diff --git a/Gruntfile.js b/Gruntfile.js
index 0d4e24fd42f01..b2cefcdca10b1 100644
--- a/Gruntfile.js
+++ b/Gruntfile.js
@@ -42,7 +42,7 @@ module.exports = function(grunt) {
puny : 'media/vendor/punycode/js',
codemirror : 'media/vendor/codemirror',
adminTemplate : 'administrator/templates/atum',
- siteTemplate : 'templates/aurora',
+ siteTemplate : 'templates/cassiopeia',
node_module : 'build/assets_tmp/node_modules/',
},
diff --git a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
index d95d26fbb7645..56ce48618e7cd 100644
--- a/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
+++ b/administrator/language/en-GB/en-GB.plg_editors_tinymce.ini
@@ -16,7 +16,7 @@ PLG_TINY_FIELD_CSS_DESC="By default the Plugin looks for an editor.css file. If
PLG_TINY_FIELD_CSS_LABEL="Template CSS Classes"
PLG_TINY_FIELD_CUSTOMBUTTON_LABEL="Custom Button"
PLG_TINY_FIELD_CUSTOMPLUGIN_LABEL="Custom Plugin"
-PLG_TINY_FIELD_CUSTOM_CSS_DESC="Optional CSS file that will override the standard editor.css file. Enter a file name to point to a file in the CSS folder of the default template (for example, templates/aurora/css/). Or enter a full URL path to the custom CSS file. If you enter a value in this field, this file will be used instead of the editor.css file."
+PLG_TINY_FIELD_CUSTOM_CSS_DESC="Optional CSS file that will override the standard editor.css file. Enter a file name to point to a file in the CSS folder of the default template (for example, templates/cassiopeia/css/). Or enter a full URL path to the custom CSS file. If you enter a value in this field, this file will be used instead of the editor.css file."
PLG_TINY_FIELD_CUSTOM_CSS_LABEL="Custom CSS Classes"
PLG_TINY_FIELD_CUSTOM_PATH_LABEL="Images Directory"
PLG_TINY_FIELD_DIRECTION_LABEL="Text Direction"
diff --git a/grunt-readme.md b/grunt-readme.md
index ec8dab8be08b9..1eea17ee97f8d 100644
--- a/grunt-readme.md
+++ b/grunt-readme.md
@@ -35,7 +35,7 @@ The full list of other Grunt Tasks available are:
- `grunt uglify:allJs`.................minifies various javascripts, excluding template files
- `grunt uglify:templates`.............minifies template javascripts
- `grunt cssmin:allCss`................minifies various stylesheets, currently it only affects codemirror files
-- `grunt cssmin:site`..................minifies the site template (Aurora) stylesheet
+- `grunt cssmin:site`..................minifies the site template (Cassiopeia) stylesheet
- `grunt cssmin:admin`.................minifies the admin template (Atum) stylesheet
- `grunt compile:site`.................minifies site template JS, lints SCSS then compiles it
- `grunt compile:admin`................minifies admin template JS, lints SCSS then compiles it
diff --git a/installation/sql/mysql/joomla.sql b/installation/sql/mysql/joomla.sql
index c8ebd45022b67..4051374c82c46 100644
--- a/installation/sql/mysql/joomla.sql
+++ b/installation/sql/mysql/joomla.sql
@@ -642,7 +642,7 @@ INSERT INTO `#__extensions` (`extension_id`, `package_id`, `name`, `type`, `elem
(484, 0, 'plg_media-action_resize', 'plugin', 'resize', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
(485, 0, 'plg_media-action_rotate', 'plugin', 'rotate', 'media-action', 0, 1, 1, 0, '', '{}', 0, '0000-00-00 00:00:00', 0, 0, ''),
(509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
-(510, 0, 'aurora', 'template', 'aurora', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
+(510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '0000-00-00 00:00:00', 0, 0, ''),
(600, 802, 'English (en-GB)', 'language', 'en-GB', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
(601, 802, 'English (en-GB)', 'language', 'en-GB', '', 1, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
(700, 0, 'files_joomla', 'file', 'joomla', '', 0, 1, 1, 1, '', '', 0, '0000-00-00 00:00:00', 0, 0, ''),
@@ -1771,7 +1771,7 @@ CREATE TABLE IF NOT EXISTS `#__template_styles` (
INSERT INTO `#__template_styles` (`id`, `template`, `client_id`, `home`, `title`, `params`) VALUES
(10, 'atum', 1, '1', 'atum - Default', ''),
-(11, 'aurora', 0, '1', 'aurora - Default', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}');
+(11, 'cassiopeia', 0, '1', 'cassiopeia - Default', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}');
-- --------------------------------------------------------
diff --git a/installation/sql/mysql/sample_testing.sql b/installation/sql/mysql/sample_testing.sql
index 2f5b49290280b..bae08d42e4566 100644
--- a/installation/sql/mysql/sample_testing.sql
+++ b/installation/sql/mysql/sample_testing.sql
@@ -563,7 +563,7 @@ INSERT INTO `#__menu_types` (`id`, `asset_id`, `menutype`, `title`, `description
--
INSERT INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, `position`, `checked_out`, `checked_out_time`, `publish_up`, `publish_down`, `published`, `module`, `access`, `showtitle`, `params`, `client_id`, `language`) VALUES
-(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":" _menu","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Aurora-default"}', 0, '*'),
+(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":" _menu","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
(3, 'Popular Articles', '', '', 2, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
(4, 'Recently Added Articles', '', '', 1, 'cpanel', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
(8, 'Toolbar', '', '', 1, 'toolbar', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_toolbar', 3, 1, '', 1, '*'),
@@ -573,7 +573,7 @@ INSERT INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, `positio
(13, 'Admin Submenu', '', '', 1, 'submenu', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_submenu', 3, 1, '', 1, '*'),
(14, 'User Status', '', '', 2, 'status', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_status', 3, 1, '', 1, '*'),
(15, 'Title', '', '', 1, 'title', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'),
-(16, 'Login Form', '', '', 2, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Aurora-cardGrey"}', 0, '*'),
+(16, 'Login Form', '', '', 2, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Cassiopeia-cardGrey"}', 0, '*'),
(17, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
(18, 'Book Store', '', '', 1, 'position-10', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
(19, 'User Menu', '', '', 3, 'sidebar-right', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":" _menu","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
@@ -624,24 +624,24 @@ INSERT INTO `#__modules` (`id`, `title`, `note`, `content`, `ordering`, `positio
(94, 'Similar Tags', '', '', 1, '', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(95, 'Syndicate Feeds', '', '', 1, 'position-8', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_syndicate', 1, 1, '{"display_text":1,"text":"Feed Entries","format":"rss","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(97, 'Similar Tags 2', '', '', 1, 'position-8', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(98, 'Top-a', '', '\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-top
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-bottom
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-top
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-bottom
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
', 1, 'banner', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(120, 'Footer', '', '© Joomla! CMS', 1, 'footer', 0, '0000-00-00 00:00:00', '0000-00-00 00:00:00', '0000-00-00 00:00:00', 1, 'mod_custom', 1, 1, '', 0, '*');
diff --git a/installation/sql/postgresql/joomla.sql b/installation/sql/postgresql/joomla.sql
index 8b5bc7b62123d..a62580cb21fc2 100644
--- a/installation/sql/postgresql/joomla.sql
+++ b/installation/sql/postgresql/joomla.sql
@@ -659,7 +659,7 @@ INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "elem
INSERT INTO "#__extensions" ("extension_id", "package_id", "name", "type", "element", "folder", "client_id", "enabled", "access", "protected", "manifest_cache", "params", "checked_out", "checked_out_time", "ordering", "state", "namespace") VALUES
(509, 0, 'atum', 'template', 'atum', '', 1, 1, 1, 0, '', '', 0, '1970-01-01 00:00:00', 0, 0, ''),
-(510, 0, 'aurora', 'template', 'aurora', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '1970-01-01 00:00:00', 0, 0, '');
+(510, 0, 'cassiopeia', 'template', 'cassiopeia', '', 0, 1, 1, 0, '', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}', 0, '1970-01-01 00:00:00', 0, 0, '');
SELECT setval('#__extensions_extension_id_seq', 10000, false);
@@ -1745,7 +1745,7 @@ CREATE INDEX "#__template_styles_idx_home" ON "#__template_styles" ("home");
INSERT INTO "#__template_styles" ("id", "template", "client_id", "home", "title", "params") VALUES
(10, 'atum', 1, '1', 'atum - Default', ''),
-(11, 'aurora', 0, '1', 'aurora - Default', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}');
+(11, 'cassiopeia', 0, '1', 'cassiopeia - Default', '{"logoFile":"","fluidContainer":"0","sidebarLeftWidth":"3","sidebarRightWidth":"3"}');
SELECT setval('#__template_styles_id_seq', 11, false);
diff --git a/installation/sql/postgresql/sample_testing.sql b/installation/sql/postgresql/sample_testing.sql
index 122c30c9cde3d..7142411f6ca57 100644
--- a/installation/sql/postgresql/sample_testing.sql
+++ b/installation/sql/postgresql/sample_testing.sql
@@ -574,7 +574,7 @@ SELECT setval('#__menu_types_id_seq', max(id)) FROM "#__menu_types";
--
INSERT INTO "#__modules" ("id", "title", "note", "content", "ordering", "position", "checked_out", "checked_out_time", "publish_up", "publish_down", "published", "module", "access", "showtitle", "params", "client_id", "language") VALUES
-(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '2017-03-22 14:43:08', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":" _menu","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Aurora-default"}', 0, '*'),
+(1, 'Main Menu', '', '', 1, 'sidebar-right', 0, '2017-03-22 14:43:08', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 1, 1, '{"menutype":"mainmenu","base":"","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"_:default","moduleclass_sfx":" _menu","cache":"1","cache_time":"900","cachemode":"itemid","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"Cassiopeia-default"}', 0, '*'),
(3, 'Popular Articles', '', '', 2, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_popular', 3, 1, '{"count":"5","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
(4, 'Recently Added Articles', '', '', 1, 'cpanel', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_latest', 3, 1, '{"count":"5","ordering":"c_dsc","catid":"","user_id":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"6","header_tag":"h3","header_class":"","style":"0"}', 1, '*'),
(8, 'Toolbar', '', '', 1, 'toolbar', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_toolbar', 3, 1, '', 1, '*'),
@@ -584,7 +584,7 @@ INSERT INTO "#__modules" ("id", "title", "note", "content", "ordering", "positio
(13, 'Admin Submenu', '', '', 1, 'submenu', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_submenu', 3, 1, '', 1, '*'),
(14, 'User Status', '', '', 2, 'status', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_status', 3, 1, '', 1, '*'),
(15, 'Title', '', '', 1, 'title', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_title', 3, 1, '', 1, '*'),
-(16, 'Login Form', '', '', 2, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Aurora-cardGrey"}', 0, '*'),
+(16, 'Login Form', '', '', 2, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_login', 1, 1, '{"pretext":"","posttext":"","login":"","logout":"","greeting":"1","profilelink":"0","name":"0","usetext":"0","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"card-title","style":"Cassiopeia-cardGrey"}', 0, '*'),
(17, 'Breadcrumbs', '', '', 1, 'breadcrumbs', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_breadcrumbs', 1, 1, '{"moduleclass_sfx":"","showHome":"1","homeText":"","showComponent":"1","separator":"","cache":"0","cache_time":"0","cachemode":"itemid"}', 0, '*'),
(18, 'Book Store', '', '', 1, 'position-10', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_banners', 1, 0, '{"target":"1","count":"1","cid":"3","catid":[""],"tag_search":"0","ordering":"0","header_text":"","footer_text":"Books!","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900"}', 0, '*'),
(19, 'User Menu', '', '', 3, 'sidebar-right', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_menu', 2, 1, '{"menutype":"usermenu","startLevel":"1","endLevel":"0","showAllChildren":"1","tag_id":"","class_sfx":"","window_open":"","layout":"","moduleclass_sfx":" _menu","cache":"1","cache_time":"900","cachemode":"itemid"}', 0, '*'),
@@ -635,24 +635,24 @@ INSERT INTO "#__modules" ("id", "title", "note", "content", "ordering", "positio
(94, 'Similar Tags', '', '', 1, '', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(95, 'Syndicate Feeds', '', '', 1, 'position-8', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_syndicate', 1, 1, '{"display_text":1,"text":"Feed Entries","format":"rss","layout":"_:default","moduleclass_sfx":"","cache":"0","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(97, 'Similar Tags 2', '', '', 1, 'position-8', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_tags_similar', 1, 1, '{"maximum":"5","matchtype":"any","layout":"_:default","moduleclass_sfx":"","owncache":"1","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
-(98, 'Top-a', '', '\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-top
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-bottom
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Top-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-top
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Main-bottom
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
\r\n
Bottom-a
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
\r\n
New
\r\n
Bottom-b
\r\n
Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua.
\r\n
', 1, 'banner', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 0, '{"prepare_content":"0","backgroundimage":"","layout":"_:default","moduleclass_sfx":"","cache":"1","cache_time":"900","cachemode":"static","module_tag":"div","bootstrap_size":"0","header_tag":"h3","header_class":"","style":"0"}', 0, '*'),
(120, 'Footer', '', '© Joomla! CMS', 1, 'footer', 0, '1970-01-01 00:00:00', '1970-01-01 00:00:00', '1970-01-01 00:00:00', 1, 'mod_custom', 1, 1, '', 0, '*');
diff --git a/language/en-GB/en-GB.tpl_aurora.ini b/language/en-GB/en-GB.tpl_aurora.ini
deleted file mode 100644
index 85fb21fa7c232..0000000000000
--- a/language/en-GB/en-GB.tpl_aurora.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-TPL_AURORA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Aurora is the Joomla 4 site template based on Bootstrap 4."
-
-TPL_AURORA_BACKTOTOP="Back to Top"
-TPL_AURORA_FLUID="Fluid"
-TPL_AURORA_FLUID_LABEL="Fluid Layout"
-TPL_AURORA_FLUID_DESC="Use Bootstrap's fluid or static container (both are responsive)."
-TPL_AURORA_LOGO_LABEL="Logo"
-TPL_AURORA_LOGO_DESC="Select or upload a custom logo for the site template."
-TPL_AURORA_SIDEBAR_LEFT_WIDTH_LABEL="Left Sidebar column width"
-TPL_AURORA_SIDEBAR_LEFT_WIDTH_DESC="Select the column width of the left sidebar"
-TPL_AURORA_SIDEBAR_RIGHT_WIDTH_LABEL="Right Sidebar column width"
-TPL_AURORA_SIDEBAR_RIGHT_WIDTH_DESC="Select the column width of the left sidebar"
-TPL_AURORA_STATIC="Static"
-TPL_AURORA_TOGGLE="Toggle Navigation"
-
diff --git a/language/en-GB/en-GB.tpl_aurora.sys.ini b/language/en-GB/en-GB.tpl_aurora.sys.ini
deleted file mode 100644
index 95e1e1a7a2a9c..0000000000000
--- a/language/en-GB/en-GB.tpl_aurora.sys.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-TPL_AURORA_POSITION_MENU="Menu"
-TPL_AURORA_POSITION_SEARCH="Search"
-TPL_AURORA_POSITION_BANNER="Banner"
-TPL_AURORA_POSITION_TOP_A="Top-a"
-TPL_AURORA_POSITION_TOP_B="Top-b"
-TPL_AURORA_POSITION_MAIN_TOP="Main-top"
-TPL_AURORA_POSITION_BREADCRUMBS="Breadcrumbs"
-TPL_AURORA_POSITION_MAIN_BOTTOM="Main-bottom"
-TPL_AURORA_POSITION_SIDEBAR_LEFT="Sidebar-left"
-TPL_AURORA_POSITION_SIDEBAR_RIGHT="Sidebar-right"
-TPL_AURORA_POSITION_BOTTOM_A="Bottom-a"
-TPL_AURORA_POSITION_BOTTOM_B="Bottom-b"
-TPL_AURORA_POSITION_FOOTER="Footer"
-TPL_AURORA_POSITION_DEBUG="Debug"
-TPL_AURORA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Aurora is the Joomla 4 site template based on Bootstrap 4."
diff --git a/language/en-GB/en-GB.tpl_cassiopeia.ini b/language/en-GB/en-GB.tpl_cassiopeia.ini
new file mode 100644
index 0000000000000..7fa565ef702e1
--- /dev/null
+++ b/language/en-GB/en-GB.tpl_cassiopeia.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Cassiopeia is the Joomla 4 site template based on Bootstrap 4."
+
+TPL_CASSIOPEIA_BACKTOTOP="Back to Top"
+TPL_CASSIOPEIA_FLUID="Fluid"
+TPL_CASSIOPEIA_FLUID_LABEL="Fluid Layout"
+TPL_CASSIOPEIA_FLUID_DESC="Use Bootstrap's fluid or static container (both are responsive)."
+TPL_CASSIOPEIA_LOGO_LABEL="Logo"
+TPL_CASSIOPEIA_LOGO_DESC="Select or upload a custom logo for the site template."
+TPL_CASSIOPEIA_SIDEBAR_LEFT_WIDTH_LABEL="Left Sidebar column width"
+TPL_CASSIOPEIA_SIDEBAR_LEFT_WIDTH_DESC="Select the column width of the left sidebar"
+TPL_CASSIOPEIA_SIDEBAR_RIGHT_WIDTH_LABEL="Right Sidebar column width"
+TPL_CASSIOPEIA_SIDEBAR_RIGHT_WIDTH_DESC="Select the column width of the left sidebar"
+TPL_CASSIOPEIA_STATIC="Static"
+TPL_CASSIOPEIA_TOGGLE="Toggle Navigation"
+
diff --git a/language/en-GB/en-GB.tpl_cassiopeia.sys.ini b/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
new file mode 100644
index 0000000000000..d63d2bc747842
--- /dev/null
+++ b/language/en-GB/en-GB.tpl_cassiopeia.sys.ini
@@ -0,0 +1,20 @@
+; Joomla! Project
+; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
+; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
+; Note : All ini files need to be saved as UTF-8
+
+TPL_CASSIOPEIA_POSITION_MENU="Menu"
+TPL_CASSIOPEIA_POSITION_SEARCH="Search"
+TPL_CASSIOPEIA_POSITION_BANNER="Banner"
+TPL_CASSIOPEIA_POSITION_TOP_A="Top-a"
+TPL_CASSIOPEIA_POSITION_TOP_B="Top-b"
+TPL_CASSIOPEIA_POSITION_MAIN_TOP="Main-top"
+TPL_CASSIOPEIA_POSITION_BREADCRUMBS="Breadcrumbs"
+TPL_CASSIOPEIA_POSITION_MAIN_BOTTOM="Main-bottom"
+TPL_CASSIOPEIA_POSITION_SIDEBAR_LEFT="Sidebar-left"
+TPL_CASSIOPEIA_POSITION_SIDEBAR_RIGHT="Sidebar-right"
+TPL_CASSIOPEIA_POSITION_BOTTOM_A="Bottom-a"
+TPL_CASSIOPEIA_POSITION_BOTTOM_B="Bottom-b"
+TPL_CASSIOPEIA_POSITION_FOOTER="Footer"
+TPL_CASSIOPEIA_POSITION_DEBUG="Debug"
+TPL_CASSIOPEIA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0 and Milkyway from 1.5), Cassiopeia is the Joomla 4 site template based on Bootstrap 4."
diff --git a/libraries/src/Application/SiteApplication.php b/libraries/src/Application/SiteApplication.php
index 049b3e41b8223..9d2c4323f7232 100644
--- a/libraries/src/Application/SiteApplication.php
+++ b/libraries/src/Application/SiteApplication.php
@@ -537,12 +537,12 @@ public function getTemplate($params = false)
{
$this->enqueueMessage(\JText::_('JERROR_ALERTNOTEMPLATE'), 'error');
- // Try to find data for 'aurora' template
+ // Try to find data for 'cassiopeia' template
$original_tmpl = $template->template;
foreach ($templates as $tmpl)
{
- if ($tmpl->template === 'aurora')
+ if ($tmpl->template === 'cassiopeia')
{
$template = $tmpl;
break;
diff --git a/libraries/src/Extension/ExtensionHelper.php b/libraries/src/Extension/ExtensionHelper.php
index 2e383f1fe02d3..b06da79927dc1 100644
--- a/libraries/src/Extension/ExtensionHelper.php
+++ b/libraries/src/Extension/ExtensionHelper.php
@@ -250,7 +250,7 @@ class ExtensionHelper
array('template', 'atum', '', 1),
// Core template extensions - site
- array('template', 'aurora', '', 0),
+ array('template', 'cassiopeia', '', 0),
);
/**
diff --git a/scss-lint.yml b/scss-lint.yml
index 85440e8c8069a..6197f7d5f763d 100644
--- a/scss-lint.yml
+++ b/scss-lint.yml
@@ -4,7 +4,7 @@ scss_files:
exclude:
- "scss/_normalize.scss"
- - "templates/aurora/scss/blocks/_css-grid.scss"
+ - "templates/cassiopeia/scss/blocks/_css-grid.scss"
- "media/vendor/bootstrap/scss/**/*.scss"
plugin_directories: ['.scss-linters']
diff --git a/templates/aurora/language/en-GB/en-GB.tpl_aurora.ini b/templates/aurora/language/en-GB/en-GB.tpl_aurora.ini
deleted file mode 100644
index 3bf7295551b3e..0000000000000
--- a/templates/aurora/language/en-GB/en-GB.tpl_aurora.ini
+++ /dev/null
@@ -1,12 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-TPL_AURORA_BACKTOTOP="Back to Top"
-TPL_AURORA_FLUID="Fluid"
-TPL_AURORA_FLUID_LABEL="Fluid Layout"
-TPL_AURORA_LOGO_LABEL="Logo"
-TPL_AURORA_STATIC="Static"
-TPL_AURORA_TOGGLE="Toggle Navigation"
-TPL_AURORA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar for 3.0), Aurora is the Joomla 4 administrator template based on Bootstrap 4."
diff --git a/templates/aurora/language/en-GB/en-GB.tpl_aurora.sys.ini b/templates/aurora/language/en-GB/en-GB.tpl_aurora.sys.ini
deleted file mode 100644
index 4b1fa4ee30b3d..0000000000000
--- a/templates/aurora/language/en-GB/en-GB.tpl_aurora.sys.ini
+++ /dev/null
@@ -1,20 +0,0 @@
-; Joomla! Project
-; Copyright (C) 2005 - 2017 Open Source Matters. All rights reserved.
-; License GNU General Public License version 2 or later; see LICENSE.txt, see LICENSE.php
-; Note : All ini files need to be saved as UTF-8
-
-TPL_AURORA_POSITION_MENU="Menu"
-TPL_AURORA_POSITION_SEARCH="Search"
-TPL_AURORA_POSITION_BANNER="Banner"
-TPL_AURORA_POSITION_TOP_A="Top-a"
-TPL_AURORA_POSITION_TOP_B="Top-b"
-TPL_AURORA_POSITION_MAIN_TOP="Main-top"
-TPL_AURORA_POSITION_BREADCRUMBS="Breadcrumbs"
-TPL_AURORA_POSITION_MAIN_BOTTOM="Main-bottom"
-TPL_AURORA_POSITION_SIDEBAR_LEFT="Sidebar-left"
-TPL_AURORA_POSITION_SIDEBAR_RIGHT="Sidebar-right"
-TPL_AURORA_POSITION_BOTTOM_A="Bottom-a"
-TPL_AURORA_POSITION_BOTTOM_B="Bottom-b"
-TPL_AURORA_POSITION_FOOTER="Footer"
-TPL_AURORA_POSITION_DEBUG="Debug"
-TPL_AURORA_XML_DESCRIPTION="Continuing the space theme (Solarflare from 1.0, Milkyway from 1.5 and Protostar for 3.0), Aurora is the Joomla 4 administrator template based on Bootstrap 4."
diff --git a/templates/aurora/component.php b/templates/cassiopeia/component.php
similarity index 95%
rename from templates/aurora/component.php
rename to templates/cassiopeia/component.php
index bd9d9cd326cb6..6f4aaa333506c 100644
--- a/templates/aurora/component.php
+++ b/templates/cassiopeia/component.php
@@ -1,7 +1,7 @@
-