Merge remote-tracking branch 'origin/master' into diff_navigation

69 files changed, 1152 insertions, 3934 deletions

diff --git a/lib/tpl/default/_admin.css b/lib/tpl/default/_admin.css
deleted file mode 100644
index 6c8066ba6..000000000
--- a/lib/tpl/default/_admin.css
+++ /dev/null
@@ -1,48 +0,0 @@
-#admin__version {
-    clear:left;
-    float: right;
-    color: __text_neu__;
-}
-
-.dokuwiki ul.admin_tasks {
-    font-size: 115%;
-    float: left;
-    width: 40%;
-    list-style-type: none;
-}
-
-.dokuwiki ul.admin_tasks li {
-    line-height: 22px;
-    padding-left: 35px;
-    margin: 1em 0;
-    background: transparent none no-repeat scroll 0 0;
-    text-align: left;
-}
-
-.dokuwiki ul.admin_tasks li div.li {
-    font-weight: bold;
-}
-
-.dokuwiki ul.admin_tasks li.admin_acl {
-    background-image: url(../../images/admin/acl.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_usermanager {
-    background-image: url(../../images/admin/usermanager.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_plugin {
-    background-image: url(../../images/admin/plugin.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_config {
-    background-image: url(../../images/admin/config.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_revert {
-    background-image: url(../../images/admin/revert.png);
-}
-
-.dokuwiki ul.admin_tasks li.admin_popularity {
-    background-image: url(../../images/admin/popularity.png);
-}
diff --git a/lib/tpl/default/_fileuploader.css b/lib/tpl/default/_fileuploader.css
deleted file mode 100644
index d06bfd519..000000000
--- a/lib/tpl/default/_fileuploader.css
+++ /dev/null
@@ -1,111 +0,0 @@
-
-.qq-uploader {
-    position: relative;
-    width: 100%;
-}
-
-.qq-uploader .error {
-    color: #f00;
-    background-color: #fff;
-}
-
-/* select file button */
-
-.qq-upload-button {
-    display: inline-block;
-    border: 1px solid __border__;
-    color: __text__;
-    background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
-    text-decoration: none;
-    font-size: 100%;
-    cursor: pointer;
-    margin: 1px 1px 5px;
-    padding: 0.125em 0.4em;
-}
-
-* html .qq-upload-button,
-*+html .qq-upload-button {
-    display: inline;
-}
-
-.qq-upload-button-focus {
-    outline: 1px dotted;
-}
-
-/* drop area */
-
-.qq-upload-drop-area {
-    position: absolute;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    min-height: 70px;
-    z-index: 2;
-    background: __background_neu__;
-    color: __text__;
-    text-align: center;
-}
-
-.qq-upload-drop-area span {
-    display: block;
-    position: absolute;
-    top: 50%;
-    width: 100%;
-    margin-top: -8px;
-    font-size: 120%;
-}
-
-.qq-upload-drop-area-active {
-    background: __background_alt__;
-}
-
-/* list of files to upload */
-
-div.qq-uploader ul {
-    margin: 0;
-    list-style: none;
-}
-
-.qq-uploader li {
-    margin-bottom: 5px;
-    color: __text__;
-}
-
-.qq-uploader li span,
-.qq-uploader li input,
-.qq-uploader li a {
-    margin-right: 5px;
-}
-
-.qq-upload-file {
-    display: block;
-    font-weight: bold;
-}
-
-.qq-upload-spinner {
-    display: inline-block;
-    background: url("../../images/throbber.gif");
-    width: 15px;
-    height: 15px;
-    vertical-align: text-bottom;
-}
-
-.qq-upload-size,
-.qq-upload-cancel {
-    font-size: 85%;
-}
-
-.qq-upload-failed-text {
-    display: none;
-}
-.qq-upload-fail .qq-upload-failed-text {
-    display: inline;
-}
-
-.qq-action-container * {
-    vertical-align: middle;
-}
-.qq-overwrite-check input {
-    margin-left: 10px;
-}
diff --git a/lib/tpl/default/_linkwiz.css b/lib/tpl/default/_linkwiz.css
deleted file mode 100644
index ca8812867..000000000
--- a/lib/tpl/default/_linkwiz.css
+++ /dev/null
@@ -1,40 +0,0 @@
-#link__wiz {
-}
-
-#link__wiz_result {
-    background-color: __background__;
-    width:  293px;
-    height: 193px;
-    overflow: auto;
-    border: 1px solid __border__;
-    margin: 3px auto;
-    text-align: left;
-}
-
-#link__wiz_result div.type_u {
-    padding: 3px 3px 3px 22px;
-    background: transparent url(../../images/up.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.type_f {
-    padding: 3px 3px 3px 22px;
-    background: transparent url(../../images/page.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.type_d {
-    padding: 3px 3px 3px 22px;
-    background: transparent url(../../images/ns.png) 3px 3px no-repeat;
-}
-
-#link__wiz_result div.even {
-    background-color: __background_neu__;
-}
-
-#link__wiz_result div.selected {
-    background-color: __background_alt__;
-}
-
-#link__wiz_result span {
-    display: block;
-    color: __text_neu__;
-}
diff --git a/lib/tpl/default/_mediamanager.css b/lib/tpl/default/_mediamanager.css
deleted file mode 100644
index 2ce345e40..000000000
--- a/lib/tpl/default/_mediamanager.css
+++ /dev/null
@@ -1,475 +0,0 @@
-
-/*____________ Layout ____________*/
-
-#mediamanager__page h1 {
-    margin: 0 0 .5em;
-}
-
-#mediamanager__page {
-    min-width: 800px;
-    width: 100%;
-    text-align: left;
-}
-
-#mediamanager__page .panel {
-    float: left;
-}
-
-#mediamanager__page .namespaces {
-    width: 15%;
-    min-width: 120px;
-}
-#mediamanager__page .filelist {
-    width: 50%;
-    min-width: 400px;
-}
-#mediamanager__page .file {
-    width: 35%;
-    min-width: 280px;
-}
-
-#mediamanager__page .panelHeader {
-    background-color: __background_alt__;
-    margin: 0 10px 10px 0;
-    padding: 10px 10px 8px;
-    text-align: left;
-    min-height: 20px;
-    overflow: hidden;
-}
-[dir=rtl] #mediamanager__page .panelContent {
-    text-align: right;
-}
-
-
-#mediamanager__page .panelContent {
-    overflow-y: auto;
-    overflow-x: hidden;
-    padding: 0;
-    margin: 0 10px 10px 0;
-    position: relative;
-}
-
-#mediamanager__page .file .panelHeader,
-#mediamanager__page .file .panelContent {
-    margin-right: 0;
-}
-
-#mediamanager__page .ui-resizable-e {
-    width: 6px;
-    right: 2px;
-    background: transparent url(images/resizecol.png) center center no-repeat;
-}
-#mediamanager__page .ui-resizable-e:hover {
-    background-color: __background_alt__;
-}
-
-
-/*____________ Namespaces tree ____________*/
-
-[dir=rtl] #mediamanager__page .namespaces {
-    text-align: right;
-}
-
-#mediamanager__page .namespaces h2 {
-    font-size: 1em;
-    display: inline-block;
-    border-width: 0;
-    padding: .3em .8em;
-    margin: 0 .3em 0 0;
-    border-radius: .5em .5em 0 0;
-    font-weight: normal;
-    background-color: __background_alt__;
-    color: __text__;
-    line-height: 1.5em;
-}
-* html #mediamanager__page .namespaces h2,
-*+html #mediamanager__page .namespaces h2 {
-    display: inline;
-}
-[dir=rtl] #mediamanager__page .namespaces h2 {
-    margin-right: 10px;
-}
-
-#mediamanager__page .namespaces ul {
-    margin-left: .2em;
-    margin-bottom: 0;
-    padding: 0;
-    list-style: none;
-}
-[dir=rtl] #mediamanager__page .namespaces ul {
-    margin-left: 0;
-    margin-right: .2em;
-}
-
-#mediamanager__page .namespaces ul ul {
-    margin-left: 1em;
-}
-[dir=rtl] #mediamanager__page .namespaces ul ul {
-    margin-left: 0;
-    margin-right: 1em;
-}
-#mediamanager__page .namespaces ul ul li {
-    margin: 0;
-}
-
-
-#mediamanager__page .namespaces ul .selected {
-    background-color: __highlight__;
-    font-weight: bold;
-}
-
-/*____________ Panel header ____________*/
-
-#mediamanager__page .panelHeader h3 {
-    float: left;
-    font-weight: normal;
-    font-size: 1em;
-    padding: 0;
-    margin: 0 0 3px;
-}
-
-#mediamanager__page .panelHeader form.options {
-    float: right;
-    margin-top: -3px;
-}
-
-#mediamanager__page .panelHeader ul {
-    list-style: none;
-    margin: 0;
-    padding: 0;
-}
-#mediamanager__page .panelHeader ul li {
-    color: __text__;
-    float: left;
-    line-height: 1;
-    padding-left: 3px;
-}
-
-#mediamanager__page .panelHeader ul li.listType {
-    padding-left: 30px;
-    background: url('../../images/icon-list.png') 3px 1px no-repeat;
-}
-#mediamanager__page .panelHeader ul li.sortBy {
-    padding-left: 30px;
-    background: url('../../images/icon-sort.png') 3px 1px no-repeat;
-}
-
-#mediamanager__page .panelHeader form.options .ui-buttonset label{
-    font-size: 90%;
-    margin-right: -0.4em;
-}
-#mediamanager__page .panelHeader form.options .ui-buttonset .ui-button-text {
-    padding: .4em .7em;
-    line-height: 1;
-}
-
-/*____________ File list ____________*/
-
-#mediamanager__page .filelist ul {
-    padding: 0;
-    margin: 0;
-}
-[dir=rtl] #mediamanager__page .filelist ul.tabs {
-    margin-right: 10px;
-}
-
-#mediamanager__page .filelist .panelContent ul li:hover {
-    background-color: __background_alt__;
-}
-
-#mediamanager__page .filelist li dt a {
-    vertical-align: middle;
-    display: table-cell;
-    overflow: hidden;
-}
-* html #mediamanager__page .filelist .thumbs li dt a,
-*+html #mediamanager__page .filelist .thumbs li dt a {
-    display: block;
-}
-* html #mediamanager__page .filelist .rows li dt a,
-*+html #mediamanager__page .filelist .rows li dt a {
-    display: inline;
-}
-
-/* thumbs */
-
-#mediamanager__page .filelist .thumbs li {
-    width: 100px;
-    min-height: 130px;
-    display: inline-block;
-    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__;
-    padding: 5px;
-    vertical-align: top;
-    text-align: center;
-    position: relative;
-    line-height: 1.2;
-}
-[dir=rtl] #mediamanager__page .filelist .thumbs li {
-    margin-right: 0;
-    margin-left: 6px;
-}
-* html #mediamanager__page .filelist .thumbs li,
-*+html #mediamanager__page .filelist .thumbs li {
-    display: inline;
-    zoom: 1;
-}
-
-#mediamanager__page .filelist .thumbs li dt a {
-    width: 100px;
-    height: 90px;
-}
-
-#mediamanager__page .filelist .thumbs li dt a img {
-    max-width: 90px;
-    max-height: 90px;
-}
-
-#mediamanager__page .filelist .thumbs li .name,
-#mediamanager__page .filelist .thumbs li .size,
-#mediamanager__page .filelist .thumbs li .filesize,
-#mediamanager__page .filelist .thumbs li .date {
-    display: block;
-    overflow: hidden;
-    text-overflow: ellipsis;
-    width: 90px;
-    white-space: nowrap;
-}
-#mediamanager__page .filelist .thumbs li .name {
-    padding: 5px 0;
-    font-weight: bold;
-}
-#mediamanager__page .filelist .thumbs li .date {
-    font-style: italic;
-    white-space: normal;
-}
-
-/* rows */
-
-#mediamanager__page .filelist .rows li {
-    list-style: none;
-    display: block;
-    position: relative;
-    max-height: 50px;
-    margin: 0;
-    margin-bottom: 3px;
-    background-color: __background__;
-    color: __text__;
-    overflow: hidden;
-}
-
-#mediamanager__page .filelist .rows li:nth-child(2n+1) {
-    background-color: __background_neu__;
-}
-
-#mediamanager__page .filelist .rows li dt {
-    float: left;
-    width: 10%;
-    height: 40px;
-    text-align: center;
-}
-
-#mediamanager__page .filelist .rows li dt a {
-    width: 100px;
-    height: 40px;
-}
-
-#mediamanager__page .filelist .rows li dt a img {
-    max-width: 40px;
-    max-height: 40px;
-}
-
-#mediamanager__page .filelist .rows li .name,
-#mediamanager__page .filelist .rows li .size,
-#mediamanager__page .filelist .rows li .filesize,
-#mediamanager__page .filelist .rows li .date {
-    overflow: hidden;
-    text-overflow: ellipsis;
-    float: left;
-    margin-left: 1%;
-    white-space: nowrap;
-}
-
-#mediamanager__page .filelist .rows li .name {
-    width: 30%;
-    font-weight: bold;
-}
-#mediamanager__page .filelist .rows li .size,
-#mediamanager__page .filelist .rows li .filesize {
-    width: 15%;
-}
-#mediamanager__page .filelist .rows li .date {
-    width: 20%;
-    font-style: italic;
-    white-space: normal;
-}
-
-/*____________ Upload panel ____________*/
-
-#mediamanager__page div.upload {
-    padding-bottom: 0.5em;
-}
-
-#media__content #mediamanager__uploader {
-    border-bottom: 1px solid __border__;
-    padding-bottom: 0.5em;
-}
-
-/*____________ File preview ____________*/
-
-#mediamanager__page .file ul.actions {
-    text-align: center;
-    margin: 0 0 5px;
-    list-style: none;
-}
-#mediamanager__page .file ul.actions li {
-    display: inline;
-}
-
-#mediamanager__page .file div.image {
-    margin-bottom: 5px;
-    text-align: center;
-}
-
-#mediamanager__page .file div.image img {
-    width: 100%;
-}
-
-#mediamanager__page .file dl {
-}
-#mediamanager__page .file dl dt {
-    font-weight: bold;
-    display: block;
-    background-color: __background_alt__;
-}
-#mediamanager__page .file dl dd {
-    display: block;
-    background-color: __background_neu__;
-}
-
-
-/*____________ Meta data edit form ____________*/
-
-#mediamanager__page form.meta div.row {
-    margin-bottom: 5px;
-}
-
-#mediamanager__page form.meta label span {
-    display: block;
-}
-[dir=rtl] #mediamanager__page form.meta label span {
-    text-align: right;
-}
-
-#mediamanager__page form.meta input {
-    width: 50%;
-}
-
-#mediamanager__page form.meta input.button {
-    width: auto;
-}
-
-#mediamanager__page form.meta textarea.edit {
-    height: 6em;
-    width: 95%;
-    min-width: 95%;
-    max-width: 95%;
-}
-
-/*____________ Revisions form ____________*/
-
-#mediamanager__page form.changes ul {
-    margin-left: 10px;
-    list-style-type: none;
-}
-
-#mediamanager__page form.changes ul li div.li div {
-    font-size: 90%;
-    color: __text_neu__;
-    padding-left: 18px;
-}
-
-#mediamanager__page form.changes ul li div.li input {
-    position: relative;
-    top: 1px;
-}
-
-/* File diff */
-
-#mediamanager__diff table {
-    table-layout: fixed;
-}
-
-#mediamanager__diff td,
-#mediamanager__diff th {
-    width: 48%;
-    margin: 0 5px 10px 0;
-    padding: 0;
-    vertical-align: top;
-    text-align: left;
-}
-[dir=rtl] #mediamanager__diff td,
-[dir=rtl] #mediamanager__diff th {
-    text-align: right;
-}
-
-#mediamanager__diff th {
-    font-weight: normal;
-}
-#mediamanager__diff th a {
-    font-weight: bold;
-}
-#mediamanager__diff th span {
-    font-size: 90%;
-}
-
-#mediamanager__diff dl dd strong{
-    background-color: __highlight__;
-    color: __text__;
-    font-weight: normal;
-}
-
-/* Image diff */
-
-#mediamanager__page .file form.diffView {
-    margin-bottom: 10px;
-    display: block;
-}
-
-#mediamanager__diff div.slider {
-    margin: 10px;
-    width: 95%;
-}
-
-#mediamanager__diff .imageDiff {
-    position: relative;
-}
-#mediamanager__diff .imageDiff .image2 {
-    position: absolute;
-    top: 0;
-    left: 0;
-}
-
-#mediamanager__diff .imageDiff.opacity .image2 {
-    -moz-opacity: 0.5;
-    -khtml-opacity: 0.5;
-    opacity: 0.5;
-}
-
-#mediamanager__diff .imageDiff.portions .image2 {
-    border-right: 1px solid red;
-    overflow: hidden;
-}
-
-#mediamanager__diff .imageDiff.portions img {
-    float: left;
-}
-
-#mediamanager__diff .imageDiff img {
-    width: 100%;
-    max-width: none;
-}
-
diff --git a/lib/tpl/default/_mediaoptions.css b/lib/tpl/default/_mediaoptions.css
deleted file mode 100644
index 81e87aa8e..000000000
--- a/lib/tpl/default/_mediaoptions.css
+++ /dev/null
@@ -1,18 +0,0 @@
-
-#media__popup_content p {
-    margin: 0 0 .5em;
-}
-
-#media__popup_content label {
-    float: left;
-    width: 9em;
-}
-
-#media__popup_content .button {
-    margin-right: 1px;
-    cursor: pointer;
-}
-
-#media__popup_content input.button {
-    margin-left: 9em;
-}
diff --git a/lib/tpl/default/_subscription.css b/lib/tpl/default/_subscription.css
deleted file mode 100644
index 0792c8c21..000000000
--- a/lib/tpl/default/_subscription.css
+++ /dev/null
@@ -1,21 +0,0 @@
-/**
- * Styles for the subscription page
- */
-
-form#subscribe__form {
-    display: block;
-    width: 300px;
-    text-align: center;
-}
-
-form#subscribe__form fieldset {
-    text-align: left;
-    margin: 0.5em 0;
-}
-
-form#subscribe__form label {
-    display:block;
-    margin: 0 0.5em 0.5em;
-}
-
-
diff --git a/lib/tpl/default/_tabs.css b/lib/tpl/default/_tabs.css
deleted file mode 100644
index a39b43441..000000000
--- a/lib/tpl/default/_tabs.css
+++ /dev/null
@@ -1,50 +0,0 @@
-
-.dokuwiki ul.tabs {
-    padding: 0;
-    margin: 0;
-    overflow: hidden;
-}
-.dokuwiki ul.tabs li {
-    float: left;
-    padding: 0;
-    margin: 0;
-    list-style: none;
-}
-[dir=rtl] .dokuwiki ul.tabs li {
-    float: right;
-}
-
-.dokuwiki ul.tabs li strong,
-.dokuwiki ul.tabs li a {
-    float: left;
-    padding: .3em .8em;
-    margin: 0 .3em 0 0;
-    background-color: __background_neu__;
-    color: __text__;
-    border-radius: .5em .5em 0 0;
-}
-[dir=rtl] .dokuwiki ul.tabs li strong,
-[dir=rtl] .dokuwiki ul.tabs li a {
-    float: right;
-    margin: 0 0 0 .3em;
-}
-*+html[dir=rtl] .dokuwiki ul.tabs li strong,
-*+html[dir=rtl] .dokuwiki ul.tabs li a {
-    float: none;
-    display: inline-block;
-}
-.dokuwiki ul.tabs li strong {
-    font-weight: normal;
-}
-
-.dokuwiki ul.tabs li a:link,
-.dokuwiki ul.tabs li a:visited {
-}
-.dokuwiki ul.tabs li a:hover,
-.dokuwiki ul.tabs li a:active,
-.dokuwiki ul.tabs li a:focus,
-.dokuwiki ul.tabs li strong {
-    background-color: __background_alt__;
-    color: __text__;
-    text-decoration: none;
-}
diff --git a/lib/tpl/default/design.css b/lib/tpl/default/design.css
deleted file mode 100644
index 4772fd2a5..000000000
--- a/lib/tpl/default/design.css
+++ /dev/null
@@ -1,863 +0,0 @@
-/**
- * Design elements for default Template
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Anika Henke <anika@selfthinker.org>
- */
-
-/* -------------- general elements --------------- */
-
-* { padding: 0; margin: 0; }
-
-body {
-  font: 80% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-  background-color: __background__;
-  color: __text__;
-}
-
-/* the document */
-div.dokuwiki div.page {
-  margin: 4px 2em 0 1em;
-  text-align: justify;
-}
-
-div.dokuwiki table {
-  font-size: 100%;
-}
-
-div.dokuwiki tr,
-div.dokuwiki td,
-div.dokuwiki th {
-}
-
-div.dokuwiki img {
-  border: 0;
-}
-
-div.dokuwiki p,
-div.dokuwiki blockquote,
-div.dokuwiki table,
-div.dokuwiki pre {
-  margin: 0 0 1.0em 0;
-}
-
-div.dokuwiki hr {
-  border: 0px;
-  border-top: 1px solid __border__;
-  text-align: center;
-  height: 0px;
-}
-
-div.dokuwiki div.nothing {
-  text-align: center;
-  margin: 2em;
-}
-
-/* ---------------- forms ------------------------ */
-
-div.dokuwiki form {
-  border: none;
-  display: inline;
-}
-
-div.dokuwiki label.block {
-  display: block;
-  text-align: right;
-  font-weight: bold;
-}
-
-div.dokuwiki label.simple {
-  display: block;
-  text-align: left;
-  font-weight: normal;
-}
-
-div.dokuwiki label.block input.edit {
-  width: 50%;
-}
-
-div.dokuwiki fieldset {
-  width: 300px;
-  text-align: center;
-  border: 1px solid __border__;
-  padding: 0.5em;
-  margin: auto;
-}
-
-div.dokuwiki textarea.edit {
-  font-family: monospace, serif;
-  /* second generic font fixes problem with font-size, see
-     http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
-  font-size: 100%;
-  color: __text__;
-  background-color: __background__;
-  border: 1px solid __border__;
-  padding: 0.3em 0 0 0.3em;
-  /* should just be "width: 100%", but IE8 doesn't like it, see FS#1910 + FS#1667 */
-  width: 700px;
-  min-width: 100%;
-  max-width: 100%;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body div.dokuwiki textarea.edit {
-  background:  __background__ url(images/inputshadow.png) repeat-x top;
-}
-
-div.dokuwiki input.edit,
-div.dokuwiki select.edit {
-  font-size: 100%;
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
-  vertical-align: middle;
-  margin: 1px;
-  padding: 0.20em 0.3em;
-  display: inline;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body div.dokuwiki input.edit,
-html>body div.dokuwiki select.edit {
-  background:  __background__ url(images/inputshadow.png) repeat-x top;
-}
-
-div.dokuwiki select.edit {
-  padding: 0.1em 0;
-}
-
-div.dokuwiki input.missing {
-  font-size: 100%;
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: #ffcccc;
-  vertical-align: middle;
-  margin: 1px;
-  padding: 0.20em 0.3em;
-  display: inline;
-}
-
-/* disabled style - not understood by IE */
-div.dokuwiki textarea.edit[disabled],
-div.dokuwiki textarea.edit[readonly],
-div.dokuwiki input.edit[disabled],
-div.dokuwiki input.edit[readonly],
-div.dokuwiki input.button[disabled],
-div.dokuwiki select.edit[disabled] {
-  background-color: __background_neu__!important;
-  color: __text_neu__!important;
-}
-
-/* edit form */
-div.dokuwiki div.toolbar,
-div.dokuwiki div#wiki__editbar {
-   margin: 2px 0;
-   text-align: left;
-}
-div.dokuwiki div#size__ctl {
-   float: right;
-   width: 60px;
-   height: 2.7em;
-}
-div.dokuwiki #size__ctl img {
-   cursor: pointer;
-}
-div.dokuwiki div#wiki__editbar div.editButtons {
-   float: left;
-   padding: 0 1.0em 0.7em 0;
-}
-div.dokuwiki div#wiki__editbar div.summary {
-   float: left;
-}
-div.dokuwiki .nowrap {
-   white-space: nowrap;
-}
-div.dokuwiki div#draft__status {
-  float: right;
-  color: __text_alt__;
-}
-
-div.dokuwiki div.license {
-  padding: 0.5em;
-  font-size: 90%;
-  text-align: center;
-}
-
-div.dokuwiki form#dw__editform div.license {
-  clear: left;
-  font-size: 90%;
-}
-
-/* --------- buttons ------------------- */
-
-div.dokuwiki input.button,
-div.dokuwiki button.button {
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
-  vertical-align: middle;
-  text-decoration: none;
-  font-size: 100%;
-  cursor: pointer;
-  margin: 1px;
-  padding: 0.125em 0.4em;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body div.dokuwiki input.button,
-html>body div.dokuwiki button.button {
-  background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
-}
-
-* html div.dokuwiki input.button,
-* html div.dokuwiki button.button {
-  height: 1.8em;
-}
-
-div.dokuwiki div.secedit input.button {
-  border: 1px solid __border__;
-  color: __text__;
-  background-color: __background__;
-  vertical-align: middle;
-  text-decoration: none;
-  margin: 0;
-  padding: 0;
-  font-size: 10px;
-  cursor: pointer;
-  float: right;
-  display: inline;
-}
-
-/* ----------- page navigator ------------- */
-
-div.dokuwiki div.pagenav {
-    margin: 1em 0 0 0;
-}
-
-div.dokuwiki div.pagenav-prev {
-    text-align: right;
-    float: left;
-    width: 49%
-}
-
-div.dokuwiki div.pagenav-next {
-    text-align: left;
-    float: right;
-    width: 49%
-}
-
-/* ----------- type of recent changes select -------- */
-
-div.dokuwiki form#dw__recent select {
-    margin-bottom: 10px;
-}
-
-/* --------------- Links ------------------ */
-
-div.dokuwiki a:link,
-div.dokuwiki a:visited {
-  color: __extern__;
-  text-decoration: none;
-}
-div.dokuwiki a:hover,
-div.dokuwiki a:active {
-  color: __text__;
-  text-decoration: underline;
-}
-
-div.dokuwiki a.nolink {
-  color: __text__ !important;
-  text-decoration: none !important;
-}
-
-/* external link */
-div.dokuwiki a.urlextern {
-  background: transparent url(images/link_icon.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
-}
-
-/* windows share */
-div.dokuwiki a.windows {
-  background: transparent url(images/windows.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
-}
-
-/* interwiki link (icon are set by dokuwiki) */
-div.dokuwiki a.interwiki {
-}
-
-/* link to some embedded media */
-div.dokuwiki a.media {
-}
-
-div.dokuwiki a.urlextern:link,
-div.dokuwiki a.windows:link,
-div.dokuwiki a.interwiki:link {
-  color: __extern__;
-}
-
-div.dokuwiki a.urlextern:visited,
-div.dokuwiki a.windows:visited,
-div.dokuwiki a.interwiki:visited {
-  color: purple;
-}
-div.dokuwiki a.urlextern:hover,
-div.dokuwiki a.urlextern:active,
-div.dokuwiki a.windows:hover,
-div.dokuwiki a.windows:active,
-div.dokuwiki a.interwiki:hover,
-div.dokuwiki a.interwiki:active {
-  color: __text__;
-}
-
-/* email link */
-div.dokuwiki a.mail {
-  background: transparent url(images/mail_icon.gif) 0px 1px no-repeat;
-  padding: 1px 0px 1px 16px;
-}
-
-/* existing wikipage */
-div.dokuwiki a.wikilink1 {
-  color: __existing__ !important;
-}
-
-/* not existing wikipage */
-div.dokuwiki a.wikilink2 {
-  color: __missing__ !important;
-  text-decoration: none !important;
-  border-bottom: dashed 1px __missing__ !important;
-}
-
-/* ------------- Page elements ----------------- */
-
-div.dokuwiki div.preview {
-  background-color: __background_neu__;
-  margin: 0 0 0 2em;
-  padding: 4px;
-  border: 1px dashed __text__;
-}
-
-div.dokuwiki div.breadcrumbs {
-  background-color: __background_neu__;
-  color: __text_neu__;
-  font-size: 80%;
-  padding: 0 0 0 4px;
-}
-
-div.dokuwiki span.user {
-  color: __text_other__;
-  font-size: 90%;
-}
-
-div.dokuwiki li.minor {
-  color: __text_neu__;
-  font-style: italic;
-}
-
-/* embedded images */
-div.dokuwiki img.media {
-  margin: 3px;
-}
-
-div.dokuwiki img.medialeft {
-  border: 0;
-  float: left;
-  margin: 0 1.5em 0 0;
-}
-
-div.dokuwiki img.mediaright {
-  border: 0;
-  float: right;
-  margin: 0 0 0 1.5em;
-}
-
-div.dokuwiki img.mediacenter {
-  border: 0;
-  display: block;
-  margin: 0 auto;
-}
-
-/* smileys */
-div.dokuwiki img.icon {
-  vertical-align: middle;
-}
-
-div.dokuwiki abbr {
-  cursor: help;
-  border-bottom: 1px dotted __text__;
-}
-
-/* general headline setup */
-div.dokuwiki h1,
-div.dokuwiki h2,
-div.dokuwiki h3,
-div.dokuwiki h4,
-div.dokuwiki h5 {
-    color: __text__;
-    background-color: inherit;
-    font-size: 100%;
-    font-weight: normal;
-    margin: 0 0 1em 0;
-    padding: 0.5em 0 0 0;
-    border-bottom: 1px solid __border__;
-    clear: left;
-}
-
-/* special headlines */
-div.dokuwiki h1 {font-size: 160%; margin-left: 0px; font-weight: bold;}
-div.dokuwiki h2 {font-size: 150%; margin-left: 20px;}
-div.dokuwiki h3 {font-size: 140%; margin-left: 40px; border-bottom: none; font-weight: bold;}
-div.dokuwiki h4 {font-size: 120%; margin-left: 60px; border-bottom: none; font-weight: bold;}
-div.dokuwiki h5 {font-size: 100%; margin-left: 80px; border-bottom: none; font-weight: bold;}
-
-/* indent different sections */
-div.dokuwiki div.level1 { margin-left: 3px; }
-div.dokuwiki div.level2 { margin-left: 23px; }
-div.dokuwiki div.level3 { margin-left: 43px; }
-div.dokuwiki div.level4 { margin-left: 63px; }
-div.dokuwiki div.level5 { margin-left: 83px; }
-
-/* unordered lists */
-div.dokuwiki ul {
-  line-height: 1.5em;
-  list-style-type: square;
-  list-style-image: none;
-  margin: 0 0 1em 3.5em;
-  color: __text_alt__;
-}
-
-/* ordered lists */
-div.dokuwiki ol {
-  line-height: 1.5em;
-  list-style-image: none;
-  margin: 0 0 1em 3.5em;
-  color: __text_alt__;
-  font-weight: bold;
-}
-
-/* no bottom gap in between and smaller left margin for nested lists */
-div.dokuwiki li ul,
-div.dokuwiki li ol {
-  margin: 0 0 0 1.5em;
-}
-
-/* the list items overriding the ul/ol definition */
-div.dokuwiki .li {
-  color: __text__;
-  font-weight: normal;
-}
-
-div.dokuwiki ol { list-style-type: decimal; }
-div.dokuwiki ol ol { list-style-type: upper-roman; }
-div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
-div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
-
-div.dokuwiki li.open {
-  list-style-image: url(images/open.gif);
-    /*list-style-type: circle;*/
-}
-
-div.dokuwiki li.closed {
-  list-style-image: url(images/closed.gif);
-    /*list-style-type: disc;*/
-}
-
-div.dokuwiki blockquote {
-  border-left: 2px solid __border__;
-  padding-left: 3px;
-}
-
-div.dokuwiki pre,
-div.dokuwiki code {
-  font-family: monospace, serif;
-  /* second generic font fixes problem with font-size, see
-     http://meyerweb.com/eric/thoughts/2010/02/12/fixed-monospace-sizing/ */
-  font-size: 100%;
-}
-div.dokuwiki pre {
-  padding: 0.5em;
-  border: 1px dashed __border__;
-  color: __text__;
-  overflow: auto;
-}
-
-/* code blocks by indention */
-div.dokuwiki pre.pre {
-  background-color: __background_other__;
-}
-
-/* code blocks by code tag */
-div.dokuwiki pre.code {
-  background-color: __background_other__;
-}
-
-/* code blocks by file tag */
-div.dokuwiki pre.file {
-  background-color: __background_alt__;
-}
-
-/* filenames for file and code blocks */
-div.dokuwiki dl.file,
-div.dokuwiki dl.code {
-    margin-top: 2em;
-    margin-bottom: 2.5em;
-}
-
-div.dokuwiki dl.file dt,
-div.dokuwiki dl.code dt {
-    border: 1px dashed __border__;
-    display: inline;
-    padding: 0.1em 1em;
-    margin-left: 2em;
-}
-
-div.dokuwiki dl.code dt a,
-div.dokuwiki dl.file dt a {
-    color: __text__;
-}
-
-div.dokuwiki dl.code dt {
-    background-color: __background_other__;
-    border-bottom: 1px solid __background_other__;
-}
-
-div.dokuwiki dl.file dt {
-    background-color: __background_alt__;
-    border-bottom: 1px solid __background_alt__;
-}
-
-
-/* inline tables */
-div.dokuwiki table.inline {
-  background-color: __background__;
-  border-spacing: 0px;
-  border-collapse: collapse;
-}
-
-div.dokuwiki table.inline th {
-  padding: 3px;
-  border: 1px solid __border__;
-  background-color: __background_alt__;
-}
-
-div.dokuwiki table.inline td {
-  padding: 3px;
-  border: 1px solid __border__;
-}
-
-/* ---------- table of contents ------------------- */
-
-div.dokuwiki #dw__toc {
-  margin: 1.2em 0 0 2em;
-  float: right;
-  width: 200px;
-  font-size: 80%;
-  clear: both;
-}
-
-div.dokuwiki #dw__toc h3 {
-  border: 1px solid __border__;
-  background-color: __background_alt__;
-  text-align: left;
-  font-weight: bold;
-  padding: 3px;
-  margin: 0 0 2px 0;
-  font-size: 1em;
-}
-
-div.dokuwiki .toggle strong {
-    border: 0.4em solid __background_alt__;
-    float: right;
-    display: block;
-    margin: 0.4em 3px 0 0;
-}
-
-div.dokuwiki .toggle span {
-    display: none;
-}
-
-div.dokuwiki .toggle.closed strong {
-    margin-top: 0.4em;
-    border-top: 0.4em solid __text__;
-}
-
-div.dokuwiki .toggle.open strong {
-    margin-top: 0;
-    border-bottom: 0.4em solid __text__;
-}
-
-div.dokuwiki #dw__toc > div {
-  border: 1px solid __border__;
-  background-color: __background__;
-  text-align: left;
-  padding: 0.5em 0 0.7em 0;
-}
-
-div.dokuwiki #dw__toc ul {
-  list-style-type: none;
-  list-style-image: none;
-  line-height: 1.2em;
-  padding-left: 1em;
-  margin: 0;
-}
-
-div.dokuwiki #dw__toc ul li {
-  background: transparent url(images/tocdot2.gif) 0 0.6em no-repeat;
-  padding-left: 0.4em;
-}
-
-div.dokuwiki #dw__toc ul li.clear {
-  background-image: none;
-  padding-left: 0.4em;
-}
-
-div.dokuwiki #dw__toc a:link,
-div.dokuwiki #dw__toc a:visited {
-  color: __extern__;
-}
-
-div.dokuwiki #dw__toc a:hover,
-div.dokuwiki #dw__toc a:active {
-  color: __text__;
-}
-
-/* ---------------------------- Diff rendering --------------------------*/
-div.dokuwiki table.diff {
-  background-color: __background__;
-  width: 100%;
-}
-div.dokuwiki td.diff-blockheader {
-  font-weight: bold;
-}
-div.dokuwiki table.diff th {
-  border-bottom: 1px solid __border__;
-  font-size: 110%;
-  font-weight: normal;
-  text-align: left;
-}
-div.dokuwiki table.diff th a {
-    font-weight: bold;
-}
-div.dokuwiki table.diff th span.user {
-    color: __text__;
-    font-size: 80%;
-}
-div.dokuwiki table.diff th span.sum {
-    font-size: 80%;
-    font-weight: bold;
-}
-div.dokuwiki table.diff th.minor {
-  font-style: italic;
-}
-.dokuwiki table.diff_sidebyside th {
-    width: 50%;
-}
-.dokuwiki table.diff .diff-lineheader {
-    width: .7em;
-    text-align: right;
-}
-[dir=rtl] .dokuwiki table.diff .diff-lineheader {
-    text-align: left;
-}
-.dokuwiki table.diff .diff-lineheader,
-div.dokuwiki table.diff td {
-  font-family: monospace;
-  font-size: 100%;
-}
-div.dokuwiki td.diff-addedline,
-div.dokuwiki span.diff-addedline {
-  background-color: #ddffdd;
-}
-div.dokuwiki td.diff-deletedline,
-div.dokuwiki span.diff-deletedline {
-    background-color: #ffffbb;
-}
-div.dokuwiki td.diff-context {
-    background-color: __background_neu__;
-}
-div.dokuwiki table.diff td.diff-addedline strong,
-div.dokuwiki table.diff td.diff-deletedline strong {
-    color: red;
-}
-
-/* --------------------- footnotes -------------------------------- */
-
-div.dokuwiki div.footnotes {
-  clear: both;
-  border-top: 1px solid __border__;
-  padding-left: 1em;
-  margin-top: 1em;
-}
-
-div.dokuwiki div.fn {
-  font-size: 90%;
-}
-
-div.dokuwiki a.fn_bot {
-  font-weight: bold;
-}
-
-/* insitu-footnotes */
-div.insitu-footnote {
-  font-size: 80%;
-  line-height: 1.2em;
-  border: 1px solid __border__;
-  background-color: __background_other__;
-  text-align: left;
-  padding: 4px;
-  max-width: 40%;    /* IE's width is handled in javascript */
-  min-width: 5em;
-}
-
-/* overcome IE issue with one line code or file boxes which require h. scrolling */
-* html .insitu-footnote pre.code,
-* html .insitu-footnote pre.file {
-  padding-bottom: 18px;
-}
-
-/* --------------- search result formating --------------- */
-#dw__loading {
-    text-align: center;
-    margin-bottom: 1em;
-}
-
-div.dokuwiki .search_results {
-  padding: 0 10px 0 30px;
-}
-
-div.dokuwiki .search_results dt {
-  margin-bottom: 3px;
-}
-div.dokuwiki .search_results dd {
-  margin-bottom: 6px;
-  color: __text_other__;
-  font-size: 12px;
-  margin-left: 20px;
-}
-
-div.dokuwiki .search_sep {
-  color: __text__;
-}
-
-div.dokuwiki .search_hit {
-  color: __text__;
-  background-color: __highlight__;
-}
-div.dokuwiki strong.search_hit {
-  font-weight: normal;
-}
-
-div.dokuwiki div.search_quickresult {
-  margin: 0 0 15px 30px;
-  padding: 0 10px 10px 0;
-  border-bottom: 1px dashed __border__;
-}
-div.dokuwiki div.search_quickresult h3 {
-  margin: 0 0 1.0em 0;
-  font-size: 1em;
-  font-weight: bold;
-}
-
-div.dokuwiki ul.search_quickhits {
-  margin: 0 0 0.5em 1.0em;
-}
-
-div.dokuwiki ul.search_quickhits li {
-  margin: 0 1.0em 0 1.0em;
-  float: left;
-  width: 30%;
-}
-
-div.dokuwiki .section_highlight {
-  background-color: __background_alt__ !important;
-}
-
-/* ------------------ Additional ---------------------- */
-
-div.footerinc {
-    text-align: center;
-}
-.footerinc a img {
-    opacity: 0.5;
-    border: 0;
-}
-
-.footerinc a:hover img {
-    opacity: 1;
-}
-
-/* ---------- AJAX quicksearch ----------- */
-
-div.dokuwiki div.ajax_qsearch {
-  position: absolute;
-  right: 237px;;
-  width: 200px;
-  opacity: 0.9;
-  display: none;
-  font-size: 80%;
-  line-height: 1.2em;
-  border: 1px solid __border__;
-  background-color: __background_other__;
-  text-align: left;
-  padding: 4px;
-}
-
-/* --------- Toolbar -------------------- */
-button.toolbutton {
-  background-color: __background__;
-  padding: 0px;
-  margin: 0 1px 0 0;
-  border: 1px solid __border__;
-  cursor: pointer;
-}
-
-/* nice alphatransparency background except for IE <7 */
-html>body button.toolbutton {
-  background:  __background__ url(images/buttonshadow.png) repeat-x bottom;
-}
-
-div.picker {
-  width: 250px;
-  border: 1px solid __border__;
-  background-color: __background_alt__;
-}
-
-div.pk_hl {
-  width: 125px;
-}
-
-button.pickerbutton {
-  padding: 0px;
-  margin: 0 1px 1px 0;
-  border: 0;
-  background-color: transparent;
-  font-size: 80%;
-  cursor: pointer;
-}
-
-/* ---------------  Image Details  ----------------- */
-
-div.dokuwiki div.img_big {
-  float: left;
-  margin-right: 0.5em;
-}
-
-div.dokuwiki dl.img_tags dt {
-  font-weight: bold;
-  background-color: __background_alt__;
-}
-div.dokuwiki dl.img_tags dd {
-  background-color: __background_neu__;
-}
-
-div.dokuwiki div.imagemeta {
-  color: __text_neu__;
-  font-size: 70%;
-  line-height: 95%;
-}
-
-div.dokuwiki div.imagemeta img.thumb {
-  float: left;
-  margin-right: 0.1em;
-}
-
diff --git a/lib/tpl/default/detail.php b/lib/tpl/default/detail.php
deleted file mode 100644
index 1c8042e15..000000000
--- a/lib/tpl/default/detail.php
+++ /dev/null
@@ -1,86 +0,0 @@
-<?php
-/**
- * DokuWiki Image Detail Template
- *
- * This is the template for displaying image details
- *
- * @link   http://dokuwiki.org/templates
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-     <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
-    [<?php echo strip_tags($conf['title'])?>]
-  </title>
-
-  <?php tpl_metaheaders()?>
-
-  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" />
-</head>
-
-<body>
-<div class="dokuwiki">
-  <?php html_msgarea()?>
-
-  <div class="page">
-    <?php if($ERROR){ print $ERROR; }else{ ?>
-
-    <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?></h1>
-
-    <div class="img_big">
-      <?php tpl_img(900,700) ?>
-    </div>
-
-    <div class="img_detail">
-      <p class="img_caption">
-        <?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?>
-      </p>
-
-      <p>&larr; <?php echo $lang['img_backto']?> <?php tpl_pagelink($ID)?></p>
-      <?php
-            $imgNS = getNS($IMG);
-            $authNS = auth_quickaclcheck("$imgNS:*");
-            if ($authNS >= AUTH_UPLOAD) {
-                echo '<p><a href="'.media_managerURL(array('ns' => $imgNS, 'image' => $IMG)).'">'.$lang['img_manager'].'</a></p>';
-            }
-      ?>
-
-      <dl class="img_tags">
-        <?php
-            $config_files = getConfigFiles('mediameta');
-            foreach ($config_files as $config_file) {
-                if(@file_exists($config_file)) include($config_file);
-            }
-
-            foreach($fields as $key => $tag){
-                $t = array();
-                if (!empty($tag[0])) $t = array($tag[0]);
-                if(is_array($tag[3])) $t = array_merge($t,$tag[3]);
-                $value = tpl_img_getTag($t);
-                if ($value) {
-                    echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
-                    if ($tag[2] == 'date') echo dformat($value);
-                    else echo hsc($value);
-                    echo '</dd>';
-                }
-            }
-        ?>
-      </dl>
-      <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw'));?>
-    </div>
-
-  <?php } ?>
-  </div>
-</div>
-</body>
-</html>
-
diff --git a/lib/tpl/default/footer.html b/lib/tpl/default/footer.html
deleted file mode 100644
index 38aab7216..000000000
--- a/lib/tpl/default/footer.html
+++ /dev/null
@@ -1,41 +0,0 @@
-<?php
-/**
- * Example footer include
- *
- * This file shows you how to use the include hooks. However I recommend to
- * create your own complete new template instead.
- */
-
-$tgt = ($conf['target']['extern']) ? 'target="'.$conf['target']['extern'].'"' : '';
-?>
-
-<div class="footerinc">
-
-  <a <?php echo $tgt?> href="<?php echo DOKU_BASE; ?>feed.php" title="Recent changes RSS feed"><img src="<?php echo DOKU_TPL; ?>images/button-rss.png" width="80" height="15" alt="Recent changes RSS feed" /></a>
-
-  <?php
-    $lic = license_img('button');
-    if($lic){
-  ?>
-      <a <?php echo $tgt?> href="<?php echo $license[$conf['license']]['url']?>" rel="license" title="<?php echo $license[$conf['license']]['name']?>"><img src="<?php echo DOKU_BASE.$lic ?>" width="80" height="15" alt="" /></a>
-  <?php } ?>
-
-  <a <?php echo $tgt?> href="http://www.dokuwiki.org/donate" title="Donate"><img src="<?php echo DOKU_TPL; ?>images/button-donate.gif" alt="Donate" width="80" height="15" /></a>
-
-  <a <?php echo $tgt?> href="http://www.php.net" title="Powered by PHP"><img src="<?php echo DOKU_TPL; ?>images/button-php.gif" width="80" height="15" alt="Powered by PHP" /></a>
-
-  <a <?php echo $tgt?> href="http://validator.w3.org/check/referer" title="Valid XHTML 1.0"><img src="<?php echo DOKU_TPL; ?>images/button-xhtml.png" width="80" height="15" alt="Valid XHTML 1.0" /></a>
-
-  <a <?php echo $tgt?> href="http://jigsaw.w3.org/css-validator/check/referer?profile=css3" title="Valid CSS"><img src="<?php echo DOKU_TPL; ?>images/button-css.png" width="80" height="15" alt="Valid CSS" /></a>
-
-  <a <?php echo $tgt?> href="http://dokuwiki.org/" title="Driven by DokuWiki"><img src="<?php echo DOKU_TPL; ?>images/button-dw.png" width="80" height="15" alt="Driven by DokuWiki" /></a>
-
-<?php
-if ($conf['allowdebug']) {
-    echo '<!-- page made in '.round(delta_time(DOKU_START_TIME), 3).' seconds -->';
-}
-?>
-
-
-</div>
-<?php include(dirname(__FILE__).'/dwtb.html') ?>
diff --git a/lib/tpl/default/images/UWEB.png b/lib/tpl/default/images/UWEB.png
deleted file mode 100644
index 292ade4ed..000000000
--- a/lib/tpl/default/images/UWEB.png
+++ /dev/null
diff --git a/lib/tpl/default/images/UWEBshadow.png b/lib/tpl/default/images/UWEBshadow.png
deleted file mode 100644
index 8c4e5f829..000000000
--- a/lib/tpl/default/images/UWEBshadow.png
+++ /dev/null
diff --git a/lib/tpl/default/images/apple-touch-icon.png b/lib/tpl/default/images/apple-touch-icon.png
deleted file mode 100644
index 45fa4e7b0..000000000
--- a/lib/tpl/default/images/apple-touch-icon.png
+++ /dev/null
diff --git a/lib/tpl/default/images/bullet.gif b/lib/tpl/default/images/bullet.gif
deleted file mode 100644
index b43de48a4..000000000
--- a/lib/tpl/default/images/bullet.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/button-cc.gif b/lib/tpl/default/images/button-cc.gif
deleted file mode 100644
index c7a403a9e..000000000
--- a/lib/tpl/default/images/button-cc.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/button-css.png b/lib/tpl/default/images/button-css.png
deleted file mode 100644
index 706325e1c..000000000
--- a/lib/tpl/default/images/button-css.png
+++ /dev/null
diff --git a/lib/tpl/default/images/button-donate.gif b/lib/tpl/default/images/button-donate.gif
deleted file mode 100644
index bba284e21..000000000
--- a/lib/tpl/default/images/button-donate.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/button-dw.png b/lib/tpl/default/images/button-dw.png
deleted file mode 100644
index 97272d968..000000000
--- a/lib/tpl/default/images/button-dw.png
+++ /dev/null
diff --git a/lib/tpl/default/images/button-php.gif b/lib/tpl/default/images/button-php.gif
deleted file mode 100644
index 19aefb08f..000000000
--- a/lib/tpl/default/images/button-php.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/button-rss.png b/lib/tpl/default/images/button-rss.png
deleted file mode 100644
index f2438043f..000000000
--- a/lib/tpl/default/images/button-rss.png
+++ /dev/null
diff --git a/lib/tpl/default/images/button-xhtml.png b/lib/tpl/default/images/button-xhtml.png
deleted file mode 100644
index ec686442c..000000000
--- a/lib/tpl/default/images/button-xhtml.png
+++ /dev/null
diff --git a/lib/tpl/default/images/buttonshadow.png b/lib/tpl/default/images/buttonshadow.png
deleted file mode 100644
index b96ebf759..000000000
--- a/lib/tpl/default/images/buttonshadow.png
+++ /dev/null
diff --git a/lib/tpl/default/images/closed.gif b/lib/tpl/default/images/closed.gif
deleted file mode 100644
index 8414d4d69..000000000
--- a/lib/tpl/default/images/closed.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/favicon.ico b/lib/tpl/default/images/favicon.ico
deleted file mode 100644
index 8b9616abb..000000000
--- a/lib/tpl/default/images/favicon.ico
+++ /dev/null
diff --git a/lib/tpl/default/images/inputshadow.png b/lib/tpl/default/images/inputshadow.png
deleted file mode 100644
index 480044986..000000000
--- a/lib/tpl/default/images/inputshadow.png
+++ /dev/null
diff --git a/lib/tpl/default/images/link_icon.gif b/lib/tpl/default/images/link_icon.gif
deleted file mode 100644
index d0a92f2fa..000000000
--- a/lib/tpl/default/images/link_icon.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/mail_icon.gif b/lib/tpl/default/images/mail_icon.gif
deleted file mode 100644
index 437d28fe1..000000000
--- a/lib/tpl/default/images/mail_icon.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/open.gif b/lib/tpl/default/images/open.gif
deleted file mode 100644
index f5d5c7e56..000000000
--- a/lib/tpl/default/images/open.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/resizecol.png b/lib/tpl/default/images/resizecol.png
deleted file mode 100644
index f0111507c..000000000
--- a/lib/tpl/default/images/resizecol.png
+++ /dev/null
diff --git a/lib/tpl/default/images/tocdot2.gif b/lib/tpl/default/images/tocdot2.gif
deleted file mode 100644
index e2b5f15cb..000000000
--- a/lib/tpl/default/images/tocdot2.gif
+++ /dev/null
diff --git a/lib/tpl/default/images/windows.gif b/lib/tpl/default/images/windows.gif
deleted file mode 100644
index 64dfeb6fb..000000000
--- a/lib/tpl/default/images/windows.gif
+++ /dev/null
diff --git a/lib/tpl/default/layout.css b/lib/tpl/default/layout.css
deleted file mode 100644
index ded2d87a2..000000000
--- a/lib/tpl/default/layout.css
+++ /dev/null
@@ -1,79 +0,0 @@
-/**
- * Tableless Layout for default template
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author moraes <moraes@tipos.com.br>
- */
-
-/* -------------- top row --------------- */
-div.dokuwiki .header {
-  padding: 3px 0 0 2px;
-}
-
-div.dokuwiki .pagename {
-  float: left;
-  font-size: 200%;
-  font-weight: bolder;
-  color: __background_alt__;
-  text-align: left;
-  vertical-align: middle;
-}
-
-div.dokuwiki .pagename a {
-  color: __extern__ !important;
-  text-decoration: none !important;
-}
-
-div.dokuwiki .logo {
-  float: right;
-  font-size: 220%;
-  font-weight: bolder;
-  text-align: right;
-  vertical-align: middle;
-}
-
-div.dokuwiki .logo a {
-  color: __background_alt__ !important;
-  text-decoration: none !important;
-  font-variant: small-caps;
-  letter-spacing: 2pt;
-}
-
-/* ---------------  top and bottom bar ---------------- */
-div.dokuwiki .bar {
-  border-top: 1px solid __border__;
-  border-bottom: 1px solid __border__;
-  background: __background_alt__;
-  padding: 0.1em 0.15em;
-  clear: both;
-}
-
-div.dokuwiki .bar-left {
-  float: left;
-}
-
-div.dokuwiki .bar-right {
-  float: right;
-  text-align: right;
-}
-
-div.dokuwiki #bar__bottom {
-  margin-bottom: 3px;
-}
-
-/* ------------- File Metadata ----------------------- */
-
-div.dokuwiki div.meta {
-  clear: both;
-  margin-top: 1em;
-  color: __text_alt__;
-  font-size: 70%;
-}
-
-div.dokuwiki div.meta div.user {
-  float: left;
-}
-
-div.dokuwiki div.meta div.doc {
-  text-align: right;
-}
diff --git a/lib/tpl/default/main.php b/lib/tpl/default/main.php
deleted file mode 100644
index 851afde6c..000000000
--- a/lib/tpl/default/main.php
+++ /dev/null
@@ -1,135 +0,0 @@
-<?php
-/**
- * DokuWiki Default Template
- *
- * This is the template you need to change for the overall look
- * of DokuWiki.
- *
- * @link   http://dokuwiki.org/templates
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
- lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction']?>">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-    <?php tpl_pagetitle()?>
-    [<?php echo strip_tags($conf['title'])?>]
-  </title>
-
-  <?php tpl_metaheaders()?>
-  <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
-
-  <?php /*old includehook*/ @include(dirname(__FILE__).'/meta.html')?>
-</head>
-
-<body>
-<?php /*old includehook*/ @include(dirname(__FILE__).'/topheader.html')?>
-<div class="dokuwiki">
-  <?php html_msgarea()?>
-
-  <div class="stylehead">
-
-    <div class="header">
-      <div class="pagename">
-        [[<?php tpl_link(wl($ID,'do=backlink'),tpl_pagetitle($ID,true),'title="'.$lang['btn_backlink'].'"')?>]]
-      </div>
-      <div class="logo">
-        <?php tpl_link(wl(),$conf['title'],'name="dokuwiki__top" id="dokuwiki__top" accesskey="h" title="[H]"')?>
-      </div>
-
-      <div class="clearer"></div>
-    </div>
-
-    <?php /*old includehook*/ @include(dirname(__FILE__).'/header.html')?>
-
-    <div class="bar" id="bar__top">
-      <div class="bar-left" id="bar__topleft">
-        <?php tpl_button('edit')?>
-        <?php tpl_button('history')?>
-      </div>
-
-      <div class="bar-right" id="bar__topright">
-        <?php tpl_button('recent')?>
-        <?php tpl_searchform()?>&#160;
-      </div>
-
-      <div class="clearer"></div>
-    </div>
-
-    <?php if($conf['breadcrumbs']){?>
-    <div class="breadcrumbs">
-      <?php tpl_breadcrumbs()?>
-      <?php //tpl_youarehere() //(some people prefer this)?>
-    </div>
-    <?php }?>
-
-    <?php if($conf['youarehere']){?>
-    <div class="breadcrumbs">
-      <?php tpl_youarehere() ?>
-    </div>
-    <?php }?>
-
-  </div>
-  <?php tpl_flush()?>
-
-  <?php /*old includehook*/ @include(dirname(__FILE__).'/pageheader.html')?>
-
-  <div class="page">
-    <!-- wikipage start -->
-    <?php tpl_content()?>
-    <!-- wikipage stop -->
-  </div>
-
-  <div class="clearer"></div>
-
-  <?php tpl_flush()?>
-
-  <div class="stylefoot">
-
-    <div class="meta">
-      <div class="user">
-        <?php tpl_userinfo()?>
-      </div>
-      <div class="doc">
-        <?php tpl_pageinfo()?>
-      </div>
-    </div>
-
-   <?php /*old includehook*/ @include(dirname(__FILE__).'/pagefooter.html')?>
-
-    <div class="bar" id="bar__bottom">
-      <div class="bar-left" id="bar__bottomleft">
-        <?php tpl_button('edit')?>
-        <?php tpl_button('history')?>
-        <?php tpl_button('revert')?>
-      </div>
-      <div class="bar-right" id="bar__bottomright">
-        <?php tpl_button('subscribe')?>
-        <?php tpl_button('media')?>
-        <?php tpl_button('admin')?>
-        <?php tpl_button('profile')?>
-        <?php tpl_button('login')?>
-        <?php tpl_button('index')?>
-        <?php tpl_button('top')?>&#160;
-      </div>
-      <div class="clearer"></div>
-    </div>
-
-  </div>
-
-  <?php tpl_license(false);?>
-
-</div>
-<?php /*old includehook*/ @include(dirname(__FILE__).'/footer.html')?>
-
-<div class="no"><?php /* provide DokuWiki housekeeping, required in all templates */ tpl_indexerWebBug()?></div>
-</body>
-</html>
diff --git a/lib/tpl/default/media.css b/lib/tpl/default/media.css
deleted file mode 100644
index 640ad3162..000000000
--- a/lib/tpl/default/media.css
+++ /dev/null
@@ -1,224 +0,0 @@
-/**
- * The CSS in here controls the appearance of the media manager
- */
-
-#media__manager {
-    height: 100%;
-    overflow: hidden;
-}
-
-#media__left {
-    width: 30%;
-    border-right: solid 1px __border__;
-
-    height: 100%;
-    overflow: auto;
-    position: absolute;
-    left: 0;
-}
-
-#media__right {
-    width: 69.7%;
-
-    height: 100%;
-    overflow: auto;
-    position: absolute;
-    right: 0;
-}
-
-#media__manager h1 {
-    margin: 0;
-    padding: 0;
-    margin-bottom: 0.5em;
-}
-
-#media__manager a.select {
-    cursor: pointer;
-}
-
-/* --- Tree formatting --- */
-
-#media__tree img {
-    float: left;
-    padding: 0.5em 0.3em 0 0;
-}
-[dir=rtl] #media__tree img {
-    float: right;
-    padding: 0.5em 0 0 0.3em;
-}
-
-#media__tree ul {
-    list-style-type: none;
-    list-style-image: none;
-    margin-left: 1.5em;
-}
-[dir=rtl] #media__tree ul {
-    margin-left: 0;
-    margin-right: 1.5em;
-}
-
-#media__tree li {
-    clear: left;
-    list-style-type: none;
-    list-style-image: none;
-}
-[dir=rtl] #media__tree li {
-    clear: right;
-}
-*+html #media__tree li,
-* html #media__tree li {
-    border: 1px solid __background__;
-}/* I don't understand this, but this fixes a style bug in IE;
-it's dirty, so any "real" fixes are welcome */
-
-/* --- options --- */
-
-#media__opts {
-    padding-left: 1em;
-    margin-bottom: 0.5em;
-}
-
-#media__opts input {
-    float: left;
-    display: block;
-    margin-top: 4px;
-    position: absolute;
-}
-*+html #media__opts input,
-* html #media__opts input {
-    position: static;
-}
-
-#media__opts label {
-    display: block;
-    float: left;
-    margin-left: 20px;
-    margin-bottom: 4px;
-}
-*+html #media__opts label,
-* html #media__opts label {
-    margin-left: 10px;
-}
-
-#media__opts br {
-    clear: left;
-}
-
-/* --- file list --- */
-
-#media__content img.load {
-    margin: 1em auto;
-}
-
-#media__content #scroll__here {
-    border: 1px dashed __border__;
-}
-
-#media__content .odd {
-    background-color: __background_other__;
-    padding: 0.4em;
-}
-
-#media__content .even {
-    padding: 0.4em;
-}
-
-#media__content a.mediafile {
-    margin-right: 1.5em;
-    font-weight: bold;
-}
-
-#media__content div.detail {
-    padding: 0.3em 0 0.3em 2em;
-}
-
-#media__content div.detail div.thumb {
-    float: left;
-    width: 130px;
-    text-align: center;
-    margin-right: 0.4em;
-}
-
-
-#media__content img.btn {
-    vertical-align: text-bottom;
-}
-
-#media__content div.example {
-    color: __text_neu__;
-    margin-left: 1em;
-}
-
-/* --- upload form --- */
-
-#media__content div.upload {
-    font-size: 90%;
-    padding: 0 0.5em 0.5em 0.5em;
-}
-
-#media__content #mediamanager__uploader {
-    display: block;
-    border-bottom: solid 1px __border__;
-    padding: 0 0.5em 1em 0.5em;
-}
-
-#media__content form#dw__upload {
-    border-bottom: 0;
-}
-
-#media__content form#dw__upload fieldset {
-    padding: 0;
-    margin: 0;
-    border: none;
-    width: auto;
-}
-#media__content form#dw__upload p {
-    text-align: left;
-    padding: 0.25em 0;
-    margin: 0;
-    line-height: 1.0em;
-}
-#media__content form#dw__upload label.check {
-    float: none;
-    width: auto;
-    margin-left: 11.5em;
-}
-
-/* --- meta edit form --- */
-
-#media__content form.meta {
-    display: block;
-    padding: 0 0 1em 0;
-}
-
-#media__content form.meta label {
-    display: block;
-    width: 25%;
-    float: left;
-    font-weight: bold;
-    margin-left: 1em;
-    clear: left;
-}
-
-#media__content form.meta .edit {
-    font: 100% "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-    float: left;
-    width: 70%;
-    padding-right: 0;
-    padding-left: 0.2em;
-    margin: 2px;
-}
-
-#media__content form.meta textarea.edit {
-    height: 8em;
-}
-
-#media__content form.meta div.metafield {
-    clear: left;
-}
-
-#media__content form.meta div.buttons {
-    clear: left;
-    margin-left: 20%;
-    padding-left: 1em;
-}
diff --git a/lib/tpl/default/mediamanager.php b/lib/tpl/default/mediamanager.php
deleted file mode 100644
index 35b526a32..000000000
--- a/lib/tpl/default/mediamanager.php
+++ /dev/null
@@ -1,45 +0,0 @@
-<?php
-/**
- * DokuWiki Default Template
- *
- * This is the template for the media manager popup
- *
- * @link   http://dokuwiki.org/templates
- * @author Andreas Gohr <andi@splitbrain.org>
- */
-
-// must be run from within DokuWiki
-if (!defined('DOKU_INC')) die();
-
-?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN"
- "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>" lang="<?php echo $conf['lang']?>" dir="ltr">
-<head>
-  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-  <title>
-    <?php echo hsc($lang['mediaselect'])?>
-    [<?php echo strip_tags($conf['title'])?>]
-  </title>
-  <?php tpl_metaheaders()?>
-  <link rel="shortcut icon" href="<?php echo DOKU_TPL?>images/favicon.ico" />
-</head>
-
-<body>
-<div id="media__manager" class="dokuwiki">
-    <div id="media__left">
-        <?php html_msgarea()?>
-        <h1><?php echo hsc($lang['mediaselect'])?></h1>
-
-        <?php /* keep the id! additional elements are inserted via JS here */?>
-        <div id="media__opts"></div>
-
-        <?php tpl_mediaTree() ?>
-    </div>
-
-    <div id="media__right">
-        <?php tpl_mediaContent() ?>
-    </div>
-</div>
-</body>
-</html>
diff --git a/lib/tpl/default/print.css b/lib/tpl/default/print.css
deleted file mode 100644
index f83e8c97c..000000000
--- a/lib/tpl/default/print.css
+++ /dev/null
@@ -1,228 +0,0 @@
-
-body {
-  font: 10pt "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-  background-color: White;
-  color: Black;
-}
-
-table {
-  font-size: 100%;
-  padding: 0;
-  margin: 0;
-}
-
-tr,td,th { padding: 0; margin: 0; }
-
-img { border: 0; }
-
-a {
-  color: #000000;
-  text-decoration: none;
-  background: none !important;
-}
-
-a.interwiki {
-  padding-left: 0px !important;
-}
-
-
-div.meta {
-  clear: both;
-  margin-top: 1em;
-  font-size: 70%;
-  text-align: right;
-}
-
-div.breadcrumbs {
-  display: none;
-}
-
-
-/* --------------------- Text formating -------------------------------- */
-
-/* external link */
-a.urlextern:after {
-   content: " [" attr(href) "]";
-   font-size: 90%;
-}
-
-/* interwiki link */
-a.interwiki:after {
-   content: " [" attr(href) "]";
-   font-size: 90%;
-}
-
-/* email link */
-a.mail:after {
-   content: " [" attr(href) "]";
-   font-size: 90%;
-}
-
-/* existing wikilink */
-a.wikilink1    { text-decoration: underline; }
-
-/* the document */
-div.page {
-  text-align: justify;
-}
-
-/* general headline setup */
-h1, h2, h3, h4, h5 {
-    color: Black;
-    background-color: transparent;
-    font-family: "Lucida Grande", Verdana, Lucida, Helvetica, Arial, sans-serif;
-    font-size: 100%;
-    font-weight: normal;
-    margin-left:    0;
-    margin-right:   0;
-    margin-top:     0;
-    margin-bottom:  1em;
-    padding-left:   0;
-    padding-right:  0;
-    padding-top:    0.5em;
-    padding-bottom: 0;
-    border-bottom: 1px solid #000000;
-    clear: left;
-}
-
-/* special headlines */
-h1 { font-size: 160%; font-weight: bold; }
-h2 { font-size: 150%; }
-h3 { font-size: 140%; border-bottom: none; }
-h4 { font-size: 120%; border-bottom: none; }
-h5 { font-size: 100%; border-bottom: none; }
-
-/* embedded images */
-img.media {
-  margin: 3px;
-}
-
-/* the styles for media images are already in
-   lib/styles/all.css, these are additional styles */
-img.medialeft {
-  margin: 0 1.5em 0 0;
-}
-img.mediaright {
-  margin: 0 0 0 1.5em;
-}
-img.mediacenter {
-}
-
-/* unordered lists */
-ul {
-    line-height: 1.5em;
-    list-style-type: square;
-    margin: 0 0 1em 3.5em;
-    padding: 0;
-}
-
-/* ordered lists */
-ol {
-    line-height: 1.5em;
-    margin: 0 0 1em 3.5em;
-    padding: 0;
-    font-weight: normal;
-}
-
-div.dokuwiki li ul {
-  margin-bottom: 0;
-}
-div.dokuwiki li ol {
-  margin-bottom: 0;
-}
-
-div.dokuwiki ol { list-style-type: decimal; }
-div.dokuwiki ol ol { list-style-type: upper-roman; }
-div.dokuwiki ol ol ol { list-style-type: lower-alpha; }
-div.dokuwiki ol ol ol ol { list-style-type: lower-greek; }
-
-/* the list items overriding the ol definition */
-span.li {
-    font-weight: normal;
-}
-
-pre {
-  font-family: monospace;
-}
-
-/* code blocks by indention */
-pre.pre {
-  font-size: 8pt;
-  padding: 0.5em;
-  border: 1px dashed #000000;
-  color: Black;
-  overflow: visible;
-}
-
-/* code blocks by code tag */
-pre.code {
-  font-size: 8pt;
-  padding: 0.5em;
-  border: 1px dashed #000000;
-  color: Black;
-  overflow: visible;
-}
-
-/* inline code words */
-code {
-  font-size: 120%;
-}
-
-/* code blocks by file tag */
-pre.file {
-  font-size: 8pt;
-  padding: 0.5em;
-  border: 1px dotted #000000;
-  color: Black;
-  overflow: visible;
-}
-
-/* footnotes */
-div.footnotes {
-  clear: both;
-  border-top: 1px solid #000000;
-  padding-left: 1em;
-  margin-top: 1em;
-}
-
-div.fn {
-  font-size: 90%;
-}
-
-a.fn_top {
-  vertical-align: super;
-  font-size: 80%;
-}
-
-a.fn_bot {
-  vertical-align: super;
-  font-size: 80%;
-  font-weight: bold;
-}
-
-abbr {
-  border: 0;
-}
-
-/* ---------- inline tables ------------------- */
-
-table.inline {
-  font-size: 80%;
-  background-color: #ffffff;
-  border-spacing: 0px;
-  border-collapse: collapse;
-}
-
-table.inline th {
-  padding: 3px;
-  border: 1px solid #000000;
-  border-bottom: 2px solid #000000;
-}
-
-table.inline td {
-  padding: 3px;
-  border: 1px solid #000000;
-}
-
-#dw__toc, .footerinc, .header, .bar, .user { display: none; }
-
diff --git a/lib/tpl/default/rtl.css b/lib/tpl/default/rtl.css
deleted file mode 100644
index f16ba101b..000000000
--- a/lib/tpl/default/rtl.css
+++ /dev/null
@@ -1,162 +0,0 @@
-/**
- * Layout and design corrections for right-to-left languages
- *
- * @author Andreas Gohr <andi@splitbrain.org>
- * @author Dotan Kamber <kamberd@yahoo.com>
- */
-
-.bar-left {
-  float: right;
-  text-align: right;
-}
-
-.bar-right {
-  float: left;
-  text-align: left;
-}
-
-.pagename {
-  float: right;
-  text-align: right;
-}
-
-.logo {
-  float: left;
-  text-align: left;
-}
-
-label {
-  text-align: left;
-}
-
-label.simple {
-  text-align: right;
-}
-
-div.meta div.user {
-  float: right;
-}
-
-div.meta div.doc {
-  text-align: left;
-}
-
-/* ------------------  Design corrections  --------------------------------- */
-
-div.dokuwiki ul,
-div.dokuwiki ol {
-  margin: 0.5em 3.5em 0.5em 0;
-}
-div.dokuwiki li ul,
-div.dokuwiki li ol {
-  margin: 0.5em 1.5em 0.5em 0;
-}
-
-div.dokuwiki a.urlextern,
-div.dokuwiki a.interwiki,
-div.dokuwiki a.mediafile,
-div.dokuwiki a.windows,
-div.dokuwiki a.mail {
-  background-position: right 1px;
-  padding-right: 16px;
-  padding-left: 0;
-  display: inline-block; /* needed for IE7 */
-}
-
-div.dokuwiki a.mediafile {
-  padding-right: 18px;
-}
-
-div.dokuwiki div.secedit input.button {
-  float: left;
-}
-
-/* headlines */
-div.dokuwiki h1, div.dokuwiki h2, div.dokuwiki h3, div.dokuwiki h4, div.dokuwiki h5 {
-  clear: right;
-}
-
-/* special headlines */
-div.dokuwiki h1 { margin-left: 0px; margin-right: 0px; }
-div.dokuwiki h2 { margin-left: 0px; margin-right: 20px; }
-div.dokuwiki h3 { margin-left: 0px; margin-right: 40px; }
-div.dokuwiki h4 { margin-left: 0px; margin-right: 60px; }
-div.dokuwiki h5 { margin-left: 0px; margin-right: 80px; }
-
-/* indent different sections */
-div.dokuwiki div.level1 { margin-left: 0px; margin-right: 3px; }
-div.dokuwiki div.level2 { margin-left: 0px; margin-right: 23px; }
-div.dokuwiki div.level3 { margin-left: 0px; margin-right: 43px; }
-div.dokuwiki div.level4 { margin-left: 0px; margin-right: 63px; }
-div.dokuwiki div.level5 { margin-left: 0px; margin-right: 83px; }
-
-/* TOC control */
-div.dokuwiki #dw__toc {
-  float: left;
-  margin: 1.2em 2em 0 0;
-}
-
-div.dokuwiki #dw__toc h3 {
-  text-align: right;
-}
-
-div.dokuwiki .toggle strong {
-    float: left;
-    margin: 0.4em 0 0 3px;
-}
-
-div.dokuwiki #dw__toc > div {
-  text-align: right;
-}
-
-div.dokuwiki #dw__toc ul {
-  padding: 0;
-  padding-right: 1em;
-}
-
-div.dokuwiki #dw__toc ul li {
-  background-position: right 0.6em;
-  padding-right: 0.4em;
-  direction: rtl;
-}
-
-div.dokuwiki #dw__toc ul li.clear {
-  padding-right: 0.4em;
-}
-
-div.dokuwiki .code {
-  direction: ltr;
-  text-align: left;
-}
-div.dokuwiki blockquote {
-  border-left: 0;
-  padding-left: 0;
-  border-right: 2px solid  __border__;
-  padding-right: 3px;
-}
-
-/* Admin corrections */
-#admin__version {
-    clear: right;
-    float: left;
-}
-
-.dokuwiki ul.admin_tasks {
-    float: right;
-}
-
-.dokuwiki ul.admin_tasks li {
-    padding-left: 0px;
-    padding-right: 35px;
-    background: transparent none no-repeat scroll right 0;
-    text-align: right;
-}
-
-/* Search corrections */
-div.dokuwiki ul.search_quickhits li {
-    float: right;
-}
-
-div#qsearch__out {
-    text-align: right;
-}
diff --git a/lib/tpl/default/style.ini b/lib/tpl/default/style.ini
deleted file mode 100644
index 0706303d0..000000000
--- a/lib/tpl/default/style.ini
+++ /dev/null
@@ -1,77 +0,0 @@
-; Please see http://www.php.net/manual/en/function.parse-ini-file.php
-; for limitations of the ini format used here
-
-; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
-; Please don't forget to copy the section your changes should be under
-; (i.e. [stylesheets] or [replacements]) into that file as well.
-
-; Define the stylesheets your template uses here. The second value
-; defines for which output media the style should be loaded. Currently
-; print, screen and rtl are supported. rtl styles are loaded additionally
-; to screen styles if a right-to-left language is selected (eg. hebrew)
-[stylesheets]
-layout.css     = screen
-design.css     = screen
-style.css      = screen
-
-media.css         = screen
-_mediaoptions.css = screen
-_admin.css        = screen
-_linkwiz.css      = screen
-_subscription.css = screen
-_mediamanager.css  = screen
-_tabs.css         = screen
-_fileuploader.css = screen
-
-rtl.css        = rtl
-print.css      = print
-
-; This section is used to configure some placeholder values used in
-; the stylesheets. Changing this file is the simplest method to
-; give your wiki a new look.
-[replacements]
-
-;--------------------------------------------------------------------------
-;------ guaranteed dokuwiki color placeholders that every plugin can use
-; main text and background colors
-__text__           = "#000"
-__background__     = "#fff"
-; alternative text and background colors
-__text_alt__       = "#638c9c"
-__background_alt__ = "#dee7ec"
-; neutral text and background colors
-__text_neu__       = "#666"
-__background_neu__ = "#f5f5f5"
-; border color
-__border__         = "#8cacbb"
-;--------------------------------------------------------------------------
-
-; other text and background colors
-__text_other__       = "#ccc"
-__background_other__ = "#f7f9fa"
-
-; these are used for links
-__extern__    = "#436976"
-__existing__  = "#090"
-__missing__   = "#f30"
-
-; highlighting search snippets
-__highlight__ = "#ff9"
-
-
-;--------------------------------------------------------------------------
-;------ for keeping old templates and plugins compatible to the old pattern
-; (to be deleted at the next or after next release)
-__white__      = "#fff"
-__lightgray__  = "#f5f5f5"
-__mediumgray__ = "#ccc"
-__darkgray__   = "#666"
-__black__      = "#000"
-
-; these are the shades of blue
-__lighter__   = "#f7f9fa"
-__light__     = "#eef3f8"
-__medium__    = "#dee7ec"
-__dark__      = "#8cacbb"
-__darker__    = "#638c9c"
diff --git a/lib/tpl/default/template.info.txt b/lib/tpl/default/template.info.txt
deleted file mode 100644
index e0dbf54ba..000000000
--- a/lib/tpl/default/template.info.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-base     default
-author   Andreas Gohr
-email    andi@splitbrain.org
-date     2013-02-16
-name     DokuWiki Default Template
-desc     DokuWiki's default template until 2012
-url      http://www.dokuwiki.org/template:default
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 ad04f7c41..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,
@@ -233,8 +233,8 @@ button img {
 }
 
 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;
@@ -253,7 +253,7 @@ em abbr {
 }
 
 mark {
-    background-color: __highlight__;
+    background-color: @ini_highlight;
     color: inherit;
 }
 
@@ -266,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 {
@@ -321,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;
@@ -357,6 +357,9 @@ progress {
     box-sizing: border-box;
 }
 
+select {
+    max-width: 100%;
+}
 optgroup {
     font-style: italic;
     font-weight: bold;
@@ -403,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;
@@ -441,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;
+}
diff --git a/lib/tpl/dokuwiki/detail.php b/lib/tpl/dokuwiki/detail.php
index d2ed530a3..ec846f6fd 100644
--- a/lib/tpl/dokuwiki/detail.php
+++ b/lib/tpl/dokuwiki/detail.php
@@ -28,8 +28,7 @@ header('X-UA-Compatible: IE=edge,chrome=1');
 
 <body>
     <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
-    <div id="dokuwiki__site"><div id="dokuwiki__top"
-        class="dokuwiki site mode_<?php echo $ACT ?>">
+    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?>">
 
         <?php include('tpl_header.php') ?>
 
@@ -109,16 +108,29 @@ header('X-UA-Compatible: IE=edge,chrome=1');
                     <h3 class="a11y"><?php echo $lang['page_tools']; ?></h3>
                     <div class="tools">
                         <ul>
-                            <?php // View in media manager; @todo: transfer logic to backend
+                            <?php
+                                $data = array();
+                                $data['view'] = 'detail';
+
+                                // View in media manager; @todo: transfer logic to backend
                                 $imgNS = getNS($IMG);
                                 $authNS = auth_quickaclcheck("$imgNS:*");
                                 if (($authNS >= AUTH_UPLOAD) && function_exists('media_managerURL')) {
                                     $mmURL = media_managerURL(array('ns' => $imgNS, 'image' => $IMG));
-                                    echo '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
+                                    $data['items']['mediaManager'] = '<li><a href="'.$mmURL.'" class="mediaManager"><span>'.$lang['img_manager'].'</span></a></li>';
                                 }
-                            ?>
-                            <?php // Back to [ID]; @todo: transfer logic to backend
-                                echo '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+
+                                // Back to [ID]; @todo: transfer logic to backend
+                                $data['items']['img_backto'] = '<li><a href="'.wl($ID).'" class="back"><span>'.$lang['img_backto'].' '.$ID.'</span></a></li>';
+
+                                // the page tools can be amended through a custom plugin hook
+                                $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
+                                if($evt->advise_before()){
+                                    foreach($evt->data['items'] as $k => $html) echo $html;
+                                }
+                                $evt->advise_after();
+                                unset($data);
+                                unset($evt);
                             ?>
                         </ul>
                     </div>
diff --git a/lib/tpl/dokuwiki/images/pagetools-sprite.png b/lib/tpl/dokuwiki/images/pagetools-sprite.png
index 898f0f4a6..b6e808717 100644
--- a/lib/tpl/dokuwiki/images/pagetools-sprite.png
+++ b/lib/tpl/dokuwiki/images/pagetools-sprite.png
diff --git a/lib/tpl/dokuwiki/images/pagetools/00_default.png b/lib/tpl/dokuwiki/images/pagetools/00_default.png
new file mode 100644
index 000000000..95d122e17
--- /dev/null
+++ b/lib/tpl/dokuwiki/images/pagetools/00_default.png
diff --git a/lib/tpl/dokuwiki/main.php b/lib/tpl/dokuwiki/main.php
index 43a0c0da7..3bc46406a 100644
--- a/lib/tpl/dokuwiki/main.php
+++ b/lib/tpl/dokuwiki/main.php
@@ -27,9 +27,8 @@ $showSidebar = $hasSidebar && ($ACT=='show');
 
 <body>
     <!--[if lte IE 7 ]><div id="IE7"><![endif]--><!--[if IE 8 ]><div id="IE8"><![endif]-->
-    <div id="dokuwiki__site"><div id="dokuwiki__top"
-        class="dokuwiki site mode_<?php echo $ACT ?> <?php echo ($showSidebar) ? 'showSidebar' : '';
-        ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
+    <div id="dokuwiki__site"><div id="dokuwiki__top" class="site <?php echo tpl_classes(); ?> <?php
+        echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo ($hasSidebar) ? 'hasSidebar' : ''; ?>">
 
         <?php include('tpl_header.php') ?>
 
@@ -75,12 +74,26 @@ $showSidebar = $hasSidebar && ($ACT=='show');
                 <div class="tools">
                     <ul>
                         <?php
-                            tpl_action('edit',      1, 'li', 0, '<span>', '</span>');
-                            tpl_action('revert',    1, 'li', 0, '<span>', '</span>');
-                            tpl_action('revisions', 1, 'li', 0, '<span>', '</span>');
-                            tpl_action('backlink',  1, 'li', 0, '<span>', '</span>');
-                            tpl_action('subscribe', 1, 'li', 0, '<span>', '</span>');
-                            tpl_action('top',       1, 'li', 0, '<span>', '</span>');
+                            $data = array(
+                                'view'  => 'main',
+                                'items' => array(
+                                    'edit'      => tpl_action('edit',      1, 'li', 1, '<span>', '</span>'),
+                                    'revert'    => tpl_action('revert',    1, 'li', 1, '<span>', '</span>'),
+                                    'revisions' => tpl_action('revisions', 1, 'li', 1, '<span>', '</span>'),
+                                    'backlink'  => tpl_action('backlink',  1, 'li', 1, '<span>', '</span>'),
+                                    'subscribe' => tpl_action('subscribe', 1, 'li', 1, '<span>', '</span>'),
+                                    'top'       => tpl_action('top',       1, 'li', 1, '<span>', '</span>')
+                                )
+                            );
+
+                            // the page tools can be amended through a custom plugin hook
+                            $evt = new Doku_Event('TEMPLATE_PAGETOOLS_DISPLAY', $data);
+                            if($evt->advise_before()){
+                                foreach($evt->data['items'] as $k => $html) echo $html;
+                            }
+                            $evt->advise_after();
+                            unset($data);
+                            unset($evt);
                         ?>
                     </ul>
                 </div>
diff --git a/lib/tpl/dokuwiki/style.ini b/lib/tpl/dokuwiki/style.ini
index 77bb98236..cc23c169f 100644
--- a/lib/tpl/dokuwiki/style.ini
+++ b/lib/tpl/dokuwiki/style.ini
@@ -2,17 +2,23 @@
 ; for limitations of the ini format used here
 
 ; To extend this file or make changes to it, it is recommended to create
-; a style.local.ini file to prevent losing any changes after an upgrade.
+; a local conf/tpl/<template-folder-name>/style.ini file to prevent losing
+; any changes after an upgrade.
 ; Please don't forget to copy the section your changes should be under
 ; (i.e. [stylesheets] or [replacements]) into that file as well.
 
 ; Define the stylesheets your template uses here. The second value
 ; defines for which output media the style should be loaded. Currently
 ; print, screen and all are supported.
+; You can reference CSS and LESS files here. Files referenced here will
+; be checked for updates when considering a cache rebuild while files
+; included through LESS' @import statements are not
 
 [stylesheets]
 
-css/basic.css             = screen
+css/mixins.less           = screen
+
+css/basic.less            = screen
 css/_imgdetail.css        = screen
 css/_media_popup.css      = screen
 css/_media_fullscreen.css = screen
@@ -28,19 +34,20 @@ css/_edit.css             = screen
 css/_modal.css            = screen
 css/_forms.css            = screen
 css/_admin.css            = screen
-css/structure.css         = screen
-css/design.css            = screen
-css/pagetools.css         = screen
-css/content.css           = screen
-css/includes.css          = screen
+css/structure.less        = screen
+css/design.less           = screen
+css/pagetools.less        = screen
+css/content.less          = screen
 
-css/mobile.css            = all
+css/mobile.less           = all
 css/print.css             = print
 
 
 ; This section is used to configure some placeholder values used in
 ; the stylesheets. Changing this file is the simplest method to
 ; give your wiki a new look.
+; Placeholders defined here will also be made available as LESS variables
+; (with surrounding underscores removed, and the prefix @ini_ added)
 
 [replacements]
 
@@ -48,32 +55,32 @@ css/print.css             = print
 ;------ guaranteed dokuwiki color placeholders that every plugin can use
 
 ; main text and background colors
-__text__            = "#333"
-__background__      = "#fff"
+__text__            = "#333"            ; @ini_text
+__background__      = "#fff"            ; @ini_background
 ; alternative text and background colors
-__text_alt__        = "#999"
-__background_alt__  = "#eee"
+__text_alt__        = "#999"            ; @ini_text_alt
+__background_alt__  = "#eee"            ; @ini_background_alt
 ; neutral text and background colors
-__text_neu__        = "#666"
-__background_neu__  = "#ddd"
+__text_neu__        = "#666"            ; @ini_text_neu
+__background_neu__  = "#ddd"            ; @ini_background_neu
 ; border color
-__border__          = "#ccc"
+__border__          = "#ccc"            ; @ini_border
 
 ; highlighted text (e.g. search snippets)
-__highlight__       = "#ff9"
+__highlight__       = "#ff9"            ; @ini_highlight
 
 ;--------------------------------------------------------------------------
 
-__background_site__ = "#fbfaf9"
+__background_site__ = "#fbfaf9"         ; @ini_background_site
 
 ; these are used for links
-__link__            = "#2b73b7"
-__existing__        = "#080"
-__missing__         = "#d30"
+__link__            = "#2b73b7"         ; @ini_link
+__existing__        = "#080"            ; @ini_existing
+__missing__         = "#d30"            ; @ini_missing
 
 ; site and sidebar widths
-__site_width__      = "75em"
-__sidebar_width__   = "16em"
+__site_width__      = "75em"            ; @ini_site_width
+__sidebar_width__   = "16em"            ; @ini_sidebar_width
 ; cut off points for mobile devices
-__tablet_width__    = "800px"
-__phone_width__     = "480px"
+__tablet_width__    = "800px"           ; @ini_tablet_width
+__phone_width__     = "480px"           ; @ini_phone_width
diff --git a/lib/tpl/dokuwiki/tpl_footer.php b/lib/tpl/dokuwiki/tpl_footer.php
index b7dc9c631..00417de9c 100644
--- a/lib/tpl/dokuwiki/tpl_footer.php
+++ b/lib/tpl/dokuwiki/tpl_footer.php
@@ -29,4 +29,5 @@ if (!defined('DOKU_INC')) die();
     </div>
 </div></div><!-- /footer -->
 
-<?php tpl_includeFile('footer.html') ?>
+<?php
+tpl_includeFile('footer.html');
diff --git a/lib/tpl/dokuwiki/tpl_header.php b/lib/tpl/dokuwiki/tpl_header.php
index 19d165059..a2bfd4346 100644
--- a/lib/tpl/dokuwiki/tpl_header.php
+++ b/lib/tpl/dokuwiki/tpl_header.php
@@ -41,7 +41,7 @@ if (!defined('DOKU_INC')) die();
                 <h3 class="a11y"><?php echo $lang['user_tools']; ?></h3>
                 <ul>
                     <?php
-                        if ($_SERVER['REMOTE_USER']) {
+                        if (!empty($_SERVER['REMOTE_USER'])) {
                             echo '<li class="user">';
                             tpl_userinfo(); /* 'Logged in as ...' */
                             echo '</li>';