diff --git a/corpus/templates/embedathon/admin.html b/corpus/templates/embedathon/admin.html
index 759af1b9..641f7d5e 100644
--- a/corpus/templates/embedathon/admin.html
+++ b/corpus/templates/embedathon/admin.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    Admin | Embedathon
+    Admin
+    {{ block.super }}
 {% endblock %}
 
 {% block content %}
diff --git a/corpus/templates/embedathon/base.html b/corpus/templates/embedathon/base.html
new file mode 100644
index 00000000..f9276aa3
--- /dev/null
+++ b/corpus/templates/embedathon/base.html
@@ -0,0 +1,24 @@
+{% extends 'base.html' %}
+
+{% block title %}
+| Embedathon
+{% endblock %}
+
+{% block script %}
+    <script>
+        document.addEventListener("DOMContentLoaded", function () {
+            const theme = "synthwave";
+            const currTheme = localStorage.getItem("corpusTheme");
+            const themeButton = document.getElementById("dark-mode-button");
+            themeButton.remove();
+            localStorage.setItem("corpusThemeArchive", currTheme);
+            localStorage.setItem("corpusTheme", theme);
+            document.documentElement.setAttribute("data-theme", theme);
+        });
+
+        window.addEventListener("beforeunload", function (event) {
+            const oldTheme = localStorage.getItem("corpusThemeArchive");
+            localStorage.setItem("corpusTheme", oldTheme);
+        })
+    </script>
+{% endblock %}
diff --git a/corpus/templates/embedathon/home.html b/corpus/templates/embedathon/home.html
index 976a7cfa..b4505b69 100644
--- a/corpus/templates/embedathon/home.html
+++ b/corpus/templates/embedathon/home.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    Home | Embedathon
+    Home
+    {{ block.super }}
 {% endblock %}
 
 {% block content %}
@@ -203,22 +204,3 @@ <h2>Contact</h2>
         <div class="md:basis-1/6"></div>
     </div>
 {% endblock %}
-
-{% block script %}
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            const theme = "synthwave";
-            const currTheme = localStorage.getItem("corpusTheme");
-            const themeButton = document.getElementById("dark-mode-button");
-            themeButton.remove();
-            localStorage.setItem("corpusThemeArchive", currTheme);
-            localStorage.setItem("corpusTheme", theme);
-            document.documentElement.setAttribute("data-theme", theme);
-        });
-
-        window.addEventListener("beforeunload", function (event) {
-            const oldTheme = localStorage.getItem("corpusThemeArchive");
-            localStorage.setItem("corpusTheme", oldTheme);
-        })
-    </script>
-{% endblock %}
diff --git a/corpus/templates/embedathon/index.html b/corpus/templates/embedathon/index.html
index bf6a6022..f2b33788 100644
--- a/corpus/templates/embedathon/index.html
+++ b/corpus/templates/embedathon/index.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    Dashboard | Embedathon
+    Dashboard
+    {{ block.super }}
 {% endblock %}
 
 {% block content %}
@@ -156,22 +157,3 @@ <h3>Create a team</h3>
         </div>
     </div>
 {% endblock %}
-
-{% block script %}
-    <script>
-        document.addEventListener("DOMContentLoaded", function () {
-            const theme = "synthwave";
-            const currTheme = localStorage.getItem("corpusTheme");
-            const themeButton = document.getElementById("dark-mode-button");
-            themeButton.remove();
-            localStorage.setItem("corpusThemeArchive", currTheme);
-            localStorage.setItem("corpusTheme", theme);
-            document.documentElement.setAttribute("data-theme", theme);
-        });
-
-        window.addEventListener("beforeunload", function (event) {
-            const oldTheme = localStorage.getItem("corpusThemeArchive");
-            localStorage.setItem("corpusTheme", oldTheme);
-        })
-    </script>
-{% endblock %}
diff --git a/corpus/templates/embedathon/register.html b/corpus/templates/embedathon/register.html
index bfa12fa3..dda00698 100644
--- a/corpus/templates/embedathon/register.html
+++ b/corpus/templates/embedathon/register.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    Register | Embedathon
+    Register
+    {{ block.title }}
 {% endblock %}
 
 {% block content %}
@@ -128,6 +129,7 @@ <h1 class="text-center">Register for Embedathon</h1>
 {% endblock %}
 
 {% block script %}
+    {{ block.super }}
     <script>
         document.addEventListener("DOMContentLoaded", function () {
             let nitkChackbox = document.getElementById("{{ form.from_nitk.id_for_label }}");
@@ -152,20 +154,5 @@ <h1 class="text-center">Register for Embedathon</h1>
             toggleIEEE();
             ieeeCheckbox.addEventListener("change", toggleIEEE);
         })
-
-        document.addEventListener("DOMContentLoaded", function () {
-            const theme = "synthwave";
-            const currTheme = localStorage.getItem("corpusTheme");
-            const themeButton = document.getElementById("dark-mode-button");
-            themeButton.remove();
-            localStorage.setItem("corpusThemeArchive", currTheme);
-            localStorage.setItem("corpusTheme", theme);
-            document.documentElement.setAttribute("data-theme", theme);
-        });
-
-        window.addEventListener("beforeunload", function (event) {
-            const oldTheme = localStorage.getItem("corpusThemeArchive");
-            localStorage.setItem("corpusTheme", oldTheme);
-        })
     </script>
 {% endblock %}
diff --git a/corpus/templates/embedathon/team_management.html b/corpus/templates/embedathon/team_management.html
index b7e829c6..a13a7203 100644
--- a/corpus/templates/embedathon/team_management.html
+++ b/corpus/templates/embedathon/team_management.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    Team Management | Embedathon
+    Team Management
+    {{ block.super }}
 {% endblock %}
 
 {% block content %}
diff --git a/corpus/templates/embedathon/team_page.html b/corpus/templates/embedathon/team_page.html
index 8134097d..05bc3e38 100644
--- a/corpus/templates/embedathon/team_page.html
+++ b/corpus/templates/embedathon/team_page.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    {{ team.team_name }} | Team Management | Embedathon
+    {{ team.team_name }} | Team Management
+    {{ block.super }}
 {% endblock %}
 
 {% block content %}
@@ -50,4 +51,4 @@ <h3>Members</h3>
         <a href="{% url 'embedathon_admin_teams' %}"
            class="btn btn-secondary text-black font-bold no-underline">Back</a>
     </div>
-{% endblock %}
+{% endblock %}
diff --git a/corpus/templates/embedathon/user_management.html b/corpus/templates/embedathon/user_management.html
index fbd89c48..dc9efcf2 100644
--- a/corpus/templates/embedathon/user_management.html
+++ b/corpus/templates/embedathon/user_management.html
@@ -1,7 +1,8 @@
-{% extends 'base.html' %}
+{% extends 'embedathon/base.html' %}
 
 {% block title %}
-    User Management | Admin | Embedathon
+    User Management | Admin
+    {{ block.super }}
 {% endblock %}
 
 {% block content %}
@@ -43,4 +44,4 @@ <h1 class="text-center">User Management</h1>
 
         <a href="{% url 'embedathon_admin' %}" class="btn btn-secondary text-black font-bold no-underline">Back</a>
     </div>
-{% endblock %}
+{% endblock %}