diff --git a/components/templates/src/builtins/404.html b/components/templates/src/builtins/404.html
index f7d50b1a..f8414f0e 100644
--- a/components/templates/src/builtins/404.html
+++ b/components/templates/src/builtins/404.html
@@ -1,10 +1,3 @@
 <!doctype html>
-<html>
-    <head>
-        <title>File Not Found: 404.</title>
-    </head>
-    <body>
-        <h1>Oops!</h1>
-        <h2>File Not Found: 404.</h2>
-    </body>
-</html>
+<title>404 Not Found</title>
+<h1>404 Not Found</h1>
diff --git a/components/templates/src/builtins/internal/alias.html b/components/templates/src/builtins/internal/alias.html
index 1759ae78..54f782e2 100644
--- a/components/templates/src/builtins/internal/alias.html
+++ b/components/templates/src/builtins/internal/alias.html
@@ -1,12 +1,6 @@
-<!DOCTYPE html>
-<html>
-    <head>
-        <title>Redirect</title>
-        <link rel="canonical" href="{{ url | safe }}" />
-        <meta http-equiv="content-type" content="text/html; charset=utf-8" />
-        <meta http-equiv="refresh" content="0;url={{ url | safe }}" />
-    </head>
-    <body>
-        <p><a href="{{ url | safe }}">Click here</a> to be redirected.</p>
-    </body>
-</html>
+<!doctype html>
+<meta charset="utf-8">
+<link rel="canonical" href="{{ url | safe }}">
+<meta http-equiv="refresh" content="0;url={{ url | safe }}">
+<title>Redirect</title>
+<p><a href="{{ url | safe }}">Click here</a> to be redirected.</p>
diff --git a/components/templates/src/builtins/rss.xml b/components/templates/src/builtins/rss.xml
index aecb42bf..b3ac9a51 100644
--- a/components/templates/src/builtins/rss.xml
+++ b/components/templates/src/builtins/rss.xml
@@ -8,14 +8,14 @@
         <language>{{ config.default_language }}</language>
         <atom:link href="{{ feed_url | safe }}" rel="self" type="application/rss+xml"/>
         <lastBuildDate>{{ last_build_date | date(format="%a, %d %b %Y %H:%M:%S %z") }}</lastBuildDate>
-        {% for page in pages %}
-            <item>
-                <title>{{ page.title }}</title>
-                <pubDate>{{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }}</pubDate>
-                <link>{{ page.permalink | escape_xml | safe }}</link>
-                <guid>{{ page.permalink | escape_xml | safe }}</guid>
-                <description>{% if page.summary %}{{ page.summary }}{% else %}{{ page.content }}{% endif %}</description>
-            </item>
-        {% endfor %}
+        {%- for page in pages %}
+        <item>
+            <title>{{ page.title }}</title>
+            <pubDate>{{ page.date | date(format="%a, %d %b %Y %H:%M:%S %z") }}</pubDate>
+            <link>{{ page.permalink | escape_xml | safe }}</link>
+            <guid>{{ page.permalink | escape_xml | safe }}</guid>
+            <description>{% if page.summary %}{{ page.summary }}{% else %}{{ page.content }}{% endif %}</description>
+        </item>
+        {%- endfor %}
     </channel>
 </rss>
diff --git a/components/templates/src/builtins/shortcodes/streamable.html b/components/templates/src/builtins/shortcodes/streamable.html
index 0fca7f77..d45fa642 100644
--- a/components/templates/src/builtins/shortcodes/streamable.html
+++ b/components/templates/src/builtins/shortcodes/streamable.html
@@ -1,7 +1,3 @@
 <div {% if class %}class="{{class}}"{% endif %}>
-    <iframe src="https://www.streamable.com/e/{{id}}" 
-            scrolling="no"
-            frameborder="0"
-            allowfullscreen mozallowfullscreen webkitallowfullscreen>
-    </iframe>
+    <iframe src="https://www.streamable.com/e/{{id}}" scrolling="no" frameborder="0" allowfullscreen mozallowfullscreen webkitallowfullscreen></iframe>
 </div>
diff --git a/components/templates/src/builtins/shortcodes/vimeo.html b/components/templates/src/builtins/shortcodes/vimeo.html
index 99760879..0a4298c7 100644
--- a/components/templates/src/builtins/shortcodes/vimeo.html
+++ b/components/templates/src/builtins/shortcodes/vimeo.html
@@ -1,4 +1,3 @@
 <div {% if class %}class="{{class}}"{% endif %}>
-     <iframe src="//player.vimeo.com/video/{{id}}" webkitallowfullscreen mozallowfullscreen allowfullscreen>
-    </iframe>
+    <iframe src="//player.vimeo.com/video/{{id}}" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 </div>
diff --git a/components/templates/src/builtins/shortcodes/youtube.html b/components/templates/src/builtins/shortcodes/youtube.html
index 5f10206f..26a7fe54 100644
--- a/components/templates/src/builtins/shortcodes/youtube.html
+++ b/components/templates/src/builtins/shortcodes/youtube.html
@@ -1,4 +1,3 @@
 <div {% if class %}class="{{class}}"{% endif %}>
-    <iframe src="https://www.youtube.com/embed/{{id}}{% if autoplay %}?autoplay=1{% endif %}" webkitallowfullscreen mozallowfullscreen allowfullscreen>
-    </iframe>
+    <iframe src="https://www.youtube.com/embed/{{id}}{% if autoplay %}?autoplay=1{% endif %}" webkitallowfullscreen mozallowfullscreen allowfullscreen></iframe>
 </div>
diff --git a/components/templates/src/builtins/sitemap.xml b/components/templates/src/builtins/sitemap.xml
index 0c2608a8..fd8ab76b 100644
--- a/components/templates/src/builtins/sitemap.xml
+++ b/components/templates/src/builtins/sitemap.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <urlset xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    {% for sitemap_entry in entries %}
-        <url>
-            <loc>{{ sitemap_entry.permalink | escape_xml | safe }}</loc>
-            {% if sitemap_entry.date %}
-                <lastmod>{{ sitemap_entry.date }}</lastmod>
-            {% endif %}
-        </url>
-    {% endfor %}
+    {%- for sitemap_entry in entries %}
+    <url>
+        <loc>{{ sitemap_entry.permalink | escape_xml | safe }}</loc>
+        {%- if sitemap_entry.date %}
+        <lastmod>{{ sitemap_entry.date }}</lastmod>
+        {%- endif %}
+    </url>
+    {%- endfor %}
 </urlset>
diff --git a/components/templates/src/builtins/split_sitemap_index.xml b/components/templates/src/builtins/split_sitemap_index.xml
index 740e322a..b44801ce 100644
--- a/components/templates/src/builtins/split_sitemap_index.xml
+++ b/components/templates/src/builtins/split_sitemap_index.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <sitemapindex xmlns="http://www.sitemaps.org/schemas/sitemap/0.9">
-    {% for sitemap in sitemaps %}
-        <sitemap>
-            <loc>{{ sitemap }}</loc>
-        </sitemap>
-    {% endfor %}
-</sitemapindex>
\ No newline at end of file
+    {%- for sitemap in sitemaps %}
+    <sitemap>
+        <loc>{{ sitemap }}</loc>
+    </sitemap>
+    {%- endfor %}
+</sitemapindex>
