diff --git a/configs/client-default-local.js b/configs/client-default-local.js
index 58e1f81c..10fedaa8 100644
--- a/configs/client-default-local.js
+++ b/configs/client-default-local.js
@@ -19,6 +19,7 @@ module.exports.makeLocal = function(config, options) {
         options.projectName = root.substr(root.lastIndexOf("/") + 1);
         options.debug = 2;
         options.env = "local";
+        options.defaultTheme = "dark";
     }
 
     for (var i = config.length - 1; i >= 0; i--) {
diff --git a/configs/client-default.js b/configs/client-default.js
index 372a64ed..b3379962 100644
--- a/configs/client-default.js
+++ b/configs/client-default.js
@@ -545,7 +545,7 @@ module.exports = function(options) {
         {
             packagePath: "plugins/c9.ide.layout.classic/preload",
             themePrefix: options.themePrefix,
-            defaultTheme: options.defaultTheme || "dark"
+            defaultTheme: options.defaultTheme || "flat-light"
         },
         {
             packagePath: "plugins/c9.ide.tree/tree",