Formatting clean-ups

There's a lot of odd formatting in this theme. Tabs for indenting, non-Doxygen header comments for functions, trailing spaces, etc.

This is a clean-up patch against the current 6.x-2.x-dev release (i.e. up to commit #224800).