Themes in Core v1

Fresh branch from a clean master
Oh yeah that makes sense. Let me make that change right now.