diff --git a/_data/aside_links.yml b/_data/aside_links.yml
deleted file mode 100644
index 43bcd9c..0000000
--- a/_data/aside_links.yml
+++ /dev/null
@@ -1,15 +0,0 @@
-- name: 'e-mail'
-  tag: 'info@valentineus.link'
-  url: 'mailto:info@valentineus.link'
-
-- name: 'telegram'
-  tag: '@valentineus'
-  url: 'https://t.me/valentineus'
-
-- name: 'github'
-  tag: '@valentineus'
-  url: 'https://github.com/valentineus'
-
-- name: 'pgp'
-  tag: 'A90A8EA3'
-  url: '/publickey.txt'
diff --git a/_data/contacts.yml b/_data/contacts.yml
new file mode 100644
index 0000000..479d0c8
--- /dev/null
+++ b/_data/contacts.yml
@@ -0,0 +1,7 @@
+- title: "info@valentineus.link"
+  description: "E-Mail"
+  url: "mailto:info@valentineus.link"
+
+- title: "@valentineus"
+  description: "Telegram"
+  url: "https://t.me/valentineus"
diff --git a/_data/links.yml b/_data/links.yml
new file mode 100644
index 0000000..23447af
--- /dev/null
+++ b/_data/links.yml
@@ -0,0 +1,11 @@
+- title: "code.valentineus.link"
+  description: "Code repositories"
+  url: "https://code.valentineus.link"
+
+- title: "@valentineus"
+  description: "GitHub"
+  url: "https://github.com/valentineus"
+
+- title: "@valyaha"
+  description: "Twitter"
+  url: "https://twitter.com/valyaha"
diff --git a/_includes/contacts.html b/_includes/contacts.html
new file mode 100644
index 0000000..06df563
--- /dev/null
+++ b/_includes/contacts.html
@@ -0,0 +1,19 @@
+<h2>Contacts</h2>
+
+<ul>
+    {% for contact in site.data.contacts %}
+    <li>
+        {% assign description = contact.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
+        {% assign title = contact.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
+        {% assign url = contact.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %}
+
+        <a href="{{ url }}" target="_blank">{{ title }}</a>
+        <span>—</span>
+        <span>{{ description }}</span>
+    </li>
+    {% endfor %}
+</ul>
+
+{% assign description = "" %}
+{% assign title = "" %}
+{% assign url = "" %}
diff --git a/_includes/links.html b/_includes/links.html
new file mode 100644
index 0000000..d301161
--- /dev/null
+++ b/_includes/links.html
@@ -0,0 +1,19 @@
+<h2>Related links</h2>
+
+<ul>
+    {% for link in site.data.links %}
+    <li>
+        {% assign description = link.description | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
+        {% assign title = link.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
+        {% assign url = link.url | strip_newlines | strip_html | strip | normalize_whitespace | relative_url | uri_escape %}
+
+        <a href="{{ url }}" target="_blank">{{ title }}</a>
+        <span>—</span>
+        <span>{{ description }}</span>
+    </li>
+    {% endfor %}
+</ul>
+
+{% assign description = "" %}
+{% assign title = "" %}
+{% assign url = "" %}
diff --git a/_includes/posts.html b/_includes/posts.html
new file mode 100644
index 0000000..6dc0d2b
--- /dev/null
+++ b/_includes/posts.html
@@ -0,0 +1,18 @@
+<h2>Posts</h2>
+
+<ul>
+    {% for post in site.posts %}
+    <li>
+        {% assign date = post.date | date: '%d-%m-%Y' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
+        {% assign title = post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape %}
+        {% assign url = post.url | relative_url | uri_escape %}
+
+        <a href="{{ url }}">{{ title }}</a>
+        (<time datetime="{{ post.date | date_to_xmlschema }}">{{ date }}</time>)
+    </li>
+    {% endfor %}
+</ul>
+
+{% assign date = "" %}
+{% assign title = "" %}
+{% assign url = "" %}
diff --git a/_pages/index.html b/_pages/index.html
index 2c09cfb..71414c7 100644
--- a/_pages/index.html
+++ b/_pages/index.html
@@ -4,26 +4,6 @@ permalink: "index.html"
 title: ""
 ---
 
-{% assign postsByYear = site.posts | group_by_exp: "post", "post.date | date: '%Y'" %}
-
-{% for year in postsByYear %}
-<section>
-    <h3>{{ year.name | strip_newlines | strip_html | strip | normalize_whitespace | smartify | slugify }}</h3>
-
-    <ul>
-        {% for post in year.items %}
-        <li>
-            <a href="{{ post.url | relative_url | uri_escape }}">
-                {{ post.title | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}
-            </a>
-
-            <small>
-                <time datetime="{{ post.date | date_to_xmlschema }}">
-                    <em>{{ post.date | date: '- %b %d' | strip_newlines | strip_html | strip | normalize_whitespace | smartify | xml_escape }}</em>
-                </time>
-            </small>
-        </li>
-        {% endfor %}
-    </ul>
-</section>
-{% endfor %}
+{% include contacts.html %}
+{% include links.html %}
+{% include posts.html %}