4 files changed, 28 insertions, 19 deletions
diff --git a/lib/scripts/subscriptions.js b/lib/scripts/subscriptions.js
index 9f602dde8..2af4ee8c4 100644
--- a/lib/scripts/subscriptions.js
+++ b/lib/scripts/subscriptions.js
@@ -5,7 +5,7 @@
  */
 
 addInitEvent(function () {
-    var form = $('subscribe');
+    var form = $('subscribe__form');
     if (!form) {
         return;
     }
@@ -31,13 +31,13 @@ addInitEvent(function () {
     var inputs = form.getElementsByTagName('input');
     for (var i = 0; i < inputs.length ; ++i) {
         switch (inputs[i].name) {
-        case 'subscribe_target':
+        case 'sub_target':
             inputs[i].addEventListener('change', update_state, false);
             if (inputs[i].checked) {
                 cur_sel = inputs[i];
             }
             break;
-        case 'subscribe_style':
+        case 'sub_style':
             styleradios[inputs[i].value] = inputs[i];
             break;
         }
diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css
new file mode 100644
index 000000000..0792c8c21
--- /dev/null
+++ b/lib/tpl/default/_subscription.css
@@ -0,0 +1,21 @@
+/**
+ * Styles for the subscription page
+ */
+
+form#subscribe__form {
+    display: block;
+    width: 300px;
+    text-align: center;
+}
+
+form#subscribe__form fieldset {
+    text-align: left;
+    margin: 0.5em 0;
+}
+
+form#subscribe__form label {
+    display:block;
+    margin: 0 0.5em 0.5em;
+}
+
+
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
index 02804256c..9c3e7b119 100644
--- a/lib/tpl/default/design.css
+++ b/lib/tpl/default/design.css
@@ -834,16 +834,3 @@ div.dokuwiki div.imagemeta img.thumb {
   margin-right: 0.1em;
 }
 
-form#subscribe p {
-    margin: 0.5em 0;
-}
-
-form#subscribe label {
-    display:block;
-    margin: 0 0.5em 0.5em;
-}
-
-form#subscribe fieldset, form#unsubscribe fieldset {
-    text-align:inherit;
-    margin: 0;
-}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
index dfd5500fa..84d04e743 100644
--- a/lib/tpl/default/style.ini
+++ b/lib/tpl/default/style.ini
@@ -10,9 +10,10 @@ layout.css     = screen
 design.css     = screen
 style.css      = screen
 
-media.css      = screen
-_admin.css     = screen
-_linkwiz.css   = screen
+media.css         = screen
+_admin.css        = screen
+_linkwiz.css      = screen
+_subscription.css = screen
 
 rtl.css        = rtl
 print.css      = print