From e0a6f224895212d7a2fd7abcd130d26211a1519e Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Wed, 3 Feb 2021 00:49:09 -0800
Subject: [PATCH] Small fixes to dark mode skins

---
 public/css/dist/skins/skin-blue-dark.css      | 73 ++++++++++----
 public/css/dist/skins/skin-blue-dark.min.css  | 73 ++++++++++----
 public/css/dist/skins/skin-green-dark.css     | 90 ++++++++++-------
 public/css/dist/skins/skin-green-dark.min.css | 90 ++++++++++-------
 public/css/dist/skins/skin-orange-dark.css    | 77 ++++++++++-----
 .../css/dist/skins/skin-orange-dark.min.css   | 77 ++++++++++-----
 public/css/dist/skins/skin-purple-dark.css    | 77 ++++++++++-----
 .../css/dist/skins/skin-purple-dark.min.css   | 77 ++++++++++-----
 public/css/dist/skins/skin-red-dark.css       | 81 ++++++++++-----
 public/css/dist/skins/skin-red-dark.min.css   | 81 ++++++++++-----
 public/css/dist/skins/skin-yellow-dark.css    | 81 ++++++++++-----
 .../css/dist/skins/skin-yellow-dark.min.css   | 81 ++++++++++-----
 public/mix-manifest.json                      | 28 +++---
 .../assets/less/skins/skin-blue-dark.less     | 75 +++++++++++---
 .../assets/less/skins/skin-green-dark.less    | 99 ++++++++++++-------
 .../assets/less/skins/skin-orange-dark.less   | 82 ++++++++++-----
 .../assets/less/skins/skin-purple-dark.less   | 82 ++++++++++-----
 .../assets/less/skins/skin-red-dark.less      | 84 +++++++++++-----
 .../assets/less/skins/skin-yellow-dark.less   | 84 +++++++++++-----
 19 files changed, 1032 insertions(+), 460 deletions(-)

diff --git a/public/css/dist/skins/skin-blue-dark.css b/public/css/dist/skins/skin-blue-dark.css
index 24808c292..5228907c9 100644
--- a/public/css/dist/skins/skin-blue-dark.css
+++ b/public/css/dist/skins/skin-blue-dark.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #00436b;
+  --button-primary: #002338;
+  --button-hover: #00131e;
   --header: #0073b7;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #b7e4ff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #51beff;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #84d1ff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #9edbff;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,11 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-a,
-a:link,
-a:visited,
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -225,15 +251,19 @@ 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,
@@ -242,8 +272,8 @@ body {
   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);
@@ -395,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-blue-dark.min.css b/public/css/dist/skins/skin-blue-dark.min.css
index 24808c292..5228907c9 100644
--- a/public/css/dist/skins/skin-blue-dark.min.css
+++ b/public/css/dist/skins/skin-blue-dark.min.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #00436b;
+  --button-primary: #002338;
+  --button-hover: #00131e;
   --header: #0073b7;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #b7e4ff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #51beff;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #84d1ff;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #9edbff;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,11 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-a,
-a:link,
-a:visited,
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -225,15 +251,19 @@ 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,
@@ -242,8 +272,8 @@ body {
   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);
@@ -395,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-green-dark.css b/public/css/dist/skins/skin-green-dark.css
index d6bf8518e..162243e79 100644
--- a/public/css/dist/skins/skin-green-dark.css
+++ b/public/css/dist/skins/skin-green-dark.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
   --header: #00a65a;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #a6ffd6;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #40ffa8;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #73ffbf;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #8dffcb;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,17 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color: var(--back-main);
+a:link {
+  color: var(--link);
 }
-.popover-title {
-  background-color: #00a65a;
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
 }
-a,
-a:link,
-a:visited,
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -216,9 +236,6 @@ a:visited,
 #assetsListingTable > tbody > tr.selected > td {
   background-color: var(--back-main);
 }
-#assetsListingTable > tbody > tr > td {
-  color: var(--link);
-}
 body {
   color: var(--text-main);
 }
@@ -234,25 +251,29 @@ 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 {
+.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);
@@ -291,12 +312,6 @@ body {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.dynamic-form-row {
-  color: #00a65a;
-}
-.select2-container--default .select2-selection--single .select2-selection__rendered {
-  color: var(--header);
-}
 .form-control {
   background-color: var(--back-main);
   color: var(--text-main);
@@ -329,9 +344,6 @@ input[type=search] {
   background-color: var(--back-sub) !important;
   color: var(--text-main);
 }
-li.select2-results__option {
-  color: #00a65a;
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -413,23 +425,27 @@ 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: #00a65a;
+.box-header.with-border {
+  border-bottom: #000;
 }
 a {
   color: var(--link);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-green-dark.min.css b/public/css/dist/skins/skin-green-dark.min.css
index d6bf8518e..162243e79 100644
--- a/public/css/dist/skins/skin-green-dark.min.css
+++ b/public/css/dist/skins/skin-green-dark.min.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #005a31;
+  --button-primary: #002715;
+  --button-hover: #000d07;
   --header: #00a65a;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #a6ffd6;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #40ffa8;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #73ffbf;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #8dffcb;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,17 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color: var(--back-main);
+a:link {
+  color: var(--link);
 }
-.popover-title {
-  background-color: #00a65a;
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
 }
-a,
-a:link,
-a:visited,
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -216,9 +236,6 @@ a:visited,
 #assetsListingTable > tbody > tr.selected > td {
   background-color: var(--back-main);
 }
-#assetsListingTable > tbody > tr > td {
-  color: var(--link);
-}
 body {
   color: var(--text-main);
 }
@@ -234,25 +251,29 @@ 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 {
+.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);
@@ -291,12 +312,6 @@ body {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.dynamic-form-row {
-  color: #00a65a;
-}
-.select2-container--default .select2-selection--single .select2-selection__rendered {
-  color: var(--header);
-}
 .form-control {
   background-color: var(--back-main);
   color: var(--text-main);
@@ -329,9 +344,6 @@ input[type=search] {
   background-color: var(--back-sub) !important;
   color: var(--text-main);
 }
-li.select2-results__option {
-  color: #00a65a;
-}
 #licensesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
 }
@@ -413,23 +425,27 @@ 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: #00a65a;
+.box-header.with-border {
+  border-bottom: #000;
 }
 a {
   color: var(--link);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-orange-dark.css b/public/css/dist/skins/skin-orange-dark.css
index 478a0d98b..a8cf66a28 100644
--- a/public/css/dist/skins/skin-orange-dark.css
+++ b/public/css/dist/skins/skin-orange-dark.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
   --header: #FF8C00;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #ffd199;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffe8cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #fff3e5;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,17 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color: var(--back-main);
+a:link {
+  color: var(--link);
 }
-.popover-title {
-  background-color: #ff8c00;
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
 }
-a,
-a:link,
-a:visited,
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -231,25 +251,29 @@ 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 {
+.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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-orange-dark.min.css b/public/css/dist/skins/skin-orange-dark.min.css
index 478a0d98b..a8cf66a28 100644
--- a/public/css/dist/skins/skin-orange-dark.min.css
+++ b/public/css/dist/skins/skin-orange-dark.min.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #b36200;
+  --button-primary: #804600;
+  --button-hover: #663800;
   --header: #FF8C00;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #ffd199;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #ffe8cc;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #fff3e5;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,17 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color: var(--back-main);
+a:link {
+  color: var(--link);
 }
-.popover-title {
-  background-color: #ff8c00;
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
 }
-a,
-a:link,
-a:visited,
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -231,25 +251,29 @@ 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 {
+.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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-purple-dark.css b/public/css/dist/skins/skin-purple-dark.css
index 67cc7c444..ad7d26f46 100644
--- a/public/css/dist/skins/skin-purple-dark.css
+++ b/public/css/dist/skins/skin-purple-dark.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
   --header: #605ca8;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #c1c0dd;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #e2e1ef;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #f2f2f8;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,17 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color: var(--back-main);
+a:link {
+  color: var(--link);
 }
-.popover-title {
-  background-color: #605ca8;
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
 }
-a,
-a:link,
-a:visited,
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -231,25 +251,29 @@ 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 {
+.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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-purple-dark.min.css b/public/css/dist/skins/skin-purple-dark.min.css
index 67cc7c444..ad7d26f46 100644
--- a/public/css/dist/skins/skin-purple-dark.min.css
+++ b/public/css/dist/skins/skin-purple-dark.min.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #434078;
+  --button-primary: #302e56;
+  --button-hover: #272546;
   --header: #605ca8;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #c1c0dd;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #e2e1ef;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #f2f2f8;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,17 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-.popover {
-  background-color: var(--back-main);
+a:link {
+  color: var(--link);
 }
-.popover-title {
-  background-color: #605ca8;
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
 }
-a,
-a:link,
-a:visited,
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -231,25 +251,29 @@ 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 {
+.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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-red-dark.css b/public/css/dist/skins/skin-red-dark.css
index 57a079fbb..6cbbaa26d 100644
--- a/public/css/dist/skins/skin-red-dark.css
+++ b/public/css/dist/skins/skin-red-dark.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #ac2d1e;
+  --button-primary: #802216;
+  --button-hover: #6b1c12;
   --header: #dd4b39;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #f3c2bc;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #fbe9e7;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #fffdfd;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,11 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-a,
-a:link,
-a:visited,
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -225,25 +251,29 @@ 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 {
+.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);
@@ -355,12 +385,6 @@ 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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-red-dark.min.css b/public/css/dist/skins/skin-red-dark.min.css
index 57a079fbb..6cbbaa26d 100644
--- a/public/css/dist/skins/skin-red-dark.min.css
+++ b/public/css/dist/skins/skin-red-dark.min.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #ac2d1e;
+  --button-primary: #802216;
+  --button-hover: #6b1c12;
   --header: #dd4b39;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #f3c2bc;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #fbe9e7;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #fffdfd;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,11 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-a,
-a:link,
-a:visited,
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -225,25 +251,29 @@ 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 {
+.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);
@@ -355,12 +385,6 @@ 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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-yellow-dark.css b/public/css/dist/skins/skin-yellow-dark.css
index 30f47ee42..31411c7d0 100644
--- a/public/css/dist/skins/skin-yellow-dark.css
+++ b/public/css/dist/skins/skin-yellow-dark.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #b06f09;
+  --button-primary: #7f5006;
+  --button-hover: #674105;
   --header: #f39c12;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #fad9a4;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #fdedd4;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #fef7ec;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,11 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-a,
-a:link,
-a:visited,
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -225,25 +251,29 @@ 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 {
+.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);
@@ -355,12 +385,6 @@ 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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/css/dist/skins/skin-yellow-dark.min.css b/public/css/dist/skins/skin-yellow-dark.min.css
index 30f47ee42..31411c7d0 100644
--- a/public/css/dist/skins/skin-yellow-dark.min.css
+++ b/public/css/dist/skins/skin-yellow-dark.min.css
@@ -170,12 +170,19 @@ a:visited {
   --background: #222;
   --back-main: #333;
   --back-sub: #444;
+  --button-default: #b06f09;
+  --button-primary: #7f5006;
+  --button-hover: #674105;
   --header: #f39c12;
   /* Use same as Header picker */
-  --text-main: #FFF;
-  --text-sub: #BBB;
-  --link: #ffffff;
-  /* Use same as Header picker */
+  --text-main: #BBB;
+  --text-sub: #9b9b9b;
+  --link: #fad9a4;
+  /* Use same as Header picker, lighten by 70% */
+  --visited-link: #fdedd4;
+  /* Use same as Header picker, lighten by 70% */
+  --hover-link: #fef7ec;
+  /* Use same as Header picker, lighten by 70% */
   --nav-link: #FFF;
   /* Use same as Header picker */
   --light-link: #fff;
@@ -188,6 +195,10 @@ a:visited {
   background: linear-gradient(to bottom, var(--header) 0%, var(--header) 100%);
   border-color: var(--header);
 }
+.bootstrap-table .fixed-table-container .table thead th .sortable {
+  color: var(--nav-link);
+}
+.thead,
 .navbar-nav > li > a:link {
   color: var(--nav-link);
 }
@@ -195,11 +206,26 @@ a:visited {
   background-color: var(--back-main);
   color: var(--text-main);
 }
-a,
-a:link,
-a:visited,
+a:link {
+  color: var(--link);
+}
+a:visited {
+  color: var(--nav-link);
+}
+a:hover {
+  color: var(--hover-link);
+}
 .btn-primary.hover {
-  color: var(--header);
+  color: var(--nav-link);
+}
+.small-box h3,
+.small-box p {
+  color: var(--nav-link) !important;
+}
+.small-box h3 a:hover,
+.small-box p a:hover {
+  text-decoration: none;
+  color: var(--nav-link) !important;
 }
 #accessoriesTable > tbody > tr > td > nobr > a > i.fa {
   color: var(--text-main);
@@ -225,25 +251,29 @@ 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 {
+.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);
@@ -355,12 +385,6 @@ 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);
@@ -401,20 +425,27 @@ 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);
 }
 a:link {
-  color: var(--header);
+  color: var(--link);
 }
 a:hover {
-  color: var(--light-link);
+  color: var(--hover-link);
+  text-decoration: underline;
 }
 a:visited {
-  color: var(--header);
+  color: var(--visited-link);
 }
 .row-striped {
   vertical-align: top;
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index dcb16dc24..8d26a8572 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=9f62f7b52ce7bc11ddfd",
     "/css/dist/skins/skin-contrast.css": "/css/dist/skins/skin-contrast.css?id=cf23e72b9c963c5ab23a",
     "/css/dist/skins/skin-green.css": "/css/dist/skins/skin-green.css?id=77ce26763889742cbb58",
-    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=26495da663d45d22a6a3",
+    "/css/dist/skins/skin-green-dark.css": "/css/dist/skins/skin-green-dark.css?id=df7904b384eef51b4431",
     "/css/dist/skins/skin-black.css": "/css/dist/skins/skin-black.css?id=87b54289d2c1370974d1",
     "/css/dist/skins/skin-black-dark.css": "/css/dist/skins/skin-black-dark.css?id=789c0a0fb854092dcfb7",
-    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=a0354af13a9e5f1fd9e4",
+    "/css/dist/skins/skin-red-dark.css": "/css/dist/skins/skin-red-dark.css?id=8a63f9f05840754366c7",
     "/css/dist/skins/skin-purple.css": "/css/dist/skins/skin-purple.css?id=3e904c2867143e27aebf",
-    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=491f44eecee65bbd8c4a",
+    "/css/dist/skins/skin-purple-dark.css": "/css/dist/skins/skin-purple-dark.css?id=1407068073f380de9439",
     "/css/dist/skins/skin-yellow.css": "/css/dist/skins/skin-yellow.css?id=11813086909e31b3d753",
-    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=c6961dc48135f991c756",
-    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=f53016b009b4adab0ac0",
-    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=1c319a5b2494db9c85a3",
+    "/css/dist/skins/skin-yellow-dark.css": "/css/dist/skins/skin-yellow-dark.css?id=26ddfee6c70b470c926c",
+    "/css/dist/skins/skin-blue-dark.css": "/css/dist/skins/skin-blue-dark.css?id=ae3535bb344876d7b067",
+    "/css/dist/skins/skin-orange-dark.css": "/css/dist/skins/skin-orange-dark.css?id=4429cb055e04857b61ae",
     "/css/dist/skins/skin-orange.css": "/css/dist/skins/skin-orange.css?id=d1cda85cbff0723be5f7",
     "/css/dist/all.css": "/css/dist/all.css?id=fc64989106daf3be016b",
-    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
-    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
-    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=26495da663d45d22a6a3",
+    "/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=df7904b384eef51b4431",
     "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=789c0a0fb854092dcfb7",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=f53016b009b4adab0ac0",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=c6961dc48135f991c756",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=a0354af13a9e5f1fd9e4",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=491f44eecee65bbd8c4a",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=1c319a5b2494db9c85a3",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=ae3535bb344876d7b067",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=26ddfee6c70b470c926c",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=8a63f9f05840754366c7",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=1407068073f380de9439",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=4429cb055e04857b61ae",
     "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=cf23e72b9c963c5ab23a",
     "/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 b96160398..61c7e6b20 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 17d79e9df..fda451ca6 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 94b6d0233..780013d40 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 9c61a4b8a..04cdecfc8 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 44b8c7d94..e67845983 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 f251972f5..bc8ca2e1f 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)
   }
 }