diff --git a/mozilla/suite/browser/navigator.js b/mozilla/suite/browser/navigator.js
index 45f71079371..f55b54cf24f 100644
--- a/mozilla/suite/browser/navigator.js
+++ b/mozilla/suite/browser/navigator.js
@@ -2113,12 +2113,15 @@ function applyTheme(themeName)
     return;
   }
 
- // XXX XXX BAD BAD BAD BAD !! XXX XXX                                         
- // we STILL haven't fixed editor skin switch problems                         
- // hacking around it yet again                                                
-
  str.data = name;
  pref.setComplexValue("general.skins.selectedSkin", Components.interfaces.nsISupportsString, str);
+
+ if (pref.getBoolPref("extensions.dss.enabled")) {
+   pref.clearUserPref("general.skins.selectedSkin");
+   chromeRegistry.selectSkin(name, true);
+   chromeRegistry.refreshSkins();
+   return;
+ }
  
  // shut down quicklaunch so the next launch will have the new skin
  var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
diff --git a/mozilla/suite/common/pref/pref-themes.js b/mozilla/suite/common/pref/pref-themes.js
index bd0b686077c..50a27972f63 100644
--- a/mozilla/suite/common/pref/pref-themes.js
+++ b/mozilla/suite/common/pref/pref-themes.js
@@ -117,6 +117,13 @@ function applySkin()
 
   parent.hPrefWindow.setPref("string", "general.skins.selectedSkin", data.name);
 
+  if (parent.hPrefWindow.getPref("bool", "extensions.dss.enabled")) {
+    parent.hPrefWindow.pref.clearUserPref("general.skins.selectedSkin");
+    reg.selectSkin(data.name, true);
+    reg.refreshSkins();
+    return;
+  }
+
   // shut down quicklaunch so the next launch will have the new skin
   var appStartup = Components.classes["@mozilla.org/toolkit/app-startup;1"]
                      .getService(Components.interfaces.nsIAppStartup);
diff --git a/mozilla/xpfe/bootstrap/browser-prefs.js b/mozilla/xpfe/bootstrap/browser-prefs.js
index e7b027d4f3f..3087bc3dbfe 100644
--- a/mozilla/xpfe/bootstrap/browser-prefs.js
+++ b/mozilla/xpfe/bootstrap/browser-prefs.js
@@ -195,6 +195,7 @@ pref("app.releaseNotesURL", "chrome://branding/locale/brand.properties");
 pref("app.vendorURL", "chrome://branding/locale/brand.properties");
 
 pref("extensions.getMoreLocalesURL", "chrome://branding/locale/brand.properties");
+pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
 
 pref("xpinstall.dialog.confirm",        "chrome://communicator/content/xpinstall/institems.xul");
 pref("xpinstall.dialog.progress.chrome","chrome://communicator/content/xpinstall/xpistatus.xul");