Add a bunch of .block types and remove the old ones as classes unless they contain logic that can't be handled otherwise