[WIP] ThemeManager fixes/issues #746

Closes #746