diff --git a/_includes/contacts.html b/_includes/contacts.html
index ef5c526..0eea581 100644
--- a/_includes/contacts.html
+++ b/_includes/contacts.html
@@ -3,9 +3,9 @@
 <ul>
     {%- for contact in site.data.contacts -%}
     <li>
-        <a href="{{- contact.url | relative_url | uri_escape -}}" target="_blank">{{- contact.title | strip | normalize_whitespace | xml_escape -}}</a>
-        <span>—</span>
+        <a href="{{- contact.url | relative_url | url_escape -}}" target="_blank">{{- contact.title | strip | normalize_whitespace | xml_escape -}}</a>
+        <span>&mdash;</span>
         <span>{{- contact.description | strip | normalize_whitespace | xml_escape -}}</span>
     </li>
     {%- endfor -%}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/_includes/head.html b/_includes/head.html
index 7a80b10..a526f66 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -10,16 +10,16 @@
     <title>{{- page.title | default: site.title | strip | normalize_whitespace | xml_escape -}}</title>
 
     <!-- CSS -->
-    <link href="{{- '/assets/css/styles.css' | relative_url | uri_escape -}}" rel="stylesheet" />
+    <link href="{{- '/assets/css/styles.css' | relative_url | url_escape -}}" rel="stylesheet" />
 
     <!-- RSS -->
-    <link href="{{- site.rss | absolute_url | uri_escape -}}" rel="alternate" title="RSS" type="application/atom+xml" />
+    <link href="{{- site.rss | absolute_url | url_escape -}}" rel="alternate" title="RSS" type="application/atom+xml" />
 
     <!-- Canonical URL -->
-    <link href="{{- page.url | absolute_url | uri_escape -}}" rel="canonical" />
+    <link href="{{- page.url | absolute_url | url_escape -}}" rel="canonical" />
 
     <!--[if lte IE 9]>
-        <script type="text/javascript" src="{{- '/assets/javascript/html5shiv-3.7.3.min.js' | relative_url | uri_escape -}}"></script>
-        <script type="text/javascript" src="{{- '/assets/javascript/respond-1.4.2.min.js' | relative_url | uri_escape -}}"></script>
+        <script type="text/javascript" src="{{- '/assets/javascript/html5shiv-3.7.3.min.js' | relative_url | url_escape -}}"></script>
+        <script type="text/javascript" src="{{- '/assets/javascript/respond-1.4.2.min.js' | relative_url | url_escape -}}"></script>
     <![endif]-->
 </head>
\ No newline at end of file
diff --git a/_includes/links.html b/_includes/links.html
index 116ff91..2fb95a1 100644
--- a/_includes/links.html
+++ b/_includes/links.html
@@ -3,9 +3,9 @@
 <ul>
     {%- for link in site.data.links -%}
     <li>
-        <a href="{{- link.url | relative_url | uri_escape -}}" target="_blank">{{- link.title | strip | normalize_whitespace | xml_escape -}}</a>
-        <span>—</span>
+        <a href="{{- link.url | relative_url | url_escape -}}" target="_blank">{{- link.title | strip | normalize_whitespace | xml_escape -}}</a>
+        <span>&mdash;</span>
         <span>{{- link.description | strip | normalize_whitespace | xml_escape -}}</span>
     </li>
     {%- endfor -%}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/_includes/navbar.html b/_includes/navbar.html
index f2780ad..03fa97f 100644
--- a/_includes/navbar.html
+++ b/_includes/navbar.html
@@ -1,10 +1,6 @@
 <nav>
     {%- for link in site.data.navbar -%}
-    <a href="{{- link.path | relative_url | uri_escape -}}">{{- link.title | strip | normalize_whitespace | xml_escape -}}</a>
+    <a href="{{- link.path | relative_url | url_escape -}}">{{- link.title | strip | normalize_whitespace | xml_escape -}}</a>
     {%- endfor -%}
-
-    <span>
-        <span>|</span>
-        <a href="{{- site.rss | absolute_url | uri_escape -}}">RSS</a>
-    </span>
+    <span><span>|</span><a href="{{- site.rss | absolute_url | url_escape -}}">RSS</a></span>
 </nav>
\ No newline at end of file
diff --git a/_includes/posts.html b/_includes/posts.html
index 48036dc..1dd5670 100644
--- a/_includes/posts.html
+++ b/_includes/posts.html
@@ -3,8 +3,8 @@
 <ul>
     {%- for post in site.posts -%}
     <li>
-        <a href="{{- post.url | relative_url | uri_escape -}}">{{- post.title | strip | normalize_whitespace | xml_escape -}}</a>
-        (<time datetime="{{- post.date | date_to_xmlschema -}}">{{- post.date | date: '%d-%m-%Y' | strip | normalize_whitespace | xml_escape -}}</time>)
+        <a href="{{- post.url | relative_url | url_escape -}}">{{- post.title | strip | normalize_whitespace | xml_escape -}}</a>
+        (<time datetime="{{- post.date | date_to_xmlschema | xml_escape -}}">{{- post.date | date: '%d-%m-%Y' | strip | normalize_whitespace | xml_escape -}}</time>)
     </li>
     {%- endfor -%}
-</ul>
+</ul>
\ No newline at end of file
diff --git a/_includes/reading-time.html b/_includes/reading-time.html
index de71601..dd1960e 100644
--- a/_includes/reading-time.html
+++ b/_includes/reading-time.html
@@ -3,5 +3,5 @@
 {%- endcapture -%}
 
 {%- unless words contains '-' -%}
-{{- words | plus: 150 | divided_by: 150 | append: '&nbsp;min read' -}}
+{{- words | plus: 150 | divided_by: 150 | append: ' min read' | xml_escape -}}
 {%- endunless -%}
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
index aa32f3e..b988df6 100644
--- a/_layouts/post.html
+++ b/_layouts/post.html
@@ -8,10 +8,10 @@ layout: default
     <p>
         <small>
             Posted
-            <time datetime="{{- page.date | date_to_xmlschema -}}">{{- page.date | date: '%B %e, %Y' | strip | normalize_whitespace | xml_escape -}}</time>
+            <time datetime="{{- page.date | date_to_xmlschema | xml_escape -}}">{{- page.date | date: '%B %e, %Y' | strip | normalize_whitespace | xml_escape -}}</time>
             by
-            <a href="mailto:{{- site.email | strip | url_encode -}}?subject={{- page.title | default: site.title | strip | normalize_whitespace | xml_escape -}}">Valentin Popov</a>
-            &nbsp;&hyphen;
+            <a href="mailto:{{- site.email | strip | url_encode -}}?subject={{- page.title | default: site.title | strip | normalize_whitespace | uri_escape -}}">Valentin Popov</a>
+            &hyphen;
             <strong>{%- include reading-time.html -%}</strong>
         </small>
     </p>
diff --git a/_pages/404.html b/_pages/404.html
index 1fcbc7c..77710d9 100644
--- a/_pages/404.html
+++ b/_pages/404.html
@@ -8,6 +8,6 @@ permalink: /404.html
     <p><strong>Page not found.</strong></p>
 
     <small>
-        <p>If you see this message, please <a href="mailto:{{- site.email | strip | url_encode -}}?subject={{- 'I found a broken page' | strip | normalize_whitespace | xml_escape -}}">let me know</a>.</p>
+        <p>If you see this message, please <a href="mailto:{{- site.email | strip | url_encode -}}?subject={{- 'I found a broken page' | strip | normalize_whitespace | uri_encode -}}">let me know</a>.</p>
     </small>
 </div>
\ No newline at end of file
diff --git a/_pages/blog.html b/_pages/blog.html
index a1c6cb5..0718d90 100644
--- a/_pages/blog.html
+++ b/_pages/blog.html
@@ -11,9 +11,9 @@ permalink: /blog.html
     <ul>
         {%- for post in site.posts -%}
         <li>
-            <time datetime="{{- post.date | date_to_xmlschema -}}">{{- post.date | date: '%Y/%m/%d' | strip | normalize_whitespace | xml_escape -}}</time>
+            <time datetime="{{- post.date | date_to_xmlschema | xml_escape -}}">{{- post.date | date: '%Y/%m/%d' | strip | normalize_whitespace | xml_escape -}}</time>
             <span>&mdash;</span>
-            <a href="{{- post.url | relative_url | uri_escape -}}">{{- post.title | strip | normalize_whitespace | xml_escape -}}</a>
+            <a href="{{- post.url | relative_url | url_escape -}}">{{- post.title | strip | normalize_whitespace | xml_escape -}}</a>
         </li>
         {%- endfor -%}
     </ul>
diff --git a/_pages/robots.txt b/_pages/robots.txt
index 28c5b92..45f1669 100644
--- a/_pages/robots.txt
+++ b/_pages/robots.txt
@@ -4,6 +4,6 @@ permalink: /robots.txt
 ---
 
 User-agent: *
-Disallow: {{- "/404.html" | relative_url | uri_escape -}}
+Disallow: {{- "/404.html" | relative_url | url_escape -}}
 Allow: /
-Sitemap: {{- "sitemap.xml" | absolute_url | uri_escape -}}
+Sitemap: {{- "sitemap.xml" | absolute_url | url_escape -}}