diff --git a/brutaldon/templates/base.html b/brutaldon/templates/base.html
index 3cff0b9..5dd2989 100644
--- a/brutaldon/templates/base.html
+++ b/brutaldon/templates/base.html
@@ -34,6 +34,8 @@
                           href="{% static 'css/bulma-badge.min.css' %}">
                     <link rel="stylesheet"
                           href="{% static 'css/photobox.css' %}">
+                {% endif %}
+                {% if not preferences.no_javascript %}
                     <script type="text/javascript" src="{% static 'js/jquery.min.js' %}"></script>
                     <script type="text/javascript" src="{% static 'js/intercooler.js' %}"></script>
                     <script type="text/javascript" src="{% static 'js/jquery.photobox.js' %}"></script>
@@ -165,7 +167,7 @@
             </div>
         </footer>
 
-        {% if not preferences.theme.is_brutalist %}
+        {% if not preferences.no_javascript %}
 
             <script type="application/javascript">
              $(document).ready(function () {
diff --git a/brutaldon/templates/main/post_minimal_partial.html b/brutaldon/templates/main/post_minimal_partial.html
index 3745583..ffb6071 100644
--- a/brutaldon/templates/main/post_minimal_partial.html
+++ b/brutaldon/templates/main/post_minimal_partial.html
@@ -39,7 +39,7 @@
             </a>
         </div>
     </div>
-    {% if not preferences.theme.is_brutalist %}
+    {% if not preferences.theme.no_javascript %}
         <script type="application/javascript">
          Intercooler.ready(characterCountSetup);
         </script>
diff --git a/brutaldon/templates/main/post_partial.html b/brutaldon/templates/main/post_partial.html
index c5d851c..50ddf06 100644
--- a/brutaldon/templates/main/post_partial.html
+++ b/brutaldon/templates/main/post_partial.html
@@ -127,7 +127,7 @@
            class="level-item emoji-link" title="custom emoji reference">😊</a>
     </div>
 </div>
-{% if not preferences.theme.is_brutalist %}
+{% if not preferences.no_javascript %}
     <script type="application/javascript">
      fileButtonUpdaters();
      Intercooler.ready(fileButtonUpdaters);
diff --git a/brutaldon/templates/main/thread.html b/brutaldon/templates/main/thread.html
index cc54b5f..4e3f7c5 100644
--- a/brutaldon/templates/main/thread.html
+++ b/brutaldon/templates/main/thread.html
@@ -29,7 +29,7 @@ mastodon.status_context(<numerical id>)
         <hr class="is-hidden">
     {% endfor %}
 
-    {% if not preferences.theme.is_brutalist %}
+    {% if not preferences.no_javascript %}
         <script type="application/javascript">
             Intercooler.ready(expandCWButtonPrepare);
         </script>