Themes in Core v1

Fresh branch from a clean master
AH!, Yeah that can be reduced to that.  Will do it shortly.  I am headed to Ann Arbor to look at a couple of houses :)