diff --git a/RIGS/templates/base_rigs.html b/RIGS/templates/base_rigs.html
index 39ccaf4a..1bb89d51 100644
--- a/RIGS/templates/base_rigs.html
+++ b/RIGS/templates/base_rigs.html
@@ -74,6 +74,7 @@
 {% endblock %}
 
 {% block js %}
+{{ block.super }}
 <script src="{% static 'js/tooltip.js' %}"></script>
 <script src="{% static 'js/popover.js' %}"></script>
 <script>
diff --git a/templates/base.html b/templates/base.html
index 96f7ae5e..858481d2 100644
--- a/templates/base.html
+++ b/templates/base.html
@@ -81,7 +81,7 @@
 <div class="modal fade" id="modal" role="dialog" tabindex=-1></div>
 <script src="{% static 'js/base.js' %}"></script>
 <script>
-if({{ request.user.dark_theme|lower }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
+if({{ request.user.dark_theme|lower|default:'false' }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
     $('<link>').appendTo('head').attr({type : 'text/css', rel : 'stylesheet'}).attr('href', '{% static "css/dark_screen.css" %}');
     document.body.setAttribute('data-theme', 'dark');
 }
diff --git a/templates/base_embed.html b/templates/base_embed.html
index 93039b6f..ddbc6015 100644
--- a/templates/base_embed.html
+++ b/templates/base_embed.html
@@ -36,7 +36,7 @@
     </div>
 </div>
 <script>
-if({{ request.user.dark_theme|lower }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
+if({{ request.user.dark_theme|lower|default:'false' }} || window.matchMedia('(prefers-color-scheme: dark)').matches) {
     $('<link>').appendTo('head').attr({type : 'text/css', rel : 'stylesheet'}).attr('href', '{% static "css/dark_screen.css" %}');
     document.body.setAttribute('data-theme', 'dark');
 }