diff --git a/templates/base/single.column.html.twig b/templates/base/one.column.html.twig
similarity index 100%
rename from templates/base/single.column.html.twig
rename to templates/base/one.column.html.twig
diff --git a/templates/base/two.column.html.twig b/templates/base/two.column.html.twig
new file mode 100644
index 0000000..979e228
--- /dev/null
+++ b/templates/base/two.column.html.twig
@@ -0,0 +1,17 @@
+{% extends 'base/container.html.twig' %}
+
+{% block container %}
+
+
+ {% if title is defined %}
{{ title }}
{% endif %}
+
+
+
+
+ {% block column1 %}{% endblock %}
+
+
+ {% block column2 %}{% endblock %}
+
+
+{% endblock %}
\ No newline at end of file
diff --git a/templates/content/compare.html.twig b/templates/content/compare.html.twig
index 7c37fe7..a5c8b09 100644
--- a/templates/content/compare.html.twig
+++ b/templates/content/compare.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title = 'Snip compare ' ~ snip %}
diff --git a/templates/generic/form.html.twig b/templates/generic/form.html.twig
index cf9f998..c09b2ee 100644
--- a/templates/generic/form.html.twig
+++ b/templates/generic/form.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title %}{{ message }}{% endset %}
diff --git a/templates/generic/simple.html.twig b/templates/generic/simple.html.twig
index 0ce1bee..bd7a0f6 100644
--- a/templates/generic/simple.html.twig
+++ b/templates/generic/simple.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% block body %}
{{ text | nl2br }}
diff --git a/templates/security/login.html.twig b/templates/security/login.html.twig
index a39e98a..ebb7df3 100644
--- a/templates/security/login.html.twig
+++ b/templates/security/login.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title %}Login{% endset %}
diff --git a/templates/security/register.html.twig b/templates/security/register.html.twig
index 113c52c..b58ebce 100644
--- a/templates/security/register.html.twig
+++ b/templates/security/register.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title %}Register{% endset %}
diff --git a/templates/snip/edit.html.twig b/templates/snip/edit.html.twig
index 7b69eef..6bc44bd 100644
--- a/templates/snip/edit.html.twig
+++ b/templates/snip/edit.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% if snip.id %}
{% set title = 'Edit Snip ' ~ snip %}
diff --git a/templates/snip/index.html.twig b/templates/snip/index.html.twig
index 6a0d4b7..864e2d5 100644
--- a/templates/snip/index.html.twig
+++ b/templates/snip/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title = 'My Snips' %}
diff --git a/templates/snip/public.html.twig b/templates/snip/public.html.twig
index adfb57f..1fb5909 100644
--- a/templates/snip/public.html.twig
+++ b/templates/snip/public.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title = 'Public Snips' %}
diff --git a/templates/snip/single.html.twig b/templates/snip/single.html.twig
index 0a02141..3d92206 100644
--- a/templates/snip/single.html.twig
+++ b/templates/snip/single.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title %}Snip {{ snip }}{% endset %}
diff --git a/templates/user/profile.html.twig b/templates/user/profile.html.twig
index 8027bab..a815b4a 100644
--- a/templates/user/profile.html.twig
+++ b/templates/user/profile.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/two.column.html.twig' %}
{% block body %}
diff --git a/templates/version/index.html.twig b/templates/version/index.html.twig
index 294801c..b01167a 100644
--- a/templates/version/index.html.twig
+++ b/templates/version/index.html.twig
@@ -1,4 +1,4 @@
-{% extends 'base/single.column.html.twig' %}
+{% extends 'base/one.column.html.twig' %}
{% set title = 'Snip ' ~ snip %}