diff --git a/_embed/templates/editor.tmpl b/_embed/templates/editor.tmpl
index d54ddd58..4ab6bcd8 100644
--- a/_embed/templates/editor.tmpl
+++ b/_embed/templates/editor.tmpl
@@ -1,34 +1,33 @@
 {{ define "content" }}
 {{ with .Data }}
 <div id="editor" class="container" data-kind="{{ .Class }}">
-<form method="POST" action="./">
-{{ if or (eq .Class "frontmatter-only") (eq .Class "complete") }}
-<div class="frontmatter" data-type="parent">
-{{ template "blocks" .FrontMatter }}
-<div class="button add">Add field</div>
-</div>
-{{ end }}
+    <form method="POST" action="./">
+        {{- if or (eq .Class "frontmatter-only") (eq .Class "complete") }}
+        <div class="frontmatter" data-type="parent">
+            {{- template "blocks" .FrontMatter }}
+            <div class="button add">Add field</div>
+        </div>
+        {{- end }}
 
-{{ if or (eq .Class "content-only") (eq .Class "complete") }}
+        {{ if or (eq .Class "content-only") (eq .Class "complete") }}
+            {{ if (eq .Class "complete")}}
+            <h3>Body</h3>
+            {{ end }}
+            <div class="content">
+                <div id="editor-source" data-mode="{{ .Mode }}"></div>
+                <textarea name="content">{{ .Content }}</textarea>
+            </div>
+        {{ end }}
 
-{{ if (eq .Class "complete")}}
-<h3>Body</h3>
-{{ end }}
-<div class="content">
-<div id="editor-source" data-mode="{{ .Mode }}"></div>
-<textarea name="content">{{ .Content }}</textarea>
-</div>
-{{ end }}
-
-<div>
-<button id="submit" type="submit" data-type="{{ .Class }}">
-<span>
-<i class="material-icons" title="Save">save</i>
-</span>
-<span>save</span>
-</button>
-</div>
-</form>
+        <div>
+            <button id="submit" type="submit" data-type="{{ .Class }}">
+            <span>
+                <i class="material-icons" title="Save">save</i>
+            </span>
+            <span>save</span>
+            </button>
+        </div>
+    </form>
 </div>
 {{ end }}
 
diff --git a/_embed/templates/frontmatter.tmpl b/_embed/templates/frontmatter.tmpl
index 2eba94a1..3f7fe91d 100644
--- a/_embed/templates/frontmatter.tmpl
+++ b/_embed/templates/frontmatter.tmpl
@@ -1,60 +1,56 @@
 {{ define "blocks" }}
- {{ if .Fields }}
-  <div class="group">
-  {{ end }}
-  {{ range $key, $value := .Fields }}
-   {{ if eq $value.Parent.Type "array" }}
-    <div id="{{ $value.Name }}-{{ $key }}" data-type="array-item">
-     {{ template "value" $value }}
-     <div class="action delete" data-delete="{{ $value.Name }}-{{ $key }}">
-      <i class="material-icons" title="Close">close</i>
-     </div>
-    </div>
-    {{ else }}
-    <div class="block" id="block-{{ $value.Name }}" data-content="{{ $value.Name }}">
-     <label for="{{ $value.Name }}">{{ $value.Title }}</label>
-     {{ template "value" $value }}
-     <div class="action delete" data-delete="block-{{ $value.Name }}">
-      <i class="material-icons" title="Close">close</i>
-     </div>
-    </div>
-   {{ end }}
-  {{ end }}
-  {{ if .Fields }}
-  </div>
- {{ end }}
+{{ if .Fields }}<div class="group">{{ end }}
+{{- range $key, $value := .Fields }}
+    {{- if eq $value.Parent.Type "array" }}
+        <div id="{{ $value.Name }}-{{ $key }}" data-type="array-item">
+            {{- template "value" $value }}
+            <div class="action delete" data-delete="{{ $value.Name }}-{{ $key }}">
+                <i class="material-icons" title="Close">close</i>
+            </div>
+        </div>
+    {{- else }}
+        <div class="block" id="block-{{ $value.Name }}" data-content="{{ $value.Name }}">
+            <label for="{{ $value.Name }}">{{ $value.Title }}</label>
+            {{ template "value" $value }}
+            <div class="action delete" data-delete="block-{{ $value.Name }}">
+                <i class="material-icons" title="Close">close</i>
+            </div>
+        </div>
+    {{- end }}
+{{- end }}
+{{- if .Fields }}</div>{{ end }}
 
- {{ range $key, $value := .Arrays }}
-  {{ template "fielset" $value }}
- {{ end }}
+{{- range $key, $value := .Arrays }}
+{{- template "fielset" $value }}
+{{- end }}
 
- {{ range $key, $value := .Objects }}
-  {{ template "fielset" $value }}
- {{ end }}
+{{- range $key, $value := .Objects }}
+{{- template "fielset" $value }}
+{{- end }}
 
 {{ end }}
 
 {{ define "value" }}
- {{ if eq .HTMLType "textarea" }}
-  <textarea class="scroll" name="{{ .Name }}" id="{{.Name }}" data-parent-type="{{ .Parent.Type }}">{{ .Content.Other }}</textarea>
-  {{ else if eq .HTMLType "datetime" }}
-  <input name="{{ .Name }}" id="{{ .Name }}" value="{{ .Content.Other.Format "2006-01-02T15:04" }}" type="datetime-local" data-parent-type="{{ .Parent.Type }}"></input>
-  {{ else }}
-  <input name="{{ .Name }}" id="{{ .Name }}" value="{{ .Content.Other }}" type="{{ .HTMLType }}" data-parent-type="{{ .Parent.Type }}"></input>
- {{ end }}
+{{- if eq .HTMLType "textarea" }}
+    <textarea class="scroll" name="{{ .Name }}" id="{{.Name }}" data-parent-type="{{ .Parent.Type }}">{{ .Content.Other }}</textarea>
+{{- else if eq .HTMLType "datetime" }}
+    <input name="{{ .Name }}" id="{{ .Name }}" value="{{ .Content.Other.Format "2006-01-02T15:04" }}" type="datetime-local" data-parent-type="{{ .Parent.Type }}"></input>
+{{- else }}
+    <input name="{{ .Name }}" id="{{ .Name }}" value="{{ .Content.Other }}" type="{{ .HTMLType }}" data-parent-type="{{ .Parent.Type }}"></input>
+{{- end }}
 {{ end }}
 
 {{ define "fielset" }}
- <fieldset id="{{ .Name }}" data-type="{{ .Type }}">
-  {{ if not (eq .Title "") }}
-   <h3>{{ .Title }}</h3>
-  {{ end }}
-  <div class="action add">
-   <i class="material-icons" title="Add">add</i>
-  </div>
-  <div class="action delete" data-delete="{{ .Name }}">
-   <i class="material-icons" title="Close">close</i>
-  </div>
-  {{ template "blocks" .Content }}
- </fieldset>
+<fieldset id="{{ .Name }}" data-type="{{ .Type }}">
+    {{- if not (eq .Title "") }}
+        <h3>{{ .Title }}</h3>
+    {{- end }}
+    <div class="action add">
+        <i class="material-icons" title="Add">add</i>
+    </div>
+    <div class="action delete" data-delete="{{ .Name }}">
+        <i class="material-icons" title="Close">close</i>
+    </div>
+    {{- template "blocks" .Content }}
+</fieldset>
 {{ end }}