diff --git a/inc/html.php b/inc/html.php
index b233e1d92633fb07b1de5ba3722ffd774e2bf145..f3f042ea1daa09f9d3ed6a6ecc07b7b327bbee39 100644
--- a/inc/html.php
+++ b/inc/html.php
@@ -449,7 +449,7 @@ function html_revisions($first=0, $media_id = false){
 
     if (!$media_id) print p_locale_xhtml('revisions');
 
-    $params = array('id' => 'page__revisions');
+    $params = array('id' => 'page__revisions', 'class' => 'changes');
     if ($media_id) $params['action'] = media_managerURL(array('image' => $media_id), '&');
 
     $form = new Doku_Form($params);
@@ -664,12 +664,13 @@ function html_recent($first=0, $show_changes='both'){
     if (getNS($ID) != '')
         print '<div class="level1"><p>' . sprintf($lang['recent_global'], getNS($ID), wl('', 'do=recent')) . '</p></div>';
 
-    $form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET'));
+    $form = new Doku_Form(array('id' => 'dw__recent', 'method' => 'GET', 'class' => 'changes'));
     $form->addHidden('sectok', null);
     $form->addHidden('do', 'recent');
     $form->addHidden('id', $ID);
 
     if ($conf['mediarevisions']) {
+        $form->addElement('<div class="changeType">');
         $form->addElement(form_makeListboxField(
                     'show_changes',
                     array(
@@ -682,6 +683,7 @@ function html_recent($first=0, $show_changes='both'){
                     array('class'=>'quickselect')));
 
         $form->addElement(form_makeButton('submit', 'recent', $lang['btn_apply']));
+        $form->addElement('</div>');
     }
 
     $form->addElement(form_makeOpenTag('ul'));
@@ -1381,7 +1383,7 @@ function html_edit(){
     }
 
     $form->addHidden('target', $data['target']);
-    $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar')));
+    $form->addElement(form_makeOpenTag('div', array('id'=>'wiki__editbar', 'class'=>'editBar')));
     $form->addElement(form_makeOpenTag('div', array('id'=>'size__ctl')));
     $form->addElement(form_makeCloseTag('div'));
     if ($wr) {
@@ -1413,13 +1415,12 @@ function html_edit(){
         echo 'textChanged = ' . ($mod ? 'true' : 'false');
         echo '//--><!]]></script>' . NL;
     } ?>
-    <div style="width:99%;">
+    <div class="editBox">
 
     <div class="toolbar">
-    <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
-    <div id="tool__bar"><?php if ($wr && $data['media_manager']){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
-        target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
-
+        <div id="draft__status"><?php if(!empty($INFO['draft'])) echo $lang['draftdate'].' '.dformat();?></div>
+        <div id="tool__bar"><?php if ($wr && $data['media_manager']){?><a href="<?php echo DOKU_BASE?>lib/exe/mediamanager.php?ns=<?php echo $INFO['namespace']?>"
+            target="_blank"><?php echo $lang['mediaselect'] ?></a><?php }?></div>
     </div>
     <?php
 
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
index 68fa2e97f06b58ed68db5873cdc8455ee2d0e5ba..8c605f69a3af42e5a2cccf923b3194de14289565 100644
--- a/lib/tpl/default/_mediamanager.css
+++ b/lib/tpl/default/_mediamanager.css
@@ -343,18 +343,18 @@
 
 /*____________ Revisions form ____________*/
 
-#mediamanager__page #page__revisions ul {
+#mediamanager__page form.changes ul {
     margin-left: 10px;
     list-style-type: none;
 }
 
-#mediamanager__page #page__revisions ul li div.li div {
+#mediamanager__page form.changes ul li div.li div {
     font-size: 90%;
     color: __text_neu__;
     padding-left: 18px;
 }
 
-#mediamanager__page #page__revisions ul li div.li input {
+#mediamanager__page form.changes ul li div.li input {
     position: relative;
     top: 1px;
 }
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 5a3952c9010b8b55167e0cc8ae4c80d776daca95..0a510657564ef5fdabfa1f861be5b6323c90720d 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -6,18 +6,21 @@
 /* edit view
 ********************************************************************/
 
+.dokuwiki div.editBox {
+}
+
 /*____________ toolbar ____________*/
 
 .dokuwiki div.toolbar {
     margin-bottom: .5em;
     overflow: hidden;
 }
-.dokuwiki div.toolbar #draft__status {
+#draft__status {
     float: right;
     color: __text_alt__;
     background-color: inherit;
 }
-.dokuwiki div.toolbar #tool__bar {
+#tool__bar {
     float: left;
 }
 
@@ -55,42 +58,42 @@ div.picker button.toolbutton {
 
 /*____________ below the textarea ____________*/
 
-.dokuwiki #wiki__editbar {
+.dokuwiki div.editBar {
     overflow: hidden;
     margin-bottom: .5em;
 }
 
 /* size and wrap controls */
-.dokuwiki #wiki__editbar #size__ctl {
+#size__ctl {
     float: right;
 }
-.dokuwiki #wiki__editbar #size__ctl img {
+#size__ctl img {
     cursor: pointer;
 }
 
 /* edit buttons */
-.dokuwiki #wiki__editbar .editButtons {
+.dokuwiki .editBar .editButtons {
     display: inline;
     margin-right: 1em;
 }
-.dokuwiki #wiki__editbar .editButtons input {
+.dokuwiki .editBar .editButtons input {
 }
 
 /* summary input and minor changes checkbox */
-.dokuwiki #wiki__editbar .summary {
+.dokuwiki .editBar .summary {
     display: inline;
 }
-.dokuwiki #wiki__editbar .summary label {
+.dokuwiki .editBar .summary label {
     vertical-align: middle;
     white-space: nowrap;
 }
-.dokuwiki #wiki__editbar .summary label span {
+.dokuwiki .editBar .summary label span {
     vertical-align: middle;
 }
-.dokuwiki #wiki__editbar .summary input {
+.dokuwiki .editBar .summary input {
 }
 /* change background colour if summary is missing */
-.dokuwiki #wiki__editbar .summary input.missing {
+.dokuwiki .editBar .summary input.missing {
     color: __text__;
     background-color: #ffcccc;
 }
diff --git a/lib/tpl/dokuwiki/css/_recent.css b/lib/tpl/dokuwiki/css/_recent.css
index 68f0e5826e58b256b1d8a31a182e6cbb84c7f112..426e06fb4929efd6a965960f2c7bcba5f73ab486 100644
--- a/lib/tpl/dokuwiki/css/_recent.css
+++ b/lib/tpl/dokuwiki/css/_recent.css
@@ -5,54 +5,41 @@
 
 /*____________ list of revisions / recent changes ____________*/
 
-/* select type of revisions (media/pages), should have a class on it's own, but hasn't */
-.dokuwiki #dw__recent label {
+/* select type of revisions (media/pages) */
+.dokuwiki .changeType {
     margin-bottom: .5em;
-    display: block;
 }
 
-.dokuwiki #dw__recent ul li,
-.dokuwiki #page__revisions ul li {
+.dokuwiki form.changes ul li {
     list-style: none;
     margin-left: 0;
 }
-.dokuwiki #dw__recent ul li span,
-.dokuwiki #dw__recent ul li a,
-.dokuwiki #page__revisions ul li span,
-.dokuwiki #page__revisions ul li a {
+.dokuwiki form.changes ul li span,
+.dokuwiki form.changes ul li a {
     vertical-align: middle;
 }
-.dokuwiki #dw__recent ul li span.user a,
-.dokuwiki #page__revisions ul li span.user a {
+.dokuwiki form.changes ul li span.user a {
     vertical-align: bottom;
 }
-.dokuwiki #dw__recent ul li.minor,
-.dokuwiki #page__revisions ul li.minor {
+.dokuwiki form.changes ul li.minor {
     opacity: .7;
 }
 
-.dokuwiki #dw__recent li span.date,
-.dokuwiki #page__revisions li span.date {
+.dokuwiki form.changes li span.date {
 }
-.dokuwiki #dw__recent li a.diff_link,
-.dokuwiki #page__revisions li a.diff_link {
+.dokuwiki form.changes li a.diff_link {
     vertical-align: baseline;
 }
-.dokuwiki #dw__recent li a.revisions_link,
-.dokuwiki #page__revisions li a.revisions_link {
+.dokuwiki form.changes li a.revisions_link {
     vertical-align: baseline;
 }
-.dokuwiki #dw__recent li a.wikilink1,
-.dokuwiki #dw__recent li a.wikilink2,
-.dokuwiki #page__revisions li a.wikilink1,
-.dokuwiki #page__revisions li a.wikilink2 {
+.dokuwiki form.changes li a.wikilink1,
+.dokuwiki form.changes li a.wikilink2 {
 }
-.dokuwiki #dw__recent li span.sum,
-.dokuwiki #page__revisions li span.sum {
+.dokuwiki form.changes li span.sum {
     font-weight: bold;
 }
-.dokuwiki #dw__recent li span.user,
-.dokuwiki #page__revisions li span.user {
+.dokuwiki form.changes li span.user {
 }
 
 
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.css
index e1052f43773654815a564d9390ae183a9a093628..b923c811c463b90b89bd4f0d497dd2cb6bd0bdb4 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.css
@@ -65,8 +65,7 @@
 }
 
 /* _recent */
-.dokuwiki #dw__recent ul,
-.dokuwiki #page__revisions ul {
+.dokuwiki form.changes ul {
     padding-left: 0;
 }
 
diff --git a/lib/tpl/dokuwiki/css/rtl.css b/lib/tpl/dokuwiki/css/rtl.css
index e0f81bb214b404eeacdf5f8d4577f575ed1dc3be..f365915489210738b179547f0ade35c5a353b2ae 100644
--- a/lib/tpl/dokuwiki/css/rtl.css
+++ b/lib/tpl/dokuwiki/css/rtl.css
@@ -166,8 +166,7 @@
 
 /*____________ _recent ____________*/
 
-[dir=rtl] .dokuwiki #dw__recent ul li,
-[dir=rtl] .dokuwiki #page__revisions ul li {
+[dir=rtl] .dokuwiki form.changes ul li {
     margin-right: 0;
 }
 
@@ -177,16 +176,16 @@
 
 /*____________ _edit ____________*/
 
-[dir=rtl] .dokuwiki div.toolbar #draft__status {
+[dir=rtl] #draft__status {
     float: left;
 }
-[dir=rtl] .dokuwiki #wiki__editbar #size__ctl {
+[dir=rtl] #size__ctl {
     float: left;
 }
-[dir=rtl] .dokuwiki #wiki__editbar #size__ctl img {
+[dir=rtl] #size__ctl img {
     cursor: pointer;
 }
-[dir=rtl] .dokuwiki #wiki__editbar .editButtons {
+[dir=rtl] .dokuwiki .editBar .editButtons {
     margin-right: 0;
     margin-left: 1em;
 }
@@ -544,8 +543,7 @@
     border-right-width: 0;
 }
 
-[dir=rtl] .dokuwiki #dw__recent ul,
-[dir=rtl] .dokuwiki #page__revisions ul {
+[dir=rtl] .dokuwiki form.changes ul {
     padding-right: 0;
 }