diff --git a/package.json b/package.json
index 11c8ed72..f84532b1 100644
--- a/package.json
+++ b/package.json
@@ -106,7 +106,7 @@
         "c9.ide.run.build": "#4de6a0b9a4",
         "c9.ide.run.debug.xdebug": "#61dcbd0180",
         "c9.ide.save": "#326087f5a2",
-        "c9.ide.scm": "#662625c230",
+        "c9.ide.scm": "#30951575e3",
         "c9.ide.terminal.monitor": "#b52a3f2144",
         "c9.ide.theme.flat": "#2de8414db7",
         "c9.ide.threewaymerge": "#229382aa0b",
diff --git a/plugins/c9.ide.layout.classic/themes/default-dark.less b/plugins/c9.ide.layout.classic/themes/default-dark.less
index a4e41847..c2476d25 100644
--- a/plugins/c9.ide.layout.classic/themes/default-dark.less
+++ b/plugins/c9.ide.layout.classic/themes/default-dark.less
@@ -1693,7 +1693,7 @@
 @detail-label-background: #272727;
 @detail-label-margin: 2px 0 0 67px;
 @detail-label-border-bottom: 1px solid rgba(0,0,0,0.7);
-@detail-label-box-shadow: rgba(255, 255, 255, 0.06);
+@detail-label-box-shadow: 0 1px 0 rgba(255, 255, 255, 0.06), 0 1px 0 rgba(255, 255, 255, 0.06) inset;
 
 @detail-label-hash-border: 1px solid #95AD0A;
 @detail-label-hash-color: @highlight-color;
@@ -1706,4 +1706,9 @@
 @diff-toolbar-buttons-background: @border-highlight;
 @diff-toolbar-buttons-border: none;
 
-@panel-settings-changes-top: 36px;
\ No newline at end of file
+@form-bar-padding: 10px 35px 10px 10px;
+@form-bar-background: @menu-button-active-background;
+@form-bar-border-bottom: 1px solid black;
+@form-bar-box-shadow: 0 1px @border-highlight;
+
+@panel-settings-changes-top: 33px;
\ No newline at end of file
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 5ef257ef..18b8e002 100644
--- a/plugins/c9.ide.layout.classic/themes/default-flat-light.less
+++ b/plugins/c9.ide.layout.classic/themes/default-flat-light.less
@@ -1705,4 +1705,9 @@
 @diff-toolbar-buttons-background: #F9F9F9;
 @diff-toolbar-buttons-border: 1px solid @border-highlight-dark;
 
+@form-bar-padding: 10px 50px 10px 10px;
+@form-bar-background: @menu-button-active-background;
+@form-bar-border-bottom: 1px solid black;
+@form-bar-box-shadow: 0 1px @border-highlight;
+
 @panel-settings-changes-top: 46px;
\ No newline at end of file