diff --git a/layouts/home.html b/layouts/home.html
new file mode 100644
index 0000000000000000000000000000000000000000..cab91f807143994da71650b443eabb8e98cf8a75
--- /dev/null
+++ b/layouts/home.html
@@ -0,0 +1,37 @@
+{{ define "main" -}}
+<div class="post">
+  <h1 class="title">{{ .Title }}</h1>
+  {{ with .Params.tagline }}<span class="tagline">{{ . }}</span>{{ end }}
+
+  {{ if ne .Type "page" -}}
+  <div class="post-date">
+    <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "2. 1. 2006" }}</time>
+  </div>
+  {{- end }}
+
+  <div>
+  {{ .Content }}
+  </div>
+
+    {{ $Site := .Site }}
+    {{ with .Params.elements }}
+      {{ range . }}
+        {{ partial . ( dict "Site" $Site ) }}
+      {{ end }}
+    {{ end }}
+
+
+  {{ partial "tags.html" . }}
+
+  {{ if (and (ne .Params.DisableShare true) (ne .Params.disable_share true)) -}}
+  {{ partial "share.html" . }}
+  {{- end }}
+
+  {{ if (and .Site.DisqusShortname (ne .Params.DisableComments true) (ne .Params.disable_comments true)) -}}
+  <div class="comments">
+    <h2>Comments</h2>
+    {{ template "_internal/disqus.html" . }}
+  </div>
+  {{- end }}
+</div>
+{{- end }}
diff --git a/layouts/index.html b/layouts/index.html
deleted file mode 100644
index 9b89434f06de8f22887d084a3f21a7ce2651dc7b..0000000000000000000000000000000000000000
--- a/layouts/index.html
+++ /dev/null
@@ -1,27 +0,0 @@
-{{ define "main" -}}
-  <div class="posts">
-    {{- $pages := where .Site.RegularPages "Type" "in" .Site.Params.MainSections -}}
-    {{- $paginator := .Paginate $pages -}}
-
-    {{ range $paginator.Pages }}
-      <article class="post">
-        <h1 class="post-title">
-          <a href="{{ .Permalink }}">{{ .Title }}</a>
-        </h1>
-
-        <div class="post-date">
-          <time datetime="{{ .Date.Format "2006-01-02T15:04:05Z0700" }}">{{ .Date.Format "2. 1. 2006" }}</time>        </div>
-
-        <div>
-          {{ .Summary }}
-        </div>
-
-        <div class="read-more-link">
-          <a href="{{ .Permalink }}">...</a>
-        </div>
-      </article>
-    {{- end }}
-  </div>
-
-  {{ template "_internal/pagination.html" . }}
-{{- end }}