diff --git a/framework/core/less/common/common.less b/framework/core/less/common/common.less
index 358c41f8c..d3f89cd70 100644
--- a/framework/core/less/common/common.less
+++ b/framework/core/less/common/common.less
@@ -8,7 +8,6 @@
 @import "print";
 @import "scaffolding";
 @import "sideNav";
-@import "mixins";
 
 @import "App";
 @import "Alert";
@@ -27,5 +26,3 @@
 @import "Search";
 @import "Select";
 @import "Tooltip";
-
-@import "variables";
diff --git a/framework/core/src/Frontend/FrontendServiceProvider.php b/framework/core/src/Frontend/FrontendServiceProvider.php
index a38726893..73d0c7a7d 100644
--- a/framework/core/src/Frontend/FrontendServiceProvider.php
+++ b/framework/core/src/Frontend/FrontendServiceProvider.php
@@ -33,8 +33,8 @@ class FrontendServiceProvider extends AbstractServiceProvider
                     $this->app->basePath().'/vendor/components/font-awesome/less' => ''
                 ]);
 
-                $assets->css([$this, 'addLessVariables']);
-                $assets->localeCss([$this, 'addLessVariables']);
+                $assets->css([$this, 'addBaseCss']);
+                $assets->localeCss([$this, 'addBaseCss']);
 
                 return $assets;
             };
@@ -70,7 +70,15 @@ class FrontendServiceProvider extends AbstractServiceProvider
         ]);
     }
 
-    public function addLessVariables(SourceCollector $sources)
+    public function addBaseCss(SourceCollector $sources)
+    {
+        $sources->addFile(base_path().'/vendor/flarum/core/less/common/variables.less');
+        $sources->addFile(base_path().'/vendor/flarum/core/less/common/mixins.less');
+
+        $this->addLessVariables($sources);
+    }
+
+    private function addLessVariables(SourceCollector $sources)
     {
         $sources->addString(function () {
             $settings = $this->app->make(SettingsRepositoryInterface::class);