diff --git a/_includes/comments-providers/scripts.html b/_includes/comments-providers/scripts.html
new file mode 100644
index 00000000..df699fc5
--- /dev/null
+++ b/_includes/comments-providers/scripts.html
@@ -0,0 +1,14 @@
+{% if site.comments.provider and page.comments %}
+
+{% case site.comments.provider %}
+{% when "disqus" %}
+ {% include /comments-providers/disqus.html %}
+{% when "facebook" %}
+ {% include /comments-providers/facebook.html %}
+{% when "google-plus" %}
+ {% include /comments-providers/google-plus.html %}
+{% when "custom" %}
+ {% include /comments-providers/custom.html %}
+{% endcase %}
+
+{% endif %}
\ No newline at end of file
diff --git a/_includes/comments.html b/_includes/comments.html
index df699fc5..0e33033e 100644
--- a/_includes/comments.html
+++ b/_includes/comments.html
@@ -1,14 +1,13 @@
-{% if site.comments.provider and page.comments %}
-
-{% case site.comments.provider %}
-{% when "disqus" %}
- {% include /comments-providers/disqus.html %}
-{% when "facebook" %}
- {% include /comments-providers/facebook.html %}
-{% when "google-plus" %}
- {% include /comments-providers/google-plus.html %}
-{% when "custom" %}
- {% include /comments-providers/custom.html %}
-{% endcase %}
-
-{% endif %}
\ No newline at end of file
+
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index 62634b3a..450f6410 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -15,7 +15,7 @@
{% endif %}
\ No newline at end of file
diff --git a/_includes/read-time.html b/_includes/read-time.html
index 407c3a2b..86e7db84 100644
--- a/_includes/read-time.html
+++ b/_includes/read-time.html
@@ -1,4 +1,8 @@
-{% assign words = page.content | strip_html | number_of_words %}
+{% if post.read_time %}
+ {% assign words = post.content | strip_html | number_of_words %}
+{% elsif page.read_time %}
+ {% assign words = page.content | strip_html | number_of_words %}
+{% endif %}
{% if words < 180 %}
{{ site.data.ui-text[site.locale].less_than }} 1 {{ site.data.ui-text[site.locale].minute_read }}
diff --git a/_includes/scripts.html b/_includes/scripts.html
index d16c5c9f..138d271e 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts.html
@@ -1,4 +1,4 @@
{% include analytics.html %}
-{% include comments.html %}
+{% include /comments-providers/scripts.html %}
diff --git a/_includes/seo.html b/_includes/seo.html
index 85d84b6a..2f1d71dc 100644
--- a/_includes/seo.html
+++ b/_includes/seo.html
@@ -16,7 +16,7 @@
{% assign canonical_url = page.url | replace: "index.html", "" | prepend: site.url %}
{% endif %}
-{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ site.title_separator }} page {{ paginator.page }}{% endunless %}{% endif %}
+{{ seo_title | default: site.title }}{% if paginator %}{% unless paginator.page == 1 %} {{ site.title_separator }} {{ site.data.ui-text[site.locale].page }} {{ paginator.page }}{% endunless %}{% endif %}
{% assign seo_description = page.description | default: page.excerpt | default: site.description %}
{% if seo_description %}
diff --git a/_includes/sidebar.html b/_includes/sidebar.html
new file mode 100644
index 00000000..c447a69d
--- /dev/null
+++ b/_includes/sidebar.html
@@ -0,0 +1,20 @@
+{% if page.author_profile or page.sidebar %}
+
+ {% if page.author_profile %}{% include author-profile.html %}{% endif %}
+ {% if page.sidebar %}
+ {% for s in page.sidebar %}
+ {% if s.image %}
+
+ {% endif %}
+ {% if s.title %}
+{% endif %}
\ No newline at end of file
diff --git a/_layouts/archive.html b/_layouts/archive.html
index 959cb6a4..0c86d19e 100644
--- a/_layouts/archive.html
+++ b/_layouts/archive.html
@@ -2,7 +2,21 @@
layout: default
---
-
-
{{ page.title }}
- {{ content }}
-
\ No newline at end of file
+{% if (page.header.overlay_color or page.header.overlay_image) or page.header.image %}
+ {% include page__hero.html %}
+{% endif %}
+
+{% if page.url != "/" and site.breadcrumbs and site.categories.type == "jekyll-archives" %}
+ {% include breadcrumbs.html %}
+{% endif %}
+
+
+ {% include sidebar.html %}
+
+
+ {% unless page.header.overlay_color or page.header.overlay_image %}
+
{{ page.title }}
+ {% endunless %}
+ {{ content }}
+
+
\ No newline at end of file
diff --git a/_layouts/default.html b/_layouts/default.html
index 32a96f8c..1fe162d9 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -16,46 +16,7 @@ layout: compress
{% include browser-upgrade.html %}
{% include masthead.html %}
- {% if page.header.image %}
-
- {% endif %}
-
- {% if site.breadcrumbs and site.categories.type == 'jekyll-archives' %}
- {% include breadcrumbs.html %}
- {% endif %}
-
-
- {% if page.author_profile or page.sidebar %}
- {% if page.author_profile %}{% include author-profile.html %}{% endif %}
- {% if page.sidebar %}
- {% for s in page.sidebar %}
- {% if s.image %}
-
- {% endif %}
- {% if s.title %}
{{ site.data.ui-text[site.locale].comments_label }}
+ {% case site.comments.provider %} + {% when "disqus" %} + + {% when "facebook" %} + + {% when "google-plus" %} +