diff --git a/client/stylesheets/base.less b/client/stylesheets/base.less
index 7d819b0bde6d..00f3ce304e8f 100644
--- a/client/stylesheets/base.less
+++ b/client/stylesheets/base.less
@@ -1,28 +1,15 @@
+// 
+// ----------------
+
+@import "global/_variables.less";
 @import "utils/_lesshat.import.less";
 @import "utils/_reset.import.less";
 @import "utils/_keyframes.import.less";
 @import "utils/_preloader.import.less";
 @import url(//fonts.googleapis.com/css?family=Roboto:300,400,500,700,900);
 @import url(//fonts.googleapis.com/css?family=Muli:400,300,500);
-@footer-min-height: 70px;
-@header-min-height: 60px;
-@rooms-box-width: 260px;
-@flex-tab-width: 400px;
-//@primary-background-color: #045080;
-//@primary-background-color: #38393d;
-@primary-background-color: #04436a;
-@secondary-background-color: #F4F4F4;
-@tertiary-background-color: #EAEAEA;
-@link-font-color: #008CE3;
-@primary-font-color: #444444;
-@secondary-font-color: #7f7f7f;
-@tertiary-font-color: rgba(255, 255, 255, 0.6);
-@quaternary-font-color: rgba(255, 255, 255, 0.85);
-@status-online: #35AC19;
-@status-offline: #CCCCCC;
-@status-busy: #D30230;
-@status-away: #fcb316;
 @import "utils/_emojione.import.less";
+
 .cf_ {
 	display: inline-block;
 	&:after {
@@ -1057,7 +1044,7 @@ a.github-fork {
 		.calc(height, ~"100% - " @header-min-height + @footer-min-height);
 		width: 100%;
 		overflow-x: hidden;
-		overflow-y: scroll;
+		overflow-y: auto;
 		display: block;
 		-webkit-overflow-scrolling: touch;
 		box-shadow: 0 0 5px rgba(0, 0, 0, 0.4) inset;
@@ -1580,7 +1567,7 @@ a.github-fork {
 		height: 100%;
 		top: 0;
 		left: 0;
-		overflow-y: scroll;
+		overflow-y: auto;
 		overflow-x: hidden;
 		word-wrap: break-word;
 		-webkit-overflow-scrolling: touch;
@@ -1955,8 +1942,8 @@ a.github-fork {
 		&:extend(.fill-all);
 		.custom-scroll(transparent, #DADADA);
 		margin-top: 60px;
-		overflow-y: scroll;
 		overflow-x: hidden;
+        overflow-y: auto;		
 		-webkit-overflow-scrolling: touch;
 		.calc(height, ~"100% - " @footer-min-height + @header-min-height);
 		> div {
diff --git a/client/stylesheets/global/_variables.less b/client/stylesheets/global/_variables.less
new file mode 100644
index 000000000000..5517cc726e18
--- /dev/null
+++ b/client/stylesheets/global/_variables.less
@@ -0,0 +1,27 @@
+@header-min-height: 60px;
+@footer-min-height: 70px;
+
+@rooms-box-width: 260px;
+@flex-tab-width: 400px;
+
+// Colors
+// --------------
+
+//@primary-background-color: #045080;
+//@primary-background-color: #38393d;
+
+@primary-background-color: #04436a;
+@secondary-background-color: #F4F4F4;
+@tertiary-background-color: #EAEAEA;
+
+@link-font-color: #008CE3;
+
+@primary-font-color: #444444;
+@secondary-font-color: #7f7f7f;
+@tertiary-font-color: rgba(255, 255, 255, 0.6);
+@quaternary-font-color: rgba(255, 255, 255, 0.85);
+
+@status-online: #35AC19;
+@status-offline: #CCCCCC;
+@status-busy: #D30230;
+@status-away: #fcb316;
\ No newline at end of file