Merge branch 'master' into stable

* master: (413 commits)
  release preparation
  fixed strict violation in ACL plugin
  Fix issues from teams:i18n:translation-check in localizations
  ensure locale is set back to the original value
  skip FS#2867 test if \s doesn't match \xA0 after attempting to change the locale
  unittests for auth_loadACL
  translation update
  allow charset for SSO to be configured FS#2148
  Mailer: avoid overlong headers in content ids FS#2868
  translation update
  translation update
  replace \s, \S with [ \t], [^ \t] in regexs used with acls
  translation update
  translation update
  translation update
  translation update
  Fix handling of the legacy subscription action name
  remove obsolete opera handling and session closing
  remove no longer used ajax.php
  fix proxy CONNECT where HTTP 1.1 answer is given
  ...

23 files changed, 1079 insertions, 1183 deletions

diff --git a/lib/tpl/dokuwiki/css/_admin.css b/lib/tpl/dokuwiki/css/_admin.css
index c8f3694b5..a9518d0ed 100644
--- a/lib/tpl/dokuwiki/css/_admin.css
+++ b/lib/tpl/dokuwiki/css/_admin.css
@@ -50,7 +50,7 @@
 .dokuwiki #admin__version {
     clear: left;
     float: right;
-    color: __text_neu__;
+    color: @ini_text_neu;
     background-color: inherit;
 }
 [dir=rtl] .dokuwiki #admin__version {
diff --git a/lib/tpl/dokuwiki/css/_diff.css b/lib/tpl/dokuwiki/css/_diff.css
index 58c24b5c7..b7c82d829 100644
--- a/lib/tpl/dokuwiki/css/_diff.css
+++ b/lib/tpl/dokuwiki/css/_diff.css
@@ -19,7 +19,7 @@
 
 /* table header */
 .dokuwiki table.diff th {
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
     font-size: 110%;
     font-weight: normal;
 }
diff --git a/lib/tpl/dokuwiki/css/_edit.css b/lib/tpl/dokuwiki/css/_edit.css
index 92ce62126..f40aaa891 100644
--- a/lib/tpl/dokuwiki/css/_edit.css
+++ b/lib/tpl/dokuwiki/css/_edit.css
@@ -16,7 +16,7 @@
 }
 #draft__status {
     float: right;
-    color: __text_alt__;
+    color: @ini_text_alt;
     background-color: inherit;
 }
 [dir=rtl] #draft__status {
@@ -35,8 +35,8 @@
 /* picker popups (outside of .dokuwiki) */
 div.picker {
     width: 300px;
-    border: 1px solid __border__;
-    background-color: __background_alt__;
+    border: 1px solid @ini_border;
+    background-color: @ini_background_alt;
     color: inherit;
 }
 /* picker for headlines */
@@ -106,7 +106,7 @@ div.picker button.toolbutton {
 }
 /* change background colour if summary is missing */
 .dokuwiki .editBar .summary input.missing {
-    color: __text__;
+    color: @ini_text;
     background-color: #ffcccc;
 }
 
@@ -114,7 +114,7 @@ div.picker button.toolbutton {
 ********************************************************************/
 
 .dokuwiki div.preview {
-    border: dotted __border__;
+    border: dotted @ini_border;
     border-width: .2em 0;
     padding: 1.4em 0;
     margin-bottom: 1.4em;
@@ -138,6 +138,6 @@ div.picker button.toolbutton {
 .dokuwiki div.section_highlight {
     margin: 0 -1em; /* negative side margin = side padding + side border */
     padding: 0 .5em;
-    border: solid __background_alt__;
+    border: solid @ini_background_alt;
     border-width: 0 .5em;
 }
diff --git a/lib/tpl/dokuwiki/css/_fileuploader.css b/lib/tpl/dokuwiki/css/_fileuploader.css
index 42004de28..3c2cd4683 100644
--- a/lib/tpl/dokuwiki/css/_fileuploader.css
+++ b/lib/tpl/dokuwiki/css/_fileuploader.css
@@ -42,8 +42,8 @@
     height: 100%;
     min-height: 70px;
     z-index: 2;
-    background: __background_neu__;
-    color: __text__;
+    background: @ini_background_neu;
+    color: @ini_text;
     text-align: center;
 }
 
@@ -57,7 +57,7 @@
 }
 
 .qq-upload-drop-area-active {
-    background: __background_alt__;
+    background: @ini_background_alt;
 }
 
 /* list of files to upload */
@@ -70,7 +70,7 @@ div.qq-uploader ul {
 
 .qq-uploader li {
     margin: 0 0 5px;
-    color: __text__;
+    color: @ini_text;
 }
 
 .qq-uploader li span,
diff --git a/lib/tpl/dokuwiki/css/_footnotes.css b/lib/tpl/dokuwiki/css/_footnotes.css
index a20f2964e..5d5f7ca30 100644
--- a/lib/tpl/dokuwiki/css/_footnotes.css
+++ b/lib/tpl/dokuwiki/css/_footnotes.css
@@ -16,7 +16,7 @@ div.insitu-footnote {
 /*____________ footnotes at the bottom of the page ____________*/
 
 .dokuwiki div.footnotes {
-    border-top: 1px solid __border__;
+    border-top: 1px solid @ini_border;
     padding: .5em 0 0 0;
     margin: 1em 0 0 0;
     clear: both;
diff --git a/lib/tpl/dokuwiki/css/_forms.css b/lib/tpl/dokuwiki/css/_forms.css
index 6744750ba..522f9ed4d 100644
--- a/lib/tpl/dokuwiki/css/_forms.css
+++ b/lib/tpl/dokuwiki/css/_forms.css
@@ -1,4 +1,3 @@
-
 /* TODO: this file is not up to the best standards and will be fixed after an overhaul of the form code */
 
 /**
@@ -48,7 +47,7 @@
 .dokuwiki fieldset {
   width: 400px;
   text-align: center;
-  border: 1px solid __border__;
+  border: 1px solid @ini_border;
   padding: 0.5em;
   margin: auto;
 }
@@ -79,7 +78,10 @@
 #dw__register fieldset {
     padding-bottom: 0.7em;
 }
-
+#dw__profiledelete {
+    display: block;
+    margin-top: 2.8em;
+}
 
 /**
  * Styles for the subscription page
diff --git a/lib/tpl/dokuwiki/css/_media_fullscreen.css b/lib/tpl/dokuwiki/css/_media_fullscreen.css
index 8d5e1e8ca..31b71897b 100644
--- a/lib/tpl/dokuwiki/css/_media_fullscreen.css
+++ b/lib/tpl/dokuwiki/css/_media_fullscreen.css
@@ -38,7 +38,7 @@
 }
 
 #mediamanager__page .panelHeader {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
     margin: 0 10px 10px 0;
     padding: 10px 10px 8px;
     text-align: left;
@@ -68,7 +68,7 @@
     background: transparent url(../../images/resizecol.png) center center no-repeat;
 }
 #mediamanager__page .ui-resizable-e:hover {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 
@@ -99,10 +99,10 @@
     margin: 0 0 0 .3em;
     border-radius: .5em .5em 0 0;
     font-weight: normal;
-    background-color: __background_alt__;
-    color: __text__;
-    border: 1px solid __border__;
-    border-bottom-color: __background_alt__;
+    background-color: @ini_background_alt;
+    color: @ini_text;
+    border: 1px solid @ini_border;
+    border-bottom-color: @ini_background_alt;
     line-height: 1.4em;
     position: relative;
     bottom: -1px;
@@ -118,7 +118,7 @@
     right: 10px;
 }
 #mediamanager__page .namespaces .panelHeader {
-    border-top: 1px solid __border__;
+    border-top: 1px solid @ini_border;
     z-index: 1;
 }
 
@@ -164,7 +164,7 @@
     padding: 0;
 }
 #mediamanager__page .panelHeader ul li {
-    color: __text__;
+    color: @ini_text;
     float: left;
     line-height: 1;
     padding-left: 3px;
@@ -205,7 +205,7 @@
 }
 
 #mediamanager__page .filelist .panelContent ul li:hover {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 #mediamanager__page .filelist li dt a {
@@ -231,8 +231,8 @@
     display: -moz-inline-stack;
     /* the right margin should visually be 10px, but because of its inline-block nature the whitespace inbetween is about 4px more */
     margin: 0 6px 10px 0;
-    background-color: __background_neu__;
-    color: __text__;
+    background-color: @ini_background_neu;
+    color: @ini_text;
     padding: 5px;
     vertical-align: top;
     text-align: center;
@@ -287,13 +287,13 @@
     max-height: 50px;
     margin: 0;
     margin-bottom: 3px;
-    background-color: __background__;
-    color: __text__;
+    background-color: @ini_background;
+    color: @ini_text;
     overflow: hidden;
 }
 
 #mediamanager__page .filelist .rows li:nth-child(2n+1) {
-    background-color: __background_neu__;
+    background-color: @ini_background_neu;
 }
 
 #mediamanager__page .filelist .rows li dt {
@@ -372,11 +372,11 @@
 #mediamanager__page .file dl dt {
     font-weight: bold;
     display: block;
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 #mediamanager__page .file dl dd {
     display: block;
-    background-color: __background_neu__;
+    background-color: @ini_background_neu;
 }
 
 
@@ -415,7 +415,7 @@
 
 #mediamanager__page #page__revisions ul li div.li div {
     font-size: 90%;
-    color: __text_neu__;
+    color: @ini_text_neu;
     padding-left: 18px;
 }
 
@@ -438,7 +438,7 @@
     padding: 0;
     vertical-align: top;
     text-align: left;
-    border-color: __background__;
+    border-color: @ini_background;
 }
 [dir=rtl] #mediamanager__diff td,
 [dir=rtl] #mediamanager__diff th {
@@ -447,7 +447,7 @@
 
 #mediamanager__diff th {
     font-weight: normal;
-    background-color: __background__;
+    background-color: @ini_background;
     line-height: 1.2;
 }
 #mediamanager__diff th a {
@@ -459,7 +459,7 @@
 
 #mediamanager__diff dl dd strong{
     background-color: __highlight__;
-    color: __text__;
+    color: @ini_text;
     font-weight: normal;
 }
 
@@ -501,4 +501,3 @@
     width: 100%;
     max-width: none;
 }
-
diff --git a/lib/tpl/dokuwiki/css/_media_popup.css b/lib/tpl/dokuwiki/css/_media_popup.css
index c776e6b8a..20d669c14 100644
--- a/lib/tpl/dokuwiki/css/_media_popup.css
+++ b/lib/tpl/dokuwiki/css/_media_popup.css
@@ -20,13 +20,13 @@ html.popup {
     overflow: auto;
     position: absolute;
     left: 0;
-    border-right: 1px solid __border__;
+    border-right: 1px solid @ini_border;
 }
 [dir=rtl] #mediamgr__aside {
     left: auto;
     right: 0;
     border-right-width: 0;
-    border-left: 1px solid __border__;
+    border-left: 1px solid @ini_border;
 }
 #mediamgr__aside .pad {
     padding: .5em;
@@ -52,7 +52,7 @@ html.popup {
     font-size: 1.5em;
     margin-bottom: .5em;
     padding-bottom: .2em;
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
 }
 
 /* left side
@@ -141,19 +141,20 @@ html.popup {
     padding: .5em;
 }
 #media__content .odd {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 #media__content .even {
 }
 /* highlight newly uploaded or edited file */
 #media__content #scroll__here {
-    border: 1px dashed __border__;
+    border: 1px dashed @ini_border;
 }
 
 /* link which inserts media file */
 #media__content a.mediafile {
     margin-right: 1.5em;
     font-weight: bold;
+    cursor: pointer;
 }
 [dir=rtl] #media__content a.mediafile {
     margin-right: 0;
@@ -167,7 +168,7 @@ html.popup {
 
 /* info how to insert media, if JS disabled */
 #media__content div.example {
-    color: __text_neu__;
+    color: @ini_text_neu;
     margin-left: 1em;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_modal.css b/lib/tpl/dokuwiki/css/_modal.css
index a3d3be194..a46dff30e 100644
--- a/lib/tpl/dokuwiki/css/_modal.css
+++ b/lib/tpl/dokuwiki/css/_modal.css
@@ -18,11 +18,11 @@
 }
 
 #link__wiz_result {
-    background-color: __background__;
+    background-color: @ini_background;
     width:  293px;
     height: 193px;
     overflow: auto;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
     margin: 3px auto;
     text-align: left;
     line-height: 1;
@@ -57,16 +57,16 @@
 }
 
 #link__wiz_result div.even {
-    background-color: __background_neu__;
+    background-color: @ini_background_neu;
 }
 
 #link__wiz_result div.selected {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
 
 #link__wiz_result span {
     display: block;
-    color: __text_neu__;
+    color: @ini_text_neu;
     margin-left: 22px;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_search.css b/lib/tpl/dokuwiki/css/_search.css
index 0090308c9..a8972ae72 100644
--- a/lib/tpl/dokuwiki/css/_search.css
+++ b/lib/tpl/dokuwiki/css/_search.css
@@ -44,14 +44,14 @@
 }
 /* search snippet */
 .dokuwiki dl.search_results dd {
-    color: __text_alt__;
+    color: @ini_text_alt;
     background-color: inherit;
     margin: 0 0 1.2em 0;
 }
 
 /* search hit in normal text */
 .dokuwiki .search_hit {
-    color: __text__;
+    color: @ini_text;
     background-color: __highlight__;
 }
 /* search hit in search results */
@@ -60,7 +60,7 @@
 }
 /* ellipsis separating snippets */
 .dokuwiki .search_results .search_sep {
-    color: __text__;
+    color: @ini_text;
     background-color: inherit;
 }
 
diff --git a/lib/tpl/dokuwiki/css/_tabs.css b/lib/tpl/dokuwiki/css/_tabs.css
index 845ec9a57..860545a27 100644
--- a/lib/tpl/dokuwiki/css/_tabs.css
+++ b/lib/tpl/dokuwiki/css/_tabs.css
@@ -17,7 +17,7 @@
     width: 100%;
     bottom: 0;
     left: 0;
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
     z-index: 1;
 }
 
@@ -39,9 +39,9 @@
     display: inline-block;
     padding: .3em .8em;
     margin: 0 0 0 .3em;
-    background-color: __background_neu__;
-    color: __text__;
-    border: 1px solid __border__;
+    background-color: @ini_background_neu;
+    color: @ini_text;
+    border: 1px solid @ini_border;
     border-radius: .5em .5em 0 0;
     position: relative;
     z-index: 0;
@@ -68,8 +68,8 @@
 .dokuwiki ul.tabs li a:active,
 .dokuwiki ul.tabs li a:focus,
 .dokuwiki ul.tabs li strong {
-    background-color: __background_alt__;
-    color: __text__;
+    background-color: @ini_background_alt;
+    color: @ini_text;
     text-decoration: none;
     font-weight: normal;
 }
@@ -78,5 +78,5 @@
 .dokuwiki .tabs > ul li .active a,
 .dokuwiki ul.tabs li strong {
     z-index: 2;
-    border-bottom-color: __background_alt__;
+    border-bottom-color: @ini_background_alt;
 }
diff --git a/lib/tpl/dokuwiki/css/_toc.css b/lib/tpl/dokuwiki/css/_toc.css
index 1226b5b5b..469e9278c 100644
--- a/lib/tpl/dokuwiki/css/_toc.css
+++ b/lib/tpl/dokuwiki/css/_toc.css
@@ -11,7 +11,7 @@
     float: right;
     margin: 0 0 1.4em 1.4em;
     width: 12em;
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
     color: inherit;
 }
 [dir=rtl] #dw__toc {
diff --git a/lib/tpl/dokuwiki/css/basic.css b/lib/tpl/dokuwiki/css/basic.less
index a0a60d295..5886889fd 100644
--- a/lib/tpl/dokuwiki/css/basic.css
+++ b/lib/tpl/dokuwiki/css/basic.less
@@ -14,8 +14,8 @@ html {
 }
 html,
 body {
-    color: __text__;
-    background: __background_site__ url(images/page-gradient.png) top left repeat-x;
+    color: @ini_text;
+    background: @ini_background_site url(images/page-gradient.png) top left repeat-x;
     margin: 0;
     padding: 0;
 }
@@ -160,7 +160,7 @@ table {
     border-collapse: collapse;
     empty-cells: show;
     border-spacing: 0;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
 }
 
 caption {
@@ -176,11 +176,11 @@ td {
     padding: .3em .5em;
     margin: 0;
     vertical-align: top;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
 }
 th {
     font-weight: bold;
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
     text-align: left;
 }
 [dir=rtl] th {
@@ -196,7 +196,7 @@ a {
 a:link,
 a:visited {
     text-decoration: none;
-    color: __link__;
+    color: @ini_link;
 }
 a:link:hover,
 a:visited:hover,
@@ -227,13 +227,14 @@ audio {
     max-width: 100%;
 }
 #IE7 img,
-#IE8 img {
+#IE8 img,
+button img {
     max-width: none;
 }
 
 hr {
-    border-top: solid __border__;
-    border-bottom: solid __background__;
+    border-top: solid @ini_border;
+    border-bottom: solid @ini_background;
     border-width: 1px 0;
     height: 0;
     text-align: center;
@@ -252,7 +253,7 @@ em abbr {
 }
 
 mark {
-    background-color: __highlight__;
+    background-color: @ini_highlight;
     color: inherit;
 }
 
@@ -265,23 +266,23 @@ kbd {
     font-size: 1em;
     direction: ltr;
     text-align: left;
-    background-color: __background_site__;
-    color: __text__;
-    box-shadow: inset 0 0 .3em __border__;
+    background-color: @ini_background_site;
+    color: @ini_text;
+    box-shadow: inset 0 0 .3em @ini_border;
     border-radius: 2px;
 }
 pre {
     overflow: auto;
     word-wrap: normal;
-    border: 1px solid __border__;
+    border: 1px solid @ini_border;
     border-radius: 2px;
-    box-shadow: inset 0 0 .5em __border__;
+    box-shadow: inset 0 0 .5em @ini_border;
     padding: .7em 1em;
 }
 
 blockquote {
     padding: 0 .5em;
-    border: solid __border__;
+    border: solid @ini_border;
     border-width: 0 0 0 .25em;
 }
 [dir=rtl] blockquote {
@@ -320,7 +321,7 @@ form {
 fieldset {
     padding: .7em 1em 0;
     padding: .7rem 1rem; /* for those browsers understanding :last-child */
-    border: 1px solid __text_alt__;
+    border: 1px solid @ini_text_alt;
 }
 fieldset > :last-child {
     margin-bottom: 0;
@@ -356,6 +357,9 @@ progress {
     box-sizing: border-box;
 }
 
+select {
+    max-width: 100%;
+}
 optgroup {
     font-style: italic;
     font-weight: bold;
@@ -402,11 +406,7 @@ button,
     color: #333;
     background-color: #eee;
     background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%");
     border: 1px solid #ccc;
     border-radius: 2px;
     padding: .1em .5em;
@@ -440,11 +440,7 @@ button:focus,
     border-color: #999;
     background-color: #ddd;
     background-image:url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc2NzAiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0RERERERCIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0JCQkJCQiIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnNjcwKSIgLz4KPC9zdmc+);
-    background: -moz-linear-gradient(   top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -webkit-linear-gradient(top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -o-linear-gradient(     top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: -ms-linear-gradient(    top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
-    background: linear-gradient(        top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%);
+    .linear-gradient("top, #ffffff 0%, #f4f4f4 30%, #dddddd 99%, #bbbbbb 99%");
 }
 
 input::-moz-focus-inner,
diff --git a/lib/tpl/dokuwiki/css/content.css b/lib/tpl/dokuwiki/css/content.less
index 119859e38..a5ffbf2be 100644
--- a/lib/tpl/dokuwiki/css/content.css
+++ b/lib/tpl/dokuwiki/css/content.less
@@ -8,16 +8,16 @@
 
 /*____________ section indenting ____________
 
-.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;}
+.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;}
@@ -32,54 +32,56 @@
 */
 /* hx margin-left = (1 / font-size) * .levelx-margin */
 
-
 /*____________ links to wiki pages (addition to _links) ____________*/
 
 /* existing wikipage */
 .dokuwiki a.wikilink1 {
-    color: __existing__;
+    color: @ini_existing;
     background-color: inherit;
 }
+
 /* not existing wikipage */
 .dokuwiki a.wikilink2 {
-    color: __missing__;
+    color: @ini_missing;
     background-color: inherit;
 }
 
-
 /*____________ images ____________*/
 
 /* embedded images (styles are already partly set in lib/styles/all.css) */
 .dokuwiki img.media {
     margin: .2em 0;
 }
+
 .dokuwiki img.medialeft {
     margin: .2em 1em .2em 0;
 }
+
 .dokuwiki img.mediaright {
     margin: .2em 0 .2em 1em;
 }
+
 .dokuwiki img.mediacenter {
     margin: .2em auto;
 }
 
-
 /*____________ lists ____________*/
 
 #dokuwiki__content ul li,
 #dokuwiki__aside ul li {
-    color: __text_alt__;
+    color: @ini_text_alt;
 }
+
 #dokuwiki__content ol li,
 #dokuwiki__aside ol li {
-    color: __text_neu__;
+    color: @ini_text_neu;
 }
+
 #dokuwiki__content li .li,
 #dokuwiki__aside li .li {
-    color: __text__;
+    color: @ini_text;
 }
 
-
 /*____________ tables ____________*/
 
 /* div around each table */
@@ -87,6 +89,7 @@
     overflow-x: auto;
     margin-bottom: 1.4em;
 }
+
 .dokuwiki div.table table {
     margin-bottom: 0;
 }
@@ -94,14 +97,15 @@
 .dokuwiki table.inline {
     min-width: 50%;
 }
+
 .dokuwiki table.inline tr:hover td {
-    background-color: __background_alt__;
+    background-color: @ini_background_alt;
 }
+
 .dokuwiki table.inline tr:hover th {
-    background-color: __border__;
+    background-color: @ini_border;
 }
 
-
 /*____________ code ____________*/
 
 /* fix if background-color hides underlining */
@@ -109,73 +113,75 @@
     text-decoration: underline;
 }
 
-/* for code in <file> */
-.dokuwiki pre.file {
-}
-
 /* filenames for downloadable file and code blocks */
 .dokuwiki dl.code,
 .dokuwiki dl.file {
+    dt {
+        background-color: @ini_background_site;
+        .linear-gradient(~"top, @{ini_background_alt} 0%, @{ini_background_site} 100%");
+        color: inherit;
+        border: 1px solid @ini_border;
+        border-bottom-color: @ini_background_site;
+        border-top-left-radius: .3em;
+        border-top-right-radius: .3em;
+        padding: .3em .6em .1em;
+        margin-bottom: -1px;
+        float: left;
+
+        a {
+            background-color: transparent;
+            font-size: 0.875em;
+            font-weight: normal;
+            display: block;
+            min-height: 16px;
+        }
+    }
+
+    dd {
+        margin: 0;
+        clear: left;
+        min-height: 1px; /* for IE7 */
+    }
+
+    pre {
+        box-shadow: inset -4px -4px .5em -.3em @ini_border;
+    }
+}
+
+[dir=rtl] .dokuwiki dl.code,
+[dir=rtl] .dokuwiki dl.file {
+    dt {
+        float: right;
+    }
+
+    dd {
+        clear: right;
+    }
 }
 
-.dokuwiki dl.code dt,
-.dokuwiki dl.file dt {
-    background-color: __background_site__;
-    background: -moz-linear-gradient(   top, __background_alt__ 0%, __background_site__ 100%);
-    background: -webkit-linear-gradient(top, __background_alt__ 0%, __background_site__ 100%);
-    background: -o-linear-gradient(     top, __background_alt__ 0%, __background_site__ 100%);
-    background: -ms-linear-gradient(    top, __background_alt__ 0%, __background_site__ 100%);
-    background: linear-gradient(        top, __background_alt__ 0%, __background_site__ 100%);
-    color: inherit;
-    border: 1px solid __border__;
-    border-bottom-color: __background_site__;
-    border-top-left-radius: .3em;
-    border-top-right-radius: .3em;
-    padding: .3em .6em .1em;
-    margin-bottom: -1px;
-    float: left;
-}
-[dir=rtl] .dokuwiki dl.code dt,
-[dir=rtl] .dokuwiki dl.file dt {
-    float: right;
-}
-.dokuwiki dl.code dt a,
-.dokuwiki dl.file dt a {
-    background-color: transparent;
-    font-size: 0.875em;
-    font-weight: normal;
-    display: block;
-    min-height: 16px;
-}
-
-.dokuwiki dl.code dd,
-.dokuwiki dl.file dd {
-    margin: 0;
-    clear: left;
-    min-height: 1px; /* for IE7 */
-}
-[dir=rtl] .dokuwiki dl.code dd,
-[dir=rtl] .dokuwiki dl.file dd {
-    clear: right;
-}
-
-.dokuwiki dl.code pre,
-.dokuwiki dl.file pre {
-    box-shadow: inset -4px -4px .5em -.3em __border__;
+/* for code in <file> */
+.dokuwiki dl.file {
+    pre,
+    dt {
+        border-style: dashed;
+    }
+    dt {
+        border-bottom-style: solid;
+    }
 }
 
-
 /*____________ JS popup ____________*/
 
 .JSpopup {
-    background-color: __background__;
-    color: __text__;
-    border: 1px solid __border__;
-    box-shadow: .1em .1em .1em __border__;
+    background-color: @ini_background;
+    color: @ini_text;
+    border: 1px solid @ini_border;
+    box-shadow: .1em .1em .1em @ini_border;
     border-radius: 2px;
     padding: .3em .5em;
     font-size: .9em;
 }
+
 .dokuwiki form.search div.ajax_qsearch {
     top: -.35em;
     font-size: 1em;
@@ -186,12 +192,12 @@
 .JSpopup ol {
     padding-left: 0;
 }
+
 [dir=rtl] .JSpopup ul,
 [dir=rtl] .JSpopup ol {
     padding-right: 0;
 }
 
-
 /* changes to underscored CSS files
 ********************************************************************/
 
@@ -202,41 +208,49 @@
 #dokuwiki__content span.curid a {
     font-weight: normal;
 }
+
 #dokuwiki__content strong span.curid a {
     font-weight: bold;
 }
 
-
 /*____________ changes to _edit ____________*/
 
-.dokuwiki div.toolbar button.toolbutton {
-    border-radius: 0;
-    border-left-width: 0;
-    padding: .1em .35em;
-}
-.dokuwiki div.toolbar button.toolbutton:first-child {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-left-width: 1px;
-}
-[dir=rtl] .dokuwiki div.toolbar button.toolbutton:first-child {
-    border-top-left-radius: 0;
-    border-bottom-left-radius: 0;
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-    border-left-width: 0;
-    border-right-width: 1px;
-}
-.dokuwiki div.toolbar button.toolbutton:last-child {
-    border-top-right-radius: 4px;
-    border-bottom-right-radius: 4px;
-}
-[dir=rtl] .dokuwiki div.toolbar button.toolbutton:last-child {
-    border-top-left-radius: 4px;
-    border-bottom-left-radius: 4px;
-    border-top-right-radius: 0;
-    border-bottom-right-radius: 0;
-    border-left-width: 1px;
+.dokuwiki div.toolbar {
+    button.toolbutton {
+        border-radius: 0;
+        border-left-width: 0;
+        padding: .1em .35em;
+    }
+
+    button.toolbutton:first-child {
+        border-top-left-radius: 4px;
+        border-bottom-left-radius: 4px;
+        border-left-width: 1px;
+    }
+
+    button.toolbutton:last-child {
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+    }
+}
+
+[dir=rtl] .dokuwiki div.toolbar {
+    button.toolbutton:last-child {
+        border-top-left-radius: 4px;
+        border-bottom-left-radius: 4px;
+        border-top-right-radius: 0;
+        border-bottom-right-radius: 0;
+        border-left-width: 1px;
+    }
+
+    button.toolbutton:first-child {
+        border-top-left-radius: 0;
+        border-bottom-left-radius: 0;
+        border-top-right-radius: 4px;
+        border-bottom-right-radius: 4px;
+        border-left-width: 0;
+        border-right-width: 1px;
+    }
 }
 
 .dokuwiki div.section_highlight {
@@ -253,31 +267,34 @@
     margin: 0 -2em;
     padding: 0 2em;
 }
+
 .dokuwiki.hasSidebar div.preview {
-    border-right: __sidebar_width__ solid __background_alt__;
+    border-right: @ini_sidebar_width solid @ini_background_alt;
 }
+
 [dir=rtl] .dokuwiki.hasSidebar div.preview {
     border-right-width: 0;
-    border-left: __sidebar_width__ solid __background_alt__;
+    border-left: @ini_sidebar_width solid @ini_background_alt;
 }
+
 .dokuwiki div.preview div.pad {
     padding: 1.556em 0 2em;
 }
 
-
 /*____________ changes to _toc ____________*/
 
 #dw__toc {
-    margin:  -1.556em -2em .5em 1.4em;
-    width: __sidebar_width__;
-    border-left: 1px solid __border__;
-    background: __background__;
+    margin: -1.556em -2em .5em 1.4em;
+    width: @ini_sidebar_width;
+    border-left: 1px solid @ini_border;
+    background: @ini_background;
     color: inherit;
 }
+
 [dir=rtl] #dw__toc {
     margin: -1.556em 1.4em .5em -2em;
     border-left-width: 0;
-    border-right: 1px solid __border__;
+    border-right: 1px solid @ini_border;
 }
 
 .dokuwiki h3.toggle {
@@ -286,6 +303,7 @@
     font-size: .875em;
     letter-spacing: .1em;
 }
+
 #dokuwiki__aside h3.toggle {
     display: none;
 }
@@ -296,6 +314,7 @@
     height: 5px;
     margin: .4em 0 0;
 }
+
 .dokuwiki .toggle.closed strong {
     background-position: 0 -5px;
 }
@@ -304,59 +323,72 @@
     display: none;
 }
 
+#dw__toc {
+    > div {
+        font-size: 0.875em;
+        padding: .5em 1em 1em;
+    }
 
-#dw__toc > div {
-    font-size: 0.875em;
-    padding: .5em 1em 1em;
-}
-#dw__toc ul {
-    padding: 0 0 0 1.2em;
+    ul {
+        padding: 0 0 0 1.2em;
+
+        li {
+            list-style-image: url(images/toc-bullet.png);
+        }
+    }
+
+    ul li.clear {
+        list-style: none;
+    }
+
+    ul li div.li {
+        padding: .2em 0;
+    }
 }
+
 [dir=rtl] #dw__toc ul {
     padding: 0 1.5em 0 0;
 }
-#dw__toc ul li {
-    list-style-image: url(images/toc-bullet.png);
-}
-#dw__toc ul li.clear {
-    list-style: none;
-}
-#dw__toc ul li div.li {
-    padding: .2em 0;
-}
-
 
 /*____________ changes to _imgdetail ____________*/
 
 #dokuwiki__detail {
     padding: 0;
-}
-#dokuwiki__detail img {
-    float: none;
-    margin-bottom: 1.4em;
-}
-#dokuwiki__detail div.img_detail {
-    float: none;
-}
 
-#dokuwiki__detail div.img_detail dl {
-    overflow: hidden;
-}
-#dokuwiki__detail div.img_detail dl dt {
-    float: left;
-    width: 9em;
-    text-align: right;
-    clear: left;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dt {
-    float: right;
-    text-align: left;
-    clear: right;
-}
-#dokuwiki__detail div.img_detail dl dd {
-    margin-left: 9.5em;
-}
-[dir=rtl] #dokuwiki__detail div.img_detail dl dd {
-    margin-left: 0;
-    margin-right: 9.5em;
-}
+    img {
+        float: none;
+        margin-bottom: 1.4em;
+    }
+
+    div.img_detail {
+        float: none;
+    }
+
+    div.img_detail dl {
+        overflow: hidden;
+    }
+
+    div.img_detail dl dt {
+        float: left;
+        width: 9em;
+        text-align: right;
+        clear: left;
+    }
+
+    div.img_detail dl dd {
+        margin-left: 9.5em;
+    }
+}
+
+[dir=rtl] #dokuwiki__detail div.img_detail {
+    dl dt {
+        float: right;
+        text-align: left;
+        clear: right;
+    }
+
+    dl dd {
+        margin-left: 0;
+        margin-right: 9.5em;
+    }
+}
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/css/design.css b/lib/tpl/dokuwiki/css/design.css
deleted file mode 100644
index 457414839..000000000
--- a/lib/tpl/dokuwiki/css/design.css
+++ /dev/null
@@ -1,405 +0,0 @@
-/**
- * This file provides the main design styles for the
- * bits that surround the content.
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Clarence Lee <clarencedglee@gmail.com>
- */
-
-/* header
-********************************************************************/
-
-#dokuwiki__header {
-    padding: 2em 0 1.5em;
-}
-
-#dokuwiki__header .headings,
-#dokuwiki__header .tools {
-    margin-bottom: 1.5em;
-    width: 49%;
-}
-#dokuwiki__header h1 img {
-    float: left;
-    margin-right: .5em;
-}
-[dir=rtl] #dokuwiki__header h1 img {
-    float: right;
-    margin-left: .5em;
-    margin-right: 0;
-}
-#dokuwiki__header h1 span {
-    display: block;
-    padding-top: 10px;
-}
-#dokuwiki__header h1 {
-    margin: 0;
-    font-size: 1.5em;
-    font-weight: normal;
-}
-#dokuwiki__header h1 a {
-    text-decoration: none;
-    color: __text__;
-    background-color: inherit;
-}
-#dokuwiki__header h1 a:hover,
-#dokuwiki__header h1 a:active,
-#dokuwiki__header h1 a:focus {
-}
-#dokuwiki__header p.claim {
-    margin-bottom: 0;
-    font-size: 0.875em;
-}
-
-#dokuwiki__header .tools {
-    margin-top: .2em;
-}
-
-
-/* tools
-********************************************************************/
-
-/* highlight selected tool */
-.mode_admin a.action.admin,
-.mode_login a.action.login,
-.mode_register a.action.register,
-.mode_profile a.action.profile,
-.mode_recent a.action.recent,
-.mode_index a.action.index,
-.mode_media a.action.media,
-.mode_revisions a.action.revs,
-.mode_backlink a.action.backlink,
-.mode_subscribe a.action.subscribe {
-    font-weight: bold;
-}
-
-#dokuwiki__header .tools ul {
-    padding-left: 0;
-    margin-bottom: 0;
-}
-#dokuwiki__header .tools li {
-    font-size: 0.875em;
-    margin-left: 1em;
-    list-style: none;
-    display: inline;
-}
-[dir=rtl] #dokuwiki__header .tools li {
-    margin-right: 1em;
-    margin-left: 0;
-}
-#dokuwiki__header .tools form.search div.ajax_qsearch li {
-    font-size: 1em;
-    margin-left: 0;
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
-#dokuwiki__usertools a.action {
-    padding-left: 20px;
-    background: transparent url(images/usertools.png) no-repeat 0 0;
-}
-[dir=rtl] #dokuwiki__usertools a.action {
-    padding-left: 0;
-    padding-right: 20px;
-}
-[dir=rtl] #IE7 #dokuwiki__usertools a.action {
-    display: inline-block;
-}
-
-
-#dokuwiki__header .mobileTools {
-    display: none; /* hide mobile tools dropdown to only show in mobile view */
-}
-
-/*____________ user tools ____________*/
-
-#dokuwiki__usertools {
-    position: absolute;
-    top: .5em;
-    right: .5em;
-    text-align: right;
-    width: 100%;
-}
-[dir=rtl] #dokuwiki__usertools {
-    text-align: left;
-    left: 40px;
-    right: auto;
-}
-#dokuwiki__usertools ul {
-    margin: 0 auto;
-    padding: 0;
-    max-width: __site_width__;
-}
-#dokuwiki__usertools ul li.user {
-}
-
-#dokuwiki__usertools a.action.admin {
-    background-position: left 0;
-}
-[dir=rtl] #dokuwiki__usertools a.action.admin {
-    background-position: right 0;
-}
-#dokuwiki__usertools a.action.profile {
-    background-position: left -32px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.profile {
-    background-position: right -32px;
-}
-#dokuwiki__usertools a.action.register {
-    background-position: left -64px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.register {
-    background-position: right -64px;
-}
-#dokuwiki__usertools a.action.login {
-    background-position: left -96px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.login {
-    background-position: right -96px;
-}
-#dokuwiki__usertools a.action.logout {
-    background-position: left -128px;
-}
-[dir=rtl] #dokuwiki__usertools a.action.logout {
-    background-position: right -128px;
-}
-
-
-/*____________ site tools ____________*/
-
-#dokuwiki__sitetools {
-    text-align: right;
-}
-[dir=rtl] #dokuwiki__sitetools {
-    text-align: left;
-}
-
-#dokuwiki__sitetools form.search {
-    display: block;
-    font-size: 0.875em;
-    position: relative;
-}
-#IE7 #dokuwiki__sitetools form.search {
-    min-height: 1px;
-    z-index: 21;
-}
-#dokuwiki__sitetools form.search input.edit {
-    width: 18em;
-    padding: .35em 22px .35em .1em;
-}
-[dir=rtl] #dokuwiki__sitetools form.search input.edit {
-    padding: .35em .1em .35em 22px;
-}
-#dokuwiki__sitetools form.search input.button {
-    background: transparent url(images/search.png) no-repeat 0 0;
-    border-width: 0;
-    width: 19px;
-    height: 14px;
-    text-indent: -99999px;
-    margin-left: -20px;
-    box-shadow: none;
-    padding: 0;
-}
-[dir=rtl] #dokuwiki__sitetools form.search input.button {
-    background-position: 5px 0;
-    margin-left: 0;
-    margin-right: -20px;
-    position: relative;
-}
-
-#dokuwiki__sitetools ul {
-    margin-top: 0.5em;
-}
-#dokuwiki__sitetools li {
-}
-
-/*____________ breadcrumbs ____________*/
-
-.dokuwiki div.breadcrumbs {
-    border-top: 1px solid __border__;
-    border-bottom: 1px solid __background__;
-    margin-bottom: .5em;
-    font-size: 0.875em;
-    clear: both;
-}
-.dokuwiki div.breadcrumbs div {
-    padding: .1em .35em;
-}
-
-.dokuwiki div.breadcrumbs div:only-child {
-    border-top: 1px solid __background__;
-    border-bottom: 1px solid __border__;
-}
-.dokuwiki div.breadcrumbs div:first-child {
-    border-top: 1px solid __background__;
-}
-#IE7 .dokuwiki div.breadcrumbs div,
-#IE8 .dokuwiki div.breadcrumbs div {
-    border-bottom: 1px solid __border__;
-}
-.dokuwiki div.breadcrumbs div:last-child {
-    border-bottom: 1px solid __border__;
-}
-
-.dokuwiki div.breadcrumbs a {
-    color: __link__;
-    background-color: inherit;
-}
-.dokuwiki div.breadcrumbs .bcsep {
-    font-size: 0.75em;
-}
-
-
-/* sidebar
-********************************************************************/
-
-#dokuwiki__aside {
-}
-#dokuwiki__aside > .pad {
-    font-size: 0.875em;
-    overflow: hidden;
-    word-wrap: break-word;
-}
-
-/* make sidebar more condensed */
-
-#dokuwiki__aside h1 {
-    font-size: 1.714em;
-    margin-bottom: .292em;
-}
-#dokuwiki__aside h2 {
-    margin-bottom: .333em;
-}
-#dokuwiki__aside h3 {
-    margin-bottom: .444em;
-}
-#dokuwiki__aside h4 {
-    margin-bottom: .5em;
-}
-#dokuwiki__aside h5 {
-    margin-bottom: .5714em;
-}
-
-#dokuwiki__aside p,
-#dokuwiki__aside ul,
-#dokuwiki__aside ol,
-#dokuwiki__aside dl,
-#dokuwiki__aside pre,
-#dokuwiki__aside table,
-#dokuwiki__aside fieldset,
-#dokuwiki__aside hr,
-#dokuwiki__aside blockquote,
-#dokuwiki__aside address {
-    margin-bottom: .7em;
-}
-
-#dokuwiki__aside ul,
-#dokuwiki__aside ol {
-    padding-left: .5em;
-}
-[dir=rtl] #dokuwiki__aside ul,
-[dir=rtl] #dokuwiki__aside ol {
-    padding-right: .5em;
-}
-#dokuwiki__aside li ul,
-#dokuwiki__aside li ol {
-    margin-bottom: 0;
-    padding: 0;
-}
-
-#dokuwiki__aside a:link,
-#dokuwiki__aside a:visited {
-    color: __link__;
-    background-color: inherit;
-}
-
-
-/* content
-********************************************************************/
-
-#dokuwiki__content {
-}
-
-.dokuwiki .pageId {
-    position: absolute;
-    top: -2.3em;
-    right: -1em;
-    overflow: hidden;
-    padding: 1em 1em 0;
-}
-[dir=rtl] .dokuwiki .pageId {
-    right: auto;
-    left: -1em;
-}
-.dokuwiki .pageId span {
-    font-size: 0.875em;
-    border: solid __background_alt__;
-    border-width: 1px 1px 0;
-    background-color: __background__;
-    color: __text_alt__;
-    padding: .1em .35em;
-    border-top-left-radius: 2px;
-    border-top-right-radius: 2px;
-    box-shadow: 0 0 .5em __text_alt__;
-    display: block;
-}
-
-.dokuwiki div.page {
-    background: __background__;
-    color: inherit;
-    border: 1px solid __background_alt__;
-    box-shadow: 0 0 .5em __text_alt__;
-    border-radius: 2px;
-    padding: 1.556em 2em 2em;
-    margin-bottom: .5em;
-    overflow: hidden;
-    word-wrap: break-word;
-}
-
-.dokuwiki .docInfo {
-    font-size: 0.875em;
-    text-align: right;
-}
-[dir=rtl] .dokuwiki .docInfo {
-    text-align: left;
-}
-
-/* license note under edit window */
-.dokuwiki div.license {
-    font-size: 93.75%;
-}
-
-
-/* footer
-********************************************************************/
-
-.dokuwiki .wrapper {
-    margin-bottom: 1.4em;
-}
-
-#dokuwiki__footer {
-    margin-bottom: 1em;
-    text-align: center;
-}
-#dokuwiki__footer > .pad {
-    font-size: 0.875em;
-}
-
-#dokuwiki__footer div.license {
-    margin-bottom: 0.5em;
-    font-size: 100%;
-}
-
-[dir=rtl] #dokuwiki__footer .license img {
-    margin: 0 0 0 .5em;
-}
-
-#dokuwiki__footer div.buttons a img {
-    opacity: 0.5;
-}
-#dokuwiki__footer div.buttons a:hover img,
-#dokuwiki__footer div.buttons a:active img,
-#dokuwiki__footer div.buttons a:focus img {
-    opacity: 1;
-}
diff --git a/lib/tpl/dokuwiki/css/design.less b/lib/tpl/dokuwiki/css/design.less
new file mode 100644
index 000000000..42292de49
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/design.less
@@ -0,0 +1,439 @@
+/**
+ * This file provides the main design styles for the
+ * bits that surround the content.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ * @author Clarence Lee <clarencedglee@gmail.com>
+ */
+
+/* header
+********************************************************************/
+
+#dokuwiki__header {
+    padding: 2em 0 1.5em;
+
+    .headings,
+    .tools {
+        margin-bottom: 1.5em;
+        width: 49%;
+    }
+    .tools {
+        margin-top: .2em;
+    }
+
+    h1 {
+        margin: 0;
+        font-size: 1.5em;
+        font-weight: normal;
+
+        img {
+            float: left;
+            margin-right: .5em;
+        }
+
+        span {
+            display: block;
+            padding-top: 10px;
+        }
+
+        a {
+            text-decoration: none;
+            color: @ini_text;
+            background-color: inherit;
+        }
+    }
+
+    p.claim {
+        margin-bottom: 0;
+        font-size: 0.875em;
+    }
+}
+
+[dir=rtl] #dokuwiki__header h1 img {
+    float: right;
+    margin-left: .5em;
+    margin-right: 0;
+}
+
+/* tools
+********************************************************************/
+
+/* highlight selected tool */
+.mode_admin a.action.admin,
+.mode_login a.action.login,
+.mode_register a.action.register,
+.mode_profile a.action.profile,
+.mode_recent a.action.recent,
+.mode_index a.action.index,
+.mode_media a.action.media,
+.mode_revisions a.action.revs,
+.mode_backlink a.action.backlink,
+.mode_subscribe a.action.subscribe {
+    font-weight: bold;
+}
+
+#dokuwiki__header .tools {
+    ul {
+        padding-left: 0;
+        margin-bottom: 0;
+    }
+
+    li {
+        font-size: 0.875em;
+        margin-left: 1em;
+        list-style: none;
+        display: inline;
+    }
+
+    form.search div.ajax_qsearch li {
+        font-size: 1em;
+        margin-left: 0;
+        display: block;
+        overflow: hidden;
+        text-overflow: ellipsis;
+    }
+}
+
+[dir=rtl] #dokuwiki__header .tools li {
+    margin-right: 1em;
+    margin-left: 0;
+}
+
+#dokuwiki__usertools a.action {
+    padding-left: 20px;
+    background: transparent url(images/usertools.png) no-repeat 0 0;
+}
+
+[dir=rtl] #dokuwiki__usertools a.action {
+    padding-left: 0;
+    padding-right: 20px;
+}
+
+[dir=rtl] #IE7 #dokuwiki__usertools a.action {
+    display: inline-block;
+}
+
+#dokuwiki__header .mobileTools {
+    display: none; /* hide mobile tools dropdown to only show in mobile view */
+}
+
+/*____________ user tools ____________*/
+
+#dokuwiki__usertools {
+    position: absolute;
+    top: .5em;
+    right: .5em;
+    text-align: right;
+    width: 100%;
+
+    ul {
+        margin: 0 auto;
+        padding: 0;
+        max-width: @ini_site_width;
+    }
+
+    a.action.admin {
+        background-position: left 0;
+    }
+
+    a.action.profile {
+        background-position: left -32px;
+    }
+
+    a.action.register {
+        background-position: left -64px;
+    }
+
+    a.action.login {
+        background-position: left -96px;
+    }
+
+    a.action.logout {
+        background-position: left -128px;
+    }
+}
+
+[dir=rtl] #dokuwiki__usertools {
+    text-align: left;
+    left: 40px;
+    right: auto;
+
+    a.action.admin {
+        background-position: right 0;
+    }
+
+    a.action.profile {
+        background-position: right -32px;
+    }
+
+    a.action.register {
+        background-position: right -64px;
+    }
+
+    a.action.login {
+        background-position: right -96px;
+    }
+
+    a.action.logout {
+        background-position: right -128px;
+    }
+}
+
+/*____________ site tools ____________*/
+
+#dokuwiki__sitetools {
+    text-align: right;
+
+    form.search {
+        display: block;
+        font-size: 0.875em;
+        position: relative;
+
+        input.edit {
+            width: 18em;
+            padding: .35em 22px .35em .1em;
+        }
+
+        input.button {
+            background: transparent url(images/search.png) no-repeat 0 0;
+            border-width: 0;
+            width: 19px;
+            height: 14px;
+            text-indent: -99999px;
+            margin-left: -20px;
+            box-shadow: none;
+            padding: 0;
+        }
+    }
+
+    ul {
+        margin-top: 0.5em;
+    }
+}
+
+[dir=rtl] #dokuwiki__sitetools {
+    text-align: left;
+
+    form.search {
+        input.edit {
+            padding: .35em .1em .35em 22px;
+        }
+
+        input.button {
+            background-position: 5px 0;
+            margin-left: 0;
+            margin-right: -20px;
+            position: relative;
+        }
+    }
+}
+
+#IE7 #dokuwiki__sitetools form.search {
+    min-height: 1px;
+    z-index: 21;
+}
+
+/*____________ breadcrumbs ____________*/
+
+.dokuwiki div.breadcrumbs {
+    border-top: 1px solid @ini_border;
+    border-bottom: 1px solid @ini_background;
+    margin-bottom: .5em;
+    font-size: 0.875em;
+    clear: both;
+
+    div {
+        padding: .1em .35em;
+    }
+
+    div:only-child {
+        border-top: 1px solid @ini_background;
+        border-bottom: 1px solid @ini_border;
+    }
+
+    div:first-child {
+        border-top: 1px solid @ini_background;
+    }
+
+    div:last-child {
+        border-bottom: 1px solid @ini_border;
+    }
+
+    a {
+        color: @ini_link;
+        background-color: inherit;
+    }
+
+    .bcsep {
+        font-size: 0.75em;
+    }
+}
+
+#IE7 .dokuwiki div.breadcrumbs div,
+#IE8 .dokuwiki div.breadcrumbs div {
+    border-bottom: 1px solid @ini_border;
+}
+
+/* sidebar
+********************************************************************/
+
+#dokuwiki__aside {
+
+    > .pad {
+        font-size: 0.875em;
+        overflow: hidden;
+        word-wrap: break-word;
+    }
+
+    /* make sidebar more condensed */
+
+    h1 {
+        font-size: 1.714em;
+        margin-bottom: .292em;
+    }
+
+    h2 {
+        margin-bottom: .333em;
+    }
+
+    h3 {
+        margin-bottom: .444em;
+    }
+
+    h4 {
+        margin-bottom: .5em;
+    }
+
+    h5 {
+        margin-bottom: .5714em;
+    }
+
+    p,
+    ul,
+    ol,
+    dl,
+    pre,
+    table,
+    fieldset,
+    hr,
+    blockquote,
+    address {
+        margin-bottom: .7em;
+    }
+
+    ul,
+    ol {
+        padding-left: .5em;
+    }
+
+    li ul,
+    li ol {
+        margin-bottom: 0;
+        padding: 0;
+    }
+
+    a:link,
+    a:visited {
+        color: @ini_link;
+        background-color: inherit;
+    }
+}
+
+[dir=rtl] #dokuwiki__aside ul,
+[dir=rtl] #dokuwiki__aside ol {
+    padding-right: .5em;
+}
+
+/* content
+********************************************************************/
+
+.dokuwiki .pageId {
+    position: absolute;
+    top: -2.3em;
+    right: -1em;
+    overflow: hidden;
+    padding: 1em 1em 0;
+
+    span {
+        font-size: 0.875em;
+        border: solid @ini_background_alt;
+        border-width: 1px 1px 0;
+        background-color: @ini_background;
+        color: @ini_text_alt;
+        padding: .1em .35em;
+        border-top-left-radius: 2px;
+        border-top-right-radius: 2px;
+        box-shadow: 0 0 .5em @ini_text_alt;
+        display: block;
+    }
+}
+
+.dokuwiki div.page {
+    background: @ini_background;
+    color: inherit;
+    border: 1px solid @ini_background_alt;
+    box-shadow: 0 0 .5em @ini_text_alt;
+    border-radius: 2px;
+    padding: 1.556em 2em 2em;
+    margin-bottom: .5em;
+    overflow: hidden;
+    word-wrap: break-word;
+}
+
+.dokuwiki .docInfo {
+    font-size: 0.875em;
+    text-align: right;
+}
+
+/* license note under edit window */
+.dokuwiki div.license {
+    font-size: 93.75%;
+}
+
+[dir=rtl] .dokuwiki .docInfo {
+    text-align: left;
+}
+
+[dir=rtl] .dokuwiki .pageId {
+    right: auto;
+    left: -1em;
+}
+
+/* footer
+********************************************************************/
+
+.dokuwiki .wrapper {
+    margin-bottom: 1.4em;
+}
+
+#dokuwiki__footer {
+    margin-bottom: 1em;
+    text-align: center;
+
+    > .pad {
+        font-size: 0.875em;
+    }
+
+    div.license {
+        margin-bottom: 0.5em;
+        font-size: 100%;
+    }
+
+    div.buttons a {
+        img {
+            opacity: 0.5;
+        }
+
+        &:hover img,
+        &:active img,
+        &:focus img {
+            opacity: 1;
+        }
+    }
+
+}
+
+[dir=rtl] #dokuwiki__footer .license img {
+    margin: 0 0 0 .5em;
+}
diff --git a/lib/tpl/dokuwiki/css/includes.css b/lib/tpl/dokuwiki/css/includes.css
deleted file mode 100644
index bc189962f..000000000
--- a/lib/tpl/dokuwiki/css/includes.css
+++ /dev/null
@@ -1,4 +0,0 @@
-/**
- * This file provides styles for included seperate html files
- * (added through "include hooks").
- */
diff --git a/lib/tpl/dokuwiki/css/mixins.less b/lib/tpl/dokuwiki/css/mixins.less
new file mode 100644
index 000000000..a88767e97
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/mixins.less
@@ -0,0 +1,10 @@
+/**
+ * linear gradient x-browser support
+ */
+.linear-gradient(@declaration: 0) {
+    background: -moz-linear-gradient(   @declaration);
+    background: -webkit-linear-gradient(@declaration);
+    background: -o-linear-gradient(     @declaration);
+    background: -ms-linear-gradient(    @declaration);
+    background: linear-gradient(        @declaration);
+}
\ No newline at end of file
diff --git a/lib/tpl/dokuwiki/css/mobile.css b/lib/tpl/dokuwiki/css/mobile.less
index 71f80599d..289f5afa3 100644
--- a/lib/tpl/dokuwiki/css/mobile.css
+++ b/lib/tpl/dokuwiki/css/mobile.less
@@ -13,7 +13,7 @@
 
 /* for screen widths in the tablet range
 ********************************************************************/
-@media only screen and (max-width: __tablet_width__) {
+@media only screen and (max-width: @ini_tablet_width) {
 
 #screen__mode {
     z-index: 1; /* for detecting media queries in JavaScript (see script.js) */
@@ -29,10 +29,10 @@
 [dir=rtl] #dokuwiki__aside > .pad {
     margin: 0 0 .5em;
     /* style like .page */
-    background: __background__;
+    background: @ini_background;
     color: inherit;
     border: 1px solid #eee;
-    box-shadow: 0 0 .5em __text_alt__;
+    box-shadow: 0 0 .5em @ini_text_alt;
     border-radius: 2px;
     padding: 1em;
     margin-bottom: .5em;
@@ -40,22 +40,24 @@
 
 #dokuwiki__aside h3.toggle {
     font-size: 1em;
-}
-#dokuwiki__aside h3.toggle.closed {
-    margin-bottom: 0;
-    padding-bottom: 0;
-}
-#dokuwiki__aside h3.toggle.open {
-    border-bottom: 1px solid __border__;
+
+    &.closed {
+        margin-bottom: 0;
+        padding-bottom: 0;
+    }
+    &.open {
+        border-bottom: 1px solid @ini_border;
+    }
 }
 
 .showSidebar #dokuwiki__content {
     float: none;
     margin-left: 0;
     width: 100%;
-}
-.showSidebar #dokuwiki__content > .pad {
-    margin-left: 0;
+
+    > .pad {
+        margin-left: 0;
+    }
 }
 
 [dir=rtl] .showSidebar #dokuwiki__content,
@@ -69,7 +71,7 @@
     margin: 0 0 1em 0;
     width: auto;
     border-left-width: 0;
-    border-bottom: 1px solid __border__;
+    border-bottom: 1px solid @ini_border;
 }
 [dir=rtl] #dw__toc {
     float: none;
@@ -119,7 +121,7 @@
 
 /* for screen widths in the smartphone range
 ********************************************************************/
-@media only screen and (max-width: __phone_width__) {
+@media only screen and (max-width: @ini_phone_width) {
 
 #screen__mode {
     z-index: 2; /* for detecting media queries in JavaScript (see script.js) */
@@ -133,9 +135,10 @@ body {
 
 #dokuwiki__site {
     max-width: 100%;
-}
-#dokuwiki__site > .site {
-    padding: 0 .5em;
+
+    > .site {
+        padding: 0 .5em;
+    }
 }
 #dokuwiki__header {
     padding: .5em 0;
@@ -154,19 +157,21 @@ body {
     list-style: none;
     padding-left: 0;
     margin: 0;
+
+    li {
+        margin-left: .35em;
+        display: inline;
+    }
 }
 [dir=rtl] #dokuwiki__header ul.a11y.skip {
     left: auto !important;
     right: 0 !important;
     float: left;
     padding-right: 0;
-}
-#dokuwiki__header ul.a11y.skip li {
-    margin-left: .35em;
-    display: inline;
-}
-[dir=rtl] #dokuwiki__header ul.a11y.skip li {
-    margin: 0 .35em 0 0;
+
+    li {
+        margin: 0 .35em 0 0;
+    }
 }
 
 #dokuwiki__header .headings,
@@ -264,13 +269,14 @@ body {
 
 .dokuwiki label.block {
     text-align: left;
+
+    span {
+        display: block;
+    }
 }
 [dir=rtl] .dokuwiki label.block {
     text-align: right;
 }
-.dokuwiki label.block span {
-    display: block;
-}
 
 /* _edit */
 .dokuwiki div.section_highlight {
diff --git a/lib/tpl/dokuwiki/css/pagetools.css b/lib/tpl/dokuwiki/css/pagetools.css
deleted file mode 100644
index 21e5c13ec..000000000
--- a/lib/tpl/dokuwiki/css/pagetools.css
+++ /dev/null
@@ -1,421 +0,0 @@
-/**
- * This file provides the styles for the page tools
- * (fly out navigation beside the page to edit, etc).
- *
- * @author Anika Henke <anika@selfthinker.org>
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-#dokuwiki__site > .site {
-    /* give space to the right so the tools won't disappear on smaller screens */
-    /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */
-    padding-right: 40px;
-    /* give the same space to the left to balance it out */
-    padding-left: 40px;
-}
-.dokuwiki div.page {
-    height: 190px;
-    min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */
-    height: auto;
-}
-#dokuwiki__usertools {
-    /* move the tools just outside of the site */
-    right: 40px;
-}
-[dir=rtl] #dokuwiki__usertools {
-    right: auto;
-    left: 40px;
-}
-
-
-#dokuwiki__pagetools {
-    position: absolute;
-    right: -40px;
-    /* on same vertical level as first headline, because .page has 2em padding */
-    top: 2em;
-    width: 40px;
-}
-[dir=rtl] #dokuwiki__pagetools {
-    right: auto;
-    left: -40px;
-}
-
-#dokuwiki__pagetools div.tools {
-    position: fixed;
-    width: 40px;
-}
-
-#dokuwiki__pagetools ul {
-    position: absolute;
-    right: 0;
-    text-align: right;
-    margin: 0;
-    padding: 0;
-    /* add transparent border to prevent jumping when proper border is added on hover */
-    border: 1px solid transparent;
-    z-index: 10;
-}
-[dir=rtl] #dokuwiki__pagetools ul {
-    right: auto;
-    left: 0;
-    text-align: left;
-}
-
-#dokuwiki__pagetools ul li {
-    padding: 0;
-    margin: 0;
-    list-style: none;
-    font-size: 0.875em;
-}
-
-#dokuwiki__pagetools ul li a {
-    display: block;
-    min-height: 20px; /* 30 - 2x5 */
-    line-height: 20px;
-    padding: 0;
-    background-position: right 0;
-    background-repeat: no-repeat;
-    /* add transparent border to prevent jumping when proper border is added on focus */
-    border: 1px solid transparent;
-    white-space: nowrap;
-    width: 30px;
-    height: 30px;
-    overflow: hidden;
-    margin-left: auto; /* align right if the ul is larger because one item is focused */
-}
-
-#dokuwiki__pagetools ul li a:before {
-    content: url(images/pagetools-sprite.png);
-    display: inline-block;
-    font-size: 0;
-    line-height: 0;
-}
-
-[dir=rtl] #dokuwiki__pagetools ul li a {
-    background-position: left 0;
-    margin-right: auto;
-    margin-left: 0;
-}
-
-/* show all tools on hover and individual tools on focus */
-#dokuwiki__pagetools:hover ul,
-#dokuwiki__pagetools ul li a:focus,
-#dokuwiki__pagetools ul li a:active {
-    background-color: __background__;
-    border-color: __border__;
-    border-radius: 2px;
-    box-shadow: 2px 2px 2px __text_alt__;
-}
-
-#dokuwiki__pagetools:hover ul li a,
-#dokuwiki__pagetools ul li a:focus,
-#dokuwiki__pagetools ul li a:active {
-    width: auto;
-    height: auto;
-    overflow: visible;
-    padding: 5px 40px 5px 5px;
-    background-image: url(images/pagetools-sprite.png);
-}
-
-#dokuwiki__pagetools:hover ul li a:before,
-#dokuwiki__pagetools ul li a:focus:before {
-    content: none;
-}
-
-[dir=rtl] #dokuwiki__pagetools:hover ul,
-[dir=rtl] #dokuwiki__pagetools ul li a:focus {
-    box-shadow: -2px 2px 2px __text_alt__;
-}
-
-[dir=rtl] #dokuwiki__pagetools:hover li a,
-[dir=rtl] #dokuwiki__pagetools ul li a:focus,
-[dir=rtl] #dokuwiki__pagetools ul li a:active {
-    padding: 5px 5px 5px 40px;
-}
-
-/* IE7 fixes, doesn't work without images */
-
-#IE7 #dokuwiki__pagetools ul li a {
-    background-image: url(images/pagetools-sprite.png);
-}
-
-#IE7 #dokuwiki__pagetools:hover ul li a span,
-#IE7 #dokuwiki__pagetools ul li a:focus span,
-#IE7 #dokuwiki__pagetools ul li a:active span {
-    clip: auto;
-    display: inline;
-    position: static;
-}
-
-#IE7 #dokuwiki__pagetools ul li a span {
-    clip: rect(0 0 0 0);
-    position: absolute;
-}
-
-#dokuwiki__pagetools ul li a:hover,
-#dokuwiki__pagetools ul li a:active,
-#dokuwiki__pagetools ul li a:focus {
-    text-decoration: none;
-}
-#dokuwiki__pagetools ul li a:hover {
-    background-color: __background_alt__;
-}
-
-/*____________ all available icons in sprite ____________*/
-
-#dokuwiki__pagetools ul li a.edit {
-    background-position: right 0;
-}
-#dokuwiki__pagetools ul li a.edit:hover,
-#dokuwiki__pagetools ul li a.edit:active,
-#dokuwiki__pagetools ul li a.edit:focus {
-    background-position: right -45px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.edit {
-    background-position: left 0;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.edit:focus {
-    background-position: left -45px;
-}
-
-#dokuwiki__pagetools ul li a.create:before {
-    margin-top: -90px;
-}
-#dokuwiki__pagetools ul li a.create {
-    background-position: right -90px;
-}
-#dokuwiki__pagetools ul li a.create:hover,
-#dokuwiki__pagetools ul li a.create:active,
-#dokuwiki__pagetools ul li a.create:focus {
-    background-position: right -135px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.create {
-    background-position: left -90px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.create:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.create:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.create:focus {
-    background-position: left -135px;
-}
-
-#dokuwiki__pagetools ul li a.show {
-    background-position: right -270px;
-}
-#dokuwiki__pagetools ul li a.show:before {
-    margin-top: -270px;
-}
-#dokuwiki__pagetools ul li a.show:hover,
-#dokuwiki__pagetools ul li a.show:active,
-#dokuwiki__pagetools ul li a.show:focus {
-    background-position: right -315px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.show {
-    background-position: left -270px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.show:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.show:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.show:focus {
-    background-position: left -315px;
-}
-
-#dokuwiki__pagetools ul li a.source {
-    background-position: right -360px;
-}
-#dokuwiki__pagetools ul li a.source:before {
-    margin-top: -360px;
-}
-#dokuwiki__pagetools ul li a.source:hover,
-#dokuwiki__pagetools ul li a.source:active,
-#dokuwiki__pagetools ul li a.source:focus {
-    background-position: right -405px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.source {
-    background-position: left -360px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.source:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.source:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.source:focus {
-    background-position: left -405px;
-}
-
-#dokuwiki__pagetools ul li a.draft {
-    background-position: right -180px;
-}
-#dokuwiki__pagetools ul li a.draft:before {
-    margin-top: -180px;
-}
-#dokuwiki__pagetools ul li a.draft:hover,
-#dokuwiki__pagetools ul li a.draft:active,
-#dokuwiki__pagetools ul li a.draft:focus {
-    background-position: right -225px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.draft {
-    background-position: left -180px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.draft:focus {
-    background-position: left -225px;
-}
-
-#dokuwiki__pagetools ul li a.revs {
-    background-position: right -540px;
-}
-#dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -540px;
-}
-#dokuwiki__pagetools ul li a.revs:hover,
-#dokuwiki__pagetools ul li a.revs:active,
-#dokuwiki__pagetools ul li a.revs:focus,
-.mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: right -585px;
-}
-.mode_revisions #dokuwiki__pagetools ul li a.revs:before {
-    margin-top: -585px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revs {
-    background-position: left -540px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.revs:focus,
-[dir=rtl] .mode_revisions #dokuwiki__pagetools ul li a.revs {
-    background-position: left -585px;
-}
-
-#dokuwiki__pagetools ul li a.backlink {
-    background-position: right -630px;
-}
-#dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -630px;
-}
-#dokuwiki__pagetools ul li a.backlink:hover,
-#dokuwiki__pagetools ul li a.backlink:active,
-#dokuwiki__pagetools ul li a.backlink:focus,
-.mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: right -675px;
-}
-.mode_backlink #dokuwiki__pagetools ul li a.backlink:before {
-    margin-top: -675px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -630px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.backlink:focus,
-[dir=rtl] .mode_backlink #dokuwiki__pagetools ul li a.backlink {
-    background-position: left -675px;
-}
-
-#dokuwiki__pagetools ul li a.top {
-    background-position: right -810px;
-}
-#dokuwiki__pagetools ul li a.top:before{
-    margin-top: -810px;
-}
-#dokuwiki__pagetools ul li a.top:hover,
-#dokuwiki__pagetools ul li a.top:active,
-#dokuwiki__pagetools ul li a.top:focus {
-    background-position: right -855px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.top {
-    background-position: left -810px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.top:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.top:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.top:focus {
-    background-position: left -855px;
-}
-
-#dokuwiki__pagetools ul li a.revert {
-    background-position: right -450px;
-}
-#dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -450px;
-}
-#dokuwiki__pagetools ul li a.revert:hover,
-#dokuwiki__pagetools ul li a.revert:active,
-#dokuwiki__pagetools ul li a.revert:focus,
-.mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: right -495px;
-}
-.mode_revert #dokuwiki__pagetools ul li a.revert:before {
-    margin-top: -450px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revert {
-    background-position: left -450px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.revert:focus,
-[dir=rtl] .mode_revert #dokuwiki__pagetools ul li a.revert {
-    background-position: left -495px;
-}
-
-#dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -720px;
-}
-#dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -720px;
-}
-#dokuwiki__pagetools ul li a.subscribe:hover,
-#dokuwiki__pagetools ul li a.subscribe:active,
-#dokuwiki__pagetools ul li a.subscribe:focus,
-.mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: right -765px;
-}
-.mode_subscribe #dokuwiki__pagetools ul li a.subscribe:before {
-    margin-top: -765px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -720px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.subscribe:focus,
-[dir=rtl] .mode_subscribe #dokuwiki__pagetools ul li a.subscribe {
-    background-position: left -765px;
-}
-
-#dokuwiki__pagetools ul li a.mediaManager {
-    background-position: right -900px;
-}
-#dokuwiki__pagetools ul li a.mediaManager:before {
-    margin-top: -900px;
-}
-#dokuwiki__pagetools ul li a.mediaManager:hover,
-#dokuwiki__pagetools ul li a.mediaManager:active,
-#dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: right -945px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager {
-    background-position: left -900px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.mediaManager:focus {
-    background-position: left -945px;
-}
-
-#dokuwiki__pagetools ul li a.back {
-    background-position: right -990px;
-}
-#dokuwiki__pagetools ul li a.back {
-    margin-top: -990px;
-}
-#dokuwiki__pagetools ul li a.back:hover,
-#dokuwiki__pagetools ul li a.back:active,
-#dokuwiki__pagetools ul li a.back:focus {
-    background-position: right -1035px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.back {
-    background-position: left -990px;
-}
-[dir=rtl] #dokuwiki__pagetools ul li a.back:hover,
-[dir=rtl] #dokuwiki__pagetools ul li a.back:active,
-[dir=rtl] #dokuwiki__pagetools ul li a.back:focus {
-    background-position: left -1035px;
-}
diff --git a/lib/tpl/dokuwiki/css/pagetools.less b/lib/tpl/dokuwiki/css/pagetools.less
new file mode 100644
index 000000000..ecb3038c3
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/pagetools.less
@@ -0,0 +1,233 @@
+/**
+ * This file provides the styles for the page tools
+ * (fly out navigation beside the page to edit, etc).
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ * @author Andreas Gohr <andi@splitbrain.org>
+ */
+
+#dokuwiki__site > .site {
+    /* give space to the right so the tools won't disappear on smaller screens */
+    /* it's 40px because the 30px wide icons will have 5px more spacing to the left and right */
+    padding-right: 40px;
+    /* give the same space to the left to balance it out */
+    padding-left: 40px;
+}
+.dokuwiki div.page {
+    height: 190px;
+    min-height: 190px; /* 30 (= height of icons) x 6 (= maximum number of possible tools) + 2x5 */
+    height: auto;
+}
+#dokuwiki__usertools {
+    /* move the tools just outside of the site */
+    right: 40px;
+}
+[dir=rtl] #dokuwiki__usertools {
+    right: auto;
+    left: 40px;
+}
+
+
+#dokuwiki__pagetools {
+    position: absolute;
+    right: -40px;
+    /* on same vertical level as first headline, because .page has 2em padding */
+    top: 2em;
+    width: 40px;
+}
+[dir=rtl] #dokuwiki__pagetools {
+    right: auto;
+    left: -40px;
+}
+
+#dokuwiki__pagetools div.tools {
+    position: fixed;
+    width: 40px;
+}
+
+#dokuwiki__pagetools ul {
+    position: absolute;
+    right: 0;
+    text-align: right;
+    margin: 0;
+    padding: 0;
+    /* add transparent border to prevent jumping when proper border is added on hover */
+    border: 1px solid transparent;
+    z-index: 10;
+}
+[dir=rtl] #dokuwiki__pagetools ul {
+    right: auto;
+    left: 0;
+    text-align: left;
+}
+
+#dokuwiki__pagetools ul li {
+    padding: 0;
+    margin: 0;
+    list-style: none;
+    font-size: 0.875em;
+}
+
+#dokuwiki__pagetools ul li a {
+    display: block;
+    min-height: 20px; /* 30 - 2x5 */
+    line-height: 20px;
+    padding: 0;
+    background-position: right 0;
+    background-repeat: no-repeat;
+    /* add transparent border to prevent jumping when proper border is added on focus */
+    border: 1px solid transparent;
+    white-space: nowrap;
+    width: 30px;
+    height: 30px;
+    overflow: hidden;
+    margin-left: auto; /* align right if the ul is larger because one item is focused */
+}
+
+#dokuwiki__pagetools ul li a:before {
+    content: url(images/pagetools-sprite.png?v=2);
+    display: inline-block;
+    font-size: 0;
+    line-height: 0;
+}
+
+[dir=rtl] #dokuwiki__pagetools ul li a {
+    background-position: left 0;
+    margin-right: auto;
+    margin-left: 0;
+}
+
+/* show all tools on hover and individual tools on focus */
+#dokuwiki__pagetools:hover ul,
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
+    background-color: @ini_background;
+    border-color: @ini_border;
+    border-radius: 2px;
+    box-shadow: 2px 2px 2px @ini_text_alt;
+}
+
+#dokuwiki__pagetools:hover ul li a,
+#dokuwiki__pagetools ul li a:focus,
+#dokuwiki__pagetools ul li a:active {
+    width: auto;
+    height: auto;
+    overflow: visible;
+    padding: 5px 40px 5px 5px;
+    background-image: url(images/pagetools-sprite.png?v=2);
+}
+
+#dokuwiki__pagetools:hover ul li a:before,
+#dokuwiki__pagetools ul li a:focus:before {
+    content: none;
+}
+
+[dir=rtl] #dokuwiki__pagetools:hover ul,
+[dir=rtl] #dokuwiki__pagetools ul li a:focus {
+    box-shadow: -2px 2px 2px @ini_text_alt;
+}
+
+[dir=rtl] #dokuwiki__pagetools:hover li a,
+[dir=rtl] #dokuwiki__pagetools ul li a:focus,
+[dir=rtl] #dokuwiki__pagetools ul li a:active {
+    padding: 5px 5px 5px 40px;
+}
+
+/* IE7 fixes, doesn't work without images */
+
+#IE7 #dokuwiki__pagetools ul li a {
+    background-image: url(images/pagetools-sprite.png?v=2);
+}
+
+#IE7 #dokuwiki__pagetools:hover ul li a span,
+#IE7 #dokuwiki__pagetools ul li a:focus span,
+#IE7 #dokuwiki__pagetools ul li a:active span {
+    clip: auto;
+    display: inline;
+    position: static;
+}
+
+#IE7 #dokuwiki__pagetools ul li a span {
+    clip: rect(0 0 0 0);
+    position: absolute;
+}
+
+#dokuwiki__pagetools ul li a:hover,
+#dokuwiki__pagetools ul li a:active,
+#dokuwiki__pagetools ul li a:focus {
+    text-decoration: none;
+}
+#dokuwiki__pagetools ul li a:hover {
+    background-color: @ini_background_alt;
+}
+
+/*____________ all available icons in sprite ____________*/
+
+@pagetools_icon_space: -90px;
+
+/**
+ * page tools without highlighting
+ *
+ * @param string @action The action class
+ * @param int @position Position in the page tools sprite
+ */
+.pagetools-item(@action, @position) {
+    @position-active: (@position+0.5);
+
+    #dokuwiki__pagetools ul li a.@{action} {
+        background-position: right @pagetools_icon_space * @position;
+
+        &:before {
+            margin-top: @pagetools_icon_space * @position;
+        }
+        &:hover,
+        &:active,
+        &:focus {
+            background-position: right @pagetools_icon_space * @position-active;
+        }
+    }
+    [dir=rtl] #dokuwiki__pagetools ul li a.@{action} {
+        background-position: left @pagetools_icon_space * @position;
+
+        &:hover,
+        &:active,
+        &:focus {
+            background-position: left @pagetools_icon_space * @position-active;
+        }
+    }
+}
+
+/**
+ * page tools with highlighting
+ *
+ * @param string @action The action class
+ * @param int @position Position in the page tools sprite
+ * @param string @mode The mode in which this tool should be highlighted
+ */
+.pagetools-item(@action, @position, @mode) {
+  .pagetools-item(@action, @position);
+  @position-active: (@position+0.5);
+
+  .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
+    background-position: right @pagetools_icon_space * @position-active;
+    &:before {
+      margin-top: @pagetools_icon_space * @position-active;
+    }
+  }
+  [dir=rtl] .mode_@{mode} #dokuwiki__pagetools ul li a.@{action} {
+    background-position: left @pagetools_icon_space * @position-active;
+  }
+}
+
+.pagetools-item(edit, 1);
+.pagetools-item(create, 2);
+.pagetools-item(show, 4);
+.pagetools-item(source, 5);
+.pagetools-item(draft, 3);
+.pagetools-item(revs, 7, revisions);
+.pagetools-item(backlink, 8, backlink);
+.pagetools-item(top, 10);
+.pagetools-item(revert, 6, revert);
+.pagetools-item(subscribe, 9, subscribe);
+.pagetools-item(mediaManager, 11);
+.pagetools-item(back, 12);
diff --git a/lib/tpl/dokuwiki/css/structure.css b/lib/tpl/dokuwiki/css/structure.css
deleted file mode 100644
index 00642e90b..000000000
--- a/lib/tpl/dokuwiki/css/structure.css
+++ /dev/null
@@ -1,81 +0,0 @@
-/**
- * This file provides styles for the general layout structure.
- *
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-body {
-    margin: 0 auto;
-}
-#dokuwiki__site {
-    margin: 0 auto;
-    max-width: __site_width__;
-}
-#dokuwiki__site > .site {
-    padding: 0 .5em;
-}
-
-#dokuwiki__header {
-    width: 100%;
-}
-#dokuwiki__header > .pad {
-}
-    #dokuwiki__header .headings {
-        float: left;
-    }
-    [dir=rtl] #dokuwiki__header .headings {
-        float: right;
-        text-align: right;
-    }
-    #dokuwiki__header .tools {
-        float: right;
-        text-align: right;
-    }
-    [dir=rtl] #dokuwiki__header .tools {
-        float: left;
-        text-align: left;
-    }
-
-#dokuwiki__site .wrapper {
-    position: relative;
-}
-
-    #dokuwiki__aside {
-        width: __sidebar_width__;
-        float: left;
-        position: relative;
-        display: block;
-    }
-    [dir=rtl] #dokuwiki__aside {
-        float: right;
-    }
-    #dokuwiki__aside > .pad {
-        margin: 0 1.5em 0 0;
-    }
-    [dir=rtl] #dokuwiki__aside > .pad {
-        margin: 0 0 0 1.5em;
-    }
-
-    .showSidebar #dokuwiki__content {
-        float: right;
-        margin-left: -__sidebar_width__;
-        width: 100%;
-    }
-    [dir=rtl] .showSidebar #dokuwiki__content {
-        float: left;
-        margin-left: 0;
-        margin-right: -__sidebar_width__;
-    }
-    .showSidebar #dokuwiki__content > .pad {
-        margin-left: __sidebar_width__;
-    }
-    [dir=rtl] .showSidebar #dokuwiki__content > .pad {
-        margin-left: 0;
-        margin-right: __sidebar_width__;
-    }
-
-#dokuwiki__footer {
-    clear: both;
-}
-#dokuwiki__footer > .pad {
-}
diff --git a/lib/tpl/dokuwiki/css/structure.less b/lib/tpl/dokuwiki/css/structure.less
new file mode 100644
index 000000000..3ea2f83eb
--- /dev/null
+++ b/lib/tpl/dokuwiki/css/structure.less
@@ -0,0 +1,89 @@
+/**
+ * This file provides styles for the general layout structure.
+ *
+ * @author Anika Henke <anika@selfthinker.org>
+ */
+body {
+    margin: 0 auto;
+}
+
+#dokuwiki__site {
+    margin: 0 auto;
+    max-width: @ini_site_width;
+}
+
+#dokuwiki__site > .site {
+    padding: 0 .5em;
+}
+
+#dokuwiki__header {
+    width: 100%;
+
+    .headings {
+        float: left;
+    }
+
+    .tools {
+        float: right;
+        text-align: right;
+    }
+}
+
+[dir=rtl] #dokuwiki__header {
+    .headings {
+        float: right;
+        text-align: right;
+    }
+
+    .tools {
+        float: left;
+        text-align: left;
+    }
+}
+
+#dokuwiki__site .wrapper {
+    position: relative;
+}
+
+#dokuwiki__aside {
+    width: @ini_sidebar_width;
+    float: left;
+    position: relative;
+    display: block;
+
+    > .pad {
+        margin: 0 1.5em 0 0;
+    }
+}
+
+[dir=rtl] #dokuwiki__aside {
+    float: right;
+    > .pad {
+        margin: 0 0 0 1.5em;
+    }
+}
+
+.showSidebar #dokuwiki__content {
+    float: right;
+    margin-left: (-1 * @ini_sidebar_width);
+    width: 100%;
+
+    > .pad {
+        margin-left: @ini_sidebar_width;
+    }
+}
+
+[dir=rtl] .showSidebar #dokuwiki__content {
+    float: left;
+    margin-left: 0;
+    margin-right: (-1 * @ini_sidebar_width);
+
+    > .pad {
+        margin-left: 0;
+        margin-right: @ini_sidebar_width;
+    }
+}
+
+#dokuwiki__footer {
+    clear: both;
+}