diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
index c152be4a2e8..a84e21e0ffc 160000
--- a/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
+++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/acorn
@@ -1 +1 @@
-Subproject commit c152be4a2e8383a21c573ba0b2495afc9ae84643
+Subproject commit a84e21e0ffc415e2eb729aad88097a1c7ecdb568
diff --git a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
index 21c9f963b94..fb2bb83134c 160000
--- a/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
+++ b/src/extensions/default/JavaScriptCodeHints/thirdparty/tern
@@ -1 +1 @@
-Subproject commit 21c9f963b94f6ad077f95d182e9b4568c0d3874d
+Subproject commit fb2bb83134c1a1dec46459da7d22189974ea1ec5
diff --git a/src/styles/brackets.less b/src/styles/brackets.less
index 01350e0e074..8f1476a7c0e 100644
--- a/src/styles/brackets.less
+++ b/src/styles/brackets.less
@@ -65,8 +65,29 @@ html, body {
     backface-visibility: hidden;
 }
 
-body {
+.platform-linux {
     height: 100%;
+    ::-webkit-scrollbar {
+        width: 8px;
+        height: 8px;
+    }
+
+    ::-webkit-scrollbar-track-piece {
+        background: none;
+    }
+
+    ::-webkit-scrollbar-thumb {
+        background: @custom-scrollbar-thumb;
+        border-radius: 4px;
+    }
+
+    ::-webkit-scrollbar-corner       {
+        background: none;
+    }
+
+    ::-webkit-scrollbar-thumb:window-inactive {
+        background: @custom-scrollbar-thumb-inactive;
+    }
 }
 
 .resizing-container {
diff --git a/src/styles/brackets_theme_default.less b/src/styles/brackets_theme_default.less
index 21fbfb71ab0..16f2ae1d255 100644
--- a/src/styles/brackets_theme_default.less
+++ b/src/styles/brackets_theme_default.less
@@ -107,13 +107,17 @@
 @open-working-file-name-highlight: #8fddff;
 @open-working-file-ext-highlight: #8fddff;
 
-/* Selection colors */
+/* selection colors */
 @selection-color-focused: #D9EFF7;
 @selection-color-unfocused: #e9e9e9;
 
 /* background color of the line that has the cursor */
 @activeline-bgcolor: #e6e9e9;
 
+/* custom scrollbar colors */
+@custom-scrollbar-thumb: rgba(0, 0, 0, 0.24);
+@custom-scrollbar-thumb-inactive: rgba(0, 0, 0, 0.12);
+
 /* Code font formatting
  *
  * NOTE (JRB): In order to get the web font to load early enough, we have a div called "dummy-text" that
diff --git a/src/thirdparty/CodeMirror2 b/src/thirdparty/CodeMirror2
index 2d51b31fa77..a71f5fced23 160000
--- a/src/thirdparty/CodeMirror2
+++ b/src/thirdparty/CodeMirror2
@@ -1 +1 @@
-Subproject commit 2d51b31fa778efafa8f3e7bf547ce52631f7a6b8
+Subproject commit a71f5fced2348a617e49a84e3252feb8702e43f6