diff --git a/core/files.js b/core/files.js
index 989aafc3..83f3878c 100644
--- a/core/files.js
+++ b/core/files.js
@@ -34,15 +34,15 @@ var files = {
         'resources/backbone.js/1.4.0/backbone-min.jsm': true,
 
         // Bootstrap.js
-        'resources/bootstrap.js/3.3.7/bootstrap.min.js': true,
-        'resources/bootstrap.js/4.4.1/bootstrap.min.js': true,
+        'resources/bootstrap.js/3.3.7/bootstrap.min.jsm': true,
+        'resources/bootstrap.js/4.4.1/bootstrap.min.jsm': true,
 
         // Bootstrap.css
-        'resources/bootstrap.css/3.3.7/bootstrap.min.css': true,
-        'resources/bootstrap.css/4.4.1/bootstrap.min.css': true,
+        'resources/bootstrap.css/3.3.7/bootstrap.min.cssm': true,
+        'resources/bootstrap.css/4.4.1/bootstrap.min.cssm': true,
 
         // bootstrap-slider
-        'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css': true,
+        'resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm': true,
 
         // Dojo
         'resources/dojo/1.14.1/dojo/dojo.jsm': true,
@@ -56,18 +56,18 @@ var files = {
         'resources/ext-core/3.1.0/ext-core.jsm': true,
 
         // Finify bundle
-        'resources/findify-bundle/6.9.15/bundle.js': true,
-        'resources/findify-bundle/6.9.15/components.js': true,
-        'resources/findify-bundle/6.9.15/config.js': true,
-        'resources/findify-bundle/6.9.15/initializer.js': true,
-        'resources/findify-bundle/6.9.15/polyfill.js': true,
-        'resources/findify-bundle/6.9.15/vendors~components~initializer.js': true,
-        'resources/findify-bundle/6.9.15/vendors~initializer.js': true,
-        'resources/findify-bundle/6.9.15/vendors~sentry.js': true,
+        'resources/findify-bundle/6.9.15/bundle.jsm': true,
+        'resources/findify-bundle/6.9.15/components.jsm': true,
+        'resources/findify-bundle/6.9.15/config.jsm': true,
+        'resources/findify-bundle/6.9.15/initializer.jsm': true,
+        'resources/findify-bundle/6.9.15/polyfill.jsm': true,
+        'resources/findify-bundle/6.9.15/vendors~components~initializer.jsm': true,
+        'resources/findify-bundle/6.9.15/vendors~initializer.jsm': true,
+        'resources/findify-bundle/6.9.15/vendors~sentry.jsm': true,
 
         // Font Awesome
-        'resources/fontawesome/4.7.0/css/font-awesome.min.css': true,
-        'resources/fontawesome/5.7.2/css/all.css': true,
+        'resources/fontawesome/4.7.0/css/font-awesome.min.cssm': true,
+        'resources/fontawesome/5.7.2/css/all.cssm': true,
 
         // jQuery
         'resources/jquery/1.8.3/jquery.min.jsm': true,
diff --git a/core/request-analyzer.js b/core/request-analyzer.js
index 1cc0c266..79b31858 100644
--- a/core/request-analyzer.js
+++ b/core/request-analyzer.js
@@ -126,7 +126,7 @@ requestAnalyzer._findLocalTarget = function (resourceMappings, basePath, channel
             bundle = helpers.determineBundle(channelPath);
             if(bundle !== '') {
                 filename = channelPath.split('/').pop();
-                targetPath = targetPath + filename;
+                targetPath = targetPath + filename + 'm';
             }
 
             // Prepare and return a local target.
diff --git a/core/resources.js b/core/resources.js
index 81d8ef39..f69a632a 100644
--- a/core/resources.js
+++ b/core/resources.js
@@ -47,17 +47,17 @@ var resources = {
     },
     // Bootstrap.js
     'bootstrapJS': {
-        'path': 'resources/bootstrap.js/{version}/bootstrap.min.js',
+        'path': 'resources/bootstrap.js/{version}/bootstrap.min.jsm',
         'type': 'application/javascript'
     },
     // Bootstrap.css
     'bootstrapCSS': {
-        'path': 'resources/bootstrap.css/{version}/bootstrap.min.css',
+        'path': 'resources/bootstrap.css/{version}/bootstrap.min.cssm',
         'type': 'text/css'
     },
     // bootstrap-slider (Slider for Bootstrap 3)
     'bootstrapSlider': {
-        'path': 'resources/bootstrap-slider/{version}/bootstrap-slider.min.css',
+        'path': 'resources/bootstrap-slider/{version}/bootstrap-slider.min.cssm',
         'type': 'text/css'
     },
     // Dojo
@@ -82,12 +82,12 @@ var resources = {
     },
     // Font Awesome
     'fontawesome4': {
-        'path': 'resources/fontawesome/{version}/css/font-awesome.min.css',
+        'path': 'resources/fontawesome/{version}/css/font-awesome.min.cssm',
         'type': 'text/css'
     },
     // Font Awesome
     'fontawesome5': {
-        'path': 'resources/fontawesome/{version}/css/all.css',
+        'path': 'resources/fontawesome/{version}/css/all.cssm',
         'type': 'text/css'
     },
     // jQuery
diff --git a/modules/internal/helpers.js b/modules/internal/helpers.js
index dfd6e0a5..132e2763 100644
--- a/modules/internal/helpers.js
+++ b/modules/internal/helpers.js
@@ -210,9 +210,9 @@ helpers.determineResourceName = function (filename) {
         return 'Ember.js';
     case 'ext-core.jsm':
         return 'Ext Core';
-    case 'font-awesome.min.css':
+    case 'font-awesome.min.cssm':
         return 'Font Awesome';
-    case 'all.css':
+    case 'all.cssm':
         return 'Font Awesome';
     case 'jquery.min.jsm':
         return 'jQuery';
@@ -240,11 +240,11 @@ helpers.determineResourceName = function (filename) {
         return 'Web Font Loader';
     case 'vue.jsm':
         return 'Vue.js';
-    case 'bootstrap.min.css':
+    case 'bootstrap.min.cssm':
         return 'Bootstrap CSS';
-    case 'bootstrap.min.js':
+    case 'bootstrap.min.jsm':
         return 'Bootstrap JS';
-    case 'bootstrap-slider.min.css':
+    case 'bootstrap-slider.min.cssm':
         return 'bootstrap-slider';
     default:
         return 'Unknown';
diff --git a/pages/updates/updates.html b/pages/updates/updates.html
index c1729eab..9c66cdc3 100644
--- a/pages/updates/updates.html
+++ b/pages/updates/updates.html
@@ -28,6 +28,7 @@
                             <li>Added detection of framework-bundles (e.g. Findify)</li>
                             <li>Fixed Moment.js (File extension and detection of resource name)</li>
                             <li>Added Vue.js v1.0.28 and page.js v1.7.1</li>
+                            <li>Fixed file extensions to prevent warnigns of Mozillas validation tests</li>
                         </ul>
                     <div class="topic-label">
                         Please update your uBlock/uMatrix rules
diff --git a/resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css b/resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm
similarity index 100%
rename from resources/bootstrap-slider/10.6.2/bootstrap-slider.min.css
rename to resources/bootstrap-slider/10.6.2/bootstrap-slider.min.cssm
diff --git a/resources/bootstrap.css/3.3.7/bootstrap-theme.css b/resources/bootstrap.css/3.3.7/bootstrap-theme.cssm
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap-theme.css
rename to resources/bootstrap.css/3.3.7/bootstrap-theme.cssm
diff --git a/resources/bootstrap.css/3.3.7/bootstrap-theme.min.css b/resources/bootstrap.css/3.3.7/bootstrap-theme.min.cssm
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap-theme.min.css
rename to resources/bootstrap.css/3.3.7/bootstrap-theme.min.cssm
diff --git a/resources/bootstrap.css/3.3.7/bootstrap.css b/resources/bootstrap.css/3.3.7/bootstrap.cssm
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap.css
rename to resources/bootstrap.css/3.3.7/bootstrap.cssm
diff --git a/resources/bootstrap.css/3.3.7/bootstrap.min.css b/resources/bootstrap.css/3.3.7/bootstrap.min.cssm
similarity index 100%
rename from resources/bootstrap.css/3.3.7/bootstrap.min.css
rename to resources/bootstrap.css/3.3.7/bootstrap.min.cssm
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-grid.css b/resources/bootstrap.css/4.4.1/bootstrap-grid.cssm
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-grid.css
rename to resources/bootstrap.css/4.4.1/bootstrap-grid.cssm
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-grid.min.css b/resources/bootstrap.css/4.4.1/bootstrap-grid.min.cssm
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-grid.min.css
rename to resources/bootstrap.css/4.4.1/bootstrap-grid.min.cssm
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-reboot.css b/resources/bootstrap.css/4.4.1/bootstrap-reboot.cssm
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-reboot.css
rename to resources/bootstrap.css/4.4.1/bootstrap-reboot.cssm
diff --git a/resources/bootstrap.css/4.4.1/bootstrap-reboot.min.css b/resources/bootstrap.css/4.4.1/bootstrap-reboot.min.cssm
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap-reboot.min.css
rename to resources/bootstrap.css/4.4.1/bootstrap-reboot.min.cssm
diff --git a/resources/bootstrap.css/4.4.1/bootstrap.css b/resources/bootstrap.css/4.4.1/bootstrap.cssm
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap.css
rename to resources/bootstrap.css/4.4.1/bootstrap.cssm
diff --git a/resources/bootstrap.css/4.4.1/bootstrap.min.css b/resources/bootstrap.css/4.4.1/bootstrap.min.cssm
similarity index 100%
rename from resources/bootstrap.css/4.4.1/bootstrap.min.css
rename to resources/bootstrap.css/4.4.1/bootstrap.min.cssm
diff --git a/resources/bootstrap.js/3.3.7/bootstrap.js b/resources/bootstrap.js/3.3.7/bootstrap.jsm
similarity index 100%
rename from resources/bootstrap.js/3.3.7/bootstrap.js
rename to resources/bootstrap.js/3.3.7/bootstrap.jsm
diff --git a/resources/bootstrap.js/3.3.7/bootstrap.min.js b/resources/bootstrap.js/3.3.7/bootstrap.min.jsm
similarity index 100%
rename from resources/bootstrap.js/3.3.7/bootstrap.min.js
rename to resources/bootstrap.js/3.3.7/bootstrap.min.jsm
diff --git a/resources/bootstrap.js/3.3.7/npm.js b/resources/bootstrap.js/3.3.7/npm.jsm
similarity index 100%
rename from resources/bootstrap.js/3.3.7/npm.js
rename to resources/bootstrap.js/3.3.7/npm.jsm
diff --git a/resources/bootstrap.js/4.4.1/bootstrap.bundle.js b/resources/bootstrap.js/4.4.1/bootstrap.bundle.jsm
similarity index 100%
rename from resources/bootstrap.js/4.4.1/bootstrap.bundle.js
rename to resources/bootstrap.js/4.4.1/bootstrap.bundle.jsm
diff --git a/resources/bootstrap.js/4.4.1/bootstrap.bundle.min.js b/resources/bootstrap.js/4.4.1/bootstrap.bundle.min.jsm
similarity index 100%
rename from resources/bootstrap.js/4.4.1/bootstrap.bundle.min.js
rename to resources/bootstrap.js/4.4.1/bootstrap.bundle.min.jsm
diff --git a/resources/bootstrap.js/4.4.1/bootstrap.js b/resources/bootstrap.js/4.4.1/bootstrap.jsm
similarity index 100%
rename from resources/bootstrap.js/4.4.1/bootstrap.js
rename to resources/bootstrap.js/4.4.1/bootstrap.jsm
diff --git a/resources/bootstrap.js/4.4.1/bootstrap.min.js b/resources/bootstrap.js/4.4.1/bootstrap.min.jsm
similarity index 100%
rename from resources/bootstrap.js/4.4.1/bootstrap.min.js
rename to resources/bootstrap.js/4.4.1/bootstrap.min.jsm
diff --git a/resources/findify-bundle/6.9.15/bundle.js b/resources/findify-bundle/6.9.15/bundle.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/bundle.js
rename to resources/findify-bundle/6.9.15/bundle.jsm
diff --git a/resources/findify-bundle/6.9.15/components.js b/resources/findify-bundle/6.9.15/components.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/components.js
rename to resources/findify-bundle/6.9.15/components.jsm
diff --git a/resources/findify-bundle/6.9.15/config.js b/resources/findify-bundle/6.9.15/config.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/config.js
rename to resources/findify-bundle/6.9.15/config.jsm
diff --git a/resources/findify-bundle/6.9.15/initializer.js b/resources/findify-bundle/6.9.15/initializer.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/initializer.js
rename to resources/findify-bundle/6.9.15/initializer.jsm
diff --git a/resources/findify-bundle/6.9.15/polyfill.js b/resources/findify-bundle/6.9.15/polyfill.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/polyfill.js
rename to resources/findify-bundle/6.9.15/polyfill.jsm
diff --git a/resources/findify-bundle/6.9.15/raw.css b/resources/findify-bundle/6.9.15/raw.cssm
similarity index 100%
rename from resources/findify-bundle/6.9.15/raw.css
rename to resources/findify-bundle/6.9.15/raw.cssm
diff --git a/resources/findify-bundle/6.9.15/styles.css b/resources/findify-bundle/6.9.15/styles.cssm
similarity index 100%
rename from resources/findify-bundle/6.9.15/styles.css
rename to resources/findify-bundle/6.9.15/styles.cssm
diff --git a/resources/findify-bundle/6.9.15/vendors~components~initializer.js b/resources/findify-bundle/6.9.15/vendors~components~initializer.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/vendors~components~initializer.js
rename to resources/findify-bundle/6.9.15/vendors~components~initializer.jsm
diff --git a/resources/findify-bundle/6.9.15/vendors~initializer.js b/resources/findify-bundle/6.9.15/vendors~initializer.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/vendors~initializer.js
rename to resources/findify-bundle/6.9.15/vendors~initializer.jsm
diff --git a/resources/findify-bundle/6.9.15/vendors~sentry.js b/resources/findify-bundle/6.9.15/vendors~sentry.jsm
similarity index 100%
rename from resources/findify-bundle/6.9.15/vendors~sentry.js
rename to resources/findify-bundle/6.9.15/vendors~sentry.jsm
diff --git a/resources/fontawesome/4.7.0/css/font-awesome.css b/resources/fontawesome/4.7.0/css/font-awesome.cssm
similarity index 100%
rename from resources/fontawesome/4.7.0/css/font-awesome.css
rename to resources/fontawesome/4.7.0/css/font-awesome.cssm
diff --git a/resources/fontawesome/4.7.0/css/font-awesome.min.css b/resources/fontawesome/4.7.0/css/font-awesome.min.cssm
similarity index 100%
rename from resources/fontawesome/4.7.0/css/font-awesome.min.css
rename to resources/fontawesome/4.7.0/css/font-awesome.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/all.css b/resources/fontawesome/5.7.2/css/all.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/all.css
rename to resources/fontawesome/5.7.2/css/all.cssm
diff --git a/resources/fontawesome/5.7.2/css/all.min.css b/resources/fontawesome/5.7.2/css/all.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/all.min.css
rename to resources/fontawesome/5.7.2/css/all.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/brands.css b/resources/fontawesome/5.7.2/css/brands.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/brands.css
rename to resources/fontawesome/5.7.2/css/brands.cssm
diff --git a/resources/fontawesome/5.7.2/css/brands.min.css b/resources/fontawesome/5.7.2/css/brands.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/brands.min.css
rename to resources/fontawesome/5.7.2/css/brands.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/fontawesome.css b/resources/fontawesome/5.7.2/css/fontawesome.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/fontawesome.css
rename to resources/fontawesome/5.7.2/css/fontawesome.cssm
diff --git a/resources/fontawesome/5.7.2/css/fontawesome.min.css b/resources/fontawesome/5.7.2/css/fontawesome.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/fontawesome.min.css
rename to resources/fontawesome/5.7.2/css/fontawesome.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/regular.css b/resources/fontawesome/5.7.2/css/regular.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/regular.css
rename to resources/fontawesome/5.7.2/css/regular.cssm
diff --git a/resources/fontawesome/5.7.2/css/regular.min.css b/resources/fontawesome/5.7.2/css/regular.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/regular.min.css
rename to resources/fontawesome/5.7.2/css/regular.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/solid.css b/resources/fontawesome/5.7.2/css/solid.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/solid.css
rename to resources/fontawesome/5.7.2/css/solid.cssm
diff --git a/resources/fontawesome/5.7.2/css/solid.min.css b/resources/fontawesome/5.7.2/css/solid.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/solid.min.css
rename to resources/fontawesome/5.7.2/css/solid.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/svg-with-js.css b/resources/fontawesome/5.7.2/css/svg-with-js.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/svg-with-js.css
rename to resources/fontawesome/5.7.2/css/svg-with-js.cssm
diff --git a/resources/fontawesome/5.7.2/css/svg-with-js.min.css b/resources/fontawesome/5.7.2/css/svg-with-js.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/svg-with-js.min.css
rename to resources/fontawesome/5.7.2/css/svg-with-js.min.cssm
diff --git a/resources/fontawesome/5.7.2/css/v4-shims.css b/resources/fontawesome/5.7.2/css/v4-shims.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/v4-shims.css
rename to resources/fontawesome/5.7.2/css/v4-shims.cssm
diff --git a/resources/fontawesome/5.7.2/css/v4-shims.min.css b/resources/fontawesome/5.7.2/css/v4-shims.min.cssm
similarity index 100%
rename from resources/fontawesome/5.7.2/css/v4-shims.min.css
rename to resources/fontawesome/5.7.2/css/v4-shims.min.cssm