diff --git a/_includes/absolute-url.liquid b/_includes/absolute-url.liquid
deleted file mode 100644
index 7809e996..00000000
--- a/_includes/absolute-url.liquid
+++ /dev/null
@@ -1 +0,0 @@
-{% capture absurl %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
\ No newline at end of file
diff --git a/_includes/archive-list-single b/_includes/archive-list-single
new file mode 100644
index 00000000..37d421d6
--- /dev/null
+++ b/_includes/archive-list-single
@@ -0,0 +1,8 @@
+
+ {% if post.link %}
+
+ {% else %}
+
+ {% endif %}
+ {% if post.excerpt %}{{ post.excerpt | markdownify | strip_html | truncate: 160 }}
{% endif %}
+
\ No newline at end of file
diff --git a/_includes/archive-list-single.html b/_includes/archive-list-single.html
deleted file mode 100644
index 3b4032bb..00000000
--- a/_includes/archive-list-single.html
+++ /dev/null
@@ -1,8 +0,0 @@
-
- {% if post.link %}
-
- {% else %}
-
- {% endif %}
- {% if post.excerpt %}{{ post.excerpt | markdownify | strip_html | truncate: 160 }}
{% endif %}
-
\ No newline at end of file
diff --git a/_includes/author-profile.html b/_includes/author-profile
similarity index 97%
rename from _includes/author-profile.html
rename to _includes/author-profile
index 29458ce7..76bb3267 100644
--- a/_includes/author-profile.html
+++ b/_includes/author-profile
@@ -7,7 +7,7 @@
{% if author.avatar contains "http" %}
{% else %}
-
+
{% endif %}
{{ author.name }}
diff --git a/_includes/base_path b/_includes/base_path
new file mode 100644
index 00000000..8c7dc62b
--- /dev/null
+++ b/_includes/base_path
@@ -0,0 +1 @@
+{% capture base_path %}{{ site.url }}{{ site.baseurl }}{% endcapture %}
\ No newline at end of file
diff --git a/_includes/breadcrumbs.html b/_includes/breadcrumbs
similarity index 68%
rename from _includes/breadcrumbs.html
rename to _includes/breadcrumbs
index 8a12274e..3caff149 100644
--- a/_includes/breadcrumbs.html
+++ b/_includes/breadcrumbs
@@ -5,7 +5,7 @@
{% for crumb in crumbs offset: 1 %}
{% if forloop.first %}
- {{ site.breadcrumb_home_label }}
+ {{ site.breadcrumb_home_label }}
{{ site.breadcrumb_separator }}
@@ -15,7 +15,7 @@
{% else %}
{% assign i = i | plus: 1 %}
- {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
+ {{ crumb | replace: '-', ' ' | replace: '%20', ' ' | capitalize }}
{{ site.breadcrumb_separator }}
diff --git a/_includes/browser-upgrade.html b/_includes/browser-upgrade
similarity index 100%
rename from _includes/browser-upgrade.html
rename to _includes/browser-upgrade
diff --git a/_includes/disqus-comments.html b/_includes/disqus-comments
similarity index 100%
rename from _includes/disqus-comments.html
rename to _includes/disqus-comments
diff --git a/_includes/feed-footer.html b/_includes/feed-footer.html
deleted file mode 100644
index 59faf918..00000000
--- a/_includes/feed-footer.html
+++ /dev/null
@@ -1,4 +0,0 @@
-{% capture feed_footer %}
- {{ post.title }} was originally published by {{ site.owner.name }} on {{ site.title }}
-{% endcapture %}
-{{ feed_footer | markdownify | xml_escape }}
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer
similarity index 100%
rename from _includes/footer.html
rename to _includes/footer
diff --git a/_includes/gallery b/_includes/gallery
index db1b0a22..4f1f77b2 100644
--- a/_includes/gallery
+++ b/_includes/gallery
@@ -1,4 +1,4 @@
-{% include absolute-url.liquid %}
+{% include base_path %}
{% if include.id %}
{% assign gallery = page.[include.id] %}
@@ -23,14 +23,14 @@
{% if img.url contains "http" %}
"{{ img.url }}"
{% else %}
- "{{ img.url | prepend: "/images/" | prepend: absurl }}"
+ "{{ img.url | prepend: "/images/" | prepend: base_path }}"
{% endif %}
>
@@ -39,7 +39,7 @@
{% if img.image_path contains "http" %}
"{{ img.image_path }}"
{% else %}
- "{{ img.image_path | prepend: "/images/" | prepend: absurl }}"
+ "{{ img.image_path | prepend: "/images/" | prepend: base_path }}"
{% endif %}
alt="{% if img.alt %}{{ img.alt }}{% endif %}">
{% endif %}
diff --git a/_includes/group-by-array.html b/_includes/group-by-array
similarity index 100%
rename from _includes/group-by-array.html
rename to _includes/group-by-array
diff --git a/_includes/head b/_includes/head
new file mode 100644
index 00000000..38a43551
--- /dev/null
+++ b/_includes/head
@@ -0,0 +1,30 @@
+
+
+{% include seo %}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/_includes/head.html b/_includes/head.html
deleted file mode 100644
index dfd62a5b..00000000
--- a/_includes/head.html
+++ /dev/null
@@ -1,30 +0,0 @@
-
-
-{% include seo.html %}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/_includes/navigation b/_includes/navigation
new file mode 100644
index 00000000..04005971
--- /dev/null
+++ b/_includes/navigation
@@ -0,0 +1,19 @@
+
+
+
+
+
+
diff --git a/_includes/navigation.html b/_includes/navigation.html
deleted file mode 100644
index 27aff530..00000000
--- a/_includes/navigation.html
+++ /dev/null
@@ -1,19 +0,0 @@
-
-
-
-
-
-
diff --git a/_includes/scripts.html b/_includes/scripts
similarity index 72%
rename from _includes/scripts.html
rename to _includes/scripts
index 746e9f5d..c8b4714e 100644
--- a/_includes/scripts.html
+++ b/_includes/scripts
@@ -1,6 +1,6 @@
-
-
+
+
{% if site.google_analytics %}