Fixes for themes/full themes
PEP8 fixes
Merge pull request #599 from bobsilverberg/theme_fix

Fixes for themes/full themes