All ThemeStates always have at least one state - the normal state
Remove unused method in CPTheme
Fix bug that was turning dictionary keys into objects