diff --git a/templates/default/views/form.pstpl b/templates/default/views/form.pstpl
new file mode 100644
index 00000000000..b888bc7a21a
--- /dev/null
+++ b/templates/default/views/form.pstpl
@@ -0,0 +1,9 @@
+<div class='{FORMID}-page'>
+  <div class="h3">{FORMHEADING}</div>
+  {LANGUAGECHANGER}
+  <div class="well">
+    {FORMMESSAGE}
+    {FORMERROR}
+    <div class="form-{FORMID}">{FORM}</div>
+  </div>
+</div>
diff --git a/templates/default/views/message.pstpl b/templates/default/views/message.pstpl
new file mode 100644
index 00000000000..9d19a0464bb
--- /dev/null
+++ b/templates/default/views/message.pstpl
@@ -0,0 +1,5 @@
+<div class='{MESSAGEID}-wrapper well'>
+    {ERROR}
+    <div class='{MESSAGEID}-text'>{MESSAGE}</div>
+    {URL}
+</div>