diff --git a/.editorconfig b/.editorconfig
new file mode 100644
index 0000000..13e5a4f
--- /dev/null
+++ b/.editorconfig
@@ -0,0 +1,19 @@
+# EditorConfig is awesome: http://EditorConfig.org
+
+# top-most EditorConfig file
+root = true
+
+# Unix-style newlines with a newline ending every file
+[*]
+end_of_line = lf
+insert_final_newline = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+# 4 space indentation
+[{*.json,*.yml,*.styl,*.ejs}]
+indent_style = space
+indent_size = 2
diff --git a/.gitignore b/.gitignore
index 8b5ae8e..ffba1b0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
-_config.yml
\ No newline at end of file
+_config.yml
+*.iml
+.idea
diff --git a/layout/_partial/header.ejs b/layout/_partial/header.ejs
index 432eb6e..de345c4 100644
--- a/layout/_partial/header.ejs
+++ b/layout/_partial/header.ejs
@@ -1,37 +1,34 @@
 <header id="header">
-    <div id="header-main" class="header-inner">
-        <div class="outer">
-            <a href="<%- url_for() %>" id="logo"><!--<i class="logo"></i>--><span
-                        class="site-title"><%= config.title %></span></a>
-
-            <nav id="main-nav">
-                <% for (var i in theme.menu){ %>
-                <a class="main-nav-link" href="<%- url_for(theme.menu[i]) %>"><%= i %></a>
-                <% } %>
-            </nav>
-            <% if(theme.profile) { %>
-            <nav id="sub-nav">
-                <div class="profile" id="profile-nav">
-                    <a id="profile-anchor" href="javascript:;"><img class="avatar" src="<%- gravatar(theme.email) %>"><i
-                                class="fa fa-caret-down"></i></a>
-                </div>
-            </nav>
-            <% } %>
-            <div id="search-form-wrap">
-                <%- search_form({button: ' '}) %>
-            </div>
-        </div>
+  <div id="header-main" class="header-inner">
+    <div class="outer">
+      <a href="<%- url_for() %>" id="logo"><!--<i class="logo"></i>--><span class="site-title"><%= config.title %></span></a>
+      <nav id="main-nav">
+        <% for (var i in theme.menu){ %>
+          <a class="main-nav-link" href="<%- url_for(theme.menu[i]) %>"><%= i %></a>
+        <% } %>
+      </nav>
+      <% if(theme.profile) { %>
+        <nav id="sub-nav">
+          <div class="profile" id="profile-nav">
+            <a id="profile-anchor" href="javascript:;"><img class="avatar" src="<%= ( theme.gravatar ? gravatar(theme.email) : url_for(config.avatar)) %>"><i class="fa fa-caret-down"></i></a>
+          </div>
+        </nav>
+      <% } %>
+      <div id="search-form-wrap">
+        <%- search_form({button: ' '}) %>
+      </div>
     </div>
-    <div id="main-nav-mobile" class="header-sub header-inner">
-        <table class="menu outer">
-            <tr>
-                <% for (var i in theme.menu){ %>
-                <td><a class="main-nav-link" href="<%- url_for(theme.menu[i]) %>"><%= i %></a></td>
-                <% } %>
-                <td>
-                    <%- search_form() %>
-                </td>
-            </tr>
-        </table>
-    </div>
-</header>
\ No newline at end of file
+  </div>
+  <div id="main-nav-mobile" class="header-sub header-inner">
+    <table class="menu outer">
+      <tr>
+        <% for (var i in theme.menu){ %>
+          <td><a class="main-nav-link" href="<%- url_for(theme.menu[i]) %>"><%= i %></a></td>
+        <% } %>
+        <td>
+          <%- search_form() %>
+        </td>
+      </tr>
+    </table>
+  </div>
+</header>
diff --git a/layout/_partial/profile.ejs b/layout/_partial/profile.ejs
index 5aca08d..8d324c2 100644
--- a/layout/_partial/profile.ejs
+++ b/layout/_partial/profile.ejs
@@ -1,42 +1,38 @@
 <aside id="profile">
-    <div class="inner profile-inner">
-        <div class="base-info profile-block">
-            <img id="avatar" src="<%- gravatar(theme.email) %>">
-
-            <h2 id="name"><%= config.author %></h2>
-
-            <h3 id="title"><%= config.author_title %></h3>
-            <span id="location"><i class="fa fa-map-marker"></i><%= config.location %></span>
-            <a id="follow" href="<%= config.follow %>"><%= __('profile.follow') %></a>
-        </div>
-        <div class="article-info profile-block">
-            <div class="article-info-block">
-                <%= site.posts.length %>
-                <span><%= (site.posts.length > 1 ? __('profile.posts') : __('profile.post')) %></span>
-            </div>
-            <div class="article-info-block">
-                <%= site.tags.length %>
-                <span><%= (site.tags.length > 1 ? __('profile.tags') : __('profile.tag')) %></span>
-            </div>
-        </div>
-        <% if(theme.contacts) { %>
-        <div class="contact-info profile-block">
-            <table class="contact-list">
-                <tr>
-                    <% for(var i in theme.contacts) { %>
-                    <td><a href="<%- url_for(theme.contacts[i]) %>" target="_blank" title="<%= i %>"><i
-                                    class="fa fa-<%= i %>"></i></a></td>
-                    <% } %>
-                </tr>
-            </table>
-        </div>
-        <% } %>
-        <div class="article-info profile-block bio">
-            <h2>About</h2>
-
-            <p>I'm a software developer who likes to tweak/break gadgets and complain about everything under the
-                sun. When I'm not doing that, I'm usually playing games, watching films or watching sports.
-            </p>
-        </div>
+  <div class="inner profile-inner">
+    <div class="base-info profile-block">
+      <img id="avatar" src="<%= ( theme.gravatar ? gravatar(theme.email) : url_for(config.avatar)) %>">
+      <h2 id="name"><%= config.author %></h2>
+      <h3 id="title"><%= config.author_title %></h3>
+      <span id="location"><i class="fa fa-map-marker"></i><%= config.location %></span>
+      <a id="follow" href="<%= config.follow %>"><%= __('profile.follow') %></a>
     </div>
-</aside>
\ No newline at end of file
+    <div class="article-info profile-block">
+      <div class="article-info-block">
+        <%= site.posts.length %>
+        <span><%= (site.posts.length > 1 ? __('profile.posts') : __('profile.post')) %></span>
+      </div>
+      <div class="article-info-block">
+        <%= site.tags.length %>
+        <span><%= (site.tags.length > 1 ? __('profile.tags') : __('profile.tag')) %></span>
+      </div>
+    </div>
+    <% if(theme.contacts) { %>
+    <div class="contact-info profile-block">
+      <table class="contact-list">
+        <tr>
+          <% for(var i in theme.contacts) { %>
+          <td><a href="<%- url_for(theme.contacts[i]) %>" target="_blank" title="<%= i %>"><i class="fa fa-<%= i %>"></i></a></td>
+          <% } %>
+        </tr>
+      </table>
+    </div>
+    <% } %>
+    <% if(theme.about) { %>
+    <div class="article-info profile-block bio">
+      <h2>About</h2>
+      <p><%- theme.about %></p>
+    </div>
+    <% } %>
+  </div>
+</aside>