diff --git a/resources/assets/less/skins/_all-skins.less b/resources/assets/less/skins/_all-skins.less
index ec07547ff1..7733d1035b 100755
--- a/resources/assets/less/skins/_all-skins.less
+++ b/resources/assets/less/skins/_all-skins.less
@@ -11,3 +11,4 @@
 @import "skin-yellow-light.less";
 @import "skin-purple.less";
 @import "skin-purple-light.less";
+@import "skin-contrast.less";
diff --git a/resources/assets/less/skins/skin-black-light.less b/resources/assets/less/skins/skin-black-light.less
index b3fe67f2d7..497ee1cef2 100755
--- a/resources/assets/less/skins/skin-black-light.less
+++ b/resources/assets/less/skins/skin-black-light.less
@@ -1,64 +1,55 @@
 /*
- * Skin: Black
- * -----------
+ * Skin: black
+ * ---------
  */
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
-/* skin-black navbar */
 .skin-black-light {
-  //Navbar & Logo
+  //Navbar
   .main-header {
-    .box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
-    .navbar-toggle {
-      color: #333;
-    }
-    .navbar-brand {
-      color: #333;
-      border-right: 1px solid #eee;
-    }
-    > .navbar {
-      .navbar-variant(#fff; #333; #999; #fff);
-      > .sidebar-toggle {
-        color: #333;
-        border-right: 1px solid #eee;
-      }
-      .navbar-nav {
-        > li > a {
-          border-right: 1px solid #eee;
+    .navbar {
+      .navbar-variant(@black; #fff);
+      .sidebar-toggle {
+        color: #fff;
+        &:hover {
+          background-color: darken(@black, 5%);
         }
       }
-      .navbar-custom-menu .navbar-nav,
-      .navbar-right {
-        > li {
-          > a {
-            border-left: 1px solid #eee;
-            border-right-width: 0;
+      @media(max-width: @screen-header-collapse) {
+        .dropdown-menu {
+          li {
+            &.divider {
+              background-color: rgba(255,255,255,0.1);
+            }
+            a {
+              color: #fff;
+              &:hover {
+                background: darken(@black, 5%);
+              }
+            }
           }
         }
       }
     }
-    > .logo {
-      .logo-variant(#fff; #333);
-      border-right: 1px solid #eee;
-      @media (max-width: @screen-header-collapse) {
-        .logo-variant(#222; #fff);
-        border-right: none;
-      }
+    //Logo
+    .logo {
+      .logo-variant(@black);
     }
 
     li.user-header {
-      background-color: #222;
+      background-color: @black;
     }
   }
 
   //Content Header
   .content-header {
     background: transparent;
-    box-shadow: none;
   }
+
   //Create the sidebar skin
-  .skin-light-sidebar(#fff);
+  .skin-light-sidebar(@black);
 }
diff --git a/resources/assets/less/skins/skin-black.less b/resources/assets/less/skins/skin-black.less
index 6b0f789d90..bcac8f6275 100755
--- a/resources/assets/less/skins/skin-black.less
+++ b/resources/assets/less/skins/skin-black.less
@@ -1,64 +1,106 @@
 /*
  * Skin: Black
- * -----------
+ * ----------
  */
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
-/* skin-black navbar */
 .skin-black {
-  //Navbar & Logo
+  //Navbar
   .main-header {
-    .box-shadow(0px 1px 1px rgba(0, 0, 0, 0.05));
-    .navbar-toggle {
-      color: #333;
-    }
-    .navbar-brand {
-      color: #333;
-      border-right: 1px solid #eee;
-    }
-    > .navbar {
-      .navbar-variant(#fff; #333; #999; #fff);
-      > .sidebar-toggle {
-        color: #333;
-        border-right: 1px solid #eee;
-      }
-      .navbar-nav {
-        > li > a {
-          border-right: 1px solid #eee;
+    .navbar {
+      .navbar-variant(@black; #fff);
+      .sidebar-toggle {
+        color: #fff;
+        &:hover {
+          background-color: darken(@black, 5%);
         }
       }
-      .navbar-custom-menu .navbar-nav,
-      .navbar-right {
-        > li {
-          > a {
-            border-left: 1px solid #eee;
-            border-right-width: 0;
+      @media (max-width: @screen-header-collapse) {
+        .dropdown-menu {
+          li {
+            &.divider {
+              background-color: rgba(255, 255, 255, 0.1);
+            }
+            a {
+              color: #fff;
+              &:hover {
+                background: darken(@black, 5%);
+              }
+            }
           }
         }
       }
     }
-    > .logo {
-      .logo-variant(#fff; #333);
-      border-right: 1px solid #eee;
-      @media (max-width: @screen-header-collapse) {
-        .logo-variant(#222; #fff);
-        border-right: none;
-      }
-    }
+    //Logo
 
     li.user-header {
-      background-color: #222;
+      background-color: @black;
     }
   }
 
   //Content Header
   .content-header {
     background: transparent;
-    box-shadow: none;
   }
+
   //Create the sidebar skin
-  .skin-dark-sidebar(#fff);
+  .skin-dark-sidebar(@black);
+}
+
+.skin-black.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: @dark-gray;
+    border-color: darken(@gray, 10%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: @black;
+    border-color: darken(@dark-gray, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: @black;
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@black, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @black;
+  text-decoration: underline;
+  &:hover {
+    color: darken(@black, 20%);
+  }
+  &:visited {
+    color: @black;
+  }
+}
+
+.text-primary {
+  color: darken(@black, 20%);
+}
+
+.skin-black .main-header .navbar .nav>li>a {
+  text-decoration: none;
 }
diff --git a/resources/assets/less/skins/skin-blue-light.less b/resources/assets/less/skins/skin-blue-light.less
index cd7341cd21..4462a1d667 100755
--- a/resources/assets/less/skins/skin-blue-light.less
+++ b/resources/assets/less/skins/skin-blue-light.less
@@ -2,8 +2,8 @@
  * Skin: Blue
  * ----------
  */
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
diff --git a/resources/assets/less/skins/skin-blue.less b/resources/assets/less/skins/skin-blue.less
index 08aa0afbfb..167ec04b19 100755
--- a/resources/assets/less/skins/skin-blue.less
+++ b/resources/assets/less/skins/skin-blue.less
@@ -1,13 +1,13 @@
 /*
- * Skin: Blue
+ * Skin: light-blue
  * ----------
  */
-@import "../../less/bootstrap-less/mixins.less";
-@import "../../less/bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
-.skin-blue {
+.skin-light-blue {
   //Navbar
   .main-header {
     .navbar {
@@ -50,8 +50,53 @@
   .skin-dark-sidebar(@light-blue);
 }
 
-.skin-blue.layout-top-nav .main-header > .logo {
+.skin-light-blue.layout-top-nav .main-header > .logo {
   .logo-variant {
     background-color: none;
   }
 }
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: darken(@light-blue, 10%);
+    border-color: darken(@light-blue, 20%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: darken(@light-blue, 20%);
+    border-color: darken(@light-blue, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: darken(@light-blue, 10%);
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@light-blue, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @light-blue;
+  &:hover {
+    color: darken(@light-blue, 20%);
+  }
+  &:visited {
+    color: @light-blue;
+  }
+}
+
+.text-primary {
+  color: darken(@light-blue, 20%);
+}
+
diff --git a/resources/assets/less/skins/skin-contrast.less b/resources/assets/less/skins/skin-contrast.less
new file mode 100644
index 0000000000..eb0c815c26
--- /dev/null
+++ b/resources/assets/less/skins/skin-contrast.less
@@ -0,0 +1,57 @@
+/*
+ * Skin: Blue
+ * ----------
+ */
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
+@import "../variables.less";
+@import "../mixins.less";
+
+.skin-contrast {
+  //Navbar
+  .main-header {
+    .navbar {
+      .navbar-variant(@navy; #fff);
+      .sidebar-toggle {
+        color: #fff;
+        &:hover {
+          background-color: darken(@navy, 5%);
+        }
+      }
+      @media (max-width: @screen-header-collapse) {
+        .dropdown-menu {
+          li {
+            &.divider {
+              background-color: rgba(255, 255, 255, 0.1);
+            }
+            a {
+              color: #fff;
+              &:hover {
+                background: darken(@navy, 5%);
+              }
+            }
+          }
+        }
+      }
+    }
+    //Logo
+
+    li.user-header {
+      background-color: @navy;
+    }
+  }
+
+  //Content Header
+  .content-header {
+    background: transparent;
+  }
+
+  //Create the sidebar skin
+  .skin-dark-sidebar(@navy);
+}
+
+.skin-contrast.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
diff --git a/resources/assets/less/skins/skin-green-light.less b/resources/assets/less/skins/skin-green-light.less
index 5c1261d7eb..f785f38bcb 100755
--- a/resources/assets/less/skins/skin-green-light.less
+++ b/resources/assets/less/skins/skin-green-light.less
@@ -3,8 +3,8 @@
  * -----------
  */
 
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
diff --git a/resources/assets/less/skins/skin-green.less b/resources/assets/less/skins/skin-green.less
index a9b7898bbd..2f4ac71a83 100755
--- a/resources/assets/less/skins/skin-green.less
+++ b/resources/assets/less/skins/skin-green.less
@@ -1,10 +1,9 @@
 /*
  * Skin: Green
- * -----------
+ * ----------
  */
-
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
@@ -19,11 +18,11 @@
           background-color: darken(@green, 5%);
         }
       }
-      @media(max-width: @screen-header-collapse) {
+      @media (max-width: @screen-header-collapse) {
         .dropdown-menu {
           li {
             &.divider {
-              background-color: rgba(255,255,255,0.1);
+              background-color: rgba(255, 255, 255, 0.1);
             }
             a {
               color: #fff;
@@ -36,9 +35,6 @@
       }
     }
     //Logo
-    .logo {
-      .logo-variant(darken(@green, 5%));
-    }
 
     li.user-header {
       background-color: @green;
@@ -52,5 +48,55 @@
 
   //Create the sidebar skin
   .skin-dark-sidebar(@green);
-
 }
+
+.skin-green.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: darken(@green, 10%);
+    border-color: darken(@green, 20%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: darken(@green, 20%);
+    border-color: darken(@green, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: darken(@green, 10%);
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@green, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @green;
+  &:hover {
+    color: darken(@green, 20%);
+  }
+  &:visited {
+    color: @green;
+  }
+}
+
+.text-primary {
+  color: darken(@green, 20%);
+}
+
diff --git a/resources/assets/less/skins/skin-orange-light.less b/resources/assets/less/skins/skin-orange-light.less
new file mode 100644
index 0000000000..02ad7134dd
--- /dev/null
+++ b/resources/assets/less/skins/skin-orange-light.less
@@ -0,0 +1,55 @@
+/*
+ * Skin: orange
+ * ---------
+ */
+
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
+@import "../variables.less";
+@import "../mixins.less";
+
+.skin-orange-light {
+  //Navbar
+  .main-header {
+    .navbar {
+      .navbar-variant(@orange; #fff);
+      .sidebar-toggle {
+        color: #fff;
+        &:hover {
+          background-color: darken(@orange, 5%);
+        }
+      }
+      @media(max-width: @screen-header-collapse) {
+        .dropdown-menu {
+          li {
+            &.divider {
+              background-color: rgba(255,255,255,0.1);
+            }
+            a {
+              color: #fff;
+              &:hover {
+                background: darken(@orange, 5%);
+              }
+            }
+          }
+        }
+      }
+    }
+    //Logo
+    .logo {
+      .logo-variant(@orange);
+    }
+
+    li.user-header {
+      background-color: @orange;
+    }
+  }
+
+  //Content Header
+  .content-header {
+    background: transparent;
+  }
+
+  //Create the sidebar skin
+  .skin-light-sidebar(@orange);
+}
diff --git a/resources/assets/less/skins/skin-orange.less b/resources/assets/less/skins/skin-orange.less
new file mode 100644
index 0000000000..d1b3f4077d
--- /dev/null
+++ b/resources/assets/less/skins/skin-orange.less
@@ -0,0 +1,102 @@
+/*
+ * Skin: Orange
+ * ----------
+ */
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
+@import "../variables.less";
+@import "../mixins.less";
+
+.skin-orange {
+  //Navbar
+  .main-header {
+    .navbar {
+      .navbar-variant(@orange; #fff);
+      .sidebar-toggle {
+        color: #fff;
+        &:hover {
+          background-color: darken(@orange, 5%);
+        }
+      }
+      @media (max-width: @screen-header-collapse) {
+        .dropdown-menu {
+          li {
+            &.divider {
+              background-color: rgba(255, 255, 255, 0.1);
+            }
+            a {
+              color: #fff;
+              &:hover {
+                background: darken(@orange, 5%);
+              }
+            }
+          }
+        }
+      }
+    }
+    //Logo
+
+    li.user-header {
+      background-color: @orange;
+    }
+  }
+
+  //Content Header
+  .content-header {
+    background: transparent;
+  }
+
+  //Create the sidebar skin
+  .skin-dark-sidebar(@orange);
+}
+
+.skin-orange.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: darken(@orange, 10%);
+    border-color: darken(@orange, 20%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: darken(@orange, 20%);
+    border-color: darken(@orange, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: darken(@orange, 10%);
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@orange, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @orange;
+  &:hover {
+    color: darken(@orange, 20%);
+  }
+  &:visited {
+    color: @orange;
+  }
+}
+
+.text-primary {
+  color: darken(@orange, 20%);
+}
+
diff --git a/resources/assets/less/skins/skin-purple-light.less b/resources/assets/less/skins/skin-purple-light.less
index 885fb05bb9..e79ac1c8e2 100755
--- a/resources/assets/less/skins/skin-purple-light.less
+++ b/resources/assets/less/skins/skin-purple-light.less
@@ -3,8 +3,8 @@
  * ------------
  */
 
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
diff --git a/resources/assets/less/skins/skin-purple.less b/resources/assets/less/skins/skin-purple.less
index f2ffaff16a..54bf80386b 100755
--- a/resources/assets/less/skins/skin-purple.less
+++ b/resources/assets/less/skins/skin-purple.less
@@ -1,10 +1,9 @@
 /*
  * Skin: Purple
- * ------------
+ * ----------
  */
-
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
@@ -19,11 +18,11 @@
           background-color: darken(@purple, 5%);
         }
       }
-      @media(max-width: @screen-header-collapse) {
+      @media (max-width: @screen-header-collapse) {
         .dropdown-menu {
           li {
             &.divider {
-              background-color: rgba(255,255,255,0.1);
+              background-color: rgba(255, 255, 255, 0.1);
             }
             a {
               color: #fff;
@@ -36,9 +35,6 @@
       }
     }
     //Logo
-    .logo {
-      .logo-variant(darken(@purple, 5%));
-    }
 
     li.user-header {
       background-color: @purple;
@@ -53,3 +49,54 @@
   //Create the sidebar skin
   .skin-dark-sidebar(@purple);
 }
+
+.skin-purple.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: darken(@purple, 10%);
+    border-color: darken(@purple, 20%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: darken(@purple, 20%);
+    border-color: darken(@purple, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: darken(@purple, 10%);
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@purple, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @purple;
+  &:hover {
+    color: darken(@purple, 20%);
+  }
+  &:visited {
+    color: @purple;
+  }
+}
+
+.text-primary {
+  color: darken(@purple, 20%);
+}
+
diff --git a/resources/assets/less/skins/skin-red-light.less b/resources/assets/less/skins/skin-red-light.less
index b13f516172..ca59ce5a09 100755
--- a/resources/assets/less/skins/skin-red-light.less
+++ b/resources/assets/less/skins/skin-red-light.less
@@ -3,8 +3,8 @@
  * ---------
  */
 
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
@@ -53,3 +53,8 @@
   //Create the sidebar skin
   .skin-light-sidebar(@red);
 }
+
+a {
+  color: @red;
+}
+
diff --git a/resources/assets/less/skins/skin-red.less b/resources/assets/less/skins/skin-red.less
index 573ad0e83f..bbfa3cc3cf 100755
--- a/resources/assets/less/skins/skin-red.less
+++ b/resources/assets/less/skins/skin-red.less
@@ -1,10 +1,9 @@
 /*
  * Skin: Red
- * ---------
+ * ----------
  */
-
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
@@ -19,11 +18,11 @@
           background-color: darken(@red, 5%);
         }
       }
-      @media(max-width: @screen-header-collapse) {
+      @media (max-width: @screen-header-collapse) {
         .dropdown-menu {
           li {
             &.divider {
-              background-color: rgba(255,255,255,0.1);
+              background-color: rgba(255, 255, 255, 0.1);
             }
             a {
               color: #fff;
@@ -36,9 +35,6 @@
       }
     }
     //Logo
-    .logo {
-      .logo-variant(darken(@red, 5%));
-    }
 
     li.user-header {
       background-color: @red;
@@ -53,3 +49,54 @@
   //Create the sidebar skin
   .skin-dark-sidebar(@red);
 }
+
+.skin-red.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: darken(@red, 10%);
+    border-color: darken(@red, 20%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: darken(@red, 20%);
+    border-color: darken(@red, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: darken(@red, 10%);
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@red, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @red;
+  &:hover {
+    color: darken(@red, 20%);
+  }
+  &:visited {
+    color: @red;
+  }
+}
+
+.text-primary {
+  color: darken(@red, 20%);
+}
+
diff --git a/resources/assets/less/skins/skin-yellow-light.less b/resources/assets/less/skins/skin-yellow-light.less
index ef745ebe2b..e226243463 100755
--- a/resources/assets/less/skins/skin-yellow-light.less
+++ b/resources/assets/less/skins/skin-yellow-light.less
@@ -1,10 +1,10 @@
 /*
- * Skin: Yellow
- * ------------
+ * Skin: yellow
+ * ---------
  */
 
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
diff --git a/resources/assets/less/skins/skin-yellow.less b/resources/assets/less/skins/skin-yellow.less
index 1ba74994d2..34306c2a9b 100755
--- a/resources/assets/less/skins/skin-yellow.less
+++ b/resources/assets/less/skins/skin-yellow.less
@@ -1,10 +1,9 @@
 /*
  * Skin: Yellow
- * ------------
+ * ----------
  */
-
-@import "../../bootstrap-less/mixins.less";
-@import "../../bootstrap-less/variables.less";
+@import "../bootstrap-less/mixins.less";
+@import "../bootstrap-less/variables.less";
 @import "../variables.less";
 @import "../mixins.less";
 
@@ -19,11 +18,11 @@
           background-color: darken(@yellow, 5%);
         }
       }
-      @media(max-width: @screen-header-collapse) {
+      @media (max-width: @screen-header-collapse) {
         .dropdown-menu {
           li {
             &.divider {
-              background-color: rgba(255,255,255,0.1);
+              background-color: rgba(255, 255, 255, 0.1);
             }
             a {
               color: #fff;
@@ -36,9 +35,6 @@
       }
     }
     //Logo
-    .logo {
-      .logo-variant(darken(@yellow, 5%));
-    }
 
     li.user-header {
       background-color: @yellow;
@@ -53,3 +49,54 @@
   //Create the sidebar skin
   .skin-dark-sidebar(@yellow);
 }
+
+.skin-yellow.layout-top-nav .main-header > .logo {
+  .logo-variant {
+    background-color: none;
+  }
+}
+
+
+
+.btn, .btn:hover {
+
+
+  &.btn-primary, .btn-primary:link {
+    background-color: darken(@yellow, 10%);
+    border-color: darken(@yellow, 20%);
+    color: #fff;
+  }
+
+
+  &a.btn-primary:hover {
+    background-color: darken(@yellow, 20%);
+    border-color: darken(@yellow, 20%);
+    color: #fff;
+  }
+
+  &.btn-white:link {
+    color: darken(@yellow, 10%);
+    color: #fff;
+  }
+
+  &.btn-white:hover {
+    color: darken(@yellow, 30%);
+    color: #fff;
+  }
+}
+
+
+a {
+  color: @yellow;
+  &:hover {
+    color: darken(@yellow, 20%);
+  }
+  &:visited {
+    color: @yellow;
+  }
+}
+
+.text-primary {
+  color: darken(@yellow, 20%);
+}
+