diff --git a/Template.php b/Template.php
index f1f71f4..e221821 100644
--- a/Template.php
+++ b/Template.php
@@ -17,6 +17,7 @@ class Template {
     protected $plugins = array(
         'sqlite' => null,
         'tagging' => null,
+        'magicmatcher' => null,
     );
 
     /**
@@ -35,6 +36,36 @@ class Template {
      */
     protected function __construct() {
         $this->initializePlugins();
+
+        /** @var \Doku_Event_Handler */
+        global $EVENT_HANDLER;
+        $EVENT_HANDLER->register_hook('PLUGIN_TPLINC_LOCATIONS_SET', 'BEFORE', $this, 'registerIncludes');
+    }
+
+    /**
+     * Makes include position info available to the tplinc plugin
+     *
+     * @param \Doku_Event $event
+     */
+    public function registerIncludes(\Doku_Event $event) {
+        $event->data['footer'] = 'Footer below the page content';
+    }
+
+    /**
+     * Get the content to include from the tplinc plugin
+     *
+     * prefix and postfix are only added when there actually is any content
+     *
+     * @param string $location
+     * @param string $pre prepend this before the content
+     * @param string $post append this to the content
+     * @return string
+     */
+    public function getInclude($location, $pre = '', $post = '') {
+        if(!$this->plugins['tplinc']) return '';
+        $content = $this->plugins['tplinc']->renderIncludes($location);
+        if($content === '') return '';
+        return $pre . $content . $post;
     }
 
     /**
@@ -44,7 +75,9 @@ class Template {
         $this->plugins['sqlite'] = plugin_load('helper', 'sqlite');
         if($this->plugins['sqlite']) {
             $this->plugins['tagging'] = plugin_load('helper', 'tagging');
+            $this->plugins['magicmatcher'] = plugin_load('syntax', 'magicmatcher_issuelist');
         }
+        $this->plugins['tplinc'] = plugin_load('helper', 'tplinc');
     }
 
     /**
@@ -75,7 +108,14 @@ class Template {
             );
         }
 
-        // fixme add magicmatcher info
+        if ($this->plugins['magicmatcher']) {
+            $tabs[] = array(
+                'id' => 'spr__tab-issues',
+                'label' => tpl_getLang('tab_issues'),
+                'tab' => $this->plugins['magicmatcher']->getIssueListHTML(),
+                'count' =>  $this->plugins['magicmatcher']->getCountIssues(),
+            );
+        }
 
         return $tabs;
     }
diff --git a/css/area_content.less b/css/area_content.less
index 8ddbc7a..1526394 100755
--- a/css/area_content.less
+++ b/css/area_content.less
@@ -21,8 +21,8 @@
                 height: @page-header_height;
                 box-sizing: border-box;
                 width: 100%;
-                background-color: @background_page-header;
-                border-bottom: 1px solid @color-border-light;
+                background-color: @ini_background_page_header;
+                border-bottom: 1px solid @ini_border_light;
             }
 
             #plugin__highlightparent {
@@ -33,28 +33,6 @@
 }
 
 
-
-.structaggregation {
-    td,
-    th {
-        line-height: @line-height-default;
-
-        a {
-
-            line-height: @line-height-default;
-        }
-    }
-
-    > a.export {
-        line-height: 135%;
-        padding-top: .5em;
-    }
-}
-
-.dokuwiki .structaggregation a.export {
-    padding-top: .3em;
-}
-
 .main-content > .level2,
 .main-content > .level1,
 .main-content > .level3,
diff --git a/css/area_footer.less b/css/area_footer.less
index 9dec28a..39b068e 100755
--- a/css/area_footer.less
+++ b/css/area_footer.less
@@ -11,12 +11,20 @@
 @media screen {
     .page-footer {
         min-height: @page-header_height;
-        background-color: @background_page-header;
-        border-top: 1px solid @color-border-light;
+        background-color: @ini_background_page_header;
+        border-top: 1px solid @ini_border_light;
+        border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
+        color: @ini_background_page_footer;
         font-size: @font-size-default;
         text-align: right;
         padding: @margin-small @margin-default;
 
+        *,
+        a:link,
+        a:visited {
+            color: inherit;
+        }
+
         bdi {
             font-weight: bold;
         }
@@ -27,13 +35,18 @@
             position: relative;
             z-index: 2;
             box-sizing: border-box;
-            background-color: @color-site-bg;
+            background-color: @ini_background;
         }
 
         p {
+            color: @ini_text_webframe;
             font-size: @font-size-default;
             margin: 0;
         }
+
+        a {
+            color: @ini_nav_menu_color;
+        }
     }
 }
 
@@ -56,7 +69,7 @@
     .showSidebar {
         #dokuwiki__footer {
             .col-xs-12 {
-                width: 73%;
+                width: @ini_site_width;
             }
         }
     }
@@ -84,3 +97,38 @@
         }
     }
 }
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 768px */
+
+@media @screen_max-xs {
+    .page-footer {
+        padding-left: @margin-small;
+        padding-right: @margin-small;
+    }
+
+    #dokuwiki__footer {
+        .main-footer {
+            > * {
+                padding-left: 0;
+                padding-right: 0;
+            }
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 480px */
+
+@media @screen_max-xxs {
+    #dokuwiki__footer {
+        .main-footer {
+            > * {
+                padding-left: @margin-small;
+                padding-right: @margin-small;
+            }
+        }
+    }
+}
diff --git a/css/area_forms.less b/css/area_forms.less
index fd2b0c9..6469546 100644
--- a/css/area_forms.less
+++ b/css/area_forms.less
@@ -12,6 +12,7 @@ form {
     margin: 0;
     padding: 0;
 
+
     // multiline label
     fieldset > label.block > span:first-child {
         display: inline-block;
@@ -25,6 +26,7 @@ form {
         }
     }
 
+
     // older version (history)
     .dokuwiki & > .no > ul > li {
         min-height: 2rem;
@@ -121,7 +123,7 @@ textarea,
 select,
 keygen {
     min-height: @formfield_min-height;
-    border: 1px solid @color-border;
+    border: 1px solid @ini_border;
     box-shadow: inset 0 0 1px #eee;
     border-radius: @fix_border-radius;
     padding-left: .3rem;
@@ -139,14 +141,19 @@ keygen:focus {
     border-color: #999;
 }
 
-input[type=radio],
-input[type=checkbox],
-input[type=image] {
+input[type="radio"],
+input[type="checkbox"],
+input[type="image"] {
     padding: 0;
     border-style: none;
     box-shadow: none;
 }
 
+input[type="file"] {
+    padding-top: .1rem;
+    padding-bottom: .1rem;
+}
+
 
 /* + + + + +  buttons  + + + + + */
 button {
@@ -181,10 +188,10 @@ button[type=submit],
     cursor: pointer;
     box-shadow: none;
     background-image: none;
-    background-color: @button_background;
-    border: 1px solid @button_background;
+    background-color: @ini_button_background;
+    border: 1px solid @ini_button_background;
     border-radius: @fix_border-radius;
-    color: @button_color;
+    color: @ini_button_color;
     vertical-align: top;
     padding: .3em @grid;
     transition: @transition background-color, @transition color;
@@ -192,8 +199,8 @@ button[type=submit],
     &:hover,
     &:active,
     &:focus {
-        background-color: @button_color;
-        color: @button_background;
+        background-color: @ini_button_color;
+        color: @ini_button_background;
     }
 }
 
@@ -216,9 +223,9 @@ button[type=submit] {
         &:focus {
             box-shadow: none;
             background-image: none;
-            background-color: @button_background;
-            color: @button_color;
-            border-color: @button_background;
+            background-color: @ini_button_background;
+            color: @ini_button_color;
+            border-color: @ini_button_background;
         }
     }
 
@@ -268,7 +275,7 @@ textarea[readonly] {
     background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background-color: #eee;
     opacity: .5;
-    border: 1px solid @color-border;
+    border: 1px solid @ini_border;
     border-radius: @fix_border-radius;
     color: #333;
     font-weight: normal;
diff --git a/css/area_header.less b/css/area_header.less
index 5717abb..e02bf1a 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -6,7 +6,7 @@
 
 
 #dokuwiki__header {
-    @header-font-opacity: .7;
+    @header-font-opacity: 1;
 
 /* + + +  wiki logo  + + + */
     @media @screen_min-md {
@@ -83,8 +83,9 @@
 
 /* + + +  wiki title  + + + */
     p.title {
-        background-color: @color-site-bg;;
+        background-color: @ini_background;
         opacity: @header-font-opacity;
+        color: @ini_text_webframe;
         line-height: @line-height-default;
         margin-bottom: .5rem;
 
@@ -103,8 +104,9 @@
 /* + + +  wiki claim  + + + */
     p.claim {
         opacity: @header-font-opacity;
-        margin-bottom: 0;
+        color: @ini_text_webframe;
         font-size: @font-size-default;
+        margin-bottom: 0;
 
         @media @screen_max-md {
             padding-top: .5rem;
@@ -114,7 +116,7 @@
 
 /* + + +  mobile nav togglelink  + + + */
     .menu-togglelink {
-        margin: @very-small-spacing -(@very-small-spacing) 0 0;
+        margin: .45rem -(@very-small-spacing) 0 0;
 
         a {
             .fontello();
@@ -125,8 +127,9 @@
             min-width: @toggle-size;
             box-sizing: border-box;
             background-color: #fff;
-            border: 1px solid @color-border;
-            border-radius: @border-radius;
+            border: 1px solid @ini_border;
+            border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+            color: @ini_nav_menu_color;
             font-size: 1rem;
             text-align: center;
             text-decoration: none;
@@ -137,13 +140,14 @@
                 font-size: 1.5rem;
                 margin: .1rem 0 0;
             }
-        }
 
-        &:hover,
-        &:active,
-        &:focus {
-            background-color: @button_color;
-            border-color: @button_background;
+            &:hover,
+            &:active,
+            &:focus {
+                background-color: @ini_nav_menu_hover_bg;
+                border-color: @ini_nav_menu_hover_color;
+                color: @ini_nav_menu_hover_color;
+            }
         }
     }
 }
diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less
index c5a8ed2..cd5582d 100644
--- a/css/area_main-content-secedit.less
+++ b/css/area_main-content-secedit.less
@@ -1,25 +1,19 @@
 /**
  * This styles the section editing buttons and highlighting
  */
-#dokuwiki__content.main-content {
-    @button-margin: .5rem; // FIXME shouldn't we have something in our base.less for this?
 
+
+#dokuwiki__content.main-content {
     div.section_highlight {
-        clear: right; // FIXME why?
+        clear: right;
         background: repeating-linear-gradient(
             -45deg,
-            transparent,
-            transparent 10px,
-            @ini_background_alt 10px,
-            @ini_background_alt 20px,
+            @highlight-odd-ini_text,
+            @highlight-odd-ini_text 10px,
+            @highlight-even-ini_text 10px,
+            @highlight-even-ini_text 20px,
         );
-    }
-
-    .secedit button {
-        clear: both;
-        font-size: 100%;
-        margin-top: -1em;
-        margin-bottom: @button-margin;
+        border-color: @ini_background_page_header;
     }
 
     .editbutton_section {
@@ -29,6 +23,12 @@
         float: right;
         margin-top: 0;
 
+        form div.no {
+            button {
+                padding-right: 0;
+            }
+        }
+
         button {
             background-color: transparent;
             color: transparent;
@@ -36,20 +36,30 @@
 
             &::after {
                 content: '';
+                float: right;
                 display: inline-block;
-                background: transparent url("svg.php?svg=pencil.svg&f=link") center center no-repeat;
+                background: transparent url("svg.php?svg=pencil.svg&f=existing") center center no-repeat;
                 height: 1em;
                 width: 1em;
                 background-size: contain;
-                margin-left: @button-margin;
+                border: solid 2px transparent;
+                border-radius: @ini_default_border_radius;
+                margin-left: @small-spacing;
+                margin-top: -1px;
             }
 
             &:hover,
             &:active,
             &:focus {
-                background-color: @button_color;
-                color: @button_background;
-                border-color: @button_background;
+                //background-color: @ini_existing;
+                color: @ini_existing;
+                //border-color: @ini_existing;
+
+                &::after {
+                    background-color: @ini_existing;
+                    background-image: url("svg.php?svg=pencil.svg&f=background_content");
+                    border-color: @ini_existing;
+                }
             }
         }
     }
diff --git a/css/area_main-content.less b/css/area_main-content.less
index 6db9048..d5db8a5 100755
--- a/css/area_main-content.less
+++ b/css/area_main-content.less
@@ -4,39 +4,52 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
-#dokuwiki__content.main-content {
 
+#dokuwiki__content.main-content {
     .level2 {
         p a.media {
             img {
-                border: 1px dotted @color-site-bg;
+                border: 1px dotted @ini_background;
 
             }
-            &:hover, &:focus, &:active {
+            &:hover,
+            &:focus,
+            &:active {
                 img {
-                    border: 1px solid @color-link;
+                    border: 1px solid @ini_existing;
                 }
             }
+        }
+    }
 
+    > div,
+    .section_highlight > div {
+        > ul,
+        > ol {
+            &:not([class="tabs"]) > li {
+                margin-bottom: @small-spacing;
+            }
         }
     }
 
     .wikipagefooter {
         > hr {
             margin-top: 3em;
-            margin-bottom: 0.5em;
-            border-top: dashed @color-border-light 2px;
+            margin-bottom: .5em;
+            border-top: dashed @ini_border_light 2px;
             border-bottom: none;
         }
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* min-width: 1440px */
 
 @media @screen_min-xlg {
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1199px */
 
diff --git a/css/area_main-sidebar-content.less b/css/area_main-sidebar-content.less
index 862c0fc..fb02fbe 100644
--- a/css/area_main-sidebar-content.less
+++ b/css/area_main-sidebar-content.less
@@ -1,14 +1,18 @@
 /**
  * This file provides the design styles the non-navigational elements in the sidebar
  */
+
+
 #dokuwiki__aside {
 
     // do not indent the first level of lists
     // and use less indention in deeper levels
-    ul, ol {
+    ul,
+    ol {
         padding-left: 0;
 
-        ul, ol {
+        ul,
+        ol {
             padding-left: @margin-small;
 
             li {
@@ -17,3 +21,41 @@
         }
     }
 }
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* max-width: 1023px */
+
+@media @screen_max-md {
+    #dokuwiki__aside {
+        display: none;
+    }
+
+    body.show-mobile-sidebar {
+        #dokuwiki__aside {
+            display: block !important;
+            position: absolute;
+            left: 1.25rem; //left margin of content container
+            z-index: 200; // above all
+            box-shadow: @box-shadow-right-bottom;
+            min-width: 45%;
+            max-width: 90%;
+            height: auto;
+
+            &:after {
+                content: "";
+                position: absolute;
+                top: 0;
+                left: 0;
+                bottom: 0;
+                right: 0;
+                width: 100%;
+                height: 100%;
+                background: @ini_background;
+                background: -webkit-linear-gradient(left, @ini_background, @ini_background_content);
+                background: linear-gradient(left, @ini_background, @ini_background_content);
+                z-index: 0;
+            }
+        }
+    }
+}
diff --git a/css/area_main-sidebar-nav.less b/css/area_main-sidebar-nav.less
index 95c8608..681dd4d 100755
--- a/css/area_main-sidebar-nav.less
+++ b/css/area_main-sidebar-nav.less
@@ -5,26 +5,91 @@
  * @author Andreas Gohr <gohr@cosmocode.de>
  */
 
+
 #dokuwiki__aside {
     @icon-size: @font-size-big;
     @menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
 
+    nav > p,
+    .mmissuelist li,
+    .mmissuelist div {
+        color: @ini_nav_menu_color;
+
+        &.noissue {
+            color: @ini_text_webframe;
+
+            * {
+                color: inherit;
+            }
+        }
+    }
+
+    nav {
+        li {
+            color: @ini_nav_menu_color;
+
+            > div {
+                color: @ini_text_webframe;
+            }
+        }
+    }
+
+
+    /* jira itemlist */
+    .mmissuelist {
+        li {
+            &.noissue {
+                list-style-type: none;
+                margin-left: 0;
+            }
+
+            a {
+                display: inline-block;
+            }
+        }
+
+        img {
+            vertical-align: bottom;
+            margin-right: .3rem;
+        }
+
+        .mm__status {
+            padding-left: .3rem;
+            padding-right: .3rem;
+        }
+
+        form {
+            vertical-align: text-top;
+        }
+    }
+
     > * {
         margin-left: @menu-margin; // moves *all* sidebar content to the right
     }
 
+    a {
+        &:link,
+        &:visited {
+            opacity: .9;
+            color: @ini_nav_menu_color;
+        }
+
+        * {
+            color: inherit;
+        }
+    }
+
     // the toggle element
     a.nav {
+        .display-flex();
+        .align-items();
+
         cursor: pointer;
-        display: flex;
-        display: -ms-flexbox;
-        flex-direction: row;
-        -ms-flex-direction: row;
-        align-items: center;
         height: @icon-size + @margin-small;
+        opacity: 1;
         border: 1px solid transparent;
         border-radius: @fix_border-radius;
-        color: @color-nav;
+        color: @ini_nav_menu_color;
         font-size: @font-size-head6;
         font-weight: normal;
         margin: -1px 0 (@font-size-head6 / 2) (@menu-margin * -1); // moves the toggles back to the left
@@ -44,7 +109,7 @@
             width: @menu-margin;
             height: @icon-size;
             flex-grow: 0;
-            border-right: 1px solid @color-border;
+            border-right: 1px solid @ini_nav_menu_color;
             text-align: center;
             margin-right: @margin-small;
             color: inherit;
@@ -60,9 +125,10 @@
                 vertical-align: baseline;
                 text-align: center;
                 color: inherit;
-                border: 2px solid @color-nav;
+                border: 2px solid @ini_nav_menu_color;
                 border-top-right-radius: 50%;
                 border-bottom-left-radius: 50%;
+                transition: @transition border-color;
             }
 
             // real icon
@@ -71,7 +137,7 @@
                 height: @icon-size;
 
                 path {
-                    fill: @color-nav;
+                    fill: @ini_nav_menu_color;
                     transition: @transition all;
                 }
             }
@@ -80,19 +146,21 @@
         &:hover,
         &:focus,
         &:active {
-            background-color: @color-nav-hover-bg;
-            border-color: @color-nav-hover;
-            color: @color-nav-hover;
+            background-color: @ini_nav_menu_hover_bg;
+            border-color: @ini_nav_menu_hover_color;
+            color: @ini_nav_menu_hover_color;
             text-decoration: none;
 
             span.ico {
+                border-color: inherit;
+
                 strong {
-                    border-color: @color-nav-hover-bg;
+                    border-color: inherit;
                 }
 
                 svg {
                     path {
-                        fill: @color-nav-hover;
+                        fill: @ini_nav_menu_hover_color;
                     }
                 }
             }
@@ -106,12 +174,16 @@
 
         ul {
             margin-bottom: 1rem;
+
+            ul {
+                margin-bottom: 0;
+            }
         }
     }
 }
 
 
-/* + + + + + +  wide page content  + + + + +
+/* + + + + + +  wide page content  border-bottom between a.nav (short width)  + + + + +
 .wide-content {
     #dokuwiki__aside {
         a.nav {
@@ -124,7 +196,7 @@
                 left: 0;
                 width: 100%;
                 height: 1px;
-                border-bottom: solid 1px @color-border;
+                border-bottom: solid 1px @ini_border;
             }
 
             &:hover,
@@ -139,15 +211,35 @@
 } */
 
 
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* min-width: 1440px */
+
+@media @screen_min-xlg {
+    #dokuwiki__aside {
+        nav {
+            li:not([class]),
+            .li {
+                font-size: @font-size-head6;
+                padding: .15em 0;
+
+                * {
+                    font-size: inherit;
+                    font-weight: inherit;
+                }
+
+                a {
+                    font-size: (@font-size-head6 - .05);
+                }
+            }
+        }
+    }
+}
+
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1023px */
 
 @media @screen_max-md {
-    // hide on medium and smaller screens
-    #dokuwiki__aside {
-        display: none;
-    }
-
     // show when toggled
     body.show-mobile-sidebar {
         .search.main-sidebar {
@@ -164,30 +256,6 @@
         }
 
         #dokuwiki__aside {
-            display: block !important;
-            position: absolute;
-            left: 1.25rem; //left margin of content container
-            z-index: 200; // above all
-            box-shadow: @box-shadow-right-bottom;
-            min-width: 45%;
-            max-width: 90%;
-            height: auto;
-
-            &:after {
-                content: "";
-                position: absolute;
-                top: 0;
-                left: 0;
-                bottom: 0;
-                right: 0;
-                width: 100%;
-                height: 100%;
-                background: @ini_background;
-                background: -webkit-linear-gradient(left, @ini_background, @color-content-bg);
-                background: linear-gradient(left, @ini_background, @color-content-bg);
-                z-index: 0;
-            }
-
             > nav {
                 position: relative;
                 z-index: 2;
@@ -212,27 +280,6 @@
 }
 
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* min-width: 1440px */
-
-@media @screen_min-xlg {
-    #dokuwiki__aside {
-        nav {
-            li:not([class]),
-            .li {
-                font-size: @font-size-default;
-                padding: .1em 0;
-
-                * {
-                    font-size: inherit;
-                    font-weight: inherit;
-                }
-            }
-        }
-    }
-}
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1439px */
 
diff --git a/css/area_msg.less b/css/area_msg.less
index e248b7f..1e2ad9e 100644
--- a/css/area_msg.less
+++ b/css/area_msg.less
@@ -1,10 +1,12 @@
-.msg-area{
+.msg-area {
     clear: both;
     padding-top: 1.6rem;
-    div{
+
+    div {
         line-height: 135%;
     }
-    &:empty{
+
+    &:empty {
         display: none;
     }
 }
@@ -20,4 +22,18 @@ div.success, div.error, div.info, div.notify {
     padding-left: 32px;
     overflow: hidden;
     border-radius: 5px;
+
+    * {
+        color: inherit;
+    }
+
+    a {
+        text-decoration: underline;
+
+        &:hover,
+        &:focus,
+        &:active {
+            text-decoration: none;
+        }
+    }
 }
diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less
index a20ffe7..16ef4ad 100755
--- a/css/area_nav-breadcrumb.less
+++ b/css/area_nav-breadcrumb.less
@@ -1,18 +1,29 @@
 /**
- * This file provides the design styles for the direct / menu jump links.
+ * This file provides the design styles for the breadcrumb
  *
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 .breadcrumbs {
     position: relative;
-    border-bottom: 1px solid @color-border-light;
-    padding: 1rem 1.8rem .2rem;
     min-height: @page-header_height;
     box-sizing: border-box;
+    background-color: @ini_background_content;
+    border-bottom: 1px solid @ini_border_light;
+    padding: 1rem 1.8rem .2rem;
 
     @media @screen_max-md {
-        background-color: @background_page-header;
+        background-color: @ini_background_page_header;
+    }
+
+    @media @screen_max-xs {
+        padding-left: @margin-small;
+        padding-right: .75rem;
+    }
+
+    @media @screen_xs-lg {
+        background-color: @ini_background_content;
     }
 
     > p {
@@ -51,7 +62,7 @@
                 width: auto;
                 box-sizing: border-box;
                 border: solid 1px transparent;
-                border-radius: @border-radius;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 vertical-align: middle;
                 text-decoration: none;
                 margin-top: -.2em;
@@ -65,7 +76,7 @@
                 &:hover,
                 &:focus,
                 &:active {
-                    border-color: @color-link;
+                    border-color: @ini_existing;
                 }
             }
         }
@@ -100,9 +111,8 @@
                 display: block;
                 width: auto;
                 min-height: @toggle-size;
-                border: 1px solid @color-border;
-                border-radius: @border-radius;
-                color: @color-nav;
+                border: 1px solid @wikiicons-border;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 text-align: center;
                 margin: 0;
             }
@@ -115,113 +125,14 @@
                 font-size: 1.2rem;
                 line-height: 1;
             }
-
-/* check !!! */
-            &.do_none {
-                position: relative;
-
-                strong {
-                    background-color: @color-site-bg;
-                }
-
-                .num {
-                    background-color: @noopentasks-background; // fix
-                    color: @noopentasks-color; // fix
-                }
-            }
-/* end check !!! */
-
-            &.plugin__qc {
-                display: inline-block;
-                overflow: visible;
-                position: static;
-            }
         } // li
 
         a {
-            transition: @transition color, @transition background-color, @transition border-color;
+            .btn-hover();
 
             &[aria-expanded="false"] + #plugin__qc__wrapper {
                 display: none;
             }
-
-            &:hover,
-            &:active,
-            &:focus {
-                background-color: @color-nav-hover-bg;
-                border-color: @color-nav-hover;
-                color: @color-nav-hover;
-
-                .prefix {
-                    color: inherit;
-                }
-            }
-        }
-
-        #plugin__qc__wrapper {
-            position: absolute;
-            right: 0;
-            width: auto;
-            border: 0 none;
-            background: @background_page-header;
-            background: -webkit-linear-gradient(top, @background_page-header, @color-content-bg);
-            background: linear-gradient(top, @background_page-header, @color-content-bg);
-            box-shadow: @box-shadow-bottom;
-            z-index: 2000;
-
-            #plugin__qc__out{
-                h1 {
-                    font-size: @font-size-head3;
-                }
-
-                h2 {
-                    margin-top: 1.6em;
-                    font-size: @font-size-head5;
-                }
-                > h1,
-                > h2,
-                > p,
-                > dl,
-                > div {
-                    padding-left: 1rem;
-                    margin-left: 0;
-                }
-
-                > div p {
-                    padding-left: 0;
-                    margin-left: 0;
-                }
-            }
-
-            &[aria-hidden="false"] {
-                margin-top: .5rem;
-            }
-        }
-
-        #plugin__qc__icon {
-            display: none;
-        }
-
-        #plugin__qc__link {
-            position: relative;
-
-            .prefix {
-                .icon-emo-happy();
-
-                width: 100%;
-                font-size: @font-size-default;
-
-                &::before {
-                    width: 100%;
-                    margin: 0;
-                }
-            }
         }
     }
 }
-
-
-/* + + + + +  ?  + + + + + */
-.mode_admin {
-
-}
diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less
index 21328ad..5defc3b 100755
--- a/css/area_nav-direct.less
+++ b/css/area_nav-direct.less
@@ -4,8 +4,9 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 .nav-direct {
-    background-color: __nav_direct_background__;
+    background-color: @nav_direct_background;
     margin-top: -1px;
 
     p {
@@ -21,12 +22,12 @@
         a:visited {
             .sr-out();
 
-            box-shadow: __box_shadow__;
+            box-shadow: @box-shadow;
             display: block;
             width: 100%;
-            background-color: __nav_direct_background__;
-            border-bottom: 1px solid __shadow_color__;
-            color: __nav_direct_color__;
+            background-color: @nav_direct_background;
+            border-bottom: 1px solid @ini_border_light;
+            color: @nav_direct_color;
             line-height: @line-height-default;
             text-decoration: none;
             padding: 1em;
diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less
index f099780..165d831 100755
--- a/css/area_nav-metabox.less
+++ b/css/area_nav-metabox.less
@@ -1,22 +1,39 @@
+/**
+ * This file provides the design styles for the metatabbox
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
 #spr__meta-box {
+    .display-flex();
+    .flex-direction();
+    .justify-content(flex-end);
+
     position: relative;
     z-index: 10;
     float: right;
-    display: inline-block;
     max-width: 40%;
-    min-height: @page-header_height;
-    border: 1px solid transparent;
-    margin-top: (@page_padding-top * -1); // reverse padding-top of .page container
+    margin-top: -(@page_padding-top); // reverse padding-top of .page container
     margin-right: -1px;
-    padding-top: 1rem;
 
+    // >= 1024
+    @media @screen_min-md {
+        height: @page-header_height;
+        border: 1px solid transparent;
+    }
+
+    // < 1024
     @media @screen_max-md {
         position: relative;
-        top: -1.1rem;
+        top: .2rem;
         right: auto;
         float: none;
         display: block;
         max-width: 100%;
+        min-height: @page-header_height;
+        height: auto;
+        border: 0 none;
     }
 
     .tab-container {
@@ -34,16 +51,17 @@
         overflow-y: visible;
     }
 
+
+/* + + + + +  tab controlls  + + + + + */
     ul.meta-tabs {
         list-style: none;
         line-height: 160%;
-        text-align: right; // right-aligned
-        white-space: nowrap;
         margin: 0;
         padding: 0;
 
-        @media @screen_max-md {
-            margin-top: 3px;
+        @media @screen_min-md {
+            white-space: nowrap;
+            text-align: right;
         }
 
         &::before,
@@ -66,41 +84,40 @@
             vertical-align: bottom;
             margin: 0;
 
+            @media @screen_min-md {
+                margin-left: .3rem;
+            }
+
             @media @screen_max-md {
-                margin-left: .2rem;
+                margin-right: .4rem;
+                margin-bottom: .2rem;
             }
 
             > a {
                 cursor: pointer;
                 position: relative;
                 display: block;
-                background-color: @color-site-bg;
-                border: 1px solid @color-border-light;
-                //border-bottom-color: @color-site-bg;
-                border-radius: @fix_border-radius @fix_border-radius 0 0;
-                color: @color-link;
                 font-size: @font-size-small;
                 line-height: 1.42857143;
-                padding: .3em 1rem .1em;
-                margin-left: 4px;
-                transition: @transition color, @transition background-color, @transition border-color;
+                transition: @transition background-color, @transition border-color, @transition color;
 
-                @media @screen_max-xxlg {
-                    padding-top: .35em;
-                }
-
-                @media @screen_max-xlg {
-                    padding-top: .3em;
+                @media @screen_min-md {
+                    background-color: @ini_background;
+                    border: 1px solid @noopentasks-border;
+                    border-bottom-color: @ini_background;
+                    border-radius: @ini_default_border_radius @ini_default_border_radius 0 0; // @ini_default_border_radius vs. @fix_border-radius
+                    color: @ini_nav_menu_color;
+                    margin-left: 4px;
+                    padding: .3em 1rem .1em;
                 }
 
                 @media @screen_max-md {
-                    top: -1px;
-                    padding: .2em .3rem .1em;
+                    top: 0;
+                    border: 1px solid @ini_existing;
+                    color: @ini_existing;
+                    margin-top: .2rem;
                     margin-left: 0;
-                }
-
-                @media @screen_max-xs {
-                    min-height: 30px;
+                    padding: .2em .3rem;
                 }
 
                 * {
@@ -112,15 +129,24 @@
                     position: relative;
                     color: inherit;
                     font-size: @font-size-small;
-                    transition: @transition color;
                 }
 
                 &:hover,
                 &:focus,
                 &:active {
-                    background-color: @color-content-bg;
-                    border-color: @color-link;
                     text-decoration: none;
+
+                    @media @screen_min-md {
+                        background-color: @ini_background_content;
+                        border-color: @ini_existing;
+                        color: @ini_existing;
+                    }
+
+                    @media @screen_max-md {
+                        background-color: @ini_existing;
+                        border-color: @ini_background_content;
+                        color: @ini_background_content;
+                    }
                 }
             }
 
@@ -129,27 +155,30 @@
 
                 > a {
                     cursor: default;
-                    background-color: @color-content-bg;
-                    border-color: @color-link;
-                    border-bottom-color: @color-content-bg;
-                    color: @color-link;
+                    background-color: @ini_background_content;
+                    border-color: @ini_existing;
+                    border-bottom-color: @ini_background_content;
+                    color: @ini_existing;
+
+                    @media @screen_max-md {
+                        background-color: @ini_existing;
+                        border-bottom-color: @ini_existing;
+                        border-radius: 0;
+                        color: @ini_background_content;
+                    }
                 }
             }
         }
     }
 
-    .meta-content {
-        @media @screen_min-xlg {
-            margin-top: -1px;
-        }
 
-        @media @screen_max-xlg {
-            margin-top: -1px;
-        }
+/* + + + + +  toggle content  + + + + + */
+    .meta-content {
+        margin-top: -1px;
 
         @media @screen_max-md {
             clear: both;
-            margin-top: -2px;
+            margin-top: 2px;
         }
 
         .tab-pane {
@@ -158,19 +187,26 @@
             right: 0;
             display: none;
             width: 100%;
-            background-color: @color-content-bg;
-            border: 1px solid @color-link;
-            border-radius: 0 0 @fix_border-radius @fix_border-radius;
+            background-color: @ini_background_content;
+            border: 1px solid @ini_existing;
 
             @media @screen_min-xs {
                 min-width: 20em;
             }
 
+            @media @screen_min-md {
+                border-radius: 0 0 @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
+            }
+
             &.active {
                 display: block;
                 overflow: hidden;
             }
 
+            a {
+                color: @ini_existing;
+            }
+
             > div {
                 font-size: @font-size-small;
                 padding: .8rem .5rem .5rem;
@@ -236,15 +272,15 @@
                         padding: .15em 0;
 
                         &::before {
+                            content: '';
                             position: absolute;
                             top: .6em;
-                            content: "";
+                            left: 0;
                             display: inline-block;
                             width: 4px;
                             height: 4px;
-                            background-color: #ccc;
                             overflow: hidden;
-                            left: 0;
+                            background-color: @ini_existing;
                         }
                     }
                 }
diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less
index 902d10c..d3f982e 100755
--- a/css/area_nav-pagetools.less
+++ b/css/area_nav-pagetools.less
@@ -21,7 +21,7 @@
 .pagetools-item(img_backto, 12);
 */
 
-#dokuwiki__aside{
+#dokuwiki__aside {
     @media @screen_max-md {
         display: none !important;
     }
@@ -57,11 +57,17 @@ nav#dokuwiki__pagetools {
                 height: auto;
                 min-height: @toolbox-size; // for nav:hover
                 width: @toolbox-size; // for nav:hover
-                opacity: .6;
-                color: @color-nav;
                 font-size: @font-size-default;
                 padding: 2px @toolbox-size 2px 2px;
 
+                @media @screen_min-md {
+                    color: @ini_nav_menu_color;
+                }
+
+                @media @screen_max-md {
+                    color: @ini_existing;
+                }
+
                 * {
                     color: inherit;
                 }
@@ -73,9 +79,7 @@ nav#dokuwiki__pagetools {
                 &:hover,
                 &:focus,
                 &:active {
-                    opacity: 1;
-                    color: @color-nav-hover;
-                    background-color: #FFF;
+                    background-color: transparent;
                 }
 
                 span {
@@ -90,8 +94,16 @@ nav#dokuwiki__pagetools {
                     width: @page-tools_svg-size;
                     height: @page-tools_svg-size;
                     vertical-align: middle;
-                    fill: @color-nav;
+                    border: solid 1px transparent;
                     margin: @page-tools_svg-space;
+
+                    @media @screen_min-md {
+                        fill: @ini_nav_menu_color;
+                    }
+
+                    @media @screen_max-md {
+                        fill: @ini_existing;
+                    }
                 }
 
                 &.top {
@@ -101,20 +113,13 @@ nav#dokuwiki__pagetools {
 
             &.plugin_move_page {
                 a {
-                    opacity: .6;
-                    color: @color-nav;
+                    .btn-hover();
+
+                    color: @ini_nav_menu_color;
 
                     * {
                         color: inherit;
                     }
-
-                    &:hover,
-                    &:focus,
-                    &:active {
-                        color: @color-nav-hover;
-                        background-color: #fff;
-                        opacity: 1;
-                    }
                 }
             }
         }
@@ -122,24 +127,34 @@ nav#dokuwiki__pagetools {
 
     &:hover {
         ul {
-            background-color: #fff;
-            box-shadow: @box-shadow-offset;
+            box-shadow: @box-shadow; // @box-shadow-offset;
+            background-color: @ini_background_content;
+            border-color: @wikiicons-border;
 
             li {
+                color: @ini_existing;
+
                 a {
                     box-shadow: none;
                     background-image: none;
-                    opacity: .8;
                     border-color: transparent;
+                    color: inherit;
                     padding: 2px 0 2px 2px;
 
+                    svg {
+                        border: solid 1px transparent;
+                        border-radius: @ini_default_border_radius;
+                        fill: @ini_existing;
+                        transition: @transition background-color, @transition border-color, @transition fill;
+                    }
+
                     &:hover,
                     &:focus,
                     &:active {
-                        opacity: 1;
-
                         svg {
-                            fill: @color-nav-hover;
+                            background-color: @ini_existing;
+                            border-color: @ini_existing;
+                            fill: @ini_background_content;
                         }
                     }
 
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index 6f110be..87959cd 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -31,12 +31,15 @@
                 width: auto;
                 min-height: @toggle-size;
                 overflow: hidden;
-                border: 1px solid @color-border;
-                border-radius: @border-radius;
-                color: @color-nav;
+                border: 1px solid @wikiicons-border;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 text-align: center;
                 margin: 0;
 
+                @media @screen_only-lg {
+                    padding-top: .14rem;
+                }
+
                 @media @screen_max-xxlg {
                     min-height: 28px;
                 }
@@ -47,27 +50,34 @@
             }
 
             &.user {
+                @space-min-xxlg: .35rem;
+                @space-max-xxlg: .4rem;
+                @space-max-xlg: .5rem;
+                @space-max-md: .35rem;
+
                 position: relative;
                 display: table-cell;
-                border: solid 1px @color-border;
-                border-radius: @border-radius;
+                background-color: @ini_background;
+                border: solid 1px @noopentasks-border;//@ini_border_light;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+                color: @ini_text_webframe;
                 padding-right: .3rem;
 
                 @media @screen_min-xxlg {
-                    padding-top: .35rem;
+                    padding-top: @space-min-xxlg;
                 }
 
                 @media @screen_max-xxlg {
-                    padding-top: .4rem;
+                    padding-top: @space-max-xxlg;
                 }
 
                 @media @screen_max-xlg {
-                    padding-top: .5rem;
+                    padding-top: @space-max-xlg;
                 }
 
                 @media @screen_max-md {
                     min-height: @toggle-size;
-                    padding-top: .35rem;
+                    padding-top: @space-max-md;
                 }
 
                 > a {
@@ -77,29 +87,29 @@
                     position: relative;
                     min-height: 26px;
                     overflow: visible;
-                    background: #FFF; // for removing bg-image
+                    background: @ini_nav_menu_hover_bg; // for removing bg-image
                     border: 0 none;
+                    color: @ini_nav_menu_hover_color;
                     text-indent: 0;
-                    color: @color-nav;
                     font-size: inherit;
                     margin-right: -.3rem;
                     padding: 0 .2em 0 0;
 
                     @media @screen_min-xxlg {
-                        margin-top: -.3rem;
+                        margin-top: -(@space-min-xxlg);
                     }
 
                     @media @screen_max-xxlg {
-                        margin-top: -.3rem;
+                        margin-top: -(@space-max-xxlg);
                     }
 
                     @media @screen_max-xlg {
-                        margin-top: -.5rem;
+                        margin-top: -(@space-max-xlg);
                     }
 
                     @media @screen_max-md {
                         min-height: (@toggle-size - .1);
-                        margin-top: -.35rem;
+                        margin-top: -(@space-max-md);
                     }
 
                     &::before {
@@ -110,18 +120,19 @@
                         right: -1px;
                         width: auto;
                         opacity: 0;
-                        border: solid 1px @color-nav-hover;
-                        border-radius: @border-radius;
+                        border: solid 1px @ini_nav_menu_hover_color;
+                        border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+                        color: inherit;
                         transform: none;
-                        transition: @transition opacity;
+                        //transition: @transition opacity;
                     }
 
                     &:hover,
                     &:focus,
                     &:active {
-                        background-color: @color-nav-hover-bg;
-                        border-color: @color-nav-hover;
-                        color: @color-nav-hover;
+                        background-color: @ini_nav_menu_hover_color;
+                        border-color: @ini_nav_menu_hover_color;
+                        color: @ini_nav_menu_hover_bg;
 
                         &::before {
                             opacity: 1;
@@ -129,18 +140,18 @@
 
                         bdi,
                         bdi:first-of-type {
-                            color: @color-nav-hover;
+                            color: @ini_nav_menu_hover_bg;
 
-                            &::before {
-                                color: inherit;
-                            }
+                            //&::before {
+                            //    color: inherit;
+                            //}
                         }
                     }
                 }
 
                 bdi {
-                    color: inherit;
                     display: inline-block;
+                    color: inherit;
                     transition: @transition color;
                 }
 
@@ -156,7 +167,6 @@
                         position: absolute;
                         left: -2px;
                         font-size: 1.4rem;
-                        color: @color-nav;
                         margin: 0;
                         transition: @transition color;
 
@@ -185,10 +195,6 @@
                     white-space: normal;
                     text-indent: 0;
 
-                    @media @screen_only-lg {
-                        padding-top: .14rem;
-                    }
-
                     &::before {
                         content: '';
                         position: absolute;
@@ -208,12 +214,15 @@
 
             &.noopentasks {
                 strong {
-                    background-color: @color-site-bg;
+                    background-color: @ini_background;
+                    border-color: @noopentasks-border;
+                    color: @ini_text_webframe;
                 }
 
                 .num {
-                    background-color: @noopentasks-background; // fix
+                    background-color: @noopentasks-border; // fix
                     color: @noopentasks-color; // fix
+                    margin-top: 1px;
                 }
             }
         } // li
@@ -223,36 +232,27 @@
         a {
             .fontello();
             .hide-text-show-before();
+            .btn-hover();
 
             cursor: pointer;
             position: relative;
-            background-color: #fff;
             line-height: 1;
             text-decoration: none;
-            transition: @transition color, @transition background-color, @transition border-color;
 
             @media @screen_only-lg {
                 min-width: 2rem;
             }
 
-            &::before {//background-color: deeppink !important;
+            &::before {
                 .center-middle();
 
                 content: "?";
+                cursor: pointer;
                 display: block;
                 width: 100%;
                 box-sizing: border-box;
                 font-size: @font-size-default + (@font-scale-factor * 4);
                 line-height: 1;
-                cursor: pointer;
-            }
-
-            &:hover,
-            &:active,
-            &:focus {
-                background-color: @color-nav-hover-bg;
-                border-color: @color-nav-hover;
-                color: @color-nav-hover;
             }
 
             /* icon register new user */
diff --git a/css/area_search.less b/css/area_search.less
new file mode 100644
index 0000000..9fddb00
--- /dev/null
+++ b/css/area_search.less
@@ -0,0 +1,12 @@
+/**
+ * This file provides the design styles for the search results
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
+/* search hit in normal text */
+.dokuwiki .search_hit {
+    background-color: @ini_highlight;
+    color: @ini_highlight_text;
+}
diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less
index d03c834..dc7eedc 100755
--- a/css/area_sidebar-search.less
+++ b/css/area_sidebar-search.less
@@ -22,7 +22,6 @@
         background-image: none;
         background-color: transparent; // fix
         border: solid 1px transparent;
-        color: @color-nav; // fix
         padding: 0;
         transition: @transition color, @transition background-color, @transition border-color;
 
@@ -30,12 +29,11 @@
         &:focus,
         &:active {
             min-height: @icon-size;
-            background-color: @button_color;
-            border: solid 1px @button_background;
-            color: @button_background;
+            background-color: @ini_button_color;
+            border: solid 1px @ini_button_background;
 
             &::after {
-                background-color: @button_background;
+                background-color: @ini_button_background;
             }
         }
 
@@ -61,6 +59,7 @@
             min-width: (@toggle-showsidebar_width + 0.1); /* must be a bit a wider than @toggle-showsidebar_width to hide right border */
             width: @main-ico-dummy;
             border-radius: @fix_border-radius;
+            color: @ini_nav_menu_color;
             text-decoration: none;
             box-sizing: border-box;
 
@@ -76,9 +75,9 @@
             &:hover,
             &:focus,
             &:active {
-                background-color: @color-nav-hover-bg;
-                border-color: @color-nav-hover;
-                color: @color-nav-hover;
+                background-color: @ini_nav_menu_hover_bg;
+                border-color: @ini_nav_menu_hover_color;
+                color: @ini_nav_menu_hover_color;
             }
         }
     }
@@ -90,6 +89,7 @@
         right: 0;
         height: auto;
         min-height: (@icon-size - .2);
+        color: @quicksearch-button-color;
 
         &:hover,
         &:focus,
@@ -97,9 +97,9 @@
             top: 0;
             bottom: 0;
             min-height: @icon-size;
-            background-color: @button_color;
-            border: solid 1px @button_background;
-            color: @button_background;
+            background-color: @ini_button_color;
+            border: solid 1px @ini_button_background;
+            color: @ini_button_background;
         }
     }
 
@@ -111,12 +111,12 @@
         margin: 0 0 @margin-default;
 
         .no {
-            display: inline-block;
+            display: block;
 
             #qsearch__in {
                 width: 100%;
                 padding-left: 10px;
-                padding-right: (@icon-size + 10);
+                padding-right: @icon-size;
             }
         }
 
@@ -127,7 +127,7 @@
 
         button[type="submit"] {
             border: solid 1px transparent;
-            border-right-color: @color-border;
+            border-right-color: @ini_border;
             margin-left: -(@icon-size);
 
             &::after {
@@ -137,10 +137,32 @@
                 bottom: 15%;
                 width: 1px;
                 left: -1px;
-                background-color: @color-border;
+                background-color: @ini_border;
                 transition: @transition background-color;
             }
         }
+
+        div.ajax_qsearch {
+            box-shadow: none;
+            background-color: #FFF;
+            padding: 0;
+
+            strong,
+            ul li {
+                color: @quicksearch-button-color;
+                padding: .25rem .5rem;
+
+                * {
+                    color: inherit;
+                }
+            }
+
+            ul li {
+                &:nth-child(odd) {
+                    background-color: @suggestion-zebra;
+                }
+            }
+        }
     }
 
     #qsearch__out {
diff --git a/css/area_tabs.less b/css/area_tabs.less
new file mode 100644
index 0000000..6574645
--- /dev/null
+++ b/css/area_tabs.less
@@ -0,0 +1,39 @@
+/**
+ * This file provides styles for tab boxes
+ */
+
+
+/* + + + + +  tabs  + + + + + */
+
+#dokuwiki__content {
+    ul.tabs {
+        li:not([class~="active"]) {
+            strong,
+            a {
+                color: @ini_text_neu;
+                transition: @transition background-color, @transition color;
+            }
+
+            a:hover,
+            a:focus,
+            a:active {
+                color: @ini_text;
+            }
+        }
+    }
+
+    .tabs > ul {
+        li:not([class~="active"]) {
+            a {
+                color: @ini_text_neu;
+                transition: @transition background-color, @transition color;
+            }
+
+            a:hover,
+            a:focus,
+            a:active {
+                color: @ini_text;
+            }
+        }
+    }
+}
diff --git a/css/area_togglelink.less b/css/area_togglelink.less
index 0607a03..816799e 100755
--- a/css/area_togglelink.less
+++ b/css/area_togglelink.less
@@ -29,10 +29,10 @@
 
             width: @margin-default;
             height: 100%;
-            background-color: @button_background;
-            border: solid 1px @button_background;
-            border-radius: @fix_border-radius 0 0 @fix_border-radius;
-            color: @button_color;
+            background-color: @ini_button_background;
+            border: solid 1px @ini_button_background;
+            border-radius: @ini_default_border_radius 0 0 @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+            color: @ini_button_color;
             text-decoration: none;
             transition: @transition color, @transition background-color, @transition border-color;
 
@@ -55,9 +55,9 @@
             &:hover,
             &:focus,
             &:active {
-                background-color: @button_color;
-                border-color: @button_background;
-                color: @button_background;
+                background-color: @ini_button_color;
+                border-color: @ini_button_background;
+                color: @ini_button_background;
                 text-decoration: none;
 
                 * {
@@ -76,9 +76,9 @@
             left: -1px;
 
             a {
-                background-color: @button_background;
-                border-color: @button_background;
-                border-radius: 0 @fix_border-radius @fix_border-radius 0;
+                background-color: @ini_button_background;
+                border-color: @ini_button_background;
+                border-radius: 0 @ini_default_border_radius @ini_default_border_radius 0; // @ini_default_border_radius vs. @fix_border-radius
 
                 &::before {
                     opacity: .6;
@@ -93,7 +93,7 @@
                 &:hover,
                 &:focus,
                 &:active {
-                    background-color: @button_color;
+                    background-color: @ini_button_color;
 
                     &::before {
                         opacity: 0;
@@ -107,21 +107,3 @@
         }
     }
 }
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* min-width: 1440px */
-
-@media @screen_min-xlg {
-    .togglelink {
-
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 1199px */
-
-@media @screen_max-xlg {
-    .togglelink {
-
-    }
-}
diff --git a/css/base.less b/css/base.less
index a954539..8d8a53f 100755
--- a/css/base.less
+++ b/css/base.less
@@ -5,97 +5,101 @@
  */
 
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* converted vars */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-
-@background_page-header: __background_page-header__;
-
-@border-radius:          __default_border_radius__;
-
-@font_family_screen:     __font_family_screen__;
-
-@color-text:             __text__;
-@color-border:           __border__;
-@color-border-light:     __border_light__;
-@color-nav:              __nav_menu_color__;
-@color-nav-hover:        __nav_menu_hover_color__;
-@color-nav-hover-bg:     __nav_menu_hover_bg__;
-
-@color-content-bg:       __background_content__;
-@color-site-bg:          __background_site__;
-
-@color-link:             __existing__;
-@color-link-hover:       @color-nav;
-
-@button_color:           __button_color__;
-@button_background:      __button_background__;
-
-@box-shadow-offset:      __box_shadow_offset__;
-@box-shadow:             __box_shadow__;
-@box-shadow-colored:     __box_shadow_colored__;
-@box-shadow-right-bottom:__box_shadow_right_bottom__;
-@box-shadow-bottom:      __box_shadow_bottom__;
-
-@th_background:          __background_alt__;
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* global vars */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 
-@height-context-bar: 50px;
+@font_family_screen:       arial, sans-serif;
+@font_family_print:        "Times New Roman", serif;
 
-@margin-small:       1rem;
-@margin-default:     2rem;
-@margin-big:         3.07rem;
+@nav_direct_background:    @ini_background_content;
+@nav_direct_color:         @ini_existing;
 
-@small-spacing:      .3rem;
-@very-small-spacing: .2rem;
+@ini_sidebar_width:        (100 - @ini_site_width) - 4;
 
-@grid:               @margin-small;
-@toggle-size:        1.75rem;
+@height-context-bar:       50px;
 
-@transition: ease-out .30s;
+@margin-small:             1rem;
+@margin-default:           2rem;
+@margin-big:               3.07rem;
+
+@small-spacing:            .3rem;
+@very-small-spacing:       .2rem;
+
+@grid:                     @margin-small;
+@toggle-size:              1.75rem;
+
+@transition:               ease-out .30s;
+
+@box-shadow-offset:        .1em .1em .1em rgba(153,153,153,.5); // pagetools, tabinclude
+@box-shadow:               0 0 .5em rgba(153,153,153,.5);
+@box-shadow-colored:       0 0 .5em fade(@ini_existing, 50%);
+@box-shadow-right-bottom:  0.1em 0.3rem 0.5em rgba(153,153,153,.5);
+@box-shadow-bottom:        0 .1em .5em rgba(153,153,153,.5); // qc-wrapper - breadcrumb
 
 
 /* + + +  for programmers customizing  + + + */
+
 @fix_border-radius:        3px;
+
 @toggle-showsidebar_width: 3.07rem;       // shown sidebar after toggle
+
 @page_padding-top:         @margin-small; // padding-top for 'dokuwiki__content'
 @page-header_height:       2.8rem;        // minimum: 2.8rem (height for breadcrumb, page-header, page-footer)
 @meta-box_height:          (@page-header_height - @page_padding-top);
 @breadcrumb_height:        @page-header_height;
+
 @formfield_min-height:     2rem;          // min-height for input, textarea, select, keygen
 
-@noopentasks-background:   #BBB;
-@noopentasks-color:        #696969;
+//@metanav-ini_background:   rgba(0, 0, 0, .1);
+
+
+/* icons */
+@noopentasks-background:   #ECECEC; /* metabox tabs + num in icons + tabinclude + code, pre, samp, kbd */
+@noopentasks-border:       #BBB; /* metabox tabs + num in icons + code, pre, samp, kbd */
+@noopentasks-color:        #666; /* metabox tabs + num in icons + code, pre, samp, kbd */
+@wikiicons-border:         #CCC; /* usertools, breadcrumbs icons, pagetools box-hover */
+
+
+/* navigation left */
+@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
+@suggestion-zebra:         #EEE;
+
+
+/* edit mode */
+@highlight-odd-ini_text:  fade(@ini_background_content, 95%);
+@highlight-even-ini_text: fade(@ini_text, 5%);
+@color-editBox:           #252525; // editmode for tables
+
+
+//@nolinkedicon-ini_background: fade(@ini_background, 10%);
+//@opacity-ini_nav_menu_color:  fade(@ini_nav_menu_color, 40%);
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* fonts */
 
-@font-size-very-small: .73rem;
-@font-size-small: .88rem;
-@font-size-default: 1rem;
-@font-size-big: 1.5rem;
-@font-size-bigger: 1.75rem;
+@font-size-very-small:     .73rem;
+@font-size-small:          .88rem;
+@font-size-default:        1rem;
+@font-size-big:            1.5rem;
+@font-size-bigger:         1.75rem;
 
-@line-height-default: 125%;
-@line-height-big: 135%;
-@line-height-bigger: 140%;
+@line-height-default:      125%;
+@line-height-big:          135%;
+@line-height-bigger:       140%;
 
-@font-weight-bold: 800;
-@font-weight-normal: 400;
+@font-weight-bold:         800;
+@font-weight-normal:       400;
 
-@font-scale-factor: .0769;
+@font-scale-factor:        .0769;
 
 @font-size-head6: @font-size-default;
 @font-size-head5: @font-size-default + @font-scale-factor;
-@font-size-head4: @font-size-default + (@font-scale-factor * 2);
-@font-size-head3: @font-size-default + (@font-scale-factor * 3);
-@font-size-head2: @font-size-default + (@font-scale-factor * 4);
-@font-size-head1: @font-size-default + (@font-scale-factor * 5);
+@font-size-head4: @font-size-default + (@font-scale-factor * 3);
+@font-size-head3: @font-size-default + (@font-scale-factor * 5);
+@font-size-head2: @font-size-default + (@font-scale-factor * 7);
+@font-size-head1: @font-size-default + (@font-scale-factor * 9);
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
@@ -137,11 +141,9 @@
 
 @screen_min-md: ~"only screen and (min-width: " ~"@{break-min-md}px)";
 @screen_max-md: ~"only screen and (max-width: " ~"@{break-max-md}px)";
-@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)";
 
 @screen_min-lg: ~"only screen and (min-width: " ~"@{break-min-lg}px)";
 @screen_max-lg: ~"only screen and (max-width: " ~"@{break-max-lg}px)";
-@screen_only-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
 
 @screen_min-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px)";
 @screen_max-xlg: ~"only screen and (max-width: " ~"@{break-max-xlg}px)";
@@ -149,6 +151,10 @@
 @screen_min-xxlg: ~"only screen and (min-width: " ~"@{break-min-xxlg}px)";
 @screen_max-xxlg: ~"only screen and (max-width: " ~"@{break-max-xxlg}px)";
 
+@screen_only-md: ~"only screen and (min-width: 800px) and (max-width: " ~"@{break-max-md}px)";
+@screen_only-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
+@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";
+
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* col width */
@@ -208,7 +214,7 @@ q {
 
 acronym {
     cursor: help;
-    border-bottom: dotted 1px #333;
+    border-bottom: dotted 1px @ini_text;
 }
 
 *:focus {
@@ -251,7 +257,7 @@ nav > ul {
     &::before,
     &::after {
         display: table;
-        content: "  ";
+        content: ' ';
         clear: both;
     }
 }
@@ -280,6 +286,7 @@ nav > ul {
 
 .mobile-only {
     display: none;
+
     @media @screen_max-md {
         display: inline-block;
     }
diff --git a/css/base_design.less b/css/base_design.less
index 64968b8..9d68d7b 100755
--- a/css/base_design.less
+++ b/css/base_design.less
@@ -7,11 +7,7 @@
 
 
 html, body {
-    background-color: @color-site-bg;
-}
-
-a {
-    color: @color-link;
+    background-color: @ini_background;
 }
 
 
@@ -30,79 +26,91 @@ a {
     font-weight: bold;
 }
 
-.dokuwiki .pageId {
-    float: right;
-    margin-right: -1em;
-    margin-bottom: -1px;
-    margin-top: -1.5em;
-    overflow: hidden;
-    padding: 0.5em 1em 0;
+.dokuwiki {
+    .page ol li,
+    .page ul li,
+    .aside ul li {
+        color: @ini_text;
+    }
 
-    span {
+    .pageId {
+        float: right;
+        margin-right: -1em;
+        margin-bottom: -1px;
+        margin-top: -1.5em;
+        overflow: hidden;
+        padding: 0.5em 1em 0;
+
+        span {
+            font-size: @font-size-small;
+            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;
+        }
+    }
+
+    div.page {
+        clear: both;
+        overflow: hidden;
+        word-wrap: break-word;
+        background: @ini_background_content;
+        color: inherit;
+        padding: @page_padding-top @margin-default @margin-default;
+
+        @media @screen_max-md {
+            padding-right: (@margin-default * 1.6);
+        }
+
+        @media @screen_max-xs {
+            padding-left: @margin-small;
+        }
+    }
+
+    .content #dokuwiki__pagetools {
+        @media @screen_max-md {
+            top: 4rem;
+        }
+    }
+
+    .docInfo {
         font-size: @font-size-small;
-        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 {
-    clear: both;
-    overflow: hidden;
-    word-wrap: break-word;
-    background: @color-content-bg;
-    color: inherit;
-    // margin-bottom: .5rem; // no margin: if there is another bg-color, then there is an #fff border
-    padding: @page_padding-top @margin-default @margin-default;
-
-    @media @screen_max-md{
-        padding-right: (@margin-default *1.6);
-    }
-}
-.content #dokuwiki__pagetools{
-    @media @screen_max-md{
-        top: 4rem;
-    }
-}
-
-.dokuwiki .docInfo {
-    font-size: @font-size-small;
-    text-align: right;
-}
-
-/* license note under edit window */
-.dokuwiki div.license {
-    font-size: @font-size-small;
-    line-height: @line-height-default;
-    padding-top: 1rem;
-
-    @media @screen_max-lg {
-        font-size: @font-size-default;
+        text-align: right;
     }
 
-    @media @screen_max-md {
+    /* license note under edit window */
+    div.license {
         font-size: @font-size-small;
+        line-height: @line-height-default;
+        padding-top: 1rem;
+
+        @media @screen_max-lg {
+            font-size: @font-size-default;
+        }
+
+        @media @screen_max-md {
+            font-size: @font-size-small;
+        }
+
+        * {
+            font-size: inherit;
+        }
     }
 
-    * {
-        font-size: inherit;
+    [dir=rtl] & .docInfo {
+        text-align: left;
     }
-}
 
-[dir=rtl] .dokuwiki .docInfo {
-    text-align: left;
-}
-
-[dir=rtl] .dokuwiki .pageId {
-    float: left;
-    margin-left: -1em;
-    margin-right: 0;
+    [dir=rtl] & .pageId {
+        float: left;
+        margin-left: -1em;
+        margin-right: 0;
+    }
 }
 
 caption,
@@ -144,27 +152,77 @@ h1 {
 h2 {
     font-size: @font-size-head2;
     margin: 0 0 @font-size-head2;
+    padding-top: (@font-size-head2 / 2);
+
+    .secedit + &,
+    .section_highlight &:first-child {
+        padding-top: 0;
+    }
+
+    .section_highlight + & {
+        padding-top: (@font-size-head2 / 2);
+    }
 }
 
 h3 {
     font-size: @font-size-head3;
     margin: 0 0 @font-size-head3;
+    padding-top: (@font-size-head3 / 2);
+
+    .secedit + &,
+    .section_highlight &:first-child {
+        padding-top: 0;
+    }
+
+    .section_highlight + & {
+        padding-top: (@font-size-head3 / 2);
+    }
 }
 
 h4 {
     font-size: @font-size-head4;
     margin: 0 0 @font-size-head4;
+    padding-top: (@font-size-head4 / 2);
+
+    .secedit + &,
+    .section_highlight &:first-child {
+        padding-top: 0;
+    }
+
+    .section_highlight + & {
+        padding-top: (@font-size-head4 / 2);
+    }
 }
 
 h5 {
     font-size: @font-size-head5;
     margin: 0 0 @font-size-head5;
+    padding-top: (@font-size-head5 / 2);
+
+    .secedit + &,
+    .section_highlight &:first-child {
+        padding-top: 0;
+    }
+
+    .section_highlight + & {
+        padding-top: (@font-size-head5 / 2);
+    }
 }
 
 h6 {
     font-size: @font-size-head6;
     font-weight: @font-weight-bold;
     margin: 0 0 @font-size-head6;
+    padding-top: (@font-size-head6 / 2);
+
+    .secedit + &,
+    .section_highlight &:first-child {
+        padding-top: 0;
+    }
+
+    .section_highlight + & {
+        padding-top: (@font-size-head6 / 2);
+    }
 }
 
 p {
@@ -305,11 +363,31 @@ ol ol ol ol ol {
     list-style-type: lower-roman;
 }
 
+
+/*____________ tables ____________*/
+
+.dokuwiki {
+    table.inline tr:hover {
+        th {
+            background-color: fade(@ini_background_alt, 50%);
+        }
+
+        td {
+            background-color: fade(@ini_background_alt, 80%);
+            color: @ini_text_alt;
+
+            *:not(button,a) {
+                color: @ini_text_alt;
+            }
+        }
+    }
+}
+
 table {
     border-collapse: collapse;
     empty-cells: show;
     border-spacing: 0;
-    border: 1px solid @color-border;
+    border: 1px solid @ini_border;
     font-size: @font-size-default;
     line-height: 140%;
 }
@@ -328,12 +406,13 @@ td {
     padding: .3em .5em;
     margin: 0;
     vertical-align: top;
-    border: 1px solid @color-border;
+    border: 1px solid @ini_border;
 }
 
 th {
     font-weight: bold;
     background-color: @ini_background_alt;
+    color: @ini_text_alt;
     text-align: left;
 }
 
@@ -343,18 +422,18 @@ th {
 
 a {
     outline: none;
-}
 
-a:link,
-a:visited {
-    text-decoration: none;
-    color: @color-link;
-}
+    &:link,
+    &:visited {
+        text-decoration: none;
+        color: @ini_link; // links to non wikipages (external links)
+    }
 
-a:hover,
-a:focus,
-a:active {
-    text-decoration: underline;
+    &:hover,
+    &:focus,
+    &:active {
+        text-decoration: underline;
+    }
 }
 
 img {
@@ -381,7 +460,7 @@ button img {
 }
 
 hr {
-    border-top: solid @color-border;
+    border-top: solid @ini_border;
     border-bottom: solid @ini_background;
     border-width: 1px 0;
     height: 0;
@@ -403,7 +482,7 @@ em abbr {
 
 mark {
     background-color: @ini_highlight;
-    color: inherit;
+    color: @ini_highlight_text;
 }
 
 pre,
@@ -415,25 +494,28 @@ kbd {
     font-size: @font-size-default;
     direction: ltr;
     text-align: left;
-    background-color: @color-site-bg;
-    color: @color-text;
-    box-shadow: inset 0 0 .3em @color-border;
+    background-color: @noopentasks-background;
+    color: @noopentasks-color;
+    box-shadow: inset 0 0 .3em @noopentasks-border;
     border-radius: @fix_border-radius;
+    padding-left: @small-spacing;
+    padding-right: @small-spacing;
 }
 
 pre {
     overflow: auto;
     word-wrap: normal;
-    border: 1px solid @color-border;
+    background-color: @noopentasks-background;
+    border: 1px solid @noopentasks-border;
     border-radius: @fix_border-radius;
-    box-shadow: inset 0 0 .5em @color-border;
+    box-shadow: inset 0 0 .5em @noopentasks-border;
     font-size: @font-size-default;
     line-height: 140%;
     padding: .7em 1em;
 }
 
 blockquote {
-    border: solid @color-border;
+    border: solid @ini_border;
     border-width: 0 0 0 .25em;
     font-size: @font-size-default;
     line-height: 140%;
diff --git a/css/base_mixins.less b/css/base_mixins.less
index 7668aa1..82a5291 100755
--- a/css/base_mixins.less
+++ b/css/base_mixins.less
@@ -142,12 +142,30 @@
 
 
 /* + + + + +  small icon-buttons (breadcrumb, page-header)  + + + + + */
+.btn-hover {
+    background-color: @ini_nav_menu_hover_bg;
+    color: @ini_nav_menu_hover_color;
+    transition: @transition color, @transition background-color, @transition border-color;
+
+    &:hover,
+    &:active,
+    &:focus {
+        background-color: @ini_nav_menu_hover_color;
+        border-color: @ini_nav_menu_hover_color;
+        color: @ini_nav_menu_hover_bg;
+
+        .prefix {
+            color: inherit;
+        }
+    }
+}
+
 .btn-usertools-wrapper(@elem:@toggle-size) {
     display: inline-block;
     min-height: @elem;
     min-width: @elem;
     box-sizing: border-box;
-    color: @color-nav;
+    color: @ini_text_webframe;
     font-size: @font-size-small;
     padding: 0;
     margin: 0 .25rem;
@@ -161,10 +179,10 @@
     .num {
         position: absolute;
         right: -.4rem;
-        top: -.4em;
-        background-color: @color-nav-hover;
+        top: -.5em;
+        background-color: @ini_nav_menu_hover_color;
         border-radius: 2px;
-        color: @color-nav-hover-bg;
+        color: @ini_nav_menu_hover_bg;
         font-size: @font-size-very-small;
         font-weight: 400;
         text-align: center;
@@ -172,17 +190,6 @@
         padding: .1em @very-small-spacing;
         transition: @transition color, @transition background-color;
     }
-
-    a {
-        &:hover,
-        &:active,
-        &:focus {
-            .num {
-                background-color: @color-nav-hover;
-                color: @color-nav-hover-bg;
-            }
-        }
-    }
 }
 
 .btn-prefix () {
diff --git a/css/base_structure.less b/css/base_structure.less
index 4901da9..83957ce 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -83,6 +83,7 @@
 
     .content .row > .col-xs-12 {
         z-index: 3;
+        border-radius: 0 @ini_default_border_radius @fix_border-radius @fix_border-radius; // @ini_default_border_radius vs. @fix_border-radius
     }
 
     .top-header {
@@ -98,7 +99,7 @@
             position: relative;
 
             > .col-xs-12 {
-                width: 23%;
+                width: @ini_sidebar_width;
                 box-sizing: border-box;
             }
         }
@@ -113,7 +114,7 @@
 
             + .col-xs-12 {
                 float: right;
-                width: 73%;
+                width: @ini_site_width;
                 box-sizing: border-box;
             }
         }
@@ -136,7 +137,7 @@
     .showSidebar {
         .content {
             .row > .col-xs-12 {
-                width: 73%;
+                width: @ini_site_width;
                 float: right;
             }
         }
diff --git a/css/plugins/bureaucracy.less b/css/plugins/bureaucracy.less
index 0c2f12d..3ba0143 100755
--- a/css/plugins/bureaucracy.less
+++ b/css/plugins/bureaucracy.less
@@ -1,6 +1,9 @@
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* all media */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/**
+ * This file provides styles for bureaucracy plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
 
 .dokuwiki form.bureaucracy__plugin {
     fieldset {
@@ -42,7 +45,6 @@
         select {
             float: left;
             width: 50%;
-            //min-height: @toggle-size;
             text-align: left;
             padding: .1em .2em;
         }
@@ -95,13 +97,6 @@
 }
 
 
-
-
-#icke__page .content ul.autocompletion {}
-
-ul.autocompletion li {}
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* min-width: 1440px */
 
diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less
new file mode 100644
index 0000000..97f6948
--- /dev/null
+++ b/css/plugins/configmanager.less
@@ -0,0 +1,27 @@
+/**
+ * This file provides styles for config manager
+ */
+
+
+/* + + + + +  config__manager  + + + + + */
+
+#dokuwiki__content {
+    #config__manager {
+        .selectiondefault {
+            background-color: transparent;
+        }
+
+        tr {
+            .input {
+                background-color: transparent;
+                color: inherit;
+            }
+        }
+
+        tr.default {
+            .input {
+                background-color: transparent;
+            }
+        }
+    }
+}
diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less
index 989fe7b..261f5de 100755
--- a/css/plugins/do_tasks.less
+++ b/css/plugins/do_tasks.less
@@ -1,9 +1,28 @@
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* all media */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/**
+ * This file provides styles for do-task plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
 
 ul.page-attributes {
     .plugin__do_pagetasks {
-        &.do_none { }
+        &.do_none {
+            position: relative;
+            border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+
+            strong {
+                overflow: hidden;
+                background-color: @ini_background;
+                border-color: @noopentasks-border;
+                color: @ini_text_webframe;
+            }
+
+            .num {
+                margin-top: 1px;
+                background-color: @noopentasks-border; // fix
+                color: @noopentasks-color; // fix
+            }
+        }
     }
 }
diff --git a/css/plugins/edit.less b/css/plugins/edit.less
index 321cb38..9e1dcda 100644
--- a/css/plugins/edit.less
+++ b/css/plugins/edit.less
@@ -6,7 +6,7 @@
 
 /* + + + + +  edit view  + + + + + */
 
-.dokuwiki {
+#dokuwiki__content {
     div.section_highlight {
         clear: right;
     }
@@ -18,24 +18,23 @@
         margin-bottom: .5rem;
     }
 
-    #dokuwiki__content div.editbutton_table {
-        float: left;
+    div.editBox {
+        background-color: #FFF;
+        border: solid 2px #FFF;
+        border-radius: @ini_default_border_radius;
 
-        form div.no {
-            button,
-            input.button {
-                border-top: solid 1px @button_background;
-                margin-top: 0;
-            }
-        }
-    }
-
-    .editBox {
         .editButtons {
             display: inline-block;
             padding-bottom: 1rem;
         }
+
+        * {
+            &:not(button) {
+                color: @color-editBox;
+            }
+        }
     }
+
 }
 
 
diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less
index 42731b2..21cad08 100644
--- a/css/plugins/edittable.less
+++ b/css/plugins/edittable.less
@@ -1,20 +1,37 @@
 /**
- * Style Adjustments for the edittable plugin
+ * This file provides styles for qc edittable plugin
  */
 
+
+/* + + + + +  global  + + + + + */
+
 #dokuwiki__content.main-content {
     div.editbutton_table {
         position: relative; // for IE
         z-index: 1; // for IE
+        float: left;
         margin-top: -1.46rem !important; // overwrite inline stales
 
         form div.no {
             button,
             input.button {
                 min-height: 1rem;
-                // button - for inverted design: background-color: @button_color; color: @button_background;
+                background-color: @ini_background_content;
+                border-top: solid 1px @ini_button_background;
+                border-color: @ini_border;
+                color: @ini_existing;
                 font-size: @font-size-small;
                 margin-top: 0;
+                padding-right: .3em;
+                transition: @transition background-color, @transition border-color, @transition color;
+
+                &:hover,
+                &:focus,
+                &:active {
+                    background-color: @ini_existing;
+                    border-color: @ini_existing;
+                    color: @ini_background_content;
+                }
             }
         }
 
diff --git a/css/plugins/extension__manager.less b/css/plugins/extension__manager.less
index d244221..3d3b80d 100644
--- a/css/plugins/extension__manager.less
+++ b/css/plugins/extension__manager.less
@@ -1,6 +1,9 @@
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* all media */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/**
+ * This file provides styles for extension manager
+ */
+
+
+/* + + + + +  global  + + + + + */
 
 .dokuwiki #extension__manager {
     .actions {
diff --git a/css/plugins/folded.less b/css/plugins/folded.less
new file mode 100644
index 0000000..0402618
--- /dev/null
+++ b/css/plugins/folded.less
@@ -0,0 +1,35 @@
+/**
+ * This file provides styles for the toggle "folded"
+ */
+
+
+/* + + + + +  global  + + + + + */
+
+#dokuwiki__content {
+    a.folder {
+        background: transparent url("svg.php?svg=down.svg&f=existing") right center no-repeat;
+        color: @ini_existing;
+        padding-right: 20px;
+
+        &.open {
+            background-image: url("svg.php?svg=up.svg&f=existing");
+        }
+    }
+
+    div.folded {
+        box-shadow: @box-shadow-colored;
+        border: 1px solid fade(@ini_existing, 50%);
+        border-radius: 0;
+        margin-top: -.7rem;
+        margin-bottom: .7rem;
+        padding: .5em;
+
+        p {
+            margin: .5rem 0;
+        }
+    }
+
+    span.folded {
+        border: 1px dotted @ini_border;
+    }
+}
diff --git a/css/plugins/hightlight_parent.less b/css/plugins/hightlight_parent.less
index 2a3d44c..a59a4df 100644
--- a/css/plugins/hightlight_parent.less
+++ b/css/plugins/hightlight_parent.less
@@ -1,5 +1,12 @@
-@media @screen_max-md{
-    #plugin__highlightparent{
+/**
+ * This file provides styles for highlight plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
+
+@media @screen_max-md {
+    #plugin__highlightparent {
         clear: both;
         margin-top: 1rem;
     }
diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less
index 84035fc..b61be46 100755
--- a/css/plugins/magic-matcher.less
+++ b/css/plugins/magic-matcher.less
@@ -1,6 +1,6 @@
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* all media */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/**
+ * This file provides styles for magic matcher plugin
+ */
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + */
@@ -21,9 +21,9 @@
         right: 0;
         top: 0;
         border: 0;
-        border-bottom: 1px solid @color-border;
-        border-left: 1px solid @color-border;
-        color: @color-nav;
+        border-bottom: 1px solid @ini_border;
+        border-left: 1px solid @ini_border;
+        color: @ini_nav_menu_color;
         background: #fff;
         border-radius: 0;
         border-bottom-left-radius: 5px;
@@ -31,8 +31,8 @@
         &:hover,
         &:focus,
         &:active {
-            border-color: @button_background;
-            color: @button_background;
+            border-color: @ini_button_background;
+            color: @ini_button_background;
         }
     }
 
@@ -42,9 +42,9 @@
         width: 100%;
         min-height: @height-context-bar;
         box-sizing: border-box;
-        box-shadow: __box_shadow__;
-        background-color: __nav_direct_background__;
-        border-radius: 0 0 __default_border_radius__ __default_border_radius__;
+        box-shadow: @box-shadow;
+        background-color: @ini_background_content;
+        border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
         font-size: @font-size-default;
         padding: .8em 1em .5em;
         margin-bottom: 0;
@@ -76,6 +76,16 @@
     }
 }
 
+
+/* + + + + +  in meta box  + + + + + */
+#spr__tab-issues {
+     ul.mmissuelist {
+         padding-left: 0;
+         margin-top: 1rem;
+     }
+}
+
+
 /* + + + + +  in content  + + + + + */
 a.jiralink {
     font-size: @font-size-default;
diff --git a/css/plugins/mediamanager.less b/css/plugins/mediamanager.less
index fee2391..33515fb 100644
--- a/css/plugins/mediamanager.less
+++ b/css/plugins/mediamanager.less
@@ -1,9 +1,9 @@
 /**
- * This file provides styles for the edit view (?do=edit), preview
- * and section edit buttons.
+ * This file provides styles for mediamanager
  */
 
-/* + + + + +  mediamanager  + + + + + */
+
+/* + + + + +  global  + + + + + */
 
 #mediamanager__page {
     .namespaces h2 {
diff --git a/css/plugins/move.less b/css/plugins/move.less
index 885f1b4..3863e28 100644
--- a/css/plugins/move.less
+++ b/css/plugins/move.less
@@ -1,6 +1,14 @@
-#dokuwiki__site > .plugin_move_dialog{
+/**
+ * This file provides styles for move plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
+
+#dokuwiki__site > .plugin_move_dialog {
     font-size: @font-size-default;
-    *{
+
+    * {
         font-size: @font-size-default;
     }
 }
diff --git a/css/plugins/popupviewer.less b/css/plugins/popupviewer.less
index 8335dbb..afa3119 100755
--- a/css/plugins/popupviewer.less
+++ b/css/plugins/popupviewer.less
@@ -1,5 +1,10 @@
+/**
+ * This file provides styles for popupviewer plugin
+ */
 
 
+/* + + + + +  global  + + + + + */
+
 #popupviewer {
     > .controls > .content {
 
diff --git a/css/plugins/qc.less b/css/plugins/qc.less
index dff5a32..aaf152a 100644
--- a/css/plugins/qc.less
+++ b/css/plugins/qc.less
@@ -1,6 +1,79 @@
-#plugin__qc__wrapper{
-    font-size: @font-size-default;
-    p{
+/**
+ * This file provides styles for qc plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
+
+#dokuwiki__site {
+    .plugin__qc {
+        display: inline-block;
+        overflow: visible;
+        position: static;
+    }
+
+    #plugin__qc__icon {
+        display: none;
+    }
+
+    #plugin__qc__link {
+        position: relative;
+
+        .prefix {
+            .icon-emo-happy();
+
+            width: 100%;
+            font-size: @font-size-default;
+
+            &::before {
+                width: 100%;
+                margin: 0;
+            }
+        }
+    }
+
+    #plugin__qc__wrapper {
+        position: absolute;
+        right: 0;
+        z-index: 2000;
+        width: auto;
+        box-shadow: @box-shadow-bottom;
+        background: @ini_background_page_header;
+        background: -webkit-linear-gradient(top, @ini_background_page_header, @ini_background_content);
+        background: linear-gradient(top, @ini_background_page_header, @ini_background_content);
+        border: 0 none;
         font-size: @font-size-default;
+
+        p {
+            font-size: @font-size-default;
+        }
+
+        #plugin__qc__out {
+            h1 {
+                font-size: @font-size-head3;
+            }
+
+            h2 {
+                margin-top: 1.6em;
+                font-size: @font-size-head5;
+            }
+            > h1,
+            > h2,
+            > p,
+            > dl,
+            > div {
+                padding-left: 1rem;
+                margin-left: 0;
+            }
+
+            > div p {
+                padding-left: 0;
+                margin-left: 0;
+            }
+        }
+
+        &[aria-hidden="false"] {
+            margin-top: .5rem;
+        }
     }
 }
diff --git a/css/plugins/starred.less b/css/plugins/starred.less
new file mode 100644
index 0000000..6c3e0c6
--- /dev/null
+++ b/css/plugins/starred.less
@@ -0,0 +1,10 @@
+/**
+ * This file provides styles for starred plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
+
+#dokuwiki__site {
+
+}
diff --git a/css/plugins/struct.less b/css/plugins/struct.less
index 31dc00e..1f9998b 100755
--- a/css/plugins/struct.less
+++ b/css/plugins/struct.less
@@ -1,6 +1,9 @@
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* all media */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/**
+ * This file provides styles for struct plugin
+ */
+
+
+/* + + + + +  global  + + + + + */
 
 #dokuwiki__content {
     .structaggregation {
@@ -10,6 +13,16 @@
         padding-bottom: @link-height;
         margin-bottom: @grid;
 
+        td,
+        th {
+            line-height: @line-height-default;
+
+            a {
+                color: @ini_existing;
+                line-height: @line-height-default;
+            }
+        }
+
         // search button in table (f.i. "All products")
         table th input {
             &:not(:focus) {
@@ -33,8 +46,26 @@
             margin-bottom: 0;
 
             &.export {
+                bottom: 1px;
+                background: transparent url("svg.php?svg=file-export.svg&f=existing") left center no-repeat;
+                background-size: auto 20px;
+                border: solid 1px @ini_border;
+                color: @ini_existing;
+                font-size: @font-size-small;
                 line-height: 1;
-                padding-top: .3em;
+                margin-top: -1px;
+                padding-top: .4em;
+                transition: @transition background-color, @transition border-color, @transition color;
+
+                &:hover,
+                &:focus,
+                &:active {
+                    background-color: @ini_existing;
+                    background-image: url("svg.php?svg=file-export.svg&f=background_content");
+                    border-color: @ini_existing;
+                    color: @ini_background_content;
+                    text-decoration: none;
+                }
             }
         }
     }
@@ -45,6 +76,7 @@
 
     .struct_entry_form {
         margin-bottom: 2rem;
+
         > fieldset {
             margin-top: 1.5rem;
         }
@@ -53,4 +85,67 @@
     textarea + .struct_entry_form {
         margin-top: -.5rem;
     }
+
+    div.editBox {
+        .struct_entry_form {
+            label span.label {
+                color: @color-editBox;
+            }
+        }
+    }
+}
+
+.dokuwiki .struct_inlineditor {
+    z-index: 3;
+}
+
+
+/* + + + + +  form - Struct Schema Editor  + + + + + */
+form {
+    &.doku_form.struct_newschema {
+        fieldset {
+            > label {
+                > span:first-child {
+                    display: inline-block;
+
+                    @media @screen_min-lg {
+                        width: 48.8%;
+                    }
+
+                    @media @screen_max-lg {
+                        width: 48.5%;
+                    }
+                }
+
+                > input[type="text"] {
+                    width: 50%;
+                }
+            }
+
+            button {
+                cursor: pointer;
+                box-shadow: none;
+                background-image: none;
+                background-color: @ini_button_background;
+                border: 1px solid @ini_button_background;
+                border-radius: @fix_border-radius;
+                color: @ini_button_color;
+                vertical-align: top;
+                margin-top: .3em;
+                padding: .3em @grid;
+                transition: @transition background-color, @transition color;
+
+                &:hover,
+                &:active,
+                &:focus {
+                    background-color: @ini_button_color;
+                    color: @ini_button_background;
+                }
+
+                + p {
+                    padding-top: 1rem;
+                }
+            }
+        }
+    }
 }
diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less
index 6fc0296..8737ed4 100644
--- a/css/plugins/tabinclude.less
+++ b/css/plugins/tabinclude.less
@@ -1,39 +1,57 @@
 /**
- * This file provides styles for the edit view (?do=edit), preview
- * and section edit buttons.
+ * This file provides styles for the tabinclude
  */
 
 
 /* + + + + +  plugin tabinclude  + + + + + */
 
 div#dwpl-ti-container {
-
-/* + + +  tabnav  + + + */
     li.dwpl-ti-tab {
         box-shadow: none;
-        border-color: @color-site-bg;
+        background-color: @ini_background_page_header;
+        border-color: @ini_border;
         border-radius: @fix_border-radius @fix_border-radius 0 0;
+        color: @ini_background_page_footer;
         padding: 0;
 
+        &:hover {
+            background-color: @ini_background_page_header;
+            text-decoration: none;
+
+            div {
+                text-decoration: underline;
+
+                &.selected {
+                    color: @ini_text;
+                }
+            }
+        }
+
         div {
-            background-color: @background_page-header;
             border-radius: inherit;
+            color: inherit;
             padding: .1em .35em;
 
             &.selected {
-                background-color: @color-site-bg;
+                position: relative;
+                z-index: 1;
+                background-color: @ini_background_content;
+                color: @ini_text;
             }
         }
     }
 
 
-/* + + +  box  + + + */
+/* + + +  content box  + + + */
     div.dwpl-ti-content-box {
+        position: relative;
+        z-index: 0;
         overflow: auto;
-        box-shadow: none;
-        background-color: @color-site-bg;
-        border: solid 1px @color-site-bg;
+        box-shadow: @box-shadow;
+        background-color: @ini_background_content;
+        border: solid 1px @ini_border;
         border-radius: 0;
+        margin-top: -1px;
     }
 }
 
@@ -42,7 +60,5 @@ div#dwpl-ti-container {
 /* media queries */
 
 @media @screen_max-md {
-    div#dwpl-ti-container {
-
-    }
+    div#dwpl-ti-container { }
 }
diff --git a/css/template_admin.less b/css/template_admin.less
index 1dc739c..285962a 100644
--- a/css/template_admin.less
+++ b/css/template_admin.less
@@ -1,42 +1,129 @@
+/**
+ * This file provides the design styles for the admin tools
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+
 .do-admin {
     #admin__version {
         font-size: @font-size-default;
     }
+
     .main-content ul {
-         > li{
+        > li {
             font-size: @font-size-default;
 
-             div.li{
-                 font-size: @font-size-default;
+            div.li {
+                font-size: @font-size-default;
 
-                 a{
-                     font-size: @font-size-default;
-                     line-height: 125%;
-                     cursor: pointer;
-                 }
-             }
-        }
-    }
-
-    ul.admin_tasks {
-        padding: 0;
-
-        li {
-            background-size: auto 1rem;
-            margin: 0 0 .6em 0;
-
-            a {
-                font-weight: 400;
+                a {
+                    font-size: @font-size-default;
+                    line-height: 125%;
+                    cursor: pointer;
+                }
             }
         }
     }
 
-    @media @screen_max-md {
-        ul.admin_tasks {
-            float: none;
-            width: auto;
-        }
+    div.ui-admin {
+        ul.admin_tasks,
+        ul.admin_plugins {
+            padding: 0;
 
+            li {
+                background-size: auto 1rem;
+                margin: 0 0 .6em 0;
+
+                a {
+                    color: @ini_existing;
+                    font-weight: 400;
+
+                    * {
+                        color: inherit;
+                    }
+
+                    span.icon {
+                        width: 1.6em;
+                        min-height: 1.6em;
+                        margin-top: -.3rem;
+                        margin-bottom: .3rem;
+
+                        svg {
+                            width: 26px;
+                            height: 26px;
+                            border: solid 1px @ini_background_content;
+                            border-radius: @ini_default_border_radius;
+                            fill: @ini_existing;
+                            transition: @transition background-color, @transition border-color, @transition fill;
+
+                            path {
+                                fill: @ini_existing;
+                                transition: @transition fill;
+                            }
+                        }
+                    }
+
+                    &:hover,
+                    &:focus,
+                    &:active {
+                        span.icon {
+                            svg {
+                                background-color: @ini_existing;
+                                border-color: @ini_existing;
+                                fill: @ini_background_content;
+
+                                path {
+                                    fill: @ini_background_content;
+                                }
+                            }
+                        }
+                    }
+                }
+            }
+        }
     }
 }
 
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* 1024px */
+
+@media @screen_max-md {
+    .do-admin {
+        div.ui-admin {
+            ul.admin_tasks {
+                width: 50%;
+                padding-top: 1rem;
+
+                li {
+                    white-space: normal;
+
+                    a {
+                        .display-flex(); // for better position with line breaks (white-space)
+
+                        span.icon {
+                            margin-top: -.3rem;
+                            margin-bottom: .3rem;
+                        }
+                    }
+                }
+            }
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* 768px */
+
+@media @screen_max-xs {
+    .do-admin {
+        div.ui-admin {
+            ul.admin_tasks {
+                width: auto;
+                padding-top: 1rem;
+            }
+        }
+    }
+}
diff --git a/img/down.svg b/img/down.svg
new file mode 100644
index 0000000..50b8625
--- /dev/null
+++ b/img/down.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7,10L12,15L17,10H7Z" /></svg>
\ No newline at end of file
diff --git a/img/file-export.svg b/img/file-export.svg
new file mode 100644
index 0000000..d1a3f2d
--- /dev/null
+++ b/img/file-export.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M6,2C4.89,2 4,2.9 4,4V20A2,2 0 0,0 6,22H18A2,2 0 0,0 20,20V8L14,2M13,3.5L18.5,9H13M8.93,12.22H16V19.29L13.88,17.17L11.05,20L8.22,17.17L11.05,14.35" /></svg>
\ No newline at end of file
diff --git a/img/up.svg b/img/up.svg
new file mode 100644
index 0000000..5fb8642
--- /dev/null
+++ b/img/up.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd"><svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" version="1.1" width="24" height="24" viewBox="0 0 24 24"><path d="M7,15L12,10L17,15H7Z" /></svg>
\ No newline at end of file
diff --git a/lang/de/lang.php b/lang/de/lang.php
index a45586b..2de4372 100755
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -1,16 +1,19 @@
 <?php
 /**
  * German language file for template
- *
+ *__background_site__
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
 
+
 $lang['direct_prefix']              = 'Direkt';
 $lang['direct_content_main']        = 'Hauptinhalt dieser Seite';
 $lang['direct_menu_main']           = 'Hauptmenü';
 
 $lang['adjunct_start_logo_text']    = 'Logo: ';
 $lang['adjunct_linked_logo_text']   = '. Link zur Startseite';
+$lang['a11y_search']                = 'geh zur Suche';
+$lang['a11y_sidebartoggle']         = 'Sidebar öffnen/schliessen';
 
 $lang['nav-area-head']              = 'Navigationsmenüs und Suche';
 $lang['head_magic_matcher']         = 'MagicMatcher';
@@ -27,6 +30,8 @@ $lang['meta_box_jira_tickets_none'] = 'Keine Jira-Tickets verknüpft';
 $lang['meta_box_tags_none']         = 'Keine Tags verknüpft';
 $lang['js']['meta_box_toc_none']    = 'kein Inhaltsverzeichnis vorhanden';
 
+$lang['tab_tags']                   = 'Tags';
+
 $lang['quality_trigger']            = 'Seitenanalyse ein- bzw. ausblenden';
 
 $lang['prefix_tasks']               = 'offene Aufgaben: ';
@@ -37,12 +42,44 @@ $lang['tasks_page_none']            = 'keine offenen Aufgaben für diese Seite';
 $lang['discussion']                 = 'Diskussion';
 $lang['back_to_article']            = 'Zurück zum Artikel';
 $lang['userpage']                   = 'Benutzer-Seite';
-$lang['__existing__']               = 'Schriftfarbe für Links zu vorhandenen Webseiten';
-$lang['__missing__']                = 'Schriftfarbe für Links zu nicht vorhandenen Webseiten';
-$lang['__site_width__']             = 'The width of the full site (can be any length unit: %, px, em, ...)';
-$lang['__sidebar_width__']          = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
 
-$lang['__button_color__']           = 'Schriftfarbe für Buttons';
-$lang['__button_background__']      = 'Hintergrundfarbe für Buttons';
 
-//Setup VIM: ex: et ts=2 :
+/**
+ * colors
+ */
+
+$lang['__site_width__']             = 'Content - Breite (in %)';
+
+$lang['__background__']             = 'Website - Hintergrundfarbe';
+$lang['__text_webframe__']          = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe';
+
+$lang['__nav_menu_color__']         = 'verlinkt: Navigation, Footer, Pagetools Icons, Tabbox - Schriftfarbe';
+$lang['__nav_menu_hover_color__']   = 'verlinkt: Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
+$lang['__nav_menu_hover_bg__']      = 'verlinkt: Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
+
+$lang['__background_content__']     = 'Content, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
+$lang['__text__']                   = 'Content: Text - Schriftfarbe';
+
+$lang['__background_neu__']         = 'Content neutral (nicht zu unterschiedlich zum Content-Hintergrund) - Hintergrundfarbe';
+$lang['__text_neu__']               = 'Content neutral - Schriftfarbe';
+
+$lang['__background_page_header__'] = 'Content: Header, Footer, Tabinclude Tab controlls deaktiviert - Hintergrundfarbe';
+$lang['__background_page_footer__'] = 'Content: Footer, Tabinclude Tab controlls deaktiviert - Schriftfarbe';
+
+$lang['__border_light__']           = 'Content: Header, Footer - Rahmenfarbe';
+
+$lang['__highlight__']              = 'Texthervorhebung (z.B. für Suchergebnisse) - Hintergrundfarbe';
+$lang['__highlight_text__']         = 'Texthervorhebung (z.B. für Suchergebnisse) - Schriftfarbe';
+
+$lang['__existing__']               = 'Links zu Wikiseiten, Stift, Pagetools (hover) - Schriftfarbe; Tabbox (hover) - Schriftfarbe, Rahmenfarbe';
+$lang['__link__']                   = 'Links zu nicht-Wikiseiten (externe Links) - Schriftfarbe';
+$lang['__missing__']                = 'Links zu nicht vorhandenen Wikiseiten - Schriftfarbe';
+
+$lang['__button_color__']           = 'Buttons - Schriftfarbe';
+$lang['__button_background__']      = 'Buttons - Hintergrundfarbe';
+
+$lang['__background_alt__']         = 'Tabellenkopf, hover: Tabellenzeile, struct Label - Hintergrundfarbe (alternativ)';
+$lang['__text_alt__']               = 'Tabellenkopf unverlinkt, hover: Tabellenzeile, struct Label - Schriftfarbe (alternativ)';
+
+$lang['__border__']                 = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe';
+$lang['__default_border_radius__']  = 'Wiki Icons, Content (oben rechts) - Borderradius';
diff --git a/lang/en/lang.php b/lang/en/lang.php
index b12f687..f634485 100755
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -5,6 +5,7 @@
  *  @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
 
+
 $lang['direct_prefix']              = 'jump to';
 $lang['direct_content_main']        = 'main content';
 $lang['direct_menu_main']           = 'main menu';
@@ -30,6 +31,7 @@ $lang['meta_box_tags_none']         = 'tags found: none';
 $lang['js']['meta_box_toc_none']    = 'no Table of Contents available';
 
 $lang['tab_tags']                   = 'Tags';
+$lang['tab_issues']                 = 'Issues';
 
 $lang['quality_trigger']            = 'toggle page analysis';
 
@@ -41,10 +43,44 @@ $lang['tasks_page_none']            = 'no open tasks for this page';
 $lang['discussion']                 = 'Discussion';
 $lang['back_to_article']            = 'Back to article';
 $lang['userpage']                   = 'User page';
-$lang['__existing__']               = 'The color for links to existing pages';
-$lang['__missing__']                = 'The color for links to non-existing pages';
-$lang['__site_width__']             = 'The width of the full site (can be any length unit: %, px, em, ...)';
-$lang['__sidebar_width__']          = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
 
-$lang['__button_color__']           = 'Color for buttons';
-$lang['__button_background__']      = 'Backgroundcolor for buttons';
+
+/**
+ * colors
+ */
+
+$lang['__site_width__']             = 'content - width (in %)';
+
+$lang['__background__']             = 'website - background color';
+$lang['__text_webframe__']          = 'website unlinked: claim, title, footer, navigation - font color';
+
+$lang['__nav_menu_color__']         = 'link: navigation, footer, pagetools icons, tabbox - font color';
+$lang['__nav_menu_hover_color__']   = 'link: navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color';
+$lang['__nav_menu_hover_bg__']      = 'link: navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color';
+
+$lang['__background_content__']     = 'content, breadcrumb, pagetools (hover) - background color';
+$lang['__text__']                   = 'content: text - font color';
+
+$lang['__background_neu__']         = 'Content neutral (not too different from the content background) - background color';
+$lang['__text_neu__']               = 'content neutral: text - font color';
+
+$lang['__background_page_header__'] = 'content: header, footer, tabinclude tab controlls deactivate - background color';
+$lang['__background_page_footer__'] = 'content: footer, tabinclude tab controlls deactivate - font color';
+
+$lang['__border_light__']           = 'content: header, footer - border color';
+
+$lang['__highlight__']              = 'text emphasize (e.g. for search results) - background color';
+$lang['__highlight_text__']         = 'text emphasize (e.g. for search results) - font color';
+
+$lang['__existing__']               = 'links to wikipages, pencil, pagetools (hover) - font color; tabbox (hover) - font color, border color';
+$lang['__link__']                   = 'links to non wikipages (external links) - font color';
+$lang['__missing__']                = 'links to non-existing pages - font color';
+
+$lang['__button_color__']           = 'buttons - font color';
+$lang['__button_background__']      = 'buttons - background color';
+
+$lang['__background_alt__']         = 'table head, hover: table cell, struct Label - background color (alternative)';
+$lang['__text_alt__']               = 'table head unlinked, hover: table cell, struct Label - font color (alternative)';
+
+$lang['__border__']                 = 'tables, form fields, blockquotes - border color';
+$lang['__default_border_radius__']  = 'wiki icons, content (top right) - border radius';
diff --git a/main.php b/main.php
index 332ff34..d4d546b 100755
--- a/main.php
+++ b/main.php
@@ -9,14 +9,13 @@
  * @license  GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
 
+use dokuwiki\template\sprintdoc\Template;
+
 if (!defined('DOKU_INC')) die();                        /* must be run from within DokuWiki */
 header('X-UA-Compatible: IE=edge,chrome=1');
 
 $showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) );
 $showSidebar =  true; /*  */
-$hasFooter = page_findnearest('pagefooter');
-$showFooter = $hasFooter && ($ACT === 'show');
-
 ?>
 <html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
 <head>
@@ -105,7 +104,7 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Wiki Title Mobile */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
-                                    <p class="title mobile-only">MO <?php echo $conf['title'] ?></p>
+                                    <p class="title mobile-only"><?php echo $conf['title'] ?></p>
                                 <?php endif ?>
                             </div><!-- .main-title -->
                         </div><!-- .headings -->
@@ -118,14 +117,14 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Wiki Title Desktop */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
-                                <p class="title">DO <?php echo $conf['title'] ?></p>
+                                <p class="title"><?php echo $conf['title'] ?></p>
                             <?php endif ?>
                             <?php if ($conf['tagline']):
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Wiki Tagline Desktop */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
-                                <p class="claim">DO <?php echo $conf['tagline'] ?></p>
+                                <p class="claim"><?php echo $conf['tagline'] ?></p>
                             <?php endif ?>
                         </div><!-- .main-title -->
                     </div><!-- .col -->
@@ -301,19 +300,13 @@ $classWideContent = ($ACT === "show") ? "": "wide-content ";
                                 tpl_content(false); /* the main content */
                             ?>
                             <div class="clearer"></div>
-                            <?php if($showFooter):
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Page Include Hook: pagefooter.txt */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                ?>
-                                <div class="wikipagefooter">
-                                    <hr>
-                                    <?php tpl_include_page('pagefooter', true, true) ?>
-                                    <div class="clearer"></div>
-                                </div>
-                            <?php endif; ?>
+                            <?php
+                            if($ACT == 'show') echo Template::getInstance()->getInclude(
+                                'footer',
+                                '<div class="wikipagefooter"><hr>',
+                                '<div class="clearer"></div></div>'
+                            );
+                            ?>
                         </div><!-- .main-content -->
 
 
diff --git a/style.ini b/style.ini
index 8701ca1..1fd8b20 100755
--- a/style.ini
+++ b/style.ini
@@ -77,6 +77,8 @@ css/area_main-content.less            = all
 css/area_main-content-secedit.less    = all
 css/area_togglelink.less              = all
 css/area_forms.less                   = all
+css/area_search.less                  = all
+css/area_tabs.less                    = all
 
 css/template_admin.less               = all
 
@@ -97,6 +99,8 @@ css/plugins/tagging.less              = all
 css/plugins/include.less              = all
 css/plugins/edittable.less            = all
 css/plugins/extension__manager.less   = all
+css/plugins/folded.less               = all
+css/plugins/configmanager.less        = all
 
 
 ; _____________  print styles  _____________
@@ -114,74 +118,72 @@ css/print.css                         = print
 [replacements]
 
 
-; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-; guaranteed dokuwiki color placeholders that every plugin can use
-; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+; guaranteed dokuwiki color placeholders that every plugin can use + template specific placeholders
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+; main content width (from this ASIDE is calculated)
+__site_width__              = "73%"              ; @ini_site_width
 
-; main text and background colors
-__text__                = "#252525"              ; @ini_text
-__background__          = "#ECECEC"              ; @ini_background
 
 ; alternative text and background colors
-__text_alt__            = "#454545"              ; @ini_text_alt
-__background_alt__      = "#f6f6f6"              ; @ini_background_alt
+__background__              = "#ECECEC"          ; @ini_background                         (guaranteed for every plugin)
 
-; neutral text and background colors
-__text_neu__            = "#656565"              ; @ini_text_neu
-__background_neu__      = "#ffffff"              ; @ini_background_neu
+__text_webframe__           = "#696969"          ; @ini_text_webframe
+
+
+; icons: usertools, pagetools, metabox, tabbox
+__nav_menu_color__          = "#696969"          ; @ini_nav_menu_color
+__nav_menu_hover_color__    = "#286da8"          ; @ini_nav_menu_hover_color
+__nav_menu_hover_bg__       = "#FFF"             ; @ini_nav_menu_hover_bg
+
+__background_content__      = "#FFF"             ; @ini_background_content
+__text__                    = "#252525"          ; @ini_text                               (guaranteed for every plugin)
+
+__background_neu__          = "#ffffff"          ; @ini_background_neu                     (guaranteed for every plugin)
+__text_neu__                = "#656565"          ; @ini_text_neu                           (guaranteed for every plugin)
+
+__background_page_header__  = "#F6F6F6"          ; @ini_background_page_header
+__border_light__            = "#dadada"          ; @ini_border_light
+__background_page_footer__  = "#252525"          ; @ini_background_page_footer
 
-; border color
-__border__              = "#bbbbbb"              ; @ini_border
 
 ; highlighted text (e.g. search snippets)
-__highlight__           = "#efefef"              ; @ini_highlight
+__highlight__               = "#efefef"          ; @ini_highlight                          (guaranteed for every plugin)
+__highlight_text__          = "#252525"          ; @ini_highlight_text
 
 
-
-; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-; template specific placeholders
-; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-
 ; these are used for links
-__link__                    = "#286DA8"                                                 ; @ini_link
-__existing__                = "#286DA8"                                                 ; @ini_existing
-__missing__                 = "#CD5360"                                                 ; @ini_missing
-
-; widths
-__site_width__              = "64em"                                                    ; @ini_site_width
-__sidebar_width__           = "16em"                                                    ; @ini_sidebar_width
-
-__font_family_screen__      = "arial, sans-serif"
-__font_family_menu__        = "arial, sans-serif"
-__font_family_print__       = "'times new roman', serif"
-
-__background_content__      = "#FFF"
-__background_site__         = "#ECECEC"
-__background_page-header__  = "#F6F6F6"
-
-__default_border_radius__   = "3px"
-__border_light__            = "#dadada"
-
-__box_shadow_colored__      = "0 0 .5em rgba(40,109,168,.5)"
-__box_shadow__              = "0 0 .5em rgb(153,153,153,.5)"
-__box_shadow_right_bottom__ = "0.1em 0.3rem 0.5em rgb(153,153,153,.5)"
-__box_shadow_bottom__       = "0 0.1em 0.5em rgb(153,153,153,.5)"
-__box_shadow_offset__       = ".1em .1em .1em rgb(153,153,153,.5)"
-
-__nav_direct_background__   = "#FFF"
-__nav_direct_color__        = "#286da8"
+__existing__                = "#286DA8"          ; @ini_existing
+__missing__                 = "#CD5360"          ; @ini_missing
+__link__                    = "#286DA8"          ; @ini_link
 
 
-; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
-; icons: usertools, pagetools, metabox, tabbox
-
-__nav_menu_color__          = "#696969"
-__nav_menu_hover_color__    = "#286da8"
-__nav_menu_hover_bg__       = "#FFF"
-
-
-; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 ; buttons: submit, links styled like buttons, togglebuttons
+__button_color__            = "#FFF"             ; @ini_button_color
+__button_background__       = "#286DA8"          ; @ini_button_background
 
-__button_color__            = "#FFF"
-__button_background__       = "#286DA8"
+__background_alt__          = "#f6f6f6"          ; @ini_background_alt                     (guaranteed for every plugin)
+__text_alt__                = "#454545"          ; @ini_text_alt                           (guaranteed for every plugin)
+
+
+; border color
+__border__                  = "#bbbbbb"          ; @ini_border                             (guaranteed for every plugin)
+
+__default_border_radius__   = "3px"              ; @ini_default_border_radius
+
+
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+; obsolete
+
+;__sidebar_width__           = "23%"
+
+;__font_family_screen__      = "arial, sans-serif"
+;__font_family_menu__        = "arial, sans-serif"
+;__font_family_print__       = "times new roman, serif"
+
+;__box_shadow_colored__      = "0 0 .5em rgba(40,109,168,.5)"
+;__box_shadow__              = "0 0 .5em rgb(153,153,153,.5)"
+;__box_shadow_right_bottom__ = "0.1em 0.3rem 0.5em rgb(153,153,153,.5)"
+;__box_shadow_bottom__       = "0 0.1em 0.5em rgb(153,153,153,.5)"
+;__box_shadow_offset__       = ".1em .1em .1em rgb(153,153,153,.5)"
diff --git a/tpl/nav-meta-box.php b/tpl/nav-meta-box.php
index 77328c5..c83145d 100755
--- a/tpl/nav-meta-box.php
+++ b/tpl/nav-meta-box.php
@@ -9,6 +9,9 @@ $tabs = \dokuwiki\template\sprintdoc\Template::getInstance()->getMetaBoxTabs();
         <li class="a11y">&nbsp;</li>
         <?php
         foreach($tabs as $tab) {
+            if (empty($tab['tab']) || trim($tab['tab']) === '') {
+                continue;
+            }
             echo '<li>';
             echo '<a href="#' . $tab['id'] . '" aria-expanded="false">';
             echo '<span class="prefix">';
@@ -27,6 +30,9 @@ $tabs = \dokuwiki\template\sprintdoc\Template::getInstance()->getMetaBoxTabs();
         <div class="box-content">
             <?php
             foreach($tabs as $tab) {
+                if (empty($tab['tab']) || trim($tab['tab']) === '') {
+                    continue;
+                }
                 echo '<div id="' . $tab['id'] . '" class="tab-pane" aria-hidden="true">';
                 echo $tab['tab'];
                 echo '</div>';