diff --git a/public/css/all.css b/public/css/all.css
index a4e33d959b..e39eb34d6e 100644
Binary files a/public/css/all.css and b/public/css/all.css differ
diff --git a/public/js/build/all.js b/public/js/build/all.js
index 29c6a8c817..45186d6e7a 100644
Binary files a/public/js/build/all.js and b/public/js/build/all.js differ
diff --git a/public/js/build/vue.js b/public/js/build/vue.js
index e908f7ec98..26fc53ee50 100644
Binary files a/public/js/build/vue.js and b/public/js/build/vue.js differ
diff --git a/public/js/build/vue.js.map b/public/js/build/vue.js.map
index eb241f3fc9..2b62c44ca5 100644
Binary files a/public/js/build/vue.js.map and b/public/js/build/vue.js.map differ
diff --git a/public/js/dist/all.js b/public/js/dist/all.js
index 4521f8c3b0..0c220928d6 100644
Binary files a/public/js/dist/all.js and b/public/js/dist/all.js differ
diff --git a/public/js/dist/bootstrap-table.js b/public/js/dist/bootstrap-table.js
index 3d732e3889..b458476852 100644
Binary files a/public/js/dist/bootstrap-table.js and b/public/js/dist/bootstrap-table.js differ
diff --git a/public/mix-manifest.json b/public/mix-manifest.json
index df944972c3..8f9165bc50 100644
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@@ -1,21 +1,21 @@
 {
-    "/js/build/vue.js": "/js/build/vue.js?id=f89ed45026610831d45d",
+    "/js/build/vue.js": "/js/build/vue.js?id=8a5d892d5cd2d6195c15",
     "/css/build/AdminLTE.css": "/css/build/AdminLTE.css?id=5002486f605469c322ed",
     "/css/build/app.css": "/css/build/app.css?id=0c4d55f9abe9a4efe526",
-    "/js/build/vue.js.map": "/js/build/vue.js.map?id=3aae6e8f609e5cd2842a",
+    "/js/build/vue.js.map": "/js/build/vue.js.map?id=770b634768b61b2b8104",
     "/css/build/AdminLTE.css.map": "/css/build/AdminLTE.css.map?id=fa40c591a5b361cb0761",
     "/css/build/app.css.map": "/css/build/app.css.map?id=5a1bc8c3be0d3da37d0a",
-    "/css/all.css": "/css/all.css?id=0a9b14700366dedbfab4",
+    "/css/all.css": "/css/all.css?id=2d7f3b6654a518d7e0c5",
     "/css/skins/skin-green-dark.min.css": "/css/skins/skin-green-dark.min.css?id=1039ae0e198a7f3d8da7",
     "/css/skins/skin-orange-dark.min.css": "/css/skins/skin-orange-dark.min.css?id=9a461970f7ab07f40847",
     "/css/skins/skin-red-dark.min.css": "/css/skins/skin-red-dark.min.css?id=99f90bbd653d7db10795",
     "/css/signature-pad.css": "/css/signature-pad.css?id=6a89d3cd901305e66ced",
     "/css/signature-pad.min.css": "/css/signature-pad.min.css?id=6a89d3cd901305e66ced",
-    "/css/blue.png": "/css/blue.png?id=e83a6c29e04fe851f212",
-    "/css/blue@2x.png": "/css/blue@2x.png?id=51135dd4d24f88f5de0b",
-    "/js/dist/all.js": "/js/dist/all.js?id=95ade195248bad430b49",
-    "/js/build/all.js": "/js/build/all.js?id=95ade195248bad430b49",
-    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=7223478ba9bf2c6dfb4f",
+    "/css/blue.png": "/css/blue.png?id=4c85d6a97173123bd14a",
+    "/css/blue@2x.png": "/css/blue@2x.png?id=62c67c6a822439e8a4ac",
+    "/js/dist/all.js": "/js/dist/all.js?id=f68abd82226bf29870c0",
+    "/js/build/all.js": "/js/build/all.js?id=f68abd82226bf29870c0",
+    "/js/dist/bootstrap-table.js": "/js/dist/bootstrap-table.js?id=6804bda467f56a251e32",
     "/js/dist/bootstrap-table-simple-view.js": "/js/dist/bootstrap-table-simple-view.js?id=3926b8f4aaad6ca20d31",
     "/css/dist/bootstrap-table.css": "/css/dist/bootstrap-table.css?id=8340c60bfbc12c34d2e6"
 }
diff --git a/resources/views/importer/import.blade.php b/resources/views/importer/import.blade.php
index b32372833e..bd830cc055 100644
--- a/resources/views/importer/import.blade.php
+++ b/resources/views/importer/import.blade.php
@@ -8,9 +8,6 @@
 
 {{-- Page content --}}
 @section('content')
-
-    <link rel="stylesheet" type="text/css" href="{{ asset('css/lib/jquery.fileupload.css') }}">
-
     {{-- Hide importer until vue has rendered it, if we continue using vue for other things we should move this higher in the style --}}
     <style>
         [v-cloak] {
diff --git a/resources/views/layouts/basic.blade.php b/resources/views/layouts/basic.blade.php
index f1860b9803..1e9b3334b5 100644
--- a/resources/views/layouts/basic.blade.php
+++ b/resources/views/layouts/basic.blade.php
@@ -9,10 +9,8 @@
     <title>{{ ($snipeSettings) && ($snipeSettings->site_name) ? $snipeSettings->site_name : 'Snipe-IT' }}</title>
 
 
-    <!-- Select2 -->
-    <link rel="stylesheet" href="{{ url(asset('js/plugins/select2/select2.min.css')) }}">
-
-    <link rel="stylesheet" href="{{ url(mix('css/all.css')) }}">
+    {{-- stylesheets --}}
+    <link rel="stylesheet" href="{{ mix('css/all.css') }}">
     <link rel="shortcut icon" type="image/ico" href="{{ url(asset('favicon.ico')) }}">
 
 
diff --git a/resources/views/users/view.blade.php b/resources/views/users/view.blade.php
index 593805308f..20b9b7fd4d 100755
--- a/resources/views/users/view.blade.php
+++ b/resources/views/users/view.blade.php
@@ -422,9 +422,6 @@
               </div>
             </div>
 
-            <link rel="stylesheet" type="text/css" href="{{ asset('css/lib/jquery.fileupload.css') }}">
-            <link rel="stylesheet" type="text/css" href="{{ asset('css/lib/jquery.fileupload-ui.css') }}">
-
             <div class="col-md-12 col-sm-12">
               <div class="table-responsive">
                 <table id="files-table" class="display table table-striped">
diff --git a/resources/views/vendor/passport/authorize.blade.php b/resources/views/vendor/passport/authorize.blade.php
index 7dcc9b4ade..663621a6ec 100644
--- a/resources/views/vendor/passport/authorize.blade.php
+++ b/resources/views/vendor/passport/authorize.blade.php
@@ -6,10 +6,9 @@
     <meta name="viewport" content="width=device-width, initial-scale=1">
 
     <title>{{ config('app.name') }} - Authorization</title>
-
-    <!-- Styles -->
-    <link href="/css/app.css" rel="stylesheet">
-
+    
+    {{-- stylesheets --}}
+    <link rel="stylesheet" href="{{ mix('css/all.css') }}">
     <style>
         .passport-authorize .container {
             margin-top: 30px;
diff --git a/webpack.mix.js b/webpack.mix.js
index 1e4a8fc3a3..e4c1927ab7 100644
--- a/webpack.mix.js
+++ b/webpack.mix.js
@@ -19,6 +19,8 @@ mix
       "./node_modules/icheck/skins/minimal/minimal.css",
       "./node_modules/bootstrap-datepicker/dist/css/bootstrap-datepicker.standalone.css",
       "./node_modules/bootstrap-colorpicker/dist/css/bootstrap-colorpicker.css",
+      "./node_modules/blueimp-file-upload/css/jquery.fileupload.css",
+      "./node_modules/blueimp-file-upload/css/jquery.fileupload-ui.css",      
       "./public/css/build/app.css",
     ],
     "./public/css/all.css"