diff --git a/config.toml b/config.toml
index 9c50f2d..03bcc3f 100644
--- a/config.toml
+++ b/config.toml
@@ -26,6 +26,12 @@ pygmentsCodefencesGuessSyntax = true
 # add info for crawlers
 enableRobotsTXT = true
 
+# we want raw HTML
+[markup]
+  [markup.goldmark]
+    [markup.goldmark.renderer]
+      unsafe = true
+
 # default author
 [Author]
     name = "Christoph Cullmann"
diff --git a/hugo b/hugo
deleted file mode 100755
index ecb8c22..0000000
Binary files a/hugo and /dev/null differ
diff --git a/server.sh b/server.sh
index 41da2bf..aff2dfe 100755
--- a/server.sh
+++ b/server.sh
@@ -8,4 +8,4 @@ export GIT_COMMIT_SHA=`git rev-parse --verify HEAD`
 export GIT_COMMIT_SHA_SHORT=`git rev-parse --short HEAD`
 
 # run hugo in local server mode, show all stuff
-exec ./hugo server -D --buildFuture
+exec hugo server -D --buildFuture
diff --git a/themes/beautifulhugo/i18n/br.yaml b/themes/beautifulhugo/i18n/br.yaml
index 98cbc47..7874904 100644
--- a/themes/beautifulhugo/i18n/br.yaml
+++ b/themes/beautifulhugo/i18n/br.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "02/Jan/2006 15:04:05"
 - id: postedOnDate
-  translation: "Postado em {{ .Count }}"
+  translation: "Postado em {{ . }}"
 - id: lastModified
-  translation: "(Ultima modificação em {{ .Count }})"
+  translation: "(Ultima modificação em {{ . }})"
 - id: translationsLabel
   translation: "Outras linguagens: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Mostrar"
 - id: comments
-  translation: "comentários" 
+  translation: "comentários"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/de.yaml b/themes/beautifulhugo/i18n/de.yaml
index be3a79a..4479dc8 100644
--- a/themes/beautifulhugo/i18n/de.yaml
+++ b/themes/beautifulhugo/i18n/de.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Gepostet am {{ .Count }}"
+  translation: "Gepostet am {{ . }}"
 - id: lastModified
-  translation: "(Zuletzt geändert am {{ .Count }})"
+  translation: "(Zuletzt geändert am {{ . }})"
 - id: translationsLabel
   translation: "Andere Sprachen: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Zeige"
 - id: comments
-  translation: "Kommentare" 
+  translation: "Kommentare"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/en.yaml b/themes/beautifulhugo/i18n/en.yaml
index ce90070..95c4fd7 100644
--- a/themes/beautifulhugo/i18n/en.yaml
+++ b/themes/beautifulhugo/i18n/en.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "Jan 2, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Posted on {{ .Count }}"
+  translation: "Posted on {{ . }}"
 - id: lastModified
-  translation: "(Last modified on {{ .Count }})"
+  translation: "(Last modified on {{ . }})"
 - id: translationsLabel
   translation: "Other languages: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Show"
 - id: comments
-  translation: "comments" 
+  translation: "comments"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/eo.yaml b/themes/beautifulhugo/i18n/eo.yaml
index 68540ca..2ff2d9d 100644
--- a/themes/beautifulhugo/i18n/eo.yaml
+++ b/themes/beautifulhugo/i18n/eo.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Afiŝiĝis je {{ .Count }}"
+  translation: "Afiŝiĝis je {{ . }}"
 - id: lastModified
-  translation: "(Laste aliiĝis je {{ .Count }})"
+  translation: "(Laste aliiĝis je {{ . }})"
 - id: translationsLabel
   translation: "Aliaj lingvoj: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Montru"
 - id: comments
-  translation: "komentoj" 
+  translation: "komentoj"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/es.yaml b/themes/beautifulhugo/i18n/es.yaml
index 6c0850f..7533e68 100644
--- a/themes/beautifulhugo/i18n/es.yaml
+++ b/themes/beautifulhugo/i18n/es.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Publicado el {{ .Count }}"
+  translation: "Publicado el {{ . }}"
 - id: lastModified
-  translation: "(Última modificación en {{ .Count }})"
+  translation: "(Última modificación en {{ . }})"
 - id: translationsLabel
   translation: "Otros idiomas: "
 - id: translationsSeparator
@@ -67,8 +67,8 @@
 - id: show
   translation: "Mostrar"
 - id: comments
-  translation: "comentarios" 
-  
+  translation: "comentarios"
+
 # Related posts
 - id: seeAlso
   translation: "Ver también"
diff --git a/themes/beautifulhugo/i18n/fr.yaml b/themes/beautifulhugo/i18n/fr.yaml
index ed85a9b..5a8f8ec 100644
--- a/themes/beautifulhugo/i18n/fr.yaml
+++ b/themes/beautifulhugo/i18n/fr.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Posté le {{ .Count }}"
+  translation: "Posté le {{ . }}"
 - id: lastModified
-  translation: "(Dernière modification le {{ .Count }})"
+  translation: "(Dernière modification le {{ . }})"
 - id: translationsLabel
   translation: "Autres langues : "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Afficher"
 - id: comments
-  translation: "commentaires" 
+  translation: "commentaires"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/it.yaml b/themes/beautifulhugo/i18n/it.yaml
index 4bf0305..0e093d5 100644
--- a/themes/beautifulhugo/i18n/it.yaml
+++ b/themes/beautifulhugo/i18n/it.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan 2006 15:04:05"
 - id: postedOnDate
-  translation: "Redatto il {{ .Count }}"
+  translation: "Redatto il {{ . }}"
 - id: lastModified
-  translation: "(Ultima modifica il {{ .Count }})"
+  translation: "(Ultima modifica il {{ . }})"
 - id: translationsLabel
   translation: "Altre lingue: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Mostra"
 - id: comments
-  translation: "commenti" 
+  translation: "commenti"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/ja.yaml b/themes/beautifulhugo/i18n/ja.yaml
index f810b0b..d0112b2 100644
--- a/themes/beautifulhugo/i18n/ja.yaml
+++ b/themes/beautifulhugo/i18n/ja.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "{{ .Count }}に投稿"
+  translation: "{{ . }}に投稿"
 - id: lastModified
-  translation: "(最終更新日時{{ .Count }})"
+  translation: "(最終更新日時{{ . }})"
 - id: translationsLabel
   translation: "翻訳："
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "ショー"
 - id: comments
-  translation: "コメント" 
+  translation: "コメント"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/nb.yaml b/themes/beautifulhugo/i18n/nb.yaml
index cd12ec6..b78b74a 100644
--- a/themes/beautifulhugo/i18n/nb.yaml
+++ b/themes/beautifulhugo/i18n/nb.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Postet {{ .Count }}"
+  translation: "Postet {{ . }}"
 - id: lastModified
-  translation: "(Sist endret {{ .Count }})"
+  translation: "(Sist endret {{ . }})"
 - id: translationsLabel
   translation: "Andre språk: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Vis"
 - id: comments
-  translation: "kommentarer" 
+  translation: "kommentarer"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/nl.yaml b/themes/beautifulhugo/i18n/nl.yaml
index 02993bb..370f5c6 100644
--- a/themes/beautifulhugo/i18n/nl.yaml
+++ b/themes/beautifulhugo/i18n/nl.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Gepost op {{ .Count }}"
+  translation: "Gepost op {{ . }}"
 - id: lastModified
-  translation: "(Laatst gewijzigd op {{ .Count }})"
+  translation: "(Laatst gewijzigd op {{ . }})"
 - id: translationsLabel
   translation: "Andere talen: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Laat"
 - id: comments
-  translation: "reacties zien" 
+  translation: "reacties zien"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/pl.yaml b/themes/beautifulhugo/i18n/pl.yaml
index e3d4f8b..bd230b7 100644
--- a/themes/beautifulhugo/i18n/pl.yaml
+++ b/themes/beautifulhugo/i18n/pl.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Opublikowany {{ .Count }}"
+  translation: "Opublikowany {{ . }}"
 - id: lastModified
-  translation: "(Ostatnia modyfikacja {{ .Count }})"
+  translation: "(Ostatnia modyfikacja {{ . }})"
 - id: translationsLabel
   translation: "Inne języki: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Pokaż"
 - id: comments
-  translation: "komentarzy" 
+  translation: "komentarzy"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/ru.yaml b/themes/beautifulhugo/i18n/ru.yaml
index e05bdb4..b267f90 100644
--- a/themes/beautifulhugo/i18n/ru.yaml
+++ b/themes/beautifulhugo/i18n/ru.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "Опубликовано {{ .Count }}"
+  translation: "Опубликовано {{ . }}"
 - id: lastModified
-  translation: "(Последнее изменение {{ .Count }})"
+  translation: "(Последнее изменение {{ . }})"
 - id: translationsLabel
   translation: "Другие языки: "
 - id: translationsSeparator
@@ -67,7 +67,7 @@
 - id: show
   translation: "Показать"
 - id: comments
-  translation: "комментариев" 
+  translation: "комментариев"
 
 # Related posts
 - id: seeAlso
diff --git a/themes/beautifulhugo/i18n/zh-CN.yaml b/themes/beautifulhugo/i18n/zh-CN.yaml
index 9b104c3..8e2d9d9 100644
--- a/themes/beautifulhugo/i18n/zh-CN.yaml
+++ b/themes/beautifulhugo/i18n/zh-CN.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "发表于 {{ .Count }}"
+  translation: "发表于 {{ . }}"
 - id: lastModified
-  translation: "(上次修改时间 {{ .Count }})"
+  translation: "(上次修改时间 {{ . }})"
 - id: translationsLabel
   translation: "其它语言: "
 - id: translationsSeparator
diff --git a/themes/beautifulhugo/i18n/zh-TW.yaml b/themes/beautifulhugo/i18n/zh-TW.yaml
index fea27b0..511d7ee 100644
--- a/themes/beautifulhugo/i18n/zh-TW.yaml
+++ b/themes/beautifulhugo/i18n/zh-TW.yaml
@@ -4,9 +4,9 @@
 - id: shortdateFormat
   translation: "2 Jan, 2006 15:04:05"
 - id: postedOnDate
-  translation: "發表於 {{ .Count }}"
+  translation: "發表於 {{ . }}"
 - id: lastModified
-  translation: "(最後修改於 {{ .Count }})"
+  translation: "(最後修改於 {{ . }})"
 - id: translationsLabel
   translation: "其他語言: "
 - id: translationsSeparator
diff --git a/themes/beautifulhugo/layouts/index.html b/themes/beautifulhugo/layouts/index.html
index d7544e2..f3de0fa 100644
--- a/themes/beautifulhugo/layouts/index.html
+++ b/themes/beautifulhugo/layouts/index.html
@@ -9,25 +9,24 @@
         {{ end }}
 
         <div class="posts-list">
-          {{ $pag := .Paginate (where .Data.Pages "Type" "post") }}
-          {{ range $pag.Pages }}
+          {{ range .Paginator.Pages }}
             <article class="post-preview">
               <a href="{{ .Permalink }}">
                 <h2 class="post-title">{{ .Title }}</h2>
+
                 {{ if .Params.subtitle }}
                   <h3 class="post-subtitle">
-                  {{ .Params.subtitle }}
+                    {{ .Params.subtitle }}
                   </h3>
                 {{ end }}
-                {{ if .Params.image }}
-                <img src="{{ .Params.image }}" alt="{{ .Title }}" class="img-title" />
-                {{ end }}
               </a>
 
-              {{ partial "post_meta.html" . }}
+              <p class="post-meta">
+                {{ partial "post_meta.html" . }}
+              </p>
               <div class="post-entry">
                 {{ if .Truncated }}
-                  {{ if .Params.summary }}{{ .Params.summary }}{{ else }}{{ .Summary }}{{ end }}
+                  {{ .Summary }}
                   <a href="{{ .Permalink }}" class="post-read-more">[{{ i18n "readMore" }}]</a>
                 {{ else }}
                   {{ .Content }}
@@ -41,6 +40,7 @@
                   {{ end }}
                 </div>
               {{ end }}
+
             </article>
           {{ end }}
         </div>
diff --git a/update.sh b/update.sh
index 85147af..e103dbb 100755
--- a/update.sh
+++ b/update.sh
@@ -11,7 +11,7 @@ export GIT_COMMIT_SHA=`git rev-parse --verify HEAD`
 export GIT_COMMIT_SHA_SHORT=`git rev-parse --short HEAD`
 
 # rerun hugo generator
-./hugo --minify --noTimes
+hugo --minify --noTimes
 
 # copy .htaccess
 cp -f static/.htaccess public