Move theme info down to the state
Move theme info down to state, and create a new Theme object