Remove explicit themes
Whitespace fixes