diff --git a/css/_admin.css b/css/_admin.css
index e466436..c8f3694 100644
--- a/css/_admin.css
+++ b/css/_admin.css
@@ -9,6 +9,9 @@
     list-style-type: none;
     font-size: 1.125em;
 }
+[dir=rtl] .dokuwiki ul.admin_tasks {
+    float: right;
+}
 
 .dokuwiki ul.admin_tasks li {
     padding-left: 35px;
@@ -18,6 +21,11 @@
     background: transparent none no-repeat scroll 0 0;
     color: inherit;
 }
+[dir=rtl] .dokuwiki ul.admin_tasks li {
+    padding-left: 0;
+    padding-right: 35px;
+    background-position: right 0;
+}
 
 .dokuwiki ul.admin_tasks li.admin_acl {
     background-image: url(../../images/admin/acl.png);
@@ -45,3 +53,7 @@
     color: __text_neu__;
     background-color: inherit;
 }
+[dir=rtl] .dokuwiki #admin__version {
+    clear: right;
+    float: left;
+}
diff --git a/css/_edit.css b/css/_edit.css
index fd93d2f..c9ca67d 100644
--- a/css/_edit.css
+++ b/css/_edit.css
@@ -20,6 +20,10 @@
     color: __text_alt__;
     background-color: inherit;
 }
+[dir=rtl] #draft__status {
+    float: left;
+}
+
 #tool__bar {
     float: left;
 }
@@ -67,6 +71,9 @@ div.picker button.toolbutton {
 #size__ctl {
     float: right;
 }
+[dir=rtl] #size__ctl {
+    float: left;
+}
 #size__ctl img {
     cursor: pointer;
 }
@@ -77,6 +84,11 @@ div.picker button.toolbutton {
     display: inline;
     margin-right: 1em;
 }
+[dir=rtl] .dokuwiki #wiki__editbar .editButtons, /* old, until 2012-01-25 */
+[dir=rtl] .dokuwiki .editBar .editButtons /* new */ {
+    margin-right: 0;
+    margin-left: 1em;
+}
 .dokuwiki #wiki__editbar .editButtons input, /* old, until 2012-01-25 */
 .dokuwiki div.editBar .editButtons input /* new */ {
 }
@@ -122,6 +134,9 @@ div.picker button.toolbutton {
     float: right;
     margin-top: -1.4em;
 }
+[dir=rtl] .dokuwiki .secedit {
+    float: left;
+}
 .dokuwiki .secedit input.button {
     font-size: 75%;
 }
@@ -136,3 +151,9 @@ div.picker button.toolbutton {
     border: solid __background_alt__;
     border-width: 0 .5em;
 }
+[dir=rtl] .dokuwiki div.section_highlight {
+    margin: -3em -1.5em -.01em 0;
+    padding: 3em 1em .01em 0;
+    border-left-width: 0;
+    border-right: .5em solid __background_alt__;
+}
diff --git a/css/_forms.css b/css/_forms.css
index 0c82f5f..dbcbc23 100644
--- a/css/_forms.css
+++ b/css/_forms.css
@@ -23,12 +23,18 @@
   text-align: right;
   font-weight: bold;
 }
+[dir=rtl] .dokuwiki label.block {
+  text-align: left;
+}
 
 .dokuwiki label.simple {
   display: block;
   text-align: left;
   font-weight: normal;
 }
+[dir=rtl] .dokuwiki label.simple {
+  text-align: right;
+}
 
 .dokuwiki label.block input.edit {
   width: 50%;
@@ -75,6 +81,9 @@
     text-align: left;
     margin: 0.5em 0;
 }
+[dir=rtl] #subscribe__form fieldset {
+    text-align: right;
+}
 
 #subscribe__form label {
     display: block;
diff --git a/css/_imgdetail.css b/css/_imgdetail.css
index a3e0f55..fbeb136 100644
--- a/css/_imgdetail.css
+++ b/css/_imgdetail.css
@@ -12,9 +12,17 @@
     float: left;
     margin: 0 1.5em .5em 0;
 }
+[dir=rtl] #dokuwiki__detail img {
+    float: right;
+    margin-right: 0;
+    margin-left: 1.5em;
+}
 #dokuwiki__detail div.img_detail {
     float: left;
 }
+[dir=rtl] #dokuwiki__detail div.img_detail {
+    float: right
+}
 
 #dokuwiki__detail div.img_detail h2 {
 }
diff --git a/css/_links.css b/css/_links.css
index 6b19c3a..faa6e2e 100644
--- a/css/_links.css
+++ b/css/_links.css
@@ -41,6 +41,15 @@
     background-position: 0 center;
     padding: 0 0 0 20px;
 }
+[dir=rtl] .dokuwiki a.urlextern,
+[dir=rtl] .dokuwiki a.windows,
+[dir=rtl] .dokuwiki a.mail,
+[dir=rtl] .dokuwiki a.interwiki,
+[dir=rtl] .dokuwiki a.mediafile {
+    background-position: right center;
+    padding: 0 17px 0 0;
+}
+
 /* external link */
 .dokuwiki a.urlextern {
     background-image: url(images/link_icon.gif);
diff --git a/css/_media_popup.css b/css/_media_popup.css
index 0469c8e..c776e6b 100644
--- a/css/_media_popup.css
+++ b/css/_media_popup.css
@@ -22,6 +22,12 @@ html.popup {
     left: 0;
     border-right: 1px solid __border__;
 }
+[dir=rtl] #mediamgr__aside {
+    left: auto;
+    right: 0;
+    border-right-width: 0;
+    border-left: 1px solid __border__;
+}
 #mediamgr__aside .pad {
     padding: .5em;
 }
@@ -33,6 +39,10 @@ html.popup {
     position: absolute;
     right: 0;
 }
+[dir=rtl] #mediamgr__content {
+    right: auto;
+    left: 0;
+}
 #mediamgr__content .pad {
     padding: .5em;
 }
@@ -57,6 +67,10 @@ html.popup {
 #media__opts input {
     margin-right: .3em;
 }
+[dir=rtl] #media__opts input {
+    margin-right: 0;
+    margin-left: .3em;
+}
 #media__opts label {
 }
 
@@ -65,22 +79,38 @@ html.popup {
 #media__tree ul {
     padding-left: .2em;
 }
+[dir=rtl] #media__tree ul {
+    padding-left: 0;
+    padding-right: .2em;
+}
 #media__tree ul li {
     clear: left;
     list-style-type: none;
     list-style-image: none;
     margin-left: 0;
 }
+[dir=rtl] #media__tree ul li {
+    clear: right;
+    margin-right: 0;
+}
 #media__tree ul li img {
     float: left;
     padding: .5em .3em 0 0;
 }
+[dir=rtl] #media__tree ul li img {
+    float: right;
+    padding: .5em 0 0 .3em;
+}
 #media__tree ul li div.li {
     display: inline;
 }
 #media__tree ul li li {
     margin-left: 1.5em;
 }
+[dir=rtl] #media__tree ul li li {
+    margin-left: 0;
+    margin-right: 1.5em;
+}
 
 /* right side
 ********************************************************************/
@@ -125,6 +155,10 @@ html.popup {
     margin-right: 1.5em;
     font-weight: bold;
 }
+[dir=rtl] #media__content a.mediafile {
+    margin-right: 0;
+    margin-left: 1.5em;
+}
 #media__content span.info {
 }
 #media__content img.btn {
@@ -144,6 +178,10 @@ html.popup {
     float: left;
     margin: 0 .5em 0 18px;
 }
+[dir=rtl] #media__content div.detail div.thumb {
+    float: right;
+    margin: 0 18px 0 .5em;
+}
 #media__content div.detail div.thumb a {
     display: block;
     cursor: pointer;
@@ -155,17 +193,17 @@ html.popup {
 
 /*____________ media search ____________*/
 
-form#dw__mediasearch {
+#dw__mediasearch {
 }
-form#dw__mediasearch p {
+#dw__mediasearch p {
 }
-form#dw__mediasearch label {
+#dw__mediasearch label {
 }
-form#dw__mediasearch label span {
+#dw__mediasearch label span {
 }
-form#dw__mediasearch input.edit {
+#dw__mediasearch input.edit {
 }
-form#dw__mediasearch input.button {
+#dw__mediasearch input.button {
 }
 
 
@@ -180,6 +218,9 @@ form#dw__mediasearch input.button {
     margin-bottom: .5em;
     overflow: hidden;
 }
+[dir=rtl] #media__content form.meta div.metafield {
+    clear: right;
+}
 
 #media__content form.meta label {
     display: block;
@@ -188,11 +229,18 @@ form#dw__mediasearch input.button {
     font-weight: bold;
     clear: left;
 }
+[dir=rtl] #media__content form.meta label {
+    float: right;
+    clear: right;
+}
 #media__content form.meta .edit {
     float: left;
     width: 70%;
     margin: 0;
 }
+[dir=rtl] #media__content form.meta .edit {
+    float: right;
+}
 #media__content form.meta textarea.edit {
     /* needed because of IE8 hack in _edit.css for textarea.edit: */
     max-width: 70%;
@@ -203,3 +251,7 @@ form#dw__mediasearch input.button {
     clear: left;
     margin: .2em 0 0 25%;
 }
+[dir=rtl] #media__content form.meta div.buttons {
+    clear: right;
+    margin: .2em 25% 0 0;
+}
diff --git a/css/_modal.css b/css/_modal.css
index 125f702..509238c 100644
--- a/css/_modal.css
+++ b/css/_modal.css
@@ -23,10 +23,16 @@
     text-align: left;
     line-height: 1;
 }
+[dir=rtl] #link__wiz_result {
+    text-align: right;
+}
 
 #link__wiz_result div {
     padding: 3px 3px 3px 0;
 }
+[dir=rtl] #link__wiz_result div {
+    padding: 3px 0 3px 3px;
+}
 
 #link__wiz_result div a {
     display: block;
@@ -34,6 +40,10 @@
     min-height: 16px;
     background: transparent 3px center no-repeat;
 }
+[dir=rtl] #link__wiz_result div a {
+    padding-right: 22px;
+    background-position: right 0;
+}
 
 #link__wiz_result div.type_u a {
     background-image: url(../../images/up.png);
@@ -58,6 +68,10 @@
     color: __text_neu__;
     margin-left: 22px;
 }
+[dir=rtl] #link__wiz_result span {
+    margin-left: 0;
+    margin-right: 22px;
+}
 
 
 /* media option wizard (opens when inserting media in the media popup)
@@ -76,6 +90,10 @@
     margin-right: .5em;
     cursor: default;
 }
+[dir=rtl] #media__popup_content label {
+    margin-right: 0;
+    margin-left: .5em;
+}
 
 #media__popup_content .button {
     margin-right: 1px;
diff --git a/css/_recent.css b/css/_recent.css
index 2ef599c..cb1e7f4 100644
--- a/css/_recent.css
+++ b/css/_recent.css
@@ -18,6 +18,12 @@
     list-style: none;
     margin-left: 0;
 }
+[dir=rtl] .dokuwiki #dw__recent ul li, /* old, until 2012-01-25 */
+[dir=rtl] .dokuwiki #page__revisions ul li, /* old, until 2012-01-25 */
+[dir=rtl] .dokuwiki form.changes ul li /* new */ {
+    margin-right: 0;
+}
+
 .dokuwiki #dw__recent ul li span, /* old, until 2012-01-25 */
 .dokuwiki #page__revisions ul li span, /* old, until 2012-01-25 */
 .dokuwiki form.changes ul li span, /* new */
diff --git a/css/_search.css b/css/_search.css
index c124c1e..541d55d 100644
--- a/css/_search.css
+++ b/css/_search.css
@@ -25,6 +25,9 @@
     width: 12em;
     margin: 0 1.5em;
 }
+[dir=rtl] .dokuwiki div.search_quickresult ul li {
+    float: right;
+}
 
 /*____________ search results ____________*/
 
@@ -78,6 +81,12 @@
     text-align: left;
     display: none;
 }
+[dir=rtl] .dokuwiki form.search div.ajax_qsearch {
+    left: auto;
+    right: -13.5em;
+    text-align: right;
+}
+
 .dokuwiki form.search div.ajax_qsearch strong {
     display: block;
     margin-bottom: .3em;
diff --git a/css/_toc.css b/css/_toc.css
index 5b71de3..9c5a247 100644
--- a/css/_toc.css
+++ b/css/_toc.css
@@ -14,6 +14,10 @@
     background-color: __background_alt__;
     color: inherit;
 }
+[dir=rtl] .dokuwiki div.toc {
+    float: left;
+    margin: 0 1.4em 1.4em 0;
+}
 
 /*____________ toc header ____________*/
 
@@ -27,6 +31,10 @@
     float: right;
     margin: 0 .2em;
 }
+[dir=rtl] .dokuwiki .toc span.toc_open,
+[dir=rtl] .dokuwiki .toc span.toc_close {
+    float: left;
+}
 
 /*____________ toc list ____________*/
 
@@ -49,6 +57,10 @@
 .dokuwiki #toc__inside ul ul {
     padding-left: 1em;
 }
+[dir=rtl] .dokuwiki #toc__inside ul ul {
+    padding-left: 0;
+    padding-right: 1em;
+}
 .dokuwiki #toc__inside ul ul li {
 }
 .dokuwiki #toc__inside ul li a {
@@ -66,6 +78,9 @@
 .dokuwiki ul.idx {
     padding-left: 0;
 }
+[dir=rtl] .dokuwiki ul.idx {
+    padding-right: 0;
+}
 .dokuwiki ul.idx li {
     list-style-image: url(images/bullet.png);
 }
@@ -75,3 +90,6 @@
 .dokuwiki ul.idx li.closed {
     list-style-image: url(images/closed.png);
 }
+[dir=rtl] .dokuwiki ul.idx li.closed {
+    list-style-image: url(images/closed-rtl.png);
+}
diff --git a/css/basic.css b/css/basic.css
index 0679920..5ff8008 100644
--- a/css/basic.css
+++ b/css/basic.css
@@ -347,3 +347,40 @@ div.clearer {
     overflow: hidden;
     display: inline;
 }
+
+
+/*____________ rtl corrections ____________*/
+
+[dir=rtl] caption,
+[dir=rtl] td,
+[dir=rtl] th {
+    text-align: right;
+}
+
+[dir=rtl] ul,
+[dir=rtl] ol {
+    padding: 0 1.5em 0 0;
+}
+[dir=rtl] li,
+[dir=rtl] dd {
+    margin: 0 1.5em 0 0;
+}
+[dir=rtl] blockquote {
+    border-width: 0 .25em 0 0;
+}
+
+[dir=rtl] h1,
+[dir=rtl] h2,
+[dir=rtl] h3,
+[dir=rtl] h4,
+[dir=rtl] h5,
+[dir=rtl] h6,
+[dir=rtl] caption,
+[dir=rtl] legend {
+    clear: right;
+}
+
+[dir=rtl] .a11y {
+    left: auto;
+    right: -9000px;
+}
diff --git a/css/content.css b/css/content.css
index 5c5a7e7..6bbfaf9 100644
--- a/css/content.css
+++ b/css/content.css
@@ -8,36 +8,27 @@
 
 /*____________ section indenting ____________
 
-.dokuwiki.page h1 {
-    margin-left: 0;
-}
-.dokuwiki.page div.level1 {
-    margin-left: 0;
-}
-.dokuwiki.page h2 {
-    margin-left: .666em;
-}
-.dokuwiki.page div.level2 {
-    margin-left: 1em;
-}
-.dokuwiki.page h3 {
-    margin-left: 1.776em;
-}
-.dokuwiki.page div.level3 {
-    margin-left: 2em;
-}
-.dokuwiki.page h4 {
-    margin-left: 3em;
-}
-.dokuwiki.page div.level4 {
-    margin-left: 3em;
-}
-.dokuwiki.page h5 {
-    margin-left: 4.5712em;
-}
-.dokuwiki.page div.level5 {
-    margin-left: 4em;
-}
+.dokuwiki.page  h1 {margin-left: 0;}
+.dokuwiki.page  h2 {margin-left: .666em;}
+.dokuwiki.page  h3 {margin-left: 1.776em;}
+.dokuwiki.page  h4 {margin-left: 3em;}
+.dokuwiki.page  h5 {margin-left: 4.5712em;}
+.dokuwiki.page  div.level1 {margin-left: 0;}
+.dokuwiki.page  div.level2 {margin-left: 1em;}
+.dokuwiki.page  div.level3 {margin-left: 2em;}
+.dokuwiki.page  div.level4 {margin-left: 3em;}
+.dokuwiki.page  div.level5 {margin-left: 4em;}
+
+[dir=rtl] .dokuwiki .page h1 {margin-left: 0; margin-right: 0;}
+[dir=rtl] .dokuwiki .page h2 {margin-left: 0; margin-right: .666em;}
+[dir=rtl] .dokuwiki .page h3 {margin-left: 0; margin-right: 1.776em;}
+[dir=rtl] .dokuwiki .page h4 {margin-left: 0; margin-right: 3em;}
+[dir=rtl] .dokuwiki .page h5 {margin-left: 0; margin-right: 4.5712em;}
+[dir=rtl] .dokuwiki .page div.level1 {margin-left: 0; margin-right: 0;}
+[dir=rtl] .dokuwiki .page div.level2 {margin-left: 0; margin-right: 1em;}
+[dir=rtl] .dokuwiki .page div.level3 {margin-left: 0; margin-right: 2em;}
+[dir=rtl] .dokuwiki .page div.level4 {margin-left: 0; margin-right: 3em;}
+[dir=rtl] .dokuwiki .page div.level5 {margin-left: 0; margin-right: 4em;}
 */
 /* hx margin-left = (1 / font-size) * .levelx-margin */
 
@@ -119,6 +110,11 @@
     padding: 0 .5em;
     margin-left: 1em;
 }
+[dir=rtl] .dokuwiki dl.code dt,
+[dir=rtl] .dokuwiki dl.file dt {
+    margin-left: 0;
+    margin-right: 1em;
+}
 .dokuwiki dl.code dt a,
 .dokuwiki dl.file dt a {
 }
diff --git a/css/design.css b/css/design.css
index 366848f..5287b5d 100644
--- a/css/design.css
+++ b/css/design.css
@@ -55,6 +55,10 @@
     width: 12em;
     margin-right: .5em;
 }
+[dir=rtl] #dokuwiki__header form.search #qsearch__in {
+    margin-right: 0;
+    margin-left: .5em;
+}
 
 #dokuwiki__header div.breadcrumbs {
     margin-bottom: .3em;
@@ -123,6 +127,10 @@
     float: left;
     margin-left: 0;
 }
+[dir=rtl] #dokuwiki__usertools ul li.user {
+    float: right;
+    margin-right: 0;
+}
 
 /*____________ page tools ____________*/
 
@@ -145,6 +153,9 @@
 #dokuwiki__pagetools ul li a.action.top {
     float: right;
 }
+[dir=rtl] #dokuwiki__pagetools ul li a.action.top {
+    float: left;
+}
 #IE6 #dokuwiki__pagetools ul,
 #IE7 #dokuwiki__pagetools ul {
     position: relative;
@@ -205,6 +216,10 @@
 #dokuwiki__aside ol {
     padding-left: 0;
 }
+[dir=rtl] #dokuwiki__aside ul,
+[dir=rtl] #dokuwiki__aside ol {
+    padding-right: 0;
+}
 #dokuwiki__aside li ul,
 #dokuwiki__aside li ol {
     margin-bottom: 0;
@@ -261,6 +276,10 @@
 .JSpopup ol {
     padding-left: 0;
 }
+[dir=rtl] .JSpopup ul,
+[dir=rtl] .JSpopup ol {
+    padding-right: 0;
+}
 
 
 /* footer
diff --git a/css/rtl.css b/css/rtl.css
deleted file mode 100644
index 0ac2f69..0000000
--- a/css/rtl.css
+++ /dev/null
@@ -1,358 +0,0 @@
-/**
- * This file provides layout and design corrections for right-to-left
- * languages.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-/*____________ basic ____________*/
-
-[dir=rtl] caption,
-[dir=rtl] td,
-[dir=rtl] th {
-    text-align: right;
-}
-
-[dir=rtl] ul,
-[dir=rtl] ol {
-    padding: 0 1.5em 0 0;
-}
-[dir=rtl] li,
-[dir=rtl] dd {
-    margin: 0 1.5em 0 0;
-}
-[dir=rtl] blockquote {
-    border-width: 0 .25em 0 0;
-}
-
-[dir=rtl] h1,
-[dir=rtl] h2,
-[dir=rtl] h3,
-[dir=rtl] h4,
-[dir=rtl] h5,
-[dir=rtl] h6,
-[dir=rtl] caption,
-[dir=rtl] legend {
-    clear: right;
-}
-
-[dir=rtl] .a11y {
-    left: auto;
-    right: -9000px;
-}
-
-/*____________ structure ____________*/
-
-[dir=rtl] #dokuwiki__header .headings {
-    float: right;
-}
-[dir=rtl] #dokuwiki__header .tools {
-    float: left;
-    text-align: left;
-}
-
-[dir=rtl] .mode_show #dokuwiki__aside {
-    float: right;
-}
-[dir=rtl] #dokuwiki__aside > .pad {
-    margin: 0 0 0 1.5em;
-}
-
-[dir=rtl] .mode_show #dokuwiki__content {
-    float: left;
-    margin-left: 0;
-    margin-right: -__sidebar_width__;
-}
-[dir=rtl] .mode_show #dokuwiki__content > .pad {
-    margin-left: 0;
-    margin-right: __sidebar_width__;
-}
-
-/*____________ design ____________*/
-
-[dir=rtl] #dokuwiki__header form.search #qsearch__in {
-    margin-right: 0;
-    margin-left: .5em;
-}
-
-[dir=rtl] #dokuwiki__usertools ul li.user {
-    float: right;
-    margin-right: 0;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.action.top {
-    float: left;
-}
-
-[dir=rtl] #dokuwiki__aside ul, #dokuwiki__aside ol {
-    padding-right: 0;
-}
-
-/*____________ content ____________*/
-
-/* section indenting
-[dir=rtl] .dokuwiki .page h1 {
-    margin-left: 0;
-    margin-right: 0;
-}
-[dir=rtl] .dokuwiki .page div.level1 {
-    margin-left: 0;
-    margin-right: 0;
-}
-[dir=rtl] .dokuwiki .page h2 {
-    margin-left: 0;
-    margin-right: .666em;
-}
-[dir=rtl] .dokuwiki .page div.level2 {
-    margin-left: 0;
-    margin-right: 1em;
-}
-[dir=rtl] .dokuwiki .page h3 {
-    margin-left: 0;
-    margin-right: 1.776em;
-}
-[dir=rtl] .dokuwiki .page div.level3 {
-    margin-left: 0;
-    margin-right: 2em;
-}
-[dir=rtl] .dokuwiki .page h4 {
-    margin-left: 0;
-    margin-right: 3em;
-}
-[dir=rtl] .dokuwiki .page div.level4 {
-    margin-left: 0;
-    margin-right: 3em;
-}
-[dir=rtl] .dokuwiki .page h5 {
-    margin-left: 0;
-    margin-right: 4.5712em;
-}
-[dir=rtl] .dokuwiki .page div.level5 {
-    margin-left: 0;
-    margin-right: 4em;
-}
-*/
-
-[dir=rtl] .dokuwiki dl.code dt,
-[dir=rtl] .dokuwiki dl.file dt {
-    margin-left: 0;
-    margin-right: 1em;
-}
-
-[dir=rtl] .JSpopup ul,
-[dir=rtl] .JSpopup ol {
-    padding-right: 0;
-}
-
-
-/*____________ _imgdetail ____________*/
-
-[dir=rtl] #dokuwiki__detail div.content img {
-    float: right;
-    margin-right: 0;
-    margin-left: 1.5em;
-}
-[dir=rtl] #dokuwiki__detail div.content div.img_detail {
-    float: right
-}
-
-
-/*____________ _mediamanager ____________*/
-
-[dir=rtl] #mediamgr__aside {
-    left: auto;
-    right: 0;
-    border-right-width: 0;
-    border-left: 1px solid __border__;
-}
-[dir=rtl] #mediamgr__content {
-    right: auto;
-    left: 0;
-}
-
-[dir=rtl] #media__opts input {
-    margin-right: 0;
-    margin-left: .3em;
-}
-
-[dir=rtl] #media__tree ul {
-    padding-left: 0;
-    padding-right: .2em;
-}
-[dir=rtl] #media__tree ul li {
-    clear: right;
-    margin-right: 0;
-}
-[dir=rtl] #media__tree ul li img {
-    float: right;
-    padding: .5em 0 0 .3em;
-}
-[dir=rtl] #media__tree ul li li {
-    margin-left: 0;
-    margin-right: 1.5em;
-}
-
-[dir=rtl] #media__content a.mediafile {
-    margin-right: 0;
-    margin-left: 1.5em;
-}
-[dir=rtl] #media__content div.detail div.thumb {
-    float: right;
-    margin: 0 18px 0 .5em;
-}
-[dir=rtl] #media__content form.meta div.metafield {
-    clear: right;
-}
-[dir=rtl] #media__content form.meta label {
-    float: right;
-    clear: right;
-}
-[dir=rtl] #media__content form.meta .edit {
-    float: right;
-}
-[dir=rtl] #media__content form.meta div.buttons {
-    clear: right;
-    margin: .2em 25% 0 0;
-}
-
-
-/*____________ _links ____________*/
-
-/* if link icons don't work as expected, remove the following lines */
-[dir=rtl] .dokuwiki a.urlextern,
-[dir=rtl] .dokuwiki a.windows,
-[dir=rtl] .dokuwiki a.mail,
-[dir=rtl] .dokuwiki a.interwiki,
-[dir=rtl] .dokuwiki a.mediafile {
-    background-position: right center;
-    padding: 0 17px 0 0;
-}
-
-
-/*____________ _toc ____________*/
-
-[dir=rtl] .dokuwiki div.toc {
-    float: left;
-    margin: 0 1.4em 1.4em 0;
-}
-[dir=rtl] .dokuwiki .toc span.toc_open,
-[dir=rtl] .dokuwiki .toc span.toc_close {
-    float: left;
-}
-[dir=rtl] .dokuwiki #toc__inside ul ul {
-    padding-left: 0;
-    padding-right: 1em;
-}
-[dir=rtl] .dokuwiki ul.idx {
-    padding-right: 0;
-}
-[dir=rtl] .dokuwiki ul.idx li.closed {
-    list-style-image: url(images/closed-rtl.png);
-}
-
-
-/*____________ _footnotes ____________*/
-
-
-/*____________ _search ____________*/
-
-[dir=rtl] .dokuwiki div.search_quickresult ul li {
-    float: right;
-}
-[dir=rtl] .dokuwiki form.search div.ajax_qsearch {
-    left: auto;
-    right: -13.5em;
-    text-align: right;
-}
-
-
-/*____________ _recent ____________*/
-
-[dir=rtl] .dokuwiki #dw__recent ul li, /* old, until 2012-01-25 */
-[dir=rtl] .dokuwiki #page__revisions ul li, /* old, until 2012-01-25 */
-[dir=rtl] .dokuwiki form.changes ul li /* new */ {
-    margin-right: 0;
-}
-
-
-/*____________ _diff ____________*/
-
-
-/*____________ _edit ____________*/
-
-[dir=rtl] #draft__status {
-    float: left;
-}
-[dir=rtl] #size__ctl {
-    float: left;
-}
-[dir=rtl] #size__ctl img {
-    cursor: pointer;
-}
-[dir=rtl] .dokuwiki #wiki__editbar .editButtons, /* old, until 2012-01-25 */
-[dir=rtl] .dokuwiki .editBar .editButtons /* new */ {
-    margin-right: 0;
-    margin-left: 1em;
-}
-
-[dir=rtl] .dokuwiki .secedit {
-    float: left;
-}
-
-[dir=rtl] .dokuwiki div.section_highlight {
-    margin: -3em -1.5em -.01em 0;
-    padding: 3em 1em .01em 0;
-    border-left-width: 0;
-    border-right: .5em solid __background_alt__;
-}
-
-
-/*____________ _modal ____________*/
-
-[dir=rtl] #link__wiz_close {
-    float: left;
-}
-[dir=rtl] #link__wiz_result {
-    text-align: right;
-}
-[dir=rtl] #link__wiz_result div.type_u,
-[dir=rtl] #link__wiz_result div.type_f,
-[dir=rtl] #link__wiz_result div.type_d {
-    padding: 3px 22px 3px 3px;
-    background-position: 257px 3px;
-}
-
-
-/*____________ _forms ____________*/
-
-[dir=rtl] .dokuwiki label.block {
-    text-align: left;
-}
-[dir=rtl] .dokuwiki label.simple {
-    text-align: right;
-}
-
-[dir=rtl] form#subscribe__form fieldset {
-    text-align: right;
-}
-
-
-/*____________ _admin ____________*/
-
-[dir=rtl] .dokuwiki ul.admin_tasks {
-    float: right;
-}
-[dir=rtl] .dokuwiki ul.admin_tasks li {
-    padding-left: 0;
-    padding-right: 35px;
-    background-position: right 0;
-}
-
-[dir=rtl] .dokuwiki #admin__version {
-    clear: right;
-    float: left;
-}
-
-
-/*____________ includes ____________*/
-
-
diff --git a/css/structure.css b/css/structure.css
index d71c5c1..220fca0 100644
--- a/css/structure.css
+++ b/css/structure.css
@@ -22,6 +22,10 @@ body {
     #dokuwiki__header .headings {
         float: left;
     }
+    [dir=rtl] #dokuwiki__header .headings {
+        float: right;
+    }
+
     #IE6 #dokuwiki__header .headings {
         width: 50%;
     }
@@ -29,6 +33,11 @@ body {
         float: right;
         text-align: right;
     }
+    [dir=rtl] #dokuwiki__header .tools {
+        float: left;
+        text-align: left;
+    }
+
     #IE6 #dokuwiki__header .tools {
         width: 50%;
     }
@@ -51,9 +60,15 @@ body {
         position: relative;
         display: block;
     }
+    [dir=rtl] .mode_show #dokuwiki__aside {
+        float: right;
+    }
     #dokuwiki__aside > .pad {
         margin: 0 1.5em 0 0;
     }
+    [dir=rtl] #dokuwiki__aside > .pad {
+        margin: 0 0 0 1.5em;
+    }
 
     /* make content wider when there's no sidebar */
     .mode_show #dokuwiki__content {
@@ -61,9 +76,18 @@ body {
         margin-left: -__sidebar_width__;
         width: 100%;
     }
+    [dir=rtl] .mode_show #dokuwiki__content {
+        float: left;
+        margin-left: 0;
+        margin-right: -__sidebar_width__;
+    }
     .mode_show #dokuwiki__content > .pad {
         margin-left: __sidebar_width__;
     }
+    [dir=rtl] .mode_show #dokuwiki__content > .pad {
+        margin-left: 0;
+        margin-right: __sidebar_width__;
+    }
 
 #dokuwiki__footer {
     clear: both;
diff --git a/style.ini b/style.ini
index 47ffc99..609bb47 100644
--- a/style.ini
+++ b/style.ini
@@ -29,7 +29,6 @@ css/design.css            = screen
 css/content.css           = screen
 css/includes.css          = screen
 
-css/rtl.css               = screen
 css/print.css             = print