diff --git a/app/src/Templates/DeferedRequirements.php b/app/src/Templates/DeferedRequirements.php
index 793318e..96fcd42 100644
--- a/app/src/Templates/DeferedRequirements.php
+++ b/app/src/Templates/DeferedRequirements.php
@@ -36,7 +36,8 @@ class DeferedRequirements implements TemplateGlobalProvider
     public static function Auto($class = false)
     {
         $config = Config::inst()->get(self::class);
-        $themeName = WebpackTemplateProvider::themeName();
+        $projectName = WebpackTemplateProvider::projectName();
+        $mainTheme = WebpackTemplateProvider::mainTheme();
 
         // Initialization
         Requirements::block(THIRDPARTY_DIR.'/jquery/jquery.js');
@@ -53,10 +54,10 @@ class DeferedRequirements implements TemplateGlobalProvider
         if (!$config['nofontawesome']) {
             DeferedRequirements::loadCSS('//use.fontawesome.com/releases/v5.4.0/css/all.css');
         }
-        DeferedRequirements::loadCSS($themeName.'.css');
-        DeferedRequirements::loadJS($themeName.'.js');
+        DeferedRequirements::loadCSS($mainTheme.'.css');
+        DeferedRequirements::loadJS($mainTheme.'.js');
 
-        // Class libs
+        // Custom controller requirements
         $class = get_class(Controller::curr());
         if (isset($config['custom_requirements'][$class])) {
             foreach ($config['custom_requirements'][$class] as $file) {
@@ -73,17 +74,26 @@ class DeferedRequirements implements TemplateGlobalProvider
         $dir = Path::join(
             Director::publicFolder(),
             ManifestFileFinder::RESOURCES_DIR,
-            $themeName,
+            $projectName,
             'client',
             'dist'
         );
 
-        if (file_exists(Path::join($dir, 'css', $themeName.'_'.$class . '.css'))) {
-            DeferedRequirements::loadCSS($themeName.'_'.$class . '.css');
+        // Controller requirements
+        $themePath = Path::join($dir, 'css', $mainTheme.'_'.$class . '.css');
+        $projectPath = Path::join($dir, 'css', $projectName.'_'.$class . '.css');
+        if ($mainTheme && file_exists($themePath)){
+            DeferedRequirements::loadCSS($mainTheme.'_'.$class . '.css');
+        } else if (file_exists($projectPath)) {
+            DeferedRequirements::loadCSS($projectName.'_'.$class . '.css');
         }
 
-        if (file_exists(Path::join($dir, 'js', $themeName.'_'.$class . '.js'))) {
-            DeferedRequirements::loadJS($themeName.'_'.$class . '.js');
+        $themePath = Path::join($dir, 'js', $mainTheme.'_'.$class . '.js');
+        $projectPath = Path::join($dir, 'js', $projectName.'_'.$class . '.js');
+        if ($mainTheme && file_exists($themePath)){
+            DeferedRequirements::loadJS($mainTheme.'_'.$class . '.js');
+        } else if (file_exists($projectPath)) {
+            DeferedRequirements::loadJS($projectName.'_'.$class . '.js');
         }
 
         return self::forTemplate();
diff --git a/app/src/Templates/WebpackTemplateProvider.php b/app/src/Templates/WebpackTemplateProvider.php
index cf2bc1c..d21e6f2 100644
--- a/app/src/Templates/WebpackTemplateProvider.php
+++ b/app/src/Templates/WebpackTemplateProvider.php
@@ -7,6 +7,7 @@
 namespace Site\Templates;
 
 use SilverStripe\Core\Manifest\ModuleManifest;
+use SilverStripe\View\SSViewer;
 use SilverStripe\View\TemplateGlobalProvider;
 use SilverStripe\View\Requirements;
 use SilverStripe\Control\Director;
@@ -66,14 +67,20 @@ class WebpackTemplateProvider implements TemplateGlobalProvider
         Requirements::javascript(self::_getPath($path));
     }
 
-    public static function themeName()
+    public static function projectName()
     {
         return Config::inst()->get(ModuleManifest::class, 'project');
     }
 
+    public static function mainTheme()
+    {
+        $themes = Config::inst()->get(SSViewer::class, 'themes');
+        return is_array($themes) && $themes[0] !== '$public' && $themes[0] !== '$default' ? $themes[0] : false;
+    }
+
     public static function resourcesURL($link = null)
     {
-        return Controller::join_links(Director::baseURL(), '/resources/'.self::themeName().'/client/dist/img/', $link);
+        return Controller::join_links(Director::baseURL(), '/resources/'.self::projectName().'/client/dist/img/', $link);
     }
 
 
@@ -111,7 +118,7 @@ class WebpackTemplateProvider implements TemplateGlobalProvider
     {
         return strpos($path, '//') === false ?
             Controller::join_links(
-                self::themeName(),
+                self::projectName(),
                 Config::inst()->get(__CLASS__, 'DIST'),
                 (strpos($path, '.css') ? 'css' : 'js'),
                 $path