Move some stuff from SiteThemeModule into the SiteTheme object.
Move some stuff from SiteThemeModule into the SiteTheme object.

svn commit r33596

silverorange/site,nburka/site,silverorange/site,nburka/site