diff --git a/README.md b/README.md
index 34eabf7..d1ef4b0 100644
--- a/README.md
+++ b/README.md
@@ -1,4 +1,4 @@
-<!-- Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+<!-- Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
  This file is part of a Moko Consulting project.
 
diff --git a/src/administrator/language/en-GB/tpl_mokocassiopeia.sys.ini b/src/administrator/language/en-GB/tpl_mokocassiopeia.sys.ini
index 26471b4..b600142 100644
--- a/src/administrator/language/en-GB/tpl_mokocassiopeia.sys.ini
+++ b/src/administrator/language/en-GB/tpl_mokocassiopeia.sys.ini
@@ -1,4 +1,4 @@
-; ; Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+; ; Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 ;
 ; This file is part of a Moko Consulting project.
 ;
diff --git a/src/administrator/language/en-US/tpl_mokocassiopeia.sys.ini b/src/administrator/language/en-US/tpl_mokocassiopeia.sys.ini
index 38a709c..31b82ae 100644
--- a/src/administrator/language/en-US/tpl_mokocassiopeia.sys.ini
+++ b/src/administrator/language/en-US/tpl_mokocassiopeia.sys.ini
@@ -1,4 +1,4 @@
-; ; Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+; ; Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 ;
 ; This file is part of a Moko Consulting project.
 ;
diff --git a/src/language/en-GB/tpl_mokocassiopeia.ini b/src/language/en-GB/tpl_mokocassiopeia.ini
index 3a07f9e..d600b9c 100644
--- a/src/language/en-GB/tpl_mokocassiopeia.ini
+++ b/src/language/en-GB/tpl_mokocassiopeia.ini
@@ -1,4 +1,4 @@
-; Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+; Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 ;
 ; This file is part of a Moko Consulting project.
 ;
@@ -24,7 +24,6 @@ TPL_MOKOCASSIOPEIA_FLUID="Fluid"
 
 ; ===== Custom Code tab =====
 TPL_MOKOCASSIOPEIA_CUSTOM_CODE_FIELDSET="Custom Code"
-COM_TEMPLATES_CUSTOM_HEAD_FIELDSET_LABEL="Custom Head"
 TPL_MOKOCASSIOPEIA_CUSTOM_HEAD_START_LABEL="Custom Head: Start"
 TPL_MOKOCASSIOPEIA_CUSTOM_HEAD_START_DESC="This content will be inserted at the beginning of the &lt;head&gt; tag"
 TPL_MOKOCASSIOPEIA_CUSTOM_HEAD_END_LABEL="Custom Head: End"
@@ -33,14 +32,14 @@ TPL_MOKOCASSIOPEIA_OFFLINEEMBED_LABEL="Offline Page Embed Code"
 TPL_MOKOCASSIOPEIA_OFFLINEEMBED_DESC="In addition to the 'Offline message' defined in 'Global Configuration', this will be displayed on the offline page.<i>Use for Mailchimp code and Social Icons</i>"
 
 ; ===== Drawers =====
-COM_TEMPLATES_DRAWERS_FIELDSET_LABEL="Drawers"
+TPL_MOKOCASSIOPEIA_DRAWERS_FIELDSET_LABEL="Drawers"
 TPL_MOKOCASSIOPEIA_DRAWER_LEFT_ICON_LABEL="Drawer Left Icon CSS"
 TPL_MOKOCASSIOPEIA_DRAWER_LEFT_ICON_DESC="Enter the Font-Awesome class for the left drawer toggle (e.g. 'fas fa-chevron-left')."
 TPL_MOKOCASSIOPEIA_DRAWER_RIGHT_ICON_LABEL="Drawer Right Icon CSS"
 TPL_MOKOCASSIOPEIA_DRAWER_RIGHT_ICON_DESC="Enter the Font-Awesome class for the right drawer toggle (e.g. 'fas fa-chevron-right')."
 
 ; ===== Google =====
-COM_TEMPLATES_GOOGLE_FIELDSET_LABEL="Google"
+TPL_MOKOCASSIOPEIA_GOOGLE_FIELDSET_LABEL="Google"
 TPL_MOKOCASSIOPEIA_GOOGLE_NOTE_TEXT="<h3>PLEASE NOTE:</h3>If fields are left blank, relative Google features will not be used"
 TPL_MOKOCASSIOPEIA_GOOGLETAGMANAGER_LABEL="Use Google Tag Manager?"
 TPL_MOKOCASSIOPEIA_GOOGLETAGMANAGER_DESC="Do you want to use Google Tag Manager?<br>More information on Google Tag Manager can be found <a target='_blank' href='https://support.google.com/tagmanager/answer/14842164'>here.</a>"
diff --git a/src/language/en-US/tpl_mokocassiopeia.ini b/src/language/en-US/tpl_mokocassiopeia.ini
index 6aef55f..96386ab 100644
--- a/src/language/en-US/tpl_mokocassiopeia.ini
+++ b/src/language/en-US/tpl_mokocassiopeia.ini
@@ -1,4 +1,4 @@
-; ; Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+; Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 ;
 ; This file is part of a Moko Consulting project.
 ;
@@ -12,8 +12,8 @@
 ; BRIEF: English (US) language strings for the MokoCassiopeia Joomla template
 ;
 ; ===== Template meta =====
-MOKOCASSIOPEIA="MOKOCASSIOPEIA Site template"
-TPL_MOKOCASSIOPEIA_XML_DESCRIPTION="<h3>MOKOCASSIOPEIA Template Description</h3> <p>  <strong>MOKOCASSIOPEIA 3.0</strong> continues Joomla’s tradition of space-themed default templates—  building on the legacy of <em>Solarflare</em> (Joomla 1.0), <em>Milkyway</em> (Joomla 1.5),  and <em>Protostar</em> (Joomla 3.0). </p> <p>  This template is a customized fork of the <strong>Cassiopeia</strong> template introduced in Joomla 4,  preserving its modern, accessible, and mobile-first foundation while introducing new stylistic  enhancements and structural refinements specifically tailored for use by Moko Consulting. </p>  <h4>Code Attribution</h4> <p>  This template is based on the original <strong>Cassiopeia</strong> template developed by the  <a href=\"https://www.joomla.org\" target=\"_blank\" rel=\"noopener\">Joomla! Project</a> and released under the GNU General Public License. </p> <p>  Modifications and enhancements have been made by Moko Consulting in accordance with open-source licensing standards. </p> <p>  It includes integration with  <a href=\"https://afeld.github.io/bootstrap-toc/\" target=\"_blank\" rel=\"noopener\">Bootstrap TOC</a>,  an open-source table of contents generator by A. Feld, licensed under the MIT License. </p> <p>  All third-party libraries and assets remain the property of their respective authors and are credited within their source files where applicable. </p>"
+MOKOCASSIOPEIA="MokoCassiopeia Site template"
+TPL_MOKOCASSIOPEIA_XML_DESCRIPTION="<h3>MokoCassiopeia Template Description</h3> <p>  <strong>MokoCassiopeia 3.0</strong> continues Joomla’s tradition of space-themed default templates—  building on the legacy of <em>Solarflare</em> (Joomla 1.0), <em>Milkyway</em> (Joomla 1.5),  and <em>Protostar</em> (Joomla 3.0). </p> <p>  This template is a customized fork of the <strong>Cassiopeia</strong> template introduced in Joomla 4,  preserving its modern, accessible, and mobile-first foundation while introducing new stylistic  enhancements and structural refinements specifically tailored for use by Moko Consulting. </p>  <h4>Code Attribution</h4> <p>  This template is based on the original <strong>Cassiopeia</strong> template developed by the  <a href=\"https://www.joomla.org\" target=\"_blank\" rel=\"noopener\">Joomla! Project</a> and released under the GNU General Public License. </p> <p>  Modifications and enhancements have been made by Moko Consulting in accordance with open-source licensing standards. </p> <p>  It includes integration with  <a href=\"https://afeld.github.io/bootstrap-toc/\" target=\"_blank\" rel=\"noopener\">Bootstrap TOC</a>,  an open-source table of contents generator by A. Feld, licensed under the MIT License. </p> <p>  All third-party libraries and assets remain the property of their respective authors and are credited within their source files where applicable. </p>"
 
 ; ===== System / layout =====
 TPL_MOKOCASSIOPEIA_DEVELOPMENTMODE_LABEL="Development Mode"
@@ -24,7 +24,6 @@ TPL_MOKOCASSIOPEIA_FLUID="Fluid"
 
 ; ===== Custom Code tab =====
 TPL_MOKOCASSIOPEIA_CUSTOM_CODE_FIELDSET="Custom Code"
-COM_TEMPLATES_CUSTOM_HEAD_FIELDSET_LABEL="Custom Head"
 TPL_MOKOCASSIOPEIA_CUSTOM_HEAD_START_LABEL="Custom Head: Start"
 TPL_MOKOCASSIOPEIA_CUSTOM_HEAD_START_DESC="This content will be inserted at the beginning of the &lt;head&gt; tag"
 TPL_MOKOCASSIOPEIA_CUSTOM_HEAD_END_LABEL="Custom Head: End"
@@ -33,14 +32,14 @@ TPL_MOKOCASSIOPEIA_OFFLINEEMBED_LABEL="Offline Page Embed Code"
 TPL_MOKOCASSIOPEIA_OFFLINEEMBED_DESC="In addition to the 'Offline message' defined in 'Global Configuration', this will be displayed on the offline page.<i>Use for Mailchimp code and Social Icons</i>"
 
 ; ===== Drawers =====
-COM_TEMPLATES_DRAWERS_FIELDSET_LABEL="Drawers"
+TPL_MOKOCASSIOPEIA_DRAWERS_FIELDSET_LABEL="Drawers"
 TPL_MOKOCASSIOPEIA_DRAWER_LEFT_ICON_LABEL="Drawer Left Icon CSS"
 TPL_MOKOCASSIOPEIA_DRAWER_LEFT_ICON_DESC="Enter the Font-Awesome class for the left drawer toggle (e.g. 'fas fa-chevron-left')."
 TPL_MOKOCASSIOPEIA_DRAWER_RIGHT_ICON_LABEL="Drawer Right Icon CSS"
 TPL_MOKOCASSIOPEIA_DRAWER_RIGHT_ICON_DESC="Enter the Font-Awesome class for the right drawer toggle (e.g. 'fas fa-chevron-right')."
 
 ; ===== Google =====
-COM_TEMPLATES_GOOGLE_FIELDSET_LABEL="Google"
+TPL_MOKOCASSIOPEIA_GOOGLE_FIELDSET_LABEL="Google"
 TPL_MOKOCASSIOPEIA_GOOGLE_NOTE_TEXT="<h3>PLEASE NOTE:</h3>If fields are left blank, relative Google features will not be used"
 TPL_MOKOCASSIOPEIA_GOOGLETAGMANAGER_LABEL="Use Google Tag Manager?"
 TPL_MOKOCASSIOPEIA_GOOGLETAGMANAGER_DESC="Do you want to use Google Tag Manager?<br>More information on Google Tag Manager can be found <a target='_blank' href='https://support.google.com/tagmanager/answer/14842164'>here.</a>"
diff --git a/src/templates/component.php b/src/templates/component.php
index 3f47b7a..b7614a9 100644
--- a/src/templates/component.php
+++ b/src/templates/component.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
  This file is part of a Moko Consulting project.
 
diff --git a/src/templates/custom.php b/src/templates/custom.php
index 143adc4..518fcd9 100644
--- a/src/templates/custom.php
+++ b/src/templates/custom.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
  This file is part of a Moko Consulting project.
 
diff --git a/src/templates/error.php b/src/templates/error.php
index 54d6c46..a7fc67e 100644
--- a/src/templates/error.php
+++ b/src/templates/error.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
  This file is part of a Moko Consulting project.
 
diff --git a/src/templates/html/com_content/article/toc-left.php b/src/templates/html/com_content/article/toc-left.php
index c903a3f..4d91c07 100644
--- a/src/templates/html/com_content/article/toc-left.php
+++ b/src/templates/html/com_content/article/toc-left.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.MokoCassiopeia
  *
- * @copyright   (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
  * @license     GNU General Public License version 3 or later; see LICENSE.txt
  * 
  * FILE INFORMATION
diff --git a/src/templates/html/com_content/article/toc-right.php b/src/templates/html/com_content/article/toc-right.php
index 83afbad..2ec4ca9 100644
--- a/src/templates/html/com_content/article/toc-right.php
+++ b/src/templates/html/com_content/article/toc-right.php
@@ -3,7 +3,7 @@
  * @package     Joomla.Site
  * @subpackage  Templates.MokoCassiopeia
  *
- * @copyright   (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+ * @copyright   (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
  * @license     GNU General Public License version 3 or later; see LICENSE.txt
  * 
  * FILE INFORMATION
diff --git a/src/templates/index.php b/src/templates/index.php
index 4d606f5..210d850 100644
--- a/src/templates/index.php
+++ b/src/templates/index.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
  This file is part of a Moko Consulting project.
 
diff --git a/src/templates/offline.php b/src/templates/offline.php
index d1a222f..f2cef85 100644
--- a/src/templates/offline.php
+++ b/src/templates/offline.php
@@ -1,5 +1,5 @@
 <?php
-/* Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+/* Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
  This file is part of a Moko Consulting project.
 
diff --git a/src/templates/templateDetails.xml b/src/templates/templateDetails.xml
index e72a8ff..676187d 100644
--- a/src/templates/templateDetails.xml
+++ b/src/templates/templateDetails.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!-- =========================================================================
-	Copyright (C) 2025 Moko Consulting <hello@mokoconsulting.tech>
+	Copyright (C) 2026 Moko Consulting <hello@mokoconsulting.tech>
 
 	This file is part of a Moko Consulting project.
 
@@ -37,10 +37,10 @@
 	</updateservers>
 	<name>mokocassiopeia</name>
 	<version>03.06.03</version>
-	<creationDate>2025-12-23</creationDate>
+	<creationDate>2026-01-30</creationDate>
 	<author>Jonathan Miller || Moko Consulting</author>
 	<authorEmail>hello@mokoconsulting.tech</authorEmail>
-	<copyright>(C)GNU General Public License Version 3 - 2025 Moko Consulting</copyright>
+	<copyright>(C)GNU General Public License Version 3 - 2026 Moko Consulting</copyright>
 	<description>TPL_MOKOCASSIOPEIA_XML_DESCRIPTION</description>
 	<inheritable>1</inheritable>
 	<files>
@@ -114,7 +114,7 @@
 			</fieldset>
 
 			<!-- Google tab -->
-			<fieldset name="google">
+			<fieldset name="google" label="TPL_MOKOCASSIOPEIA_GOOGLE_FIELDSET_LABEL">
 				<field name="googletagmanager" type="radio" label="TPL_MOKOCASSIOPEIA_GOOGLETAGMANAGER_LABEL" description="TPL_MOKOCASSIOPEIA_GOOGLETAGMANAGER_DESC" layout="joomla.form.field.radio.switcher" filter="boolean">
 					<option value="0">JNO</option>
 					<option value="1">JYES</option>
@@ -134,7 +134,7 @@
 			</fieldset>
 
 			<!-- Drawers tab -->
-			<fieldset name="drawers">
+			<fieldset name="drawers" label="TPL_MOKOCASSIOPEIA_DRAWERS_FIELDSET_LABEL">
 				<field name="drawerLeftIcon" type="text" default="fa-solid fa-chevron-right" label="TPL_MOKOCASSIOPEIA_DRAWER_LEFT_ICON_LABEL" description="TPL_MOKOCASSIOPEIA_DRAWER_LEFT_ICON_DESC" filter="string" />
 				<field name="drawerRightIcon" type="text" default="fa-solid fa-chevron-left" label="TPL_MOKOCASSIOPEIA_DRAWER_RIGHT_ICON_LABEL" description="TPL_MOKOCASSIOPEIA_DRAWER_RIGHT_ICON_DESC" filter="string" />
 			</fieldset>