diff --git a/_config.yml b/_config.yml
index 7cb9d34..f62b2ef 100644
--- a/_config.yml
+++ b/_config.yml
@@ -1,9 +1,11 @@
+# Jekyll
safe: true
-markdown: kramdown
-pygments: true
-permalink: /:title.html
-relative_permalinks: false
+markdown: kramdown
+highlighter: pygments
+permalink: /:title.html
+url:
+# Shower
default_theme: ribbon
default_width: 792
default_lang: en
diff --git a/_includes/setup.md b/_includes/_setup.html
similarity index 91%
rename from _includes/setup.md
rename to _includes/_setup.html
index b096ebd..1cf2649 100644
--- a/_includes/setup.md
+++ b/_includes/_setup.html
@@ -1,6 +1,6 @@
-{% capture strip_whitespace %}
+{% capture _strip_whitespace %}
-# Set all the things
+<!-- Set all the things -->
{% capture theme %}{% if page.theme and page.theme != 'default' %}{{ page.theme }}{% else %}{{ site.default_theme }}{% endif %}{% endcapture %}
{% capture width %}{% if page.width %}{{ page.width }}{% else %}{{ site.default_width }}{% endif %}{% endcapture %}
@@ -13,13 +13,11 @@
{% capture company_name %}{% if page.author.company %}{% if page.author.company.name %}{{ page.author.company.name }}{% else %}{{ page.author.company }}{% endif %}{% elsif page.company %}{% if page.company.name %}{{ page.company.name }}{% else %}{{ page.company }}{% endif %}{% else %}{{ site.author.company.name }}{% endif %}{% endcapture %}
{% capture company_url %}{% if page.author.company %}{{ page.author.company.url }}{% elsif page.company %}{{ page.company.url }}{% else %}{% if site.author.company.url %}{{ site.author.company.url }}{% endif %}{% endif %}{% endcapture %}
- {% capture title %}{% if page.title %}{{ page.title }}{% else %}{{ supertitle }}{% endif %}{% endcapture %}
-
{% capture subtitle %}{% if page.subtitle %}{{ page.subtitle }}{% else %}{% if author_url != '' %}[{{ author_name }}]({{ author_url }}){% else %}{{ author_name }}{% endif %}{% if company_name != '' %}, {% if company_url != '' %}[{{ company_name }}]({{ company_url }}){% else %}{{ company_name }}{% endif %}{% endif %}{% endif %}{% endcapture %}{% capture subtitle %}{{ subtitle | markdownify }}{% endcapture %}
{% capture fork_url %}{% if page.fork_url %}{{ page.fork_url }}{% else %}{{ site.fork_url }}{% endif %}{% endcapture %}
-## Set the progress var
+<!-- Set the progress var -->
{% assign progress = page.progress | append:'' | size %}
{% if progress == 0 %}
@@ -28,7 +26,7 @@
{% assign progress = page.progress %}
{% endif %}
-## Set the line numbers var
+<!-- Set the line numbers var -->
{% assign line_numbers = page.line_numbers | append:'' | size %}
{% if line_numbers == 0 %}
@@ -37,4 +35,4 @@
{% assign line_numbers = page.line_numbers %}
{% endif %}
-{% endcapture %}
+{% endcapture %}
\ No newline at end of file
diff --git a/_includes/showerify.html b/_includes/_showerify.html
similarity index 98%
rename from _includes/showerify.html
rename to _includes/_showerify.html
index 83e890d..eeae0a1 100644
--- a/_includes/showerify.html
+++ b/_includes/_showerify.html
@@ -1,5 +1,8 @@
-{% capture strip_whitespace %}
-{% include setup.md %}
+{% capture _strip_whitespace %}
+
+<!-- Get things setup -->
+{% include _setup.html %}
+
{% assign items = showerify_input | split:'<h1' %}
{% for item in items %}
{% assign subitems = item | split:'</h1>' %}
@@ -122,4 +125,4 @@
{% assign showerify_middle = showerify_middle | replace:'<hr />','</div></section><section class="slide"><div>' %}
{% capture showerify_output %}{{ showerify_middle }}{% endcapture %}
-{% endcapture %}
+{% endcapture %}
\ No newline at end of file
diff --git a/_layouts/bright.html b/_layouts/bright.html
index 9a29882..eadb046 100644
--- a/_layouts/bright.html
+++ b/_layouts/bright.html
@@ -1,7 +1,6 @@
---
layout: default
-
theme: bright
---
diff --git a/_layouts/default.html b/_layouts/default.html
index 08da076..83aa2f8 100644
--- a/_layouts/default.html
+++ b/_layouts/default.html
@@ -1,12 +1,11 @@
-<!DOCTYPE HTML>{% capture showerify_input %}{{ content }}{% endcapture %}{% include showerify.html %}{% include setup.md %}
+<!DOCTYPE HTML>{% capture showerify_input %}{{ content }}{% endcapture %}{% include _showerify.html %}{% capture title %}{% if page.title %}{{ page.title }}{% else %}{{ supertitle }}{% endif %}{% endcapture %}
<html lang="{{ lang }}">
<head>
- <title>{{ title | strip_html }}</title>
+ <title>{{ title }}</title>
<meta charset="utf-8">
<meta name="viewport" content="width={% if width %}{{ width }}{% else %}792{% endif %}, user-scalable=no">
- <link rel="stylesheet" href="themes/{{ theme }}/styles/screen.css">
- {% if page.style %}<style>
-{{ page.style }}</style>{%endif%}
+ <link rel="stylesheet" href="{{ url }}/themes/{{ theme }}/styles/screen.css">
+ {% if page.style %}<style>{{ page.style }}</style>{%endif%}
</head>
<body class="{{ body_class }}">
<header class="caption">
diff --git a/_layouts/ribbon.html b/_layouts/ribbon.html
index a2edb68..6474cdd 100644
--- a/_layouts/ribbon.html
+++ b/_layouts/ribbon.html
@@ -1,7 +1,6 @@
---
layout: default
-
theme: ribbon
---
diff --git a/examples/bright.md b/examples/bright.md
index 4069b60..5c221ed 100644
--- a/examples/bright.md
+++ b/examples/bright.md
@@ -1,7 +1,6 @@
---
layout: bright
-
permalink: bright.html
---
diff --git a/examples/ribbon.md b/examples/ribbon.md
index 8437056..49a2028 100644
--- a/examples/ribbon.md
+++ b/examples/ribbon.md
@@ -1,7 +1,6 @@
---
layout: ribbon
-
permalink: ribbon.html
---
diff --git a/examples/shower.md b/examples/shower.md
index 5678976..2fc7342 100755
--- a/examples/shower.md
+++ b/examples/shower.md
@@ -1,7 +1,7 @@
---
layout: bright
-
+permalink: shower.html
style: |
#Cover h2 {
diff --git a/shower b/shower
index 2cb3716..aa8a6bf 160000
--- a/shower
+++ b/shower
@@ -1 +1 @@
-Subproject commit 2cb371668b63b002e56aef4c0cc0ec933919c889
+Subproject commit aa8a6bfc36d8808a47e9b44f915bda13200426ff
diff --git a/themes/bright b/themes/bright
index 29b60e1..79f64f3 160000
--- a/themes/bright
+++ b/themes/bright
@@ -1 +1 @@
-Subproject commit 29b60e1c6254f9b2e73e77f413ec3a217bb6b814
+Subproject commit 79f64f358793cf5dd9bd3f09c3f1233df1081ba3
diff --git a/themes/ribbon b/themes/ribbon
index 1e9ba80..d59af02 160000
--- a/themes/ribbon
+++ b/themes/ribbon
@@ -1 +1 @@
-Subproject commit 1e9ba80d02cb66d95fc60440c7bf5d74902e2a6f
+Subproject commit d59af0239f0f61990f36f37f321407dde2b2a3a8