diff --git a/templates/banned.html b/templates/banned.html
index 65d66281..1dcdc8e8 100644
--- a/templates/banned.html
+++ b/templates/banned.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 {# Automatically removes unnecessary whitespace #}
 <div class="ban">
 	<iframe width="420" height="315" src="https://www.youtube.com/embed/FXPKJUE86d0" frameborder="0" allowfullscreen></iframe>
@@ -142,4 +142,4 @@
 		{% endif %}
 	{% endif %}
 </div>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/notbanned.html b/templates/notbanned.html
index 6654b6d6..25e6f88f 100644
--- a/templates/notbanned.html
+++ b/templates/notbanned.html
@@ -1,7 +1,7 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 {# Automatically removes unnecessary whitespace #}
 <div class="ban">
   <h2>You are not banned!</h2>
   <p class="reason">Well done on not being terrible!</p>
 </div>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/post_thread_fileboard.html b/templates/post_thread_fileboard.html
index 1a11ff79..c1fe2b9b 100644
--- a/templates/post_thread_fileboard.html
+++ b/templates/post_thread_fileboard.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 {# tabs and new lines will be ignored #}
 
 {# we are intentionally breaking the thread_ID convention: the jses need to handle this case differently #}
@@ -39,4 +39,4 @@
     <a href="{{ post.root }}{{ board.dir }}{{ config.dir.res }}{{ link_for(post) }}">[{% trans %}Reply{% endtrans %}]</a>
 
 </tr>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/basic/index.html b/templates/themes/basic/index.html
index d5d1c820..79c60509 100644
--- a/templates/themes/basic/index.html
+++ b/templates/themes/basic/index.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -54,4 +54,4 @@
 	{% endverbatim %}</script>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/catalog/catalog.html b/templates/themes/catalog/catalog.html
index 12542a70..3be4152e 100644
--- a/templates/themes/catalog/catalog.html
+++ b/templates/themes/catalog/catalog.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -105,4 +105,4 @@
 	{% endverbatim %}</script>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/categories/news.html b/templates/themes/categories/news.html
index 34f71364..27aeed16 100644
--- a/templates/themes/categories/news.html
+++ b/templates/themes/categories/news.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <div class="introduction">
   <style style="display:none;">
     .home-logo {
@@ -107,5 +107,5 @@
 		<br><b>Leftychan.net is not currently under investigation by any Federal, State, or Local Authorities.</b></p>
 	</footer>
 </div>
-{% endfilter %}
+{% endapply %}
 
diff --git a/templates/themes/categories/sidebar.html b/templates/themes/categories/sidebar.html
index 2a53855c..53c93f7f 100644
--- a/templates/themes/categories/sidebar.html
+++ b/templates/themes/categories/sidebar.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <div class="sidebar">
 	<fieldset>
 		<legend>{{ settings.title }}</legend>
@@ -45,4 +45,4 @@
 	{% endfor %}
 </div>
 
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/donate/donate.html b/templates/themes/donate/donate.html
index b64f16f5..cfcc535b 100644
--- a/templates/themes/donate/donate.html
+++ b/templates/themes/donate/donate.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!DOCTYPE html>
 <html>
   <head>
@@ -58,4 +58,4 @@
 
   </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/faq/index.html b/templates/themes/faq/index.html
index 26b690f2..f3d708a3 100644
--- a/templates/themes/faq/index.html
+++ b/templates/themes/faq/index.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -157,5 +157,5 @@
 {% endverbatim %}</script>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
 
diff --git a/templates/themes/frameset/news.html b/templates/themes/frameset/news.html
index 0719079f..601c25f5 100644
--- a/templates/themes/frameset/news.html
+++ b/templates/themes/frameset/news.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -38,4 +38,4 @@
         </footer>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/frameset/sidebar.html b/templates/themes/frameset/sidebar.html
index 40e2d719..95e75375 100644
--- a/templates/themes/frameset/sidebar.html
+++ b/templates/themes/frameset/sidebar.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -38,4 +38,4 @@
 	</fieldset>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/irc/irc.html b/templates/themes/irc/irc.html
index 0b21aae5..b6730ea1 100644
--- a/templates/themes/irc/irc.html
+++ b/templates/themes/irc/irc.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!DOCTYPE html>
 <html>
   <head>
@@ -32,4 +32,4 @@
 	{% endverbatim %}</script>
   </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/recent/recent.html b/templates/themes/recent/recent.html
index 0d131bff..53c4a306 100644
--- a/templates/themes/recent/recent.html
+++ b/templates/themes/recent/recent.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -98,4 +98,4 @@
 	</div>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/rss/rss.xml b/templates/themes/rss/rss.xml
index 6bf34113..2556032f 100644
--- a/templates/themes/rss/rss.xml
+++ b/templates/themes/rss/rss.xml
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <?xml version="1.0" encoding="utf-8"?>
 <rss xmlns:dc="http://purl.org/dc/elements/1.1/"
      version="2.0">
@@ -25,4 +25,4 @@
     {% endfor %}
   </channel>
 </rss>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/rules/rules.html b/templates/themes/rules/rules.html
index 7c09f3f4..83c617c6 100644
--- a/templates/themes/rules/rules.html
+++ b/templates/themes/rules/rules.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!DOCTYPE html>
 <html>
   <head>
@@ -31,5 +31,5 @@
 	{% endverbatim %}</script>
   </body>
 </html>
-{% endfilter %}
+{% endapply %}
 
diff --git a/templates/themes/sitemap/sitemap.xml b/templates/themes/sitemap/sitemap.xml
index 95dfdd26..060bdf43 100644
--- a/templates/themes/sitemap/sitemap.xml
+++ b/templates/themes/sitemap/sitemap.xml
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
 	{% for board in boards %}
@@ -16,4 +16,4 @@
 		{% endfor %}
 	{% endfor %}
 </urlset>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/staffapplication/staffapplication.html b/templates/themes/staffapplication/staffapplication.html
index 132081fd..0028cb29 100644
--- a/templates/themes/staffapplication/staffapplication.html
+++ b/templates/themes/staffapplication/staffapplication.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!doctype html>
 <html>
 <head>
@@ -77,4 +77,4 @@
 	{% endverbatim %}</script>
 </body>
 </html>
-{% endfilter %}
+{% endapply %}
diff --git a/templates/themes/zine/zine.html b/templates/themes/zine/zine.html
index 3b8fce26..7b30da58 100644
--- a/templates/themes/zine/zine.html
+++ b/templates/themes/zine/zine.html
@@ -1,4 +1,4 @@
-{% filter remove_whitespace %}
+{% apply remove_whitespace %}
 <!DOCTYPE html>
 <html>
   <head>
@@ -68,4 +68,4 @@
     </div>
   </body>
 </html>
-{% endfilter %}
+{% endapply %}
