diff --git a/share/html_templates/header.mustache b/share/html_templates/header.mustache
deleted file mode 100644
index dd460be..0000000
--- a/share/html_templates/header.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<h1><a href="{{blog_url}}">{{title}}</a></h1>
diff --git a/share/html_templates/item.mustache b/share/html_templates/item.mustache
deleted file mode 100644
index 7fbfcce..0000000
--- a/share/html_templates/item.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-<li>
-	<time>{{date_human}}</time>
-	<div>
-		<a href="{{url}}" class="title">{{title}}</a>
-		<p class="abstract">{{abstract}}</p>
-	</div>
-</li>
\ No newline at end of file
diff --git a/share/html_templates/list.mustache b/share/html_templates/list.mustache
deleted file mode 100644
index a02e3a1..0000000
--- a/share/html_templates/list.mustache
+++ /dev/null
@@ -1,17 +0,0 @@
-<main>
-<h3>Topics</h3>
-
-<ul class="topics">
-{{topics}}
-</ul>
-
-<h3>Recent articles</h3>
-
-<ul class="timeline">
-{{recent_texts_listing}}
-</ul>
-
-<nav>
-{{navigation}}
-</nav>
-</main>
\ No newline at end of file
diff --git a/share/html_templates/note.mustache b/share/html_templates/note.mustache
deleted file mode 100644
index b9738c8..0000000
--- a/share/html_templates/note.mustache
+++ /dev/null
@@ -1,13 +0,0 @@
-<article>
-<h1>{{title}}</h1>
-<details>
-	<summary>{{abstract}}</summary>
-	<a href="" rel="author">{{author_name}}</a>
-	<time datetime="{{date}}">{{date_human}}</time>
-	<span>Series: {{series}}</span>
-	<span>Topics: {{topics}}</span>
-	<span>Keywords: {{keywords}}</span>
-	<span>UUID: {{uuid}}</span>
-</details>
-{{body}}
-</article>
\ No newline at end of file
diff --git a/share/html_templates/frontpage.mustache b/share/template/frontpage.mustache
similarity index 67%
rename from share/html_templates/frontpage.mustache
rename to share/template/frontpage.mustache
index 05b99fb..c92e57f 100644
--- a/share/html_templates/frontpage.mustache
+++ b/share/template/frontpage.mustache
@@ -1,3 +1,3 @@
-Articles
+## Articles
 
 {{recent_texts_listing}}
\ No newline at end of file
diff --git a/share/template/header.mustache b/share/template/header.mustache
new file mode 100644
index 0000000..ab17eed
--- /dev/null
+++ b/share/template/header.mustache
@@ -0,0 +1 @@
+{{title}}
diff --git a/share/template/item.mustache b/share/template/item.mustache
new file mode 100644
index 0000000..23b82b0
--- /dev/null
+++ b/share/template/item.mustache
@@ -0,0 +1,3 @@
+{{date_human}}
+{{link}}
+{{abstract}}
\ No newline at end of file
diff --git a/share/template/list.mustache b/share/template/list.mustache
new file mode 100644
index 0000000..196b072
--- /dev/null
+++ b/share/template/list.mustache
@@ -0,0 +1,7 @@
+### Topics
+
+{{topics}}
+
+### Recent articles
+
+{{recent_texts_listing}}
\ No newline at end of file
diff --git a/share/template/note.mustache b/share/template/note.mustache
new file mode 100644
index 0000000..d98fe6a
--- /dev/null
+++ b/share/template/note.mustache
@@ -0,0 +1,5 @@
+# {{title}}
+
+{{details}}
+
+{{body}}
\ No newline at end of file