Fix bug when setting themeStates in a themeAttribute
Fix accidental semicolon
Change CPTheme implementation to fix how searching for a matching theme works