re-format code.
remove obsolete method.
update ThemeFactory so that themes can be reset & reloaded which should fix #40.