-
-
\ No newline at end of file
diff --git a/_includes/footer.html b/_includes/footer.html
index 13d009d..4020711 100644
--- a/_includes/footer.html
+++ b/_includes/footer.html
@@ -1,39 +1,7 @@
-
-
-
-
-
-
-
-
-
-
-
-
@@ -77,25 +45,14 @@
-
-
-
-
-
+{% if page.requires_twitter %}
+{% endif %}
+
+{% if page.requires_graphs %}
-
\ No newline at end of file
+
\ No newline at end of file
diff --git a/_includes/head.html b/_includes/head.html
index a0ac778..a864a89 100644
--- a/_includes/head.html
+++ b/_includes/head.html
@@ -5,17 +5,27 @@
{%seo%}
-
+
-
-
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+
\ No newline at end of file
diff --git a/_includes/nav.html b/_includes/nav.html
index c87d4c8..050b88f 100644
--- a/_includes/nav.html
+++ b/_includes/nav.html
@@ -1,7 +1,8 @@
-
\ No newline at end of file
diff --git a/_layouts/album.html b/_layouts/album.html
deleted file mode 100644
index 77f04e0..0000000
--- a/_layouts/album.html
+++ /dev/null
@@ -1,71 +0,0 @@
-{% include head.html %}
-
-
-
-
- {% include footer.html %}
-
-
\ No newline at end of file
diff --git a/_layouts/page.html b/_layouts/page.html
index 14300cd..c08d596 100644
--- a/_layouts/page.html
+++ b/_layouts/page.html
@@ -1,5 +1,6 @@
{% include head.html %}
+
@@ -8,17 +9,65 @@
-
-
{{page.title}}
-
+
+
+
+
+
+
{{page.title}}
+
{{page.description}}
+
+
+
+
+
+
+
+ {{content}}
+
-
- {{content}}
{% include footer.html %}
+
+
\ No newline at end of file
diff --git a/_layouts/portfolio.html b/_layouts/portfolio.html
deleted file mode 100644
index f02e27b..0000000
--- a/_layouts/portfolio.html
+++ /dev/null
@@ -1,38 +0,0 @@
-{% include head.html %}
-
-
-
-
-
- {% include nav.html %}
-
-
-
-
-
{{page.title}}
-
-
-
-
-
-
Software
-
-
-
-
-
Web
-
-
-
-
-
Photography
-
-
-
-
-
-
- {% include footer.html %}
-
-
-
\ No newline at end of file
diff --git a/_layouts/post.html b/_layouts/post.html
deleted file mode 100644
index 8b0b8fe..0000000
--- a/_layouts/post.html
+++ /dev/null
@@ -1,46 +0,0 @@
-{% include head.html %}
-
-
-
-
-
-
- {% include nav.html %}
-
-
-
-
-
{{page.title}}
-
{{page.description}}
-
-
-
-
-
-
-
- {{page.date}}
-
-
- {% if page.is_short %}
- Mini Post
- {% endif %}
-
-
- {% if page.redirect_from %}
-
- {% endif %}
-
-
-
-
- {{content}}
-
-
-
-
- {% include advert.html %}
- {% include footer.html %}
-
-
-
\ No newline at end of file
diff --git a/_layouts/posts.html b/_layouts/posts.html
deleted file mode 100644
index 8bbdde6..0000000
--- a/_layouts/posts.html
+++ /dev/null
@@ -1,87 +0,0 @@
-{% include head.html %}
-
-
-
-
-
- {% include nav.html %}
-
-
-
-
-
-
-
-
{{page.title}}
-
-
-
-
- Featured
- Post
-
- {% assign i = 0 %}
- {% for post in site.posts %}
-
- {% if i == 0 %}
-
-
-
-
+
+
+ {% endif %}
+ {% assign i = i | plus:1 %}
+ {% endfor %}
+
\ No newline at end of file
diff --git a/events.md b/events.md
index 96d76c1..edd4068 100644
--- a/events.md
+++ b/events.md
@@ -1,5 +1,31 @@
---
title: Events
description: Notable events I am attending / have attended
-layout: events
----
\ No newline at end of file
+layout: page
+---
+
+