diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
index 341c6b9732..55485ea896 100644
Binary files a/public/css/dist/skins/skin-blue-dark.css and b/public/css/dist/skins/skin-blue-dark.css differ
diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index 2ab3d54a72..13f300af4f 100644
Binary files a/public/css/dist/skins/skin-blue-dark.min.css and b/public/css/dist/skins/skin-blue-dark.min.css differ
diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
index 9a2b178929..c02706fdae 100644
Binary files a/public/css/dist/skins/skin-green-dark.css and b/public/css/dist/skins/skin-green-dark.css differ
diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index ba07a2a2e2..dd198f450a 100644
Binary files a/public/css/dist/skins/skin-green-dark.min.css and b/public/css/dist/skins/skin-green-dark.min.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
index fe665af01a..bc0511afeb 100644
Binary files a/public/css/dist/skins/skin-orange-dark.css and b/public/css/dist/skins/skin-orange-dark.css differ
diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index e51d921601..7d25d11610 100644
Binary files a/public/css/dist/skins/skin-orange-dark.min.css and b/public/css/dist/skins/skin-orange-dark.min.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
index 6ec40ff562..67c5eac459 100644
Binary files a/public/css/dist/skins/skin-purple-dark.css and b/public/css/dist/skins/skin-purple-dark.css differ
diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index 3549bf793e..5631ccf33e 100644
Binary files a/public/css/dist/skins/skin-purple-dark.min.css and b/public/css/dist/skins/skin-purple-dark.min.css differ
diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
index cf4fcdeb37..e718bc3810 100644
Binary files a/public/css/dist/skins/skin-red-dark.css and b/public/css/dist/skins/skin-red-dark.css differ
diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index e371583fa6..fefd81d7c1 100644
Binary files a/public/css/dist/skins/skin-red-dark.min.css and b/public/css/dist/skins/skin-red-dark.min.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
index 0a8516e0d2..460b605b2e 100644
Binary files a/public/css/dist/skins/skin-yellow-dark.css and b/public/css/dist/skins/skin-yellow-dark.css differ
diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index c01e3c863d..ecc7d91cc6 100644
Binary files a/public/css/dist/skins/skin-yellow-dark.min.css and b/public/css/dist/skins/skin-yellow-dark.min.css differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 1f230c8ee8..872a595dc4 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -7,27 +7,27 @@
     "/css/dist/skins/skin-red.css": "/css/dist/skins/skin-red.css?id=747948e5f269f64047f7",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=d7996d850e8bcdc4e167",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=eb25d2ec49f730d09431",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=ba70d2217ea2abc67bb9",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=007a6a34faef7ae0dbae",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=35602987835e5d50d162",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=3ffccc321a19007ae2a2",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=29f5802313a3f55895c3",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=5d40700e5a9ffce2337f",
     "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=b6dcb6d5c666fc5c8cc0",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=3528ee7aeb95b1ea5560",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=0a02c76392200c4349b2",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=cb85a4e40e784319e878",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=6379a53bbd4fad2ea7f5",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=ebc04d98ded8db19d22e",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=13b539e881fcf83bbfc4",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=5c430afd404d8e27678b",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=4eb849d29e458a7dc71c",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=9d1b4bb34e17de3e5952",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=b4fc4a74e1f6367dc3e2",
     "/css/dist/all.css": "/css/dist/all.css?id=199fdf677ce0dce6cef8",
     "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
     "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=ba70d2217ea2abc67bb9",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=007a6a34faef7ae0dbae",
     "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=3ffccc321a19007ae2a2",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=ebc04d98ded8db19d22e",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=6379a53bbd4fad2ea7f5",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=29f5802313a3f55895c3",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=3528ee7aeb95b1ea5560",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=13b539e881fcf83bbfc4",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=4eb849d29e458a7dc71c",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=5c430afd404d8e27678b",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=5d40700e5a9ffce2337f",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=0a02c76392200c4349b2",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=9d1b4bb34e17de3e5952",
     "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=d7996d850e8bcdc4e167",
     "/css/dist/signature-pad.css": "/css/dist/signature-pad.css?id=6a89d3cd901305e66ced",
     "/css/build/signature-pad.min.css": "/css/build/signature-pad.min.css?id=d41d8cd98f00b204e980",
diff --git a/resources/assets/less/skins/skin-blue-dark.less b/resources/assets/less/skins/skin-blue-dark.less
index b961603981..61c7e6b200 100644
--- a/resources/assets/less/skins/skin-blue-dark.less
+++ b/resources/assets/less/skins/skin-blue-dark.less
@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@blue, 15%);
+  --button-primary: darken(@blue, 25%);
+  --button-hover: darken(@blue, 30%);
   --header: @blue; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@blue, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@blue, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@blue, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@blue, 45%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -132,9 +141,31 @@ a {
   color: var(--text-main);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:link {
+  color: var(--link);
 }
+
+a:visited {
+  color: var(--nav-link);
+}
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -157,19 +188,25 @@ body {
   color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  background-color: var(--button-default);
+  color: var(--link);
 }
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
 .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
-  background-color: var(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
 .btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -298,19 +335,25 @@ input[type=text], input[type=search] {
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
 
+.box-header.with-border {
+  border-bottom: #000;
+}
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--header)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--header)
+    color: var(--visited-link)
   }
 }
 
diff --git a/resources/assets/less/skins/skin-green-dark.less b/resources/assets/less/skins/skin-green-dark.less
index 17d79e9df5..fda451ca67 100644
--- a/resources/assets/less/skins/skin-green-dark.less
+++ b/resources/assets/less/skins/skin-green-dark.less
@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@green, 15%);
+  --button-primary: darken(@green, 25%);
+  --button-hover: darken(@green, 30%);
   --header: @green; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@green, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@green, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@green, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@green, 45%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -131,29 +140,42 @@ a {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #00a65a;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  color: var(--nav-link);
 }
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
 #assetsListingTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
+
 #assetsListingTable>tbody>tr.selected>td {
   background-color: var(--back-main);
 }
-#assetsListingTable>tbody>tr>td {
-  color: var(--link);
-}
-
 body {
   color: var(--text-main);
 }
@@ -166,19 +188,25 @@ body {
   color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  background-color: var(--button-default);
+  color: var(--link);
 }
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
 .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
-  background-color: var(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-green {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -211,13 +239,6 @@ body {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.dynamic-form-row{
-  color: @green;
-}
-
-.select2-container--default .select2-selection--single .select2-selection__rendered {
-  color: var(--header);
-}
 .form-control {
   background-color: var(--back-main);
   color: var(--text-main);
@@ -240,9 +261,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-sub)!important;
   color: var(--text-main);
 }
-li.select2-results__option{
-  color:@green;
-}
 #licensesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
@@ -317,21 +335,25 @@ li.select2-results__option{
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
-#webui>#app>.row>.col-md-12>.box>.box-body>.row>.col-md-12 {
-  color:@green;
+
+.box-header.with-border {
+  border-bottom: #000;
 }
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--header)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--header)
+    color: var(--visited-link)
   }
 }
 
@@ -361,3 +383,4 @@ a {
   border-top: 1px solid #dddddd;
   display: table-cell;
 }
+
diff --git a/resources/assets/less/skins/skin-orange-dark.less b/resources/assets/less/skins/skin-orange-dark.less
index 94b6d0233d..780013d40b 100644
--- a/resources/assets/less/skins/skin-orange-dark.less
+++ b/resources/assets/less/skins/skin-orange-dark.less
@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@orange, 15%);
+  --button-primary: darken(@orange, 25%);
+  --button-hover: darken(@orange, 30%);
   --header: @orange; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@orange, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@orange, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@orange, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@orange, 45%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -131,22 +140,39 @@ a {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #ff8c00;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  color: var(--nav-link);
 }
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
 #assetsListingTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
+
 #assetsListingTable>tbody>tr.selected>td {
   background-color: var(--back-main);
 }
@@ -162,19 +188,25 @@ body {
   color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  background-color: var(--button-default);
+  color: var(--link);
 }
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
 .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
-  background-color: var(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-orange {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -303,19 +335,25 @@ input[type=text], input[type=search] {
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
 
+.box-header.with-border {
+  border-bottom: #000;
+}
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--header)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--header)
+    color: var(--visited-link)
   }
 }
 
diff --git a/resources/assets/less/skins/skin-purple-dark.less b/resources/assets/less/skins/skin-purple-dark.less
index 9c61a4b8ac..04cdecfc87 100644
--- a/resources/assets/less/skins/skin-purple-dark.less
+++ b/resources/assets/less/skins/skin-purple-dark.less
@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@purple, 15%);
+  --button-primary: darken(@purple, 25%);
+  --button-hover: darken(@purple, 30%);
   --header: @purple; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@purple, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@purple, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@purple, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@purple, 45%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -131,22 +140,39 @@ a {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #605ca8;
+
+a:link {
+  color: var(--link);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:visited {
+  color: var(--nav-link);
 }
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
 #assetsListingTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
+
 #assetsListingTable>tbody>tr.selected>td {
   background-color: var(--back-main);
 }
@@ -162,19 +188,25 @@ body {
   color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  background-color: var(--button-default);
+  color: var(--link);
 }
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
 .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
-  background-color: var(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-purple {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -303,19 +335,25 @@ input[type=text], input[type=search] {
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
 
+.box-header.with-border {
+  border-bottom: #000;
+}
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--header)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--header)
+    color: var(--visited-link)
   }
 }
 
diff --git a/resources/assets/less/skins/skin-red-dark.less b/resources/assets/less/skins/skin-red-dark.less
index 44b8c7d94e..e678459836 100644
--- a/resources/assets/less/skins/skin-red-dark.less
+++ b/resources/assets/less/skins/skin-red-dark.less
@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@red, 15%);
+  --button-primary: darken(@red, 25%);
+  --button-hover: darken(@red, 30%);
   --header: @red; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@red, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@red, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@red, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@red, 45%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -132,15 +141,38 @@ a {
   color: var(--text-main);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:link {
+  color: var(--link);
 }
+
+a:visited {
+  color: var(--nav-link);
+}
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
 #assetsListingTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
+
 #assetsListingTable>tbody>tr.selected>td {
   background-color: var(--back-main);
 }
@@ -156,19 +188,25 @@ body {
   color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  background-color: var(--button-default);
+  color: var(--link);
 }
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
 .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
-  background-color: var(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-red {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -262,12 +300,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-main);
   color: var(--header);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #dd4b39;
-}
 .select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {
   background-color: var(--back-sub);
   color: var(--header);
@@ -303,19 +335,25 @@ input[type=text], input[type=search] {
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
 
+.box-header.with-border {
+  border-bottom: #000;
+}
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--header)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--header)
+    color: var(--visited-link)
   }
 }
 
diff --git a/resources/assets/less/skins/skin-yellow-dark.less b/resources/assets/less/skins/skin-yellow-dark.less
index f251972f5c..bc8ca2e1fa 100644
--- a/resources/assets/less/skins/skin-yellow-dark.less
+++ b/resources/assets/less/skins/skin-yellow-dark.less
@@ -108,10 +108,15 @@ a {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: darken(@yellow, 15%);
+  --button-primary: darken(@yellow, 25%);
+  --button-hover: darken(@yellow, 30%);
   --header: @yellow; /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: lighten(@yellow, 50%); /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: lighten(@yellow, 30%); /* Use same as Header picker, lighten by 70% */
+  --visited-link: lighten(@yellow, 40%); /* Use same as Header picker, lighten by 70% */
+  --hover-link: lighten(@yellow, 45%); /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF; /* Use same as Header picker */
   --light-link: #fff; /* Use same as Header picker */
 }
@@ -123,7 +128,11 @@ a {
   border-color: var(--header);
 }
 
-.navbar-nav>li>a:link {
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+
+.thead, .navbar-nav>li>a:link {
   color: var(--nav-link);
 }
 
@@ -132,15 +141,38 @@ a {
   color: var(--text-main);
 }
 
-a, a:link, a:visited, .btn-primary.hover {
-  color: var(--header);
+a:link {
+  color: var(--link);
 }
+
+a:visited {
+  color: var(--nav-link);
+}
+
+a:hover {
+  color: var(--hover-link);
+}
+
+.btn-primary.hover {
+  color: var(--nav-link);
+}
+
+.small-box h3, .small-box p {
+  color: var(--nav-link) !important;
+  a:hover {
+    text-decoration: none;
+    color: var(--nav-link) !important;
+  }
+}
+
+
 #accessoriesTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
 #assetsListingTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
 }
+
 #assetsListingTable>tbody>tr.selected>td {
   background-color: var(--back-main);
 }
@@ -156,19 +188,25 @@ body {
   color: var(--header);
 }
 .btn-default{
-  background-color: var(--back-main);
-  color: var(--header);
+  background-color: var(--button-default);
+  color: var(--link);
 }
+
+.btn-default dropdown-toggle {
+  background-color: var(--button-default);
+  color: var(--link);
+}
+
 .btn-default:active, .btn-default:focus, .btn-default:hover, .btn-default.active {
-  background-color: var(--back-sub);
-  color: var(--header);
+  background-color: var(--button-hover);
+  color: var(--link);
 }
-.btn-primary, .btn-primary.hover, .btn-primary:active, .text-blue {
+.btn-primary, .btn-primary.hover, .btn-primary:active, .text-yellow {
   color: var(--text-main)!important;
 }
 .btn-primary:hover {
-  background-color: var(--back-main);
-  color: var(--header)!important;
+  background-color: var(--button-primary);
+  color: var(--link)!important;
 }
 #componentsTable>tbody>tr>td>nobr>a>i.fa {
   color: var(--text-main);
@@ -262,12 +300,6 @@ input[type=text], input[type=search] {
   background-color: var(--back-main);
   color: var(--header);
 }
-.popover {
-  background-color:var(--back-main);
-}
-.popover-title {
-  background-color: #f39c12;
-}
 .select2-container--default .select2-results__option[aria-selected=true], .select2-container--default .select2-results__option[aria-selected=true]:hover {
   background-color: var(--back-sub);
   color: var(--header);
@@ -303,19 +335,25 @@ input[type=text], input[type=search] {
 .table-striped>tbody>tr:nth-of-type(odd) {
   background-color: var(--back-sub);
 }
-#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa {
+#webui>div>div>div>div>div>table>tbody>tr>td>a>i.fa, .box-body, .box-footer, .box-header {
   color: var(--text-main);
 }
 
+.box-header.with-border {
+  border-bottom: #000;
+}
+
 a {
   color: var(--link);
+
   &:link {
-    color: var(--header)  }
+    color: var(--link)  }
   &:hover {
-    color: var(--light-link);
+    color: var(--hover-link);
+    text-decoration: underline;
   }
   &:visited {
-    color: var(--header)
+    color: var(--visited-link)
   }
 }