diff --git a/app/assets/stylesheets/common.scss b/app/assets/stylesheets/common.scss
index 1507aab2..82d43d4c 100644
--- a/app/assets/stylesheets/common.scss
+++ b/app/assets/stylesheets/common.scss
@@ -581,7 +581,8 @@ li.note {
 /* CHZN reset few styles */
 .chzn-container-single .chzn-single { 
   background:#FFF;
-  border: 1px solid #ccc;
+  border: 1px solid #bbb;
+  box-shadow:none;
 }
 .chzn-container-active .chzn-single { 
   background:#fff;
diff --git a/app/assets/stylesheets/gitlab_bootstrap.scss b/app/assets/stylesheets/gitlab_bootstrap.scss
index 04a55bf9..8bab1779 100644
--- a/app/assets/stylesheets/gitlab_bootstrap.scss
+++ b/app/assets/stylesheets/gitlab_bootstrap.scss
@@ -165,11 +165,11 @@ a:focus {
 }
 
 .nav-pills a:hover { 
-  background-color:#ccc;
+  background-color:#888;
 }
 
 .nav-pills .active a {
-  background-color: #aaa;
+  background-color: $style_color;
 }
 
 .label { 
diff --git a/app/assets/stylesheets/highlight.black.scss b/app/assets/stylesheets/highlight/dark.scss
similarity index 98%
rename from app/assets/stylesheets/highlight.black.scss
rename to app/assets/stylesheets/highlight/dark.scss
index 61a09327..97c57835 100644
--- a/app/assets/stylesheets/highlight.black.scss
+++ b/app/assets/stylesheets/highlight/dark.scss
@@ -59,7 +59,7 @@
   .highlight .sr{color:orange;} /* Literal.String.Regex */
   .highlight .s1{color:orange;} /* Literal.String.Single */
   .highlight .ss{color:orange;} /* Literal.String.Symbol */
-  .bp { color: #003388 } /* Name.Builtin.Pseudo */
+  .bp { color: #D58 } /* Name.Builtin.Pseudo */
   .vc { color: #336699 } /* Name.Variable.Class */
   .vg { color: #dd7700 } /* Name.Variable.Global */
   .vi { color: cyan }
diff --git a/app/assets/stylesheets/highlight.scss b/app/assets/stylesheets/highlight/white.scss
similarity index 96%
rename from app/assets/stylesheets/highlight.scss
rename to app/assets/stylesheets/highlight/white.scss
index 535ec382..2b95d4b5 100644
--- a/app/assets/stylesheets/highlight.scss
+++ b/app/assets/stylesheets/highlight/white.scss
@@ -1,10 +1,3 @@
-@mixin round-borders-all($radius) {
-  border: 1px solid #eaeaea;
-  -moz-border-radius: $radius;
-  -webkit-border-radius: $radius;
-  border-radius: $radius;
-}
-
 table.highlighttable
 {
   margin:0px;
diff --git a/app/assets/stylesheets/main.scss b/app/assets/stylesheets/main.scss
index 5a09e564..bff24dd6 100644
--- a/app/assets/stylesheets/main.scss
+++ b/app/assets/stylesheets/main.scss
@@ -152,13 +152,13 @@ $hover: #FDF5D9;
  * CODE HIGHTLIGHT BASE
  *
  */
-@import "highlight.scss";
+@import "highlight/white.scss";
 
 /**
  * CODE HIGHTLIGHT DARK schema
  *
  */
-@import "highlight.black.scss";
+@import "highlight/dark.scss";
 
 /**
  * JQUERY UI ext