diff --git a/modules/backend/behaviors/RelationController.php b/modules/backend/behaviors/RelationController.php
index 063f832d5..1167c4d09 100644
--- a/modules/backend/behaviors/RelationController.php
+++ b/modules/backend/behaviors/RelationController.php
@@ -116,7 +116,7 @@ class RelationController extends ControllerBehavior
     {
         parent::__construct($controller);
 
-        $this->addJs('js/october.relation.js');
+        $this->addJs('js/october.relation.js', 'core');
 
         /*
          * Build configuration
diff --git a/modules/backend/formwidgets/CodeEditor.php b/modules/backend/formwidgets/CodeEditor.php
index 21a4cdaae..e8d758321 100644
--- a/modules/backend/formwidgets/CodeEditor.php
+++ b/modules/backend/formwidgets/CodeEditor.php
@@ -90,9 +90,9 @@ class CodeEditor extends FormWidgetBase
      */
     public function loadAssets()
     {
-        $this->addCss('css/codeeditor.css');
-        $this->addJs('vendor/ace/ace.js');
-        $this->addJs('js/codeeditor.js');
+        $this->addCss('css/codeeditor.css', 'core');
+        $this->addJs('vendor/ace/ace.js', 'core');
+        $this->addJs('js/codeeditor.js', 'core');
     }
 
 }
\ No newline at end of file
diff --git a/modules/backend/formwidgets/Datepicker.php b/modules/backend/formwidgets/Datepicker.php
index c6a74c434..dcac5aa87 100644
--- a/modules/backend/formwidgets/Datepicker.php
+++ b/modules/backend/formwidgets/Datepicker.php
@@ -77,11 +77,11 @@ class Datepicker extends FormWidgetBase
      */
     public function loadAssets()
     {
-        $this->addCss('vendor/pikaday/css/pikaday.css');
-        $this->addCss('css/datepicker.css');
-        $this->addJs('vendor/pikaday/js/pikaday.js');
-        $this->addJs('vendor/pikaday/js/pikaday.jquery.js');
-        $this->addJs('js/datepicker.js');
+        $this->addCss('vendor/pikaday/css/pikaday.css', 'core');
+        $this->addCss('css/datepicker.css', 'core');
+        $this->addJs('vendor/pikaday/js/pikaday.js', 'core');
+        $this->addJs('vendor/pikaday/js/pikaday.jquery.js', 'core');
+        $this->addJs('js/datepicker.js', 'core');
     }
 
     /**
diff --git a/modules/backend/formwidgets/FileUpload.php b/modules/backend/formwidgets/FileUpload.php
index ae087db89..7850f3671 100644
--- a/modules/backend/formwidgets/FileUpload.php
+++ b/modules/backend/formwidgets/FileUpload.php
@@ -153,8 +153,8 @@ class FileUpload extends FormWidgetBase
      */
     public function loadAssets()
     {
-        $this->addCss('css/fileupload.css');
-        $this->addJs('js/fileupload.js');
+        $this->addCss('css/fileupload.css', 'core');
+        $this->addJs('js/fileupload.js', 'core');
     }
 
     /**
diff --git a/modules/backend/formwidgets/RichEditor.php b/modules/backend/formwidgets/RichEditor.php
index feb5dbe18..81dd321de 100644
--- a/modules/backend/formwidgets/RichEditor.php
+++ b/modules/backend/formwidgets/RichEditor.php
@@ -41,10 +41,10 @@ class RichEditor extends FormWidgetBase
      */
     public function loadAssets()
     {
-        $this->addCss('vendor/redactor/redactor.css');
-        $this->addCss('css/richeditor.css');
-        $this->addJs('vendor/redactor/redactor.js');
-        $this->addJs('js/richeditor.js');
+        $this->addCss('vendor/redactor/redactor.css', 'core');
+        $this->addCss('css/richeditor.css', 'core');
+        $this->addJs('vendor/redactor/redactor.js', 'core');
+        $this->addJs('js/richeditor.js', 'core');
     }
 
 }
\ No newline at end of file
diff --git a/modules/backend/widgets/Form.php b/modules/backend/widgets/Form.php
index 7a6a8efae..1298176d4 100644
--- a/modules/backend/widgets/Form.php
+++ b/modules/backend/widgets/Form.php
@@ -120,7 +120,7 @@ class Form extends WidgetBase
      */
     public function loadAssets()
     {
-        $this->addJs('js/form.js');
+        $this->addJs('js/form.js', 'core');
     }
 
     /**
diff --git a/modules/backend/widgets/Lists.php b/modules/backend/widgets/Lists.php
index 94e728c7e..5460c342a 100644
--- a/modules/backend/widgets/Lists.php
+++ b/modules/backend/widgets/Lists.php
@@ -157,7 +157,7 @@ class Lists extends WidgetBase
      */
     public function loadAssets()
     {
-        $this->addJs('js/october.list.js');
+        $this->addJs('js/october.list.js', 'core');
     }
 
     /**
diff --git a/modules/backend/widgets/ReportContainer.php b/modules/backend/widgets/ReportContainer.php
index 0254b1fdb..8481b286e 100644
--- a/modules/backend/widgets/ReportContainer.php
+++ b/modules/backend/widgets/ReportContainer.php
@@ -82,9 +82,9 @@ class ReportContainer extends WidgetBase
      */
     public function loadAssets()
     {
-        $this->addCss('css/reportcontainer.css');
-        $this->addJs('vendor/isotope/jquery.isotope.min.js');
-        $this->addJs('js/reportcontainer.js');
+        $this->addCss('css/reportcontainer.css', 'core');
+        $this->addJs('vendor/isotope/jquery.isotope.min.js', 'core');
+        $this->addJs('js/reportcontainer.js', 'core');
     }
 
     //
diff --git a/modules/cms/widgets/AssetList.php b/modules/cms/widgets/AssetList.php
index f26069328..4c4681ba4 100644
--- a/modules/cms/widgets/AssetList.php
+++ b/modules/cms/widgets/AssetList.php
@@ -71,9 +71,9 @@ class AssetList extends WidgetBase
      */
     public function loadAssets()
     {
-        $this->addCss('css/assetlist.css');
-        $this->addJs('js/assetlist.js');
-        $this->addJs('/modules/backend/widgets/form/assets/js/form.js');
+        $this->addCss('css/assetlist.css', 'core');
+        $this->addJs('js/assetlist.js', 'core');
+        $this->addJs('/modules/backend/widgets/form/assets/js/form.js', 'core');
     }
 
     /**
diff --git a/modules/system/controllers/Settings.php b/modules/system/controllers/Settings.php
index 91185cd0b..796fad75c 100644
--- a/modules/system/controllers/Settings.php
+++ b/modules/system/controllers/Settings.php
@@ -31,7 +31,7 @@ class Settings extends Controller
     {
         parent::__construct();
 
-        $this->addCss('/modules/system/assets/css/settings.css');
+        $this->addCss('/modules/system/assets/css/settings.css', 'core');
 
         BackendMenu::setContext('October.System', 'system', 'settings');
     }
diff --git a/modules/system/controllers/Updates.php b/modules/system/controllers/Updates.php
index 2be5d5b8d..f0505c8fa 100644
--- a/modules/system/controllers/Updates.php
+++ b/modules/system/controllers/Updates.php
@@ -31,7 +31,7 @@ class Updates extends Controller
     {
         parent::__construct();
 
-        $this->addCss('/modules/system/assets/css/updates.css');
+        $this->addCss('/modules/system/assets/css/updates.css', 'core');
 
         BackendMenu::setContext('October.System', 'system', 'updates');
     }