Theme WML cleanup inspired by a wmlindent pass

Mostly comments and indentation only. Also removed a big mid-line
whitespace chunk.
Theme WML cleanup inspired by a wmlindent pass

Mostly comments and indentation only.
Theme WML cleanup inspired by a wmlindent pass

Comment indentation only.
wmlindent pass on mainline