Properly handle missing CSS themes
Indentation fixes