diff --git a/core/files.js b/core/files.js
index 493c90d9..d8bedd8a 100644
--- a/core/files.js
+++ b/core/files.js
@@ -30,7 +30,7 @@ var files = {
         'resources/angularjs/1.7.9/angular-touch.min.jsm': true,
 
         // Animate CSS
-        'resources/animate.css/3.7.2/animate.min.cssm': true,
+        'resources/animate.css/3.7.2/animate.min.css': true,
 
         // Backbone.js
         'resources/backbone.js/0.9.10/backbone-min.jsm': true,
@@ -41,11 +41,11 @@ var files = {
         'resources/bootstrap.js/4.4.1/bootstrap.min.jsm': true,
 
         // Bootstrap.css
-        'resources/bootstrap.css/3.3.7/bootstrap.min.cssm': true,
-        'resources/bootstrap.css/4.4.1/bootstrap.min.cssm': true,
+        'resources/bootstrap.css/3.3.7/bootstrap.min.css': true,
+        'resources/bootstrap.css/4.4.1/bootstrap.min.css': true,
 
         // bootstrap-slider
-        'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm': true,
+        'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css': true,
         'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.jsm': true,
 
         // clipboard.js
@@ -79,12 +79,12 @@ var files = {
         'resources/flv.js/1.5.0/flv.min.jsm': true,
 
         // Font Awesome
-        'resources/fontawesome/3.2.1/css/font-awesome.min.cssm': true,
-        'resources/fontawesome/3.2.1/css/font-awesome.cssm': true,
-        'resources/fontawesome/3.2.1/css/font-awesome-ie7.cssm': true,
-        'resources/fontawesome/3.2.1/css/font-awesome-ie7.min.cssm': true,
-        'resources/fontawesome/4.7.0/css/font-awesome.min.cssm': true,
-        'resources/fontawesome/5.7.2/css/all.cssm': true,
+        'resources/fontawesome/3.2.1/css/font-awesome.min.css': true,
+        'resources/fontawesome/3.2.1/css/font-awesome.css': true,
+        'resources/fontawesome/3.2.1/css/font-awesome-ie7.css': true,
+        'resources/fontawesome/3.2.1/css/font-awesome-ie7.min.css': true,
+        'resources/fontawesome/4.7.0/css/font-awesome.min.css': true,
+        'resources/fontawesome/5.7.2/css/all.css': true,
 
         // hls.js
         'resources/hls.js/0.13.2/hls.min.jsm': true,
@@ -145,7 +145,7 @@ var files = {
 
         // rickshaw
         'resources/rickshaw/1.6.6/rickshaw.min.jsm': true,
-        'resources/rickshaw/1.6.6/rickshaw.min.cssm': true,
+        'resources/rickshaw/1.6.6/rickshaw.min.css': true,
 
         // Cloudflare Rocket Loader
         'resources/rocket-loader/latest/rocket-loader.min.jsm': true,
@@ -155,7 +155,7 @@ var files = {
 
         // Select2
         'resources/select2/4.0.12/select2.full.min.jsm': true,
-        'resources/select2/4.0.12/select2.min.cssm': true,
+        'resources/select2/4.0.12/select2.min.css': true,
 
         // spin.js
         'resources/spin.js/2.3.2/spin.min.jsm': true,
@@ -167,7 +167,7 @@ var files = {
         'resources/swfobject/2.2/swfobject.jsm': true,
 
         // toastr.js
-        'resources/toastr.js/2.1.4/toastr.min.cssm': true,
+        'resources/toastr.js/2.1.4/toastr.min.css': true,
         'resources/toastr.js/2.1.4/toastr.min.jsm': true,
 
         // Twitter Bootstrap
diff --git a/core/request-analyzer.js b/core/request-analyzer.js
index 682506ca..3441be6a 100644
--- a/core/request-analyzer.js
+++ b/core/request-analyzer.js
@@ -149,7 +149,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
             let bundle = helpers.determineBundle(channelPath);
             if(bundle !== '') {
                 filename = channelPath.split('/').pop();
-                targetPath = targetPath + filename + 'm';
+                targetPath = ( RegExp('.*\.css$').test(filename) ) ? targetPath + filename : targetPath + filename + 'm';
             }
 
             if (requestAnalyzer.logging) {
diff --git a/core/resources.js b/core/resources.js
index 4bc0f5a9..1f0f5e37 100644
--- a/core/resources.js
+++ b/core/resources.js
@@ -42,7 +42,7 @@ var resources = {
     },
     // Animate CSS
     'animateCSS': {
-        'path': 'resources/animate.css/{version}/animate.min.cssm',
+        'path': 'resources/animate.css/{version}/animate.min.css',
         'type': 'text/css'
     },
     // Backbone.js
@@ -57,12 +57,12 @@ var resources = {
     },
     // Bootstrap.css
     'bootstrapCSS': {
-        'path': 'resources/bootstrap.css/{version}/bootstrap.min.cssm',
+        'path': 'resources/bootstrap.css/{version}/bootstrap.min.css',
         'type': 'text/css'
     },
     // bootstrap-slider (Slider for Bootstrap 3)
     'bootstrapSliderCSS': {
-        'path': 'resources/bootstrap-slider/{version}/bootstrap-slider.min.cssm',
+        'path': 'resources/bootstrap-slider/{version}/bootstrap-slider.min.css',
         'type': 'text/css'
     },
     'bootstrapSliderJS': {
@@ -107,12 +107,12 @@ var resources = {
 
     // Font Awesome
     'fontawesome': {
-        'path': 'resources/fontawesome/{version}/css/font-awesome.min.cssm',
+        'path': 'resources/fontawesome/{version}/css/font-awesome.min.css',
         'type': 'text/css'
     },
     // Font Awesome
     'fontawesome5': {
-        'path': 'resources/fontawesome/{version}/css/all.cssm',
+        'path': 'resources/fontawesome/{version}/css/all.css',
         'type': 'text/css'
     },
     // hls.js
@@ -206,7 +206,7 @@ var resources = {
         'type': 'application/javascript'
     },
     'rickshawCSS': {
-        'path': 'resources/rickshaw/{version}/rickshaw.min.cssm',
+        'path': 'resources/rickshaw/{version}/rickshaw.min.css',
         'type': 'text/css'
     },
     // Cloudflare Rocket Loader
@@ -221,7 +221,7 @@ var resources = {
     },
     // Select2
     'select2css': {
-        'path': 'resources/select2/{version}/select2.min.cssm',
+        'path': 'resources/select2/{version}/select2.min.css',
         'type': 'text/css'
     },
     'select2js': {
@@ -257,7 +257,7 @@ var resources = {
     },
     // toastr.js
     'toastrCSS': {
-        'path': 'resources/toastr.js/{version}/toastr.min.cssm',
+        'path': 'resources/toastr.js/{version}/toastr.min.css',
         'type': 'text/css'
     },
     // toastr.js
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index 6c31f53c..16d1bfe4 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -215,11 +215,11 @@ helpers.determineResourceName = function (filename) {
         return 'AngularJS Sanitize';
     case 'angular-touch.min.jsm':
         return 'AngularJS Touch';
-    case 'animate.min.cssm':
+    case 'animate.min.css':
         return 'Animate CSS'
     case 'backbone-min.jsm':
         return 'Backbone.js';
-    case 'bootstrap.min.cssm':
+    case 'bootstrap.min.css':
         return 'Bootstrap CSS';
     case 'bootstrap.min.css':
         return 'Bootstrap CSS';
@@ -227,7 +227,7 @@ helpers.determineResourceName = function (filename) {
         return 'Bootstrap JS';
     case 'bootstrap-slider.min.jsm':
         return 'bootstrap-slider JS';
-    case 'bootstrap-slider.min.cssm':
+    case 'bootstrap-slider.min.css':
         return 'bootstrap-slider CSS';
     case 'clipboard.min.jsm':
         return 'clipboard.js';
@@ -241,9 +241,9 @@ helpers.determineResourceName = function (filename) {
         return 'Ext Core';
     case 'flv.min.jsm':
         return 'flv.js';
-    case 'font-awesome.min.cssm':
+    case 'font-awesome.min.css':
         return 'Font Awesome';
-    case 'all.cssm':
+    case 'all.css':
         return 'Font Awesome';
     case 'hls.min.jsm':
         return 'hls.js';
@@ -275,7 +275,7 @@ helpers.determineResourceName = function (filename) {
         return 'P2P Media Loader Core';
     case 'page.min.jsm':
         return 'page.js';
-    case 'plyr.min.cssm':
+    case 'plyr.min.css':
         return 'plyr CSS';
     case 'prototype.jsm':
         return 'Prototype';
@@ -283,11 +283,11 @@ helpers.determineResourceName = function (filename) {
         return 'Rocket Loader';
     case 'rickshaw.min.jsm':
         return 'rickshaw JS';
-    case 'rickshaw.min.cssm':
+    case 'rickshaw.min.css':
         return 'rickshaw CSS';
     case 'scriptaculous.jsm':
         return 'Scriptaculous';
-    case 'select2.min.cssm':
+    case 'select2.min.css':
         return 'Select2 CSS';
     case 'select2.full.min.jsm':
         return 'Select2 JS';
@@ -297,7 +297,7 @@ helpers.determineResourceName = function (filename) {
         return 'Store.js';
     case 'swfobject.jsm':
         return 'SWFObject';
-    case 'toastr.min.cssm':
+    case 'toastr.min.css':
         return 'toastr.js';
     case 'toastr.min.jsm':
         return 'toastr.js';
diff --git a/pages/updates/updates.html b/pages/updates/updates.html
index ad3ad5d6..e327ce49 100644
--- a/pages/updates/updates.html
+++ b/pages/updates/updates.html
@@ -23,7 +23,7 @@
                         New in LocalCDN:
                     </div>
                         <ul>
-                            <li></li>
+                            <li>Fixed <a href="https://gitlab.com/nobody42/localcdn/-/issues/28">#28</a> and <a href="https://gitlab.com/nobody42/localcdn/-/issues/44">#44</a></li>
                         </ul>
                     <div class="topic-label">
                         Please update your uBlock/uMatrix rules
diff --git a/resources/animate.css/3.7.2/animate.min.cssm b/resources/animate.css/3.7.2/animate.min.css
similarity index 100%
rename from resources/animate.css/3.7.2/animate.min.cssm
rename to resources/animate.css/3.7.2/animate.min.css
diff --git a/resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm b/resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css
similarity index 100%
rename from resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm
rename to resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css
diff --git a/resources/bootstrap.css/3.3.7/bootstrap-theme.cssm b/resources/bootstrap.css/3.3.7/bootstrap-theme.css
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap-theme.cssm
rename to resources/bootstrap.css/3.3.7/bootstrap-theme.css
diff --git a/resources/bootstrap.css/3.3.7/bootstrap-theme.min.cssm b/resources/bootstrap.css/3.3.7/bootstrap-theme.min.css
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap-theme.min.cssm
rename to resources/bootstrap.css/3.3.7/bootstrap-theme.min.css
diff --git a/resources/bootstrap.css/3.3.7/bootstrap.cssm b/resources/bootstrap.css/3.3.7/bootstrap.css
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap.cssm
rename to resources/bootstrap.css/3.3.7/bootstrap.css
diff --git a/resources/bootstrap.css/3.3.7/bootstrap.min.cssm b/resources/bootstrap.css/3.3.7/bootstrap.min.css
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap.min.cssm
rename to resources/bootstrap.css/3.3.7/bootstrap.min.css
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-grid.cssm b/resources/bootstrap.css/4.4.1/bootstrap-grid.css
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-grid.cssm
rename to resources/bootstrap.css/4.4.1/bootstrap-grid.css
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-grid.min.cssm b/resources/bootstrap.css/4.4.1/bootstrap-grid.min.css
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-grid.min.cssm
rename to resources/bootstrap.css/4.4.1/bootstrap-grid.min.css
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-reboot.cssm b/resources/bootstrap.css/4.4.1/bootstrap-reboot.css
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-reboot.cssm
rename to resources/bootstrap.css/4.4.1/bootstrap-reboot.css
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-reboot.min.cssm b/resources/bootstrap.css/4.4.1/bootstrap-reboot.min.css
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-reboot.min.cssm
rename to resources/bootstrap.css/4.4.1/bootstrap-reboot.min.css
diff --git a/resources/bootstrap.css/4.4.1/bootstrap.cssm b/resources/bootstrap.css/4.4.1/bootstrap.css
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap.cssm
rename to resources/bootstrap.css/4.4.1/bootstrap.css
diff --git a/resources/bootstrap.css/4.4.1/bootstrap.min.cssm b/resources/bootstrap.css/4.4.1/bootstrap.min.css
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap.min.cssm
rename to resources/bootstrap.css/4.4.1/bootstrap.min.css
diff --git a/resources/findify-bundle/6.9.15/raw.cssm b/resources/findify-bundle/6.9.15/raw.css
similarity index 100%
rename from resources/findify-bundle/6.9.15/raw.cssm
rename to resources/findify-bundle/6.9.15/raw.css
diff --git a/resources/findify-bundle/6.9.15/styles.cssm b/resources/findify-bundle/6.9.15/styles.css
similarity index 100%
rename from resources/findify-bundle/6.9.15/styles.cssm
rename to resources/findify-bundle/6.9.15/styles.css
diff --git a/resources/fontawesome/3.2.1/css/font-awesome-ie7.cssm b/resources/fontawesome/3.2.1/css/font-awesome-ie7.css
similarity index 100%
rename from resources/fontawesome/3.2.1/css/font-awesome-ie7.cssm
rename to resources/fontawesome/3.2.1/css/font-awesome-ie7.css
diff --git a/resources/fontawesome/3.2.1/css/font-awesome-ie7.min.cssm b/resources/fontawesome/3.2.1/css/font-awesome-ie7.min.css
similarity index 100%
rename from resources/fontawesome/3.2.1/css/font-awesome-ie7.min.cssm
rename to resources/fontawesome/3.2.1/css/font-awesome-ie7.min.css
diff --git a/resources/fontawesome/3.2.1/css/font-awesome.cssm b/resources/fontawesome/3.2.1/css/font-awesome.css
similarity index 100%
rename from resources/fontawesome/3.2.1/css/font-awesome.cssm
rename to resources/fontawesome/3.2.1/css/font-awesome.css
diff --git a/resources/fontawesome/3.2.1/css/font-awesome.min.cssm b/resources/fontawesome/3.2.1/css/font-awesome.min.css
similarity index 100%
rename from resources/fontawesome/3.2.1/css/font-awesome.min.cssm
rename to resources/fontawesome/3.2.1/css/font-awesome.min.css
diff --git a/resources/fontawesome/4.7.0/css/font-awesome.cssm b/resources/fontawesome/4.7.0/css/font-awesome.css
similarity index 100%
rename from resources/fontawesome/4.7.0/css/font-awesome.cssm
rename to resources/fontawesome/4.7.0/css/font-awesome.css
diff --git a/resources/fontawesome/4.7.0/css/font-awesome.min.cssm b/resources/fontawesome/4.7.0/css/font-awesome.min.css
similarity index 100%
rename from resources/fontawesome/4.7.0/css/font-awesome.min.cssm
rename to resources/fontawesome/4.7.0/css/font-awesome.min.css
diff --git a/resources/fontawesome/5.7.2/css/all.cssm b/resources/fontawesome/5.7.2/css/all.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/all.cssm
rename to resources/fontawesome/5.7.2/css/all.css
diff --git a/resources/fontawesome/5.7.2/css/all.min.cssm b/resources/fontawesome/5.7.2/css/all.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/all.min.cssm
rename to resources/fontawesome/5.7.2/css/all.min.css
diff --git a/resources/fontawesome/5.7.2/css/brands.cssm b/resources/fontawesome/5.7.2/css/brands.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/brands.cssm
rename to resources/fontawesome/5.7.2/css/brands.css
diff --git a/resources/fontawesome/5.7.2/css/brands.min.cssm b/resources/fontawesome/5.7.2/css/brands.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/brands.min.cssm
rename to resources/fontawesome/5.7.2/css/brands.min.css
diff --git a/resources/fontawesome/5.7.2/css/fontawesome.cssm b/resources/fontawesome/5.7.2/css/fontawesome.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/fontawesome.cssm
rename to resources/fontawesome/5.7.2/css/fontawesome.css
diff --git a/resources/fontawesome/5.7.2/css/fontawesome.min.cssm b/resources/fontawesome/5.7.2/css/fontawesome.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/fontawesome.min.cssm
rename to resources/fontawesome/5.7.2/css/fontawesome.min.css
diff --git a/resources/fontawesome/5.7.2/css/regular.cssm b/resources/fontawesome/5.7.2/css/regular.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/regular.cssm
rename to resources/fontawesome/5.7.2/css/regular.css
diff --git a/resources/fontawesome/5.7.2/css/regular.min.cssm b/resources/fontawesome/5.7.2/css/regular.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/regular.min.cssm
rename to resources/fontawesome/5.7.2/css/regular.min.css
diff --git a/resources/fontawesome/5.7.2/css/solid.cssm b/resources/fontawesome/5.7.2/css/solid.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/solid.cssm
rename to resources/fontawesome/5.7.2/css/solid.css
diff --git a/resources/fontawesome/5.7.2/css/solid.min.cssm b/resources/fontawesome/5.7.2/css/solid.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/solid.min.cssm
rename to resources/fontawesome/5.7.2/css/solid.min.css
diff --git a/resources/fontawesome/5.7.2/css/svg-with-js.cssm b/resources/fontawesome/5.7.2/css/svg-with-js.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/svg-with-js.cssm
rename to resources/fontawesome/5.7.2/css/svg-with-js.css
diff --git a/resources/fontawesome/5.7.2/css/svg-with-js.min.cssm b/resources/fontawesome/5.7.2/css/svg-with-js.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/svg-with-js.min.cssm
rename to resources/fontawesome/5.7.2/css/svg-with-js.min.css
diff --git a/resources/fontawesome/5.7.2/css/v4-shims.cssm b/resources/fontawesome/5.7.2/css/v4-shims.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/v4-shims.cssm
rename to resources/fontawesome/5.7.2/css/v4-shims.css
diff --git a/resources/fontawesome/5.7.2/css/v4-shims.min.cssm b/resources/fontawesome/5.7.2/css/v4-shims.min.css
similarity index 100%
rename from resources/fontawesome/5.7.2/css/v4-shims.min.cssm
rename to resources/fontawesome/5.7.2/css/v4-shims.min.css
diff --git a/resources/rickshaw/1.6.6/rickshaw.min.cssm b/resources/rickshaw/1.6.6/rickshaw.min.css
similarity index 100%
rename from resources/rickshaw/1.6.6/rickshaw.min.cssm
rename to resources/rickshaw/1.6.6/rickshaw.min.css
diff --git a/resources/select2/4.0.12/select2.min.cssm b/resources/select2/4.0.12/select2.min.css
similarity index 100%
rename from resources/select2/4.0.12/select2.min.cssm
rename to resources/select2/4.0.12/select2.min.css
diff --git a/resources/toastr.js/2.1.4/toastr.min.cssm b/resources/toastr.js/2.1.4/toastr.min.css
similarity index 100%
rename from resources/toastr.js/2.1.4/toastr.min.cssm
rename to resources/toastr.js/2.1.4/toastr.min.css