diff --git a/_config.yml b/_config.yml
index e63ac94..0a8ffff 100644
--- a/_config.yml
+++ b/_config.yml
@@ -42,6 +42,12 @@ title: "Personal blog"
 rss: "/atom.xml"
 lang: "ru"
 
+# About the author
+author:
+  email: "info@valentineus.link"
+  name: "Valentin Popov"
+  url: "http://valentineus.link"
+
 # Plugins
 plugins:
   - "jekyll-paginate"
diff --git a/_data/author_info.yml b/_data/author_info.yml
deleted file mode 100644
index 03ef667..0000000
--- a/_data/author_info.yml
+++ /dev/null
@@ -1,3 +0,0 @@
-email: "info@valentineus.link"
-name: "Valentin Popov"
-url: "http://valentineus.link"
diff --git a/_pages/404.html b/_pages/404.html
index 59d4490..be2e1fb 100644
--- a/_pages/404.html
+++ b/_pages/404.html
@@ -9,6 +9,6 @@ layout: default
   <p>Sorry, this page does not exist.</p>
   <p>
     <a class="btn btn-lg btn-primary" role="button" href="/">Home page</a>
-    <a class="btn btn-lg btn-default" role="button" href="mailto:{{ site.data.author_info.email | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape }}">Contact</a>
+    <a class="btn btn-lg btn-default" role="button" href="mailto:{{ site.author.email | strip_newlines | strip_html | strip | normalize_whitespace | uri_escape }}">Contact</a>
   </p>
 </div>
diff --git a/_pages/atom.xml b/_pages/atom.xml
index 79cd5e1..d149c67 100644
--- a/_pages/atom.xml
+++ b/_pages/atom.xml
@@ -1,6 +1,8 @@
 ---
 permalink: "atom.xml"
 layout: compress
+title: "RSS"
+show: true
 ---
 
 <?xml version="1.0" encoding="utf-8"?>
@@ -19,9 +21,9 @@ layout: compress
 
     <!-- Author -->
     <author>
-        <email>{{ site.data.author_info.email | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</email>
-        <name>{{ site.data.author_info.name | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</name>
-        <uri>{{ site.data.author_info.url | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</uri>
+        <email>{{ site.author.email | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</email>
+        <name>{{ site.author.name | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</name>
+        <uri>{{ site.author.url | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</uri>
     </author>
 
     {% for item in site.posts %}
@@ -39,9 +41,9 @@ layout: compress
 
             <!-- Author -->
             <author>
-                <email>{{ site.data.author_info.email | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</email>
-                <name>{{ site.data.author_info.name | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</name>
-                <uri>{{ site.data.author_info.url | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</uri>
+                <email>{{ site.author.email | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</email>
+                <name>{{ site.author.name | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</name>
+                <uri>{{ site.author.url | strip_newlines | strip_html | strip | normalize_whitespace | xml_escape }}</uri>
             </author>
 
             <!-- Content -->