Theming, fixing up the build