Merge remote-tracking branch 'origin/experimental' into travis/develop-for-real

src/settings/Settings.js

@@ -206,8 +206,8 @@ export const SETTINGS = {
         default: false,
     },
     "theme": {
-        supportedLevels: LEVELS_ACCOUNT_SETTINGS,
-        default: "light",
+        supportedLevels: ['config'],
+        default: "dharma",
     },
     "webRtcForceTURN": {
         supportedLevels: LEVELS_DEVICE_ONLY_SETTINGS_WITH_CONFIG,

src/settings/handlers/ConfigSettingsHandler.js

@@ -27,7 +27,7 @@ export default class ConfigSettingsHandler extends SettingsHandler {
 
         // Special case themes
         if (settingName === "theme") {
-            return config["default_theme"];
+            return "dharma"; // config["default_theme"];
         }
 
         const settingsConfig = config["settingDefaults"];