diff --git a/package.json b/package.json
index 10df5c69..e260e8d2 100644
--- a/package.json
+++ b/package.json
@@ -109,7 +109,7 @@
         "c9.ide.run.build": "#0598fff697",
         "c9.ide.run.debug.xdebug": "#9956689819",
         "c9.ide.save": "#4cda35bfdb",
-        "c9.ide.scm": "#22af54d32d",
+        "c9.ide.scm": "#2e19f7a48c",
         "c9.ide.terminal.monitor": "#1a4092ede2",
         "c9.ide.test": "#102942ae4e",
         "c9.ide.test.mocha": "#fc053b23d2",
diff --git a/plugins/c9.ide.layout.classic/less/codebox.less b/plugins/c9.ide.layout.classic/less/codebox.less
index ec164470..c4cfd5c1 100644
--- a/plugins/c9.ide.layout.classic/less/codebox.less
+++ b/plugins/c9.ide.layout.classic/less/codebox.less
@@ -18,6 +18,9 @@
     color : @textbox-disabled-color;
     background: @textbox-disabled-background;
 }
+.has_apf .searchTxt.tb_console.ace_searchboxDisabled .sbtb_middle .input {
+    color : @textbox-disabled-color;
+}
 .ace_one-line .ace_scroller.ace_scroll-left {
     box-shadow: none;
 }
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 01c4ff40..74aa8f16 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -1066,8 +1066,8 @@
 @textbox-border-color: darken(#dedede, @darken-chrome);
 @textbox-initial-color: darken(#A5A5A5, @darken-chrome);
 @textbox-initial-text-shadow: 0 1px 0 darken(#FFFFFF, @darken-chrome);
-@textbox-disabled-color: gray;
-@textbox-disabled-background: darken(rgb(216, 216, 216), @darken-chrome);
+@textbox-disabled-color: #C5C5C5;
+@textbox-disabled-background: #F1F1F1;
 
 // Textbox - Simple
 @tbsimple-border: 1px solid #DEDEDE;
diff --git a/plugins/c9.ide.layout.classic/themes/flat-light.less b/plugins/c9.ide.layout.classic/themes/flat-light.less
index 351b97ee..82317527 100644
--- a/plugins/c9.ide.layout.classic/themes/flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/flat-light.less
@@ -470,6 +470,9 @@ body .runner-form-header{
     .cbblack.cbcontainerDisabled.cbcontainerChecked .checkbox{
         background-position: 0 -142px;
     }
+    .cbblack.cbcontainerDisabled.cbcontainerDisabled .checkbox{
+        background-position: 0 0;
+    }
     .session_btn .tab_middle:before {
         background-position   : 0 -126px;
         -webkit-mask-position : 0 -95px;