diff --git a/config/version.php b/config/version.php
index fc65702a03..01549c1e9c 100644
--- a/config/version.php
+++ b/config/version.php
@@ -1,10 +1,10 @@
 <?php
 return array (
-  'app_version' => 'v5.1.4',
-  'full_app_version' => 'v5.1.4 - build 5886-g9f3a8a43c',
-  'build_version' => '5886',
+  'app_version' => 'v5.1.5',
+  'full_app_version' => 'v5.1.5 - build 6029-gb8c356443',
+  'build_version' => '6029',
   'prerelease_version' => '',
-  'hash_version' => 'g9f3a8a43c',
-  'full_hash' => 'v5.1.3-23-g9f3a8a43c',
+  'hash_version' => 'gb8c356443',
+  'full_hash' => 'v5.1.5-125-gb8c356443',
   'branch' => 'master',
 );
\ No newline at end of file
diff --git a/public/css/dist/skins/skin-black.min.css b/public/css/dist/skins/skin-black.min.css
new file mode 100644
index 0000000000..43df00b8dd
Binary files /dev/null and b/public/css/dist/skins/skin-black.min.css differ
diff --git a/public/css/dist/skins/skin-blue.min.css b/public/css/dist/skins/skin-blue.min.css
new file mode 100644
index 0000000000..b0733416f3
Binary files /dev/null and b/public/css/dist/skins/skin-blue.min.css differ
diff --git a/public/css/dist/skins/skin-green.min.css b/public/css/dist/skins/skin-green.min.css
new file mode 100644
index 0000000000..6a4edbcf59
Binary files /dev/null and b/public/css/dist/skins/skin-green.min.css differ
diff --git a/public/css/dist/skins/skin-orange.min.css b/public/css/dist/skins/skin-orange.min.css
new file mode 100644
index 0000000000..0670d37774
Binary files /dev/null and b/public/css/dist/skins/skin-orange.min.css differ
diff --git a/public/css/dist/skins/skin-purple.min.css b/public/css/dist/skins/skin-purple.min.css
new file mode 100644
index 0000000000..6289fadf73
Binary files /dev/null and b/public/css/dist/skins/skin-purple.min.css differ
diff --git a/public/css/dist/skins/skin-red.min.css b/public/css/dist/skins/skin-red.min.css
new file mode 100644
index 0000000000..3fd32d8bbb
Binary files /dev/null and b/public/css/dist/skins/skin-red.min.css differ
diff --git a/public/css/dist/skins/skin-yellow.min.css b/public/css/dist/skins/skin-yellow.min.css
new file mode 100644
index 0000000000..3f3b564356
Binary files /dev/null and b/public/css/dist/skins/skin-yellow.min.css differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index 3d993150e4..7fa4dfa64c 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -21,18 +21,25 @@
     "/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=0d9935d834b39386a82e",
-    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=97ec6f217441ac2f79ed",
-    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=8f7aed152883df9c6f5e",
-    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=23a14ac3cfe978b19c89",
-    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=bb408a66967c2c81f420",
-    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=39058e01caf0aeb39624",
-    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=b3d2ebfcb2541fa8e9ec",
-    "/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/dist/signature-pad.min.css": "/css/dist/signature-pad.min.css?id=6a89d3cd901305e66ced",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=1e77fde04b3f42432581",
     "/js/build/vendor.js": "/js/build/vendor.js?id=b93877b4a88a76e1b18b",
     "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=fd6e727609678bf04984",
-    "/js/dist/all.js": "/js/dist/all.js?id=dde965016a515da2f8d2"
+    "/js/dist/all.js": "/js/dist/all.js?id=dde965016a515da2f8d2",
+    "/css/dist/skins/skin-green.min.css": "/css/dist/skins/skin-green.min.css?id=eee1d10b6d7db576428e",
+    "/css/dist/skins/skin-green-dark.min.css": "/css/dist/skins/skin-green-dark.min.css?id=0d9935d834b39386a82e",
+    "/css/dist/skins/skin-black.min.css": "/css/dist/skins/skin-black.min.css?id=39250963ef83dac17f77",
+    "/css/dist/skins/skin-black-dark.min.css": "/css/dist/skins/skin-black-dark.min.css?id=97ec6f217441ac2f79ed",
+    "/css/dist/skins/skin-blue.min.css": "/css/dist/skins/skin-blue.min.css?id=2a741dd5409582c0af89",
+    "/css/dist/skins/skin-blue-dark.min.css": "/css/dist/skins/skin-blue-dark.min.css?id=8f7aed152883df9c6f5e",
+    "/css/dist/skins/skin-yellow.min.css": "/css/dist/skins/skin-yellow.min.css?id=67a30cff63473dade0e3",
+    "/css/dist/skins/skin-yellow-dark.min.css": "/css/dist/skins/skin-yellow-dark.min.css?id=23a14ac3cfe978b19c89",
+    "/css/dist/skins/skin-red.min.css": "/css/dist/skins/skin-red.min.css?id=817384969ed226028416",
+    "/css/dist/skins/skin-red-dark.min.css": "/css/dist/skins/skin-red-dark.min.css?id=bb408a66967c2c81f420",
+    "/css/dist/skins/skin-purple.min.css": "/css/dist/skins/skin-purple.min.css?id=b8be296ada5cbc4563fa",
+    "/css/dist/skins/skin-purple-dark.min.css": "/css/dist/skins/skin-purple-dark.min.css?id=39058e01caf0aeb39624",
+    "/css/dist/skins/skin-orange.min.css": "/css/dist/skins/skin-orange.min.css?id=39eb843599c275696aed",
+    "/css/dist/skins/skin-orange-dark.min.css": "/css/dist/skins/skin-orange-dark.min.css?id=b3d2ebfcb2541fa8e9ec",
+    "/css/dist/skins/skin-contrast.min.css": "/css/dist/skins/skin-contrast.min.css?id=d7996d850e8bcdc4e167"
 }
diff --git a/resources/lang/en/admin/settings/general.php b/resources/lang/en/admin/settings/general.php
index 553d030308..e15162210e 100644
--- a/resources/lang/en/admin/settings/general.php
+++ b/resources/lang/en/admin/settings/general.php
@@ -15,7 +15,7 @@ return array(
     'alert_interval'			=> 'Expiring Alerts Threshold (in days)',
     'alert_inv_threshold'		=> 'Inventory Alert Threshold',
     'allow_user_skin'           => 'Allow user skin',
-    'allow_user_skin_help_text' => 'Checking this box will allow a user to change the site skin for himself.' ,
+    'allow_user_skin_help_text' => 'Checking this box will allow a user to override the UI skin with a different one.' ,
     'asset_ids'					=> 'Asset IDs',
     'audit_interval'            => 'Audit Interval',
     'audit_interval_help'       => 'If you are required to regularly physically audit your assets, enter the interval in months.',
diff --git a/resources/views/layouts/default.blade.php b/resources/views/layouts/default.blade.php
index cd159112ef..0ac2479f99 100644
--- a/resources/views/layouts/default.blade.php
+++ b/resources/views/layouts/default.blade.php
@@ -30,7 +30,7 @@
     {{-- stylesheets --}}
     <link rel="stylesheet" href="{{ url(mix('css/dist/all.css')) }}">
     @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '')
-        <link rel="stylesheet" href="{{ mix('css/dist/skins/skin-'.Auth::user()->present()->skin.'.css') }}">
+        <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.Auth::user()->present()->skin.'.min.css')) }}">
     @else
     <link rel="stylesheet" href="{{ url(mix('css/dist/skins/skin-'.($snipeSettings->skin!='' ? $snipeSettings->skin : 'blue').'.css')) }}">
     @endif
@@ -65,12 +65,6 @@
     </style>
     @endif
 
-      @if (($snipeSettings) && ($snipeSettings->custom_css))
-          <style>
-              {!! $snipeSettings->show_custom_css() !!}
-          </style>
-      @endif
-
 
     <script nonce="{{ csrf_token() }}">
           window.snipeit = {
@@ -88,7 +82,13 @@
 
 
   </head>
-  <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
+
+  @if (($snipeSettings) && ($snipeSettings->allow_user_skin==1) && Auth::check() && Auth::user()->present()->skin != '')
+      <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? Auth::user()->present()->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
+  @else
+      <body class="sidebar-mini skin-{{ $snipeSettings->skin!='' ? $snipeSettings->skin : 'blue' }} {{ (session('menu_state')!='open') ? 'sidebar-mini sidebar-collapse' : ''  }}">
+  @endif
+
   <a class="skip-main" href="#main">Skip to main content</a>
     <div class="wrapper">
 
diff --git a/webpack.mix.js b/webpack.mix.js
index 90895d3779..f486da1eab 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -37,21 +37,7 @@ mix
 mix.copy(['./node_modules/icheck/skins/minimal/blue.png',
     './node_modules/icheck/skins/minimal/blue@2x.png'], './public/css');
 
-/**
- * Copy, minify and version skins
- */
-mix
-    .minify([
-        './public/css/dist/skins/skin-green-dark.css',
-        './public/css/dist/skins/skin-black-dark.css',
-        './public/css/dist/skins/skin-blue-dark.css',
-        './public/css/dist/skins/skin-yellow-dark.css',
-        './public/css/dist/skins/skin-red-dark.css',
-        './public/css/dist/skins/skin-purple-dark.css',
-        './public/css/dist/skins/skin-orange-dark.css',
-        './public/css/dist/skins/skin-contrast.css'
-    ])
-    .version();
+
 /**
  * Copy, minify and version signature-pad.css
  */
@@ -160,5 +146,26 @@ mix.combine(
     ).version();
 
 
-
+/**
+ * Copy, minify and version skins
+ */
+mix
+    .minify([
+        './public/css/dist/skins/skin-green.css',
+        './public/css/dist/skins/skin-green-dark.css',
+        './public/css/dist/skins/skin-black.css',
+        './public/css/dist/skins/skin-black-dark.css',
+        './public/css/dist/skins/skin-blue.css',
+        './public/css/dist/skins/skin-blue-dark.css',
+        './public/css/dist/skins/skin-yellow.css',
+        './public/css/dist/skins/skin-yellow-dark.css',
+        './public/css/dist/skins/skin-red.css',
+        './public/css/dist/skins/skin-red-dark.css',
+        './public/css/dist/skins/skin-purple.css',
+        './public/css/dist/skins/skin-purple-dark.css',
+        './public/css/dist/skins/skin-orange.css',
+        './public/css/dist/skins/skin-orange-dark.css',
+        './public/css/dist/skins/skin-contrast.css'
+    ])
+    .version();