Final fixes for the ThemeManager.
Lots of changes/additions towards Beta 1.