diff --git a/templates/clips.html.twig b/templates/clips.html.twig
index 5e2a355..7ff7c49 100644
--- a/templates/clips.html.twig
+++ b/templates/clips.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/clips/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/clips/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/clips/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/clips/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/clips/assets/inline.bundle.js') %}
-    {% do assets.addJs('/clips/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/clips/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/clips/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}
 
diff --git a/templates/gifted-subs.html.twig b/templates/gifted-subs.html.twig
index 46bb523..6e86555 100644
--- a/templates/gifted-subs.html.twig
+++ b/templates/gifted-subs.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/gifted-subs/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/gifted-subs/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/gifted-subs/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/gifted-subs/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/gifted-subs/assets/inline.bundle.js') %}
-    {% do assets.addJs('/gifted-subs/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/gifted-subs/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/gifted-subs/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}
 
diff --git a/templates/merchandise.html.twig b/templates/merchandise.html.twig
index 6b26ce6..43b83bf 100644
--- a/templates/merchandise.html.twig
+++ b/templates/merchandise.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/merchandise/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/merchandise/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/merchandise/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/merchandise/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/merchandise/assets/inline.bundle.js') %}
-    {% do assets.addJs('/merchandise/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/merchandise/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/merchandise/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}
 
diff --git a/templates/modular-with-schedule.html.twig b/templates/modular-with-schedule.html.twig
index 877568f..4c419bd 100644
--- a/templates/modular-with-schedule.html.twig
+++ b/templates/modular-with-schedule.html.twig
@@ -11,6 +11,9 @@
 
 {% block javascripts %}
     {% do assets.add('theme://js/singlepagenav.min.js') %}
+    {% do assets.addJs('/schedule/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/schedule/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/schedule/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
@@ -43,12 +46,6 @@
     });
     </script>
 
-    {% do assets.addJs('/schedule/assets/inline.bundle.js') %}
-    {% do assets.addJs('/schedule/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/schedule/assets/main.bundle.js') %}
-
-    {{ assets.js() }}
-
 {% endblock %}
 
 {% block hero %}
diff --git a/templates/quotes.html.twig b/templates/quotes.html.twig
index 40be4c8..8256f3b 100644
--- a/templates/quotes.html.twig
+++ b/templates/quotes.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/quotes/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/quotes/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/quotes/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/quotes/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/quotes/assets/inline.bundle.js') %}
-    {% do assets.addJs('/quotes/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/quotes/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/quotes/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}
 
diff --git a/templates/regular-subs.html.twig b/templates/regular-subs.html.twig
index 628256f..fd14964 100644
--- a/templates/regular-subs.html.twig
+++ b/templates/regular-subs.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/regular-subs/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/regular-subs/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/regular-subs/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/regular-subs/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/regular-subs/assets/inline.bundle.js') %}
-    {% do assets.addJs('/regular-subs/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/regular-subs/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/regular-subs/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}
 
diff --git a/templates/schedule.html.twig b/templates/schedule.html.twig
index 10f1df7..bd29a43 100644
--- a/templates/schedule.html.twig
+++ b/templates/schedule.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/schedule/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/schedule/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/schedule/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/schedule/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/schedule/assets/inline.bundle.js') %}
-    {% do assets.addJs('/schedule/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/schedule/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/schedule/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}
 
diff --git a/templates/twitch-logs.html.twig b/templates/twitch-logs.html.twig
index a6b6597..89d6791 100644
--- a/templates/twitch-logs.html.twig
+++ b/templates/twitch-logs.html.twig
@@ -7,21 +7,19 @@
 
 {% endblock head %}
 
-{% block stylesheets %}
-    {% do assets.addCss('/twitch-logs/assets/styles.bundle.css') %}
+{% block javascripts %}
+    {% do assets.addJs('/twitch-logs/assets/inline.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/twitch-logs/assets/polyfills.bundle.js', {group: 'bottom'}) %}
+    {% do assets.addJs('/twitch-logs/assets/main.bundle.js', {group: 'bottom'}) %}
 
     {{ parent() }}
 
 {% endblock %}
 
-{% block bottom %}
-    {{ parent() }}
-
-    {% do assets.addJs('/twitch-logs/assets/inline.bundle.js') %}
-    {% do assets.addJs('/twitch-logs/assets/polyfills.bundle.js') %}
-    {% do assets.addJs('/twitch-logs/assets/main.bundle.js') %}
+{% block stylesheets %}
+    {% do assets.addCss('/twitch-logs/assets/styles.bundle.css') %}
 
-    {{ assets.js() }}
+    {{ parent() }}
 
 {% endblock %}