diff --git a/package.json b/package.json
index b09095be..875b1c8b 100644
--- a/package.json
+++ b/package.json
@@ -114,6 +114,6 @@
         "c9.ide.threewaymerge": "#229382aa0b",
         "c9.ide.undo": "#b028bcb4d5",
         "c9.ide.upload": "#0bd010d3dc",
-        "c9.ide.welcome": "#1050ee2fd4"
+        "c9.ide.welcome": "#412fe300da"
     }
 }
\ No newline at end of file
diff --git a/plugins/c9.fs/mock/test.js b/plugins/c9.fs/mock/test.js
index 558c2a2e..6625eb26 100644
--- a/plugins/c9.fs/mock/test.js
+++ b/plugins/c9.fs/mock/test.js
@@ -38,4 +38,4 @@ var i = 0;
 console.log(greeter(user), Date.now(), i++);
 setInterval(function(){
     console.log(greeter(user), Date.now(), i++);
-}, 10000);
+}, 1000);
diff --git a/plugins/c9.ide.ace/themes.js b/plugins/c9.ide.ace/themes.js
index 8767e356..3a2c3db6 100644
--- a/plugins/c9.ide.ace/themes.js
+++ b/plugins/c9.ide.ace/themes.js
@@ -1,6 +1,7 @@
 define(function(require, exports, module) {
     main.consumes = [
-        "PreferencePanel", "ace", "ui", "configure", "settings"
+        "PreferencePanel", "ace", "ui", "configure", "settings", 
+        "preferences.experimental"
     ];
     main.provides = ["preferences.themes"];
     return main;
@@ -11,6 +12,9 @@ define(function(require, exports, module) {
         var ace = imports.ace;
         var configure = imports.configure;
         var settings = imports.settings;
+        var experimental = imports["preferences.experimental"];
+        
+        var FLATDARK = experimental.addExperiment("flat-dark=1", "UI/Flat Dark Theme");
         
         /***** Initialization *****/
         
@@ -53,6 +57,23 @@ define(function(require, exports, module) {
             var list = getThemes();
             
             var rb1, rb2, rb3, rb4, rb5, rb6;
+            
+            var flatThemes = []
+            rb6 = new ui.radiobutton({ 
+                group: "theme-color", 
+                class: "themepicker", 
+                style: "background:#252525;", 
+                value: "flat-dark"
+            });
+            rb5 = new ui.radiobutton({ 
+                group: "theme-color", 
+                class: "themepicker", 
+                style: "background:#dcdbdb;", 
+                value: "flat-light"
+            });
+            if (FLATDARK) flatThemes.push(rb6);
+            flatThemes.push(rb5);
+            
             plugin.form.add([
                 {
                     type: "custom",
@@ -79,20 +100,7 @@ define(function(require, exports, module) {
                                 style: "padding-top:5px" 
                             }),
                             new ui.bar({
-                                childNodes: [
-                                    rb6 = new ui.radiobutton({ 
-                                        group: "theme-color", 
-                                        class: "themepicker", 
-                                        style: "background:#252525;", 
-                                        value: "flat-dark"
-                                    }),
-                                    rb5 = new ui.radiobutton({ 
-                                        group: "theme-color", 
-                                        class: "themepicker", 
-                                        style: "background:#dcdbdb;", 
-                                        value: "flat-light"
-                                    })
-                                ]
+                                childNodes: flatThemes
                             })
                         ]
                     })
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
index 4f2eec73..72acde7b 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-dark.less
@@ -48,9 +48,9 @@
 @general-smoothing: true;
 
 // Ace
-@ace-cloud9-day-gutter: darken(#252525, @darken-chrome);
-@ace-cloud9-day-gutter-color: darken(#7c7c7c, @darken-chrome);
-@ace-cloud9-day-background: darken(#303130, @darken-chrome);
+@ace-cloud9-day-gutter: darken(#ECECEC, @darken-chrome);
+@ace-cloud9-day-gutter-color: darken(#333, @darken-chrome);
+@ace-cloud9-day-background: darken(#FBFBFB, @darken-chrome);
 @ace-cloud9-night-gutter: darken(#303130, @darken-chrome);
 @ace-cloud9-night-background: darken(#181818, @darken-chrome);
 @ace-cloud9-night-active-line: darken(#292929, @darken-chrome);
diff --git a/plugins/c9.ide.layout.classic/themes/default-flat-light.less b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
index 07a27208..14bb0d89 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -594,6 +594,7 @@
 @dialog-header-font-size: 16px;
 @dialog-header-font-weight: normal;
 
+@dialog-content-color: #f1f1f1;
 @dialog-content-background: darken(#FEFEFE, @darken-chrome);
 @dialog-content-dark-background-color: @dialog-content-background;
 @dialog-content-dark-gradient: linear-gradient(top, transparent 0%, transparent 100%);
diff --git a/plugins/c9.ide.layout.classic/themes/flat-dark.less b/plugins/c9.ide.layout.classic/themes/flat-dark.less
index 92821009..be6a89e9 100644
--- a/plugins/c9.ide.layout.classic/themes/flat-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/flat-dark.less
@@ -19,6 +19,10 @@
     background: rgba(255,255,255, 0.14) !important;
 }
 
+.searchresults .item{
+    padding : 3px 3px 3px 5px;
+}
+
 .envcontainer {
     box-shadow: 1px 1px 6px 0px rgba(0, 0, 0, 0.08);
 }