Moved theme settings to it's own feature... and removed the theme setting from the rebuild script.
Merge branch 'theme-settings'