diff --git a/.gitignore b/.gitignore
index e43b0f9..6fdc0f3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,2 @@
 .DS_Store
+host-map.php
diff --git a/code/extensions/SiteTreeSubsites.php b/code/extensions/SiteTreeSubsites.php
index ebb2a2b..2a82701 100644
--- a/code/extensions/SiteTreeSubsites.php
+++ b/code/extensions/SiteTreeSubsites.php
@@ -205,7 +205,10 @@ class SiteTreeSubsites extends DataExtension {
 	 */
 	static function contentcontrollerInit($controller) {
 		$subsite = Subsite::currentSubsite();
-		if($subsite && $subsite->Theme) SSViewer::set_theme(Subsite::currentSubsite()->Theme);
+
+		if($subsite && $subsite->Theme){
+			Config::inst()->update('SSViewer', 'theme', Subsite::currentSubsite()->Theme);
+		}
 	}
 
 	function alternateAbsoluteLink() {