Massive style and markup refactor

I really have to start doing this more atomically.