joomla · bembelimen · Nov 30, 2021 · Nov 16, 2021 · Oct 22, 2021 · Oct 22, 2021
diff --git a/administrator/components/com_admin/script.php b/administrator/components/com_admin/script.php
diff --git a/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-11-28.sql b/administrator/components/com_admin/sql/updates/mysql/4.1.0-2021-11-28.sql
@@ -0,0 +1,9 @@
+--
+-- Convert core templates to new mode
+--
+UPDATE `#__template_styles` SET `inheritable` = 1 WHERE `template` = 'atum' AND `client_id` = 1 OR `template` = 'cassiopeia' AND `client_id` = 0;
+
+UPDATE `#__template_styles`
+   SET `params` = REPLACE(`params`,'"useFontScheme":"templates\\/cassiopeia\\/css\\/','"useFontScheme":"media\\/templates\\/site\\/cassiopeia\\/css\\/')
+ WHERE `template` = 'cassiopeia'
+   AND `client_id` = 0;
diff --git a/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-11-28.sql b/administrator/components/com_admin/sql/updates/postgresql/4.1.0-2021-11-28.sql
@@ -0,0 +1,9 @@
+--
+-- Convert core templates to new mode
+--
+UPDATE "#__template_styles" SET "inheritable" = 1 WHERE "template" = 'atum' AND "client_id" = 1 OR "template" = 'cassiopeia' AND "client_id" = 0;
+
+UPDATE "#__template_styles"
+   SET "params" = REPLACE("params",'"useFontScheme":"templates\\/cassiopeia\\/css\\/','"useFontScheme":"media\\/templates\\/site\\/cassiopeia\\/css\\/')
+ WHERE "template" = 'cassiopeia'
+   AND "client_id" = 0;
diff --git a/administrator/templates/atum/error_full.php b/administrator/templates/atum/error_full.php
@@ -37,10 +37,10 @@
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-large.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-small.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
 	? 'alt=""'

diff --git a/administrator/templates/atum/error_login.php b/administrator/templates/atum/error_login.php
@@ -35,13 +35,13 @@
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-large.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $loginLogo = $this->params->get('loginLogo')
 	? Uri::root() . $this->params->get('loginLogo')
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/login.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/login.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-small.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
 	? 'alt=""'

diff --git a/administrator/templates/atum/index.php b/administrator/templates/atum/index.php
@@ -45,10 +45,10 @@
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-large.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-small.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
 	? 'alt=""'

diff --git a/administrator/templates/atum/login.php b/administrator/templates/atum/login.php
@@ -35,13 +35,13 @@
 // Template params
 $logoBrandLarge  = $this->params->get('logoBrandLarge')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandLarge'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-large.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-large.svg';
 $loginLogo = $this->params->get('loginLogo')
 	? Uri::root() . $this->params->get('loginLogo')
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/login.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/login.svg';
 $logoBrandSmall = $this->params->get('logoBrandSmall')
 	? Uri::root() . htmlspecialchars($this->params->get('logoBrandSmall'), ENT_QUOTES)
-	: $this->baseurl . '/templates/' . $this->template . '/images/logos/brand-small.svg';
+	: Uri::root() . 'media/templates/administrator/atum/images/logos/brand-small.svg';
 
 $logoBrandLargeAlt = empty($this->params->get('logoBrandLargeAlt')) && empty($this->params->get('emptyLogoBrandLargeAlt'))
 	? 'alt=""'

diff --git a/administrator/templates/atum/scss/vendor/_bootstrap.scss b/administrator/templates/atum/scss/vendor/_bootstrap.scss
diff --git a/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss b/administrator/templates/atum/scss/vendor/awesomplete/awesomplete.scss
diff --git a/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss b/administrator/templates/atum/scss/vendor/fontawesome-free/fontawesome.scss
diff --git a/administrator/templates/atum/templateDetails.xml b/administrator/templates/atum/templateDetails.xml
@@ -7,6 +7,7 @@
 	<authorEmail>[email protected]</authorEmail>
 	<copyright>(C) 2016 Open Source Matters, Inc.</copyright>
 	<description>TPL_ATUM_XML_DESCRIPTION</description>
+	<inheritable>1</inheritable>
 	<files>
 		<filename>component.php</filename>
 		<filename>cpanel.php</filename>
@@ -17,15 +18,13 @@
 		<filename>joomla.asset.json</filename>
 		<filename>login.php</filename>
 		<filename>templateDetails.xml</filename>
-		<filename>template_preview.png</filename>
-		<filename>template_thumbnail.png</filename>
-		<folder>css</folder>
 		<folder>html</folder>
-		<folder>images</folder>
-		<folder>scss</folder>
 	</files>
 	<media destination="templates/administrator/atum" folder="media">
 		<folder>js</folder>
+		<folder>css</folder>
+		<folder>scss</folder>
+		<folder>images</folder>
 	</media>
 	<positions>
 		<!-- used directly in the template -->

diff --git a/administrator/templates/system/error.php b/administrator/templates/system/error.php
@@ -15,7 +15,7 @@
 /** @var \Joomla\CMS\Document\ErrorDocument $this */
 
 // Load template CSS file
-$this->getWebAssetManager()->registerAndUseStyle('template.system.error', 'administrator/templates/system/css/error.css');
+$this->getWebAssetManager()->registerAndUseStyle('template.system.error', 'media/system/css/system-admin-error.min.css');
 
 // Set page title
 $this->setTitle($this->error->getCode() . ' - ' . htmlspecialchars($this->error->getMessage(), ENT_QUOTES, 'UTF-8'));

diff --git a/...ator/templates/system/images/calendar.png → ...d/media_source/system/images/calendar.png b/...ator/templates/system/images/calendar.png → ...d/media_source/system/images/calendar.png
diff --git a/templates/system/scss/editor.scss → build/media_source/system/scss/editor.scss b/templates/system/scss/editor.scss → build/media_source/system/scss/editor.scss
diff --git a/...istrator/templates/system/scss/error.scss → ...ource/system/scss/system-admin-error.scss b/...istrator/templates/system/scss/error.scss → ...ource/system/scss/system-admin-error.scss
diff --git a/...strator/templates/system/scss/system.scss → ...urce/system/scss/system-admin-system.scss b/...strator/templates/system/scss/system.scss → ...urce/system/scss/system-admin-system.scss
diff --git a/templates/system/scss/error.scss → ...source/system/scss/system-site-error.scss b/templates/system/scss/error.scss → ...source/system/scss/system-site-error.scss
diff --git a/templates/system/scss/error_rtl.scss → ...ce/system/scss/system-site-error_rtl.scss b/templates/system/scss/error_rtl.scss → ...ce/system/scss/system-site-error_rtl.scss
diff --git a/templates/system/scss/general.scss → ...urce/system/scss/system-site-general.scss b/templates/system/scss/general.scss → ...urce/system/scss/system-site-general.scss
diff --git a/templates/system/scss/offline.scss → ...urce/system/scss/system-site-offline.scss b/templates/system/scss/offline.scss → ...urce/system/scss/system-site-offline.scss
diff --git a/templates/system/scss/offline_rtl.scss → .../system/scss/system-site-offline_rtl.scss b/templates/system/scss/offline_rtl.scss → .../system/scss/system-site-offline_rtl.scss
diff --git a/.../templates/atum/images/joomla-pattern.svg → ...inistrator/atum/images/joomla-pattern.svg b/.../templates/atum/images/joomla-pattern.svg → ...inistrator/atum/images/joomla-pattern.svg
diff --git a/...mplates/atum/images/logos/brand-large.svg → ...strator/atum/images/logos/brand-large.svg b/...mplates/atum/images/logos/brand-large.svg → ...strator/atum/images/logos/brand-large.svg
diff --git a/...mplates/atum/images/logos/brand-small.svg → ...strator/atum/images/logos/brand-small.svg b/...mplates/atum/images/logos/brand-small.svg → ...strator/atum/images/logos/brand-small.svg
diff --git a/...tor/templates/atum/images/logos/login.svg → ...administrator/atum/images/logos/login.svg b/...tor/templates/atum/images/logos/login.svg → ...administrator/atum/images/logos/login.svg
diff --git a/...ates/atum/images/select-bg-active-rtl.svg → ...ator/atum/images/select-bg-active-rtl.svg b/...ates/atum/images/select-bg-active-rtl.svg → ...ator/atum/images/select-bg-active-rtl.svg
diff --git a/...emplates/atum/images/select-bg-active.svg → ...istrator/atum/images/select-bg-active.svg b/...emplates/atum/images/select-bg-active.svg → ...istrator/atum/images/select-bg-active.svg
diff --git a/...r/templates/atum/images/select-bg-rtl.svg → ...ministrator/atum/images/select-bg-rtl.svg b/...r/templates/atum/images/select-bg-rtl.svg → ...ministrator/atum/images/select-bg-rtl.svg
diff --git a/...rator/templates/atum/images/select-bg.svg → ...s/administrator/atum/images/select-bg.svg b/...rator/templates/atum/images/select-bg.svg → ...s/administrator/atum/images/select-bg.svg
diff --git a/...rator/templates/atum/template_preview.png → ...istrator/atum/images/template_preview.png b/...rator/templates/atum/template_preview.png → ...istrator/atum/images/template_preview.png
diff --git a/...tor/templates/atum/template_thumbnail.png → ...trator/atum/images/template_thumbnail.png b/...tor/templates/atum/template_thumbnail.png → ...trator/atum/images/template_thumbnail.png
diff --git a/administrator/templates/atum/scss/_root.scss → ...plates/administrator/atum/scss/_root.scss b/administrator/templates/atum/scss/_root.scss → ...plates/administrator/atum/scss/_root.scss
diff --git a/...rator/templates/atum/scss/_variables.scss → ...s/administrator/atum/scss/_variables.scss b/...rator/templates/atum/scss/_variables.scss → ...s/administrator/atum/scss/_variables.scss
@@ -146,7 +146,7 @@ $badge-font-size:                  .75rem;
 $jicon-css-prefix:                 icon !default;
 $fa-css-prefix:                    fa !default;
 $fa-font-path:                     "../../../../media/vendor/fontawesome-free/webfonts";
-$roboto-font-path:                 "../../../../media/vendor/roboto-fontface/fonts";
+$roboto-font-path:                 "../../../../../media/vendor/roboto-fontface/fonts";
 
 // Font weights
 $thin-weight:                      100;

diff --git a/...r/templates/atum/scss/blocks/_alerts.scss → ...ministrator/atum/scss/blocks/_alerts.scss b/...r/templates/atum/scss/blocks/_alerts.scss → ...ministrator/atum/scss/blocks/_alerts.scss
diff --git a/...tor/templates/atum/scss/blocks/_edit.scss → ...administrator/atum/scss/blocks/_edit.scss b/...tor/templates/atum/scss/blocks/_edit.scss → ...administrator/atum/scss/blocks/_edit.scss
diff --git a/...tor/templates/atum/scss/blocks/_form.scss → ...administrator/atum/scss/blocks/_form.scss b/...tor/templates/atum/scss/blocks/_form.scss → ...administrator/atum/scss/blocks/_form.scss
diff --git a/...r/templates/atum/scss/blocks/_global.scss → ...ministrator/atum/scss/blocks/_global.scss b/...r/templates/atum/scss/blocks/_global.scss → ...ministrator/atum/scss/blocks/_global.scss
diff --git a/...r/templates/atum/scss/blocks/_header.scss → ...ministrator/atum/scss/blocks/_header.scss b/...r/templates/atum/scss/blocks/_header.scss → ...ministrator/atum/scss/blocks/_header.scss
diff --git a/...or/templates/atum/scss/blocks/_icons.scss → ...dministrator/atum/scss/blocks/_icons.scss b/...or/templates/atum/scss/blocks/_icons.scss → ...dministrator/atum/scss/blocks/_icons.scss
diff --git a/...r/templates/atum/scss/blocks/_iframe.scss → ...ministrator/atum/scss/blocks/_iframe.scss b/...r/templates/atum/scss/blocks/_iframe.scss → ...ministrator/atum/scss/blocks/_iframe.scss
diff --git a/...r/templates/atum/scss/blocks/_layout.scss → ...ministrator/atum/scss/blocks/_layout.scss b/...r/templates/atum/scss/blocks/_layout.scss → ...ministrator/atum/scss/blocks/_layout.scss
diff --git a/...or/templates/atum/scss/blocks/_lists.scss → ...dministrator/atum/scss/blocks/_lists.scss b/...or/templates/atum/scss/blocks/_lists.scss → ...dministrator/atum/scss/blocks/_lists.scss
diff --git a/...or/templates/atum/scss/blocks/_login.scss → ...dministrator/atum/scss/blocks/_login.scss b/...or/templates/atum/scss/blocks/_login.scss → ...dministrator/atum/scss/blocks/_login.scss
diff --git a/...r/templates/atum/scss/blocks/_modals.scss → ...ministrator/atum/scss/blocks/_modals.scss b/...r/templates/atum/scss/blocks/_modals.scss → ...ministrator/atum/scss/blocks/_modals.scss
diff --git a/...mplates/atum/scss/blocks/_quickicons.scss → ...strator/atum/scss/blocks/_quickicons.scss b/...mplates/atum/scss/blocks/_quickicons.scss → ...strator/atum/scss/blocks/_quickicons.scss
diff --git a/...plates/atum/scss/blocks/_sidebar-nav.scss → ...trator/atum/scss/blocks/_sidebar-nav.scss b/...plates/atum/scss/blocks/_sidebar-nav.scss → ...trator/atum/scss/blocks/_sidebar-nav.scss
diff --git a/.../templates/atum/scss/blocks/_sidebar.scss → ...inistrator/atum/scss/blocks/_sidebar.scss b/.../templates/atum/scss/blocks/_sidebar.scss → ...inistrator/atum/scss/blocks/_sidebar.scss
diff --git a/...templates/atum/scss/blocks/_switcher.scss → ...nistrator/atum/scss/blocks/_switcher.scss b/...templates/atum/scss/blocks/_switcher.scss → ...nistrator/atum/scss/blocks/_switcher.scss
diff --git a/.../templates/atum/scss/blocks/_toolbar.scss → ...inistrator/atum/scss/blocks/_toolbar.scss b/.../templates/atum/scss/blocks/_toolbar.scss → ...inistrator/atum/scss/blocks/_toolbar.scss
diff --git a/...mplates/atum/scss/blocks/_treeselect.scss → ...strator/atum/scss/blocks/_treeselect.scss b/...mplates/atum/scss/blocks/_treeselect.scss → ...strator/atum/scss/blocks/_treeselect.scss
diff --git a/...emplates/atum/scss/blocks/_utilities.scss → ...istrator/atum/scss/blocks/_utilities.scss b/...emplates/atum/scss/blocks/_utilities.scss → ...istrator/atum/scss/blocks/_utilities.scss
diff --git a/...emplates/atum/scss/pages/_com_config.scss → ...istrator/atum/scss/pages/_com_config.scss b/...emplates/atum/scss/pages/_com_config.scss → ...istrator/atum/scss/pages/_com_config.scss
diff --git a/...mplates/atum/scss/pages/_com_content.scss → ...strator/atum/scss/pages/_com_content.scss b/...mplates/atum/scss/pages/_com_content.scss → ...strator/atum/scss/pages/_com_content.scss
diff --git a/...emplates/atum/scss/pages/_com_cpanel.scss → ...istrator/atum/scss/pages/_com_cpanel.scss b/...emplates/atum/scss/pages/_com_cpanel.scss → ...istrator/atum/scss/pages/_com_cpanel.scss
diff --git a/...es/atum/scss/pages/_com_joomlaupdate.scss → ...or/atum/scss/pages/_com_joomlaupdate.scss b/...es/atum/scss/pages/_com_joomlaupdate.scss → ...or/atum/scss/pages/_com_joomlaupdate.scss
diff --git a/...mplates/atum/scss/pages/_com_modules.scss → ...strator/atum/scss/pages/_com_modules.scss b/...mplates/atum/scss/pages/_com_modules.scss → ...strator/atum/scss/pages/_com_modules.scss
diff --git a/...mplates/atum/scss/pages/_com_privacy.scss → ...strator/atum/scss/pages/_com_privacy.scss b/...mplates/atum/scss/pages/_com_privacy.scss → ...strator/atum/scss/pages/_com_privacy.scss
diff --git a/.../templates/atum/scss/pages/_com_tags.scss → ...inistrator/atum/scss/pages/_com_tags.scss b/.../templates/atum/scss/pages/_com_tags.scss → ...inistrator/atum/scss/pages/_com_tags.scss
diff --git a/...lates/atum/scss/pages/_com_templates.scss → ...rator/atum/scss/pages/_com_templates.scss b/...lates/atum/scss/pages/_com_templates.scss → ...rator/atum/scss/pages/_com_templates.scss
diff --git a/...templates/atum/scss/pages/_com_users.scss → ...nistrator/atum/scss/pages/_com_users.scss b/...templates/atum/scss/pages/_com_users.scss → ...nistrator/atum/scss/pages/_com_users.scss
diff --git a/.../scss/system/searchtools/searchtools.scss → .../scss/system/searchtools/searchtools.scss b/.../scss/system/searchtools/searchtools.scss → .../scss/system/searchtools/searchtools.scss
diff --git a/...tor/templates/atum/scss/template-rtl.scss → ...administrator/atum/scss/template-rtl.scss b/...tor/templates/atum/scss/template-rtl.scss → ...administrator/atum/scss/template-rtl.scss
diff --git a/...strator/templates/atum/scss/template.scss → ...tes/administrator/atum/scss/template.scss b/...strator/templates/atum/scss/template.scss → ...tes/administrator/atum/scss/template.scss
@@ -1,5 +1,5 @@
 // Bootstrap functions
-@import "../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Atum Variables
 @import "variables";
@@ -8,12 +8,12 @@
 @import "vendor/bootstrap";
 
 // Fonts
-@import "../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
+@import "../../../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
 
 @import "blocks/global"; // Leave this first
 
 // jQuery Minicolors
-@import "../../../../build/media_source/system/scss/jquery-minicolors";
+@import "../../../../../../media/system/scss/jquery-minicolors";
 
 // Vendor overrides
 @import "vendor/bootstrap/badge";

diff --git a/build/media_source/templates/administrator/atum/scss/vendor/_bootstrap.scss b/build/media_source/templates/administrator/atum/scss/vendor/_bootstrap.scss
@@ -0,0 +1,37 @@
+// Variables
+
+// Media, Jumbotron & Print removed https://getbootstrap.com/docs/5.0/migration/
+// Code is now in reboot https://github.com/twbs/bootstrap/pull/28917/files
+
+@import "../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../root";
+@import "../../../../../../../media/vendor/bootstrap/scss/reboot";
+@import "../../../../../../../media/vendor/bootstrap/scss/type";
+@import "../../../../../../../media/vendor/bootstrap/scss/images";
+@import "../../../../../../../media/vendor/bootstrap/scss/containers";
+@import "../../../../../../../media/vendor/bootstrap/scss/grid";
+@import "../../../../../../../media/vendor/bootstrap/scss/tables";
+@import "../../../../../../../media/vendor/bootstrap/scss/forms";
+@import "../../../../../../../media/vendor/bootstrap/scss/buttons";
+@import "../../../../../../../media/vendor/bootstrap/scss/transitions";
+@import "../../../../../../../media/vendor/bootstrap/scss/dropdown";
+@import "../../../../../../../media/vendor/bootstrap/scss/accordion";
+@import "../../../../../../../media/vendor/bootstrap/scss/button-group";
+@import "../../../../../../../media/vendor/bootstrap/scss/nav";
+@import "../../../../../../../media/vendor/bootstrap/scss/navbar";
+@import "../../../../../../../media/vendor/bootstrap/scss/card";
+@import "../../../../../../../media/vendor/bootstrap/scss/breadcrumb";
+@import "../../../../../../../media/vendor/bootstrap/scss/pagination";
+@import "../../../../../../../media/vendor/bootstrap/scss/badge";
+@import "../../../../../../../media/vendor/bootstrap/scss/alert";
+@import "../../../../../../../media/vendor/bootstrap/scss/progress";
+@import "../../../../../../../media/vendor/bootstrap/scss/list-group";
+@import "../../../../../../../media/vendor/bootstrap/scss/close";
+@import "../../../../../../../media/vendor/bootstrap/scss/modal";
+@import "../../../../../../../media/vendor/bootstrap/scss/tooltip";
+@import "../../../../../../../media/vendor/bootstrap/scss/popover";
+@import "../../../../../../../media/vendor/bootstrap/scss/carousel";
+@import "../../../../../../../media/vendor/bootstrap/scss/utilities";
+@import "../../../../../../../media/vendor/bootstrap/scss/utilities/api";
+@import "../../../../../../../media/vendor/bootstrap/scss/helpers";
diff --git a/...mplates/atum/scss/vendor/_codemirror.scss → ...strator/atum/scss/vendor/_codemirror.scss b/...mplates/atum/scss/vendor/_codemirror.scss → ...strator/atum/scss/vendor/_codemirror.scss
diff --git a/.../templates/atum/scss/vendor/_dragula.scss → ...inistrator/atum/scss/vendor/_dragula.scss b/.../templates/atum/scss/vendor/_dragula.scss → ...inistrator/atum/scss/vendor/_dragula.scss
diff --git a/.../templates/atum/scss/vendor/_tinymce.scss → ...inistrator/atum/scss/vendor/_tinymce.scss b/.../templates/atum/scss/vendor/_tinymce.scss → ...inistrator/atum/scss/vendor/_tinymce.scss
diff --git a/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss b/build/media_source/templates/administrator/atum/scss/vendor/awesomplete/awesomplete.scss
@@ -0,0 +1,6 @@
+// Awesomplete
+@import "../../../../../../../../node_modules/awesomplete/awesomplete";
+
+.awesomplete {
+  display: block;
+}
diff --git a/...es/atum/scss/vendor/bootstrap/_badge.scss → ...or/atum/scss/vendor/bootstrap/_badge.scss b/...es/atum/scss/vendor/bootstrap/_badge.scss → ...or/atum/scss/vendor/bootstrap/_badge.scss
diff --git a/...scss/vendor/bootstrap/_bootstrap-rtl.scss → ...scss/vendor/bootstrap/_bootstrap-rtl.scss b/...scss/vendor/bootstrap/_bootstrap-rtl.scss → ...scss/vendor/bootstrap/_bootstrap-rtl.scss
diff --git a/.../atum/scss/vendor/bootstrap/_buttons.scss → .../atum/scss/vendor/bootstrap/_buttons.scss b/.../atum/scss/vendor/bootstrap/_buttons.scss → .../atum/scss/vendor/bootstrap/_buttons.scss
diff --git a/...tes/atum/scss/vendor/bootstrap/_card.scss → ...tor/atum/scss/vendor/bootstrap/_card.scss b/...tes/atum/scss/vendor/bootstrap/_card.scss → ...tor/atum/scss/vendor/bootstrap/_card.scss
diff --git a/...atum/scss/vendor/bootstrap/_collapse.scss → ...atum/scss/vendor/bootstrap/_collapse.scss b/...atum/scss/vendor/bootstrap/_collapse.scss → ...atum/scss/vendor/bootstrap/_collapse.scss
diff --git a/.../scss/vendor/bootstrap/_custom-forms.scss → .../scss/vendor/bootstrap/_custom-forms.scss b/.../scss/vendor/bootstrap/_custom-forms.scss → .../scss/vendor/bootstrap/_custom-forms.scss
diff --git a/...atum/scss/vendor/bootstrap/_dropdown.scss → ...atum/scss/vendor/bootstrap/_dropdown.scss b/...atum/scss/vendor/bootstrap/_dropdown.scss → ...atum/scss/vendor/bootstrap/_dropdown.scss
diff --git a/...tes/atum/scss/vendor/bootstrap/_form.scss → ...tor/atum/scss/vendor/bootstrap/_form.scss b/...tes/atum/scss/vendor/bootstrap/_form.scss → ...tor/atum/scss/vendor/bootstrap/_form.scss
diff --git a/...es/atum/scss/vendor/bootstrap/_lists.scss → ...or/atum/scss/vendor/bootstrap/_lists.scss b/...es/atum/scss/vendor/bootstrap/_lists.scss → ...or/atum/scss/vendor/bootstrap/_lists.scss
diff --git a/...es/atum/scss/vendor/bootstrap/_modal.scss → ...or/atum/scss/vendor/bootstrap/_modal.scss b/...es/atum/scss/vendor/bootstrap/_modal.scss → ...or/atum/scss/vendor/bootstrap/_modal.scss
diff --git a/...um/scss/vendor/bootstrap/_pagination.scss → ...um/scss/vendor/bootstrap/_pagination.scss b/...um/scss/vendor/bootstrap/_pagination.scss → ...um/scss/vendor/bootstrap/_pagination.scss
diff --git a/...s/atum/scss/vendor/bootstrap/_reboot.scss → ...r/atum/scss/vendor/bootstrap/_reboot.scss b/...s/atum/scss/vendor/bootstrap/_reboot.scss → ...r/atum/scss/vendor/bootstrap/_reboot.scss
diff --git a/...es/atum/scss/vendor/bootstrap/_table.scss → ...or/atum/scss/vendor/bootstrap/_table.scss b/...es/atum/scss/vendor/bootstrap/_table.scss → ...or/atum/scss/vendor/bootstrap/_table.scss
diff --git a/...s/atum/scss/vendor/choicesjs/choices.scss → ...r/atum/scss/vendor/choicesjs/choices.scss b/...s/atum/scss/vendor/choicesjs/choices.scss → ...r/atum/scss/vendor/choicesjs/choices.scss
@@ -1,13 +1,13 @@
-@import "../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Atum Variables
 @import "../../variables";
 
-@import "../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // choices.js
-@import "../../../../../../node_modules/choices.js/src/styles/choices";
+@import "../../../../../../../../node_modules/choices.js/src/styles/choices";
 
 .choices {
   border: 0;

diff --git a/...d/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss b/...d/media_source/templates/administrator/atum/scss/vendor/fontawesome-free/fontawesome.scss
@@ -0,0 +1,19 @@
+// Override the font path
+$fa-css-prefix:                    fa;
+$fa-font-path:                     "../../../../../../vendor/fontawesome-free/webfonts" !default;
+
+// Font Awesome 5 Free
+@import "../../../../../../../../media/vendor/fontawesome-free/scss/fontawesome";
+@import "../../../../../../../../media/vendor/fontawesome-free/scss/regular";
+@import "../../../../../../../../media/vendor/fontawesome-free/scss/solid";
+
+// Brands must be imported last
+@import "../../../../../../../../media/vendor/fontawesome-free/scss/brands";
+
+// B/C for Icomoon
+@import "../../../../../../system/scss/icomoon";
+
+// RTL override
+html[dir=rtl] .float-right {
+  float: left;
+}
diff --git a/.../joomla-custom-elements/joomla-alert.scss → .../joomla-custom-elements/joomla-alert.scss b/.../joomla-custom-elements/joomla-alert.scss → .../joomla-custom-elements/joomla-alert.scss
@@ -1,5 +1,5 @@
 @import "../../variables";
-@import "../../../../../../node_modules/joomla-ui-custom-elements/dist/css/joomla-alert";
+@import "../../../../../../../../node_modules/joomla-ui-custom-elements/dist/css/joomla-alert";
 
 // The following is a restyle for the system alerts
 

diff --git a/...or/joomla-custom-elements/joomla-tab.scss → ...or/joomla-custom-elements/joomla-tab.scss b/...or/joomla-custom-elements/joomla-tab.scss → ...or/joomla-custom-elements/joomla-tab.scss
@@ -1,10 +1,10 @@
-@import "../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Atum Variables
 @import "../../variables";
 
-@import "../../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // Tabs
 

diff --git a/...um/scss/vendor/minicolors/minicolors.scss → ...um/scss/vendor/minicolors/minicolors.scss b/...um/scss/vendor/minicolors/minicolors.scss → ...um/scss/vendor/minicolors/minicolors.scss
@@ -1,5 +1,5 @@
 // Minicolours
-@import "../../../../../../node_modules/@claviska/jquery-minicolors/jquery.minicolors";
+@import "../../../../../../../../node_modules/@claviska/jquery-minicolors/jquery.minicolors";
 
 .minicolors-theme-bootstrap {
 

diff --git a/templates/cassiopeia/images/logo.svg → ...templates/site/cassiopeia/images/logo.svg b/templates/cassiopeia/images/logo.svg → ...templates/site/cassiopeia/images/logo.svg
diff --git a/...assiopeia/images/select-bg-active-rtl.svg → ...assiopeia/images/select-bg-active-rtl.svg b/...assiopeia/images/select-bg-active-rtl.svg → ...assiopeia/images/select-bg-active-rtl.svg
diff --git a/...es/cassiopeia/images/select-bg-active.svg → ...te/cassiopeia/images/select-bg-active.svg b/...es/cassiopeia/images/select-bg-active.svg → ...te/cassiopeia/images/select-bg-active.svg
diff --git a/...lates/cassiopeia/images/select-bg-rtl.svg → .../site/cassiopeia/images/select-bg-rtl.svg b/...lates/cassiopeia/images/select-bg-rtl.svg → .../site/cassiopeia/images/select-bg-rtl.svg
diff --git a/templates/cassiopeia/images/select-bg.svg → ...ates/site/cassiopeia/images/select-bg.svg b/templates/cassiopeia/images/select-bg.svg → ...ates/site/cassiopeia/images/select-bg.svg
diff --git a/templates/cassiopeia/template_preview.png → ...te/cassiopeia/images/template_preview.png b/templates/cassiopeia/template_preview.png → ...te/cassiopeia/images/template_preview.png
diff --git a/templates/cassiopeia/template_thumbnail.png → .../cassiopeia/images/template_thumbnail.png b/templates/cassiopeia/template_thumbnail.png → .../cassiopeia/images/template_thumbnail.png
diff --git a/templates/cassiopeia/js/template.es5.js → ...plates/site/cassiopeia/js/template.es5.js b/templates/cassiopeia/js/template.es5.js → ...plates/site/cassiopeia/js/template.es5.js
diff --git a/...lates/cassiopeia/scss/blocks/_alerts.scss → .../site/cassiopeia/scss/blocks/_alerts.scss b/...lates/cassiopeia/scss/blocks/_alerts.scss → .../site/cassiopeia/scss/blocks/_alerts.scss
diff --git a/.../cassiopeia/scss/blocks/_back-to-top.scss → .../cassiopeia/scss/blocks/_back-to-top.scss b/.../cassiopeia/scss/blocks/_back-to-top.scss → .../cassiopeia/scss/blocks/_back-to-top.scss
diff --git a/...lates/cassiopeia/scss/blocks/_banner.scss → .../site/cassiopeia/scss/blocks/_banner.scss b/...lates/cassiopeia/scss/blocks/_banner.scss → .../site/cassiopeia/scss/blocks/_banner.scss
diff --git a/...tes/cassiopeia/scss/blocks/_css-grid.scss → ...ite/cassiopeia/scss/blocks/_css-grid.scss b/...tes/cassiopeia/scss/blocks/_css-grid.scss → ...ite/cassiopeia/scss/blocks/_css-grid.scss
diff --git a/...lates/cassiopeia/scss/blocks/_footer.scss → .../site/cassiopeia/scss/blocks/_footer.scss b/...lates/cassiopeia/scss/blocks/_footer.scss → .../site/cassiopeia/scss/blocks/_footer.scss
diff --git a/templates/cassiopeia/scss/blocks/_form.scss → ...es/site/cassiopeia/scss/blocks/_form.scss b/templates/cassiopeia/scss/blocks/_form.scss → ...es/site/cassiopeia/scss/blocks/_form.scss
diff --git a/...assiopeia/scss/blocks/_frontend-edit.scss → ...assiopeia/scss/blocks/_frontend-edit.scss b/...assiopeia/scss/blocks/_frontend-edit.scss → ...assiopeia/scss/blocks/_frontend-edit.scss
diff --git a/...lates/cassiopeia/scss/blocks/_global.scss → .../site/cassiopeia/scss/blocks/_global.scss b/...lates/cassiopeia/scss/blocks/_global.scss → .../site/cassiopeia/scss/blocks/_global.scss
diff --git a/...lates/cassiopeia/scss/blocks/_header.scss → .../site/cassiopeia/scss/blocks/_header.scss b/...lates/cassiopeia/scss/blocks/_header.scss → .../site/cassiopeia/scss/blocks/_header.scss
diff --git a/templates/cassiopeia/scss/blocks/_icons.scss → ...s/site/cassiopeia/scss/blocks/_icons.scss b/templates/cassiopeia/scss/blocks/_icons.scss → ...s/site/cassiopeia/scss/blocks/_icons.scss
diff --git a/...lates/cassiopeia/scss/blocks/_iframe.scss → .../site/cassiopeia/scss/blocks/_iframe.scss b/...lates/cassiopeia/scss/blocks/_iframe.scss → .../site/cassiopeia/scss/blocks/_iframe.scss
diff --git a/...lates/cassiopeia/scss/blocks/_layout.scss → .../site/cassiopeia/scss/blocks/_layout.scss b/...lates/cassiopeia/scss/blocks/_layout.scss → .../site/cassiopeia/scss/blocks/_layout.scss
diff --git a/...lates/cassiopeia/scss/blocks/_legacy.scss → .../site/cassiopeia/scss/blocks/_legacy.scss b/...lates/cassiopeia/scss/blocks/_legacy.scss → .../site/cassiopeia/scss/blocks/_legacy.scss
diff --git a/...lates/cassiopeia/scss/blocks/_modals.scss → .../site/cassiopeia/scss/blocks/_modals.scss b/...lates/cassiopeia/scss/blocks/_modals.scss → .../site/cassiopeia/scss/blocks/_modals.scss
diff --git a/...es/cassiopeia/scss/blocks/_modifiers.scss → ...te/cassiopeia/scss/blocks/_modifiers.scss b/...es/cassiopeia/scss/blocks/_modifiers.scss → ...te/cassiopeia/scss/blocks/_modifiers.scss
diff --git a/templates/cassiopeia/scss/blocks/_tags.scss → ...es/site/cassiopeia/scss/blocks/_tags.scss b/templates/cassiopeia/scss/blocks/_tags.scss → ...es/site/cassiopeia/scss/blocks/_tags.scss
diff --git a/...ates/cassiopeia/scss/blocks/_toolbar.scss → ...site/cassiopeia/scss/blocks/_toolbar.scss b/...ates/cassiopeia/scss/blocks/_toolbar.scss → ...site/cassiopeia/scss/blocks/_toolbar.scss
diff --git a/...es/cassiopeia/scss/blocks/_utilities.scss → ...te/cassiopeia/scss/blocks/_utilities.scss b/...es/cassiopeia/scss/blocks/_utilities.scss → ...te/cassiopeia/scss/blocks/_utilities.scss
diff --git a/templates/cassiopeia/scss/editor.scss → ...emplates/site/cassiopeia/scss/editor.scss b/templates/cassiopeia/scss/editor.scss → ...emplates/site/cassiopeia/scss/editor.scss
diff --git a/...opeia/scss/global/colors_alternative.scss → ...opeia/scss/global/colors_alternative.scss b/...opeia/scss/global/colors_alternative.scss → ...opeia/scss/global/colors_alternative.scss
diff --git a/...ssiopeia/scss/global/colors_standard.scss → ...ssiopeia/scss/global/colors_standard.scss b/...ssiopeia/scss/global/colors_standard.scss → ...ssiopeia/scss/global/colors_standard.scss
diff --git a/...opeia/scss/global/fonts-local_roboto.scss → ...opeia/scss/global/fonts-local_roboto.scss b/...opeia/scss/global/fonts-local_roboto.scss → ...opeia/scss/global/fonts-local_roboto.scss
@@ -1,6 +1,6 @@
 // Fonts
-$roboto-font-path: "../../../../media/vendor/roboto-fontface/fonts" !default;
-@import "../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
+$roboto-font-path: "../../../../../vendor/roboto-fontface/fonts" !default;
+@import "../../../../../../../media/vendor/roboto-fontface/scss/roboto/sass/roboto-fontface";
 
 :root {
   --cassiopeia-font-family-body: "Roboto", sans-serif;

diff --git a/templates/cassiopeia/scss/offline.scss → ...mplates/site/cassiopeia/scss/offline.scss b/templates/cassiopeia/scss/offline.scss → ...mplates/site/cassiopeia/scss/offline.scss
@@ -1,5 +1,5 @@
 // Bootstrap functions
-@import "../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Variables, Functions and Mixins
 @import "tools/tools";

diff --git a/.../scss/system/searchtools/searchtools.scss → .../scss/system/searchtools/searchtools.scss b/.../scss/system/searchtools/searchtools.scss → .../scss/system/searchtools/searchtools.scss
diff --git a/templates/cassiopeia/scss/template-rtl.scss → ...es/site/cassiopeia/scss/template-rtl.scss b/templates/cassiopeia/scss/template-rtl.scss → ...es/site/cassiopeia/scss/template-rtl.scss
diff --git a/templates/cassiopeia/scss/template.scss → ...plates/site/cassiopeia/scss/template.scss b/templates/cassiopeia/scss/template.scss → ...plates/site/cassiopeia/scss/template.scss
@@ -1,15 +1,15 @@
 // Bootstrap functions
-@import "../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../media/vendor/bootstrap/scss/functions";
 
 // Variables, Functions and Mixins
 @import "tools/tools";
 
 // Bootstrap
-@import "../../../media/vendor/bootstrap/scss/variables";
-@import "../../../media/vendor/bootstrap/scss/bootstrap";
+@import "../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../media/vendor/bootstrap/scss/bootstrap";
 
 // jQuery Minicolors
-@import "../../../media/system/scss/jquery-minicolors";
+@import "../../../../../../media/system/scss/jquery-minicolors";
 
 // Blocks
 @import "blocks/global"; // Leave this first

diff --git a/templates/cassiopeia/scss/tools/_tools.scss → ...es/site/cassiopeia/scss/tools/_tools.scss b/templates/cassiopeia/scss/tools/_tools.scss → ...es/site/cassiopeia/scss/tools/_tools.scss
@@ -1,5 +1,5 @@
 // Vendor
-@import "../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../media/vendor/bootstrap/scss/functions";
 
 
 // Variables

diff --git a/...peia/scss/tools/functions/_max-width.scss → ...peia/scss/tools/functions/_max-width.scss b/...peia/scss/tools/functions/_max-width.scss → ...peia/scss/tools/functions/_max-width.scss
diff --git a/...peia/scss/tools/variables/_variables.scss → ...peia/scss/tools/variables/_variables.scss b/...peia/scss/tools/variables/_variables.scss → ...peia/scss/tools/variables/_variables.scss
diff --git a/.../cassiopeia/scss/vendor/_awesomplete.scss → .../cassiopeia/scss/vendor/_awesomplete.scss b/.../cassiopeia/scss/vendor/_awesomplete.scss → .../cassiopeia/scss/vendor/_awesomplete.scss
diff --git a/...lates/cassiopeia/scss/vendor/_chosen.scss → .../site/cassiopeia/scss/vendor/_chosen.scss b/...lates/cassiopeia/scss/vendor/_chosen.scss → .../site/cassiopeia/scss/vendor/_chosen.scss
diff --git a/...ates/cassiopeia/scss/vendor/_dragula.scss → ...site/cassiopeia/scss/vendor/_dragula.scss b/...ates/cassiopeia/scss/vendor/_dragula.scss → ...site/cassiopeia/scss/vendor/_dragula.scss
diff --git a/...s/cassiopeia/scss/vendor/_minicolors.scss → ...e/cassiopeia/scss/vendor/_minicolors.scss b/...s/cassiopeia/scss/vendor/_minicolors.scss → ...e/cassiopeia/scss/vendor/_minicolors.scss
diff --git a/...ates/cassiopeia/scss/vendor/_tinymce.scss → ...site/cassiopeia/scss/vendor/_tinymce.scss b/...ates/cassiopeia/scss/vendor/_tinymce.scss → ...site/cassiopeia/scss/vendor/_tinymce.scss
diff --git a/...scss/vendor/bootstrap/_bootstrap-rtl.scss → ...scss/vendor/bootstrap/_bootstrap-rtl.scss b/...scss/vendor/bootstrap/_bootstrap-rtl.scss → ...scss/vendor/bootstrap/_bootstrap-rtl.scss
diff --git a/...opeia/scss/vendor/bootstrap/_buttons.scss → ...opeia/scss/vendor/bootstrap/_buttons.scss b/...opeia/scss/vendor/bootstrap/_buttons.scss → ...opeia/scss/vendor/bootstrap/_buttons.scss
diff --git a/...peia/scss/vendor/bootstrap/_collapse.scss → ...peia/scss/vendor/bootstrap/_collapse.scss b/...peia/scss/vendor/bootstrap/_collapse.scss → ...peia/scss/vendor/bootstrap/_collapse.scss
diff --git a/.../scss/vendor/bootstrap/_custom-forms.scss → .../scss/vendor/bootstrap/_custom-forms.scss b/.../scss/vendor/bootstrap/_custom-forms.scss → .../scss/vendor/bootstrap/_custom-forms.scss
diff --git a/...peia/scss/vendor/bootstrap/_dropdown.scss → ...peia/scss/vendor/bootstrap/_dropdown.scss b/...peia/scss/vendor/bootstrap/_dropdown.scss → ...peia/scss/vendor/bootstrap/_dropdown.scss
diff --git a/...siopeia/scss/vendor/bootstrap/_forms.scss → ...siopeia/scss/vendor/bootstrap/_forms.scss b/...siopeia/scss/vendor/bootstrap/_forms.scss → ...siopeia/scss/vendor/bootstrap/_forms.scss
diff --git a/...siopeia/scss/vendor/bootstrap/_lists.scss → ...siopeia/scss/vendor/bootstrap/_lists.scss b/...siopeia/scss/vendor/bootstrap/_lists.scss → ...siopeia/scss/vendor/bootstrap/_lists.scss
diff --git a/...siopeia/scss/vendor/bootstrap/_modal.scss → ...siopeia/scss/vendor/bootstrap/_modal.scss b/...siopeia/scss/vendor/bootstrap/_modal.scss → ...siopeia/scss/vendor/bootstrap/_modal.scss
diff --git a/...assiopeia/scss/vendor/bootstrap/_nav.scss → ...assiopeia/scss/vendor/bootstrap/_nav.scss b/...assiopeia/scss/vendor/bootstrap/_nav.scss → ...assiopeia/scss/vendor/bootstrap/_nav.scss
diff --git a/...ia/scss/vendor/bootstrap/_pagination.scss → ...ia/scss/vendor/bootstrap/_pagination.scss b/...ia/scss/vendor/bootstrap/_pagination.scss → ...ia/scss/vendor/bootstrap/_pagination.scss
diff --git a/...siopeia/scss/vendor/bootstrap/_table.scss → ...siopeia/scss/vendor/bootstrap/_table.scss b/...siopeia/scss/vendor/bootstrap/_table.scss → ...siopeia/scss/vendor/bootstrap/_table.scss
diff --git a/...iopeia/scss/vendor/choicesjs/choices.scss → ...iopeia/scss/vendor/choicesjs/choices.scss b/...iopeia/scss/vendor/choicesjs/choices.scss → ...iopeia/scss/vendor/choicesjs/choices.scss
@@ -1,9 +1,9 @@
-@import "../../../../../media/vendor/bootstrap/scss/functions";
-@import "../../../../../media/vendor/bootstrap/scss/variables";
-@import "../../../../../media/vendor/bootstrap/scss/mixins";
+@import "../../../../../../../../media/vendor/bootstrap/scss/functions";
+@import "../../../../../../../../media/vendor/bootstrap/scss/variables";
+@import "../../../../../../../../media/vendor/bootstrap/scss/mixins";
 
 // choices.js
-@import "../../../../../media/vendor/choicesjs/scss/choices";
+@import "../../../../../../../../media/vendor/choicesjs/scss/choices";
 
 // Cassiopea Variables, Functions and Mixins
 @import "../../tools/tools";

diff --git a/.../joomla-custom-elements/joomla-alert.scss → .../joomla-custom-elements/joomla-alert.scss b/.../joomla-custom-elements/joomla-alert.scss → .../joomla-custom-elements/joomla-alert.scss
@@ -1,5 +1,5 @@
 @import "../../tools/tools";
-@import "../../../../../media/vendor/joomla-custom-elements/css/joomla-alert.css";
+@import "../../../../../../vendor/joomla-custom-elements/css/joomla-alert.css";
 
 // The following is a restyle for the system alerts
 #system-message-container {

diff --git a/...eia/scss/vendor/metismenu/_metismenu.scss → ...eia/scss/vendor/metismenu/_metismenu.scss b/...eia/scss/vendor/metismenu/_metismenu.scss → ...eia/scss/vendor/metismenu/_metismenu.scss
diff --git a/installation/sql/mysql/base.sql b/installation/sql/mysql/base.sql
@@ -808,8 +808,8 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
 --
 
 INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`, `inheritable`, `parent`, `params`) VALUES
-(10, 'atum', 1, '1', 'Atum - Default', 0, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
-(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 0, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
+(10, 'atum', 1, '1', 'Atum - Default', 1, '', '{"hue":"hsl(214, 63%, 20%)","bg-light":"#f0f4fb","text-dark":"#495057","text-light":"#ffffff","link-color":"#2a69b8","special-color":"#001b4c","monochrome":"0","loginLogo":"","loginLogoAlt":"","logoBrandLarge":"","logoBrandLargeAlt":"","logoBrandSmall":"","logoBrandSmallAlt":""}'),
+(11, 'cassiopeia', 0, '1', 'Cassiopeia - Default', 1, '', '{"brand":"1","logoFile":"","siteTitle":"","siteDescription":"","useFontScheme":"0","colorName":"colors_standard","fluidContainer":"0","stickyHeader":0,"backTop":0}');
 
 -- --------------------------------------------------------