diff --git a/.gitattributes b/.gitattributes
deleted file mode 100644
index 050b5e0..0000000
--- a/.gitattributes
+++ /dev/null
@@ -1,2 +0,0 @@
-/.* export-ignore
-/_test export-ignore
diff --git a/.github/auto-comment.yml b/.github/auto-comment.yml
deleted file mode 100644
index f6a72e3..0000000
--- a/.github/auto-comment.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-# auto replies used by probot/auto-comment
-
-issuesOpened: >
-  Thank you for opening this issue.
-
-  [CosmoCode](https://www.cosmocode.de) is a software company in Berlin providing services for wiki, app and web development. As such we can't guarantee quick responses for issues opened on our Open Source projects.
-
-  If you require certain features or bugs fixed, you can always hire us. Feel free to contact us at dokuwiki@cosmocode.de for an offer.
-
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..0bc03db
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,18 @@
+sprintdoc-farm:
+  environment: sprintdoc-farm
+  tags:
+    - locally
+  only:
+    - live
+  script:
+    - fab deploy
+    
+
+cosmocode-farm:
+  environment: cosmocode-farm
+  tags:
+    - locally
+  only:
+    - live
+  script:
+    - fab deploy
\ No newline at end of file
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index d159169..0000000
--- a/LICENSE
+++ /dev/null
@@ -1,339 +0,0 @@
-                    GNU GENERAL PUBLIC LICENSE
-                       Version 2, June 1991
-
- Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The licenses for most software are designed to take away your
-freedom to share and change it.  By contrast, the GNU General Public
-License is intended to guarantee your freedom to share and change free
-software--to make sure the software is free for all its users.  This
-General Public License applies to most of the Free Software
-Foundation's software and to any other program whose authors commit to
-using it.  (Some other Free Software Foundation software is covered by
-the GNU Lesser General Public License instead.)  You can apply it to
-your programs, too.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-this service if you wish), that you receive source code or can get it
-if you want it, that you can change the software or use pieces of it
-in new free programs; and that you know you can do these things.
-
-  To protect your rights, we need to make restrictions that forbid
-anyone to deny you these rights or to ask you to surrender the rights.
-These restrictions translate to certain responsibilities for you if you
-distribute copies of the software, or if you modify it.
-
-  For example, if you distribute copies of such a program, whether
-gratis or for a fee, you must give the recipients all the rights that
-you have.  You must make sure that they, too, receive or can get the
-source code.  And you must show them these terms so they know their
-rights.
-
-  We protect your rights with two steps: (1) copyright the software, and
-(2) offer you this license which gives you legal permission to copy,
-distribute and/or modify the software.
-
-  Also, for each author's protection and ours, we want to make certain
-that everyone understands that there is no warranty for this free
-software.  If the software is modified by someone else and passed on, we
-want its recipients to know that what they have is not the original, so
-that any problems introduced by others will not reflect on the original
-authors' reputations.
-
-  Finally, any free program is threatened constantly by software
-patents.  We wish to avoid the danger that redistributors of a free
-program will individually obtain patent licenses, in effect making the
-program proprietary.  To prevent this, we have made it clear that any
-patent must be licensed for everyone's free use or not licensed at all.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                    GNU GENERAL PUBLIC LICENSE
-   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-  0. This License applies to any program or other work which contains
-a notice placed by the copyright holder saying it may be distributed
-under the terms of this General Public License.  The "Program", below,
-refers to any such program or work, and a "work based on the Program"
-means either the Program or any derivative work under copyright law:
-that is to say, a work containing the Program or a portion of it,
-either verbatim or with modifications and/or translated into another
-language.  (Hereinafter, translation is included without limitation in
-the term "modification".)  Each licensee is addressed as "you".
-
-Activities other than copying, distribution and modification are not
-covered by this License; they are outside its scope.  The act of
-running the Program is not restricted, and the output from the Program
-is covered only if its contents constitute a work based on the
-Program (independent of having been made by running the Program).
-Whether that is true depends on what the Program does.
-
-  1. You may copy and distribute verbatim copies of the Program's
-source code as you receive it, in any medium, provided that you
-conspicuously and appropriately publish on each copy an appropriate
-copyright notice and disclaimer of warranty; keep intact all the
-notices that refer to this License and to the absence of any warranty;
-and give any other recipients of the Program a copy of this License
-along with the Program.
-
-You may charge a fee for the physical act of transferring a copy, and
-you may at your option offer warranty protection in exchange for a fee.
-
-  2. You may modify your copy or copies of the Program or any portion
-of it, thus forming a work based on the Program, and copy and
-distribute such modifications or work under the terms of Section 1
-above, provided that you also meet all of these conditions:
-
-    a) You must cause the modified files to carry prominent notices
-    stating that you changed the files and the date of any change.
-
-    b) You must cause any work that you distribute or publish, that in
-    whole or in part contains or is derived from the Program or any
-    part thereof, to be licensed as a whole at no charge to all third
-    parties under the terms of this License.
-
-    c) If the modified program normally reads commands interactively
-    when run, you must cause it, when started running for such
-    interactive use in the most ordinary way, to print or display an
-    announcement including an appropriate copyright notice and a
-    notice that there is no warranty (or else, saying that you provide
-    a warranty) and that users may redistribute the program under
-    these conditions, and telling the user how to view a copy of this
-    License.  (Exception: if the Program itself is interactive but
-    does not normally print such an announcement, your work based on
-    the Program is not required to print an announcement.)
-
-These requirements apply to the modified work as a whole.  If
-identifiable sections of that work are not derived from the Program,
-and can be reasonably considered independent and separate works in
-themselves, then this License, and its terms, do not apply to those
-sections when you distribute them as separate works.  But when you
-distribute the same sections as part of a whole which is a work based
-on the Program, the distribution of the whole must be on the terms of
-this License, whose permissions for other licensees extend to the
-entire whole, and thus to each and every part regardless of who wrote it.
-
-Thus, it is not the intent of this section to claim rights or contest
-your rights to work written entirely by you; rather, the intent is to
-exercise the right to control the distribution of derivative or
-collective works based on the Program.
-
-In addition, mere aggregation of another work not based on the Program
-with the Program (or with a work based on the Program) on a volume of
-a storage or distribution medium does not bring the other work under
-the scope of this License.
-
-  3. You may copy and distribute the Program (or a work based on it,
-under Section 2) in object code or executable form under the terms of
-Sections 1 and 2 above provided that you also do one of the following:
-
-    a) Accompany it with the complete corresponding machine-readable
-    source code, which must be distributed under the terms of Sections
-    1 and 2 above on a medium customarily used for software interchange; or,
-
-    b) Accompany it with a written offer, valid for at least three
-    years, to give any third party, for a charge no more than your
-    cost of physically performing source distribution, a complete
-    machine-readable copy of the corresponding source code, to be
-    distributed under the terms of Sections 1 and 2 above on a medium
-    customarily used for software interchange; or,
-
-    c) Accompany it with the information you received as to the offer
-    to distribute corresponding source code.  (This alternative is
-    allowed only for noncommercial distribution and only if you
-    received the program in object code or executable form with such
-    an offer, in accord with Subsection b above.)
-
-The source code for a work means the preferred form of the work for
-making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
-associated interface definition files, plus the scripts used to
-control compilation and installation of the executable.  However, as a
-special exception, the source code distributed need not include
-anything that is normally distributed (in either source or binary
-form) with the major components (compiler, kernel, and so on) of the
-operating system on which the executable runs, unless that component
-itself accompanies the executable.
-
-If distribution of executable or object code is made by offering
-access to copy from a designated place, then offering equivalent
-access to copy the source code from the same place counts as
-distribution of the source code, even though third parties are not
-compelled to copy the source along with the object code.
-
-  4. You may not copy, modify, sublicense, or distribute the Program
-except as expressly provided under this License.  Any attempt
-otherwise to copy, modify, sublicense or distribute the Program is
-void, and will automatically terminate your rights under this License.
-However, parties who have received copies, or rights, from you under
-this License will not have their licenses terminated so long as such
-parties remain in full compliance.
-
-  5. You are not required to accept this License, since you have not
-signed it.  However, nothing else grants you permission to modify or
-distribute the Program or its derivative works.  These actions are
-prohibited by law if you do not accept this License.  Therefore, by
-modifying or distributing the Program (or any work based on the
-Program), you indicate your acceptance of this License to do so, and
-all its terms and conditions for copying, distributing or modifying
-the Program or works based on it.
-
-  6. Each time you redistribute the Program (or any work based on the
-Program), the recipient automatically receives a license from the
-original licensor to copy, distribute or modify the Program subject to
-these terms and conditions.  You may not impose any further
-restrictions on the recipients' exercise of the rights granted herein.
-You are not responsible for enforcing compliance by third parties to
-this License.
-
-  7. If, as a consequence of a court judgment or allegation of patent
-infringement or for any other reason (not limited to patent issues),
-conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot
-distribute so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you
-may not distribute the Program at all.  For example, if a patent
-license would not permit royalty-free redistribution of the Program by
-all those who receive copies directly or indirectly through you, then
-the only way you could satisfy both it and this License would be to
-refrain entirely from distribution of the Program.
-
-If any portion of this section is held invalid or unenforceable under
-any particular circumstance, the balance of the section is intended to
-apply and the section as a whole is intended to apply in other
-circumstances.
-
-It is not the purpose of this section to induce you to infringe any
-patents or other property right claims or to contest validity of any
-such claims; this section has the sole purpose of protecting the
-integrity of the free software distribution system, which is
-implemented by public license practices.  Many people have made
-generous contributions to the wide range of software distributed
-through that system in reliance on consistent application of that
-system; it is up to the author/donor to decide if he or she is willing
-to distribute software through any other system and a licensee cannot
-impose that choice.
-
-This section is intended to make thoroughly clear what is believed to
-be a consequence of the rest of this License.
-
-  8. If the distribution and/or use of the Program is restricted in
-certain countries either by patents or by copyrighted interfaces, the
-original copyright holder who places the Program under this License
-may add an explicit geographical distribution limitation excluding
-those countries, so that distribution is permitted only in or among
-countries not thus excluded.  In such case, this License incorporates
-the limitation as if written in the body of this License.
-
-  9. The Free Software Foundation may publish revised and/or new versions
-of the General Public License from time to time.  Such new versions will
-be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the Program
-specifies a version number of this License which applies to it and "any
-later version", you have the option of following the terms and conditions
-either of that version or of any later version published by the Free
-Software Foundation.  If the Program does not specify a version number of
-this License, you may choose any version ever published by the Free Software
-Foundation.
-
-  10. If you wish to incorporate parts of the Program into other free
-programs whose distribution conditions are different, write to the author
-to ask for permission.  For software which is copyrighted by the Free
-Software Foundation, write to the Free Software Foundation; we sometimes
-make exceptions for this.  Our decision will be guided by the two goals
-of preserving the free status of all derivatives of our free software and
-of promoting the sharing and reuse of software generally.
-
-                            NO WARRANTY
-
-  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
-OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
-TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
-PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-REPAIR OR CORRECTION.
-
-  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-POSSIBILITY OF SUCH DAMAGES.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software; you can redistribute it and/or modify
-    it under the terms of the GNU General Public License as published by
-    the Free Software Foundation; either version 2 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU General Public License for more details.
-
-    You should have received a copy of the GNU General Public License along
-    with this program; if not, write to the Free Software Foundation, Inc.,
-    51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If the program is interactive, make it output a short notice like this
-when it starts in an interactive mode:
-
-    Gnomovision version 69, Copyright (C) year name of author
-    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-    This is free software, and you are welcome to redistribute it
-    under certain conditions; type `show c' for details.
-
-The hypothetical commands `show w' and `show c' should show the appropriate
-parts of the General Public License.  Of course, the commands you use may
-be called something other than `show w' and `show c'; they could even be
-mouse-clicks or menu items--whatever suits your program.
-
-You should also get your employer (if you work as a programmer) or your
-school, if any, to sign a "copyright disclaimer" for the program, if
-necessary.  Here is a sample; alter the names:
-
-  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-  `Gnomovision' (which makes passes at compilers) written by James Hacker.
-
-  <signature of Ty Coon>, 1 April 1989
-  Ty Coon, President of Vice
-
-This General Public License does not permit incorporating your program into
-proprietary programs.  If your program is a subroutine library, you may
-consider it more useful to permit linking proprietary applications with the
-library.  If this is what you want to do, use the GNU Lesser General
-Public License instead of this License.
diff --git a/README b/README
old mode 100644
new mode 100755
index 6cadc0c..89f53df
--- a/README
+++ b/README
@@ -1,27 +1,7 @@
-sprintdoc template for DokuWiki
+sprintDoc Template (FIXME URL)
+for DokuWiki [https://www.dokuwiki.org]
+by Jana Deutschlaender <deutschlaender@cosmocode.de>
 
-modern, responsive template that integrates multiple plugins
 
-All documentation for this template can be found at
-https://www.dokuwiki.org/template:sprintdoc
-
-If you install this template manually, make sure it is installed in
-lib/tpl/sprintdoc/ - if the folder is called different it
-will not work!
-
-Please refer to http://www.dokuwiki.org/extensions for additional info
-on how to install extensions in DokuWiki.
-
-----
-Copyright (C) Jana Deutschlaender <dokuwiki@cosmocode.de>
-
-This program is free software; you can redistribute it and/or modify
-it under the terms of the GNU General Public License as published by
-the Free Software Foundation; version 2 of the License
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU General Public License for more details.
-
-See the LICENSING file for details
+Version: see template.info.txt
+License: GPL2, see COPYING
diff --git a/README.md b/README.md
new file mode 100755
index 0000000..216f47d
--- /dev/null
+++ b/README.md
@@ -0,0 +1 @@
+# sprintDoc Template for dokuwiki
diff --git a/Template.php b/Template.php
index 1cd2739..7eae3ae 100644
--- a/Template.php
+++ b/Template.php
@@ -11,19 +11,15 @@ namespace dokuwiki\template\sprintdoc;
  */
 class Template {
 
-    /** @var array loaded plugins */
+    /**
+     * @var array loaded plugins
+     */
     protected $plugins = array(
         'sqlite' => null,
         'tagging' => null,
         'magicmatcher' => null,
-        'tplinc' => null,
-        'sitemapnavi' => null,
     );
 
-    /** @var string the type of special navigation to use */
-    protected $nav = '';
-
-
     /**
      * Get the singleton instance
      *
@@ -40,26 +36,12 @@ class Template {
      */
     protected function __construct() {
         $this->initializePlugins();
-        $this->initNavigationCookie();
 
         /** @var \Doku_Event_Handler */
         global $EVENT_HANDLER;
         $EVENT_HANDLER->register_hook('PLUGIN_TPLINC_LOCATIONS_SET', 'BEFORE', $this, 'registerIncludes');
     }
 
-    /**
-     * Load all the plugins we support directly
-     */
-    protected function initializePlugins() {
-        $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');
-        $this->plugins['sitemapnavi'] = plugin_load('helper', 'sitemapnavi');
-    }
-
     /**
      * Makes include position info available to the tplinc plugin
      *
@@ -69,8 +51,6 @@ class Template {
         $event->data['footer'] = 'Footer below the page content';
         $event->data['sidebarfooter'] = 'Footer below the sidebar';
         $event->data['sidebarheader'] = 'Header above the sidebar';
-        $event->data['navtop'] = 'Additional navigation items at the top';
-        $event->data['navbottom'] = 'Additional navigation items at the bottom';
     }
 
     /**
@@ -91,81 +71,15 @@ class Template {
     }
 
     /**
-     * Sets a cookie to remember the requested special navigation
+     * Load all the plugins we support directly
      */
-    protected function initNavigationCookie() {
-        if ($this->plugins['sitemapnavi'] === null) return;
-        global $INPUT;
-
-        $nav = $INPUT->str('nav');
-        if($nav) {
-            set_doku_pref('nav', $nav);
-            $this->nav = $INPUT->str('nav');
-        } else {
-            $this->nav = get_doku_pref('nav', 'sidebar');
+    protected function initializePlugins() {
+        $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');
         }
-    }
-
-    /**
-     * Return the navigation for the sidebar
-     *
-     * Defaults to the standard sidebar mechanism, but supports also the sitemapnavi plugin
-     *
-     * @return string
-     */
-    public function getNavigation() {
-        global $ID;
-        global $conf;
-
-        // id of the current sidebar, each sidebar must have its own state
-        $header = sprintf('<div id="sidebarId" class="%s"></div>', md5(page_findnearest($conf['sidebar'])));
-        // add tabs if multiple navigation types available
-        if ($this->plugins['sitemapnavi'] !== null) {
-            $header .= '<ul class="sidebar-tabs">';
-            $header .= '<li class="' . ($this->nav === 'sidebar' ? 'active' : '') . '">' .
-                '<a href="' . wl($ID, ['nav' => 'sidebar']) . '">'.tpl_getLang('nav_sidebar').'</a></li>';
-            $header .= '<li class="' . ($this->nav === 'sitemap' ? 'active' : '') . '">' .
-                '<a href="' . wl($ID, ['nav' => 'sitemap']) . '">'.tpl_getLang('nav_sitemap').'</a></li>';
-            $header .= '</ul>';
-        }
-
-        // decide what to show
-        if ($this->nav === 'sitemap') {
-            // site tree created by sitemapnavi plugin
-            $nav = '<nav class="nav-sitemapnavi" id="plugin__sitemapnavi">';
-            $nav .= $this->plugins['sitemapnavi']->getSiteMap(':');
-            $nav .= '</nav>';
-        } else {
-            // main navigation, loaded from standard sidebar, fixed up by javascript
-            $nav = '<nav class="nav-main">';
-            // immeadiately hide the navigation (if javascript available)
-            // it will be restyled and made visible again by our script later
-            $nav .= '<script type="application/javascript">
-                        document.getElementsByClassName("nav-main")[0].style.visibility = "hidden";
-                     </script>';
-
-            $nav .= $this->getInclude('navtop');
-            $nav .= tpl_include_page($conf['sidebar'], false, true);
-            $nav .= $this->getInclude('navbottom');
-            $nav .= '</nav>';
-        }
-
-        return $header . $nav;
-    }
-
-    /**
-     * Default class defining is the sidebar should collapse
-     *
-     * @return string
-     */
-    public function fullWidthClass() {
-        global $ACT;
-        // no auto collapsing? empty class
-        if (!tpl_getConf('autocollapse')) return '';
-        // mode show? empty class
-        if ($ACT === "show") return '';
-        // anything else? wide content
-        return 'wide-content ';
+        $this->plugins['tplinc'] = plugin_load('helper', 'tplinc');
     }
 
     /**
@@ -174,7 +88,7 @@ class Template {
      * @return array
      */
     public function getMetaBoxTabs() {
-        global $lang, $INFO;
+        global $lang;
         $tabs = array();
 
         $toc = tpl_toc(true);
@@ -192,7 +106,7 @@ class Template {
                 'id' => 'spr__tab-tags',
                 'label' => tpl_getLang('tab_tags'),
                 'tab' => $this->plugins['tagging']->tpl_tags(false),
-                'count' => count($this->plugins['tagging']->findItems(array('pid' => $INFO['id']), 'tag')),
+                'count' => null, // FIXME
             );
         }
 
@@ -215,10 +129,9 @@ class Template {
      * @param array $attributes
      * @param int $w
      * @param int $h
-     * @param bool $crop
      * @return string
      */
-    public static function getResizedImgTag($tag, $attributes, $w, $h, $crop = true) {
+    public static function getResizedImgTag($tag, $attributes, $w, $h) {
         $attr = '';
         $medias = array();
 
@@ -241,7 +154,7 @@ class Template {
         if($media === '') return '';
 
         // replace the array
-        $media = ml($media, array('w' => $w, 'h' => $h, 'crop' => (int) $crop), true, '&');
+        $media = ml($media, array('w' => $w, 'h' => $h, 'crop' => 1), true, '&');
         $attributes[$attr] = $media;
 
         // return the full tag
@@ -264,62 +177,32 @@ class Template {
             $title = tpl_getLang('adjunct_start_logo_text') . $conf['title'];
         }
 
-        $logo = <<<HTML
-<img class="mobile-hide dark-only" src="/_media/wiki:logo-on.svg" alt="EH22 DEMO">
-<img class="mobile-hide light-only" src="/_media/wiki:logo-off.svg" alt="EH22 DEMO">
-HTML;
+        $desktop = self::getResizedImgTag(
+            'img',
+            array(
+                'class' => 'mobile-hide',
+                'src' => array(tpl_getConf('logo'), 'wiki:logo-wide.png', 'wiki:logo.png'),
+                'alt' => $title,
+            ),
+            0, 0
+        );
+        $mobile = self::getResizedImgTag(
+            'img',
+            array(
+                'class' => 'mobile-only',
+                'src' => array('wiki:logo-32x32.png', 'wiki:favicon.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo')),
+                'alt' => $title,
+            ),
+            32, 32
+        );
 
         // homepage logo should not link to itself (BITV accessibility requirement)
         if($linkit) {
-            tpl_link(wl(), $logo, 'accesskey="h" title="[H]"');
+            tpl_link(wl(), $desktop, 'accesskey="h" title="[H]"');
+            tpl_link(wl(), $mobile, 'accesskey="h" title="[H]"');
         } else {
-            echo $logo;
+            echo $desktop;
+            echo $mobile;
         }
     }
-
-    /**
-     * Add the current mode information to the hierarchical breadcrumbs
-     */
-    public function breadcrumbSuffix() {
-        global $ACT;
-        global $lang;
-        global $INPUT;
-        global $ID;
-        global $conf;
-        global $IMG;
-        if($ACT == 'show') return;
-
-        // find an apropriate label for the current mode
-        if($ACT) {
-            $label = tpl_getLang('mode_' . $ACT);
-            if(!$label) {
-                if(isset($lang['btn_' . $ACT])) {
-                    $label = $lang['btn_' . $ACT];
-                } else {
-                    $label = $ACT;
-                }
-            }
-        } else {
-            // actually we would need to create a proper namespace breadcrumb path here,
-            // but this is the most simplest thing we can do for now
-            if(defined('DOKU_MEDIADETAIL')) {
-                $label = hsc(noNS($IMG));
-            } else {
-                return;
-            }
-        }
-
-        if($ACT == 'admin' && $INPUT->has('page')) {
-            $link = wl($ID, array('do' => 'admin'));
-            echo '<bdi> : <a href="' . $link . '"><strong>' . $label . '</strong></a></bdi>';
-
-            /** @var \DokuWiki_Admin_Plugin $plugin */
-            $plugin = plugin_load('admin', $INPUT->str('page'));
-            if(!$plugin) return;
-
-            $label = $plugin->getMenuText($conf['lang']);
-        }
-
-        echo '<bdi><span class="curid"> : <strong>' . $label . '</strong></span></bdi>';
-    }
 }
diff --git a/conf/default.php b/conf/default.php
index f666d04..108f53a 100755
--- a/conf/default.php
+++ b/conf/default.php
@@ -4,8 +4,13 @@
  *
  */
 
-$conf['sidebar_sections'] = 'h1,h2,h3,h4,h5';
-$conf['header_layout'] = 'header-default';
-$conf['autocollapse'] = 1;
-$conf['closedwiki'] = 0;
-$conf['copyright'] = '';
+$conf['logo']             = 'wiki:logo.png';
+$conf['mobile_logo']      = 'images/fav/favicon-32x32.png';
+
+$conf['logo_spacer']      = 'logo_spacer.png';
+
+$conf['discussionPage']   = 'discussion:@ID@';
+$conf['userPage']         = 'user:@USER@:';
+$conf['user_ns']          = 'user';
+$conf['hideTools']        = 0;
+$conf['tasks_page']       = 'dashboard';
diff --git a/conf/metadata.php b/conf/metadata.php
index 863b778..f0f0808 100755
--- a/conf/metadata.php
+++ b/conf/metadata.php
@@ -1,23 +1,14 @@
 <?php
+/*
+ * configuration metadata
+ *
+ */
 
-$meta['sidebar_sections'] = array(
-                                'multichoice',
-                                '_choices' => array(
-                                    'h1',
-                                    'h1,h2',
-                                    'h1,h2,h3,h4,h5',
-                                    'li.level1 > .li',
-                                ),
-                            );
+$meta['logo']             = array('string');
+$conf['logo_spacer']      = array('string');
 
-$meta['header_layout'] = array(
-                            'multichoice',
-                            '_choices' => array(
-                                'header-default',
-                                'header-compact',
-                            ),
-                        );
-
-$meta['autocollapse'] = array('onoff');
-$meta['closedwiki'] = array('onoff');
-$meta['copyright'] = array('');
+$meta['discussionPage']   = array('string');
+$meta['userPage']         = array('string');
+$conf['user_ns']          = array('string');
+$meta['hideTools']        = array('onoff');
+$meta['tasks_page']       = array('string');
diff --git a/css/area_content.less b/css/area_content.less
index 67f2840..1526394 100755
--- a/css/area_content.less
+++ b/css/area_content.less
@@ -1,53 +1,54 @@
 /**
  * This file provides the design styles for the page content.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
-.picker {
-    z-index: 2; // position over .content
-}
-
 .content .row {
     > .col-xs-12 {
-        z-index: 1;
-
-        background-color: var(--color-background);
-
+        box-shadow: @box-shadow;
 
         #dokuwiki__content {
             position: relative;
+            z-index: 10;
 
-            .page-content {
-                padding-top: @page-header_height;
+            &::before {
+                content: '';
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: -1;
+                height: @page-header_height;
+                box-sizing: border-box;
+                width: 100%;
+                background-color: @ini_background_page_header;
+                border-bottom: 1px solid @ini_border_light;
+            }
 
-                .msg-area + * {
-                    clear: both;
-                    padding-top: 1em; // as h1
-                }
+            #plugin__highlightparent {
+                display: block;
             }
         }
     }
-    @media @screen_min-md {
-        > .col-xs-12 {
-            border-left: dashed 0.25em var(--color-shade-4);
-            border-radius: 0;
-        }
-    }
 }
 
+
 .main-content > .level2,
 .main-content > .level1,
 .main-content > .level3,
 .main-content > .level4,
 .main-content > .level5,
 .main-content > .level6 {
-    > p,
-    > ul > li .li {
+    //padding-bottom: 1rem;
+
+    > p, > ul > li .li {
         a {
             font-size: inherit;
         }
     }
 }
 
+
 .level1,
 .level2,
 .level3,
diff --git a/css/area_footer.less b/css/area_footer.less
index 7e103bd..39b068e 100755
--- a/css/area_footer.less
+++ b/css/area_footer.less
@@ -1,16 +1,20 @@
 /**
  * This file provides the design styles for the page footer
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* no print */
+
 @media screen {
     .page-footer {
         min-height: @page-header_height;
-        background-color: var(--color-background);
-        border-top: 1px solid var(--color-shade-4);
+        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: var(--color-shade-4);
+        color: @ini_background_page_footer;
         font-size: @font-size-default;
         text-align: right;
         padding: @margin-small @margin-default;
@@ -22,34 +26,34 @@
         }
 
         bdi {
-            display: inline-block;
-            max-width: 100%;
-            overflow-x: auto;
-            overflow-y: hidden;
             font-weight: bold;
-            vertical-align: bottom;
         }
     }
 
     #dokuwiki__footer {
         .main-footer {
             position: relative;
+            z-index: 2;
             box-sizing: border-box;
-            background-color: var(--color-background);
-            margin-top: 5px; // for box-shadow of content
-            text-align: center;
+            background-color: @ini_background;
         }
 
         p {
-            color: var(--color-shade-4);
+            color: @ini_text_webframe;
             font-size: @font-size-default;
             margin: 0;
         }
+
+        a {
+            color: @ini_nav_menu_color;
+        }
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* min-width: 1024px */
+
 @media @screen_min-md {
     #dokuwiki__footer {
         .col-xs-12 {
@@ -74,16 +78,17 @@
         &.showSidebar {
             #dokuwiki__footer {
                 .col-xs-12 {
-                    width: 100%;
-                    padding-left: @toggle-showsidebar_width;
+                    margin-left: @toggle-showsidebar_width;
                 }
             }
         }
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1023px */
+
 @media @screen_max-md {
     #dokuwiki__footer {
         .main-footer {
@@ -93,8 +98,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 768px */
+
 @media @screen_max-xs {
     .page-footer {
         padding-left: @margin-small;
@@ -111,8 +118,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 480px */
+
 @media @screen_max-xxs {
     #dokuwiki__footer {
         .main-footer {
diff --git a/css/area_footnotes.less b/css/area_footnotes.less
deleted file mode 100644
index 87abded..0000000
--- a/css/area_footnotes.less
+++ /dev/null
@@ -1,55 +0,0 @@
-/**
- * This file provides the design styles for the footnotes.
- */
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* footnotes section  */
-.dokuwiki div.footnotes {
-  div.fn {
-    margin-bottom: .2rem;
-    display: table;
-    vertical-align: top;
-
-    > sup,
-    .content {
-      display: table-cell;
-    }
-
-    > sup {
-      vertical-align: top;
-
-      // footnote anchor
-      a.fn_bot {
-        font-size: .86em;
-        padding-right: .2em;
-      }
-    }
-
-    .content {
-      vertical-align: top;
-      line-height: 135%;
-    }
-
-    // footnote text
-    div.content {
-      line-height: 135%;
-    }
-  }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* footnotes in content  */
-.main-content sup,
-.main-content > div > p sup,
-.main-content > div > ul > li .li sup {
-  a.fn_top {
-    font-size: .7rem;
-    font-weight: bold;
-    padding-right: .2em;
-  }
-}
-
-.insitu-footnote {
-  line-height: 130%;
-  z-index: 100;
-}
diff --git a/css/area_forms.less b/css/area_forms.less
index d7be3cf..6469546 100644
--- a/css/area_forms.less
+++ b/css/area_forms.less
@@ -1,13 +1,18 @@
 /**
  * This file provides the design styles for forms.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 /* for all of the form styles, style.ini colours are not used on purpose (except for fieldset border) */
+
 form {
     display: inline;
     margin: 0;
     padding: 0;
 
+
     // multiline label
     fieldset > label.block > span:first-child {
         display: inline-block;
@@ -20,6 +25,34 @@ form {
             width: 48.5%;
         }
     }
+
+
+    // older version (history)
+    .dokuwiki & > .no > ul > li {
+        min-height: 2rem;
+        vertical-align: baseline;
+
+        a,
+        span,
+        img {
+            vertical-align: baseline;
+        }
+
+        img {
+            margin-left: 4px;
+            margin-right: 4px;
+        }
+
+        input[type="checkbox"] {
+            margin-bottom: .2rem;
+        }
+
+        span.user bdi {
+            a {
+                vertical-align: baseline;
+            }
+        }
+    }
 }
 
 fieldset {
@@ -59,8 +92,8 @@ meter,
 progress {
     font: inherit;
     font-weight: normal;
-    color: var(--color-foreground);
-    background-color: var(--color-background);
+    color: #333;
+    background-color: #fff;
     line-height: normal;
     margin: 0;
     vertical-align: middle;
@@ -90,25 +123,13 @@ textarea,
 select,
 keygen {
     min-height: @formfield_min-height;
-    border: 1px solid var(--color-shade-4);
+    border: 1px solid @ini_border;
+    box-shadow: inset 0 0 1px #eee;
     border-radius: @fix_border-radius;
     padding-left: .3rem;
     padding-right: .3rem;
 }
 
-input[type="radio"],
-input[type="checkbox"] {
-    min-height: 1rem;
-}
-
-input[type="radio"],
-input[type="checkbox"],
-input[type="image"] {
-    padding: 0;
-    border-style: none;
-    //box-shadow: none; :in ie picture and checkbox disappear
-}
-
 input:active,
 input:focus,
 textarea:active,
@@ -117,7 +138,15 @@ select:active,
 select:focus,
 keygen:active,
 keygen:focus {
-    border-color: var(--color-shade-4);
+    border-color: #999;
+}
+
+input[type="radio"],
+input[type="checkbox"],
+input[type="image"] {
+    padding: 0;
+    border-style: none;
+    box-shadow: none;
 }
 
 input[type="file"] {
@@ -125,6 +154,7 @@ input[type="file"] {
     padding-bottom: .1rem;
 }
 
+
 /* + + + + +  buttons  + + + + + */
 button {
     background-color: #eee;
@@ -147,6 +177,7 @@ button {
     }
 }
 
+
 /* + + +  all types of submit-buttons  + + + */
 form input[type=submit], // heredity 'adnewpage'
 a.button,
@@ -157,33 +188,31 @@ button[type=submit],
     cursor: pointer;
     box-shadow: none;
     background-image: none;
-    background-color: var(--color-shade-1);
-    border: solid 0.1rem var(--color-shade-2);
-    border-radius: 0.5rem;
-    color: var(--color-foreground);
+    background-color: @ini_button_background;
+    border: 1px solid @ini_button_background;
+    border-radius: @fix_border-radius;
+    color: @ini_button_color;
     vertical-align: top;
     padding: .3em @grid;
+    transition: @transition background-color, @transition color;
 
     &:hover,
     &:active,
     &:focus {
-        background-color: transparent;
-        color: var(--color-glow-primary);
-        border-color: var(--color-glow-primary);
-        transition: var(--transition-glow);
-        filter: var(--filter-glow-primary);
+        background-color: @ini_button_color;
+        color: @ini_button_background;
     }
 }
 
 button[type='reset'] {
-    min-height: @formfield_min-height;
+    min-height: 2rem;
     vertical-align: middle;
     padding: .3em 1rem;
 }
 
 input[type=submit],
 button[type=submit] {
-    min-height: @formfield_min-height;
+    min-height: 2rem;
     vertical-align: middle;
 
     &[disabled] {
@@ -206,6 +235,7 @@ button[type=submit] {
     }
 }
 
+
 /* + + +  all types of buttons not being submit-buttons  + + + */
 input.button,
 input[type=button] {
@@ -229,6 +259,7 @@ input[type=button] {
     }
 }
 
+
 /* + + +  all disabled buttons  + + + */
 input[disabled],
 button[disabled],
@@ -240,11 +271,13 @@ button[readonly],
 select[readonly],
 textarea[readonly] {
     cursor: auto;
-    background-color: var(--color-background);
+    background-image: url(data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAlIiBoZWlnaHQ9IjEwMCUiIHZpZXdCb3g9IjAgMCAxIDEiIHByZXNlcnZlQXNwZWN0UmF0aW89Im5vbmUiPgo8bGluZWFyR3JhZGllbnQgaWQ9Imc4MjQiIGdyYWRpZW50VW5pdHM9InVzZXJTcGFjZU9uVXNlIiB4MT0iMCUiIHkxPSIwJSIgeDI9IjAlIiB5Mj0iMTAwJSI+CjxzdG9wIHN0b3AtY29sb3I9IiNGRkZGRkYiIG9mZnNldD0iMCIvPjxzdG9wIHN0b3AtY29sb3I9IiNGNEY0RjQiIG9mZnNldD0iMC4zIi8+PHN0b3Agc3RvcC1jb2xvcj0iI0VFRUVFRSIgb2Zmc2V0PSIwLjk5Ii8+PHN0b3Agc3RvcC1jb2xvcj0iI0NDQ0NDQyIgb2Zmc2V0PSIuOTkiLz4KPC9saW5lYXJHcmFkaWVudD4KPHJlY3QgeD0iMCIgeT0iMCIgd2lkdGg9IjEiIGhlaWdodD0iMSIgZmlsbD0idXJsKCNnODI0KSIgLz4KPC9zdmc+);
+    background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
+    background-color: #eee;
     opacity: .5;
     border: 1px solid @ini_border;
     border-radius: @fix_border-radius;
-    color: var(--color-shade-4);
+    color: #333;
     font-weight: normal;
     padding: .3em @grid;
     transition: @transition background-color, @transition color;
@@ -266,8 +299,10 @@ button::-moz-focus-inner {
     padding: 0;
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* media queries - Styles for auth forms */
+
 @media @screen_max-xs {
     .tpl_sprintdoc {
         #dw__login,
diff --git a/css/area_header.less b/css/area_header.less
index b041641..e02bf1a 100755
--- a/css/area_header.less
+++ b/css/area_header.less
@@ -1,31 +1,37 @@
 /**
  * This file provides the design styles for the page header.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 #dokuwiki__header {
     @header-font-opacity: 1;
 
-    @media @screen_max-xs {
-        min-height: 120px;
-    }
-
-    /* + + +  wiki logo  + + + */
+/* + + +  wiki logo  + + + */
     @media @screen_min-md {
+        div.claim {
+            display: table-cell;
+            height: 100%;
+            vertical-align: middle;
+        }
+
         .logo {
             padding: 1rem 0 .3rem;
-            text-align: center;
 
             img {
-                height: 200px;
+                height: 4.6rem;
                 width: auto;
-                transition: transform 200ms ease-in-out;
+                border-style: solid;
+                border-color: transparent;
+                border-width: 2px 0;
             }
 
             a:hover,
             a:focus,
             a:active {
                 img {
-                    transform: scale(1.05);
+                    border-width: 0;
                 }
             }
         }
@@ -33,13 +39,7 @@
 
     @media @screen_max-md {
         .logo {
-            //display: table-cell;
-            text-align: center;
-            width: 100%;
-
-            img {
-                max-height: 200px;
-            }
+            display: table-cell;
 
             .mobile-only {
                 margin: .8rem 1rem .6rem 0;
@@ -47,7 +47,8 @@
         }
     }
 
-    /* + + + + +  DESKTOP  -  wiki title + claim  + + + + + */
+
+/* + + +  wiki title + claim  + + + */
     .main-title.desktop-only {
         @media @screen_min-md {
             display: table-cell;
@@ -69,28 +70,20 @@
                 display: block;
                 padding-bottom: 1rem;
             }
-
-            @media @screen_max-xs {
-                padding-right: (@toggle-size + @headericons-margin-xxs);
-            }
         }
     }
 
-    /* + + + + +  MOBILE  -  wiki title wrapper  + + + + + */
     .main-title:not([class*="desktop-only"]) {
         @media @screen_max-md {
             display: table-cell;
             vertical-align: middle;
         }
-
-        @media @screen_max-xs {
-            padding-right: (@toggle-size + @headericons-margin-xxs);
-        }
     }
 
-    /* + + +  wiki title  + + + */
+
+/* + + +  wiki title  + + + */
     p.title {
-        background-color: var(--color-background);
+        background-color: @ini_background;
         opacity: @header-font-opacity;
         color: @ini_text_webframe;
         line-height: @line-height-default;
@@ -107,16 +100,8 @@
         }
     }
 
-    /* + + + + +  DESKTOP  -  wiki claim, logo, title wrapper  + + + + + */
-    @media @screen_min-md {
-        div.claim {
-            display: table-cell;
-            height: 100%;
-            vertical-align: middle;
-        }
-    }
 
-    /* + + +  wiki claim  + + + */
+/* + + +  wiki claim  + + + */
     p.claim {
         opacity: @header-font-opacity;
         color: @ini_text_webframe;
@@ -128,154 +113,40 @@
         }
     }
 
-    /* + + +  mobile nav togglelink  + + + */
+
+/* + + +  mobile nav togglelink  + + + */
     .menu-togglelink {
-        position: relative;
-        margin: @headericons-margin-xxs -(@very-small-spacing) 0 0;
+        margin: .45rem -(@very-small-spacing) 0 0;
 
         a {
             .fontello();
             .icon-menu();
-            .btn-hover();
 
             display: block;
             min-height: @toggle-size;
             min-width: @toggle-size;
             box-sizing: border-box;
+            background-color: #fff;
             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;
             line-height: 1;
+            transition: @transition color, @transition background-color, @transition border-color;
 
             &::before {
                 font-size: 1.5rem;
                 margin: .1rem 0 0;
             }
-        }
-    }
 
-    /* + + +  mobile select for doku wiki tools   + + + */
-    .menu-tool-select {
-        position: relative;
-        z-index: 1000;
-        display: none;
-        @media @screen_max-xxs {
-            display: block;
-        }
-
-        select {
-            display:  block;
-            width:100%;
-        }
-    }
-
-    /* + + + + +  with magic matcher  + + + + + */
-    &.has-magicmatcher {
-        .logo {
-            @media @screen_min-md {
-                padding-top: 3rem;
-            }
-        }
-
-        .main-title.desktop-only {
-            @media @screen_min-md {
-                vertical-align: bottom;
-                padding-top: @height-context-bar;
-                padding-bottom: 1rem;
-            }
-
-            p.title {
-                @media @screen_min-md {
-                    margin-right: 16rem;
-                }
-            }
-
-            p.claim {
-                @media @screen_max-md {
-                    display: block;
-                    padding-bottom: 1rem;
-                }
-            }
-        }
-    }
-}
-
-/* + + + + +  layout option compact  + + + + + */
-.header-compact {
-    #dokuwiki__header {
-        min-height: 2.7rem;
-        margin-bottom: 0.5rem;
-
-        .main-title.desktop-only p.claim,
-        p.claim {
-            white-space: nowrap;
-            text-overflow: ellipsis;
-            overflow: hidden;
-            max-width: 35em;
-        }
-
-        // desktop
-        @media @screen_min-md {
-            div.claim {
-                vertical-align: top;
-            }
-
-            .main-title.desktop-only {
-                vertical-align: top;
-            }
-
-            .main-title.desktop-only,
-            .logo {
-                padding-top: 0.4rem;
-            }
-
-            .logo img {
-                height: 3.6rem;
-            }
-        }
-
-        // mobile middle
-        @media @screen_max-md {
-
-            .main-title.desktop-only p.claim,
-            p.claim {
-                display: none;
-            }
-
-            .logo {
-                display: block;
-                position: absolute;
-                top: 0;
-                left: 3rem;
-
-                .mobile-only {
-                    margin: .4rem;
-                    height: 1.75rem;
-                }
-            }
-
-            .main-title:not([class*="desktop-only"]) {
-                display: inline-block;
-                vertical-align: top;
-                padding-left: 1.75rem;
-            }
-
-            p.title {
-                font-size: 1rem;
-            }
-        }
-        
-        @media @screen_max-xxs {
-            min-height: 70px; // needed for menu select toolbar
-
-            .logo {
-                left: 2rem;
-            }
-
-            .menu-tool-select {
-                padding-top: .3rem;
+            &: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-anchor.less b/css/area_main-content-anchor.less
deleted file mode 100644
index c5e55dc..0000000
--- a/css/area_main-content-anchor.less
+++ /dev/null
@@ -1,36 +0,0 @@
-#dokuwiki__content.main-content {
-    h1, h2, h3, h4, h5 {
-        a.anchor {
-            vertical-align: middle;
-            margin-left: 0.25em;
-            display: none;
-            position: absolute;
-
-            svg {
-                width: 1em;
-                height: 1em;
-                fill: var(--color-foreground);
-            }
-        }
-
-        &:hover {
-            a.anchor {
-                display: inline-block;
-                transition-property: filter, border-color;
-                transition-duration: 200ms;
-                transition-timing-function: ease-out;
-
-                &:hover {
-                    color: var(--color-glow-primary);
-                    filter: var(--filter-glow-primary);
-                    transition: var(--transition-glow);
-
-                    svg {
-                        fill: var(--color-glow-primary);
-                    }
-                }
-
-            }
-        }
-    }
-}
diff --git a/css/area_main-content-secedit.less b/css/area_main-content-secedit.less
index 1d26e34..cd5582d 100644
--- a/css/area_main-content-secedit.less
+++ b/css/area_main-content-secedit.less
@@ -1,32 +1,42 @@
 /**
- * This styles the "section editing button" (if not added by data-plugin)
+ * This styles the section editing buttons and highlighting
  */
 
+
 #dokuwiki__content.main-content {
-    .secedit:not([class*="plugin"]):not([class*="table"]) {
+    div.section_highlight {
+        clear: right;
+        background: repeating-linear-gradient(
+            -45deg,
+            @highlight-odd-ini_text,
+            @highlight-odd-ini_text 10px,
+            @highlight-even-ini_text 10px,
+            @highlight-even-ini_text 20px,
+        );
+        border-color: @ini_background_page_header;
+    }
+
+    .editbutton_section {
         position: relative;
+        z-index: 2;
         top: 0;
         float: right;
-        margin-top: 0; // for best position of edit-tab beneath table
+        margin-top: 0;
 
         form div.no {
             button {
-                margin-top: -.4rem;
-                margin-right: -0.4rem;
-                padding: 0.2rem 0.4rem;
+                padding-right: 0;
             }
         }
 
-        // "section editing button"
         button {
-            display: flex;
-            align-items: center;
             background-color: transparent;
             color: transparent;
             border-color: transparent;
 
             &::after {
                 content: '';
+                float: right;
                 display: inline-block;
                 background: transparent url("svg.php?svg=pencil.svg&f=existing") center center no-repeat;
                 height: 1em;
@@ -36,20 +46,20 @@
                 border-radius: @ini_default_border_radius;
                 margin-left: @small-spacing;
                 margin-top: -1px;
-
-                color: var(--color-foreground);
-                mask-size: contain;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                background: currentColor !important;
-
-                mask-image: url('img/pencil.svg');
             }
 
             &:hover,
             &:active,
             &:focus {
-                .fnActiveButton();
+                //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 6058c8c..d5db8a5 100755
--- a/css/area_main-content.less
+++ b/css/area_main-content.less
@@ -1,12 +1,15 @@
 /**
  * This file provides the design styles for the main-content.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 #dokuwiki__content.main-content {
-    div[class^="level"] {
+    .level2 {
         p a.media {
             img {
-                border: 1px dotted var(--color-background);
+                border: 1px dotted @ini_background;
 
             }
             &:hover,
@@ -20,7 +23,7 @@
     }
 
     > div,
-    div[class^="level"] {
+    .section_highlight > div {
         > ul,
         > ol {
             &:not([class="tabs"]) > li {
@@ -39,12 +42,16 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* min-width: 1440px */
-// @media @screen_min-xlg {
-// }
+
+@media @screen_min-xlg {
+}
+
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1199px */
-// @media @screen_max-xlg {
-// }
+
+@media @screen_max-xlg {
+}
diff --git a/css/area_main-sidebar-content.less b/css/area_main-sidebar-content.less
new file mode 100644
index 0000000..fb02fbe
--- /dev/null
+++ b/css/area_main-sidebar-content.less
@@ -0,0 +1,61 @@
+/**
+ * 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 {
+        padding-left: 0;
+
+        ul,
+        ol {
+            padding-left: @margin-small;
+
+            li {
+                margin-left: 0;
+            }
+        }
+    }
+}
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* 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 8363b35..681dd4d 100755
--- a/css/area_main-sidebar-nav.less
+++ b/css/area_main-sidebar-nav.less
@@ -1,250 +1,134 @@
 /**
  * This file provides the design styles the navigational elements in the sidebar
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ * @author Andreas Gohr <gohr@cosmocode.de>
  */
 
+
 #dokuwiki__aside {
     @icon-size: @font-size-big;
-    @menu-margin: @icon-size + @margin-small * 2;
+    @menu-margin: @icon-size + @margin-small*2; // FIXME this is still wrong
 
-    @media @screen_md-lg {
-        margin-left: -1.25rem;
-    }
+    nav > p,
+    .mmissuelist li,
+    .mmissuelist div {
+        color: @ini_nav_menu_color;
 
-    @media @screen_max-md {
-        display: none;
-    }
+        &.noissue {
+            color: @ini_text_webframe;
 
-    ul {
-        padding-left: 0;
+            * {
+                color: inherit;
+            }
+        }
     }
 
     nav {
-        display: flex;
-        flex-direction: column;
-        gap: 0.75rem;
-
-        &.nav-main {
-            margin-bottom: @nav-margin;
-        }
-
-        > p {
-            color: var(--color-foreground);
-
-            &.noissue {
-                color: @ini_text_webframe;
-
-                * {
-                    color: inherit;
-                }
-            }
-        }
-
-        ul,
-        div.nav {
-            margin-bottom: 0;
-        }
-
         li {
-            color: var(--color-foreground);
+            color: @ini_nav_menu_color;
 
             > div {
                 color: @ini_text_webframe;
             }
-
-            &.toggler {
-                list-style: none;
-                margin-left: 0;
-            }
-        }
-
-        li:not([class]),
-        .li {
-            padding: .15em 0;
-
-
-            /* + + + + +  active  + + + + + */
-
-            span.curid {
-                font-weight: bold;
-            }
         }
     }
 
-    a, label {
+
+    /* 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: var(--color-foreground);
+            color: @ini_nav_menu_color;
         }
 
         * {
-            color: var(--color-foreground);
+            color: inherit;
         }
     }
 
-    /* + + +  the wrapper around the toggle to reserve space  + + + */
+    // the toggle element
+    a.nav {
+        .display-flex();
+        .align-items();
 
-    div.nav {
-        min-height: @icon-size + @margin-small;
-        background-color: var(--color-background);
-        border-radius: 0.5rem;
+        cursor: pointer;
+        height: @icon-size + @margin-small;
+        opacity: 1;
+        border: 1px solid transparent;
+        border-radius: @fix_border-radius;
+        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
+        transition: @transition color, @transition background-color, @transition border-color;
 
-        &.themeToggle input {
-            width: 0;
-            height: 0;
-            margin: 0;
-            padding: 0;
-            display: block;
-            opacity: 0;
+        span {
+            display: inline-block;
+            vertical-align: middle;
+            color: inherit;
         }
 
-        // the toggle element
-        a, label {
-            border-radius: 0.5rem;
-            background-color: var(--color-shade-1);
-            transition: background-color 150ms;
-            color: var(--color-foreground);
-            font-size: 1.2em;
-            border: solid 0.1em var(--color-shade-1);
-            transition-property: filter, border-color;
-            transition-duration: 200ms;
-            transition-timing-function: ease-out;
-
-
-            cursor: pointer;
-            display: flex;
-            align-items: center;
-            width: 100%;
-            opacity: 1;
-            font-weight: normal;
-            margin: 0 0 @very-small-spacing;
-            padding: 0.4rem 0.1rem;
-            text-decoration: none;
-
-            span {
-                display: inline-block;
-                vertical-align: middle;
-                color: inherit;
-            }
-
-            span.ico {
-                display: flex;
-                align-items: center;
-                justify-content: center;
-                i[data-icon] {
-                    font-size: 1.5rem;
-                }
-            }
-
-
-            /* + + +  submenu entry is active  + + + */
-            /* + + +  toggle: open  + + + */
-
-            &.is-active, &.is-open {
-                background-color: var(--color-shade-2);
-                border-color: var(--color-shade-4);
-                color: var(--color-foreground);
-
-                span.ico {
-                    &:after {
-                        background-color: currentColor;
-                    }
-
-                    strong {
-                        border-color: currentColor;
-                    }
-
-                    svg {
-                        path {
-                            fill: currentColor;
-                        }
-                    }
-                }
-            }
-        }
-
-        &:hover,
-        &:focus-within {
-            position: relative; // always show label, even with collapsed sidebar
-            z-index: 100;
-
-            a, label {
-
-                width: 100%;
-                background-color: transparent;
-                border: solid 0.1em var(--color-glow-primary);
-                text-decoration: none;
-                color: var(--color-glow-primary);
-                filter: var(--filter-glow-primary);
-                transition: var(--transition-glow);
-
-
-                span.ico {
-                    &:after {
-                        background-color: currentColor;
-                    }
-
-                    strong {
-                        border-color: inherit;
-                    }
-
-                    svg {
-                        path {
-                            fill: currentColor;
-                        }
-                    }
-                }
-            }
-
+        span.lbl {
+            flex-grow: 1;
         }
 
         span.ico {
-            position: relative;
-            display: table-cell;
-            width: (@menu-margin - .1);
-            min-width: (@menu-margin - .1);
+            width: @menu-margin;
             height: @icon-size;
+            flex-grow: 0;
+            border-right: 1px solid @ini_nav_menu_color;
             text-align: center;
-            vertical-align: middle;
+            margin-right: @margin-small;
             color: inherit;
 
-            &::after {
-                @border-height: 1.5rem;
-
-                content: '';
-                position: absolute;
-                right: 0;
-                top: 50%;
-                bottom: auto;
-                height: @border-height;
-                width: 1px;
-                background-color: currentColor;
-                margin-top: -(@border-height / 2);
-
-                // wordbreak too late in IE 10
-                @media screen and (-ms-high-contrast: active), (-ms-high-contrast: none) {
-                    top: 0;
-                    bottom: .5rem;
-                    height: 100%;
-                    margin: 0;
-                }
-            }
-
             // simple fake icon
             strong {
                 display: inline-block;
-                width: @icon-size * 0.98;
-                height: @icon-size * 0.98;
-                border: 2px solid currentColor;
-                border-top-right-radius: 50%;
-                border-bottom-left-radius: 50%;
-                color: inherit;
                 font-size: @icon-size * 0.5;
+                width: @icon-size * 0.9;
+                height: @icon-size * 0.9;
                 line-height: @icon-size * 0.9;
+                margin: @icon-size * 0.05;
                 vertical-align: baseline;
                 text-align: center;
-                margin: @icon-size * 0.05;
-                padding: 0 .05em .05em;
+                color: inherit;
+                border: 2px solid @ini_nav_menu_color;
+                border-top-right-radius: 50%;
+                border-bottom-left-radius: 50%;
+                transition: @transition border-color;
             }
 
             // real icon
@@ -253,49 +137,90 @@
                 height: @icon-size;
 
                 path {
-                    fill: currentColor;
+                    fill: @ini_nav_menu_color;
                     transition: @transition all;
                 }
             }
         }
 
-        span.lbl {
-            display: table-cell;
-            font-size: inherit;
-            padding-left: .5rem;
+        &:hover,
+        &:focus,
+        &:active {
+            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: inherit;
+                }
+
+                svg {
+                    path {
+                        fill: @ini_nav_menu_hover_color;
+                    }
+                }
+            }
         }
     }
 
-    /* + + + + +  the panel (hidden by default)  + + + + + */
-
+    // the panel (hidden by default)
     div.nav-panel {
         display: none;
         margin-top: .5rem;
-        margin-left: @margin-small;
 
         ul {
             margin-bottom: 1rem;
 
             ul {
                 margin-bottom: 0;
-                margin-left: 16px;
             }
         }
-
-        ul.toollist li {
-            margin-left: 0;
-        }
     }
 }
 
+
+/* + + + + + +  wide page content  border-bottom between a.nav (short width)  + + + + +
+.wide-content {
+    #dokuwiki__aside {
+        a.nav {
+            position: relative;
+
+            &::after {
+                content: '';
+                position: absolute;
+                bottom: -1px;
+                left: 0;
+                width: 100%;
+                height: 1px;
+                border-bottom: solid 1px @ini_border;
+            }
+
+            &:hover,
+            &:focus,
+            &:active {
+                &::after {
+                    display: none;
+                }
+            }
+        }
+    }
+} */
+
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* 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;
@@ -310,51 +235,34 @@
     }
 }
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 1440px */
-@media @screen_max-xlg {
-    #dokuwiki__aside {
-        div.nav {
-            a {
-                margin-left: 0;
-            }
-        }
-    }
-}
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1023px */
+
 @media @screen_max-md {
-    #dokuwiki__aside {
-        div.nav {
-            a {
-                margin-left: 0;
+    // show when toggled
+    body.show-mobile-sidebar {
+        .search.main-sidebar {
+            display: block !important;
+            position: relative;
+
+            form {
+                margin-bottom: 1rem;
+
+                .no {
+                    display: block;
+                }
             }
         }
-    }
 
-    body.show-mobile-sidebar {
         #dokuwiki__aside {
-            display: block !important;
-            position: absolute;
-            left: 1.25rem; // left margin of content container
-            box-shadow: @box-shadow-right-bottom;
-            min-width: 45%;
-            max-width: 90%;
-            height: auto;
-            background: var(--color-background);
-
             > nav {
                 position: relative;
+                z-index: 2;
 
                 &:first-child {
                     margin-top: 1.2rem;
                 }
-
-                a,
-                label {
-                    font-size: @font-size-small;
-                }
             }
 
             a.nav {
@@ -363,44 +271,29 @@
                 border-left-width: 0;
             }
 
-            div.nav-panel,
+            .nav-panel,
             a.nav {
-                margin-top: 0;
                 padding-right: .8em;
             }
         }
     }
 }
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 768px */
-@media @screen_max-xs {
-    body.show-mobile-sidebar {
-        .page-wrapper > .tools {
-            top: 2.5rem;
-        }
-
-        #dokuwiki__aside {
-            left: 1.25rem;
-            right: 1.25rem;
-            width: auto;
-            max-width: 100%;
-            margin-top: -1rem;
-        }
-    }
-}
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 480px */
-@media @screen_max-xxs {
-    body.show-mobile-sidebar {
-        #dokuwiki__aside {
-            left: 4px;
-            right: 4px;
+/* max-width: 1439px */
 
-            > nav {
-                a {
-                    font-size: @font-size-default;
+@media @screen_max-xlg {
+    #dokuwiki__aside {
+        nav {
+            li:not([class]),
+            .li {
+                font-size: @font-size-default;
+                padding: .15em 0 .15em .25rem;
+
+                * {
+                    font-size: inherit;
+                    font-weight: inherit;
                 }
             }
         }
diff --git a/css/area_main-sidebar-search.less b/css/area_main-sidebar-search.less
deleted file mode 100644
index a14fbc6..0000000
--- a/css/area_main-sidebar-search.less
+++ /dev/null
@@ -1,241 +0,0 @@
-/**
- * This file provides the design styles for the quick search.
- */
-
-.search.main-sidebar {
-    @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
-    @icon-size: @page-header_height;
-    @icon-search_font-size: @font-size-big;
-
-    @media @screen_md-lg {
-        margin-left: -(@menu-margin-lg);
-    }
-
-    p.toggleSearch a,
-    button[type="submit"] {
-        .hide-text-show-before();
-
-        position: relative;
-        width: @icon-size;
-        min-height: @icon-size;
-        overflow: visible;
-        background-image: none;
-        background-color: transparent; // fix
-        border: solid 1px transparent;
-        padding: 0;
-        transition: @transition color, @transition background-color, @transition border-color;
-        display: flex;
-        align-items: center;
-
-        &:hover,
-        &:focus,
-        &:active {
-            .fnActiveButton();
-
-            &::after{
-                background-color: var(--color-glow-primary);
-            }
-        }
-
-        &::before {
-            width: @icon-size;
-            height: 0.8em;
-            font-size: @icon-search_font-size;
-            text-align: center;
-            margin: 0;
-            color: var(--color-foreground);
-            content: '';
-            display: block;
-            mask-size: contain;
-            mask-position: center;
-            mask-repeat: no-repeat;
-            background-color: currentColor;
-
-
-            mask-image: url('img/search.svg');
-        }
-    }
-
-    p.toggleSearch {
-        display: none;
-        padding: 0;
-
-        a {
-            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: 0.5rem 0 0 0.5rem;
-            border-right: none;
-            background-color: var(--color-shade-1);
-            color: var(--color-foreground);
-            text-decoration: none;
-            box-sizing: border-box;
-
-            &::before {
-                width: 100%;
-                color: inherit;
-                text-align: center;
-            }
-
-            &:hover,
-            &:focus,
-            &:active {
-                border-right: none;
-                background-color: transparent;
-                border-color: var(--color-glow-primary);
-                color: var(--color-glow-primary);
-            }
-        }
-    }
-
-    button[type="submit"] {
-        position: absolute;
-        top: 1px;
-        bottom: 1px;
-        right: 0;
-        height: auto;
-        min-height: (@icon-size - .2);
-        color: @quicksearch-button-color;
-    }
-
-    /* + + +  form  + + + */
-    form {
-        position: relative;
-        display: block;
-        margin: 0 0 @margin-default;
-
-        .no {
-            display: block;
-
-            #qsearch__in {
-                width: 100%;
-                padding-left: 10px;
-                padding-right: @icon-size;
-            }
-        }
-
-        input {
-            min-height: @icon-size;
-            box-sizing: border-box;
-        }
-
-        button[type="submit"] {
-            border: solid 1px transparent;
-            margin-left: -(@icon-size);
-
-            &::after {
-                content: '';
-                position: absolute;
-                top: 15%;
-                bottom: 15%;
-                width: 1px;
-                left: -1px;
-                background-color: var(--color-shade-4);
-                transition: @transition background-color;
-            }
-        }
-
-        div.ajax_qsearch {
-            box-shadow: none;
-            background-color: var(--color-shade-1);
-            padding: 0;
-            z-index: 300; // otherwise hidden behind sidebar in mobile view
-            border: solid 0.1em var(--color-shade-4);
-            border-radius: 0.5rem;
-
-            > strong {
-                color: var(--color-foreground);
-                padding: 0.25rem 0.5rem;
-                border-bottom: solid 0.1em var(--color-shade-4);
-            }
-
-            ul li {
-                color: var(--color-foreground);
-
-                a {
-                    display: block;
-                    padding: 0.25rem 0.5rem;
-                    overflow: hidden;
-                    color: inherit;
-                    text-overflow: ellipsis;
-
-                    &:hover,
-                    &:focus,
-                    &:active {
-                        background-color: var(--color-shade-2);
-                    }
-                }
-            }
-        }
-    }
-
-    /* + + + + +  suggestionlist  + + + + + */
-    #qsearch__out {
-        left: auto;
-        top: auto;
-        width: 100%;
-        min-width: 20rem;
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* min-width: 1024px */
-@media @screen_min-md {
-
-    // wide page content
-    .wide-content {
-        .search.main-sidebar {
-            p.toggleSearch {
-                position: relative;
-                display: block;
-                float: left;
-                width: auto;
-            }
-
-            form {
-                input {
-                    border: 0 none;
-                }
-
-                .no {
-                    #qsearch__in {
-                        width: 0;
-                        padding: 0;
-                        margin: 0;
-                    }
-
-                    button[type="submit"] {
-                        display: none;
-                    }
-                }
-            }
-        }
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 1023px */
-@media @screen_max-md {
-
-    // show when toggled
-    body.show-mobile-sidebar {
-        #dokuwiki__aside {
-            padding: 0 1rem;
-            border-radius: 0.5rem;
-        }
-
-        p.toggleSearch {
-            display: none !important;
-        }
-
-        .search.main-sidebar {
-            display: block !important;
-            position: relative;
-            margin-left: -1px;
-            margin-right: -1px;
-
-            form {
-                margin-bottom: 1rem;
-            }
-        }
-    }
-}
diff --git a/css/area_main-sidebar-tabs.less b/css/area_main-sidebar-tabs.less
deleted file mode 100644
index f2fdefd..0000000
--- a/css/area_main-sidebar-tabs.less
+++ /dev/null
@@ -1,33 +0,0 @@
-/**
- * This file provides the design styles for tab list in sidebar
- */
-
-/* default view */
-#dokuwiki__aside ul.sidebar-tabs {
-    margin-top: 0;
-    margin-bottom: @nav-margin;
-
-    border-bottom: 1px solid @ini_nav_menu_color;
-
-    white-space: nowrap;
-
-    li {
-        display: inline-block;
-        border: 1px solid @ini_nav_menu_color;
-        padding: 0.25em 0.5em;
-        margin-bottom: -1px;
-        margin-left: 0.5em;
-        border-top-right-radius: @fix_border-radius;
-        border-top-left-radius: @fix_border-radius;
-
-        &.active {
-            border-bottom: 1px solid var(--color-background);
-            font-weight: bold;
-        }
-    }
-}
-
-/* wide content view */
-.wide-content #dokuwiki__aside ul.sidebar-tabs {
-    visibility: hidden;
-}
diff --git a/css/area_msg.less b/css/area_msg.less
index 8697293..1e2ad9e 100644
--- a/css/area_msg.less
+++ b/css/area_msg.less
@@ -1,7 +1,3 @@
-/**
- * This file provides the design styles for message block
- */
-
 .msg-area {
     clear: both;
     padding-top: 1.6rem;
@@ -15,65 +11,20 @@
     }
 }
 
-div.success,
-div.error,
-div.info,
-div.notify {
-    display: block;
-    border: none;
-    border-left: solid 0.5rem var(--color-shade-4);
-    border-radius: 0.5rem;
-    padding: 1em;
-    background-image: none;
-    background-color: var(--color-shade-1);
+/* short fix: SPR-891 - Icons für Notifications in Message Area werden gekachelt */
+div.success, div.error, div.info, div.notify {
+    background-repeat: no-repeat;
+    background-position: 8px 50%;
+    border: 1px solid #eeb;
+    font-size: 90%;
+    margin: 0 0 .5em;
+    padding: .4em;
+    padding-left: 32px;
+    overflow: hidden;
+    border-radius: 5px;
 
-    &::before {
-        display: inline-block;
-        content: "";
-        margin: 0.3em 0.2em 0 0;
-        width: 1em;
-        height: 1em;
-        mask-size: contain;
-        mask-position: center top;
-        mask-repeat: no-repeat;
-        background-color: currentColor;
-        vertical-align: top;
-    }
-
-    &.success {
-        color: var(--color-success);
-
-        &::before {
-            mask-image: url(img/tick_small.svg);
-        }
-    }
-
-    &.error {
-        border-left-color: var(--color-error);
-        color: var(--color-foreground);
-
-        &::before {
-            background-color: var(--color-error);
-            mask-image: url(img/power.svg);
-        }
-    }
-
-    &.info {
-        color: var(--color-foreground);
-
-        &::before {
-            mask-image: url(img/info.svg);
-        }
-    }
-
-    &.notify {
-        border-left-color: var(--color-warning);
-        color: var(--color-foreground);
-
-        &::before {
-            background-color: var(--color-warning);
-            mask-image: url(img/warning.svg);
-        }
+    * {
+        color: inherit;
     }
 
     a {
diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less
index 4200172..16ef4ad 100755
--- a/css/area_nav-breadcrumb.less
+++ b/css/area_nav-breadcrumb.less
@@ -1,26 +1,37 @@
 /**
  * This file provides the design styles for the breadcrumb
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 .breadcrumbs {
     position: relative;
     min-height: @page-header_height;
     box-sizing: border-box;
-    background-color: var(--color-background);
-    border-bottom: 1px solid var(--color-shade-4);
+    background-color: @ini_background_content;
+    border-bottom: 1px solid @ini_border_light;
     padding: 1rem 1.8rem .2rem;
 
+    @media @screen_max-md {
+        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 {
         font-size: @font-size-small;
         margin: 0;
 
         @media @screen_max-xs{
-            width: 0;
+            width: 1px;
             position: relative;
             overflow: hidden;
             height: 1.6rem;
@@ -50,16 +61,14 @@
                 min-width: 1.9em;
                 width: auto;
                 box-sizing: border-box;
-                background-color: var(--color-shade-1);
-                border: solid .1em transparent;
-                border-radius: 0.5rem;
+                border: solid 1px transparent;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
                 vertical-align: middle;
                 text-decoration: none;
                 margin-top: -.2em;
-                transition: var(--transition-glow);
+                transition: @transition border-color;
 
                 &:before {
-                    color: var(--color-foreground);
                     font-size: @font-size-default + (@font-scale-factor * 2);
                     margin-top: .17rem;
                 }
@@ -67,14 +76,7 @@
                 &:hover,
                 &:focus,
                 &:active {
-                    &:before {
-                        color: var(--color-glow-primary);
-                    }
-
-                    background-color: transparent;
-                    border-color: var(--color-glow-primary);
-                    color: var(--color-glow-primary);
-                    filter: var(--filter-glow-primary);
+                    border-color: @ini_existing;
                 }
             }
         }
@@ -83,4 +85,54 @@
             padding: .1em .1em 0;
         }
     }
+
+
+/* + + + + +  icon list  + + + + + */
+    .page-attributes {
+        list-style: none;
+        float: right;
+        display: inline-block;
+        max-width: 30%;
+        margin: -.45em 0 0;
+        padding: 0;
+
+        @media @screen_max-xs{
+            max-width: 90%;
+        }
+
+        > li {
+            .btn-usertools-wrapper(); // uniform li
+            .btn-usertools-num();
+
+            float: left;
+
+            > strong,
+            > a {
+                display: block;
+                width: auto;
+                min-height: @toggle-size;
+                border: 1px solid @wikiicons-border;
+                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
+                text-align: center;
+                margin: 0;
+            }
+
+            .prefix {
+                .btn-prefix ();
+                .icon-clipboard();
+
+                display: block;
+                font-size: 1.2rem;
+                line-height: 1;
+            }
+        } // li
+
+        a {
+            .btn-hover();
+
+            &[aria-expanded="false"] + #plugin__qc__wrapper {
+                display: none;
+            }
+        }
+    }
 }
diff --git a/css/area_nav-direct.less b/css/area_nav-direct.less
index 62bbe63..5defc3b 100755
--- a/css/area_nav-direct.less
+++ b/css/area_nav-direct.less
@@ -1,7 +1,10 @@
 /**
  * This file provides the design styles for the direct / menu jump links.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 .nav-direct {
     background-color: @nav_direct_background;
     margin-top: -1px;
diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less
index 1e16a28..165d831 100755
--- a/css/area_nav-metabox.less
+++ b/css/area_nav-metabox.less
@@ -1,28 +1,26 @@
 /**
  * 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);
 
-    clear: none;
-    display: block;
     position: relative;
+    z-index: 10;
     float: right;
-
-    box-sizing: border-box;
     max-width: 40%;
-    padding-bottom: 0.5rem;
-    height: 4rem !important;
-
-    color: var(--color-foreground);
+    margin-top: -(@page_padding-top); // reverse padding-top of .page container
+    margin-right: -1px;
 
     // >= 1024
     @media @screen_min-md {
         height: @page-header_height;
-        border: 0 none;
+        border: 1px solid transparent;
     }
 
     // < 1024
@@ -31,34 +29,13 @@
         top: .2rem;
         right: auto;
         float: none;
+        display: block;
         max-width: 100%;
         min-height: @page-header_height;
         height: auto;
         border: 0 none;
     }
 
-    &.sticky {
-        position: fixed;
-        top: 0;
-
-        ul.meta-tabs > li > a {
-            border-top-color: var(--color-background);
-            border-bottom-color: var(--color-shade-4);
-            border-radius: 0 0 @ini_default_border_radius @ini_default_border_radius;
-
-        }
-
-        .meta-content .tab-pane.active {
-            max-height: 80vh;
-            overflow: auto;
-        }
-    }
-
-    + .msg-area + a {
-        clear: right;
-        margin-top: 20px;
-    }
-
     .tab-container {
         display: table;
 
@@ -75,7 +52,7 @@
     }
 
 
-    /* + + + + +  tab controls  + + + + + */
+/* + + + + +  tab controlls  + + + + + */
     ul.meta-tabs {
         list-style: none;
         line-height: 160%;
@@ -121,23 +98,31 @@
                 position: relative;
                 display: block;
                 font-size: @font-size-small;
-                transition: var(--transition-glow);
-                background-color: var(--color-shade-1);
-                border: solid 0.1em transparent;
-                border-radius: 0.5rem;
-                color: var(--color-foreground);
-                padding: .25em;
-                margin-left: 0;
+                line-height: 1.42857143;
+                transition: @transition background-color, @transition border-color, @transition color;
+
+                @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: 0;
+                    border: 1px solid @ini_existing;
+                    color: @ini_existing;
                     margin-top: .2rem;
+                    margin-left: 0;
+                    padding: .2em .3rem;
                 }
 
                 * {
                     cursor: pointer;
                     color: inherit;
-                    font-size: inherit;
                 }
 
                 .prefix {
@@ -150,22 +135,44 @@
                 &:focus,
                 &:active {
                     text-decoration: none;
-                    background-color: transparent;
-                    border-color: var(--color-glow-secondary);
-                    color: var(--color-glow-secondary);
-                    filter: var(--filter-glow-secondary);
+
+                    @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;
+                    }
                 }
             }
 
             &.active {
+                z-index: 1;
+
                 > a {
                     cursor: default;
+                    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;
+                    }
                 }
             }
         }
     }
 
-    /* + + + + +  toggle content  + + + + + */
+
+/* + + + + +  toggle content  + + + + + */
     .meta-content {
         margin-top: -1px;
 
@@ -180,24 +187,24 @@
             right: 0;
             display: none;
             width: 100%;
-            background-color: var(--color-shade-1);
-            border: solid .1em transparent;
-            border-radius: 0.5rem;
+            background-color: @ini_background_content;
+            border: 1px solid @ini_existing;
 
             @media @screen_min-xs {
                 min-width: 20em;
             }
 
             @media @screen_min-md {
-                margin-top: 0.5rem;
+                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: var(--color-foreground);
+                color: @ini_existing;
             }
 
             > div {
@@ -215,12 +222,11 @@
                 ul {
                     list-style: none;
                     padding-left: 0;
-                }
 
-                li {
-                    list-style-image: none; // overwrite universally styles
-                    margin-left: 0;
-                    padding-left: 1em;
+                    li {
+                        margin-left: 0;
+                        padding-left: 1em;
+                    }
                 }
             }
 
@@ -239,10 +245,8 @@
                 float: none;
                 margin: 0;
                 padding: .6rem .5rem .5rem .8rem;
-                background-color: transparent;
-                color: var(--color-foreground);
-                border: solid .1em var(--color-shade-4);
-                border-radius: 0.5rem;
+                background: transparent;
+                border: 0 none;
 
                 h3 {
                     display: none;
@@ -276,7 +280,7 @@
                             width: 4px;
                             height: 4px;
                             overflow: hidden;
-                            background-color: var(--color-shade-4);
+                            background-color: @ini_existing;
                         }
                     }
                 }
@@ -288,113 +292,8 @@
         }
     }
 
-    /* + + + + +  tab issues  + + + + + */
-    #spr__tab-issues {
-        ul.mmissuelist {
-            padding-left: 0;
-            margin-top: 1rem;
-
-            li {
-                &.noissue {
-                    font-size: @font-size-small;
-                    list-style-type: none;
-                    margin-left: 0;
-
-                    .li {
-                        font-size: @font-size-small;
-                        margin-left: .5rem;
-                    }
-                }
-
-                a {
-                    display: inline-block;
-                }
-            }
-
-            img {
-                vertical-align: bottom;
-                margin-right: .3rem;
-            }
-
-            .mm__status {
-                padding-left: .3rem;
-                padding-right: .3rem;
-            }
-
-            form {
-                vertical-align: text-top;
-            }
-        }
-    }
-
-    /* + + + + +  tab issues  + + + + + */
-    /* see plugins/magic-matcher.less   */
-    #spr__tab-issues {
-        ul.mmissuelist {
-            padding-left: 0;
-            margin-top: .5rem;
-            margin-bottom: .6rem;
-
-            li {
-                list-style-type: none;
-                margin-top: .3rem;
-                margin-left: .5rem;
-
-                &.noissue {
-                    list-style-type: none;
-                    margin-left: 0;
-                }
-            }
-
-            a {
-                display: inline-block;
-                font-size: @font-size-small;
-
-                * {
-                    font-size: inherit;
-                }
-            }
-
-            img {
-                vertical-align: bottom;
-                margin-right: .3rem;
-            }
-
-            .mm__status {
-                display: inline-block;
-                text-decoration: none;
-                padding-left: .3rem;
-                padding-right: .3rem;
-            }
-
-            form {
-                vertical-align: text-top;
-
-                button {
-                    background: @ini_button_background;
-                    border-color: @ini_button_background;
-                    color: @ini_button_color;
-                    font-size: @font-size-small;
-                    padding: .2em .3em;
-
-                    &[name="removeIssue"] {
-                        min-width: 20px;
-                        font-size: .94rem;
-                        font-weight: bold;
-                        line-height: 95%;
-                        text-align: center;
-                        padding: 0 .1rem .1rem;
-                        margin-left: .5rem;
-                    }
-
-                    &:hover,
-                    &:focus,
-                    &:active {
-                        background: @ini_button_color;
-                        color: @ini_button_background;
-                    }
-                }
-            }
-        }
+    + .msg-area + a {
+        clear: right;
+        margin-top: 20px;
     }
 }
diff --git a/css/area_nav-page-attributes.less b/css/area_nav-page-attributes.less
deleted file mode 100644
index 2d24c75..0000000
--- a/css/area_nav-page-attributes.less
+++ /dev/null
@@ -1,54 +0,0 @@
-/**
- * Page Attribute Icons in the breadcrumb bar
- */
-.page-attributes {
-    list-style: none;
-    float: right;
-    margin: -.45em 0 0; // FIXME sourrounding CSS should be fixed so negative margin is not needed
-    padding: 0;
-    display: flex;
-    gap: 0.5rem;
-
-    > li {
-        margin: 0;
-        padding: 0;
-        border: 1px solid @wikiicons-border;
-        border-radius: @ini_default_border_radius;
-        position: relative;
-        display: flex;
-        align-items: center;
-        justify-content: center;
-        transition: @transition background-color, @transition border-color, @transition color;
-
-        // override any plugin element styles
-        * {
-            margin: 0;
-            padding: 0;
-            line-height: normal;
-            display: block;
-        }
-
-        // number badge
-        .btn-usertools-num();
-
-        // icon
-        svg {
-            height: 1.5em;
-            width: 1.5em;
-
-            path {
-                fill: @ini_nav_menu_color;
-            }
-        }
-
-        // adjust colors on hover
-        &:hover {
-            background-color: @ini_nav_menu_hover_color;
-            border-color: @ini_nav_menu_hover_color;
-
-            svg path {
-                fill: @ini_nav_menu_hover_bg;
-            }
-        }
-    }
-}
diff --git a/css/area_nav-pagetools.less b/css/area_nav-pagetools.less
index 7172ae1..40d2b06 100755
--- a/css/area_nav-pagetools.less
+++ b/css/area_nav-pagetools.less
@@ -1,5 +1,7 @@
 /**
  * This file provides the design styles for the page specific tool bar.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
 /*
@@ -28,15 +30,8 @@
 nav#dokuwiki__pagetools {
     @toolbox-size: 30px;
 
-    @page-tools_svg-size: 25px;
-    @page-tools_svg-space: (@toolbox-size - @page-tools_svg-size) / 2;
-    @item-width: (@page-tools_svg-size + @page-tools_svg-space + @page-tools_svg-space);
-    @item-height: (@page-tools_svg-size + @page-tools_svg-space);
-
     top: 3.05rem;
-    position: absolute;
-
-    width: @item-width;
+    z-index: 100;
 
     @media @screen_min-md {
         right: -2.5rem;
@@ -46,40 +41,24 @@ nav#dokuwiki__pagetools {
         right: 8px;
     }
 
-    @media @screen_max-xxs {
-        display: none;
-    }
-    div.tools {
-        position: fixed;
-        width: @item-width;
-    }
-
     ul {
-        position: absolute;
-        right: 0;
-        text-align: right;
-        margin: 0;
-        padding: 0;
-        /* add transparent border to prevent jumping when proper border is added on hover */
-        border: 1px solid transparent;
-
         li {
-            padding: 0;
-            margin: 0;
-            list-style: none;
+            @page-tools_svg-size: 25px;
+            @page-tools_svg-space: (@toolbox-size - @page-tools_svg-size) / 2;
+
+            * {
+                font-size: @font-size-default;
+            }
 
             a {
-                display: inline-table;
-                /* add transparent border to prevent jumping when proper border is added on focus */
-                border: 1px solid transparent;
-                white-space: nowrap;
-                vertical-align: middle;
-                height: @item-height;
+                .fontello-double();
 
                 position: relative;
-                line-height: 20px;
+                height: auto;
+                min-height: @toolbox-size; // for nav:hover
+                width: @toolbox-size; // for nav:hover
                 font-size: @font-size-default;
-                padding: 2px 0 2px 2px;
+                padding: 2px @toolbox-size 2px 2px;
 
                 @media @screen_min-md {
                     color: @ini_nav_menu_color;
@@ -89,6 +68,10 @@ nav#dokuwiki__pagetools {
                     color: @ini_existing;
                 }
 
+                * {
+                    color: inherit;
+                }
+
                 &::before {
                     display: none;
                 }
@@ -99,25 +82,6 @@ nav#dokuwiki__pagetools {
                     background-color: transparent;
                 }
 
-                &:focus {
-                    box-shadow: none;
-                    background-image: none;
-                    color: var(--color-glow-primary);
-                    transition: var(--transition-glow);
-                    filter: var(--filter-glow-primary);
-
-                    span {
-                        position: relative;
-                        display: inline;
-                        width: auto;
-                        height: auto;
-                    }
-
-                    svg {
-                        fill: var(--color-glow-primary);
-                    }
-                }
-
                 span {
                     .sr-only();
 
@@ -132,7 +96,14 @@ nav#dokuwiki__pagetools {
                     vertical-align: middle;
                     border: solid 1px transparent;
                     margin: @page-tools_svg-space;
-                    fill: var(--color-foreground);
+
+                    @media @screen_min-md {
+                        fill: @ini_nav_menu_color;
+                    }
+
+                    @media @screen_max-md {
+                        fill: @ini_existing;
+                    }
                 }
 
                 &.top {
@@ -145,37 +116,33 @@ nav#dokuwiki__pagetools {
     &:hover {
         ul {
             box-shadow: @box-shadow; // @box-shadow-offset;
-            background-color: var(--color-shade-1);
-            border-color: var(--color-shade-4);
-            border-radius: 0.5rem;
+            background-color: @ini_background_content;
+            border-color: @wikiicons-border;
 
             li {
-                color: var(--color-foreground);
+                color: @ini_existing;
 
                 a {
                     box-shadow: none;
                     background-image: none;
                     border-color: transparent;
                     color: inherit;
+                    padding: 2px 0 2px 2px;
 
                     svg {
                         border: solid 1px transparent;
                         border-radius: @ini_default_border_radius;
-                        fill: var(--color-foreground);
+                        fill: @ini_existing;
                         transition: @transition background-color, @transition border-color, @transition fill;
                     }
 
                     &:hover,
                     &:focus,
                     &:active {
-                        color: var(--color-glow-primary);
-                        transition: var(--transition-glow);
-                        filter: var(--filter-glow-primary);
-
                         svg {
-                            background-color: transparent;
-                            border: none;
-                            fill: var(--color-glow-primary);
+                            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 2762329..87959cd 100755
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -1,65 +1,34 @@
 /**
  * This file provides the design styles for the direct / menu jump links.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
-#dokuwiki__usertools.nav-usertools {
-    @media @screen_min-md {
-        right: 1.25rem;
-    }
-
-    @media @screen_max-md {
-        position: absolute;
-        top: 0;
-        left: (@toggle-size + 1.25); // margin-left content
-        right: @headericons-margin-xxs;
-        margin-top: 0;
-        margin-right: 0;
-    }
 
+.nav-usertools {
     &.has-bar {
-        @media @screen_min-md {
-            margin-top: @height-context-bar;
-            padding-top: .5em;
-        }
+        margin-top: @height-context-bar;
+        padding-top: .5em;
     }
 
-    /* + + + + +  icon list  + + + + + */
+
+/* + + + + +  icon list  + + + + + */
     ul {
         float: right;
         padding: 0;
         margin: (@very-small-spacing * 2) -.25rem 0 0;
 
-        @media @screen_max-md {
-            margin-right: .5rem;
-        }
-
-        @media @screen_max-xxs {
-            margin-right: -.3rem;
-        }
-
         li {
             .btn-usertools-wrapper(); // uniform li
             .btn-usertools-num();
 
             float: right;
+            min-height: 28px;
 
-            @media @screen_max-xs {
-                display: block;
-                float: none;
-
-                margin-bottom: @headericons-margin-xxs;
-            }
-
-            @media @screen_max-xxs {
-                margin-bottom: (@headericons-margin-xxs - .2);
-                display: none;
-            }
-
-            > span,
+            > strong,
             > a {
                 display: block;
                 width: auto;
-                min-width: (@toggle-size + .25);
                 min-height: @toggle-size;
                 overflow: hidden;
                 border: 1px solid @wikiicons-border;
@@ -67,38 +36,48 @@
                 text-align: center;
                 margin: 0;
 
-                @media @screen_md-xlg {
+                @media @screen_only-lg {
                     padding-top: .14rem;
                 }
-            }
 
-            /* !!! &.user-task FIND in plugins/do_tasks.less !!! */
-            &.user {
-                position: relative;
-                display: table-cell;
-                background-color: var(--color-shade-1);
-                border: solid 1px var(--color-shade-2);
-                border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
-                color: var(--color-foreground);
-                padding-right: .3rem;
+                @media @screen_max-xxlg {
+                    min-height: 28px;
+                }
 
                 @media @screen_max-md {
                     min-height: @toggle-size;
                 }
+            }
 
-                @media @screen_max-xs {
-                    position: absolute;
-                    top: @headericons-margin-xxs;
-                    right: (@toggle-size + @headericons-margin-xxs + 1); // 1.75rem + 1 + (button login/out margin-right)
-                    overflow: hidden;
-                    white-space: nowrap;
-                    margin: -1px 0 0;
+            &.user {
+                @space-min-xxlg: .35rem;
+                @space-max-xxlg: .4rem;
+                @space-max-xlg: .5rem;
+                @space-max-md: .35rem;
+
+                position: relative;
+                display: table-cell;
+                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: @space-min-xxlg;
                 }
 
-                @media @screen_max-xxs {
-                    left: -10px;
-                    right: 0;
-                    width: auto;
+                @media @screen_max-xxlg {
+                    padding-top: @space-max-xxlg;
+                }
+
+                @media @screen_max-xlg {
+                    padding-top: @space-max-xlg;
+                }
+
+                @media @screen_max-md {
+                    min-height: @toggle-size;
+                    padding-top: @space-max-md;
                 }
 
                 > a {
@@ -106,37 +85,31 @@
                     .align-items();
 
                     position: relative;
-                    height: 1rem; // for IE11
+                    min-height: 26px;
                     overflow: visible;
-                    background: var(--color-shade-1); // for removing bg-image
+                    background: @ini_nav_menu_hover_bg; // for removing bg-image
                     border: 0 none;
-                    color: var(--color-foreground);
+                    color: @ini_nav_menu_hover_color;
                     text-indent: 0;
                     font-size: inherit;
                     margin-right: -.3rem;
                     padding: 0 .2em 0 0;
 
                     @media @screen_min-xxlg {
-                        min-height: (@toggle-size - .1);
-                        margin-top: -.4rem;
+                        margin-top: -(@space-min-xxlg);
                     }
 
                     @media @screen_max-xxlg {
-                        min-height: (@toggle-size - .15);
-                        margin-top: -.35rem;
+                        margin-top: -(@space-max-xxlg);
+                    }
+
+                    @media @screen_max-xlg {
+                        margin-top: -(@space-max-xlg);
                     }
 
                     @media @screen_max-md {
                         min-height: (@toggle-size - .1);
-                        margin-top: -.35rem;
-                    }
-
-                    @media @screen_max-sm {
-                        margin-top: -.35rem;
-                    }
-
-                    @media @screen_max-xs {
-                        margin-top: -.4rem;
+                        margin-top: -(@space-max-md);
                     }
 
                     &::before {
@@ -147,29 +120,31 @@
                         right: -1px;
                         width: auto;
                         opacity: 0;
-                        border: solid 1px var(--color-shade-2);
+                        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;
                     }
 
                     &:hover,
                     &:focus,
                     &:active {
-                        background-color: transparent;
-                        color: var(--color-glow-secondary);
-                        filter: var(--filter-glow-secondary);
-                        transition: var(--transition-glow);
+                        background-color: @ini_nav_menu_hover_color;
+                        border-color: @ini_nav_menu_hover_color;
+                        color: @ini_nav_menu_hover_bg;
 
                         &::before {
                             opacity: 1;
-                            filter: var(--filter-glow-secondary);
-                            border-color: var(--color-glow-secondary);
                         }
 
                         bdi,
                         bdi:first-of-type {
                             color: @ini_nav_menu_hover_bg;
+
+                            //&::before {
+                            //    color: inherit;
+                            //}
                         }
                     }
                 }
@@ -177,6 +152,7 @@
                 bdi {
                     display: inline-block;
                     color: inherit;
+                    transition: @transition color;
                 }
 
                 bdi:first-of-type {
@@ -189,61 +165,84 @@
 
                     &::before {
                         position: absolute;
-                        top: 2px;
                         left: -2px;
-                        font-size: @font-size-default + (@font-scale-factor * 4);
+                        font-size: 1.4rem;
                         margin: 0;
+                        transition: @transition color;
+
+                        @media @screen_min-xxlg {
+                            top: -.25rem;
+                        }
+
+                        @media @screen_max-xxlg {
+                            top: -.2rem;
+                        }
+
+                        @media @screen_max-xxs {
+                            top: -.25rem;
+
+                        }
                     }
                 }
             } // user
+
+            &.user-task {
+                position: relative;
+
+                a {
+                    position: relative;
+                    overflow: visible;
+                    white-space: normal;
+                    text-indent: 0;
+
+                    &::before {
+                        content: '';
+                        position: absolute;
+                    }
+                }
+
+                .prefix {
+                    .btn-prefix();
+                    .icon-clipboard();
+
+                    display: block;
+                    font-size: 1.2rem;
+                    text-align: center;
+                    margin-bottom: -1px;
+                }
+            } // user-task
+
+            &.noopentasks {
+                strong {
+                    background-color: @ini_background;
+                    border-color: @noopentasks-border;
+                    color: @ini_text_webframe;
+                }
+
+                .num {
+                    background-color: @noopentasks-border; // fix
+                    color: @noopentasks-color; // fix
+                    margin-top: 1px;
+                }
+            }
         } // li
 
-        /* + + +  icons  + + + */
-        .menuitem, button {
-            padding: 2px 0 0 2px;
-            min-height: @toggle-size; // overrides button[type="submit"] styles
-            background-color: var(--color-shade-1);
-            color: var(--color-foreground);
-            border: solid 1px var(--color-shade-2); // overrides button[type="submit"] styles
-            .btn-hover();
 
-            &:hover,
-            &:active,
-            &:focus {
-                background-color: transparent;
-                border-color: var(--color-glow-secondary);
-                color: var(--color-glow-secondary);
-                filter: var(--filter-glow-secondary);
-            }
-
-            &:hover svg,
-            &:active svg,
-            &:focus svg {
-                transition: @transition fill;
-                fill: var(--color-glow-secondary);
-            }
-
-            svg {
-                fill: var(--color-shade-1);
-                height: @font-size-default + (@font-scale-factor * 4);
-            }
-
-            span {
-                display: none;
-            }
-        }
-
-        a { // Pre-Greebo backwards compatibility, remove after transitioning to Greebo
+/* + + +  icons  + + + */
+        a {
             .fontello();
             .hide-text-show-before();
             .btn-hover();
 
-            background-color: var(--color-shade-1);
             cursor: pointer;
             position: relative;
             line-height: 1;
             text-decoration: none;
 
+            @media @screen_only-lg {
+                min-width: 2rem;
+            }
+
             &::before {
                 .center-middle();
 
@@ -282,71 +281,3 @@
         } // a
     } // ul
 } // nav-usertools
-
-/* + + + + +  layout option compact  + + + + + */
-.header-compact {
-    #dokuwiki__usertools.nav-usertools {
-
-        // mobile
-        @media @screen_max-md {
-            left: 6rem;
-
-            ul {
-                overflow: hidden;
-
-                li.user {
-                    color: var(--color-background);
-
-                    bdi {
-                        position: absolute;
-                        width: 0;
-                        padding: 0;
-                        text-indent: -10000px;
-
-                        &:before {
-                            transition: @transition background-color;
-                            background-color: var(--color-shade-1);
-                            color: var(--color-foreground);
-                            text-indent: 0;
-                        }
-                    }
-
-                    > a {
-                        padding: 0 .2em;
-                        color: @ini_nav_menu_hover_bg;
-
-                        bdi {
-                            &:before {
-                                background-color: var(--color-shade-1);
-                                color: var(--color-foreground);
-                            }
-                        }
-
-                        &:hover {
-                            color: var(--color-glow-secondary);
-
-                            bdi {
-                                &:before {
-                                    background-color: transparent;
-                                    color: var(--color-glow-secondary);
-                                }
-                            }
-                        }
-                    }
-
-                    bdi + bdi {
-                        display: none;
-                    }
-                }
-            }
-        }
-
-        @media @screen_max-sm {
-            ul li {
-                position: static;
-                float: right;
-                top: 0; right: 0;
-            }
-        }
-    }
-}
diff --git a/css/area_recent.less b/css/area_recent.less
deleted file mode 100644
index 9583da8..0000000
--- a/css/area_recent.less
+++ /dev/null
@@ -1,167 +0,0 @@
-/**
- * This file provides the design styles for page revisions
- */
-
-.dokuwiki {
-
-    /* + + + + +  list of changes  + + + + + */
-    form.changes {
-        li {
-            .sizechange {
-                color: @color-editBox;
-
-                &.positive {
-                    background-color: var(--color-success);
-                    color: var(--color-background);
-                }
-
-                &.negative {
-                    background-color: var(--color-error);
-                    color: var(--color-foreground);
-                }
-            }
-        }
-
-        > .no > ul > li {
-            min-height: @formfield_min-height;
-            vertical-align: baseline;
-            margin-bottom: @small-spacing;
-
-            .li {
-                line-height: 150%;
-
-                > * {
-                    min-height: 10px;
-                }
-            }
-
-            a,
-            span,
-            img {
-                vertical-align: baseline;
-            }
-
-            img {
-                margin-left: @small-spacing;
-                margin-right: @small-spacing;
-            }
-
-            input[type="checkbox"] {
-                margin: 0 .5rem .2rem -1.5rem;
-            }
-
-            span.user bdi {
-                a {
-                    vertical-align: baseline;
-                }
-            }
-        }
-    }
-
-    /* + + + + +  view of differents  + + + + + */
-    a.difflink {
-        color: @ini_existing;
-
-        * {
-            color: inherit;
-        }
-    }
-
-    .diffnav {
-        a {
-            background-color: var(--color-background);
-            border: solid 1px var(--color-background);
-            border-radius: 0.5rem;
-            color: var(--color-foreground);
-
-            &::before {
-                background-color: inherit;
-                border: 0 none;
-                color: inherit;
-            }
-
-            &:hover,
-            &:focus,
-            &:active {
-                background-color: transparent;
-                border-color: var(--color-glow-primary);
-                color: var(--color-glow-primary);
-                transition: var(--transition-glow);
-                filter: var(--filter-glow-primary);
-
-                &::before {
-                    background-color: inherit;
-                    color: inherit;
-                }
-            }
-        }
-    }
-
-    table.diff {
-        background-color: var(--color-background);
-        border: none;
-
-        &.diff_inline {
-            border-top-width: 0;
-
-            .diffnav {
-                padding-top: 10px;
-                padding-bottom: 10px;
-            }
-        }
-
-        th {
-            background-color: var(--color-background);
-            color: var(--color-foreground);
-            padding-top: 10px;
-            padding-bottom: 10px;
-
-            &.minor {
-                color: #999;
-            }
-        }
-
-        td {
-            background-color: transparent;
-            color: var(--color-text-1);
-
-            &.diff-blockheader {
-                background-color: transparent;
-                color: var(--color-foreground);
-            }
-
-            &.diff-context {
-                background-color: transparent;
-                color: var(--color-text-1);
-            }
-        }
-
-        .diff-addedline {
-            background-color: var(--color-success-highlight);
-            color: var(--color-foreground);
-
-            strong {
-                background-color: transparent;
-                color: var(--color-success) !important;
-            }
-        }
-
-        .diff-deletedline {
-            background-color: var(--color-error-highlight);
-            color: var(--color-foreground);
-
-            * {
-                color: inherit;
-            }
-
-            strong {
-                background-color: transparent;
-                color: var(--color-error) !important;
-            }
-        }
-
-        .diff-lineheader {
-            background-color: transparent;
-        }
-    }
-}
diff --git a/css/area_search.less b/css/area_search.less
index 503570e..9fddb00 100644
--- a/css/area_search.less
+++ b/css/area_search.less
@@ -1,7 +1,10 @@
 /**
  * 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;
diff --git a/css/area_sidebar-search.less b/css/area_sidebar-search.less
new file mode 100755
index 0000000..dc7eedc
--- /dev/null
+++ b/css/area_sidebar-search.less
@@ -0,0 +1,205 @@
+/**
+ * This file provides the design styles for the quick search.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+.search.main-sidebar {
+    @main-ico-dummy: @font-size-big + @margin-small*2; //FIXME copied from area_main-sidebar-nav
+    @icon-size: @page-header_height;
+    @icon-search_font-size: @font-size-big;
+
+    p.toggleSearch a,
+    button[type="submit"] {
+        .fontello();
+        .hide-text-show-before();
+        .icon-search();
+
+        position: relative;
+        width: @icon-size;
+        min-height: @icon-size;
+        overflow: visible;
+        background-image: none;
+        background-color: transparent; // fix
+        border: solid 1px transparent;
+        padding: 0;
+        transition: @transition color, @transition background-color, @transition border-color;
+
+        &:hover,
+        &:focus,
+        &:active {
+            min-height: @icon-size;
+            background-color: @ini_button_color;
+            border: solid 1px @ini_button_background;
+
+            &::after {
+                background-color: @ini_button_background;
+            }
+        }
+
+        &::before {
+            width: 100%;
+            color: inherit;
+            font-size: @icon-search_font-size;
+            text-align: center;
+            margin: 0;
+        }
+    }
+
+    p.toggleSearch {
+        display: none;
+        margin: -2px 0 0; // reverse transparent border and box-sizing of a child
+        padding: 0;
+
+        @media @screen_max-xxlg {
+            margin-top: -1px;
+        }
+
+        a {
+            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;
+
+            &::before {
+                position: absolute;
+                top: 50%;
+                left: 0;
+                color: inherit;
+                text-align: center;
+                margin-top: -(@icon-search_font-size / 2);
+            }
+
+            &:hover,
+            &:focus,
+            &:active {
+                background-color: @ini_nav_menu_hover_bg;
+                border-color: @ini_nav_menu_hover_color;
+                color: @ini_nav_menu_hover_color;
+            }
+        }
+    }
+
+    button[type="submit"] {
+        position: absolute;
+        top: 1px;
+        bottom: 1px;
+        right: 0;
+        height: auto;
+        min-height: (@icon-size - .2);
+        color: @quicksearch-button-color;
+
+        &:hover,
+        &:focus,
+        &:active {
+            top: 0;
+            bottom: 0;
+            min-height: @icon-size;
+            background-color: @ini_button_color;
+            border: solid 1px @ini_button_background;
+            color: @ini_button_background;
+        }
+    }
+
+
+/* + + +  form  + + + */
+    form {
+        position: relative;
+        display: block;
+        margin: 0 0 @margin-default;
+
+        .no {
+            display: block;
+
+            #qsearch__in {
+                width: 100%;
+                padding-left: 10px;
+                padding-right: @icon-size;
+            }
+        }
+
+        input {
+            min-height: @icon-size;
+            box-sizing: border-box;
+        }
+
+        button[type="submit"] {
+            border: solid 1px transparent;
+            border-right-color: @ini_border;
+            margin-left: -(@icon-size);
+
+            &::after {
+                content: '';
+                position: absolute;
+                top: 15%;
+                bottom: 15%;
+                width: 1px;
+                left: -1px;
+                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 {
+        left: auto;
+        top: auto;
+        width: 100%;
+    }
+}
+
+
+/* + + + + +  wide page content  + + + + + */
+.wide-content {
+    .search.main-sidebar {
+        p.toggleSearch {
+            position: relative;
+            z-index: 1;
+            display: block;
+            float: left;
+            width: 100%;
+        }
+
+        form {
+            input {
+                border: 0 none;
+            }
+
+            .no {
+                #qsearch__in {
+                    width: 0;
+                    padding: 0;
+                    margin: 0;
+                }
+
+                button[type="submit"] {
+                    display: none;
+                }
+            }
+        }
+    }
+}
diff --git a/css/area_tabs.less b/css/area_tabs.less
index 8b98f02..6574645 100644
--- a/css/area_tabs.less
+++ b/css/area_tabs.less
@@ -2,28 +2,22 @@
  * 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 {
-                background-color: var(--color-shade-2);
-                color: var(--color-accent-1);
-            }
-            strong {
-                background-color: var(--color-shade-3);
-                color: inherit;
-            }
-
             a:hover,
             a:focus,
             a:active {
-                color: var(--color-accent-3);
+                color: @ini_text;
             }
         }
     }
diff --git a/css/area_togglelink.less b/css/area_togglelink.less
index 9a12b47..816799e 100755
--- a/css/area_togglelink.less
+++ b/css/area_togglelink.less
@@ -1,51 +1,63 @@
 /**
  * This file provides the design styles for the sidebar (navmain).
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 .togglelink {
     &.page_main-content {
         position: absolute;
         top: 0;
         bottom: -1px;
         width: 2rem;
-        left: -(@margin-default + 0.25rem);
+        left: -(@margin-default);
+        z-index: 1;
 
         @media @screen_max-md {
             display: none;
         }
 
         a {
-            position: absolute;
-            inset: 0;
+            .fontello-double();
+            .icon-right-bold();
+            .icon-left-bold();
+
+            .display-flex();
+            .flex-direction();
+            .justify-content();
 
             width: @margin-default;
             height: 100%;
-            background-color: transparent;
-            border: solid 1px var(--color-shade-4);
-            border-right-style: none;
-            border-radius: 0.5rem 0 0 0.5rem;
-            color: var(--color-shade-4);
+            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;
 
-            &::before {
-                content: '';
-                display: block;
-                position: absolute;
-                inset: 0.3rem;
-                mask-size: contain;
-                mask-position: center;
-                mask-repeat: no-repeat;
-                background-color: currentColor;
-                mask-image: url('img/arrow_left.svg');
+            &::before,
+            &::after {
+                width: 100%;
+                opacity: .6;
+                font-size: 1rem;
+                line-height: 1;
+                text-align: center;
+                margin: 0;
+                transition: @transition opacity;
+            }
 
+            &::before {
+                opacity: 1;
+                font-size: 1.25rem;
             }
 
             &:hover,
             &:focus,
             &:active {
-                border-color: var(--color-glow-primary);
-                color: var(--color-glow-primary);
+                background-color: @ini_button_color;
+                border-color: @ini_button_background;
+                color: @ini_button_background;
                 text-decoration: none;
 
                 * {
@@ -53,24 +65,43 @@
                     text-decoration: none;
                 }
 
-                filter: var(--filter-glow-primary);
-                transition: var(--transition-glow);
-
+                &::after {
+                    opacity: 0;
+                }
             }
         }
 
-        /* + + +  toggle out  + + + */
-
+/* + + +  toggle out  + + + */
         .wide-content & {
-            left: 0;
+            left: -1px;
 
             a {
-                border-radius: 0 0.5rem 0.5rem 0;
-                border-style: solid;
-                border-left-style: none;
+                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 {
-                    mask-image: url('img/arrow_right.svg');
+                    opacity: .6;
+                    font-size: 1rem;
+                }
+
+                &::after {
+                    opacity: 1;
+                    font-size: 1.25rem;
+                }
+
+                &:hover,
+                &:focus,
+                &:active {
+                    background-color: @ini_button_color;
+
+                    &::before {
+                        opacity: 0;
+                    }
+
+                    &::after {
+                        opacity: 1;
+                    }
                 }
             }
         }
diff --git a/css/base.less b/css/base.less
index 5b50fb6..8d8a53f 100755
--- a/css/base.less
+++ b/css/base.less
@@ -1,17 +1,20 @@
 /**
- * This file provides the basic/reset styles.
+ * This file provides the basic vars and reset styles.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* global vars */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@font_family_screen:       "Athiti", ui-sans, sans-serif;
-@font_family_print:        "Athiti", ui-sans, sans-serif;
 
-@nav_direct_background:     var(--color-background);
+@font_family_screen:       arial, sans-serif;
+@font_family_print:        "Times New Roman", serif;
+
+@nav_direct_background:    @ini_background_content;
 @nav_direct_color:         @ini_existing;
 
-@background_darker:        rgba(230,230,230, .2);
 @ini_sidebar_width:        (100 - @ini_site_width) - 4;
 
 @height-context-bar:       50px;
@@ -19,7 +22,6 @@
 @margin-small:             1rem;
 @margin-default:           2rem;
 @margin-big:               3.07rem;
-@nav-margin:               1.3rem;
 
 @small-spacing:            .3rem;
 @very-small-spacing:       .2rem;
@@ -29,18 +31,18 @@
 
 @transition:               ease-out .30s;
 
-@box-shadow-offset:        .1em .1em .1em rgba(153,153,153,.5); // tabinclude
-@box-shadow:               0 0 .5em rgba(153,153,153,.5); // pagetoolbox hover
+@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:  .1em .3rem .5em rgba(153,153,153,.5);
-@box-shadow-bottom:        0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor
+@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:        0.5rem; // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
 
-@toggle-showsidebar_width: 3.47rem;       // shown sidebar after toggle
+@fix_border-radius:        3px;
 
-@headericons-margin-xxs:  .45rem;         // screen xxs margin-top for header icons
+@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)
@@ -49,31 +51,34 @@
 
 @formfield_min-height:     2rem;          // min-height for input, textarea, select, keygen
 
-@code-background:          #F6F6F6; /* code, pre, samp, kbd */
+//@metanav-ini_background:   rgba(0, 0, 0, .1);
+
 
 /* icons */
-@noopentasks-background:   #ECECEC; /* metabox tabs + num in icons + tabinclude */
+@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 */
-@menu-margin-lg: 1.3rem;
 
+/* navigation left */
 @quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
 @suggestion-zebra:         #EEE;
 
-/* edit mode */
-@highlight-odd-ini_text:  fade(@ini_background, 95%);
-@highlight-even-ini_text: fade(@ini_text, 5%);
-@color-editBox:           var(--color-foreground); // editmode for tables, revision states
 
-//@nolinkedicon-ini_background: fade(@ini_background_site, 10%);
+/* 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;
@@ -96,9 +101,10 @@
 @font-size-head2: @font-size-default + (@font-scale-factor * 7);
 @font-size-head1: @font-size-default + (@font-scale-factor * 9);
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* breakpoints */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 @break-min-xxs: 480;
 @break-max-xxs: (@break-min-xxs - 1);
 
@@ -120,9 +126,10 @@
 @break-min-xxlg: 1600;
 @break-max-xxlg: (@break-min-xxlg - 1);
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* media queries for breakpoints */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 @screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)";
 @screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)";
 
@@ -145,14 +152,13 @@
 @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-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)";
-@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
-@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) 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_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* col width */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 @c12:               100%;
 @c11:               91.66666667%;
 @c10:               83.33333333%;
@@ -169,104 +175,10 @@
 @grid-columns:      12;
 
 
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* fonts */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-
-@font-face {
-    font-family: "Athiti";
-    font-weight: 700;
-    src: url("fonts/athiti/Athiti-Bold.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Athiti";
-    font-weight: 600;
-    src: url("fonts/athiti/Athiti-SemiBold.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Athiti";
-    font-weight: 500;
-    src: url("fonts/athiti/Athiti-Medium.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Athiti";
-    font-weight: 400;
-    src: url("fonts/athiti/Athiti-Regular.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Athiti";
-    font-weight: 300;
-    src: url("fonts/athiti/Athiti-Light.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Athiti";
-    font-weight: 200;
-    src: url("fonts/athiti/Athiti-ExtraLight.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Departure Mono";
-    src: url("fonts/departuremono/DepartureMono-Regular.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 100;
-    src: url("fonts/argonglow/ArgonGlow-Thin.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 200;
-    src: url("fonts/argonglow/ArgonGlow-ExtraLight.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 300;
-    src: url("fonts/argonglow/ArgonGlow-Light.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 400;
-    src: url("fonts/argonglow/ArgonGlow-Regular.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 500;
-    src: url("fonts/argonglow/ArgonGlow-Medium.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 600;
-    src: url("fonts/argonglow/ArgonGlow-SemiBold.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    font-weight: 700;
-    src: url("fonts/argonglow/ArgonGlow-Bold.woff2") format("woff2");
-}
-
-@font-face {
-    font-family: "Argon Glow";
-    src: url("fonts/argonglow/ArgonGlow-VariableVF.woff2") format("woff2");
-    font-weight: 100 900;
-}
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* all media */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 html,
 body {
     .reset();
@@ -278,6 +190,18 @@ header,
     .elementsReset();
 }
 
+div, span, object,
+h1, h2, h3, h4, h5, h6, p, blockquote,
+a, abbr, em,acronym, img, strong,
+dl, dt, dd, ol, ul, li,
+fieldset, form, label, legend,
+table, caption, tbody, tfoot, thead, tr, th, td,
+input, select, option, textarea, button {
+    font-size: 1rem;
+    line-height: 100%;
+}
+
+
 ol,
 ul {
     list-style: none outside none;
@@ -338,9 +262,10 @@ nav > ul {
     }
 }
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* css behaviour */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 .sr-out {
     .sr-out();
 }
@@ -382,303 +307,12 @@ nav > ul {
     }
 }
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* variables */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-
-:root {
-    --color-neutral-50: #F2F0F5;
-    --color-neutral-100: #D1C6E0;
-    --color-neutral-200: #B2A0CB;
-    --color-neutral-300: #957EB5;
-    --color-neutral-400: #7A60A0;
-    --color-neutral-500: #61468B;
-    --color-neutral-600: #4B3176;
-    --color-neutral-700: #371F60;
-    --color-neutral-800: #26114B;
-    --color-neutral-900: #180736;
-    --color-neutral-950: #0C011F;
-    --color-argon-50: #E1ABC9;
-    --color-argon-100: #DA87B5;
-    --color-argon-200: #D464A1;
-    --color-argon-300: #CD448F;
-    --color-argon-400: #C6257D;
-    --color-argon-500: #B0166F;
-    --color-argon-600: #9A0A61;
-    --color-argon-700: #830755;
-    --color-argon-800: #6D0449;
-    --color-argon-900: #56023C;
-    --color-argon-950: #3F012D;
-    --color-krypton-50: #B2D9EA;
-    --color-krypton-100: #8CC9E4;
-    --color-krypton-200: #69BADE;
-    --color-krypton-300: #4BADD8;
-    --color-krypton-400: #2493C2;
-    --color-krypton-500: #167FAC;
-    --color-krypton-600: #0A6C96;
-    --color-krypton-700: #075C81;
-    --color-krypton-800: #044C6B;
-    --color-krypton-900: #023C55;
-    --color-krypton-950: #012C3F;
-    --color-green-50: #C0F49A;
-    --color-green-100: #A7E57A;
-    --color-green-200: #8FD75D;
-    --color-green-300: #7AC843;
-    --color-green-400: #66B92D;
-    --color-green-500: #54AA18;
-    --color-green-600: #47990F;
-    --color-green-700: #397E0A;
-    --color-green-800: #2B6206;
-    --color-green-900: #1F4703;
-    --color-green-950: #122B01;
-    --color-red-50: #E6AFAF;
-    --color-red-100: #DD9090;
-    --color-red-200: #D57272;
-    --color-red-300: #CC5757;
-    --color-red-400: #C33D3D;
-    --color-red-500: #BB2626;
-    --color-red-600: #B21010;
-    --color-red-700: #950808;
-    --color-red-800: #780404;
-    --color-red-900: #5C0202;
-    --color-red-950: #3F0101;
-
-    --color-white: #FFFFFF;
-
-    --color-dark-foreground: var(--color-neutral-50);
-    --color-dark-background: var(--color-neutral-950);
-    --color-dark-shade-1: var(--color-neutral-900);
-    --color-dark-shade-2: var(--color-neutral-800);
-    --color-dark-shade-3: var(--color-neutral-700);
-    --color-dark-shade-4: var(--color-neutral-600);
-    --color-dark-text-1: var(--color-neutral-200);
-    --color-dark-text-2: var(--color-neutral-300);
-    --color-dark-text-3: var(--color-neutral-400);
-    --color-dark-text-4: var(--color-neutral-500);
-    --color-dark-primary: var(--color-argon-400);
-    --color-dark-secondary: var(--color-krypton-300);
-    --color-dark-error: var(--color-red-500);
-    --color-dark-error-highlight: var(--color-red-950);
-    --color-dark-success: var(--color-green-500);
-    --color-dark-success-highlight: var(--color-green-950);
-    --color-dark-warning: #efb100;
-    --color-dark-highlight: #efb10060;
-    --color-dark-accent-1: #60a5f9;
-    --color-dark-accent-2: #d381f7;
-    --color-dark-accent-3: #ff7975;
-
-    --color-light-foreground: var(--color-neutral-950);
-    --color-light-background: var(--color-neutral-50);
-    --color-light-shade-1: var(--color-neutral-100);
-    --color-light-shade-2: var(--color-neutral-200);
-    --color-light-shade-3: var(--color-neutral-300);
-    --color-light-shade-4: var(--color-neutral-400);
-    --color-light-text-1: var(--color-neutral-800);
-    --color-light-text-2: var(--color-neutral-700);
-    --color-light-text-3: var(--color-neutral-600);
-    --color-light-text-4: var(--color-neutral-500);
-    --color-light-primary: var(--color-argon-600);
-    --color-light-secondary: var(--color-krypton-500);
-    --color-light-error: var(--color-red-600);
-    --color-light-error-highlight: var(--color-red-50);
-    --color-light-success: var(--color-green-600);
-    --color-light-success-highlight: var(--color-green-50);
-    --color-light-warning: #d08700;
-    --color-light-highlight: #d0870060;
-    --color-light-accent-1: #303EC0;
-    --color-light-accent-2: #6c366c;
-    --color-light-accent-3: #932f0a;
-
-    --color-cmyk-primary: var(--color-dark-primary);
-    --color-cmyk-secondary: var(--color-dark-secondary);
-
-    --text-xs: 0.75rem;
-    --text-sm: 0.875rem;
-    --text-base: 1rem;
-    --text-lg: 1.125rem;
-    --text-xl: 1.25rem;
-    --text-2xl: 1.5rem;
-    --text-3xl: 1.875rem;
-    --text-4xl: 2.25rem;
-    --text-5xl: 3rem;
-
-    --container-3xs: 16rem;
-    --container-2xs: 18rem;
-    --container-xs: 20rem;
-    --container-sm: 24rem;
-    --container-md: 28rem;
-    --container-lg: 32rem;
-    --container-xl: 36rem;
-    --container-2xl: 42rem;
-    --container-3xl: 48rem;
-    --container-4xl: 56rem;
-    --container-5xl: 64rem;
-    --container-6xl: 72rem;
-    --container-7xl: 80rem;
-}
-
-.fnButton {
-    border-radius: 0.5rem;
-    background-color: var(--color-shade-1);
-    transition: background-color 150ms;
-    color: var(--color-foreground);
-    font-size: 1.2em;
-    border: solid 0.1em var(--color-shade-1);
-    transition-property: filter, border-color;
-    transition-duration: 200ms;
-    transition-timing-function: ease-out;
-
-    &:hover, &.active{
-        .fnActiveButton();
-    }
-}
-
-.fnButtonSecondary {
-    &:hover, &.active{
-        .fnActiveButtonSecondary();
-    }
-}
-
-.fnActiveButton {
-    background-color: transparent;
-    border: solid 0.1em var(--color-glow-primary);
-    text-decoration: none;
-    color: var(--color-glow-primary);
-    filter: var(--filter-glow-primary);
-    transition: var(--transition-glow);
-}
-
-.fnActiveButtonSecondary {
-    background-color: transparent;
-    border: solid 0.1em var(--color-glow-secondary);
-    text-decoration: none;
-    color: var(--color-glow-secondary);
-    filter: var(--filter-glow-secondary);
-    transition: var(--transition-glow);
-}
-
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* screen only */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 
 @media screen {
-
-    .dark {
-
-        --color-foreground: var(--color-dark-foreground);
-        --color-background: var(--color-dark-background);
-        --color-shade-1: var(--color-dark-shade-1);
-        --color-shade-2: var(--color-dark-shade-2);
-        --color-shade-3: var(--color-dark-shade-3);
-        --color-shade-4: var(--color-dark-shade-4);
-        --color-text-1: var(--color-dark-text-1);
-        --color-text-2: var(--color-dark-text-2);
-        --color-text-3: var(--color-dark-text-3);
-        --color-text-4: var(--color-dark-text-4);
-        --color-primary: var(--color-dark-primary);
-        --color-secondary: var(--color-dark-secondary);
-        --color-error: var(--color-dark-error);
-        --color-error-highlight: var(--color-dark-error-highlight);
-        --color-success: var(--color-dark-success);
-        --color-success-highlight: var(--color-dark-success-highlight);
-        --color-warning: var(--color-dark-warning);
-        --color-highlight: var(--color-dark-highlight);
-        --color-accent-1: var(--color-dark-accent-1);
-        --color-accent-2: var(--color-dark-accent-2);
-        --color-accent-3: var(--color-dark-accent-3);
-
-        --filter-glow-primary: drop-shadow(0 0 0.0625em var(--color-white)) drop-shadow(0 0 0.125em var(--color-primary)) drop-shadow(0 0 0.25em var(--color-primary));
-        --filter-glow-secondary: drop-shadow(0 0 0.0625em var(--color-white)) drop-shadow(0 0 0.125em var(--color-secondary)) drop-shadow(0 0 0.25em var(--color-secondary));
-        --color-glow-primary: var(--color-white);
-        --color-glow-secondary: var(--color-white);
-        --transition-glow: filter 150ms cubic-bezier(0,1.7,1,-0.3) 50ms,
-        border-color 150ms cubic-bezier(0,1.7,1,-0.3) 50ms;
-
-        @media (prefers-reduced-motion) {
-            --transition-glow: filter 150ms, border-color 150ms;
-        }
-
-        .light-only {
-            display: none;
-        }
-
-        .dark-only {
-            display: initial;
-        }
-    }
-
-    .light {
-        --color-foreground: var(--color-light-foreground);
-        --color-background: var(--color-light-background);
-        --color-shade-1: var(--color-light-shade-1);
-        --color-shade-2: var(--color-light-shade-2);
-        --color-shade-3: var(--color-light-shade-3);
-        --color-shade-4: var(--color-light-shade-4);
-        --color-text-1: var(--color-light-text-1);
-        --color-text-2: var(--color-light-text-2);
-        --color-text-3: var(--color-light-text-3);
-        --color-text-4: var(--color-light-text-4);
-        --color-primary: var(--color-light-primary);
-        --color-secondary: var(--color-light-secondary);
-        --color-error: var(--color-light-error);
-        --color-error-highlight: var(--color-light-error-highlight);
-        --color-success: var(--color-light-success);
-        --color-success-highlight: var(--color-light-success-highlight);
-        --color-warning: var(--color-light-warning);
-        --color-highlight: var(--color-light-highlight);
-        --color-accent-1: var(--color-light-accent-1);
-        --color-accent-2: var(--color-light-accent-2);
-        --color-accent-3: var(--color-light-accent-3);
-
-        --filter-glow-primary: drop-shadow(0 0 0.0625em var(--color-argon-400));
-        --filter-glow-secondary: drop-shadow(0 0 0.0625em var(--color-krypton-400));
-        --color-glow-primary: var(--color-argon-950);
-        --color-glow-secondary: var(--color-krypton-950);
-        --transition-glow: filter 150ms cubic-bezier(0, 2, 1, -0.7) 50ms,
-        border-color 150ms cubic-bezier(0, 2, 1, -0.7) 50ms;
-
-        @media (prefers-reduced-motion) {
-            --transition-glow: filter 150ms, border-color 150ms;
-        }
-
-        .light-only {
-            display: initial;
-        }
-
-        .dark-only {
-            display: none;
-        }
-    }
-
-    @media (prefers-color-scheme: dark) {
-        html {
-            .dark();
-
-            &:has(#themeLight:checked) {
-                .light();
-            }
-        }
-        #themeToggleDark {
-            display: none !important;
-        }
-    }
-
-    @media (prefers-color-scheme: light) {
-        html {
-            .light();
-
-            &:has(#themeDark:checked) {
-                .dark();
-            }
-        }
-        #themeToggleLight {
-            display: none !important;
-        }
-    }
-
-
-
     html {
         -ms-text-size-adjust: 100%;
         -webkit-text-size-adjust: 100%;
@@ -707,28 +341,9 @@ nav > ul {
         display: none;
     }
 
-    a {
-        color: var(--color-accent-1);
-        text-decoration: underline;
-
-        &:hover,
-        &:active,
-        &:focus {
-            color: var(--color-accent-3);
-            text-decoration: none;
-        }
-
-        &:visited {
-            color: var(--color-accent-2);
-            text-decoration: underline;
-
-            &:hover,
-            &:active,
-            &:focus {
-                color: var(--color-accent-3);
-                text-decoration: none;
-            }
-        }
+    a:active,
+    a:hover {
+        outline: 0;
     }
 
     abbr[title] {
@@ -739,6 +354,22 @@ nav > ul {
         font-size: 80%;
     }
 
+    sub,
+    sup {
+        font-size: 75%;
+        line-height: 0;
+        position: relative;
+        vertical-align: baseline;
+    }
+
+    sup {
+        top: -0.5em;
+    }
+
+    sub {
+        bottom: -0.25em;
+    }
+
     svg:not(:root) {
         overflow: hidden;
     }
@@ -756,7 +387,7 @@ nav > ul {
     kbd,
     pre,
     samp {
-        font-family: "Departure Mono", ui-monospace, monospace;
+        font-family: monospace, monospace;
         font-size: 1em;
     }
 
@@ -823,15 +454,28 @@ nav > ul {
         padding: 0;
     }
 
-    html, body {
+    html, body, div, span, applet, object, iframe,
+    h1, h2, h3, h4, h5, h6, p, blockquote,
+    a, abbr, acronym, address, big, cite, del, dfn, em, img, ins, kbd, q, s, samp,
+    small, strike, strong, sub, sup, tt, var,
+    b, u, i, center,
+    dl, dt, dd, ol, ul, li,
+    fieldset, form, label, legend,
+    table, caption, tbody, tfoot, thead, tr, th, td,
+    article, aside, canvas, details, embed,
+    figure, figcaption, footer, header,
+    menu, nav, output, ruby, section, summary,
+    time, mark, audio, video {
         font-family: @font_family_screen;
-        color: var(--color-foreground);
+        color: @ini_text;
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* print only */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 @media print {
     body {
         font-size: 12pt;
diff --git a/css/base_design.less b/css/base_design.less
index 2dfc1f1..9d68d7b 100755
--- a/css/base_design.less
+++ b/css/base_design.less
@@ -1,14 +1,18 @@
 /**
  * This file provides the main design styles
  * across all template elements (typo, colors etc.)
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
 
 html, body {
-    background-color: var(--color-background);
+    background-color: @ini_background;
 }
 
+
 /* highlight selected tool */
+
 .mode_admin a.action.admin,
 .mode_login a.action.login,
 .mode_register a.action.register,
@@ -23,23 +27,10 @@ html, body {
 }
 
 .dokuwiki {
-    .tabs > ul li a,
-    ul.tabs li strong,
-    ul.tabs li a {
-        border-color: var(--color-shade-4);
-    }
-    ul.tabs::after {
-        border-color: var(--color-shade-4);
-    }
-
     .page ol li,
     .page ul li,
     .aside ul li {
-        color: var(--color-foreground);
-
-        .li {
-            color: var(--color-foreground);
-        }
+        color: @ini_text;
     }
 
     .pageId {
@@ -54,7 +45,7 @@ html, body {
             font-size: @font-size-small;
             border: solid @ini_background_alt;
             border-width: 1px 1px 0;
-            background-color: var(--color-background);
+            background-color: @ini_background;
             color: @ini_text_alt;
             padding: .1em .35em;
             border-top-left-radius: 2px;
@@ -68,7 +59,7 @@ html, body {
         clear: both;
         overflow: hidden;
         word-wrap: break-word;
-        background: var(--color-background);
+        background: @ini_background_content;
         color: inherit;
         padding: @page_padding-top @margin-default @margin-default;
 
@@ -79,10 +70,6 @@ html, body {
         @media @screen_max-xs {
             padding-left: @margin-small;
         }
-
-        @media @screen_max-xxs {
-            padding-right: @margin-small;
-        }
     }
 
     .content #dokuwiki__pagetools {
@@ -97,7 +84,6 @@ html, body {
     }
 
     /* license note under edit window */
-
     div.license {
         font-size: @font-size-small;
         line-height: @line-height-default;
@@ -167,24 +153,60 @@ 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 {
@@ -192,11 +214,20 @@ h6 {
     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 {
     font-size: @font-size-default;
-    line-height: @line-height-big;
+    line-height: 135%;
 
     a,
     span,
@@ -255,58 +286,11 @@ small,
 
 .code {
     margin-top: @grid;
-
-    // SPR-926: darker colors for accessibility
-    .es6 {
-        color: #00832B;
-    }
-
-    .kw5 {
-        color: #005D00;
-    }
-
-    .kw6 {
-        color: #DC0075;
-    }
-
-    .nu0 {
-        color: #A74DA7;
-    }
-
-    .re3 {
-        color: #DE1B1B;
-    }
-
-    .re4 {
-        color: #007F6F;
-    }
-
-    .br0, .sy0 {
-        color: #248124;
-    }
-
-    .co1, .coMULTI, .sc-1 {
-        color: #707070;
-    }
-
-    .co2, .sy1 {
-        color: #108400;
-    }
-
-    .co3, .sy4 {
-        color: #008070;
-    }
-
-    .kw1, .kw8 {
-        color: #747400;
-    }
-
-    .re1, .st0, .st_h {
-        color: #DD0000;
-    }
 }
 
-/* + + +  lists   + + + */
+
+/*____________ lists ____________*/
+
 ul,
 ol {
     font-size: @font-size-default;
@@ -335,11 +319,6 @@ dl {
     line-height: 140%;
 }
 
-dt,
-dd {
-    line-height: inherit;
-}
-
 dt {
     font-weight: bold;
     margin: 0;
@@ -384,15 +363,22 @@ ol ol ol ol ol {
     list-style-type: lower-roman;
 }
 
-/* + + +  tables   + + + */
+
+/*____________ tables ____________*/
+
 .dokuwiki {
     table.inline tr:hover {
         th {
-            background-color: var(--color-shade-3);
+            background-color: fade(@ini_background_alt, 50%);
         }
 
         td {
-            background-color: var(--color-shade-2);
+            background-color: fade(@ini_background_alt, 80%);
+            color: @ini_text_alt;
+
+            *:not(button,a) {
+                color: @ini_text_alt;
+            }
         }
     }
 }
@@ -401,7 +387,7 @@ table {
     border-collapse: collapse;
     empty-cells: show;
     border-spacing: 0;
-    border: 1px solid var(--color-shade-4);
+    border: 1px solid @ini_border;
     font-size: @font-size-default;
     line-height: 140%;
 }
@@ -420,24 +406,36 @@ td {
     padding: .3em .5em;
     margin: 0;
     vertical-align: top;
-    border: 1px solid var(--color-shade-4);
+    border: 1px solid @ini_border;
 }
 
 th {
     font-weight: bold;
-    background-color: var(--color-shade-1);
-    color: var(--color-foreground);
+    background-color: @ini_background_alt;
+    color: @ini_text_alt;
     text-align: left;
-
-    a {
-        color: @ini_link_alt;
-    }
 }
 
 [dir=rtl] th {
     text-align: right;
 }
 
+a {
+    outline: none;
+
+    &:link,
+    &:visited {
+        text-decoration: none;
+        color: @ini_link; // links to non wikipages (external links)
+    }
+
+    &:hover,
+    &:focus,
+    &:active {
+        text-decoration: underline;
+    }
+}
+
 img {
     display: inline-block;
     border-width: 0;
@@ -463,7 +461,7 @@ button img {
 
 hr {
     border-top: solid @ini_border;
-    border-bottom: solid var(--color-background);
+    border-bottom: solid @ini_background;
     border-width: 1px 0;
     height: 0;
     text-align: center;
@@ -491,39 +489,31 @@ pre,
 code,
 samp,
 kbd {
-    font-family: "Departure Mono", ui-monospace, monospace;
+    font-family: Consolas, "Andale Mono WT", "Andale Mono", "Bitstream Vera Sans Mono", "Nimbus Mono L", Monaco, "Courier New", monospace;
     /* same font stack should be used for ".dokuwiki table.diff td" in _diff.css */
     font-size: @font-size-default;
     direction: ltr;
     text-align: left;
-    background-color: var(--color-shade-1);
-    color: var(--color-foreground);
+    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;
-
-    * {
-        font-family: inherit;
-        font-size: inherit;
-    }
-
-    span {
-        color: inherit;
-    }
 }
 
 pre {
     overflow: auto;
     word-wrap: normal;
+    background-color: @noopentasks-background;
+    border: 1px solid @noopentasks-border;
+    border-radius: @fix_border-radius;
+    box-shadow: inset 0 0 .5em @noopentasks-border;
     font-size: @font-size-default;
     line-height: 140%;
     padding: .7em 1em;
 }
 
-code:not([class]) {
-    display: inline-block;
-}
-
 blockquote {
     border: solid @ini_border;
     border-width: 0 0 0 .25em;
diff --git a/css/base_fontello-icons.less b/css/base_fontello-icons.less
index 2bd1a37..bb31646 100644
--- a/css/base_fontello-icons.less
+++ b/css/base_fontello-icons.less
@@ -1,8 +1,10 @@
 /**
  * This file provides styles for web fonts and icon fonts
- * (If you add new icons in the fontello set you have to add the icon class and associated character encoding here)
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 /* icon font */
 .setIconFontFace('fontello','fontello');
 
@@ -10,7 +12,12 @@
     .fontello();
 }
 
+
 /* + + + + +  fontello codes  + + + + + */
+/**
+ * If in the Fontello-Packet an icon is added, the code should be supplemented here:
+*/
+
 .icon-emo-happy          { &::before { content: '\e804'; } } /* '' */
 .icon-emo-wink           { &::before { content: '\e805'; } } /* '' */
 .icon-emo-unhappy        { &::before { content: '\e806'; } } /* '' */
@@ -87,6 +94,7 @@
 
 
 /* + + + + +  additional "after" for nav-pagetools  + + + + + */
+
 .icon-pencil {
     &::before,
     &::after { content: '\e840'; }
diff --git a/css/base_mixins.less b/css/base_mixins.less
index e664bf3..82a5291 100755
--- a/css/base_mixins.less
+++ b/css/base_mixins.less
@@ -1,10 +1,14 @@
 /**
  * This file provides less mixins for all other style modules
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Fonts */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 .setLocalFontFace(@fontFamily,@fontWeight,@localFontName,@localFontNameVar,@filename) {
     @font-face {
         font-family: @fontFamily;
@@ -98,9 +102,11 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Screenreader / Hide */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 .sr-out() {
     display: block;
     width: 1px;
@@ -134,20 +140,19 @@
     }
 }
 
+
 /* + + + + +  small icon-buttons (breadcrumb, page-header)  + + + + + */
 .btn-hover {
-    background-color: var(--color-shade-1);
-    border-color: var(--color-shade-2);
-    color: var(--color-foreground);
-    transition: var(--transition-glow);
+    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: transparent;
-        border-color: var(--color-glow-secondary);
-        color: var(--color-glow-secondary);
-        filter: var(--filter-glow-secondary);
+        background-color: @ini_nav_menu_hover_color;
+        border-color: @ini_nav_menu_hover_color;
+        color: @ini_nav_menu_hover_bg;
 
         .prefix {
             color: inherit;
@@ -170,7 +175,7 @@
     }
 }
 
-.btn-usertools-num() {
+.btn-usertools-num () {
     .num {
         position: absolute;
         right: -.4rem;
@@ -187,7 +192,7 @@
     }
 }
 
-.btn-prefix(@margin-top:.3rem) {
+.btn-prefix () {
     .fontello();
     .hide-text-show-before();
 
@@ -195,15 +200,15 @@
     font-size: @font-size-default;
 
     @media @screen_min-xxlg {
-        margin-top: .22rem;
+        margin-top: .25rem;
     }
 
     @media @screen_max-xxlg {
-        margin-top: @margin-top;
+        margin-top: .3rem;
     }
 
     @media @screen_max-md {
-        margin-top: .2rem;
+        margin-top: .25rem;
     }
 }
 
@@ -277,14 +282,10 @@
     -webkit-flex: @elem;
 }
 
-.flex-wrap() {
-    flex-wrap: wrap;
-    -webkit-flex-wrap: wrap;
-    -ms-flex-wrap: wrap;
-}
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* positioning */
+
 .center-middle() {
     position: absolute;
     top: 50%;
@@ -294,9 +295,11 @@
     -webkit-transform: translateX(-50%) translateY(-50%);
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Screenreader / Hide */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 .reset() {
     background: transparent;
     border: none 0; outline: 0; vertical-align: baseline;
@@ -320,42 +323,22 @@
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Col Grid */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 .make-grid(@class) {
     .float-grid-columns(@class);
-    .grid-columns(1, @class, width);
-    .grid-columns(2, @class, width);
-    .grid-columns(3, @class, width);
-    .grid-columns(4, @class, width);
-    .grid-columns(5, @class, width);
-    .grid-columns(6, @class, width);
-    .grid-columns(7, @class, width);
-    .grid-columns(8, @class, width);
-    .grid-columns(9, @class, width);
-    .grid-columns(10, @class, width);
-    .grid-columns(11, @class, width);
-    .grid-columns(12, @class, width);
+    .loop-grid-columns(@grid-columns, @class, width);
 }
 
 .float-grid-columns(@class) {
-    .col-@{class}-1,
-    .col-@{class}-2,
-    .col-@{class}-3,
-    .col-@{class}-4,
-    .col-@{class}-5,
-    .col-@{class}-6,
-    .col-@{class}-7,
-    .col-@{class}-8,
-    .col-@{class}-9,
-    .col-@{class}-10,
-    .col-@{class}-11,
-    .col-@{class}-12 {
+    .col-@{class}-1, .col-@{class}-2, .col-@{class}-3, .col-@{class}-4, .col-@{class}-5, .col-@{class}-6, .col-@{class}-7, .col-@{class}-8, .col-@{class}-9, .col-@{class}-10, .col-@{class}-11, .col-@{class}-12 {
         float: left;
     }
 }
 
-// todo: no recusion - fix it !!!
-.grid-columns(@index, @class, @type) {
+.loop-grid-columns(@index, @class, @type) when (@index >= 0) {
     .calc-grid-column(@index, @class, @type);
+    // next iteration
+    .loop-grid-columns((@index - 1), @class, @type);
 }
 
 .calc-grid-column(@index, @class, @type) when (@type = width) and (@index > 0) {
diff --git a/css/base_structure.less b/css/base_structure.less
index 344cfa4..83957ce 100755
--- a/css/base_structure.less
+++ b/css/base_structure.less
@@ -1,10 +1,14 @@
 /**
  * This file provides styles for the general layout structure.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* col grid */
+/* Col Grid */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 .make-grid(xs);
 
 @media screen {
@@ -13,18 +17,15 @@
     }
 }
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* font sizing */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 @media @screen_min-xxs {
     html {
-        font-size: 100%; //16px
+        font-size: 114%; //16px
     }
 }
 
 @media @screen_min-xs {
     html {
-        font-size: 100%; //16px
+        font-size: 114%; //16px
     }
 }
 
@@ -39,6 +40,7 @@
     .make-grid(md);
     html {
         font-size: 87.5%; //14px
+        //font-size: 81.25%; //13px
     }
 }
 
@@ -61,87 +63,34 @@
     }
 }
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* z-indices */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@media screen {
+/* + + + + +  z-indeces  + + + + + */
+@media @screen_min-md {
     .nav-direct p {
-        z-index: 1000; // keyboard-navigation overlays always on top
+        z-index: 1000;
     }
 
     .top-header {
-        z-index: 2; // put MagicMatcher-Dropdowns above .content and metabox-tabs
+        z-index: 900;
     }
 
-    #dokuwiki__aside div.nav a {
-        &:hover, &:focus, &:active {
-            z-index: 100; // show label/link above content on hover etc.
-        }
+    .tools .row > .col-xs-12 {
+        z-index: 1;
     }
 
-    .qc-output {
-        z-index: 1; // put qc-output above meta-box
+    .header .row > .col-xs-12 {
+        z-index: 2;
     }
 
-    #spr__meta-box {
-        z-index: 10; // put meta-box above positioned content-elements such as aggregations, edit-buttons
-        ul.meta-tabs > li.active {
-            z-index: 1; // put the active tab above the meta-content in .tab-pane.active
-        }
-    }
-
-    nav#dokuwiki__pagetools {
-        z-index: 100; // put labels of the pagetools above content on hover etc.
-    }
-
-    #dokuwiki__detail .img-link a::before {
-        z-index: 2; // put 'view original file'-overlay above image
-    }
-
-    /* plug-in do_tasks */
-    .plugin__do_usertasks_list {
-        z-index: 200; // put tasks-list above pagetools
-    }
-
-    /* plug-in editable */
-    #dokuwiki__content.main-content div.editbutton_table {
-        z-index: 1; // for IE
-    }
-
-    /* plug-in tabinclude */
-    div#dwpl-ti-container li.dwpl-ti-tab div.selected {
-        z-index: 1; // put .slected tab above div.dwpl-ti-content-box
-    }
-}
-
-@media @screen_min-md {
-    .wide-content .search.main-sidebar p.toggleSearch {
-        z-index: 1; // put search-toggle-button above #dw__search
-    }
-}
-
-@media @screen_max-md {
-    body.show-mobile-sidebar #dokuwiki__aside {
-            z-index: 200; // mobile sidebar above all except nav-direct
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* screen sizing */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-
-// >= 1024
-@media @screen_min-md {
-
     .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 {
         position: absolute;
         top: 0;
-        right: 0;
-        width: 50%;
+        left: 0;
+        width: 100%;
     }
 
     .header,
@@ -171,16 +120,6 @@
         }
     }
 
-    /* + + + + +  layout option compact  + + + + + */
-    .header-compact {
-        .header {
-            .row > .col-xs-12 {
-                height: auto;
-                min-height: auto;
-            }
-        }
-    }
-
     .tools {
         .row > .col-xs-12 {
             position: absolute;
@@ -231,22 +170,20 @@
     }
 }
 
-// > 1024
-@media @screen_md-lg {
-    .wide-content.showSidebar {
-        .content {
-            .row > .col-xs-12 {
-                margin-left: 2.3rem;
-            }
-        }
-    }
-}
-
 @media @screen_max-md {
     .container {
         margin: 0 1.25rem;
     }
 
+    #dokuwiki__usertools {
+        margin-top: 0;
+        max-width: 75%;
+        position: absolute;
+        top: 0;
+        margin-right: 0;
+        right: 1.25rem;
+    }
+
     .content {
         position: relative;
 
@@ -277,6 +214,10 @@
         left: @mobileMargin;
     }
 
+    #dokuwiki__usertools {
+        right: @mobileMargin;
+    }
+
     #dokuwiki__footer {
         .main-footer {
             > * {
diff --git a/css/base_vars.less b/css/base_vars.less
deleted file mode 100644
index 60c46f2..0000000
--- a/css/base_vars.less
+++ /dev/null
@@ -1,165 +0,0 @@
-/**
- * This file provides the basic vars
- */
-
-@font_family_screen:       arial, sans-serif;
-@font_family_print:        "Times New Roman", serif;
-
-@nav_direct_background:    @ini_background;
-@nav_direct_color:         @ini_existing;
-
-@background_darker:        rgba(230,230,230, .2);
-@ini_sidebar_width:        (100 - @ini_site_width) - 4;
-
-@height-context-bar:       50px;
-
-@margin-small:             1rem;
-@margin-default:           2rem;
-@margin-big:               3.07rem;
-@nav-margin:               1.3rem;
-
-@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); // tabinclude
-@box-shadow:               0 0 .5em rgba(153,153,153,.5); // pagetoolbox hover
-@box-shadow-colored:       0 0 .5em fade(@ini_existing, 50%);
-@box-shadow-right-bottom:  .1em .3rem .5em rgba(153,153,153,.5);
-@box-shadow-bottom:        0 .1em .5em rgba(153,153,153,.5); // qc-wrapper (breadcrumb), struct inline-editor
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* for programmers customizing */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@fix_border-radius:        3px;           // inputs, editbox (textarea), buttons, content, code, quicksearch, msg
-
-@toggle-showsidebar_width: 3.47rem;       // shown sidebar after toggle
-
-@headericons-margin-xxs:  .45rem;         // screen xxs margin-top for header icons
-
-@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
-
-@code-background:          #F6F6F6; /* code, pre, samp, kbd */
-
-/* icons */
-@noopentasks-background:   #ECECEC; /* metabox tabs + num in icons + tabinclude */
-@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 */
-@menu-margin-lg: 1.3rem;
-
-@quicksearch-button-color: @noopentasks-color; /* autosuggest, submit in quicksearch */
-@suggestion-zebra:         #EEE;
-
-/* edit mode */
-@highlight-odd-ini_text:  fade(@ini_background, 95%);
-@highlight-even-ini_text: fade(@ini_text, 5%);
-@color-editBox:           #252525; // editmode for tables, revision states
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* fonts */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@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%;
-
-@font-weight-bold:         800;
-@font-weight-normal:       400;
-
-@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 * 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);
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* breakpoints */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@break-min-xxs: 480;
-@break-max-xxs: (@break-min-xxs - 1);
-
-@break-min-xs: 768;
-@break-max-xs: (@break-min-xs - 1);
-
-@break-min-sm: 992;
-@break-max-sm: (@break-min-sm - 1);
-
-@break-min-md: 1024;
-@break-max-md: (@break-min-md - 1);
-
-@break-min-lg: 1200;
-@break-max-lg: (@break-min-lg - 1);
-
-@break-min-xlg: 1440;
-@break-max-xlg: (@break-min-xlg - 1);
-
-@break-min-xxlg: 1600;
-@break-max-xxlg: (@break-min-xxlg - 1);
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* media queries for breakpoints */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@screen_min-xxs: ~"only screen and (min-width: " ~"@{break-min-xxs}px)";
-@screen_max-xxs: ~"only screen and (max-width: " ~"@{break-max-xxs}px)";
-
-@screen_min-xs: ~"only screen and (min-width: " ~"@{break-min-xs}px)";
-@screen_max-xs: ~"only screen and (max-width: " ~"@{break-max-xs}px)";
-
-@screen_min-sm: ~"only screen and (min-width: " ~"@{break-min-sm}px)";
-@screen_max-sm: ~"only screen and (max-width: " ~"@{break-max-sm}px)";
-
-@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_min-lg: ~"only screen and (min-width: " ~"@{break-min-lg}px)";
-@screen_max-lg: ~"only screen and (max-width: " ~"@{break-max-lg}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)";
-
-@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-xlg: ~"only screen and (min-width: " ~"@{break-min-xlg}px) and (max-width: " ~"@{break-max-xxlg}px)";
-@screen_md-xlg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-xlg}px)";
-@screen_md-lg: ~"only screen and (min-width: " ~"@{break-min-md}px) and (max-width: " ~"@{break-max-lg}px)";
-@screen_xs-lg: ~"only screen and (min-width: " ~"@{break-min-xs}px) and (max-width: " ~"@{break-max-md}px)";
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* col width */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-@c12:               100%;
-@c11:               91.66666667%;
-@c10:               83.33333333%;
-@c9:                75%;
-@c8:                66.66666667%;
-@c7:                58.33333333%;
-@c6:                50%;
-@c5:                41.66666667%;
-@c4:                33.33333333%;
-@c3:                25%;
-@c2:                16.66666667%;
-@c1:                8.33333333%;
-
-@grid-columns:      12;
diff --git a/css/icons.less b/css/icons.less
deleted file mode 100644
index cc0087d..0000000
--- a/css/icons.less
+++ /dev/null
@@ -1,60 +0,0 @@
-
-i[data-icon] {
-    display: inline-block;
-    width: 1em;
-    height: 1em;
-    flex-shrink: 0;
-    position: relative;
-    box-sizing: content-box;
-
-    &::before {
-        content: '';
-        display: block;
-        width: 100%;
-        height: 100%;
-        mask-size: contain;
-        mask-position: center;
-        mask-repeat: no-repeat;
-        background-color: currentColor;
-    }
-
-    &[data-icon='arrow-left']::before {
-        mask-image: url('img/arrow_left.svg');
-    }
-
-    &[data-icon='arrow-up']::before {
-        mask-image: url('img/arrow_up.svg');
-    }
-
-    &[data-icon='arrow-right']::before {
-        mask-image: url('img/arrow_right.svg');
-    }
-
-    &[data-icon='arrow-down']::before {
-        mask-image: url('img/arrow_down.svg');
-    }
-
-    &[data-icon='info']::before {
-        mask-image: url('img/info.svg');
-    }
-
-    &[data-icon='home']::before {
-        mask-image: url('img/home.svg');
-    }
-
-    &[data-icon='menu-small']::before {
-        mask-image: url('img/menu_small.svg');
-    }
-
-    &[data-icon='light']::before {
-        mask-image: url('img/lightbulb.svg');
-    }
-
-    &[data-icon='warning']::before {
-        mask-image: url('img/warning.svg');
-    }
-
-    &[data-icon='creature']::before {
-        mask-image: url('img/creature.svg');
-    }
-}
\ No newline at end of file
diff --git a/css/plugins/bureaucracy.less b/css/plugins/bureaucracy.less
index 678e902..3ba0143 100755
--- a/css/plugins/bureaucracy.less
+++ b/css/plugins/bureaucracy.less
@@ -2,7 +2,9 @@
  * This file provides styles for bureaucracy plugin
  */
 
+
 /* + + + + +  global  + + + + + */
+
 .dokuwiki form.bureaucracy__plugin {
     fieldset {
         width: 100%;
@@ -55,6 +57,7 @@
 
         span {
             float: left;
+            width: 50%;
             text-align: right;
             line-height: @line-height-default;
             padding-top: .2em;
@@ -93,8 +96,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* min-width: 1440px */
+
 @media @screen_min-xlg {
     .dokuwiki form.bureaucracy__plugin {
         p {
@@ -103,8 +108,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1439px */
+
 @media @screen_max-xlg {
     .dokuwiki form.bureaucracy__plugin {
         p,
@@ -114,3 +121,4 @@
         }
     }
 }
+
diff --git a/css/plugins/configmanager.less b/css/plugins/configmanager.less
index 972744d..97f6948 100644
--- a/css/plugins/configmanager.less
+++ b/css/plugins/configmanager.less
@@ -2,173 +2,26 @@
  * This file provides styles for config manager
  */
 
+
 /* + + + + +  config__manager  + + + + + */
+
 #dokuwiki__content {
     #config__manager {
-        fieldset {
-            min-width: 100%;
-            overflow-x: auto;
-            box-sizing: border-box;
-            background-color: var(--color-background);
-            margin-left: 0;
-            margin-right: 0;
-            color: var(--color-foreground)
-        }
-
         .selectiondefault {
             background-color: transparent;
-            color: inherit;
         }
 
         tr {
-            a {
-                color: var(--color-shade-4);
-            }
-
             .input {
                 background-color: transparent;
                 color: inherit;
             }
-
-            input, select, textarea {
-                background-color: var(--color-background);
-                color: var(--color-foreground);
-            }
-
-            select.edit {
-                padding: 0 0.3em;
-            }
-
-            &:hover {
-                td {
-                    color: inherit;
-                }
-            }
         }
 
         tr.default {
             .input {
                 background-color: transparent;
             }
-
-            input, select, textarea {
-                background-color: var(--color-shade-1);
-            }
-        }
-
-        td.label {
-            padding: .8em 0 1.2em 1em;
-
-            span.outkey {
-                background-color: var(--color-background);
-                color: inherit;
-                font-size: (@font-size-small - .06);
-                font-weight: bold;
-                padding: 0 @very-small-spacing;
-
-                a {
-                    font-size: inherit;
-                }
-            }
-
-            label {
-                line-height: @line-height-big;
-            }
-        }
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 1024px */
-@media @screen_max-md {
-    #dokuwiki__content {
-        #config__manager {
-            td {
-                &.label {
-                    label,
-                    span {
-                        font-size: @font-size-small;
-                    }
-                }
-
-                &.label + td {
-                    font-size: @font-size-small;
-
-                    span {
-                        font-size: inherit;
-                    }
-                }
-
-                select,
-                input.edit {
-                    font-size: @font-size-small;
-                }
-            }
-
-            .selectiondefault {
-                label {
-                    font-size: @font-size-small;
-                }
-            }
-        }
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* max-width: 768px */
-@media @screen_max-sm {
-    #dokuwiki__content {
-        #config__manager {
-            table {
-                border-top: 0 none;
-            }
-
-            td {
-                padding-top: 0;
-
-                &.label {
-                    display: block;
-                    width: 100%;
-                    border: 0 none;
-                    border-top: 1px solid @ini_border;
-                    border-bottom: 0 none;
-                    padding: .8em .5em .3em;
-
-
-                    span.outkey {
-                        margin-left: 0;
-                    }
-                }
-
-                .input {
-                    width: 100%;
-                }
-
-
-                &.value,
-                &.label + td {
-                    display: block;
-                    width: 100%;
-                    border: 0 none;
-                    margin-bottom: 1.2rem;
-                }
-
-                select,
-                input.edit {
-                    width: 100%;
-                    text-overflow: ellipsis;
-                }
-            }
-
-            .selectiondefault {
-                float: none;
-                max-width: 100%;
-                width: auto;
-
-                label {
-                    width: 90%;
-                }
-            }
         }
     }
 }
diff --git a/css/plugins/data.less b/css/plugins/data.less
deleted file mode 100644
index 561c488..0000000
--- a/css/plugins/data.less
+++ /dev/null
@@ -1,48 +0,0 @@
-/**
- * This file provides styles for "data plugin"
- * after importing struct data this can be deleted
- */
-
-/* + + + + +  global  + + + + + */
-#dokuwiki__content {
-    .dataplugin_entry {
-        dl {
-            margin-left: 0;
-            margin-right: 0;
-        }
-    }
-
-    .editbutton_plugin_data {
-        position: relative;
-        top: -1em; // as margin after DL
-        float: left;
-        font-size: @font-size-small; // for right position
-        margin-top: 0;
-
-        form {
-            button {
-                min-height: 1rem;
-                height: 1.8em;
-                background-color: var(--color-background);
-                border-top: solid 1px @ini_button_background;
-                border-color: @ini_border;
-                border-radius: 0 0 @fix_border-radius @fix_border-radius;
-                color: @ini_existing;
-                font-size: @font-size-small;
-                line-height: 1.8em;
-                margin-top: -1px; // for right position
-                margin-left: .6em;
-                padding: 0 .3em;
-                transition: @transition background-color, @transition border-color, @transition color;
-
-                &:hover,
-                &:focus,
-                &:active {
-                    background-color: @ini_existing;
-                    border-color: @ini_existing;
-                    color: var(--color-background);
-                }
-            }
-        }
-    }
-}
diff --git a/css/plugins/do_tasks.less b/css/plugins/do_tasks.less
index 2fa828b..261f5de 100755
--- a/css/plugins/do_tasks.less
+++ b/css/plugins/do_tasks.less
@@ -3,94 +3,26 @@
  */
 
 
-/* + + + + +  usertool icon in header  + + + + + */
-#dokuwiki__usertools.nav-usertools {
-    ul {
-        li {
-            &.user-task {
-                .btn-usertools-wrapper();
-                .btn-usertools-num();
+/* + + + + +  global  + + + + + */
 
-                position: relative;
+ul.page-attributes {
+    .plugin__do_pagetasks {
+        &.do_none {
+            position: relative;
+            border-radius: @ini_default_border_radius; // @ini_default_border_radius vs. @fix_border-radius
 
-                .plugin__do_usertasks {
-                    width: 100%;
-                    min-width: (@toggle-size + .25);
-                    min-height: @toggle-size;
-                    border-radius: @ini_default_border_radius;
-                    border: 1px solid @wikiicons-border;
-                    padding: .14rem 0 0 0;
+            strong {
+                overflow: hidden;
+                background-color: @ini_background;
+                border-color: @noopentasks-border;
+                color: @ini_text_webframe;
+            }
 
-                    &::before {
-                        content: ''; // remove when fontello is removed from usertools
-                    }
-
-                    &:hover,
-                    &:focus,
-                    &:active {
-                        background-color: @ini_nav_menu_hover_color;
-                        border: none;
-
-                        svg path {
-                            fill: @ini_nav_menu_hover_bg;
-                        }
-                    }
-                }
-
-                button {
-                    background-color: @ini_nav_menu_hover_bg;
-                }
-
-                svg {
-                    width: 1.2rem;
-                    height: 1.2rem; // for IE 11
-                    margin-bottom: 2px;
-
-                    path {
-                        fill: @ini_nav_menu_hover_color;
-                    }
-                }
-
-                .noopentasks {
-                    span {
-                        background-color: var(--color-background);
-                        border-color: @noopentasks-border;
-                        color: @ini_text_webframe;
-                    }
-
-                    svg path {
-                        fill: @ini_text_webframe;
-                    }
-
-                    .num {
-                        background-color: @noopentasks-border; // fix
-                        color: @noopentasks-color; // fix
-                        margin-top: 1px;
-                    }
-                }
-
-                @media @screen_max-xs {
-                    display: none;
-                }
-            } // user-task
-        } // li
-    } // ul
-}
-
-.plugin__do_usertasks_list {
-    background-color: transparent;
-
-    @media @screen_max-sm {
-        right: 1.25rem !important;
-        left: 1.25rem !important;
-    }
-
-    table.inline {
-        background-color: var(--color-background);
-        margin-top: .5rem;
-
-        @media @screen_max-sm {
-            width: 100%;
+            .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 b3092d7..9e1dcda 100644
--- a/css/plugins/edit.less
+++ b/css/plugins/edit.less
@@ -1,71 +1,43 @@
 /**
  * This file provides styles for the edit view (?do=edit), preview
- * and "section edit button" and "editbutton_table edit button".
+ * and section edit buttons.
  */
 
+
 /* + + + + +  edit view  + + + + + */
+
 #dokuwiki__content {
     div.section_highlight {
         clear: right;
-        background: repeating-linear-gradient(-45deg,
-        var(--color-shade-1),
-        var(--color-shade-1) 10px,
-        var(--color-background) 10px,
-        var(--color-background) 20px,);
-        border-color: var(--color-background);
     }
 
-    // "section edit button" and "editbutton_table edit button"
     .secedit button {
         clear: both;
         font-size: 100%;
         margin-top: .5rem;
         margin-bottom: .5rem;
-
-        &::after {
-
-        }
-
-        &:hover {
-            &::after {
-                border: none;
-            }
-        }
     }
 
     div.editBox {
-        background-color: var(--color-background);
-        border: solid 2px var(--color-shade-4);
-        border-radius: @fix_border-radius;
-        padding: 0.5rem;
+        background-color: #FFF;
+        border: solid 2px #FFF;
+        border-radius: @ini_default_border_radius;
 
         .editButtons {
             display: inline-block;
             padding-bottom: 1rem;
         }
 
-        @media @screen_max-xs {
-            div.summary {
-                label[for=edit__summary] {
-                    white-space: normal;
-                    display: block;
-                    width: 100%;
-
-                    span {
-                        display: inline-block;
-                        padding-bottom: .4rem;
-                    }
-
-                    input#edit__summary {
-                        max-width: 100%;
-                        box-sizing: border-box;
-                    }
-                }
+        * {
+            &:not(button) {
+                color: @color-editBox;
             }
         }
     }
+
 }
 
+
 .mode_edit {
     .content {
         .msg-area {
diff --git a/css/plugins/edittable.less b/css/plugins/edittable.less
index 144270b..21cad08 100644
--- a/css/plugins/edittable.less
+++ b/css/plugins/edittable.less
@@ -1,59 +1,36 @@
 /**
- * This file provides styles for "edittable plugin"
+ * This file provides styles for qc edittable plugin
  */
 
+
 /* + + + + +  global  + + + + + */
+
 #dokuwiki__content.main-content {
-    #edittable__editor {
-        th,
-        .handsontable th {
-            border-color: var(--color-shade-4);
-            background-color: var(--color-shade-1);
-            color: var(--color-foreground);
-
-            &.ht__highlight {
-                background-color: var(--color-shade-2);
-            }
-        }
-
-        td {
-            border-color: var(--color-shade-4);
-            background-color: var(--color-background);
-            color: var(--color-foreground);
-
-            &.current {
-                background-color: var(--color-shade-1);
-            }
-        }
-    }
-
     div.editbutton_table {
         position: relative; // for IE
+        z-index: 1; // for IE
         float: left;
-        margin-top: -1.4em !important; // overwrite inline styles
+        margin-top: -1.46rem !important; // overwrite inline stales
 
         form div.no {
             button,
             input.button {
                 min-height: 1rem;
-                background-color: var(--color-shade-1);
-                border: solid 0.1em var(--color-shade-2);
-                border-radius: 0.5rem;
-                color: var(--color-foreground);
+                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: 0;
-                margin-top: 0.5rem;
-                padding: 0.2rem 0.4rem;
-                height: auto;
+                margin-top: 0;
+                padding-right: .3em;
+                transition: @transition background-color, @transition border-color, @transition color;
 
                 &:hover,
                 &:focus,
                 &:active {
-                    background-color: transparent;
-                    color: var(--color-glow-primary);
-                    border-color: var(--color-glow-primary);
-                    transition: var(--transition-glow);
-                    filter: var(--filter-glow-primary);
+                    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 1199b74..3d3b80d 100644
--- a/css/plugins/extension__manager.less
+++ b/css/plugins/extension__manager.less
@@ -2,65 +2,18 @@
  * This file provides styles for extension manager
  */
 
+
 /* + + + + +  global  + + + + + */
-.dokuwiki {
-    #extension__manager {
-        .actions {
-            font-size: 0;
 
-            > button {
-                font-size: .92rem;
-                margin-left: .3rem;
-                padding-left: .3rem;
-                padding-right: .3rem;
-            }
+.dokuwiki #extension__manager {
+    .actions {
+        font-size: 0;
 
-            p.permerror {
-                @media @screen_max-md {
-                    flex-direction: column;
-                }
-
-                display: flex;
-                align-items: start;
-                gap: 0.5rem;
-                background: none;
-
-                &::before {
-                    content: "";
-                    flex-shrink: 0;
-                    margin-top: 0.3em;
-                    width: 1em;
-                    height: 1em;
-                    mask-size: contain;
-                    mask-position: center top;
-                    mask-repeat: no-repeat;
-                    mask-image: url(img/warning.svg);
-                    background-color: var(--color-warning);
-                }
-            }
-        }
-
-        ul.tabs {
-            li.active {
-                a {
-                    background-color: var(--color-shade-3);
-                    color: var(--color-foreground);
-                    border-color: var(--color-shade-4);
-                }
-            }
-        }
-
-        .panelHeader {
-            background-color: var(--color-shade-2);
-        }
-    }
-
-    #extension__list {
-        .extensionList {
-
-            li {
-                color: var(--color-foreground);
-            }
+        > button {
+            font-size: .92rem;
+            margin-left: .3rem;
+            padding-left: .3rem;
+            padding-right: .3rem;
         }
     }
 }
diff --git a/css/plugins/fastwiki.less b/css/plugins/fastwiki.less
deleted file mode 100644
index c8f3016..0000000
--- a/css/plugins/fastwiki.less
+++ /dev/null
@@ -1,7 +0,0 @@
-/**
- * This file provides styles for "fastwiki" plugin
- */
-
-.mode_edit .content .row > .col-xs-12 #dokuwiki__content::before {
-    display: none;
-}
diff --git a/css/plugins/folded.less b/css/plugins/folded.less
index 660d4a5..0402618 100644
--- a/css/plugins/folded.less
+++ b/css/plugins/folded.less
@@ -2,7 +2,9 @@
  * 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;
diff --git a/css/plugins/highlight_parent.less b/css/plugins/hightlight_parent.less
similarity index 55%
rename from css/plugins/highlight_parent.less
rename to css/plugins/hightlight_parent.less
index 73822fb..a59a4df 100644
--- a/css/plugins/highlight_parent.less
+++ b/css/plugins/hightlight_parent.less
@@ -2,17 +2,8 @@
  * This file provides styles for highlight plugin
  */
 
-/* + + + + +  global  + + + + + */
-#plugin__highlightparent {
-    clear: none;
-    display: block;
-    position: relative;
 
-    + * {
-        clear: both;
-        padding-top: 1em; // as h1
-    }
-}
+/* + + + + +  global  + + + + + */
 
 @media @screen_max-md {
     #plugin__highlightparent {
diff --git a/css/plugins/include.less b/css/plugins/include.less
new file mode 100644
index 0000000..f793a80
--- /dev/null
+++ b/css/plugins/include.less
@@ -0,0 +1,33 @@
+/**
+ * This file provides the main design styles
+ * across all template elements (typo, colors etc.)
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
+ */
+
+#dokuwiki__content .plugin_include_content {
+    > h1,
+    > .section_highlight h1 {
+        padding-top: @font-size-head1;
+    }
+    > h2,
+    > .section_highlight h2 {
+        padding-top: @font-size-head2;
+    }
+    > h3,
+    > .section_highlight h3 {
+        padding-top: @font-size-head3;
+    }
+    > h4,
+    > .section_highlight h4 {
+        padding-top: @font-size-head4;
+    }
+    > h5,
+    > .section_highlight h5 {
+        padding-top: @font-size-head5;
+    }
+    > h6,
+    > .section_highlight h6 {
+        padding-top: @font-size-head6;
+    }
+}
diff --git a/css/plugins/magic-matcher.less b/css/plugins/magic-matcher.less
index 865897f..b61be46 100755
--- a/css/plugins/magic-matcher.less
+++ b/css/plugins/magic-matcher.less
@@ -2,28 +2,20 @@
  * This file provides styles for magic matcher plugin
  */
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + */
 /* magic matcher bar with form on top of page */
+
 #spr__magic-matcher {
     position: fixed;
     top: 0;
     left: 0;
     width: 100%;
 
-    .container {
-        @media @screen_md-lg {
-            margin-left: 1.8rem;
-        }
-    }
-
     #mm__issueselect_chosen {
         max-width: 50%;
     }
 
-    select[name="mmissues"] + div.chosen-container {
-        max-width: 67%;
-    }
-
     button[name="toggleSuggestions"] {
         position: absolute;
         right: 0;
@@ -46,11 +38,12 @@
 
     #magicmatcher__context {
         position: relative;
+        z-index: 100;
         width: 100%;
         min-height: @height-context-bar;
         box-sizing: border-box;
         box-shadow: @box-shadow;
-        background-color: var(--color-background);
+        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;
@@ -83,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;
@@ -102,58 +105,6 @@ a.jiralink {
     }
 }
 
-/* + + + + +  tooltip in metabox  + + + + + */
-.dokuwiki {
-    .serverToolTip {
-        box-shadow: @box-shadow;
-        border-radius: @fix_border-radius;
-        font-size: @font-size-default;
-
-        h1.issueTitle {
-            font-size: @font-size-default;
-        }
-
-        h2 {
-            font-size: @font-size-small;
-        }
-
-        ul {
-            margin-top: @small-spacing;
-        }
-
-        p,
-        li {
-            font-size: (@font-size-small - .06);
-
-            * {
-                font-size: inherit;
-            }
-        }
-
-        p {
-            margin-top: @small-spacing;
-            margin-bottom: @small-spacing;
-        }
-
-        .components {
-            .component {
-                font-size: (@font-size-small - .06);
-            }
-        }
-
-        .labels {
-            .label {
-                font-size: (@font-size-small - .06);
-            }
-        }
-
-        .descriptionTeaser {
-            font-size: (@font-size-small - .06);
-            margin-top: (@small-spacing * 2);
-            margin-bottom: (@small-spacing * 2);
-        }
-    }
-}
 
 /* + + + + +  no js version  + + + + + */
 .no-js {
@@ -162,29 +113,10 @@ a.jiralink {
     }
 }
 
-.do-admin #dokuwiki__content {
-    #magicmatcher__repoadmin,
-    #magicmatcher_adminimport {
-        .tabs li {
-            a {
-                cursor: pointer;
-            }
-            &.active {
-                a {
-                    cursor: default;
-                }
-            }
-        }
-
-        .service_wrapper > a{
-            display: inline-block;
-            margin-top: 20px;
-        }
-    }
-}
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* max-width: 1023px */
+
 @media @screen_max-lg {
     #spr__magic-matcher {
         #magicmatcher__context {
@@ -201,15 +133,27 @@ a.jiralink {
 
 @media @screen_max-md {
     #spr__magic-matcher {
-        display: none;
+        position: relative;
+
+        .container {
+            margin: .8rem 0 -5px;
+        }
+
+        #magicmatcher__context {
+            border-radius: 0;
+        }
     }
 }
 
+
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* print */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+
 @media print {
     #spr__magic-matcher {
         display: none;
     }
 }
+
diff --git a/css/plugins/mediamanager.less b/css/plugins/mediamanager.less
index e591949..33515fb 100644
--- a/css/plugins/mediamanager.less
+++ b/css/plugins/mediamanager.less
@@ -2,20 +2,14 @@
  * This file provides styles for mediamanager
  */
 
+
 /* + + + + +  global  + + + + + */
+
 #mediamanager__page {
-    .namespaces{
-        h2 {
-            bottom: 0;
-            line-height: 100%;
-            margin-bottom: -1px;
-            background-color: var(--color-shade-3);
-            color: var(--color-foreground);
-            border-color: var(--color-shade-4);
-        }
-        .panelHeader {
-            border-color: var(--color-shade-4);
-        }
+    .namespaces h2 {
+        bottom: 0;
+        line-height: 100%;
+        margin-bottom: -1px;
     }
 
     #media__tree ul li img {
@@ -25,42 +19,12 @@
     ul.tabs li a {
         border-bottom-color: transparent;
     }
-
-    #page__revisions {
-        > .no > ul > li input[type="checkbox"] {
-            margin-left: 0;
-        }
-    }
-
-    .panelHeader {
-        background-color: var(--color-shade-2);
-    }
-
-    .filelist .panelContent ul li{
-        background-color: var(--color-shade-2);
-        color: var(--color-foreground);
-
-        &:hover {
-            background-color: var(--color-shade-4);
-            border: none;
-        }
-    }
-
-    .file dl {
-        dt{
-            background-color: var(--color-shade-2);
-            padding: 0.2em;
-        }
-
-        dd{
-            background-color: var(--color-shade-1);
-            padding: 0.2em;
-        }
-    }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* media queries */
+
 @media @screen_max-md {
     #mediamanager__page {
         min-width: 100%;
diff --git a/css/plugins/move.less b/css/plugins/move.less
index c512c54..3863e28 100644
--- a/css/plugins/move.less
+++ b/css/plugins/move.less
@@ -2,7 +2,9 @@
  * This file provides styles for move plugin
  */
 
+
 /* + + + + +  global  + + + + + */
+
 #dokuwiki__site > .plugin_move_dialog {
     font-size: @font-size-default;
 
diff --git a/css/plugins/popupviewer.less b/css/plugins/popupviewer.less
index a9c32d8..afa3119 100755
--- a/css/plugins/popupviewer.less
+++ b/css/plugins/popupviewer.less
@@ -2,9 +2,12 @@
  * This file provides styles for popupviewer plugin
  */
 
+
 /* + + + + +  global  + + + + + */
+
 #popupviewer {
     > .controls > .content {
+
         padding: 1.5rem 1rem 1rem;
 
         td,
@@ -16,7 +19,6 @@
                 line-height: @line-height-default;
             }
         }
-
         .li,
         li {
             font-size: @font-size-default;
diff --git a/css/plugins/qc.less b/css/plugins/qc.less
index c26c734..aaf152a 100644
--- a/css/plugins/qc.less
+++ b/css/plugins/qc.less
@@ -1,103 +1,79 @@
 /**
- * Styles for the QC plugin
+ * This file provides styles for qc plugin
  */
 
-/* + + + + +  slideout output  + + + + + */
-.qc-output {
-    position: relative;
-    min-width: 100%;
-    width: auto;
-    background-color: @ini_background !important;
-    font-size: 90%;
-    box-shadow: @box-shadow-bottom;
-    border-bottom: solid 1px @ini_border_light;
-    margin-bottom: 0;
-    padding-top: 0 !important; // for JS overwrite
 
-    @media @screen_min-xxs {
-        margin-right: -(@margin-default);
-        margin-left: -(@margin-default);
-        padding-left: @margin-default;
-        padding-right: @margin-default;
+/* + + + + +  global  + + + + + */
+
+#dokuwiki__site {
+    .plugin__qc {
+        display: inline-block;
+        overflow: visible;
+        position: static;
     }
 
-    @media @screen_min-md {
-        top: -(@margin-small);
+    #plugin__qc__icon {
+        display: none;
     }
 
-    @media @screen_max-md {
-        top: 0;
-        margin-top: -(@page_padding-top + 2);
-        margin-right: -(@margin-default * 1.6);
-        margin-left: -(@margin-default);
-        padding-top: @margin-default;
-    }
+    #plugin__qc__link {
+        position: relative;
 
-    @media @screen_max-xxs {
-        margin-left: -(@margin-small);
-        padding-left: @margin-small;
-        padding-right: @margin-default;
-    }
+        .prefix {
+            .icon-emo-happy();
 
-    h1 {
-        @media @screen_min-md {
-            padding-top: 0;
+            width: 100%;
+            font-size: @font-size-default;
+
+            &::before {
+                width: 100%;
+                margin: 0;
+            }
         }
     }
 
-    h2 {
-        font-size: 1.3rem;
-    }
+    #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;
 
-    h3 {
-         font-size: 1.1rem;
-    }
+        p {
+            font-size: @font-size-default;
+        }
 
-    h4,
-    h5,
-    h6 {
-        font-size: 1rem;
-    }
+        #plugin__qc__out {
+            h1 {
+                font-size: @font-size-head3;
+            }
 
-    div,
-    p {
-        margin-left: 0;
-    }
+            h2 {
+                margin-top: 1.6em;
+                font-size: @font-size-head5;
+            }
+            > h1,
+            > h2,
+            > p,
+            > dl,
+            > div {
+                padding-left: 1rem;
+                margin-left: 0;
+            }
 
-    dl {
-        dt,
-        dd {
-            padding-bottom: @small-spacing;
-
-            @media @screen_max-xxs {
-                float: none;
-                display: inline-block;
-                width: 49%;
-                max-width: 10em;
-                vertical-align: top;
+            > div p {
+                padding-left: 0;
                 margin-left: 0;
             }
         }
-    }
 
-    .qc_icon {
-        background-color: #fff;
-        border-radius: @fix_border-radius;
-        vertical-align: top;
-        padding: .1rem;
-    }
-}
-
-/* + + + + +  admin settings  + + + + + */
-.do-admin #dokuwiki__content {
-    #plugin__qc_admin {
-        table .centeralign {
-            .qc_icon svg + span {
-                min-width: 2em;
-                padding-left: .2em;
-                text-align: left;
-                display: inline-block;
-            }
+        &[aria-hidden="false"] {
+            margin-top: .5rem;
         }
     }
 }
diff --git a/css/plugins/sitemapnavi.less b/css/plugins/sitemapnavi.less
deleted file mode 100644
index 23978f4..0000000
--- a/css/plugins/sitemapnavi.less
+++ /dev/null
@@ -1,25 +0,0 @@
-/**
- * This file provides styles for the sitemapnavi plugin
- */
-
-#plugin__sitemapnavi {
-    padding-bottom: @nav-margin;
-    margin-bottom: @nav-margin;
-    border-bottom: 1px solid @ini_nav_menu_color;
-
-    label {
-        padding-left: 0.5em;
-    }
-
-    li {
-        line-height: @line-height-bigger;
-
-        li {
-            margin-left: 0.75em;
-        }
-    }
-}
-
-.wide-content #plugin__sitemapnavi {
-    display: none;
-}
diff --git a/css/plugins/starred.less b/css/plugins/starred.less
index 26426d6..6c3e0c6 100644
--- a/css/plugins/starred.less
+++ b/css/plugins/starred.less
@@ -1,17 +1,10 @@
 /**
  * This file provides styles for starred plugin
  */
-nav.nav-starred {
-    ul {
-        list-style: none;
 
-        li {
-            margin-left: 0;
 
-            svg {
-                vertical-align: text-top;
-                fill: @ini_nav_menu_color;
-            }
-        }
-    }
+/* + + + + +  global  + + + + + */
+
+#dokuwiki__site {
+
 }
diff --git a/css/plugins/struct.less b/css/plugins/struct.less
index 6742bf3..1f9998b 100755
--- a/css/plugins/struct.less
+++ b/css/plugins/struct.less
@@ -2,7 +2,9 @@
  * This file provides styles for struct plugin
  */
 
+
 /* + + + + +  global  + + + + + */
+
 #dokuwiki__content {
     .structaggregation {
         @link-height: 1.5rem;
@@ -16,17 +18,11 @@
             line-height: @line-height-default;
 
             a {
-                //color: @ini_existing;
+                color: @ini_existing;
                 line-height: @line-height-default;
             }
         }
 
-        th {
-            a {
-                color: @ini_link_alt;
-            }
-        }
-
         // search button in table (f.i. "All products")
         table th input {
             &:not(:focus) {
@@ -51,11 +47,9 @@
 
             &.export {
                 bottom: 1px;
-                overflow-x: hidden;
                 background: transparent url("svg.php?svg=file-export.svg&f=existing") left center no-repeat;
                 background-size: auto 20px;
                 border: solid 1px @ini_border;
-                border-radius: 0 0 @fix_border-radius @fix_border-radius;
                 color: @ini_existing;
                 font-size: @font-size-small;
                 line-height: 1;
@@ -67,21 +61,17 @@
                 &:focus,
                 &:active {
                     background-color: @ini_existing;
-                    background-image: url("svg.php?svg=file-export.svg&f=background");
+                    background-image: url("svg.php?svg=file-export.svg&f=background_content");
                     border-color: @ini_existing;
-                    //color: var(--color-background);
+                    color: @ini_background_content;
                     text-decoration: none;
                 }
             }
         }
     }
 
-    #plugin__struct_output {
+    #plugin__struct_output{
         margin-right: 0;
-
-        th {
-            background-color: @ini_background_alt;
-        }
     }
 
     .struct_entry_form {
@@ -105,43 +95,8 @@
     }
 }
 
-/* + + + + +  struct inline-editor  + + + + + */
-.dokuwiki {
-    .struct_inlineditor {
-        box-shadow: @box-shadow-bottom;
-
-        p.hint {
-            margin-top: @small-spacing;
-            margin-bottom: @margin-small;
-        }
-
-        button[type="submit"] + button {
-            min-height: @formfield_min-height;
-            vertical-align: middle;
-            margin-left: @small-spacing;
-        }
-    }
-
-    /* struct fields for bureaucracy forms */
-    .bureaucracy__plugin {
-        .field {
-            clear: both;
-
-            label {
-                padding: 0;
-
-                .label {
-                    text-align: right;
-                    font-weight: bold;
-                    padding: 0;
-                }
-            }
-
-            .input {
-                line-height: 2.5em;
-            }
-        }
-    }
+.dokuwiki .struct_inlineditor {
+    z-index: 3;
 }
 
 
@@ -191,6 +146,6 @@ form {
                     padding-top: 1rem;
                 }
             }
-        } // fieldset
+        }
     }
-} // form
+}
diff --git a/css/plugins/structstatus.less b/css/plugins/structstatus.less
deleted file mode 100644
index 0bfd143..0000000
--- a/css/plugins/structstatus.less
+++ /dev/null
@@ -1,12 +0,0 @@
-/**
- * This file provides styles for structstatus plugin
- */
-
-/* + + + + +  global  + + + + + */
-#dokuwiki__content {
-    .struct_status {
-        border-color: @ini_border;
-        border-radius: @fix_border-radius;
-        font-size: @font-size-small;
-    }
-}
diff --git a/css/plugins/tabinclude.less b/css/plugins/tabinclude.less
index b8ef834..8737ed4 100644
--- a/css/plugins/tabinclude.less
+++ b/css/plugins/tabinclude.less
@@ -2,7 +2,9 @@
  * This file provides styles for the tabinclude
  */
 
+
 /* + + + + +  plugin tabinclude  + + + + + */
+
 div#dwpl-ti-container {
     li.dwpl-ti-tab {
         box-shadow: none;
@@ -32,26 +34,31 @@ div#dwpl-ti-container {
 
             &.selected {
                 position: relative;
-                background-color: var(--color-background);
+                z-index: 1;
+                background-color: @ini_background_content;
                 color: @ini_text;
             }
         }
     }
 
+
 /* + + +  content box  + + + */
     div.dwpl-ti-content-box {
         position: relative;
+        z-index: 0;
         overflow: auto;
         box-shadow: @box-shadow;
-        background-color: var(--color-background);
+        background-color: @ini_background_content;
         border: solid 1px @ini_border;
         border-radius: 0;
         margin-top: -1px;
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* media queries */
+
 @media @screen_max-md {
     div#dwpl-ti-container { }
 }
diff --git a/css/plugins/tablelayout.less b/css/plugins/tablelayout.less
deleted file mode 100644
index 9e69a36..0000000
--- a/css/plugins/tablelayout.less
+++ /dev/null
@@ -1,19 +0,0 @@
-/**
- * This file provides styles for "tablelayout plugin"
- */
-
-
-/* + + + + +  global  + + + + + */
-
-#dokuwiki__content.main-content .secedit.editbutton_table{
-    a.button.print {
-        min-height: 1rem;
-        background-color: var(--color-background);
-        border-radius: 0 @ini_default_border_radius;
-        border-top: solid 1px;
-        border-color: @ini_border;
-        font-size: .88rem;
-        margin-top: -1px;
-        padding-right: .3em;
-    }
-}
diff --git a/css/plugins/tagging.less b/css/plugins/tagging.less
index d20a77f..a15cdfb 100644
--- a/css/plugins/tagging.less
+++ b/css/plugins/tagging.less
@@ -2,7 +2,9 @@
  * This file provides styles for the form in tagcloud
  */
 
+
 /* + + + + +  plugin tagging  + + + + + */
+
 #spr__meta-box {
     ul.tagging_cloud {
         width: 100%;
@@ -10,45 +12,35 @@
 
         li {
             &.t0 a {
-                font-size: .88rem;
+                font-size: .9rem;
             }
-
             &.t1 a {
                 font-size: 1rem;
             }
-
             &.t2 a {
                 font-size: 1.1rem;
             }
-
             &.t3 a {
                 font-size: 1.2rem;
             }
-
             &.t4 a {
                 font-size: 1.3rem;
             }
-
             &.t5 a {
                 font-size: 1.4rem;
             }
-
             &.t6 a {
                 font-size: 1.5rem;
             }
-
             &.t7 a {
                 font-size: 1.6rem;
             }
-
             &.t8 a {
                 font-size: 1.7rem;
             }
-
             &.t9 a {
                 font-size: 1.8rem;
             }
-
             &.t10 a {
                 font-size: 1.9rem;
             }
@@ -69,8 +61,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* media queries */
+
 @media @screen_max-md {
     #spr__meta-box {
         form {
diff --git a/css/plugins/tplinc.less b/css/plugins/tplinc.less
deleted file mode 100644
index 986b145..0000000
--- a/css/plugins/tplinc.less
+++ /dev/null
@@ -1,6 +0,0 @@
-.wide-content {
-    .sidebarheader,
-    .sidebarfooter {
-        visibility: hidden;
-    }
-}
diff --git a/css/plugins/translation.less b/css/plugins/translation.less
deleted file mode 100644
index eb6a464..0000000
--- a/css/plugins/translation.less
+++ /dev/null
@@ -1,57 +0,0 @@
-/**
- * This file provides styles for the translation plugin
- */
-@import "../base";
-
-
-.dokuwiki div.plugin_translation {
-    clear: none;
-    display: block;
-    position: relative;
-    float: none;
-
-    box-sizing: border-box;
-    width: 100%;
-    padding-bottom: 0.5rem;
-    height: 4rem;
-
-    + * {
-        clear: both;
-        padding-top: 1em; // as h1
-    }
-
-    ul li {
-        margin-top: 0;
-
-        // active language
-        span.wikilink1 {
-            .fnButton();
-            .fnActiveButton();
-            cursor: default;
-        }
-
-        a.wikilink1{
-            .fnButton();
-        }
-
-        span.wikilink2{
-            .fnButton();
-            .fnButtonSecondary();
-            .fnActiveButtonSecondary()
-        }
-
-        a.wikilink2,
-        a.wikilink2:visited{
-            .fnButton();
-            .fnButtonSecondary();
-            background-color: var(--color-shade-4);
-        }
-    }
-}
-
-@media @screen_max-md {
-    .dokuwiki div.plugin_translation {
-        clear: both;
-        margin-top: 1rem;
-    }
-}
diff --git a/css/plugins/wrap.less b/css/plugins/wrap.less
deleted file mode 100644
index 0c0948c..0000000
--- a/css/plugins/wrap.less
+++ /dev/null
@@ -1,119 +0,0 @@
-.dokuwiki {
-  span.wrap_em {
-    color: var(--color-error);
-  }
-
-  span.wrap_hi {
-    background-color: var(--color-highlight);
-    color: var(--color-foreground);
-  }
-
-  span.wrap_lo {
-    color: var(--color-text-2);
-  }
-
-  div.plugin_wrap {
-    &.wrap_box {
-      background-color: var(--color-shade-1);
-      color: var(--color-foreground);
-    }
-
-    &.wrap_info,
-    &.wrap_tip,
-    &.wrap_important,
-    &.wrap_alert,
-    &.wrap_help,
-    &.wrap_download,
-    &.wrap_todo {
-      @media @screen_max-md {
-        flex-direction: column;
-      }
-
-      display: flex;
-      align-items: start;
-      gap: 1rem;
-      border: none;
-      border-left: solid 0.5rem var(--color-shade-4);
-      border-radius: 0.5rem;
-      padding: 1em;
-      background-image: none;
-      background-color: var(--color-shade-1);
-
-      &::before {
-        content: "";
-        flex-shrink: 0;
-        margin-top: 0.3em;
-        width: 2em;
-        height: 2em;
-        mask-size: contain;
-        mask-position: center top;
-        mask-repeat: no-repeat;
-        background-color: currentColor;
-      }
-    }
-
-    &.wrap_info {
-      color: var(--color-foreground);
-
-      &::before {
-        mask-image: url(img/info.svg);
-      }
-    }
-
-    &.wrap_tip {
-      color: var(--color-foreground);
-
-      &::before {
-        mask-image: url(img/lightbulb.svg);
-      }
-    }
-
-    &.wrap_important {
-      border-left-color: var(--color-warning);
-      color: var(--color-foreground);
-
-      &::before {
-        background-color: var(--color-warning);
-        mask-image: url(img/warning.svg);
-      }
-    }
-
-    &.wrap_alert {
-      border-left-color: var(--color-error);
-      color: var(--color-foreground);
-
-      &::before {
-        background-color: var(--color-error);
-        mask-image: url(img/power.svg);
-      }
-    }
-
-    &.wrap_help {
-      border-left-color: var(--color-accent-1);
-      color: var(--color-foreground);
-
-      &::before {
-        background-color: var(--color-accent-1);
-        mask-image: url(img/question.svg);
-      }
-    }
-
-    &.wrap_download {
-      border-left-color: var(--color-success);
-      color: var(--color-foreground);
-
-      &::before {
-        background-color: var(--color-success);
-        mask-image: url(img/arrow_down.svg);
-      }
-    }
-
-    &.wrap_todo {
-      color: var(--color-foreground);
-
-      &::before {
-        mask-image: url(img/tick_small.svg);
-      }
-    }
-  }
-}
diff --git a/css/print.less b/css/print.less
index 1c475ac..d655956 100755
--- a/css/print.less
+++ b/css/print.less
@@ -1,517 +1,6 @@
 /**
  * This file provides the styles for printing.
+ *
+ * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
-/* + + + + +  variables  + + + + + */
-@color-print: #000;
-@background-print: transparent;
-@border-color-print: #ccc;
-@border-dark-print: #777;
-
-/*  + + + + + print styles  + + + + + */
-html,
-body {
-    background: @background-print;
-}
-
-a:link,
-a:visited {
-    background: @background-print !important;
-    color: @color-print !important;
-    text-decoration: underline;
-}
-
-/* lightbox is shown: */ #dokuwiki__top[style="overflow: hidden;"] .page-wrapper,
-#spr__direct,
-.top-header,
-.main-footer,
-.menu-togglelink,
-.main-title.desktop-only,
-#spr__meta-box,
-.content .row > .col-xs-12 #dokuwiki__content::before,
-.page-wrapper > .tools,
-.breadcrumbs,
-.wikilink1[href*="id=pagefooter"],
-.structaggregation > a.export,
-#dokuwiki__content .structaggregation > a,
-#dokuwiki__content a.folder {
-    display: none !important;
-}
-
-.content .row > .col-xs-12 {
-    box-shadow: none;
-}
-
-.dokuwiki div.page,
-.main-sidebar.claim,
-.page-footer {
-    padding: 20pt 20pt 0;
-}
-
-#dokuwiki__header .logo img {
-    height: 4rem;
-    width: auto;
-}
-
-
-/* + + + + + + + + + + + + + + */
-/* + + + + +  admin  + + + + + */
-
-/* + + +  acl_manager  + + + */
-#acl__tree {
-    display: none;
-}
-
-#acl__detail {
-    .aclpage {
-        display: block;
-        font-size: 110%;
-        margin-top: 13pt;
-        padding-bottom: 13pt;
-    }
-}
-
-/* + + +  Extension Manager  + + + */
-#extension__manager {
-    form.search {
-        display: inline-block;
-        margin-bottom: 20pt;
-    }
-    form.install {
-        display: none;
-    }
-    ul.tabs {
-        li.active {
-            a {
-                font-weight: bold;
-                text-decoration: none;
-            }
-        }
-    }
-}
-
-#extension__list {
-    .extensionList {
-        border-bottom: 1pt solid @border-color-print;
-        padding: 0;
-
-        li {
-            list-style-type: none;
-            border-top: 1pt solid @border-color-print;
-            margin-left: 0;
-
-            &::after {
-                content: '';
-                clear: both;
-                display: table;
-                height: 10pt;
-            }
-
-            a.info,
-            .actions.col {
-                display: none;
-            }
-
-            .screenshot {
-                float: left;
-                border: 1pt solid @border-color-print;
-                margin: 0 10pt 5pt 0;
-            }
-
-            h2, h2 * {
-                font-size: 100%;
-            }
-        }
-    }
-}
-
-#user__manager {
-    table input,
-    .import_users input{
-        display: none !important;
-    }
-}
-#acl__detail #acl__user {
-    display: none;
-}
-
-.do-admin #dokuwiki__content {
-
-    #confmanager {
-        .popup,
-        .confmanager_singleLine#local,
-        button,
-        .button.saveButton {
-            display: none !important;
-        }
-
-        .confmanager_singleLine {
-            div.defaultValue {
-                word-break: break-all;
-            }
-        }
-
-    }
-
-    > form > fieldset {
-
-        border-color: @border-color-print;
-
-        > textarea.edit[readonly] {
-            border: 0 none;
-            min-height: 2250pt;
-            overflow:visible;
-            display: block;
-            page-break-inside: auto;
-
-            + br + label[for="autosubmit"] {
-                margin-top: 20pt;
-
-                input {
-                    margin-right: 5pt;
-                }
-            }
-        }
-    }
-
-    #magicmatcher__repoadmin {
-
-        button {
-            display: none;
-        }
-        .service-wrapper {
-            padding-top: 1rem;
-        }
-    }
-
-    .plugin_move_form {
-        legend {
-            display: none;
-        }
-    }
-
-    #plugin__qc_admin {
-        table .centeralign {
-            .qc_icon svg + span {
-                vertical-align: top;
-            }
-        }
-    }
-
-    .doku_form.struct_newschema {
-        button {
-            display: none;
-        }
-    }
-    form.plugin_tagging {
-        display: none;
-    }
-
-    #plugin__upgrade_meter {
-        ol li .stage {
-            padding-left: .4em;
-        }
-    }
-
-    #plugin__upgrade {
-        code {
-            word-break: break-all;
-            font-size: .82rem;
-        }
-    }
-}
-
-/* + + +  Configuration Settings  + + + */
-#dokuwiki__content #config__manager {
-    fieldset {
-        padding: 0;
-
-        legend {
-            padding: 0 .5em;
-            text-align: center;
-            background-color: #fff;
-        }
-         > .table > table {
-             border: 0 solid @border-color-print;
-             width: 100%;
-             tr {
-                 border-top: 1pt solid @border-color-print;
-
-                 &:first-child {
-                     border-top-width: 0;
-                 }
-                 td {
-                     border-width: 0;
-                 }
-             }
-         }
-    }
-    td.value,
-    td.label {
-        font-size: 100%;
-        padding: .6em 0 .8em 1em;
-    }
-    td.label {
-        width: 35%;
-        span.outkey, span.outkey * {
-            font-size: 100%;
-        }
-        label {
-            display: block;
-        }
-        span.outkey, label {
-            padding-left: .2rem;
-        }
-    }
-
-    td.value {
-        input[type="text"] {
-            border: 0 none;
-        }
-
-        select {
-            max-width: 80%;
-            box-sizing: border-box;
-            border: 1px solid transparent;
-            background: transparent;
-        }
-        .selectiondefault {
-            position: relative;
-
-            input.checkbox {
-                position: absolute;
-                top:0;
-                left: 0;
-            }
-
-            label, input[type="text"] {
-                position: relative;
-                top:0;
-                left: 0;
-                margin-left: 20pt;
-                margin-top: .5em;
-                padding-left: 0;
-                background-color: transparent;
-            }
-        }
-    }
-
-}
-
-.do-admin div.ui-admin ul.admin_tasks,
-.do-admin div.ui-admin ul.admin_plugins {
-    li {
-        list-style-type: none;
-        min-height: 2em;
-
-        a {
-            span.icon {
-                float: left;
-                clear: left;
-                display: inline-block;
-                width: 22pt;
-                height: 22pt;
-                border: 1pt solid @border-color-print;
-                margin: 0 10pt 0 0;
-
-                &:empty {
-                    &::before {
-                        content: "?";
-                        display: inline-block;
-                        padding-top: 1pt;
-                    }
-                }
-
-                svg {
-                    width: 20pt;
-                    height: 20pt;
-
-                    path {
-                        fill: @color-print;
-                    }
-                }
-            }
-
-            span.prompt {
-                min-height: 26pt;
-                display: inline-block;
-                margin: 0;
-                padding-top: 4pt;
-            }
-        }
-    }
-}
-
-/* + + + + + + + + + + + + + + + + + + + + + + + */
-/* + + + + +  Template Style Settings  + + + + + */
-.page-footer {
-    border-top: 1pt solid @border-color-print;
-    margin-top: 13pt;
-}
-
-#dokuwiki__content #plugin__styling {
-
-    button {
-        display: none !important;
-    }
-
-    .styling input[type="text"] {
-        border: 0 none;
-    }
-}
-
-/* + + +  data plugin  + + + */
-.dataplugin_entry dl {
-    border: 1pt solid @border-color-print;
-    padding: 7pt;
-    margin: 7pt 0;
-
-    dt {
-        clear: left;
-        float: left;
-        width: 22%;
-        font-weight: bold;
-        text-align: right;
-        margin-right: 5pt;
-    }
-}
-
-#dokuwiki__detail {
-    div.img_detail dl {
-        dt {
-            display: inline-block;
-            width: 20%;
-            background-color: transparent;
-        }
-        dd {
-            display: inline-block;
-            width: 75%;
-        }
-    }
-}
-
-/* + + +  tabbox  + + + */
-div#dwpl-ti-container .dwpl-ti,
-.dwpl-ti-permalink-header,
-.dwpl-ti-permalink-footer {
-    display: none !important;
-}
-
-div#dwpl-ti-container div.dwpl-ti-content-box {
-    box-shadow: none;
-    border: 0 none;
-}
-
-/* + + +  media nmanager  + + + */
-#mediamanager__page {
-    .namespaces,
-    .filelist .tabs,
-    .panelHeader form {
-        display: none;
-    }
-
-    ul.rows {
-        width: auto;
-        padding: 0;
-    }
-
-    .filelist li {
-        clear: both;
-        list-style-type: none;
-        margin: 7pt 0 0;
-
-        dl {
-            position: relative;
-            display: table;
-            border-top: solid 1pt @border-color-print;
-            padding-top: 2rem;
-        }
-
-        dt {
-            display: table-cell;
-            width: 10%;
-            height: 40px;
-
-            .size,
-            .filesize {
-                width: 15%;
-            }
-
-            .date {
-                width: 20%;
-            }
-        }
-
-        dd {
-            display: table-cell;
-
-            &.name {
-                position: absolute;
-                top: .5rem;
-                left: 0;
-                display: block;
-                font-weight: bold;
-                margin: 0;
-            }
-        }
-    }
-}
-
-/* + + +  forms  + + + */
-form {
-    button {
-        &[type="submit"],
-        &[type="reset"] {
-            display: none;
-        }
-    }
-
-    fieldset {
-        label,
-        label.block {
-            display: block;
-            text-align: left;
-        }
-
-        br + br {
-            display: none;
-        }
-
-        label {
-            clear: both;
-
-            > input {
-                &:first-child {
-                    float: left;
-                }
-
-                + span {
-                    float: left;
-                    display: inline-block;
-                    padding-left: 7pt;
-                    padding-bottom: 13pt;
-                }
-            }
-        }
-
-        label.block {
-            display: block;
-            text-align: left;
-
-            > span {
-                float: none;
-                padding-bottom: 0;
-
-                &:first-child {
-                    display: block;
-                }
-            }
-        }
-    }
-
-    input,
-    textarea,
-    select {
-        border: 1pt solid @border-dark-print;
-    }
-}
diff --git a/css/template_admin.less b/css/template_admin.less
index f085a35..285962a 100644
--- a/css/template_admin.less
+++ b/css/template_admin.less
@@ -1,7 +1,10 @@
 /**
  * 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;
@@ -49,7 +52,7 @@
                         svg {
                             width: 26px;
                             height: 26px;
-                            border: solid 1px var(--color-background);
+                            border: solid 1px @ini_background_content;
                             border-radius: @ini_default_border_radius;
                             fill: @ini_existing;
                             transition: @transition background-color, @transition border-color, @transition fill;
@@ -68,10 +71,10 @@
                             svg {
                                 background-color: @ini_existing;
                                 border-color: @ini_existing;
-                                fill: var(--color-background);
+                                fill: @ini_background_content;
 
                                 path {
-                                    fill: var(--color-background);
+                                    fill: @ini_background_content;
                                 }
                             }
                         }
@@ -82,8 +85,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* 1024px */
+
 @media @screen_max-md {
     .do-admin {
         div.ui-admin {
@@ -108,8 +113,10 @@
     }
 }
 
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* 768px */
+
 @media @screen_max-xs {
     .do-admin {
         div.ui-admin {
diff --git a/css/template_detail.less b/css/template_detail.less
deleted file mode 100644
index 0e06a5a..0000000
--- a/css/template_detail.less
+++ /dev/null
@@ -1,168 +0,0 @@
-/**
- * This file provides the design styles for the the detail template
- * (media details)
- */
-
-#dokuwiki__detail {
-
-    /* + + + + +  linked image  + + + + + */
-    @media screen {
-        .img-link {
-            text-align: center;
-
-            a {
-                position: relative;
-                left: 0;
-                display: inline-block;
-                max-width: 100%;
-                color: var(--color-foreground);
-                margin: 0 auto 1.4em;
-
-                &::before {
-                    position: absolute;
-                    top: 0;
-                    left: 0;
-                    display: block;
-                    width: 100%;
-                    box-sizing: border-box;
-                    background: var(--color-background);
-                    line-height: @line-height-default;
-                    padding: @margin-small;
-                }
-
-                img {
-                    margin: 0;
-                    display: block;
-                    border: solid 0.1rem transparent;
-                    position: relative;
-                }
-
-                &:hover,
-                &:focus,
-                &:active {
-                    text-decoration: none;
-
-                    &::before {
-                        content: attr(title);
-                        border: solid 0.1rem var(--color-glow-primary);
-                        transition: var(--transition-glow);
-                        filter: var(--filter-glow-primary);
-                    }
-
-                    img {
-                        border: solid 0.1rem var(--color-shade-4);
-                    }
-                }
-            }
-        }
-    }
-
-
-    /* + + + + +  meta data  + + + + + */
-    div.img_detail {
-        @media screen {
-            /* vertical minus margin of .img-detail corresponds to the padding of .page */
-            background-color: var(--color-shade-1);
-            border: solid 0.1em var(--color-shade-4);
-            margin: @margin-default -(@margin-default);
-            color: var(--color-foreground);
-
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6,
-            p {
-                padding-left: @margin-default;
-                padding-right: @margin-default;
-            }
-
-            > h4 {
-                padding-top: (@margin-default / 2);
-            }
-        }
-
-        dl {
-            @media screen {
-                .display-flex();
-                .flex-wrap();
-
-                width: 100%;
-
-                dt,
-                dd {
-                    box-sizing: border-box;
-                    margin: .2em 0;
-                    padding: (@small-spacing * 2) @small-spacing;
-                }
-            }
-
-            dt {
-                background-color: none;
-                color: var(--color-foreground);
-
-                @media @screen_min-xs {
-                    width: 33.3%;
-                }
-
-                @media @screen_max-xs {
-                    width: 40%;
-                }
-            }
-
-            dd {
-                padding-left: (@small-spacing * 2);
-
-                @media @screen_min-xs {
-                    width: 66.6%;
-                }
-
-                @media @screen_max-xs {
-                    width: 59.9%;
-                }
-            }
-        }
-
-        .os-map {
-            p {
-                text-align: right;
-            }
-
-            iframe {
-                border: solid @ini_button_background;
-                border-width: 1px 0;
-                margin: 0;
-                padding: 0;
-            }
-        }
-
-        @media @screen_max-md {
-            margin-right: -(@margin-default * 1.6);
-
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6,
-            p {
-                padding-right: (@margin-default * 1.6);
-            }
-        }
-
-        @media @screen_max-xs {
-            margin-left: -(@margin-small);
-
-            h1,
-            h2,
-            h3,
-            h4,
-            h5,
-            h6,
-            p {
-                padding-left: @margin-small;
-            }
-        }
-    }
-}
diff --git a/css/toollist.less b/css/toollist.less
deleted file mode 100644
index e9d5b14..0000000
--- a/css/toollist.less
+++ /dev/null
@@ -1,29 +0,0 @@
-/**
- * Styles for site tools and user tools in sidebar
- * Using BEM methodology as far as possible
- */
-
-//.toollist {
-//}
-
-.toollist__listitem {
-    list-style: none;
-
-    a {
-        display: inline-flex;
-        flex-direction: row-reverse;
-        flex-wrap: nowrap;
-        align-items: center;
-    }
-
-    span {
-        font-size: @font-size-default;
-    }
-
-    svg {
-        width: @font-size-default;
-        vertical-align: middle;
-        fill: var(--color-foreground);
-        margin-right: .2em;
-    }
-}
diff --git a/deleted.files b/deleted.files
deleted file mode 100644
index 3a43b3d..0000000
--- a/deleted.files
+++ /dev/null
@@ -1,102 +0,0 @@
-# This is a list of files that were present in previous releases
-# but were removed later. They should not exist in your installation.
-.gitlab-ci.yml
-css/area_main-sidebar-content.less
-css/area_main-sidebar.less
-css/area_sidebar-search.less
-css/area_sidetools.less
-css/base_fonts.less
-css/basic.css
-css/content.css
-css/design.css
-css/includes.css
-css/mobile.css
-css/plugins/hightlight_parent.less
-css/print.css
-css/structure.css
-fabfile.py
-fonts/Google Android License.txt
-fonts/icons/fontello-1a5d199c.zip
-fonts/icons/svg/index.css
-fonts/roboto-black.eot
-fonts/roboto-black.svg
-fonts/roboto-black.ttf
-fonts/roboto-black.woff
-fonts/roboto-blackItalic.eot
-fonts/roboto-blackItalic.svg
-fonts/roboto-blackItalic.ttf
-fonts/roboto-blackItalic.woff
-fonts/roboto-bold.eot
-fonts/roboto-bold.svg
-fonts/roboto-bold.ttf
-fonts/roboto-bold.woff
-fonts/roboto-boldcondensed.eot
-fonts/roboto-boldcondensed.svg
-fonts/roboto-boldcondensed.ttf
-fonts/roboto-boldcondensed.woff
-fonts/roboto-boldcondenseditalic.eot
-fonts/roboto-boldcondenseditalic.svg
-fonts/roboto-boldcondenseditalic.ttf
-fonts/roboto-boldcondenseditalic.woff
-fonts/roboto-bolditalic.eot
-fonts/roboto-bolditalic.svg
-fonts/roboto-bolditalic.ttf
-fonts/roboto-bolditalic.woff
-fonts/roboto-condensed.eot
-fonts/roboto-condensed.svg
-fonts/roboto-condensed.ttf
-fonts/roboto-condensed.woff
-fonts/roboto-condenseditalic.eot
-fonts/roboto-condenseditalic.svg
-fonts/roboto-condenseditalic.ttf
-fonts/roboto-condenseditalic.woff
-fonts/roboto-italic.eot
-fonts/roboto-italic.svg
-fonts/roboto-italic.ttf
-fonts/roboto-italic.woff.textClipping
-fonts/roboto-italic2.woff
-fonts/roboto-light.eot
-fonts/roboto-light.svg
-fonts/roboto-light.ttf
-fonts/roboto-light.woff
-fonts/roboto-lightItalic.eot
-fonts/roboto-lightItalic.svg
-fonts/roboto-lightItalic.ttf
-fonts/roboto-lightItalic.woff
-fonts/roboto-medium.eot
-fonts/roboto-medium.svg
-fonts/roboto-medium.ttf
-fonts/roboto-medium.woff
-fonts/roboto-mediumItalic.eot
-fonts/roboto-mediumItalic.svg
-fonts/roboto-mediumItalic.ttf
-fonts/roboto-mediumItalic.woff
-fonts/roboto-regular.eot
-fonts/roboto-regular.svg
-fonts/roboto-regular.ttf
-fonts/roboto-regular.woff
-fonts/roboto-thin.eot
-fonts/roboto-thin.svg
-fonts/roboto-thin.ttf
-fonts/roboto-thin.woff
-fonts/roboto-thinItalic.eot
-fonts/roboto-thinItalic.svg
-fonts/roboto-thinItalic.ttf
-fonts/roboto-thinItalic.woff
-images/apple-touch-icon.png
-images/logo.png
-js/base/helper.js
-js/base/rem.min.js
-js/base/spc.js
-js/base/velocity.min.js
-js/legacy/html5shiv.js
-js/legacy/respond.min.js
-js/breadcrumb.js
-js/sidebar-menu.js
-tpl/nav-main.php
-tpl/nav-page-quality-tasks.php
-tpl/nav-sitetools.php
-tpl/nav-trace.php
-tpl/nav-usermenu.php
-tpl/nav-usertools.php
-tpl_functions.php
diff --git a/detail.php b/detail.php
index 49de8c8..f010711 100755
--- a/detail.php
+++ b/detail.php
@@ -1,405 +1,93 @@
+<!DOCTYPE html>
 <?php
 /**
- * DokuWiki sprintDoc Detail Template
+ * DokuWiki Image Detail Page
  *
- * @link     FIXME
- * @author   Jana Deutschlaender <deutschlaender@cosmocode.de>
- * @author   Michael Grosse <grosse@cosmocode.de>
+ * @author   Andreas Gohr <andi@splitbrain.org>
+ * @author   Anika Henke <anika@selfthinker.org>
  * @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 */
+// must be run from within DokuWiki
+if (!defined('DOKU_INC')) die();
 header('X-UA-Compatible: IE=edge,chrome=1');
 
-global $JSINFO;
-if (empty($JSINFO['template'])) {
-    $JSINFO['template'] = array();
-}
-$JSINFO['template']['sprintdoc'] = array('sidebar_toggle_elements' => tpl_getConf('sidebar_sections'));
-
-$showTools = true;
-$showSidebar =  true;
-
 ?>
-<!DOCTYPE html>
-<html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
+<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="<?php echo $conf['lang']?>"
+ lang="<?php echo $conf['lang']?>" dir="<?php echo $lang['direction'] ?>" class="no-js">
 <head>
-<?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* meta and link relations */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-?>
-<meta charset="utf-8" />
-<meta name="viewport" content="width=device-width, initial-scale=1.0" />
-<?php tpl_metaheaders() ?>
-<?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* page title */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-?>
-<title><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?> [<?php echo strip_tags($conf['title']) ?>]</title>
-
-<script type="text/javascript">(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
-<?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* favicons */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-?>
-<?php
-include('tpl/favicon_tiles.php');
-?>
-<?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Include Hook: meta.html */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-?>
-<?php tpl_includeFile('meta.html') ?>
+    <meta charset="UTF-8" />
+    <title>
+        <?php echo hsc(tpl_img_getTag('IPTC.Headline',$IMG))?>
+        [<?php echo strip_tags($conf['title'])?>]
+    </title>
+    <script>(function(H){H.className=H.className.replace(/\bno-js\b/,'js')})(document.documentElement)</script>
+    <?php tpl_metaheaders()?>
+    <meta name="viewport" content="width=device-width,initial-scale=1" />
+    <?php echo tpl_favicon(array('favicon', 'mobile')) ?>
+    <?php tpl_includeFile('meta.html') ?>
 </head>
 
-<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?> wide-content showSidebar <?php echo tpl_getConf('header_layout'); ?>">
-<div id="dokuwiki__site">
-    <?php
+<body>
+    <div id="dokuwiki__detail" class="<?php echo tpl_classes(); ?>">
+        <?php html_msgarea() ?>
 
+        <?php if($ERROR): print $ERROR; ?>
+        <?php else: ?>
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* template Include: tpl/nav-direct */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-    ?>
-    <?php include('tpl/nav-direct.php') ?>
-
-
-    <div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
-        <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Include Hook: header.html */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-            tpl_includeFile('header.html');
-        ?>
-
-        <div id="dokuwiki__header" class="header no-print">
-            <div class="container">
-                <div class="row">
-                    <div class="col-xs-12">
-                        <div class="claim main-sidebar">
-                            <div class="menu-togglelink mobile-only">
-                                <a href="#">
-                                    <span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle'); ?></span>
-                                </a>
-                            </div>
-
-                            <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Logo */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */
-                                include('tpl/main-sidebar-logo.php');
-                            ?>
-                            <div class="main-title">
-                                <?php if ($conf['title']):
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Wiki Title Mobile */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
-                                    <p class="title mobile-only"><?php echo $conf['title'] ?></p>
-                                <?php endif ?>
-                            </div><!-- .main-title -->
-
-                            <div class="menu-tool-select">
-                                <h5 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_tool-select') ?></h5>
-                                <?php tpl_actiondropdown($lang['tools'], "test"); ?>
-                            </div><!-- .menu-tool-select -->
-                        </div><!-- .headings -->
-                    </div><!-- .col -->
-
-
-                    <div class="col-xs-12">
-                        <div class="main-title desktop-only">
-                            <?php if ($conf['title']):
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Wiki Title Desktop */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
-                                <p class="title"><?php echo $conf['title'] ?></p>
-                            <?php endif ?>
-                            <?php if ($conf['tagline']):
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Wiki Tagline Desktop */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
-                                <p class="claim"><?php echo $conf['tagline'] ?></p>
-                            <?php endif ?>
-                        </div><!-- .main-title -->
-                    </div><!-- .col -->
-
-                </div><!-- .row -->
-            </div><!-- .container -->
-        </div><!-- .header -->
-        <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* headline menu area (Accessibility ) */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-        ?>
-
-        <div class="sr-only nav-area-head">
-            <h5 class="sr-only" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
-        </div><!-- .nav-area-head -->
-
-        <div class="tools">
-            <div class="container">
-                <div class="row">
-                    <div class="col-xs-12">
-                        <div class="search main-sidebar">
-                            <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* search form */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                include('tpl/main-sidebar-search.php');
-                            ?>
-                        </div><!-- .search -->
-
-                        <div class="sidebarheader main-sidebar">
-                            <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Include Hook: sidebarheader.html */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                tpl_includeFile('sidebarheader.html')
-                            ?>
-                        </div><!-- .sidebarheader -->
-
-                        <div id="dokuwiki__aside">
-
-                            <?php
-                            echo Template::getInstance()->getInclude(
-                                'sidebarheader',
-                                '<div class="sidebarheader">',
-                                '<div class="clearer"></div></div>'
-                            );
-                            ?>
-
-                            <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* sidebar */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                include('tpl/main-sidebar-nav.php');
-                            ?>
-
-                            <?php
-                            echo Template::getInstance()->getInclude(
-                                'sidebarfooter',
-                                '<div class="sidebarfooter">',
-                                '<div class="clearer"></div></div>'
-                            );
-                            ?>
-                        </div><!-- .aside -->
-
-                    </div><!-- .col -->
-                </div><!-- .row -->
-            </div><!-- .container -->
-        </div><!-- .tools -->
-
-
-        <div class="top-header">
-            <div class="container">
-                <div class="row">
-                    <div class="col-xs-12">
-
-                        <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* User Tools but no MagicMatcher Bar */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                        $showTools = true;
-                        include('tpl/nav-usertools-buttons.php');
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Include Hook: header.html */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                        tpl_includeFile('header.html');
-                        ?>
-
-                    </div><!-- .col -->
-                </div><!-- .row -->
-            </div><!-- .container -->
-        </div><!-- /top-header -->
-
-
-        <div id="dokuwiki__detail">
-
-            <?php tpl_flush(); /* flush the output buffer */ ?>
+            <?php if($REV) echo p_locale_xhtml('showrev');?>
+            <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG))?></h1>
 
             <div class="content group">
-                <div class="container">
-                    <div class="row">
-                        <div class="col-xs-12">
-                            <div class="breadcrumbs" data-do="<?php echo tpl_getLang('image_detail') ?>">
+                <?php tpl_img(900, 700); /* the image; parameters: maximum width, maximum height (and more) */ ?>
 
-                                <div class="togglelink page_main-content">
-                                    <a id="spr__toggle-content" href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle') ?></span></a>
-                                </div>
+                <div class="img_detail">
+                    <h2><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h2>
 
-                                <h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_status') ?></h6>
-
-                                <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* breadcrumb */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                include('tpl/nav-breadcrumb.php');
-                                ?>
-
-                                <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['page_tools'] ?></h6>
-
-                                <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* page tools */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                ?>
-                                <nav id="dokuwiki__pagetools">
-                                    <div class="tools">
-                                        <ul>
-                                            <?php
-                                            echo '<li>' . dokuwiki\template\sprintdoc\tpl::pageToolAction('mediaManager') . '</li>';
-                                            echo '<li>' . dokuwiki\template\sprintdoc\tpl::pageToolAction('img_backto') . '</li>';
-                                            ?>
-                                        </ul>
-                                    </div>
-                                </nav>
-
-                            </div>
-                            <div id="dokuwiki__content" class="page main-content">
-
-                                <div id="spr__meta-box"></div>
-                                <div class="msg-area"><?php html_msgarea();/*msg('Information.', 0);msg('Success', 1);msg('Notification', 2);msg('Fehler', -1);*/ ?></div>
-
-
-                                <?php if ($ERROR): print $ERROR; ?>
-                                <?php else: ?>
-
-                                <?php if ($REV) {
-                                    echo p_locale_xhtml('showrev');
-                                } ?>
-
-                                <h1><?php echo hsc(tpl_img_getTag('IPTC.Headline', $IMG)) ?></h1>
-                                <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* image */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                ?>
-                                <div class="img-link">
-                                    <?php tpl_img(900, 700); /* the image; parameters: maximum width, maximum height (and more) */ ?>
-                                </div>
-                                <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* meta data of image */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                ?>
-                                <div class="img_detail">
-                                    <?php
-                                        $simple_title = hsc(tpl_img_getTag('simple.title'));
-                                        if(strlen($simple_title) > 0) {
-                                    ?>
-                                    <h4><?php print nl2br(hsc(tpl_img_getTag('simple.title'))); ?></h4>
-                                    <?php
-                                        } else {
-                                            echo '<h4>' . tpl_getLang('meta_data') . '</h4>';
-                                        }
-                                    ?>
-
-                                    <?php
-                                    tpl_img_meta();
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* open street maps if geo data is available */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                    /** @var \helper_plugin_spatialhelper_index $spatial */
-                                    $spatial = plugin_load('helper', 'spatialhelper_index');
-                                    if ($spatial && plugin_load('helper', 'geophp')) {
-                                        global $IMG;
-                                        $point = $spatial->getCoordsFromExif($IMG);
-                                        if ($point) {
-                                            $long = $point->getX();
-                                            $lat = $point->getY();
-                                            $latShort = round($lat, 3);
-                                            $longShort = round($long, 3);
-
-                                            $hrefOSM = "https://www.openstreetmap.org/?mlat=$lat&mlon=$long#map=18/$lat/$long";
-                                            $srcOSM = 'https://www.openstreetmap.org/export/embed.html?bbox=' . ($long - 0.004) . ',' . ($lat - 0.002) . ',' . ($long + 0.004) . ',' . ($lat + 0.002) . '&layer=mapnik&marker=' . $lat . ',' . $long;
-                                            echo '<div class="os-map">';
-                                            echo '<h4 lang="en">OSM (Open Street Maps):</h4>';
-                                            echo '<iframe width="100%" height="350" frameborder="0" src="' . $srcOSM . '"></iframe><br/><p><a class="button" target="_blank" title="' . tpl_getLang('osm_zoom_link_title') . '" href="' . $hrefOSM . '">' . tpl_getLang('osm_zoom_link_text') . '</a></p>';
-                                            echo '</div>';
-                                        }
+                    <?php if(function_exists('tpl_img_meta')): ?>
+                        <?php tpl_img_meta(); ?>
+                    <?php else: /* deprecated since Release 2014-05-05 */ ?>
+                        <dl>
+                            <?php
+                                $config_files = getConfigFiles('mediameta');
+                                foreach ($config_files as $config_file) {
+                                    if(@file_exists($config_file)) {
+                                        include($config_file);
                                     }
-                                    ?>
-                                    <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw')); ?>
-                                </div>
-                            </div><!-- .main-content -->
-                        </div><!-- .col -->
-                    </div><!-- .row -->
-                </div><!-- .container -->
+                                }
+
+                                foreach($fields as $key => $tag){
+                                    $t = array();
+                                    if (!empty($tag[0])) {
+                                        $t = array($tag[0]);
+                                    }
+                                    if(is_array($tag[3])) {
+                                        $t = array_merge($t,$tag[3]);
+                                    }
+                                    $value = tpl_img_getTag($t);
+                                    if ($value) {
+                                        echo '<dt>'.$lang[$tag[1]].':</dt><dd>';
+                                        if ($tag[2] == 'date') {
+                                            echo dformat($value);
+                                        } else {
+                                            echo hsc($value);
+                                        }
+                                        echo '</dd>';
+                                    }
+                                }
+                            ?>
+                        </dl>
+                    <?php endif; ?>
+                    <?php //Comment in for Debug// dbg(tpl_img_getTag('Simple.Raw')); ?>
+                </div>
             </div><!-- /.content -->
 
+            <p class="back">
+                <?php tpl_action('mediaManager', 1) ?><br />
+                &larr; <?php tpl_action('img_backto', 1) ?>
+            </p>
 
         <?php endif; ?>
-        </div>
-    </div><!-- /wrapper -->
-
-
-    <!-- ********** FOOTER ********** -->
-
-    <div id="dokuwiki__footer">
-        <div class="container">
-            <div class="row">
-                <div class="col-xs-12">
-
-                    <div class="main-footer">
-                        <?php include 'tpl/main-footer.php'; ?>
-                    </div>
-
-                </div>
-            </div>
-        </div>
-    </div><!-- /footer -->
-
-
-    <?php tpl_includeFile('footer.html') ?>
-</div><!-- .dokuwiki__site -->
-
-<div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
-
+    </div>
 </body>
 </html>
diff --git a/fabfile.py b/fabfile.py
new file mode 100644
index 0000000..b1e5fa0
--- /dev/null
+++ b/fabfile.py
@@ -0,0 +1,61 @@
+import os
+import sys
+import json
+from fabric.api import run, env, cd
+
+config = {
+    'TARGET_PORT': 6589,
+    'TARGET_USER': 'www-data',
+}
+
+try:
+    TARGET_CONF = json.loads(os.getenv('TARGET_CONF'))
+except (SyntaxError, ValueError) as e:
+    print 'Could not parse configuration: %s' % e
+    sys.exit(1)
+
+BUILD_JOB_NAME = os.getenv('CI_BUILD_NAME')
+
+if BUILD_JOB_NAME not in TARGET_CONF:
+    print 'Could not find job configuration for %s' % BUILD_JOB_NAME
+    sys.exit(1)
+else:
+    config.update(TARGET_CONF[BUILD_JOB_NAME])
+
+BRANCH = os.getenv('CI_BUILD_REF_NAME')
+
+if not BRANCH:
+    print 'Could not get branch name from configuration: Please specify CI_BUILD_REF_NAME env var'
+    sys.exit(1)
+
+for option in ['TARGET_HOST', 'TARGET_PATH']:
+    if not config.get(option):
+        print 'Could not get %s from configuration!' % option
+        sys.exit(1)
+
+env.hosts = [config.get('TARGET_HOST')]
+env.port = config.get('TARGET_PORT')
+env.user = config.get('TARGET_USER')
+
+
+def pre():
+    if config.get('PRE_CMDS'):
+        [run(cmd) for cmd in config.get('PRE_CMDS')]
+
+
+def git_pull():
+    run('git fetch --all')
+    run('git checkout --force %s' % BRANCH)
+    run('git reset --hard origin/%s' % BRANCH)
+
+
+def post():
+    if config.get('POST_CMDS'):
+        [run(cmd) for cmd in config.get('POST_CMDS')]
+
+
+def deploy():
+    with cd(config.get('TARGET_PATH')):
+        pre()
+        git_pull()
+        post()
\ No newline at end of file
diff --git a/fonts/argonglow/ArgonGlow-Bold.woff2 b/fonts/argonglow/ArgonGlow-Bold.woff2
deleted file mode 100644
index caf6ff6..0000000
Binary files a/fonts/argonglow/ArgonGlow-Bold.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-ExtraLight.woff2 b/fonts/argonglow/ArgonGlow-ExtraLight.woff2
deleted file mode 100644
index 7dc6448..0000000
Binary files a/fonts/argonglow/ArgonGlow-ExtraLight.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-Light.woff2 b/fonts/argonglow/ArgonGlow-Light.woff2
deleted file mode 100644
index 08a6637..0000000
Binary files a/fonts/argonglow/ArgonGlow-Light.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-Medium.woff2 b/fonts/argonglow/ArgonGlow-Medium.woff2
deleted file mode 100644
index 83bb0d9..0000000
Binary files a/fonts/argonglow/ArgonGlow-Medium.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-Regular.woff2 b/fonts/argonglow/ArgonGlow-Regular.woff2
deleted file mode 100644
index 601d465..0000000
Binary files a/fonts/argonglow/ArgonGlow-Regular.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-SemiBold.woff2 b/fonts/argonglow/ArgonGlow-SemiBold.woff2
deleted file mode 100644
index a88f939..0000000
Binary files a/fonts/argonglow/ArgonGlow-SemiBold.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-Thin.woff2 b/fonts/argonglow/ArgonGlow-Thin.woff2
deleted file mode 100644
index dc950fe..0000000
Binary files a/fonts/argonglow/ArgonGlow-Thin.woff2 and /dev/null differ
diff --git a/fonts/argonglow/ArgonGlow-VariableVF.woff2 b/fonts/argonglow/ArgonGlow-VariableVF.woff2
deleted file mode 100644
index 7d3aaf4..0000000
Binary files a/fonts/argonglow/ArgonGlow-VariableVF.woff2 and /dev/null differ
diff --git a/fonts/argonglow/OFL b/fonts/argonglow/OFL
deleted file mode 100644
index 1cdb289..0000000
--- a/fonts/argonglow/OFL
+++ /dev/null
@@ -1,96 +0,0 @@
-Copyright (c) 2025, The Argon Glow Project Authors (https://codeberg.org/kritzl/argon-glow),
-Copyright (c) 2025, kritzl (kritzl@kritzl.dev),
-Copyright (c) 2025, traumweh (traumweh@lyx.sh),
-with Reserved Font Name "Argon Glow".
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting - in part or in whole - any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/fonts/athiti/Athiti-Bold.woff2 b/fonts/athiti/Athiti-Bold.woff2
deleted file mode 100644
index 4cc5810..0000000
Binary files a/fonts/athiti/Athiti-Bold.woff2 and /dev/null differ
diff --git a/fonts/athiti/Athiti-ExtraLight.woff2 b/fonts/athiti/Athiti-ExtraLight.woff2
deleted file mode 100644
index 9bb6cea..0000000
Binary files a/fonts/athiti/Athiti-ExtraLight.woff2 and /dev/null differ
diff --git a/fonts/athiti/Athiti-Light.woff2 b/fonts/athiti/Athiti-Light.woff2
deleted file mode 100644
index 51f9e72..0000000
Binary files a/fonts/athiti/Athiti-Light.woff2 and /dev/null differ
diff --git a/fonts/athiti/Athiti-Medium.woff2 b/fonts/athiti/Athiti-Medium.woff2
deleted file mode 100644
index bc8b50a..0000000
Binary files a/fonts/athiti/Athiti-Medium.woff2 and /dev/null differ
diff --git a/fonts/athiti/Athiti-Regular.woff2 b/fonts/athiti/Athiti-Regular.woff2
deleted file mode 100644
index c69c128..0000000
Binary files a/fonts/athiti/Athiti-Regular.woff2 and /dev/null differ
diff --git a/fonts/athiti/Athiti-SemiBold.woff2 b/fonts/athiti/Athiti-SemiBold.woff2
deleted file mode 100644
index 726a075..0000000
Binary files a/fonts/athiti/Athiti-SemiBold.woff2 and /dev/null differ
diff --git a/fonts/athiti/OFL b/fonts/athiti/OFL
deleted file mode 100644
index b0f4597..0000000
--- a/fonts/athiti/OFL
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright (c) 2015, Cadson Demak (info@cadsondemak.com)
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-http://scripts.sil.org/OFL
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded, 
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/fonts/departuremono/DepartureMono-Regular.woff2 b/fonts/departuremono/DepartureMono-Regular.woff2
deleted file mode 100644
index 7d8b33b..0000000
Binary files a/fonts/departuremono/DepartureMono-Regular.woff2 and /dev/null differ
diff --git a/fonts/departuremono/LICENSE b/fonts/departuremono/LICENSE
deleted file mode 100644
index de52476..0000000
--- a/fonts/departuremono/LICENSE
+++ /dev/null
@@ -1,93 +0,0 @@
-Copyright 2022–2024 Helena Zhang (helenazhang.com).
-
-This Font Software is licensed under the SIL Open Font License, Version 1.1.
-This license is copied below, and is also available with a FAQ at:
-https://openfontlicense.org
-
-
------------------------------------------------------------
-SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
------------------------------------------------------------
-
-PREAMBLE
-The goals of the Open Font License (OFL) are to stimulate worldwide
-development of collaborative font projects, to support the font creation
-efforts of academic and linguistic communities, and to provide a free and
-open framework in which fonts may be shared and improved in partnership
-with others.
-
-The OFL allows the licensed fonts to be used, studied, modified and
-redistributed freely as long as they are not sold by themselves. The
-fonts, including any derivative works, can be bundled, embedded,
-redistributed and/or sold with any software provided that any reserved
-names are not used by derivative works. The fonts and derivatives,
-however, cannot be released under any other type of license. The
-requirement for fonts to remain under this license does not apply
-to any document created using the fonts or their derivatives.
-
-DEFINITIONS
-"Font Software" refers to the set of files released by the Copyright
-Holder(s) under this license and clearly marked as such. This may
-include source files, build scripts and documentation.
-
-"Reserved Font Name" refers to any names specified as such after the
-copyright statement(s).
-
-"Original Version" refers to the collection of Font Software components as
-distributed by the Copyright Holder(s).
-
-"Modified Version" refers to any derivative made by adding to, deleting,
-or substituting -- in part or in whole -- any of the components of the
-Original Version, by changing formats or by porting the Font Software to a
-new environment.
-
-"Author" refers to any designer, engineer, programmer, technical
-writer or other person who contributed to the Font Software.
-
-PERMISSION & CONDITIONS
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of the Font Software, to use, study, copy, merge, embed, modify,
-redistribute, and sell modified and unmodified copies of the Font
-Software, subject to the following conditions:
-
-1) Neither the Font Software nor any of its individual components,
-in Original or Modified Versions, may be sold by itself.
-
-2) Original or Modified Versions of the Font Software may be bundled,
-redistributed and/or sold with any software, provided that each copy
-contains the above copyright notice and this license. These can be
-included either as stand-alone text files, human-readable headers or
-in the appropriate machine-readable metadata fields within text or
-binary files as long as those fields can be easily viewed by the user.
-
-3) No Modified Version of the Font Software may use the Reserved Font
-Name(s) unless explicit written permission is granted by the corresponding
-Copyright Holder. This restriction only applies to the primary font name as
-presented to the users.
-
-4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
-Software shall not be used to promote, endorse or advertise any
-Modified Version, except to acknowledge the contribution(s) of the
-Copyright Holder(s) and the Author(s) or with their explicit written
-permission.
-
-5) The Font Software, modified or unmodified, in part or in whole,
-must be distributed entirely under this license, and must not be
-distributed under any other license. The requirement for fonts to
-remain under this license does not apply to any document created
-using the Font Software.
-
-TERMINATION
-This license becomes null and void if any of the above conditions are
-not met.
-
-DISCLAIMER
-THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
-OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
-COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
-INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
-DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
-OTHER DEALINGS IN THE FONT SOFTWARE.
diff --git a/img/LICENSE b/img/LICENSE
deleted file mode 100644
index 7d4f96c..0000000
--- a/img/LICENSE
+++ /dev/null
@@ -1,427 +0,0 @@
-Attribution-ShareAlike 4.0 International
-
-=======================================================================
-
-Creative Commons Corporation ("Creative Commons") is not a law firm and
-does not provide legal services or legal advice. Distribution of
-Creative Commons public licenses does not create a lawyer-client or
-other relationship. Creative Commons makes its licenses and related
-information available on an "as-is" basis. Creative Commons gives no
-warranties regarding its licenses, any material licensed under their
-terms and conditions, or any related information. Creative Commons
-disclaims all liability for damages resulting from their use to the
-fullest extent possible.
-
-Using Creative Commons Public Licenses
-
-Creative Commons public licenses provide a standard set of terms and
-conditions that creators and other rights holders may use to share
-original works of authorship and other material subject to copyright
-and certain other rights specified in the public license below. The
-following considerations are for informational purposes only, are not
-exhaustive, and do not form part of our licenses.
-
-     Considerations for licensors: Our public licenses are
-     intended for use by those authorized to give the public
-     permission to use material in ways otherwise restricted by
-     copyright and certain other rights. Our licenses are
-     irrevocable. Licensors should read and understand the terms
-     and conditions of the license they choose before applying it.
-     Licensors should also secure all rights necessary before
-     applying our licenses so that the public can reuse the
-     material as expected. Licensors should clearly mark any
-     material not subject to the license. This includes other CC-
-     licensed material, or material used under an exception or
-     limitation to copyright. More considerations for licensors:
-    wiki.creativecommons.org/Considerations_for_licensors
-
-     Considerations for the public: By using one of our public
-     licenses, a licensor grants the public permission to use the
-     licensed material under specified terms and conditions. If
-     the licensor's permission is not necessary for any reason--for
-     example, because of any applicable exception or limitation to
-     copyright--then that use is not regulated by the license. Our
-     licenses grant only permissions under copyright and certain
-     other rights that a licensor has authority to grant. Use of
-     the licensed material may still be restricted for other
-     reasons, including because others have copyright or other
-     rights in the material. A licensor may make special requests,
-     such as asking that all changes be marked or described.
-     Although not required by our licenses, you are encouraged to
-     respect those requests where reasonable. More considerations
-     for the public:
-    wiki.creativecommons.org/Considerations_for_licensees
-
-=======================================================================
-
-Creative Commons Attribution-ShareAlike 4.0 International Public
-License
-
-By exercising the Licensed Rights (defined below), You accept and agree
-to be bound by the terms and conditions of this Creative Commons
-Attribution-ShareAlike 4.0 International Public License ("Public
-License"). To the extent this Public License may be interpreted as a
-contract, You are granted the Licensed Rights in consideration of Your
-acceptance of these terms and conditions, and the Licensor grants You
-such rights in consideration of benefits the Licensor receives from
-making the Licensed Material available under these terms and
-conditions.
-
-
-Section 1 -- Definitions.
-
-  a. Adapted Material means material subject to Copyright and Similar
-     Rights that is derived from or based upon the Licensed Material
-     and in which the Licensed Material is translated, altered,
-     arranged, transformed, or otherwise modified in a manner requiring
-     permission under the Copyright and Similar Rights held by the
-     Licensor. For purposes of this Public License, where the Licensed
-     Material is a musical work, performance, or sound recording,
-     Adapted Material is always produced where the Licensed Material is
-     synched in timed relation with a moving image.
-
-  b. Adapter's License means the license You apply to Your Copyright
-     and Similar Rights in Your contributions to Adapted Material in
-     accordance with the terms and conditions of this Public License.
-
-  c. BY-SA Compatible License means a license listed at
-     creativecommons.org/compatiblelicenses, approved by Creative
-     Commons as essentially the equivalent of this Public License.
-
-  d. Copyright and Similar Rights means copyright and/or similar rights
-     closely related to copyright including, without limitation,
-     performance, broadcast, sound recording, and Sui Generis Database
-     Rights, without regard to how the rights are labeled or
-     categorized. For purposes of this Public License, the rights
-     specified in Section 2(b)(1)-(2) are not Copyright and Similar
-     Rights.
-
-  e. Effective Technological Measures means those measures that, in the
-     absence of proper authority, may not be circumvented under laws
-     fulfilling obligations under Article 11 of the WIPO Copyright
-     Treaty adopted on December 20, 1996, and/or similar international
-     agreements.
-
-  f. Exceptions and Limitations means fair use, fair dealing, and/or
-     any other exception or limitation to Copyright and Similar Rights
-     that applies to Your use of the Licensed Material.
-
-  g. License Elements means the license attributes listed in the name
-     of a Creative Commons Public License. The License Elements of this
-     Public License are Attribution and ShareAlike.
-
-  h. Licensed Material means the artistic or literary work, database,
-     or other material to which the Licensor applied this Public
-     License.
-
-  i. Licensed Rights means the rights granted to You subject to the
-     terms and conditions of this Public License, which are limited to
-     all Copyright and Similar Rights that apply to Your use of the
-     Licensed Material and that the Licensor has authority to license.
-
-  j. Licensor means the individual(s) or entity(ies) granting rights
-     under this Public License.
-
-  k. Share means to provide material to the public by any means or
-     process that requires permission under the Licensed Rights, such
-     as reproduction, public display, public performance, distribution,
-     dissemination, communication, or importation, and to make material
-     available to the public including in ways that members of the
-     public may access the material from a place and at a time
-     individually chosen by them.
-
-  l. Sui Generis Database Rights means rights other than copyright
-     resulting from Directive 96/9/EC of the European Parliament and of
-     the Council of 11 March 1996 on the legal protection of databases,
-     as amended and/or succeeded, as well as other essentially
-     equivalent rights anywhere in the world.
-
-  m. You means the individual or entity exercising the Licensed Rights
-     under this Public License. Your has a corresponding meaning.
-
-
-Section 2 -- Scope.
-
-  a. License grant.
-
-       1. Subject to the terms and conditions of this Public License,
-          the Licensor hereby grants You a worldwide, royalty-free,
-          non-sublicensable, non-exclusive, irrevocable license to
-          exercise the Licensed Rights in the Licensed Material to:
-
-            a. reproduce and Share the Licensed Material, in whole or
-               in part; and
-
-            b. produce, reproduce, and Share Adapted Material.
-
-       2. Exceptions and Limitations. For the avoidance of doubt, where
-          Exceptions and Limitations apply to Your use, this Public
-          License does not apply, and You do not need to comply with
-          its terms and conditions.
-
-       3. Term. The term of this Public License is specified in Section
-          6(a).
-
-       4. Media and formats; technical modifications allowed. The
-          Licensor authorizes You to exercise the Licensed Rights in
-          all media and formats whether now known or hereafter created,
-          and to make technical modifications necessary to do so. The
-          Licensor waives and/or agrees not to assert any right or
-          authority to forbid You from making technical modifications
-          necessary to exercise the Licensed Rights, including
-          technical modifications necessary to circumvent Effective
-          Technological Measures. For purposes of this Public License,
-          simply making modifications authorized by this Section 2(a)
-          (4) never produces Adapted Material.
-
-       5. Downstream recipients.
-
-            a. Offer from the Licensor -- Licensed Material. Every
-               recipient of the Licensed Material automatically
-               receives an offer from the Licensor to exercise the
-               Licensed Rights under the terms and conditions of this
-               Public License.
-
-            b. Additional offer from the Licensor -- Adapted Material.
-               Every recipient of Adapted Material from You
-               automatically receives an offer from the Licensor to
-               exercise the Licensed Rights in the Adapted Material
-               under the conditions of the Adapter's License You apply.
-
-            c. No downstream restrictions. You may not offer or impose
-               any additional or different terms or conditions on, or
-               apply any Effective Technological Measures to, the
-               Licensed Material if doing so restricts exercise of the
-               Licensed Rights by any recipient of the Licensed
-               Material.
-
-       6. No endorsement. Nothing in this Public License constitutes or
-          may be construed as permission to assert or imply that You
-          are, or that Your use of the Licensed Material is, connected
-          with, or sponsored, endorsed, or granted official status by,
-          the Licensor or others designated to receive attribution as
-          provided in Section 3(a)(1)(A)(i).
-
-  b. Other rights.
-
-       1. Moral rights, such as the right of integrity, are not
-          licensed under this Public License, nor are publicity,
-          privacy, and/or other similar personality rights; however, to
-          the extent possible, the Licensor waives and/or agrees not to
-          assert any such rights held by the Licensor to the limited
-          extent necessary to allow You to exercise the Licensed
-          Rights, but not otherwise.
-
-       2. Patent and trademark rights are not licensed under this
-          Public License.
-
-       3. To the extent possible, the Licensor waives any right to
-          collect royalties from You for the exercise of the Licensed
-          Rights, whether directly or through a collecting society
-          under any voluntary or waivable statutory or compulsory
-          licensing scheme. In all other cases the Licensor expressly
-          reserves any right to collect such royalties.
-
-
-Section 3 -- License Conditions.
-
-Your exercise of the Licensed Rights is expressly made subject to the
-following conditions.
-
-  a. Attribution.
-
-       1. If You Share the Licensed Material (including in modified
-          form), You must:
-
-            a. retain the following if it is supplied by the Licensor
-               with the Licensed Material:
-
-                 i. identification of the creator(s) of the Licensed
-                    Material and any others designated to receive
-                    attribution, in any reasonable manner requested by
-                    the Licensor (including by pseudonym if
-                    designated);
-
-                ii. a copyright notice;
-
-               iii. a notice that refers to this Public License;
-
-                iv. a notice that refers to the disclaimer of
-                    warranties;
-
-                 v. a URI or hyperlink to the Licensed Material to the
-                    extent reasonably practicable;
-
-            b. indicate if You modified the Licensed Material and
-               retain an indication of any previous modifications; and
-
-            c. indicate the Licensed Material is licensed under this
-               Public License, and include the text of, or the URI or
-               hyperlink to, this Public License.
-
-       2. You may satisfy the conditions in Section 3(a)(1) in any
-          reasonable manner based on the medium, means, and context in
-          which You Share the Licensed Material. For example, it may be
-          reasonable to satisfy the conditions by providing a URI or
-          hyperlink to a resource that includes the required
-          information.
-
-       3. If requested by the Licensor, You must remove any of the
-          information required by Section 3(a)(1)(A) to the extent
-          reasonably practicable.
-
-  b. ShareAlike.
-
-     In addition to the conditions in Section 3(a), if You Share
-     Adapted Material You produce, the following conditions also apply.
-
-       1. The Adapter's License You apply must be a Creative Commons
-          license with the same License Elements, this version or
-          later, or a BY-SA Compatible License.
-
-       2. You must include the text of, or the URI or hyperlink to, the
-          Adapter's License You apply. You may satisfy this condition
-          in any reasonable manner based on the medium, means, and
-          context in which You Share Adapted Material.
-
-       3. You may not offer or impose any additional or different terms
-          or conditions on, or apply any Effective Technological
-          Measures to, Adapted Material that restrict exercise of the
-          rights granted under the Adapter's License You apply.
-
-
-Section 4 -- Sui Generis Database Rights.
-
-Where the Licensed Rights include Sui Generis Database Rights that
-apply to Your use of the Licensed Material:
-
-  a. for the avoidance of doubt, Section 2(a)(1) grants You the right
-     to extract, reuse, reproduce, and Share all or a substantial
-     portion of the contents of the database;
-
-  b. if You include all or a substantial portion of the database
-     contents in a database in which You have Sui Generis Database
-     Rights, then the database in which You have Sui Generis Database
-     Rights (but not its individual contents) is Adapted Material,
-     including for purposes of Section 3(b); and
-
-  c. You must comply with the conditions in Section 3(a) if You Share
-     all or a substantial portion of the contents of the database.
-
-For the avoidance of doubt, this Section 4 supplements and does not
-replace Your obligations under this Public License where the Licensed
-Rights include other Copyright and Similar Rights.
-
-
-Section 5 -- Disclaimer of Warranties and Limitation of Liability.
-
-  a. UNLESS OTHERWISE SEPARATELY UNDERTAKEN BY THE LICENSOR, TO THE
-     EXTENT POSSIBLE, THE LICENSOR OFFERS THE LICENSED MATERIAL AS-IS
-     AND AS-AVAILABLE, AND MAKES NO REPRESENTATIONS OR WARRANTIES OF
-     ANY KIND CONCERNING THE LICENSED MATERIAL, WHETHER EXPRESS,
-     IMPLIED, STATUTORY, OR OTHER. THIS INCLUDES, WITHOUT LIMITATION,
-     WARRANTIES OF TITLE, MERCHANTABILITY, FITNESS FOR A PARTICULAR
-     PURPOSE, NON-INFRINGEMENT, ABSENCE OF LATENT OR OTHER DEFECTS,
-     ACCURACY, OR THE PRESENCE OR ABSENCE OF ERRORS, WHETHER OR NOT
-     KNOWN OR DISCOVERABLE. WHERE DISCLAIMERS OF WARRANTIES ARE NOT
-     ALLOWED IN FULL OR IN PART, THIS DISCLAIMER MAY NOT APPLY TO YOU.
-
-  b. TO THE EXTENT POSSIBLE, IN NO EVENT WILL THE LICENSOR BE LIABLE
-     TO YOU ON ANY LEGAL THEORY (INCLUDING, WITHOUT LIMITATION,
-     NEGLIGENCE) OR OTHERWISE FOR ANY DIRECT, SPECIAL, INDIRECT,
-     INCIDENTAL, CONSEQUENTIAL, PUNITIVE, EXEMPLARY, OR OTHER LOSSES,
-     COSTS, EXPENSES, OR DAMAGES ARISING OUT OF THIS PUBLIC LICENSE OR
-     USE OF THE LICENSED MATERIAL, EVEN IF THE LICENSOR HAS BEEN
-     ADVISED OF THE POSSIBILITY OF SUCH LOSSES, COSTS, EXPENSES, OR
-     DAMAGES. WHERE A LIMITATION OF LIABILITY IS NOT ALLOWED IN FULL OR
-     IN PART, THIS LIMITATION MAY NOT APPLY TO YOU.
-
-  c. The disclaimer of warranties and limitation of liability provided
-     above shall be interpreted in a manner that, to the extent
-     possible, most closely approximates an absolute disclaimer and
-     waiver of all liability.
-
-
-Section 6 -- Term and Termination.
-
-  a. This Public License applies for the term of the Copyright and
-     Similar Rights licensed here. However, if You fail to comply with
-     this Public License, then Your rights under this Public License
-     terminate automatically.
-
-  b. Where Your right to use the Licensed Material has terminated under
-     Section 6(a), it reinstates:
-
-       1. automatically as of the date the violation is cured, provided
-          it is cured within 30 days of Your discovery of the
-          violation; or
-
-       2. upon express reinstatement by the Licensor.
-
-     For the avoidance of doubt, this Section 6(b) does not affect any
-     right the Licensor may have to seek remedies for Your violations
-     of this Public License.
-
-  c. For the avoidance of doubt, the Licensor may also offer the
-     Licensed Material under separate terms or conditions or stop
-     distributing the Licensed Material at any time; however, doing so
-     will not terminate this Public License.
-
-  d. Sections 1, 5, 6, 7, and 8 survive termination of this Public
-     License.
-
-
-Section 7 -- Other Terms and Conditions.
-
-  a. The Licensor shall not be bound by any additional or different
-     terms or conditions communicated by You unless expressly agreed.
-
-  b. Any arrangements, understandings, or agreements regarding the
-     Licensed Material not stated herein are separate from and
-     independent of the terms and conditions of this Public License.
-
-
-Section 8 -- Interpretation.
-
-  a. For the avoidance of doubt, this Public License does not, and
-     shall not be interpreted to, reduce, limit, restrict, or impose
-     conditions on any use of the Licensed Material that could lawfully
-     be made without permission under this Public License.
-
-  b. To the extent possible, if any provision of this Public License is
-     deemed unenforceable, it shall be automatically reformed to the
-     minimum extent necessary to make it enforceable. If the provision
-     cannot be reformed, it shall be severed from this Public License
-     without affecting the enforceability of the remaining terms and
-     conditions.
-
-  c. No term or condition of this Public License will be waived and no
-     failure to comply consented to unless expressly agreed to by the
-     Licensor.
-
-  d. Nothing in this Public License constitutes or may be interpreted
-     as a limitation upon, or waiver of, any privileges and immunities
-     that apply to the Licensor or You, including from the legal
-     processes of any jurisdiction or authority.
-
-
-=======================================================================
-
-Creative Commons is not a party to its public
-licenses. Notwithstanding, Creative Commons may elect to apply one of
-its public licenses to material it publishes and in those instances
-will be considered the “Licensor.” The text of the Creative Commons
-public licenses is dedicated to the public domain under the CC0 Public
-Domain Dedication. Except for the limited purpose of indicating that
-material is shared under a Creative Commons public license or as
-otherwise permitted by the Creative Commons policies published at
-creativecommons.org/policies, Creative Commons does not authorize the
-use of the trademark "Creative Commons" or any other trademark or logo
-of Creative Commons without its prior written consent including,
-without limitation, in connection with any unauthorized modifications
-to any of its public licenses or any other arrangements,
-understandings, or agreements concerning use of licensed material. For
-the avoidance of doubt, this paragraph does not form part of the
-public licenses.
-
-Creative Commons may be contacted at creativecommons.org.
diff --git a/img/arrow_down.svg b/img/arrow_down.svg
deleted file mode 100644
index 56b4a9b..0000000
--- a/img/arrow_down.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M299.996 0a25 25 0 0 0-24.998 24.998v389.803c0 23.914 15.39 43.832 34.613 51.795 19.223 7.962 44.194 4.759 61.104-12.15L485.617 339.54c5.091-5.09 12.583-5.09 17.674 0s5.097 12.589.006 17.68L317.682 542.836c-9.973 9.972-25.387 9.972-35.36 0L105.543 366.059a25 25 0 0 0-35.348 0 25 25 0 0 0-.005 35.353L246.969 578.19c29.08 29.08 76.986 29.08 106.066 0L538.65 392.574c24.199-24.198 24.199-64.192 0-88.39-24.198-24.199-64.188-24.195-88.386.004L335.359 419.092c-2.66 2.66-4.216 2.309-6.617 1.314-2.4-.994-3.742-1.838-3.742-5.601V25.002A25 25 0 0 0 299.996 0" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_down_left.svg b/img/arrow_down_left.svg
deleted file mode 100644
index e1b3007..0000000
--- a/img/arrow_down_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M501.832 73.168a25 25 0 0 0-17.676 7.32L208.523 356.121c-16.91 16.91-20.118 41.877-12.156 61.1 7.963 19.223 27.883 34.613 51.797 34.613H410.67c7.2 0 12.498 5.298 12.498 12.498s-5.298 12.498-12.498 12.498h-262.5c-14.103 0-25.002-10.893-25.002-24.996V201.832a25 25 0 0 0-25.004-25.002 25 25 0 0 0-24.994 25.002v250.002c0 41.125 33.875 75 75 75h262.5c34.222 0 62.494-28.28 62.494-62.502s-28.272-62.502-62.494-62.502H248.164c-3.763 0-4.607-1.343-5.601-3.744-.995-2.401-1.347-3.945 1.314-6.606l275.63-275.632a25 25 0 0 0 0-35.36 25 25 0 0 0-17.675-7.32" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_down_right.svg b/img/arrow_down_right.svg
deleted file mode 100644
index 56f308a..0000000
--- a/img/arrow_down_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M98.168 73.168a25 25 0 0 0-17.68 7.324 25 25 0 0 0 0 35.352l275.633 275.633c16.91 16.91 41.877 20.118 61.1 12.156 19.223-7.963 34.613-27.883 34.613-51.797V189.33c0-7.2 5.298-12.498 12.498-12.498s12.498 5.298 12.498 12.498v262.5c0 14.103-10.893 25.002-24.996 25.002H201.832a25 25 0 0 0-25.002 25.004 25 25 0 0 0 25.002 24.994h250.002c41.125 0 75-33.875 75-75v-262.5c0-34.222-28.28-62.494-62.502-62.494s-62.502 28.272-62.502 62.494v162.506c0 3.763-1.343 4.607-3.744 5.601-2.401.995-3.945 1.347-6.606-1.314L115.848 80.493a25 25 0 0 0-17.68-7.325" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_left.svg b/img/arrow_left.svg
deleted file mode 100644
index 1a35060..0000000
--- a/img/arrow_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M216.264 62.867a25 25 0 0 0-17.676 7.324L21.81 246.971c-29.08 29.08-29.08 76.984 0 106.064l185.615 185.617c24.198 24.199 64.188 24.193 88.387-.006 24.198-24.198 24.204-64.188.006-88.386l-114.91-114.908c-2.662-2.661-2.31-4.209-1.315-6.61.994-2.4 1.838-3.742 5.601-3.742h389.803A25 25 0 0 0 600 299.998 25 25 0 0 0 575.002 275H185.199c-23.914 0-43.838 15.384-51.8 34.607-7.963 19.223-4.758 44.194 12.152 61.104l114.908 114.908c5.09 5.091 5.09 12.583 0 17.674s-12.583 5.09-17.674 0L57.168 317.678c-9.973-9.973-9.976-25.381-.004-35.354l176.777-176.78a25 25 0 0 0 0-35.358 25 25 0 0 0-17.677-7.319" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_right.svg b/img/arrow_right.svg
deleted file mode 100644
index 23fba2c..0000000
--- a/img/arrow_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M348.379 43.203c-16.048 0-32.096 6.05-44.195 18.149-24.199 24.198-24.195 64.188.004 88.386l114.904 114.903c2.66 2.66 2.309 4.218 1.314 6.619-.994 2.4-1.842 3.738-5.605 3.738l-389.799.004A25 25 0 0 0 .006 300a25 25 0 0 0 24.996 24.998l389.799.004c23.914 0 43.832-15.388 51.795-34.611 7.962-19.223 4.759-44.194-12.15-61.104L339.54 114.385c-5.09-5.091-5.09-12.583 0-17.674s12.589-5.097 17.68-.006L542.836 282.32c9.972 9.973 9.972 25.387 0 35.36L366.059 494.457a25 25 0 0 0 0 35.35 25 25 0 0 0 35.353.004L578.19 353.033c29.08-29.08 29.08-76.986 0-106.066L392.574 61.352c-12.099-12.1-28.147-18.149-44.195-18.149" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_up.svg b/img/arrow_up.svg
deleted file mode 100644
index 34ec6cd..0000000
--- a/img/arrow_up.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M300.002 0c-19.247 0-38.493 7.27-53.033 21.81L61.354 207.427c-24.199 24.198-24.199 64.194 0 88.392 24.198 24.199 64.188 24.193 88.386-.006l114.903-114.904c2.66-2.66 4.206-2.309 6.607-1.314 2.4.994 3.748 1.842 3.748 5.605v389.803A25 25 0 0 0 299.996 600a25 25 0 0 0 25.002-25.002V185.195c0-23.913-15.388-43.834-34.611-51.797s-44.188-4.753-61.098 12.157L114.387 260.459c-5.091 5.09-12.585 5.09-17.676 0s-5.095-12.589-.004-17.68L282.322 57.164c9.973-9.972 25.387-9.972 35.36 0l176.777 176.777a25 25 0 0 0 35.348 0 25 25 0 0 0 .006-35.353L353.035 21.81C338.495 7.27 319.248 0 300.002 0" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_up_left.svg b/img/arrow_up_left.svg
deleted file mode 100644
index 923c5dd..0000000
--- a/img/arrow_up_left.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M148.166 73.17c-41.125 0-75 33.875-75 75v262.5c0 34.222 28.28 62.494 62.502 62.494s62.502-28.272 62.502-62.494V248.164c0-3.763 1.343-4.607 3.744-5.601 2.401-.995 3.945-1.347 6.606 1.314l275.632 275.63a25 25 0 0 0 35.36 0 25 25 0 0 0 0-35.35L243.879 208.522c-16.91-16.91-41.877-20.118-61.1-12.156-19.223 7.963-34.613 27.883-34.613 51.797V410.67c0 7.2-5.298 12.498-12.498 12.498s-12.498-5.298-12.498-12.498v-262.5c0-14.103 10.893-25.002 24.996-25.002h250.002a25 25 0 0 0 25.002-25.004 25 25 0 0 0-25.002-24.994Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/arrow_up_right.svg b/img/arrow_up_right.svg
deleted file mode 100644
index ab82e8b..0000000
--- a/img/arrow_up_right.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M188.83 73.164c-34.222 0-62.494 28.282-62.494 62.504s28.272 62.502 62.494 62.502h162.506c3.763 0 4.607 1.341 5.602 3.742.994 2.401 1.348 3.947-1.313 6.608L79.992 484.152a25 25 0 0 0 0 35.36 25 25 0 0 0 35.352 0l275.633-275.633c16.91-16.91 20.12-41.877 12.158-61.1s-27.885-34.615-51.8-34.615H188.83c-7.2 0-12.498-5.296-12.498-12.496s5.298-12.498 12.498-12.498h262.5c14.103 0 25.002 10.89 25.002 24.994v250.004a25 25 0 0 0 25.004 25.002 25 25 0 0 0 24.994-25.002V148.164c0-41.125-33.875-75-75-75z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/basket.svg b/img/basket.svg
deleted file mode 100644
index 5dfc4a1..0000000
--- a/img/basket.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M255.775 100.053a25 25 0 0 0-22.41 11.08l-66.666 100a25 25 0 0 0 6.934 34.668 25 25 0 0 0 34.668-6.934l66.666-100a25 25 0 0 0-6.934-34.668 25 25 0 0 0-12.258-4.146m88.45 0a25 25 0 0 0-12.258 4.146 25 25 0 0 0-6.934 34.668l66.666 100a25 25 0 0 0 34.668 6.934 25 25 0 0 0 6.934-34.668l-66.666-100a25 25 0 0 0-22.41-11.08M74.637 275.002c-40.845 0-71.443 40.057-60.696 79.463l48.881 179.228c10.646 39.034 46.353 66.303 86.813 66.303h300.73c40.46 0 76.17-27.269 86.815-66.303l61.943-227.113a25 25 0 0 0-17.543-30.695 25 25 0 0 0-30.703 17.535l-61.936 227.113c-4.775 17.51-20.426 29.469-38.576 29.469h-300.73c-18.15 0-33.8-11.959-38.576-29.469L62.178 341.305c-2.408-8.827 3.31-16.309 12.459-16.309H500A25 25 0 0 0 524.998 300 25 25 0 0 0 500 275.002Z" style="stroke-width:3.82848"/>
-</svg>
diff --git a/img/bed.svg b/img/bed.svg
deleted file mode 100644
index bd22140..0000000
--- a/img/bed.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M25 225a25 25 0 0 0-25 25v325a25 25 0 0 0 25 25 25 25 0 0 0 25-25V250a25 25 0 0 0-25-25m137.498.002C114.47 225.002 75 264.472 75 312.5s39.47 87.498 87.498 87.498a25 25 0 0 0 25.002-24.996A25 25 0 0 0 162.498 350c-21.007 0-37.5-16.493-37.5-37.5s16.493-37.5 37.5-37.5 37.5 16.493 37.5 37.5v12.498c0 41.125 33.875 75 75 75h244A49.8 49.8 0 0 1 554.24 414.6l3.086 3.078a25 25 0 0 0 35.352 0 25 25 0 0 0 0-35.354l-3.078-3.084A99.88 99.88 0 0 0 518.998 350h-244c-14.103 0-24.996-10.899-24.996-25.002V312.5c0-48.029-39.475-87.498-87.504-87.498M150 424.998c-41.125 0-75 33.875-75 75v75A25 25 0 0 0 100.002 600a25 25 0 0 0 24.996-25.002v-75c0-14.103 10.899-24.996 25.002-24.996h349.998c14.103 0 25.002 10.893 25.002 24.996v75A25 25 0 0 0 550.002 600a25 25 0 0 0 24.996-25.002v-75c0-41.125-33.875-75-75-75z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/clock.svg b/img/clock.svg
deleted file mode 100644
index 9050282..0000000
--- a/img/clock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M300 0C220.428 0 147.8 31.12 94.102 81.81a25 25 0 0 0-1.018 35.342 25 25 0 0 0 35.34 1.018C173.224 75.88 233.429 50 300 50c138.367 0 250 111.633 250 250S438.367 550 300 550 50 438.367 50 300c0-41.007 9.823-79.539 27.246-113.621a25 25 0 0 0-10.88-33.639 25 25 0 0 0-33.641 10.881C11.805 204.545 0 250.985 0 300c0 165.39 134.61 300 300 300s300-134.61 300-300S465.39 0 300 0m0 72.15a25 25 0 0 0-25.002 25.002v177.846a175.02 175.02 0 0 0 35.004 105l45 60A25 25 0 0 0 390 445.002a25 25 0 0 0 4.998-35.004l-45-60a124.98 124.98 0 0 1-24.996-75V97.152A25 25 0 0 0 300 72.15" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/code.svg b/img/code.svg
deleted file mode 100644
index c283678..0000000
--- a/img/code.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M376.402 200.002c-26.675 0-50.36 17.869-57.69 43.518L233.01 543.475c-1.135 3.972-4.52 6.525-8.653 6.525h-35.035a8.82 8.82 0 0 1-6.355-2.687L57.15 417.629c-9.716-10.015-9.716-25.243 0-35.258l135.79-139.959a25 25 0 0 0-.532-35.353 25 25 0 0 0-35.351.533L21.267 347.55C7.188 362.064.148 381.033.148 400s7.04 37.936 21.12 52.45l125.817 129.675a58.9 58.9 0 0 0 42.238 17.873h35.035c26.23 0 49.525-17.565 56.73-42.785l85.696-299.957c1.258-4.402 5.041-7.256 9.62-7.256h33.853a9.8 9.8 0 0 1 7.064 2.99l125.53 129.381c9.716 10.015 9.716 25.243 0 35.258L407.059 557.588a25 25 0 0 0 .53 35.353 25 25 0 0 0 35.354-.533L578.74 452.45c28.161-29.025 28.161-75.873 0-104.898L453.21 218.17a59.88 59.88 0 0 0-42.954-18.168Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/creature.svg b/img/creature.svg
deleted file mode 100644
index 1ab0d45..0000000
--- a/img/creature.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="375" height="600">
-    <path d="M187.5-.17c-82.547 0-150 67.453-150 150 0 55.323 30.14 103.976 74.982 129.916a25 25 0 0 0 34.159-9.121 25 25 0 0 0-9.123-34.158C107.635 219.18 87.5 187.043 87.5 149.83c0-55.524 44.475-100 100-100s100 44.476 100 100c0 37.213-20.135 69.35-50.018 86.637a25 25 0 0 0-9.123 34.158 25 25 0 0 0 34.159 9.121c44.843-25.94 74.982-74.593 74.982-129.916 0-82.547-67.453-150-150-150m-62.502 325.172C56.258 325.002 0 381.26 0 450v124.998A25 25 0 0 0 25.002 600a25 25 0 0 0 24.996-25.002V450c0-41.717 33.283-75 75-75h125.004c41.717 0 75 33.283 75 75v124.998A25 25 0 0 0 349.998 600 25 25 0 0 0 375 574.998V450c0-68.74-56.259-124.998-124.998-124.998Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/cross.svg b/img/cross.svg
deleted file mode 100644
index d0e63ad..0000000
--- a/img/cross.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M22.797.516a25 25 0 0 0-15.49 7.24 25 25 0 0 0 .03 35.355l225 224.582a25 25 0 0 0 35.356-.03 25 25 0 0 0-.03-35.356l-225-224.584a25 25 0 0 0-11.216-6.46 25 25 0 0 0-8.65-.747m554.838 0a25 25 0 0 0-8.65.744 25 25 0 0 0-11.217 6.453L6.932 556.879a25 25 0 0 0-.055 35.355 25 25 0 0 0 35.355.053L593.068 43.121a25 25 0 0 0 .055-35.355 25 25 0 0 0-15.488-7.25M347.797 325.098a25 25 0 0 0-15.49 7.24 25 25 0 0 0 .03 35.355l225 224.584a25 25 0 0 0 35.356-.033 25 25 0 0 0-.03-35.355l-225-224.582a25 25 0 0 0-11.216-6.461 25 25 0 0 0-8.65-.748"/>
-</svg>
diff --git a/img/cross_small.svg b/img/cross_small.svg
deleted file mode 100644
index d890ea0..0000000
--- a/img/cross_small.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="412.5" height="412.5">
-    <path d="M25 0a25 25 0 0 0-6.47.852 25 25 0 0 0-11.208 6.47 25 25 0 0 0 0 35.356l125 125a25 25 0 0 0 35.356 0 25 25 0 0 0 0-35.356l-125-125A25 25 0 0 0 25 0m364.68.096a25 25 0 0 0-8.65.756 25 25 0 0 0-11.208 6.47l-362.5 362.5a25 25 0 0 0 0 35.356 25 25 0 0 0 35.356 0l362.5-362.5a25 25 0 0 0 0-35.356A25 25 0 0 0 389.68.096M262.5 237.5a25 25 0 0 0-6.47.852 25 25 0 0 0-11.208 6.47 25 25 0 0 0 0 35.356l125 125a25 25 0 0 0 35.356 0 25 25 0 0 0 0-35.356l-125-125A25 25 0 0 0 262.5 237.5"/>
-</svg>
diff --git a/img/cup_1.svg b/img/cup_1.svg
deleted file mode 100644
index 9020279..0000000
--- a/img/cup_1.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M151.773.063a25 25 0 0 0-9.675 1.222 25 25 0 0 0-14.461 12.535l-13.82 27.637a75.07 75.07 0 0 0 0 67.086l2.644 5.28a24.94 24.94 0 0 1 0 22.359l-13.82 27.638a25 25 0 0 0 11.175 33.543 25 25 0 0 0 33.545-11.183l13.819-27.639a75.05 75.05 0 0 0 0-67.078l-2.635-5.285a24.94 24.94 0 0 1 0-22.362l13.818-27.636A25 25 0 0 0 161.18 2.637a25 25 0 0 0-9.407-2.574m100 0a25 25 0 0 0-9.675 1.222 25 25 0 0 0-14.461 12.535l-13.82 27.637a75.07 75.07 0 0 0 0 67.086l2.644 5.28a24.94 24.94 0 0 1 0 22.359l-13.82 27.638a25 25 0 0 0 11.175 33.543 25 25 0 0 0 33.545-11.183l13.819-27.639a75.05 75.05 0 0 0 0-67.078l-2.635-5.285a24.94 24.94 0 0 1 0-22.362l13.818-27.636A25 25 0 0 0 261.18 2.637a25 25 0 0 0-9.407-2.574m100 0a25 25 0 0 0-9.675 1.222 25 25 0 0 0-14.461 12.535l-13.819 27.637a75.07 75.07 0 0 0 0 67.086l2.643 5.28a24.94 24.94 0 0 1 0 22.359l-13.82 27.638a25 25 0 0 0 11.177 33.543 25 25 0 0 0 33.543-11.183l13.819-27.639a75.05 75.05 0 0 0 0-67.078l-2.635-5.285a24.94 24.94 0 0 1 0-22.362l13.818-27.636A25 25 0 0 0 361.18 2.637a25 25 0 0 0-9.407-2.574m48.221 224.939-325.002.066c-40.818.008-70.027 42.55-55.37 80.647l89.09 231.592c14.502 37.694 50.899 62.695 91.286 62.695H300c40.387 0 76.784-25.001 91.285-62.695l89.1-231.592c7.13-18.536 24.755-30.643 44.615-30.643 14.103 0 25.002 10.899 25.002 25.002v23.963a57.19 57.19 0 0 1-30.9 50.854l-5.625 2.923a25 25 0 0 0-10.666 33.706 25 25 0 0 0 33.712 10.666l5.625-2.915C577.652 400.838 600 364.041 600 324.037v-23.963c0-41.125-33.875-75-75-75-40.387 0-76.784 24.993-91.285 62.688l-89.1 231.592c-7.13 18.535-24.755 30.642-44.615 30.642H199.998c-19.86 0-37.486-12.107-44.617-30.642l-89.1-231.592c-2.65-6.89 1.344-12.696 8.727-12.698l324.994-.066a25 25 0 0 0 24.996-25.002 25 25 0 0 0-25.004-24.994" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/cup_2.svg b/img/cup_2.svg
deleted file mode 100644
index 0db73f7..0000000
--- a/img/cup_2.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M151.773.063a25 25 0 0 0-9.675 1.222 25 25 0 0 0-14.461 12.535l-13.82 27.637a75.07 75.07 0 0 0 0 67.086l2.644 5.28a24.94 24.94 0 0 1 0 22.359l-13.82 27.638a25 25 0 0 0 11.175 33.543 25 25 0 0 0 33.545-11.183l13.819-27.639a75.05 75.05 0 0 0 0-67.078l-2.635-5.285a24.94 24.94 0 0 1 0-22.362l13.818-27.636A25 25 0 0 0 161.18 2.637a25 25 0 0 0-9.407-2.574m100 0a25 25 0 0 0-9.675 1.222 25 25 0 0 0-14.461 12.535l-13.82 27.637a75.07 75.07 0 0 0 0 67.086l2.644 5.28a24.94 24.94 0 0 1 0 22.359l-13.82 27.638a25 25 0 0 0 11.175 33.543 25 25 0 0 0 33.545-11.183l13.819-27.639a75.05 75.05 0 0 0 0-67.078l-2.635-5.285a24.94 24.94 0 0 1 0-22.362l13.818-27.636A25 25 0 0 0 261.18 2.637a25 25 0 0 0-9.407-2.574m100 0a25 25 0 0 0-9.675 1.222 25 25 0 0 0-14.461 12.535l-13.819 27.637a75.07 75.07 0 0 0 0 67.086l2.643 5.28a24.94 24.94 0 0 1 0 22.359l-13.82 27.638a25 25 0 0 0 11.177 33.543 25 25 0 0 0 33.543-11.183l13.819-27.639a75.05 75.05 0 0 0 0-67.078l-2.635-5.285a24.94 24.94 0 0 1 0-22.362l13.818-27.636A25 25 0 0 0 361.18 2.637a25 25 0 0 0-9.407-2.574m48.221 249.949-325.002.066 1.506.043c-42.822-2.572-77.719 36.651-70.18 78.883a25 25 0 0 0 .303 1.476c26.464 109.63 127.365 194.602 243.38 194.602 116.017 0 216.912-84.971 243.376-194.602a25 25 0 0 0 .295-1.416c2.886-15.95 15.938-27.567 32.021-28.85 13.742.375 24.309 11.017 24.309 24.872v23.96a57.19 57.19 0 0 1-30.9 50.854l-5.626 2.924a25 25 0 0 0-10.666 33.705 25 25 0 0 0 33.713 10.666l5.625-2.922C577.652 425.84 600 389.05 600 349.047v-23.961c0-41.125-33.875-75-75-75a25 25 0 0 0-1.447.043c-39.24 2.272-72.083 31.356-79.082 70.033l.302-1.41c-20.961 86.837-103.608 156.334-194.771 156.334-90.812 0-173.093-68.99-194.445-155.36-1.719-11.293 6.426-20.387 17.945-19.695a25 25 0 0 0 1.506.043l324.994-.066a25 25 0 0 0 24.996-25.002 25 25 0 0 0-25.002-24.994ZM70.115 550a25 25 0 0 0-25 25 25 25 0 0 0 25 25h359.77a25 25 0 0 0 25-25 25 25 0 0 0-25-25Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/dect.svg b/img/dect.svg
deleted file mode 100644
index b061df2..0000000
--- a/img/dect.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="350" height="600">
-    <path d="M325.002 0A25 25 0 0 0 300 25.002V75c0 14.103-10.899 25.002-25.002 25.002H75c-41.125 0-75 33.875-75 75V525c0 41.125 33.875 75 75 75h199.998c41.125 0 75-33.875 75-75V199.998a25 25 0 0 0-24.996-24.996A25 25 0 0 0 300 199.998V525c0 14.103-10.899 25.002-25.002 25.002H75c-14.103 0-25.002-10.899-25.002-25.002V175.002C49.998 160.899 60.897 150 75 150h199.998c41.125 0 75-33.875 75-75V25.002A25 25 0 0 0 325.002 0m-175 175c-41.125 0-75 33.875-75 75v25.002c0 41.125 33.875 75 75 75H200c41.125 0 75-33.875 75-75v-75A25 25 0 0 0 249.998 175a25 25 0 0 0-24.996 25.002v75c0 14.103-10.899 24.996-25.002 24.996h-49.998c-14.103 0-25.002-10.893-25.002-24.996V250c0-14.103 10.899-25.002 25.002-25.002h24.996A25 25 0 0 0 200 200.002 25 25 0 0 0 174.998 175ZM100 400a25 25 0 0 0-25 25 25 25 0 0 0 25 25h150a25 25 0 0 0 25-25 25 25 0 0 0-25-25zm0 70a25 25 0 0 0-25 25 25 25 0 0 0 25 25h150a25 25 0 0 0 25-25 25 25 0 0 0-25-25z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/export.sh b/img/export.sh
deleted file mode 100755
index ba6d47d..0000000
--- a/img/export.sh
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# This script can be used to automatically export all project files
-# to ensure, they are a single path without any modifiers or other
-# inkscape-dependent things. It will also remove unnecessary things
-# from the SVGs. For this the script requires both inkscape and svgo
-# to be installed.
-
-for infile in ./project_files/*.svg
-do
-  outfile="./$(basename "$infile")"
-
-  inkscape --actions="select-by-element: svg;
-                      object-set-attribute: id, svg;
-                      select-clear;
-                      select-all: layers;
-                      selection-ungroup;
-                      select-clear;
-                      select-all: no-groups;
-                      object-stroke-to-path;
-                      path-union;
-                      object-set-attribute: id,path;
-                      object-set-attribute: style,;
-                      selection-group;
-                      selection-ungroup;
-                      export-plain-svg;" \
-           --export-filename "$outfile" \
-           --vacuum-defs "$infile"
-
-  svgo --pretty "$outfile"
-done
diff --git a/img/external.svg b/img/external.svg
deleted file mode 100644
index 92a7419..0000000
--- a/img/external.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" xml:space="preserve" width="600" height="600">
-    <path d="M262.5 0c-34.222 0-62.502 28.28-62.502 62.502s28.28 62.496 62.502 62.496h162.498c3.763 0 4.61 1.35 5.604 3.75s1.346 3.945-1.315 6.606l-321.96 321.968a25 25 0 0 0 0 35.352 25 25 0 0 0 35.35 0l321.97-321.961c16.91-16.91 20.112-41.877 12.15-61.1C468.834 90.39 448.912 75 424.998 75H262.5c-7.2 0-12.498-5.298-12.498-12.498S255.3 49.998 262.5 49.998H525c14.103 0 25.002 10.899 25.002 25.002v250.002a25 25 0 0 0 24.996 24.996A25 25 0 0 0 600 325.002V75c0-41.125-33.875-75-75-75ZM75 75c-41.125 0-75 33.875-75 75v375c0 41.125 33.875 75 75 75h375c41.125 0 75-33.875 75-75V424.998a25 25 0 0 0-25.002-24.996 25 25 0 0 0-24.996 24.996V525c0 14.103-10.899 25.002-25.002 25.002H75c-14.103 0-25.002-10.899-25.002-25.002V150c0-14.103 10.899-25.002 25.002-25.002h49.998A25 25 0 0 0 150 100.002 25 25 0 0 0 124.998 75Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/fairydust.svg b/img/fairydust.svg
deleted file mode 100644
index e847437..0000000
--- a/img/fairydust.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="387.074" height="600">
-    <path d="M193.537 0c-16.56 0-33.118 5.21-47 15.621l-36.002 26.994a134.8 134.8 0 0 0-50.404 77.303l-6.887 29.625a221.3 221.3 0 0 0-2.414 88.346L62 301.543a74.85 74.85 0 0 1-11.45 54.486l-5.624 8.436A256 256 0 0 0 9.58 444.359L3.984 466.75a133.52 133.52 0 0 0 9.973 91.814l5.479 11.014c19.46 39.138 78.74 39.138 98.2 0l5.477-11.014a597 597 0 0 0 31.787-76.992l-.066.207c4.198-12.242 15.545-20.271 28.486-20.16h20.219c13.223 0 24.748 8.31 28.93 20.854l.008.015a590 590 0 0 0 31.49 76.092l5.47 11c19.46 39.137 78.742 39.137 98.202 0l5.476-11.016a133.52 133.52 0 0 0 9.975-91.814l-5.596-22.391a256 256 0 0 0-35.345-79.893l-5.625-8.437a73.98 73.98 0 0 1-11.235-54.295l10.69-58.789a223.1 223.1 0 0 0-1.713-88.302l-7.649-34.399a133.16 133.16 0 0 0-50.078-77.629l-36.002-26.994C226.656 5.21 210.097 0 193.537 0m0 49.902c5.96 0 11.919 1.902 17 5.713l36.002 27.002a83.1 83.1 0 0 1 31.27 48.47l7.648 34.407a173.1 173.1 0 0 1 1.328 68.504l-10.69 58.79a124.06 124.06 0 0 0 18.833 90.982l5.617 8.43a206 206 0 0 1 28.441 64.288l5.596 22.389a83.47 83.47 0 0 1-6.236 57.424l-5.479 11.021c-2.485 4.998-6.173 4.998-8.658 0l-5.479-11.021-.006-.015a540 540 0 0 1-28.82-69.627l-.008-.023c-10.933-32.766-41.813-55.023-76.357-55.023h-19.791c-34.27-.295-65.094 21.528-76.211 53.947l-.067.199A547 547 0 0 1 78.341 536.3l-5.476 11.022c-2.485 4.998-6.173 4.998-8.658 0L58.728 536.3a83.47 83.47 0 0 1-6.236-57.424l5.594-22.388a206 206 0 0 1 28.443-64.29l5.617-8.43a124.93 124.93 0 0 0 19.098-90.87l-11.17-63.654a171.3 171.3 0 0 1 1.87-68.379l6.886-29.63a84.74 84.74 0 0 1 31.705-48.618l36.002-27.002c5.082-3.81 11.04-5.713 17-5.713M193.525 126c-41.125 0-75 33.875-75 75s33.875 75 75 75 75-33.875 75-75-33.874-75-75-75m0 50c14.104 0 25 10.897 25 25s-10.896 25-25 25-25-10.897-25-25 10.897-25 25-25m0 310.617a25 25 0 0 0-25 25v63.967a25 25 0 0 0 25 25 25 25 0 0 0 25-25v-63.967a25 25 0 0 0-25-25" style="stroke-width:3.77952"/>
-</svg>
diff --git a/img/file-export.svg b/img/file-export.svg
index 727df65..d1a3f2d 100644
--- a/img/file-export.svg
+++ b/img/file-export.svg
@@ -1,6 +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
+<?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/flag.svg b/img/flag.svg
deleted file mode 100644
index 539a20e..0000000
--- a/img/flag.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="384.92" height="600">
-    <path d="M60.115.084C28.094 1.748.015 28.487.014 62.588L-.002 575a25.017 24.983 0 0 0 25.016 24.98A25.017 24.983 0 0 0 50.035 575l.016-512.412c0-9.262 7.646-14.874 16.498-12.111l263.558 82.25c4.644 1.449 4.789 3.295 4.782 6.507-.007 3.213-.153 5.054-4.803 6.483l-235.44 72.34a25.017 24.983 0 0 0-16.558 31.23 25.017 24.983 0 0 0 31.271 16.531l235.438-72.347c25.233-7.754 40.07-31.614 40.119-54.131.05-22.518-14.686-46.44-39.885-54.305L81.473 2.785A61 61 0 0 0 60.115.084" style="stroke-width:3.87606"/>
-</svg>
diff --git a/img/gluten.svg b/img/gluten.svg
deleted file mode 100644
index 715037b..0000000
--- a/img/gluten.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="315.625" height="600">
-    <path d="M151.52.053A25 25 0 0 0 139.26 4.2a25 25 0 0 0-6.94 34.664l33.36 50.043c15.85 23.776 45.37 34.84 72.947 27.35l58.553-15.9a25 25 0 0 0 17.568-30.68 25 25 0 0 0-30.678-17.576L225.523 68.01c-7.009 1.904-14.21-.793-18.24-6.836l-33.36-50.041A25 25 0 0 0 158.032.486a25 25 0 0 0-6.511-.433m-37.5 99.996a25 25 0 0 0-12.26 4.146 25 25 0 0 0-6.94 34.672l33.36 50.035c15.85 23.777 45.37 34.849 72.947 27.358l58.553-15.9a25 25 0 0 0 17.568-30.688 25 25 0 0 0-30.678-17.568l-58.547 15.908c-7.009 1.904-14.21-.8-18.24-6.844l-33.36-50.033a25 25 0 0 0-15.892-10.653 25 25 0 0 0-6.511-.433M76.52 200.05a25 25 0 0 0-12.26 4.146 25 25 0 0 0-6.94 34.674l33.36 50.033c15.85 23.776 45.37 34.849 72.947 27.358l58.553-15.908a25 25 0 0 0 17.568-30.678 25 25 0 0 0-30.678-17.57l-58.547 15.902c-7.009 1.904-14.21-.793-18.24-6.836l-33.36-50.043a25 25 0 0 0-15.892-10.645 25 25 0 0 0-6.511-.433m-37.5 100.002a25 25 0 0 0-12.26 4.148 25 25 0 0 0-6.94 34.664l33.36 50.043a33.5 33.5 0 0 1 3.506 30.406L1.594 566.221a25 25 0 0 0 14.63 32.185 25 25 0 0 0 32.186-14.63l55.092-146.909c9.428-25.143 6.176-53.35-8.719-75.693l-33.36-50.041a25 25 0 0 0-15.892-10.647 25 25 0 0 0-6.511-.433" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/hackertours.svg b/img/hackertours.svg
deleted file mode 100644
index ca88cc6..0000000
--- a/img/hackertours.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M350.002-.002A213.3 213.3 0 0 0 244.184 28.1l-89.041 50.884a204.7 204.7 0 0 0-76.159 76.159L28.1 244.183A213.3 213.3 0 0 0-.002 350.003v49.613c-.503 4.886-.603 9.706-.053 14.365 4.766 40.358 46.799 70.319 87.934 57.196a25 25 0 0 0 3.58-1.453 175.02 175.02 0 0 0 78.264-78.264L175 380.902A125 125 0 0 1 230.902 325l11.45-5.729c16.634-8.317 36.47-5.095 49.62 8.055l265.35 265.348a25 25 0 0 0 35.352 0 25 25 0 0 0 0-35.352l-265.348-265.35c-28.233-28.232-71.622-35.275-107.334-17.42l-11.449 5.73a175 175 0 0 0-78.262 78.261l-5.28 10.557C113.3 392.506 94.46 411.47 71.345 423.645c-12.973 3.242-23.769-6.184-21.645-19.791a25 25 0 0 0 .303-3.854v-49.998c0-28.416 7.413-56.336 21.512-81.008l50.882-89.049a154.64 154.64 0 0 1 57.55-57.549l89.048-50.882a163.27 163.27 0 0 1 81.008-21.512H400c16.782 0 26.407 15.52 19.178 30.539-11.229 19.473-28.33 34.893-48.934 43.922a25 25 0 0 0-1.144.539l-10.557 5.28a175 175 0 0 0-78.262 78.261l-2.642 5.28a25 25 0 0 0 11.183 33.534 25 25 0 0 0 33.535-11.175l2.643-5.28A125 125 0 0 1 380.902 175l10.557-5.277-1.145.539a155.4 155.4 0 0 0 72.913-65.885 25 25 0 0 0 .59-1.113C487.07 56.756 451.996-.002 400-.002Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/hare_head.svg b/img/hare_head.svg
deleted file mode 100644
index e20029e..0000000
--- a/img/hare_head.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M215.691.084c-24.836-1.325-49.965 13.31-58.503 38.922l-9.073 27.21a24.977 24.977 0 0 0 15.795 31.595 24.977 24.977 0 0 0 31.596-15.795l9.07-27.211c1.93-5.788 7.246-7.357 12.014-3.543l46.265 37.006a103.36 103.36 0 0 1 36.801 60.455l5.516 27.58c7.422 37.103 34.236 67.47 70.135 79.433l54.43 18.141a167.1 167.1 0 0 1 66.962 42.027l28.672 29.479 1.193.959c12.595 10.12 20.88 24.551 23.395 40.465-.36 18.612-10.84 35.453-27.549 43.859l-9.857 4.959c-35.007 17.61-50.963 59.597-36.483 96.01l13.164 33.101a219 219 0 0 1 6.116 17.498 24.977 24.977 0 0 0 31.14 16.672 24.977 24.977 0 0 0 16.67-31.14 269 269 0 0 0-7.508-21.489l-13.164-33.101c-5.076-12.766.236-26.75 12.514-32.926l9.857-4.959c34.028-17.118 55.455-52.207 55.137-90.295l-.012-1.53-.2-1.517c-3.747-28.48-18.106-54.447-40.055-72.888l-27.22-27.987a217.1 217.1 0 0 0-86.98-54.588l-54.43-18.14a55.5 55.5 0 0 1-36.943-41.842l-5.517-27.58a153.36 153.36 0 0 0-54.582-89.666L247.79 12.252c-9.583-7.665-20.81-11.566-32.1-12.168m-91.19 127.154c-9.2-.424-18.494.116-27.73 1.655l-49.019 8.168c-39.144 6.522-60.25 52.218-39.83 86.246l22.476 37.455a125.3 125.3 0 0 0 89.68 59.535l72.541 10.361c18.588 2.655 33.565 16.162 38.117 34.37l.899 3.593.23.73c6.79 21.462 2.901 44.774-10.398 62.901-16.922 19.734-42.273 40.916-84.22 72.342a867 867 0 0 0-66.485 51.414 24.977 24.977 0 0 0-2.77 35.213 24.977 24.977 0 0 0 35.213 2.771 817 817 0 0 1 63.168-48.82l.346-.242.338-.252c43.25-32.397 71.604-55.472 93.021-80.658l.498-.584.46-.616c22.979-30.653 29.946-70.448 18.874-107.06l-.006-.024-.707-2.826c-9.444-37.771-40.97-66.198-79.515-71.703l-72.541-10.361a75.23 75.23 0 0 1-53.91-35.787l-22.477-37.455c-3.158-5.263-.852-10.26 5.209-11.27l49.02-8.168a81.88 81.88 0 0 1 64.63 16.83l82.04 65.62a24.977 24.977 0 0 0 35.105-3.903 24.977 24.977 0 0 0-3.904-35.108l-82.04-65.619a131.9 131.9 0 0 0-76.312-28.748"/>
-</svg>
diff --git a/img/history.svg b/img/history.svg
deleted file mode 100644
index 4b66dd4..0000000
--- a/img/history.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M300 0C220.422 0 147.792 31.123 94.092 81.82a25 25 0 0 0-1.018 35.342 25 25 0 0 0 35.342 1.018C173.216 75.885 233.424 50 300 50c138.367 0 250 111.633 250 250S438.367 550 300 550 50 438.367 50 300a25 25 0 0 0-25-25 25 25 0 0 0-25 25c0 165.39 134.61 300 300 300s300-134.61 300-300S465.39 0 300 0m0 72.15a25 25 0 0 0-25.002 25.002v177.846a175.02 175.02 0 0 0 35.004 105l45 60A25 25 0 0 0 390 445.002a25 25 0 0 0 4.998-35.004l-45-60a124.98 124.98 0 0 1-24.996-75V97.152A25 25 0 0 0 300 72.15M34.887 75.016a25 25 0 0 0-5.582.414 25 25 0 0 0-19.94 29.195l9.59 50.885c6.08 32.273 37.795 53.935 70.068 47.855l53.106-10.002a25 25 0 0 0 19.937-29.203 25 25 0 0 0-29.195-19.937l-53.105 10.01c-5.719 1.077-10.6-2.263-11.678-7.981L58.5 95.369a25 25 0 0 0-23.613-20.353" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/home.svg b/img/home.svg
deleted file mode 100644
index 6c4e2f1..0000000
--- a/img/home.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M250.002.088c-19.347 0-38.698 6.674-54.213 20.02L46.602 148.442A134 134 0 0 0 0 250.002V525c0 41.125 33.875 75 75 75h49.998c41.125 0 75-33.875 75-75V424.998c0-14.103 10.899-24.996 25.002-24.996h49.998c14.103 0 25.002 10.893 25.002 24.996V525c0 41.125 33.875 75 75 75h49.998c41.125 0 75-33.875 75-75V400.002A25 25 0 0 0 475.002 375 25 25 0 0 0 450 400.002V525c0 14.103-10.899 25.002-25.002 25.002H375c-14.103 0-25.002-10.899-25.002-25.002V424.998c0-41.125-33.875-75-75-75H225c-41.125 0-75 33.875-75 75V525c0 14.103-10.899 25.002-25.002 25.002H75c-14.103 0-25.002-10.899-25.002-25.002V250.002a83.92 83.92 0 0 1 29.209-63.654l149.19-128.334c12.557-10.802 30.647-10.802 43.205 0l149.187 128.334A83.92 83.92 0 0 1 450 250.002V300a25 25 0 0 0 25.002 25.002A25 25 0 0 0 499.998 300v-49.998c0-39.01-17.028-76.12-46.602-101.559L304.207 20.107C288.692 6.762 269.349.087 250.002.087" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/hygene.svg b/img/hygene.svg
deleted file mode 100644
index a7db265..0000000
--- a/img/hygene.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M25.004-.006a25 25 0 0 0-25.01 25.01v465.38c0 60.244 49.378 109.622 109.621 109.622h380.77c60.243 0 109.62-49.378 109.62-109.621v-380.77c0-60.243-49.377-109.62-109.62-109.62H99.996a25 25 0 0 0-24.998 25.009 25 25 0 0 0 24.998 24.998h390.389c33.22 0 59.613 26.392 59.613 59.613v380.77c0 33.22-26.392 59.613-59.613 59.613h-380.77c-33.22 0-59.613-26.392-59.613-59.613V25.004A25 25 0 0 0 25.004-.006m248.994 75.004c-40.573 0-73.996 33.431-73.996 74.004V175c0 14.103-10.899 25.002-25.002 25.002h-25.002c-41.125 0-75 33.875-75 75V325c0 41.125 33.875 75 75 75H175c14.103 0 25.002 10.899 25.002 25.002v24.996c0 41.125 33.875 75 75 75H325c41.125 0 75-33.875 75-75v-24.996C400 410.899 410.899 400 425.002 400h24.996c41.125 0 75-33.875 75-75v-49.998c0-41.125-33.875-75-75-75h-24.996C410.899 200.002 400 189.103 400 175v-25.002a25 25 0 0 0-25.002-24.996 25 25 0 0 0-24.996 24.996V175c0 41.125 33.875 75 75 75h24.996C464.101 250 475 260.899 475 275.002V325c0 14.103-10.899 25.002-25.002 25.002h-24.996c-41.125 0-75 33.875-75 75v24.996C350.002 464.101 339.103 475 325 475h-49.998C260.899 475 250 464.101 250 449.998v-24.996c0-41.125-33.875-75-75-75h-25.002c-14.103 0-24.996-10.899-24.996-25.002v-49.998c0-14.103 10.893-25.002 24.996-25.002H175c41.125 0 75-33.875 75-75v-25.998c0-13.551 10.447-24 23.998-24H325A25 25 0 0 0 350.002 100 25 25 0 0 0 325 74.998Z" style="stroke-width:6.39612"/>
-</svg>
diff --git a/img/info.svg b/img/info.svg
deleted file mode 100644
index 2c6c17d..0000000
--- a/img/info.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M300-.021a302 302 0 0 0-54.22 4.91C123.543 27.215 27.22 123.54 4.894 245.775a301.8 301.8 0 0 0 0 108.448C27.22 476.458 123.545 572.78 245.779 595.107l.569.104.568.074a67.5 67.5 0 0 0 15.525.31c35.441-3.4 64.245-34.597 62.532-71.743l.03 1.15V287.498A25 25 0 0 0 300 262.502a25 25 0 0 0-25.002 24.996v238.08l.03.576c.56 12.161-9.045 20.989-21.06 19.563C152.57 526.846 72.621 446.75 54.08 345.238a251.8 251.8 0 0 1 0-90.478C72.671 152.975 152.98 72.665 254.764 54.074a251.8 251.8 0 0 1 90.473 0c101.785 18.591 182.092 98.9 200.683 200.686a251.8 251.8 0 0 1 0 90.478c-17.169 93.999-87.02 169.7-177.727 195.356a25 25 0 0 0-17.25 30.855 25 25 0 0 0 30.864 17.26c109.004-30.83 192.68-121.602 213.298-234.486a301.8 301.8 0 0 0 0-108.448C572.78 123.54 476.455 27.215 354.221 4.89A302 302 0 0 0 300-.021M300 75c-41.125 0-75 33.875-75 75s33.875 75 75 75 75-33.875 75-75a25 25 0 0 0-25-25 25 25 0 0 0-25 25c0 14.103-10.897 25-25 25s-25-10.897-25-25 10.897-25 25-25a25 25 0 0 0 25-25 25 25 0 0 0-25-25" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/lightbulb.svg b/img/lightbulb.svg
deleted file mode 100644
index ee9e8df..0000000
--- a/img/lightbulb.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="350" height="600">
-    <path d="M175.002-.037a175 175 0 0 0-57.268 9.627C49.132 33.336 0 98.642 0 175.002c0 32.284 7.99 76.66 21.94 118.922s30.923 82.685 65.52 102.705a25 25 0 0 0 4.614 2.074l67.301 22.442a49.43 49.43 0 0 0 31.256 0l35.459-11.823c25.922-6.562 49.197-20.998 66.506-41.424a25 25 0 0 0 1.373-1.771c33.695-47.882 51.52-122.526 55.37-174.596a197 197 0 0 0-.138-33.314l-.015-.178a174.3 174.3 0 0 0-9.147-41.37 25 25 0 0 0-31.904-15.241 25 25 0 0 0-15.244 31.904 124 124 0 0 1 6.511 29.432c.729 8.247.764 16.542.096 24.795l-.008.177c-3.118 42.349-23.046 115.583-45.959 148.76-10.754 12.27-25.002 20.959-40.902 24.715a25 25 0 0 0-2.157.613l-35.47 11.824-63.352-21.119c-10.443-6.927-30.176-37.757-42.23-74.275-12.335-37.37-19.422-80.022-19.422-103.252 0-54.945 35.223-101.246 84.094-118.162a125.04 125.04 0 0 1 81.814 0 124.3 124.3 0 0 1 21.576 9.87 25 25 0 0 0 34.157-9.124 25 25 0 0 0-9.123-34.156 174.2 174.2 0 0 0-30.252-13.84 175 175 0 0 0-57.262-9.627m-72.57 437.652a25 25 0 0 0-26.147 16.977 25 25 0 0 0 15.81 31.623l43.378 14.46a125 125 0 0 0 79.052 0l43.383-14.46a25 25 0 0 0 15.813-31.623 25 25 0 0 0-31.625-15.813L198.72 453.24a75 75 0 0 1-47.436 0l-43.377-14.46a25 25 0 0 0-5.476-1.165m0 87.504a25 25 0 0 0-26.147 16.977 25 25 0 0 0 15.81 31.625l43.378 14.453a125 125 0 0 0 79.052 0l43.383-14.453a25 25 0 0 0 15.813-31.625 25 25 0 0 0-31.625-15.81l-43.375 14.46a75 75 0 0 1-47.436 0l-43.377-14.46a25 25 0 0 0-5.476-1.167" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/link.svg b/img/link.svg
deleted file mode 100644
index a88ab81..0000000
--- a/img/link.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M462.5 0c-47.534 0-89.756 24.304-114.4 61.209l-.006.008-49.944 74.916a25 25 0 0 0 6.934 34.668 25 25 0 0 0 34.668-6.934l49.928-74.89.011-.014v-.002C405.386 65.469 431.954 50 462.5 50c48.621 0 87.5 38.879 87.5 87.5 0 18.065-5.389 34.62-14.674 48.514l-.008.011-100.01 150.014C419.614 359.531 393.046 375 362.5 375c-.857 0-1.686-.103-2.537-.127a137 137 0 0 0 14.04-46.625 25 25 0 0 0 .16-.5c.12-1.091.178-2.199.273-3.297.073-.843.15-1.683.209-2.53.211-3.12.355-6.255.355-9.421 0-75.643-61.857-137.5-137.5-137.5-47.534 0-89.756 24.304-114.4 61.209l-.006.008L23.086 386.229C8.513 408.045 0 434.405 0 462.5 0 538.143 61.857 600 137.5 600c47.534 0 89.756-24.304 114.4-61.209l.006-.008 49.944-74.916 28.484-42.727c10.33 2.5 21.094 3.86 32.166 3.86 47.534 0 89.756-24.304 114.4-61.209l.006-.008L576.9 213.795l.015-.024C591.487 191.955 600 165.595 600 137.5 600 61.857 538.143 0 462.5 0m-225 225c48.621 0 87.5 38.879 87.5 87.5 0 2.965-.196 5.87-.48 8.746-1.356 13.76-5.87 26.46-12.836 37.572C289.45 343.013 275 317.091 275 287.5c0-3.306.182-6.56.535-9.754a25 25 0 0 0-22.101-27.596 25 25 0 0 0-27.596 22.104A139 139 0 0 0 225 287.5c0 46.57 23.466 87.89 59.14 112.791l-23.892 35.842-49.94 74.906a88.6 88.6 0 0 1-9.93 12.318C184.512 539.787 162.319 550 137.5 550 88.879 550 50 511.121 50 462.5q.001-3.387.25-6.701a86.5 86.5 0 0 1 5.701-25.121 87 87 0 0 1 2.514-5.79v-.001a87 87 0 0 1 2.912-5.567v-.002a88 88 0 0 1 3.297-5.33v-.002l.008-.01v-.002l99.998-149.998.011-.014v-.002C180.386 240.47 206.954 225 237.5 225"/>
-</svg>
diff --git a/img/location.svg b/img/location.svg
deleted file mode 100644
index e299d03..0000000
--- a/img/location.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="375" height="600">
-    <path d="M187.5-.016c-11.596 0-23.19 1.072-34.637 3.211C77.062 17.365 17.367 77.063 3.197 152.865a188.4 188.4 0 0 0 .006 69.28l.156.85.213.833c9.28 35.752 22.002 70.517 37.93 103.84l22.566 56.592a25 25 0 0 0 32.479 13.967 25 25 0 0 0 13.967-32.489l-23.016-57.726-.377-.776c-14.652-30.47-26.285-62.29-34.842-94.998-3.016-16.597-3.035-33.598.067-50.183v-.006c10.376-55.51 54.19-99.327 109.7-109.703a138.5 138.5 0 0 1 50.907 0c63.386 11.848 111.416 67.043 111.953 134.049-4.602 41.951-16.983 82.682-36.629 120.044l-.605 1.159-95.33 239.109c-1.288 3.23-2.524 3.285-4.842 3.285s-3.554-.056-4.842-3.285L140.41 440.738a25 25 0 0 0-32.48-13.959 25 25 0 0 0-13.965 32.48l42.246 105.962c8.826 22.138 30.597 34.77 51.289 34.77s42.463-12.632 51.29-34.77l94.782-237.75c22.17-42.826 36.244-89.382 41.287-137.356l.141-1.3v-1.313c0-91.448-65.82-168.036-152.863-184.307A188.5 188.5 0 0 0 187.5-.015m0 75.016C125.664 75 75 125.664 75 187.5S125.664 300 187.5 300 300 249.336 300 187.5c0-11.116-1.626-21.928-4.662-32.13a25 25 0 0 0-31.092-16.83 25 25 0 0 0-16.83 31.09A62.4 62.4 0 0 1 250 187.5c0 34.814-27.686 62.5-62.5 62.5S125 222.314 125 187.5s27.686-62.5 62.5-62.5c6.26 0 12.233.906 17.875 2.586a25 25 0 0 0 31.094-16.826 25 25 0 0 0-16.828-31.096A112.6 112.6 0 0 0 187.5 75"/>
-</svg>
diff --git a/img/lock.svg b/img/lock.svg
deleted file mode 100644
index 6f32cac..0000000
--- a/img/lock.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="375" height="600">
-    <path d="M187.5 0C111.857 0 49.998 61.859 49.998 137.502v37.5A25 25 0 0 0 75 199.998a25 25 0 0 0 25.002-24.996v-37.5c0-48.621 38.877-87.504 87.498-87.504s87.498 38.883 87.498 87.504v37.5A25 25 0 0 0 300 199.998a25 25 0 0 0 25.002-24.996v-37.5C325.002 61.859 263.143 0 187.5 0M75 225c-41.125 0-75 33.875-75 75v199.998A25 25 0 0 0 25.002 525a25 25 0 0 0 24.996-25.002V300c0-14.103 10.899-25.002 25.002-25.002h225c14.103 0 25.002 10.899 25.002 25.002v225c0 14.103-10.899 25.002-25.002 25.002H25.002A25 25 0 0 0 0 574.998 25 25 0 0 0 25.002 600H300c41.125 0 75-33.875 75-75V300c0-41.125-33.875-75-75-75zm112.5 112.5a25 25 0 0 0-25.002 25.002v99.996A25 25 0 0 0 187.5 487.5a25 25 0 0 0 25.002-25.002v-99.996A25 25 0 0 0 187.5 337.5"/>
-</svg>
diff --git a/img/login.svg b/img/login.svg
deleted file mode 100644
index efa6a28..0000000
--- a/img/login.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="450" height="600">
-    <path d="M149.998 0c-41.125 0-75 33.875-75 75v150A25 25 0 0 0 100 250.002 25 25 0 0 0 125.002 225V75c0-14.103 10.893-25.002 24.996-25.002h225C389.101 49.998 400 60.897 400 75v450c0 14.103-10.899 25.002-25.002 25.002h-225c-14.103 0-24.996-10.899-24.996-25.002V375A25 25 0 0 0 100 349.998 25 25 0 0 0 74.998 375v150c0 41.125 33.875 75 75 75h225c41.125 0 75-33.875 75-75V75c0-41.125-33.875-75-75-75Zm57.88 140.805c-8.207.045-16.27 1.776-23.503 5.03-19.289 8.681-34.377 28.973-34.377 53.167v51c0 14.103-10.893 24.996-24.996 24.996H25A25 25 0 0 0-.002 300 25 25 0 0 0 25 325.002h100.002c41.125 0 75-33.875 75-75v-51c0-4.515 1.862-6.21 4.894-7.574 3.033-1.365 5.531-1.637 8.91 1.357l104.706 92.768c8.987 7.962 8.987 20.932 0 28.894l-104.705 92.768c-3.38 2.994-5.878 2.722-8.91 1.357s-4.895-3.057-4.895-7.572v-26A25 25 0 0 0 175 349.998 25 25 0 0 0 149.998 375v26c0 24.194 15.088 44.484 34.377 53.164s44.483 6.521 62.592-9.523l104.697-92.768c30.806-27.295 30.806-76.451 0-103.746l-104.697-92.768c-9.055-8.022-19.885-12.571-30.858-14.033a60 60 0 0 0-8.23-.521" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/logout.svg b/img/logout.svg
deleted file mode 100644
index 18c84d2..0000000
--- a/img/logout.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="450" height="600">
-    <path d="M75.002 0c-41.125 0-75 33.875-75 75v450c0 41.125 33.875 75 75 75h225c41.125 0 75-33.875 75-75v-25.002A25 25 0 0 0 350 475.002a25 25 0 0 0-25.002 24.996V525c0 14.103-10.893 25.002-24.996 25.002h-225C60.899 550.002 50 539.103 50 525V75c0-14.103 10.899-25.002 25.002-25.002h225c14.103 0 24.996 10.899 24.996 25.002v25.002A25 25 0 0 0 350 124.998a25 25 0 0 0 25.002-24.996V75c0-41.125-33.875-75-75-75Zm207.877 140.805c-8.208.045-16.27 1.776-23.504 5.03-19.289 8.681-34.377 28.973-34.377 53.167v51c0 14.103-10.893 24.996-24.996 24.996H100A25 25 0 0 0 74.998 300 25 25 0 0 0 100 325.002h100.002c41.125 0 75-33.875 75-75v-51c0-4.515 1.862-6.21 4.894-7.574 3.033-1.365 5.532-1.637 8.91 1.357l104.69 92.768c8.987 7.963 8.987 20.93 0 28.894l-104.69 92.768c-3.378 2.994-5.877 2.722-8.91 1.357-3.032-1.364-4.894-3.057-4.894-7.572v-26A25 25 0 0 0 250 349.998 25 25 0 0 0 224.998 375v26c0 24.194 15.088 44.484 34.377 53.164s44.484 6.514 62.592-9.531l104.69-92.76c30.804-27.295 30.804-76.45 0-103.746l-104.69-92.76c-9.054-8.022-19.885-12.579-30.858-14.04a60 60 0 0 0-8.23-.522" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/menu.svg b/img/menu.svg
index dda9be4..db5d4df 100644
--- a/img/menu.svg
+++ b/img/menu.svg
@@ -1,3 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M25 0A25 25 0 0 0 0 25a25 25 0 0 0 25 25h550a25 25 0 0 0 25-25 25 25 0 0 0-25-25Zm0 275a25 25 0 0 0-25 25 25 25 0 0 0 25 25h550a25 25 0 0 0 25-25 25 25 0 0 0-25-25zm0 275a25 25 0 0 0-25 25 25 25 0 0 0 25 25h550a25 25 0 0 0 25-25 25 25 0 0 0-25-25z"/>
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M3 6h18v2H3V6m0 5h18v2H3v-2m0 5h18v2H3v-2z"/></svg>
\ No newline at end of file
diff --git a/img/menu_small.svg b/img/menu_small.svg
deleted file mode 100644
index e5258de..0000000
--- a/img/menu_small.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="412.5" height="412.5">
-    <path d="M25 0A25 25 0 0 0 0 25a25 25 0 0 0 25 25h362.5a25 25 0 0 0 25-25 25 25 0 0 0-25-25zm0 181.25a25 25 0 0 0-25 25 25 25 0 0 0 25 25h362.5a25 25 0 0 0 25-25 25 25 0 0 0-25-25zm0 181.25a25 25 0 0 0-25 25 25 25 0 0 0 25 25h362.5a25 25 0 0 0 25-25 25 25 0 0 0-25-25z"/>
-</svg>
diff --git a/img/merch.svg b/img/merch.svg
deleted file mode 100644
index f1e4512..0000000
--- a/img/merch.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="550" height="600">
-    <path d="M156.43.023C134.7.152 113.102 6.84 94.756 19.855L51.314 50.674C19.148 73.496.002 110.557.002 149.998c0 41.125 33.875 75 75 75 14.103 0 24.996 10.899 24.996 25.002v325.002A25 25 0 0 0 125 599.998a25 25 0 0 0 25.002-24.996V250c0-41.125-33.875-75-75-75C60.899 175 50 164.101 50 149.998a71.7 71.7 0 0 1 30.244-58.539l43.442-30.826a57.52 57.52 0 0 1 59.513-4.348l35.899 18.291c35.097 17.883 76.707 17.883 111.804 0l35.899-18.29a57.52 57.52 0 0 1 59.513 4.347l43.442 30.826A71.7 71.7 0 0 1 500 149.998C500 164.101 489.101 175 474.998 175c-41.125 0-75 33.875-75 75v274.998c0 14.103-10.893 25.002-24.996 25.002H200a25 25 0 0 0-25.002 25.002A25 25 0 0 0 200 599.998h175.002c41.125 0 75-33.875 75-75V250c0-14.103 10.893-25.002 24.996-25.002 41.125 0 75-33.875 75-75 0-39.44-19.146-76.502-51.312-99.324l-43.442-30.819c-32.615-23.14-75.51-26.275-111.142-8.12l-35.899 18.292a73.08 73.08 0 0 1-66.406 0l-35.899-18.293A107.5 107.5 0 0 0 156.43.024" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/message.svg b/img/message.svg
deleted file mode 100644
index d89f9e4..0000000
--- a/img/message.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M75 200.002c-41.125 0-75 33.875-75 75v249.996c0 41.125 33.875 75 75 75h450c41.125 0 75-33.875 75-75V275.002c0-19.301-12.602-35.76-28.22-42.23-15.62-6.47-36.165-3.742-49.813 9.906L317.68 446.963c-9.973 9.972-25.387 9.972-35.36 0L117.674 282.326a25 25 0 0 0-35.352 0 25 25 0 0 0 0 35.352L246.97 482.322c29.08 29.08 76.982 29.08 106.062 0L550.002 285.36V525C550.002 539.1 539.103 550 525 550H75c-14.103 0-25.002-10.899-25.002-25.002V275.002C49.998 260.899 60.897 250 75 250h375a25 25 0 0 0 25.002-25.002A25 25 0 0 0 450 200.002z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/microphone.svg b/img/microphone.svg
deleted file mode 100644
index 041242d..0000000
--- a/img/microphone.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="440.769" height="600">
-    <path d="M132.297.088c-21.964.54-44.077 6.376-64.352 18.039C3.067 55.448-19.356 138.832 18.102 203.475a135.7 135.7 0 0 0 55.722 52.875 24.957 25.048 90 0 0 .844.412 38.34 38.34 0 0 1 14.797 12.158l196.824 293.748c24.55 36.64 74.036 48.145 112.328 26.117s53.035-70.48 33.463-109.984L308.727 229.824c-19.565-39.488-69.42-54.546-107.698-32.527l-21.947 12.625a24.955 25.046 90 0 0-9.168 34.09 24.955 25.046 90 0 0 34.215 9.134l21.947-12.625c13.836-7.959 30.67-2.875 37.742 11.399L387.17 500.889c8.1 16.348 2.247 35.556-13.6 44.672s-35.46 4.557-45.62-10.606l-197.264-294.41a24.957 25.048 90 0 0-.536-.758 88.4 88.4 0 0 0-34.314-28.256l.84.403c-14.248-7.276-26.542-18.485-35.194-33.414-23.921-41.284-9.924-93.332 31.51-117.166s93.68-9.893 117.602 31.39c7.89 13.615 11.567 28.288 11.554 42.86a24.955 25.046 90 0 0 25.024 24.972 24.955 25.046 90 0 0 25.064-24.933c.02-23.061-5.906-46.537-18.26-67.856C228.225 23.345 180.619-1.1 132.297.087" style="stroke-width:4.19282"/>
-</svg>
diff --git a/img/network.svg b/img/network.svg
deleted file mode 100644
index d746fb9..0000000
--- a/img/network.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M300 39.727c-105.448 0-204.202 29.633-288.06 81.011a25 25 0 0 0-8.256 34.38 25 25 0 0 0 34.377 8.255C114.327 116.646 203.905 89.727 300 89.727c96.093 0 185.672 26.919 261.938 73.644a25 25 0 0 0 34.378-8.258 25 25 0 0 0-8.257-34.377C504.2 69.36 405.447 39.726 300 39.726m0 150c-78.743 0-152.41 22.744-214.447 62.003a25 25 0 0 0-7.756 34.495 25 25 0 0 0 34.494 7.755c54.317-34.374 118.574-54.253 187.709-54.253 69.134 0 133.39 19.878 187.707 54.252a25 25 0 0 0 34.494-7.756 25 25 0 0 0-7.758-34.494c-62.036-39.26-135.7-62.002-214.443-62.002m0 150c-52.216 0-100.94 16.038-141.14 43.433a25 25 0 0 0-6.583 34.736 25 25 0 0 0 34.739 6.583c32.206-21.947 70.972-34.752 112.984-34.752s80.777 12.804 112.982 34.75a25 25 0 0 0 34.739-6.582 25 25 0 0 0-6.582-34.737c-40.201-27.393-88.924-43.431-141.139-43.431m0 150c-26.519 0-50.923 10.43-68.861 27.37a25 25 0 0 0-1.01 35.342 25 25 0 0 0 35.34 1.01c9.038-8.535 21.017-13.722 34.531-13.722s25.493 5.187 34.531 13.722a25 25 0 0 0 35.34-1.011 25 25 0 0 0-1.01-35.34c-17.938-16.94-42.343-27.371-68.861-27.371"/>
-</svg>
diff --git a/img/pen.svg b/img/pen.svg
deleted file mode 100644
index 7586346..0000000
--- a/img/pen.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M475.002 0a25 25 0 0 0-17.68 7.322L67.928 396.717a104.4 104.4 0 0 0-21.842 32.023l-41.54 95.086c-9.442 21.618-3.09 45.77 11.384 60.244s38.626 20.826 60.244 11.383l95.086-41.539a104.4 104.4 0 0 0 32.023-21.842l389.395-389.394a25 25 0 0 0 0-35.352 25 25 0 0 0-35.352 0L167.93 496.713a54.4 54.4 0 0 1-16.682 11.383l-95.094 41.537c-2.882 1.259-3.435.508-4.865-.922s-2.181-1.983-.922-4.865l41.537-95.094a54.4 54.4 0 0 1 11.383-16.682L492.674 42.674a25 25 0 0 0 0-35.352A25 25 0 0 0 475.002 0m98.69.033a25 25 0 0 0-5.163.819 25 25 0 0 0-11.207 6.47l-100 100a25 25 0 0 0 0 35.356 25 25 0 0 0 35.356 0l100-100a25 25 0 0 0 0-35.356A25 25 0 0 0 573.69.033" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/pencil.svg b/img/pencil.svg
index 7fae82b..e3a4faa 100644
--- a/img/pencil.svg
+++ b/img/pencil.svg
@@ -1,18 +1 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<!-- Created with Inkscape (http://www.inkscape.org/) -->
-
-<svg
-   width="600"
-   height="600"
-   viewBox="0 0 158.75 158.75"
-   version="1.1"
-   id="svg1"
-   xmlns="http://www.w3.org/2000/svg"
-   xmlns:svg="http://www.w3.org/2000/svg">
-  <defs
-     id="defs1" />
-  <path
-     id="path2"
-     style="stroke-linecap:round;stroke-linejoin:round"
-     d="M 125.6776 0 A 6.6146002 6.6146002 0 0 0 120.99985 1.9373494 L 17.972546 104.96465 C 15.534014 107.40318 13.57404 110.27727 12.193571 113.43752 L 1.2030273 138.59567 C -1.2954806 144.3154 0.38528675 150.70582 4.2147298 154.53527 C 8.044173 158.36471 14.4346 160.04548 20.154325 157.54697 L 45.31248 146.55643 C 48.472732 145.17596 51.346815 143.21599 53.785347 140.77745 L 156.81265 37.750151 A 6.6146002 6.6146002 0 0 0 156.81265 28.396716 A 6.6146002 6.6146002 0 0 0 147.45922 28.396716 L 44.431396 131.42195 C 43.16098 132.69237 41.664126 133.71446 40.017712 134.43365 L 14.857491 145.42368 C 14.094767 145.75685 13.948653 145.55819 13.570231 145.17977 C 13.191808 144.80134 12.993142 144.65523 13.326318 143.89251 L 24.316345 118.73229 C 25.035536 117.08588 26.057632 115.58901 27.328048 114.3186 L 130.35328 11.290784 A 6.6146002 6.6146002 0 0 0 130.35328 1.9373494 A 6.6146002 6.6146002 0 0 0 125.6776 0 z M 152.13593 0 A 6.6146002 6.6146002 0 0 0 147.45818 1.9378662 L 120.99933 28.394649 A 6.6146002 6.6146002 0 0 0 120.99933 37.750151 A 6.6146002 6.6146002 0 0 0 130.35432 37.750151 L 156.81368 11.2913 A 6.6146002 6.6146002 0 0 0 156.81368 1.9378662 A 6.6146002 6.6146002 0 0 0 152.13593 0 z " />
-</svg>
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M20.71 7.04c.39-.39.39-1.04 0-1.41l-2.34-2.34c-.37-.39-1.02-.39-1.41 0l-1.84 1.83 3.75 3.75M3 17.25V21h3.75L17.81 9.93l-3.75-3.75L3 17.25z"/></svg>
\ No newline at end of file
diff --git a/img/pin.svg b/img/pin.svg
deleted file mode 100644
index 2b07c7a..0000000
--- a/img/pin.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="350" height="600">
-    <path d="M106.055 0C62.76 0 33.348 47.596 52.709 86.318l2.57 5.141A186.8 186.8 0 0 1 75 175v50a73.68 73.68 0 0 1-30.1 59.441l-22.513 16.532c-19.028 13.97-27.006 38.84-19.655 61.271C10.083 384.676 31.232 400 54.838 400H100a25 25 0 0 0 25-25 25 25 0 0 0-25-25H54.838c-2.186 0-3.911-1.249-4.592-3.326s-.03-4.105 1.733-5.399l22.515-16.53C106.227 301.444 125 264.367 125 225v-50a236.8 236.8 0 0 0-25-105.902l-2.57-5.141C93.756 56.61 97.84 50 106.055 50h137.89c8.215 0 12.299 6.61 8.625 13.957l-2.57 5.14A236.8 236.8 0 0 0 225 175v50c0 39.369 18.773 76.444 50.506 99.744l22.515 16.531c1.763 1.294 2.414 3.321 1.733 5.399-.68 2.077-2.406 3.326-4.592 3.326H225c-41.125 0-75 33.875-75 75v150a25 25 0 0 0 25 25 25 25 0 0 0 25-25V425c0-14.103 10.897-25 25-25h70.162c23.606 0 44.755-15.324 52.106-37.756s-.627-47.3-19.655-61.271L305.1 284.44A73.68 73.68 0 0 1 275 225v-50c0-29.001 6.751-57.602 19.72-83.541l2.571-5.14C316.652 47.595 287.239 0 243.945 0Z"/>
-</svg>
diff --git a/img/plate_and_cutlery.svg b/img/plate_and_cutlery.svg
deleted file mode 100644
index e759c5a..0000000
--- a/img/plate_and_cutlery.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M25.002 0A25 25 0 0 0 0 25.002v75c0 38.635 15.355 75.71 42.674 103.03l4.289 4.288A95.68 95.68 0 0 1 75 274.998v300A25 25 0 0 0 100.002 600a25 25 0 0 0 24.996-25.002v-300c0-38.635-15.356-75.71-42.676-103.03l-4.289-4.288a95.68 95.68 0 0 1-28.035-67.678v-75A25 25 0 0 0 25.002 0M100 0a25 25 0 0 0-25 25v100a25 25 0 0 0 25 25 25 25 0 0 0 25-25V25a25 25 0 0 0-25-25m75 0a25 25 0 0 0-25 25v100a25 25 0 0 0 25 25 25 25 0 0 0 25-25V25a25 25 0 0 0-25-25m368.838.133c-14.337-.385-29.24 4.4-40.94 15.178l-8.06 7.425A139.07 139.07 0 0 0 450 124.998v125.004a25 25 0 0 0 25.002 24.996 25 25 0 0 0 24.996-24.996V124.998a89 89 0 0 1 28.715-65.484l8.06-7.428c3.244-2.988 5.575-2.712 8.512-1.424s4.717 2.81 4.717 7.219v517.117A25 25 0 0 0 574.998 600 25 25 0 0 0 600 574.998V57.881c0-24.241-15.266-44.514-34.643-53.01-4.844-2.124-10.05-3.555-15.421-4.258a59 59 0 0 0-6.098-.48M300 98c-19.053 0-37.652 2.138-55.531 6.195a25 25 0 0 0-18.85 29.912 25 25 0 0 0 29.912 18.848C269.813 149.715 284.684 148 300 148c32.015 0 62.111 7.475 88.875 20.775a25 25 0 0 0 33.514-11.261A25 25 0 0 0 411.125 124C377.641 107.36 339.827 98 300 98m0 100c-82.547 0-150 67.453-150 150s67.453 150 150 150 150-67.453 150-150a149.7 149.7 0 0 0-30-90.012 25 25 0 0 0-35.004-4.974 25 25 0 0 0-4.975 35.002C392.586 304.745 400 325.368 400 348c0 55.525-44.475 100-100 100s-100-44.475-100-100 44.475-100 100-100a25 25 0 0 0 25-25 25 25 0 0 0-25-25m191.729 244.273a25 25 0 0 0-22.086 11.715C434.287 510.444 371.713 548 300 548c-49.84 0-95.145-18.104-130.15-48.137a25 25 0 0 0-35.252 2.696 25 25 0 0 0 2.695 35.253C180.996 575.307 238.001 598 300 598c89.21 0 167.828-46.911 212.018-117.473a25 25 0 0 0-7.918-34.457 25 25 0 0 0-12.371-3.797"/>
-</svg>
diff --git a/img/power.svg b/img/power.svg
deleted file mode 100644
index 1e003d3..0000000
--- a/img/power.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M299.998 0c-17.969.002-35.937 8.867-44.912 26.594L97.07 338.689a24.986 25.014 0 0 0 10.987 33.622 24.986 25.014 0 0 0 33.582-11L299.656 49.207c.836-1.65-.156-1.65.68 0l249.31 492.395c2.42 4.777.216 8.367-5.134 8.367H55.486c-5.35 0-7.548-3.59-5.129-8.367l53.311-105.291a24.986 25.014 0 0 0-10.994-33.622 24.986 25.014 0 0 0-33.582 11l-53.31 105.3c-18.312 36.166 9.202 81.015 49.704 81.015h489.026c40.502 0 68.017-44.849 49.705-81.016L344.912 26.586C335.937 8.859 317.967-.002 299.998 0m-1.494 125.045a25 25 0 0 0-6.41 1.236 25 25 0 0 0-14.453 12.535l-45.834 91.66c-20.544 41.088 16.57 90.745 61.793 82.678l46.97-8.37c4.572-.816 6.43.767 8.254 3.587s2.508 5.17-.111 9.006l-63.875 93.521a25 25 0 0 0 6.547 34.747 25 25 0 0 0 34.748-6.547L390 345.576c13.941-20.413 12.491-46.296.813-64.355-11.68-18.06-34.69-30.007-59.026-25.666l-46.965 8.377c-7.813 1.393-11.838-3.996-8.289-11.094l45.826-91.654a25 25 0 0 0-11.175-33.543 25 25 0 0 0-12.68-2.596m-57.086 293.9a25 25 0 0 0-7.818.229 25 25 0 0 0-19.938 29.195l5.293 28.102c6.08 32.273 37.795 53.937 70.068 47.857l28.104-5.293a25 25 0 0 0 19.937-29.195 25 25 0 0 0-29.195-19.937l-28.103 5.292c-5.719 1.078-10.6-2.262-11.678-7.98l-5.293-28.104a25 25 0 0 0-21.377-20.166z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/question.svg b/img/question.svg
deleted file mode 100644
index f904106..0000000
--- a/img/question.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M300 0C134.61 0 0 134.61 0 300c0 148.033 107.597 271.458 249.027 295.682l.532.095.533.067c40.434 5.138 76.65-28.182 74.888-68.903l.022 1.079V487.5A25 25 0 0 0 300 462.498a25 25 0 0 0-25.002 25.002v41.066l.022.538c.46 10.654-7.845 18.313-18.39 17.11C139.263 525.697 49.999 423.55 49.999 300 49.998 161.633 161.633 49.998 300 49.998S550.002 161.633 550.002 300c0 114.68-76.959 210.935-181.809 240.59a25 25 0 0 0-17.25 30.865 25 25 0 0 0 30.864 17.25C507.807 553.067 600 437.075 600 300 600 134.61 465.39 0 300 0m0 75c-46.07 0-86.646 25.11-108.264 62.48a25 25 0 0 0 9.125 34.165 25 25 0 0 0 34.157-9.125c12.963-22.41 37.023-37.522 64.982-37.522 41.717 0 75 33.283 75 75 0 19.348-7.191 36.704-19.09 49.996h-.008l-49.074 54.871a125.03 125.03 0 0 0-31.83 83.334v11.803A25 25 0 0 0 300 424.998a25 25 0 0 0 25.002-24.996v-11.803a75 75 0 0 1 19.097-50.006l49.061-54.847.008-.006c19.769-22.087 31.83-51.466 31.83-83.342C424.998 131.258 368.74 75 300 75z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/schedule.svg b/img/schedule.svg
deleted file mode 100644
index 48c0c0e..0000000
--- a/img/schedule.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="450" height="600">
-    <path d="M74-.002C33.427-.002-.002 33.429-.002 74.002V212.5A25 25 0 0 0 25 237.502 25 25 0 0 0 50.002 212.5V74.002c0-13.551 10.447-24 23.998-24h300.998c14.103 0 25.002 10.893 25.002 24.996v450C400 539.101 389.101 550 374.998 550h-300c-14.103 0-24.996-10.899-24.996-25.002V287.5A25 25 0 0 0 25 262.498 25 25 0 0 0-.002 287.5v237.498c0 41.125 33.875 75 75 75h300c41.125 0 75-33.875 75-75v-450c0-41.125-33.875-75-75-75zm26 75A25 25 0 0 0 74.998 100 25 25 0 0 0 100 125.002h75c14.103 0 25.002 10.893 25.002 24.996 0 41.125 33.875 75 75 75h75a25 25 0 0 0 24.996-24.996A25 25 0 0 0 350.002 175h-75C260.899 175 250 164.101 250 149.998c0-41.125-33.875-75-75-75ZM100 225a25 25 0 0 0-25.002 25.002A25 25 0 0 0 100 274.998h75c14.103 0 25.002 10.899 25.002 25.002 0 41.125 33.875 75 75 75h75a25 25 0 0 0 24.996-25.002 25 25 0 0 0-24.996-24.996h-75C260.899 325.002 250 314.103 250 300c0-41.125-33.875-75-75-75zm0 149.998A25 25 0 0 0 74.998 400 25 25 0 0 0 100 425.002h75c14.103 0 25.002 10.893 25.002 24.996 0 41.125 33.875 75 75 75h75a25 25 0 0 0 24.996-24.996A25 25 0 0 0 350.002 475h-75C260.899 475 250 464.101 250 449.998c0-41.125-33.875-75-75-75z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/search.svg b/img/search.svg
deleted file mode 100644
index 0e81215..0000000
--- a/img/search.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M375 0C251.032 0 150 101.032 150 225c0 34.638 7.868 67.611 21.953 96.998l3.035 6.348c11.922 24.94 6.863 54.443-12.683 73.99L7.322 557.326a25 25 0 0 0 0 35.352 25 25 0 0 0 35.352 0l154.99-154.983c34.408-34.407 43.419-87.01 22.434-130.912l-3.05-6.385-.005-.013c-10.934-22.813-17.045-48.297-17.045-75.385 0-96.946 78.056-175.002 175.002-175.002S550.002 128.054 550.002 225 471.946 400.002 375 400.002c-31.981 0-61.765-8.513-87.506-23.408a25 25 0 0 0-34.154 9.117 25 25 0 0 0 9.115 34.156C295.559 439.023 334.105 450 375 450c123.968 0 225-101.032 225-225S498.968 0 375 0" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/settings.svg b/img/settings.svg
deleted file mode 100644
index 410588b..0000000
--- a/img/settings.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M204.652-1.486c-2.586-.01-5.162.12-7.714.382-6.806.703-13.437 2.359-19.622 4.92-24.739 10.248-44.347 35.738-43.818 66.811l.12 7.059c.535 31.434-24.498 56.467-55.932 55.931l-7.059-.119c-31.073-.53-56.563 19.08-66.81 43.818-10.248 24.74-6.09 56.626 16.255 78.223l5.084 4.912c22.606 21.849 22.606 57.249 0 79.098l-5.084 4.912C-2.274 366.058-6.43 397.945 3.816 422.684s35.738 44.347 66.811 43.818l7.059-.121c31.434-.536 56.467 24.491 55.931 55.926l-.119 7.066c-.53 31.073 19.08 56.563 43.818 66.81 24.74 10.248 56.626 6.09 78.223-16.255l4.912-5.084c21.849-22.606 57.249-22.606 79.098 0l4.912 5.084c21.597 22.346 53.484 26.503 78.223 16.256s44.347-35.738 43.818-66.81l-.03-1.849a25 25 0 0 0-25.424-24.57 25 25 0 0 0-24.57 25.422l.03 1.848c.181 10.663-5.236 16.565-12.957 19.763s-15.725 2.86-23.137-4.808l-4.912-5.084c-41.046-42.47-109.954-42.47-151 0l-4.912 5.084c-7.412 7.668-15.416 8.007-23.137 4.808s-13.14-9.1-12.959-19.763l.121-7.067c1.004-59.054-47.719-107.777-106.773-106.771l-7.067.119c-10.663.181-16.565-5.236-19.763-12.957s-2.86-15.725 4.808-23.137l5.084-4.912c42.47-41.046 42.47-109.954 0-151l-5.084-4.914c-7.668-7.412-8.007-15.414-4.808-23.135s9.1-13.14 19.763-12.959l7.067.121c59.054 1.006 107.777-47.717 106.771-106.771l-.12-7.067c-.182-10.663 5.237-16.565 12.958-19.763 7.722-3.199 15.725-2.86 23.137 4.808l4.912 5.084c41.046 42.47 109.954 42.47 151 0l4.912-5.084c7.412-7.668 15.415-8.007 23.137-4.808 7.721 3.198 13.139 9.1 12.957 19.763l-.12 7.067c-1.005 59.054 47.718 107.777 106.772 106.771l7.067-.12c10.663-.182 16.565 5.237 19.763 12.958 3.199 7.722 2.86 15.723-4.808 23.135l-38.56 37.27c-24.168 23.357-24.168 62.931 0 86.289l38.56 37.267c7.668 7.412 8.007 15.415 4.808 23.137-3.198 7.721-9.1 13.139-19.763 12.957l-2.655-.045a25 25 0 0 0-25.416 24.572 25 25 0 0 0 24.57 25.424l2.65.045c31.072.53 56.562-19.08 66.81-43.818 10.247-24.74 6.09-56.626-16.256-78.223l-38.563-37.268c-4.304-4.16-4.304-10.227 0-14.386l38.563-37.268c22.346-21.597 26.503-53.484 16.256-78.223s-35.739-44.347-66.811-43.818l-7.066.12c-31.435.535-56.462-24.498-55.926-55.932l.12-7.059c.53-31.073-19.078-56.563-43.817-66.81s-56.626-6.09-78.223 16.255l-4.912 5.084c-21.849 22.606-57.249 22.606-79.098 0l-4.912-5.084C241.366 5.408 222.76-1.42 204.652-1.486M300 150c-82.547 0-150 67.453-150 150 0 21.257 4.457 41.618 12.492 60.01a25 25 0 0 0 32.918 12.898 25 25 0 0 0 12.9-32.918C202.967 327.76 200 314.298 200 300c0-55.524 44.476-100 100-100s100 44.476 100 100-44.476 100-100 100c-14.303 0-27.767-2.969-40.002-8.316a25 25 0 0 0-32.922 12.896 25 25 0 0 0 12.897 32.92C258.369 445.54 278.736 450 300 450c82.547 0 150-67.453 150-150s-67.453-150-150-150" style="stroke-width:3.82848"/>
-</svg>
diff --git a/img/signup.svg b/img/signup.svg
deleted file mode 100644
index 6c20d48..0000000
--- a/img/signup.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M337.5 0c-82.547 0-150 67.453-150 150 0 55.323 30.14 103.978 74.982 129.918a25 25 0 0 0 34.159-9.123 25 25 0 0 0-9.123-34.158C257.635 219.35 237.5 187.213 237.5 150c0-55.525 44.475-100 100-100s100 44.475 100 100c0 37.213-20.135 69.35-50.018 86.637a25 25 0 0 0-9.123 34.158 25 25 0 0 0 34.159 9.123C457.36 253.978 487.5 205.323 487.5 150c0-82.547-67.453-150-150-150M125.002 199.998A25 25 0 0 0 100 225v25.002c0 41.125 33.875 75 75 75h25.002A25 25 0 0 0 224.998 300a25 25 0 0 0-24.996-25.002H175c-14.103 0-25.002-10.893-25.002-24.996V225a25 25 0 0 0-24.996-25.002m-100.004 100A25 25 0 0 0 .002 325a25 25 0 0 0 24.996 25.002H50c14.103 0 25.002 10.893 25.002 24.996V400a25 25 0 0 0 24.996 25.002A25 25 0 0 0 125 400v-25.002c0-41.125-33.875-75-75-75zm250 25.004C206.258 325.002 150 381.26 150 450v124.998A25 25 0 0 0 175.002 600a25 25 0 0 0 24.996-25.002V450c0-41.717 33.283-75 75-75h125.004c41.717 0 75 33.283 75 75v124.998A25 25 0 0 0 499.998 600 25 25 0 0 0 525 574.998V450c0-68.74-56.259-124.998-124.998-124.998Z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/soldering_iron.svg b/img/soldering_iron.svg
deleted file mode 100644
index 6c36a6e..0000000
--- a/img/soldering_iron.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M537.424.154c-14.128 0-28.254 5.319-38.889 15.953l-52.572 52.575a154.94 154.94 0 0 1-131.524 43.84l-2.746-.391c-23.82-3.403-45.647 10.262-54.9 28.767-9.253 18.506-7.085 44.16 9.93 61.174l16.556 16.565c3.724 3.724 3.724 9.002 0 12.726L71.465 443.18A73.32 73.32 0 0 0 49.998 495v10.002a23.25 23.25 0 0 1-6.822 16.463L7.322 557.326a25 25 0 0 0 0 35.352 25 25 0 0 0 35.352 0l35.861-35.854a73.33 73.33 0 0 0 21.467-51.822V495a23.25 23.25 0 0 1 6.822-16.46L318.64 266.722c22.831-22.832 22.831-60.614 0-83.446l-16.565-16.556c-2.012-2.012-1.284-2.016-.56-3.463.723-1.448.29-2.033 3.107-1.631l2.746.39c63.855 9.123 128.337-12.365 173.947-57.976l52.575-52.574c2.162-2.162 4.908-2.162 7.07 0l7.574 7.574c2.162 2.162 2.162 4.908 0 7.07l-94.998 94.998c-18.903 18.903-27.823 45.658-24.043 72.121l8.881 62.149c.402 2.817-.183 2.384-1.63 3.107-1.448.724-1.452 1.452-3.464-.56l-15.855-15.856c-23.222-23.222-61.626-23.222-84.848 0L132.32 482.326a25 25 0 0 0 0 35.352 25 25 0 0 0 35.36 0l200.248-200.25c4.114-4.115 10.03-4.115 14.144 0l15.856 15.85c17.015 17.014 42.668 19.182 61.174 9.929 18.505-9.253 32.17-31.08 28.767-54.9l-8.88-62.141a34.95 34.95 0 0 1 9.9-29.705l95.004-94.996c21.269-21.27 21.269-56.514 0-77.783l-7.575-7.575C565.684 5.473 551.552.154 537.424.154" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/star-circle.svg b/img/star-circle.svg
deleted file mode 100644
index b71b998..0000000
--- a/img/star-circle.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M16.23 18L12 15.45 7.77 18l1.12-4.81-3.73-3.23 4.92-.42L12 5l1.92 4.53 4.92.42-3.73 3.23L16.23 18M12 2C6.47 2 2 6.5 2 12a10 10 0 0 0 10 10 10 10 0 0 0 10-10A10 10 0 0 0 12 2z"/></svg>
\ No newline at end of file
diff --git a/img/tick.svg b/img/tick.svg
deleted file mode 100644
index 6d5e5aa..0000000
--- a/img/tick.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M579.277.787a25 25 0 0 0-9.752.24 25 25 0 0 0-15.642 11.014L223.176 534.082c-12.96 20.46-40.422 22.014-55.61 3.148L44.471 384.324a25 25 0 0 0-35.15-3.799 25 25 0 0 0-3.792 35.15l123.094 152.909c35.737 44.391 106.296 40.396 136.793-7.746l330.7-522.041a25 25 0 0 0-7.739-34.502 25 25 0 0 0-9.1-3.508" style="stroke-width:3.82848"/>
-</svg>
diff --git a/img/tick_small.svg b/img/tick_small.svg
deleted file mode 100644
index cf7760e..0000000
--- a/img/tick_small.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="412.33">
-    <path d="M575.02 0a25 25 0 0 0-17.686 7.305L210.582 353.424c-12.206 12.183-31.206 12.29-43.549.246L42.457 232.11a25 25 0 0 0-35.346.433 25 25 0 0 0 .426 35.354l124.576 121.552c31.516 30.755 82.625 30.466 113.791-.642l346.754-346.11a25 25 0 0 0 .04-35.361A25 25 0 0 0 575.02 0" style="stroke-width:3.82847"/>
-</svg>
diff --git a/img/ticket.svg b/img/ticket.svg
deleted file mode 100644
index d836a02..0000000
--- a/img/ticket.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="475" height="600">
-    <path d="M75 0C33.875 0 0 33.875 0 75v450c0 41.125 33.875 75 75 75h34.865a75 75 0 0 0 41.596-12.594l44.44-29.623a74.85 74.85 0 0 1 83.2 0l44.432 29.623A75 75 0 0 0 365.14 600h34.863c41.125 0 75-33.875 75-75V75c0-41.125-33.875-75-75-75h-34.863a75 75 0 0 0-41.606 12.594l-44.431 29.623a74.85 74.85 0 0 1-83.202 0l-44.44-29.623A75 75 0 0 0 109.866 0Zm0 49.998h34.865c4.938 0 9.755 1.46 13.864 4.2l44.431 29.624c41.928 27.952 96.748 27.952 138.676 0l44.44-29.625a24.98 24.98 0 0 1 13.863-4.199h34.863c14.103 0 24.996 10.899 24.996 25.002v450c0 14.103-10.893 25.002-24.996 25.002h-34.863c-4.938 0-9.755-1.46-13.864-4.2l-44.44-29.624c-41.927-27.952-96.747-27.952-138.675 0l-44.431 29.625a24.98 24.98 0 0 1-13.864 4.199H75c-14.103 0-25.002-10.899-25.002-25.002V75c0-14.103 10.899-25.002 25.002-25.002M100 180a25 25 0 0 0-25 25 25 25 0 0 0 25 25h25a25 25 0 0 0 25-25 25 25 0 0 0-25-25zm250 0a25 25 0 0 0-25 25 25 25 0 0 0 25 25h25a25 25 0 0 0 25-25 25 25 0 0 0-25-25zm-125 20a25 25 0 0 0-25 25 25 25 0 0 0 25 25h25a25 25 0 0 0 25-25 25 25 0 0 0-25-25z" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/toast.svg b/img/toast.svg
deleted file mode 100644
index 287b801..0000000
--- a/img/toast.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M163.1.03c-24.085-.381-48.086 6.712-68.41 20.888l-42.977 29.97C19.334 73.472.002 110.523.002 149.999a190.16 190.16 0 0 0 31.936 105.473l8.392 12.593A57.56 57.56 0 0 1 50 299.998v275.004a25 25 0 0 0 25.002 24.996 25 25 0 0 0 24.996-24.996V299.998c0-21.235-6.286-42-18.064-59.668l-8.4-12.594A140.14 140.14 0 0 1 50 149.998a70.76 70.76 0 0 1 30.31-58.096l42.977-29.978a66.24 66.24 0 0 1 63.33-6.865l57.623 23.888a145.65 145.65 0 0 0 111.526 0l57.623-23.888a66.22 66.22 0 0 1 63.322 6.865l42.976 29.978a70.76 70.76 0 0 1 30.311 58.096c0 27.67-8.185 54.716-23.533 77.738l-8.4 12.594A107.58 107.58 0 0 0 500 299.998v225C500 539.101 489.101 550 474.998 550H150.002A25 25 0 0 0 125 575.002a25 25 0 0 0 25.002 24.996h324.996c41.125 0 75-33.875 75-75v-225a57.56 57.56 0 0 1 9.67-31.934l8.4-12.593a190.16 190.16 0 0 0 31.934-105.473c0-39.476-19.33-76.527-51.709-99.11l-42.979-29.97c-32.52-22.68-74.448-27.23-111.074-12.047l-57.623 23.887a95.58 95.58 0 0 1-73.228 0L205.766 8.87A116.2 116.2 0 0 0 163.1.03" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/train.svg b/img/train.svg
deleted file mode 100644
index 6791f66..0000000
--- a/img/train.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M25.002 0A25 25 0 0 0 0 25.002a25 25 0 0 0 25.002 24.996h300a73.12 73.12 0 0 1 59.19 30.14l141.185 194.13a128.74 128.74 0 0 1 24.625 75.73v75C550.002 439.101 539.103 450 525 450H25.002A25 25 0 0 0 0 475.002a25 25 0 0 0 25.002 24.996H525c41.125 0 75-33.875 75-75v-75c0-37.776-11.974-74.59-34.193-105.14L424.629 50.735C401.46 18.881 364.39 0 325.002 0Zm0 75A25 25 0 0 0 0 100.002a25 25 0 0 0 25.002 24.996H75c14.103 0 25.002 10.899 25.002 25.002v199.998C100.002 364.101 89.103 375 75 375H25.002A25 25 0 0 0 0 400.002a25 25 0 0 0 25.002 24.996H75c41.125 0 75-33.875 75-75V150c0-41.125-33.875-75-75-75Zm225 0c-41.125 0-75 33.875-75 75v150a25 25 0 0 0 24.996 25.002A25 25 0 0 0 225 300V150c0-14.103 10.899-25.002 25.002-25.002h24.996a74.94 74.94 0 0 1 60 30l90 120h-150A25 25 0 0 0 250.002 300a25 25 0 0 0 24.996 25.002h150c39.629 0 63.78-48.301 40.002-80.004l-90-120C351.406 93.54 314.32 75 274.998 75Zm-92.309 450.002a25 25 0 0 0-12.463 3.482 25 25 0 0 0-8.78 34.248C149.366 584.56 172.954 600 200 600s50.633-15.44 63.55-37.268a25 25 0 0 0-8.78-34.248 25 25 0 0 0-34.249 8.784C215.635 545.524 208.221 550 200 550s-15.635-4.476-20.521-12.732a25 25 0 0 0-21.786-12.266m199.897.015a25 25 0 0 0-12.613 2.897 25 25 0 0 0-10.375 33.8c12.51 23.595 37.013 40.56 65.398 40.56s52.887-16.965 65.398-40.56a25 25 0 0 0-10.375-33.8 25 25 0 0 0-33.798 10.377c-4.78 9.013-12.596 13.984-21.225 13.984s-16.445-4.971-21.225-13.984a25 25 0 0 0-21.185-13.274" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/vegan.svg b/img/vegan.svg
deleted file mode 100644
index c65c83e..0000000
--- a/img/vegan.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="525" height="600">
-    <path d="M464.906 16.281q-3.127.025-6.275.403h-.002a56.8 56.8 0 0 0-14.336 3.675l-32.154 12.86a268.6 268.6 0 0 0-90.17 59.46l-4.29 4.29c-27.805 27.805-40.92 67.135-35.359 106.062l10.86 76.004a135.06 135.06 0 0 1-12.905 79.504l-52.632 105.28a25 25 0 0 0 11.175 33.542 25 25 0 0 0 33.543-11.183l52.641-105.28a185.08 185.08 0 0 0 17.672-108.935l-10.85-76.004a74.93 74.93 0 0 1 21.207-63.639l4.29-4.289a218.6 218.6 0 0 1 73.39-48.388l32.148-12.86c6.607-2.643 12.143 1.101 12.143 8.217v25.002a25 25 0 0 0 .015.828c.806 24.32-5.588 48.316-18.336 69.035A163.25 163.25 0 0 1 394.097 225l-5.28 2.643a25 25 0 0 0-11.175 33.535 25 25 0 0 0 33.537 11.183l5.278-2.642a213.3 213.3 0 0 0 82.08-72.453 25 25 0 0 0 .449-.694 173.95 173.95 0 0 0 26-97.396l.015.826V75c0-33.454-28.831-58.984-60.094-58.719zM22.736 142.406a25 25 0 0 0-12.146 4.469 25 25 0 0 0-6.02 34.838C84.882 295.575 136.8 430.789 150.102 577.262a25 25 0 0 0 27.16 22.636 25 25 0 0 0 22.636-27.16C185.786 417.35 130.641 273.704 45.43 152.895a25 25 0 0 0-22.694-10.489" style="stroke-width:3.77953"/>
-</svg>
diff --git a/img/warning.svg b/img/warning.svg
deleted file mode 100644
index 84bdef2..0000000
--- a/img/warning.svg
+++ /dev/null
@@ -1,3 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" width="600" height="600">
-    <path d="M299.998.809c-19.76 0-39.517 9.78-49.455 29.343L6.713 510.148c-20.416 40.19 10.015 89.87 55.053 89.87H249.95c41.143 0 75.033-33.93 75.033-75.12V487.5a24.986 25.014 0 0 0-24.982-25.012 24.986 25.014 0 0 0-24.988 25.012v37.398c0 14.153-10.926 25.084-25.063 25.084H61.766c-9.864 0-14.977-8.35-10.506-17.152L295.09 52.832c2.735-5.384 7.09-5.384 9.826 0l243.83 479.982c4.472 8.803-.643 17.162-10.508 17.163l-163.24.006A24.986 25.014 0 0 0 350.018 575a24.986 25.014 0 0 0 24.98 25.018l163.24-.014c45.038-.003 75.472-49.68 55.055-89.87L349.455 30.153C339.517 10.59 319.757.81 299.998.81M300 125a25 25 0 0 0-25 25v250a25 25 0 0 0 25 25 25 25 0 0 0 25-25V150a25 25 0 0 0-25-25"/>
-</svg>
diff --git a/js/anchor.js b/js/anchor.js
deleted file mode 100644
index 6bbd854..0000000
--- a/js/anchor.js
+++ /dev/null
@@ -1,13 +0,0 @@
-jQuery(function () {
-    jQuery('#dokuwiki__content.main-content').find('h1,h2,h3,h4,h5').append(function () {
-        if (this.id) {
-            return '<a href="#' + this.id + '" class="anchor">' +
-                '<svg viewBox="0 0 20 20">' +
-                '<path d="m 15.416601,0 c -1.58446,-4.6014118e-8 -2.991809,0.81019022 -3.813281,2.0403646 l -1.89e-4,2.645e-4 -1.6649087,2.4970052 a 0.83333545,0.83333545 0 0 0 0.2313147,1.1557943 0.83333545,0.83333545 0 0 0 1.155534,-0.2310548 l 1.664323,-2.4965493 2.52e-4,-5.166e-4 c 0.523149,-0.7831205 1.408706,-1.298698 2.426953,-1.2986979 1.6207,0 2.916798,1.2960971 2.916798,2.9167968 0,0.6021756 -0.179631,1.154007 -0.489128,1.6171224 l -2.52e-4,2.645e-4 -3.333658,5.0005203 c -0.523149,0.783122 -1.408706,1.298698 -2.426953,1.298698 -1.6207,0 -2.916797,-1.295901 -2.916797,-2.9166011 0,-0.11021 0.0062,-0.2187797 0.017969,-0.3252604 A 0.83333545,0.83333545 0 0 0 8.447859,8.3383588 0.83333545,0.83333545 0 0 0 7.5280673,9.0750775 c -0.018477,0.1671322 -0.02806,0.3368675 -0.02806,0.5083334 0,2.5214361 2.0619628,4.5832031 4.5833987,4.5832031 1.584459,0 2.991809,-0.809929 3.813282,-2.040104 l 2.52e-4,-5.17e-4 3.333203,-4.9994788 C 19.716167,6.3991244 20,5.5202455 20,4.5833984 20,2.0619631 17.938037,9.202824e-8 15.416601,0 Z M 7.9166015,5.8333983 C 6.3321419,5.8333982 4.9247921,6.643328 4.1033203,7.8735025 l -1.89e-4,5.165e-4 -3.33366517,5.000265 C 0.28367569,13.601502 0,14.480069 0,15.416601 0,17.938037 2.0619629,20 4.5833984,20 c 1.58446,0 2.9918085,-0.810191 3.8132812,-2.040364 l 1.889e-4,-2.52e-4 1.6649085,-2.497006 A 0.83333545,0.83333545 0 0 0 9.8304623,14.306584 0.83333545,0.83333545 0 0 0 8.6749285,14.537639 L 7.0103452,17.03471 c -0.5231502,0.783122 -1.4087056,1.298697 -2.4269531,1.298697 -1.6206999,0 -2.9167969,-1.296097 -2.9167969,-2.916797 0,-0.602177 0.1796968,-1.154007 0.4891927,-1.617122 l 2.016e-4,-2.52e-4 3.3334635,-4.9999997 2.646e-4,-5.166e-4 c 0.5231491,-0.7831206 1.4086408,-1.298698 2.426888,-1.2986979 1.6206997,0 2.9168624,1.2959017 2.9168624,2.9166012 0,0.110213 -0.0062,0.21879 -0.01797,0.325261 a 0.83333545,0.83333545 0 0 0 0.736719,0.919791 0.83333545,0.83333545 0 0 0 0.919726,-0.736718 C 12.490419,10.757796 12.5,10.588061 12.5,10.416601 12.5,7.895166 10.438037,5.8333983 7.9166015,5.8333983 Z" />' +
-                '</svg>' +
-                '</a>';
-        } else {
-            return '';
-        }
-    })
-});
diff --git a/js/base/helper.js b/js/base/helper.js
new file mode 100755
index 0000000..170773b
--- /dev/null
+++ b/js/base/helper.js
@@ -0,0 +1,85 @@
+/**
+ * @file helper funcs
+ *
+ */
+
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+// shuffle func for random values
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+Array.prototype.shuffle = function(){
+    var tmp, rand;
+    for(var i =0; i < this.length; i++){
+        rand = Math.floor(Math.random() * this.length);
+        tmp = this[i];
+        this[i] = this[rand];
+        this[rand] =tmp;
+    }
+};
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+// js trim func for ie
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+if(typeof String.prototype.trim !== 'function') {
+    String.prototype.trim = function() {
+        return this.replace(/^\s\s*/, '').replace(/\s\s*$/, '');
+    };
+}
+var linkTo_UnCryptMailto = function(s){
+    location.href=decryptString(s,-2);
+};
+var decryptCharcode = function(n, start, end, offset) {
+    n = n + offset;
+    if (offset > 0 && n > end) {
+        n = start + (n - end - 1);
+    } else if (offset < 0 && n < start) {
+        n = end - (start - n - 1);
+    }
+    return String.fromCharCode(n);
+};
+var decryptString = function(enc, offset) {
+    var dec = '';
+    var len = enc.length;
+    for (var i = 0; i < len; i++) {
+        var n = enc.charCodeAt(i);
+        if (n >= 43 && n <= 58) {
+            dec += decryptCharcode(n, 43, 58, offset);
+        } else if (n >= 64 && n <= 90) {
+            dec += decryptCharcode(n, 64, 90, offset);
+        } else if (n >= 97 && n <= 122) {
+            dec += decryptCharcode(n, 97, 122, offset);
+        } else {
+            dec += enc.charAt(i);
+        }
+    }
+    return dec;
+};
+/**
+ * simplify setting and getting state out of a node
+ * $("#my_id").data("my_data_attr") equals $$("#my_id").my_data_attr and
+ * $("#my_id").data("my_data_attr", "my_data_val") equals $$("#my_id").my_data_attr = my_data_val
+ * you can also do
+ * $$("#my_id").my_data_val = $$("#my_id").my_data_val + 1.
+ */
+var $$ = function(param) {
+    var node = $(param)[0];
+    var id = $.data(node);
+    $.cache[id] = $.cache[id] || {};
+    $.cache[id].node = node;
+    return $.cache[id];
+};
+var alertFB = false;
+if (typeof console === "undefined" || typeof console.log === "undefined") {
+    console = {};
+    if (alertFB) {
+        console.log = function(msg) {
+            alert(msg);
+        };
+    } else {
+        console.log = function() {};
+    }
+}
+
+var wikiLang = "de";
+/**
+ * anonymous func: get page language
+ */
+(function($){ $("html").attr("lang"); if(typeof(l)!= 'undefined' && l.length>=2) wikiLang=l.substr(0,2).toLowerCase(); if(wikiLang!='de'&& wikiLang!='en') wikiLang='de'; })(jQuery);
diff --git a/js/base/rem.min.js b/js/base/rem.min.js
new file mode 100755
index 0000000..7a96d75
--- /dev/null
+++ b/js/base/rem.min.js
@@ -0,0 +1,7 @@
+/**
+ * Module: rem - v1.3.2
+ * Description: A polyfill to parse CSS links and rewrite pixel equivalents into head for non supporting browsers
+ * Date Built: 2014-07-02
+ * Copyright (c) 2014  | Chuck Carpenter <chuck.carpenter@me.com>,Lucas Serven <lserven@gmail.com>;
+**/
+!function(e){"use strict";var t=function(){var e=document.createElement("div");return e.style.cssText="font-size: 1rem;",/rem/.test(e.style.fontSize)},n=function(){for(var e=document.getElementsByTagName("link"),t=[],n=0;n<e.length;n++)"stylesheet"===e[n].rel.toLowerCase()&&null===e[n].getAttribute("data-norem")&&t.push(e[n].href);return t},r=function(){for(var e=0;e<h.length;e++)l(h[e],o)},o=function(e,t){if(p.push(e.responseText),v.push(t),v.length===h.length){for(var n=0;n<v.length;n++)a(p[n],v[n]);(h=m.slice(0)).length>0?(v=[],p=[],m=[],r()):i()}},a=function(e,t){for(var n,r=d(e).replace(/\/\*[\s\S]*?\*\//g,""),o=/[\w\d\s\-\/\\\[\]:,.'"*()<>+~%#^$_=|@]+\{[\w\d\s\-\/\\%#:!;,.'"*()]+\d*\.?\d+rem[\w\d\s\-\/\\%#:!;,.'"*()]*\}/g,a=r.match(o),i=/\d*\.?\d+rem/g,s=r.match(i),c=/(.*\/)/,l=c.exec(t)[0],u=/@import (?:url\()?['"]?([^'\)"]*)['"]?\)?[^;]*/gm;null!==(n=u.exec(e));)m.push(0===n[1].indexOf("/")?n[1]:l+n[1]);null!==a&&0!==a.length&&(f=f.concat(a),g=g.concat(s))},i=function(){for(var e=/[\w\d\s\-\/\\%#:,.'"*()]+\d*\.?\d+rem[\w\d\s\-\/\\%#:!,.'"*()]*[;}]/g,t=0;t<f.length;t++){u+=f[t].substr(0,f[t].indexOf("{")+1);for(var n=f[t].match(e),r=0;r<n.length;r++)u+=n[r],r===n.length-1&&"}"!==u[u.length-1]&&(u+="\n}")}s()},s=function(){for(var e=0;e<g.length;e++)y[e]=Math.round(parseFloat(g[e].substr(0,g[e].length-3)*w))+"px";c()},c=function(){for(var e=0;e<y.length;e++)y[e]&&(u=u.replace(g[e],y[e]));var t=document.createElement("style");t.setAttribute("type","text/css"),t.id="remReplace",document.getElementsByTagName("head")[0].appendChild(t),t.styleSheet?t.styleSheet.cssText=u:t.appendChild(document.createTextNode(u))},l=function(t,n){try{var r=e.ActiveXObject?new ActiveXObject("Microsoft.XMLHTTP")||new ActiveXObject("Msxml2.XMLHTTP"):new XMLHttpRequest;r.open("GET",t,!0),r.onreadystatechange=function(){4===r.readyState&&n(r,t)},r.send(null)}catch(o){if(e.XDomainRequest){var a=new XDomainRequest;a.open("get",t),a.onload=function(){n(a,t)},a.onerror=function(){return!1},a.send()}}},d=function(t){return e.matchMedia||e.msMatchMedia||(t=t.replace(/@media[\s\S]*?\}\s*\}/g,"")),t};if(!t()){var u="",h=n(),m=[],f=[],g=[],p=[],v=[],y=[],w="";w=function(){var e,t=document,n=t.documentElement,r=t.body||t.createElement("body"),o=!t.body,a=t.createElement("div"),i=r.style.fontSize;return o&&n.appendChild(r),a.style.cssText="width:1em; position:absolute; visibility:hidden; padding: 0;",r.style.fontSize="1em",r.appendChild(a),e=a.offsetWidth,o?n.removeChild(r):(r.removeChild(a),r.style.fontSize=i),e}(),r()}}(window);
\ No newline at end of file
diff --git a/js/base/spc.js b/js/base/spc.js
new file mode 100755
index 0000000..a0bc71a
--- /dev/null
+++ b/js/base/spc.js
@@ -0,0 +1,198 @@
+/**
+ * @file utility funcs for jQuery projects
+ *
+ */
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+// object literal with funcs for jquery plug-ins
+// + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+    var spc = {
+    /*general options */
+    config: {
+        debug: false,
+        dev: true
+    },
+    isDef: function(val){
+        return (val===undefined) ? false : true;
+    },
+    /* get options of object */
+    get_options: function(key, options){
+        var result = null;
+        if ('object' == typeof(options)) {
+            result = options[key];
+        }
+        if (!result) { return ""; }
+        return result;
+    },
+    /* set wai aria roles to list of containern */
+    set_wa: function(contlist, ariaattr,ariaval){
+        $(contlist).attr(ariaattr, ariaval);
+    },
+    /* Encode/decode htmlentities */
+    encode_entities: function(s){
+        return $("<acronym/>").text(s).html();
+    },
+    decode_entities: function(s){
+        return $("<acronym/>").html(s).text();
+    },
+    /* add func to load event */
+    add_loadEvent: function(func_name){
+        var lastonload = window.onload;
+        if (typeof window.onload != 'function') { window.onload = func_name; }
+        else { window.onload = function() { lastonload(); func_name(); }; }
+    },
+    /* logging for debug */
+    _debug: function(msg){
+        if(this.config.debug) {
+            try{
+                if(console){
+                    console.log(msg);
+                } else{
+                    alert(msg);
+                }
+            }catch(err){
+                alert(msg);
+            }
+        }
+    },
+    /* return obj values for debug */
+    _get_objVs: function(objl){
+        try{
+            var p = typeof JSON != "undefined" ? JSON.stringify : function(objl){
+                var arr = [];
+                $.each(objl,function(key,val){
+                    var next = key + ": ";
+                    next += $.isPlainObject(val) ? printObj(val) : val;
+                    arr.push( next );
+                });
+                return "{ " + arr.join(", ") + " }";
+            };
+            return p(objl);
+        }catch(err){
+            this._debug(err);
+            return '';
+        }
+    },
+    aria_live: function(setobj){
+        if(typeof(setobj)=='object'){
+            setobj.attr('aria-live',"polite");
+        }
+    },
+    aria_role: function(setobj, role){
+        if(typeof(setobj)=='object'){
+            setobj.attr('role',role);
+        }
+    },
+    change_tabindex: function(remobj,setobj,i){
+        if(typeof(remobj)=='object'){
+            remobj.removeAttr('tabindex');
+        }
+        if(typeof(setobj)=='object'){
+            setobj.attr('tabindex',i);
+        }
+    },
+    /* set focus to dom object: param obj */
+    set_newfocusObj: function(focusobj){
+        try{
+            if(focusobj) focusobj.focus();
+        }catch(err){
+            this._debug('exception: '+err);
+        }
+    },
+    /* set focus to dom object: param id */
+    set_newfocusId: function(fid){
+        try{
+            var focusobj = document.getElementById(fid);
+            if(focusobj) focusobj.focus();
+            if(focusobj) console.log(focusobj);
+        }catch(err){
+            this._debug('exception: '+err);
+        }
+    },
+    /* set focus to nonfocussable dom object:  */
+    set_newfocusBox: function(remobj,setobj){
+        this.change_tabindex(remobj,setobj,0);
+        try{
+            if(setobj) setobj.focus();
+        }catch(err){
+            this._debug('exception: '+err);
+        }
+    },
+    /* set title(s) and remove other title(s) if set */
+    set_title: function(remobj,setobj,ctitle){
+        if(typeof(remobj)=='object'){
+            remobj.removeAttr('title');
+        }
+        if(typeof(setobj)=='object'){
+            setobj.attr('title',ctitle);
+        }
+    },
+    /* count appearances of dom elems with certain markup */
+    count: function(jqdom){
+        var num = 0;
+        $(jqdom).each(function() {
+            num++;
+        });
+        return num;
+    },
+    countOV: function(objlit){
+        var i = 0;
+        for (var elem in objlit){
+            i++;
+        }
+        return i;
+    },
+    /*merge object literals (do not overwrite default, not recursively) */
+    merge: function(objl1,objl2,objl3,objl4){
+        return $.extend({},objl1,objl2,objl3,objl4);
+    },
+    /*merge object literals (do not overwrite default, recursively) */
+    mergeR: function(objl1,objl2,objl3,objl4){
+        return $.extend(true,{},objl1,objl2,objl3,objl4);
+    },
+    loadImage: function(isrc, func, errfunc){
+        try{
+            var img = new Image();
+            img.onload = func;
+            img.onerror = errfunc;
+            img.src = isrc;
+        }catch(err){
+            errfunc();
+        }
+    },
+    tb_getPageSize: function(){
+        var de=document.documentElement;
+        var w=window.innerWidth||self.innerWidth||(de&&de.clientWidth)||document.body.clientWidth;
+        var h=window.innerHeight||self.innerHeight||(de&&de.clientHeight)||document.body.clientHeight;
+        arrayPageSize=[w,h];
+        return arrayPageSize;
+    },
+    useLocStorage: function(){
+        return ('localStorage' in window && window.localStorage !== null);
+    },
+    saveLSI: function(key, data){
+        if (this.useLocStorage) {
+            localStorage.setItem(key, data);
+        }
+    },
+    removeLSI: function(key){
+        if (this.useLocStorage) {
+            localStorage.removeItem(key);
+        }
+    },
+    getLSI: function(key){
+        if (this.useLocStorage) {
+            return localStorage.getItem(key);
+        }
+        return '';
+
+    },
+    showAllLSI: function() {
+        if (this.useLocStorage) {
+            var key = "";
+            for (var i=0; i<=localStorage.length-1; i++) {
+                key = localStorage.key(i);
+                //console.log(key+': '+localStorage.getItem(key));
+            }
+        }
+    }
+};
diff --git a/js/breadcrumb.js b/js/breadcrumb.js
new file mode 100644
index 0000000..510c837
--- /dev/null
+++ b/js/breadcrumb.js
@@ -0,0 +1,18 @@
+/**
+ * Sets up the breadcrumb behaviour (adds do / ACT status information)
+ */
+jQuery(function () {
+    var $breadcrumb = jQuery('.breadcrumbs');
+    if (!$breadcrumb.length) return;
+
+    /**
+     * add ACT status to breadcrumb (if not show)
+     *
+     */
+    var mode = $breadcrumb.attr('data-do');
+    if(mode && mode.indexOf('show') !== 0){
+        var markup = '<bdi lang="en"><span class="curid"> : <strong>' + mode + '</strong></span></bdi>';
+        $breadcrumb.find('p').append(markup);
+    }
+
+});
diff --git a/js/direct.js b/js/direct.js
deleted file mode 100644
index b2e9710..0000000
--- a/js/direct.js
+++ /dev/null
@@ -1,128 +0,0 @@
-
-/**
- * Sets up the behaviour of direct menu links
- *
- * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
- */
-(function($) {
-
-
-    var $body,
-
-        /**
-         * Register the click handler for the direct links
-         * should scroll to the page area whether there is a fixed magic matcher bar or not
-         *
-         * @param $directMenu
-         */
-        scrollingForDirectNav = function($directMenu) {
-            $body = $('body');
-            checkAnchorsOnLoad($directMenu);
-            registerClickForDirectLinks($directMenu);
-
-        },
-
-        /**
-         * register click event listener for direct links
-         * @param $menu
-         */
-        registerClickForDirectLinks = function($menu) {
-            $menu.find('a').on('click', function (e) {
-                e.stopPropagation();
-                var target = $(this).attr('href');
-                tasksBeforeScrolling(target);
-                scrollToTarget(target);
-            });
-        },
-
-        /**
-         * scroll to / set focus to target of direct link if value of location hash equals direct link
-         * @param $menu
-         */
-        checkAnchorsOnLoad = function($menu) {
-            var hash = window.location.hash;
-            if (hash) {
-                $menu.find('a').each(function() {
-                    var target = $(this).attr('href');
-                    if(hash === target) {
-                        tasksBeforeScrolling(target);
-                        scrollToTarget(target);
-                        setFocusOnLoad(target);
-                    }
-                });
-            }
-        },
-
-        /**
-         * todos that needs to be done before the scrolling can start
-         * @param target
-         */
-        tasksBeforeScrolling = function(target) {
-            switch (target) {
-                case '#qsearch__in':
-                    showSearchField(target);
-                    break;
-
-                case '#dokuwiki__usertools':
-                    $(target).find('li:first-child').find('a').focus();
-                    break;
-
-            }
-        },
-
-        /**
-         * set focus on target or first link found in target
-         * @param target
-         */
-        setFocusOnLoad = function(target) {
-            var $target = $(target);
-            switch (target) {
-
-                case '#qsearch__in':
-                case '#spr__toggle-content':
-                    $target.focus();
-                    break;
-
-                case '#dokuwiki__usertools':
-                    break;
-
-                default:
-                    $target.attr('tabindex',0);
-                    $target.focus();
-
-            }
-        },
-
-        /**
-         * trigger content toggle link to make the search field visible otherwise it neither be used for scrolling nor
-         * for focus setting
-         * @param target
-         */
-        showSearchField = function(target) {
-            if($body.hasClass('wide-content')) {
-                $('#spr__toggle-content').trigger('click');
-            }
-        },
-
-        /**
-         * scrolls to the target with an offset of 60px
-         * @param target
-         */
-        scrollToTarget = function(target) {
-            // scroll to each target
-            $('html, body').animate({
-                scrollTop: (target.offset().top - 60)
-            }, 400);
-        };
-
-
-    $(function(){
-
-        var $directMenu = $('#spr__direct');
-        if (!$directMenu.length) return;
-
-        scrollingForDirectNav($directMenu);
-    });
-
-
-})(jQuery);
diff --git a/js/legacy/html5shiv.js b/js/legacy/html5shiv.js
new file mode 100755
index 0000000..448cebd
--- /dev/null
+++ b/js/legacy/html5shiv.js
@@ -0,0 +1,8 @@
+/*
+ HTML5 Shiv v3.7.0 | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
+*/
+(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
+a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/[\w\-]+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,dialog,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}template{display:none}</style>";
+c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="<xyz></xyz>";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode||
+"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details dialog figcaption figure footer header hgroup main mark meter nav output progress section summary template time video",version:"3.7.0",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);
+if(g)return a.createDocumentFragment();for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
diff --git a/js/legacy/respond.min.js b/js/legacy/respond.min.js
new file mode 100755
index 0000000..80a7b69
--- /dev/null
+++ b/js/legacy/respond.min.js
@@ -0,0 +1,5 @@
+/*! Respond.js v1.4.2: min/max-width media query polyfill * Copyright 2013 Scott Jehl
+ * Licensed under https://github.com/scottjehl/Respond/blob/master/LICENSE-MIT
+ *  */
+
+!function(a){"use strict";a.matchMedia=a.matchMedia||function(a){var b,c=a.documentElement,d=c.firstElementChild||c.firstChild,e=a.createElement("body"),f=a.createElement("div");return f.id="mq-test-1",f.style.cssText="position:absolute;top:-100em",e.style.background="none",e.appendChild(f),function(a){return f.innerHTML='&shy;<style media="'+a+'"> #mq-test-1 { width: 42px; }</style>',c.insertBefore(e,d),b=42===f.offsetWidth,c.removeChild(e),{matches:b,media:a}}}(a.document)}(this),function(a){"use strict";function b(){u(!0)}var c={};a.respond=c,c.update=function(){};var d=[],e=function(){var b=!1;try{b=new a.XMLHttpRequest}catch(c){b=new a.ActiveXObject("Microsoft.XMLHTTP")}return function(){return b}}(),f=function(a,b){var c=e();c&&(c.open("GET",a,!0),c.onreadystatechange=function(){4!==c.readyState||200!==c.status&&304!==c.status||b(c.responseText)},4!==c.readyState&&c.send(null))};if(c.ajax=f,c.queue=d,c.regex={media:/@media[^\{]+\{([^\{\}]*\{[^\}\{]*\})+/gi,keyframes:/@(?:\-(?:o|moz|webkit)\-)?keyframes[^\{]+\{(?:[^\{\}]*\{[^\}\{]*\})+[^\}]*\}/gi,urls:/(url\()['"]?([^\/\)'"][^:\)'"]+)['"]?(\))/g,findStyles:/@media *([^\{]+)\{([\S\s]+?)$/,only:/(only\s+)?([a-zA-Z]+)\s?/,minw:/\([\s]*min\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/,maxw:/\([\s]*max\-width\s*:[\s]*([\s]*[0-9\.]+)(px|em)[\s]*\)/},c.mediaQueriesSupported=a.matchMedia&&null!==a.matchMedia("only all")&&a.matchMedia("only all").matches,!c.mediaQueriesSupported){var g,h,i,j=a.document,k=j.documentElement,l=[],m=[],n=[],o={},p=30,q=j.getElementsByTagName("head")[0]||k,r=j.getElementsByTagName("base")[0],s=q.getElementsByTagName("link"),t=function(){var a,b=j.createElement("div"),c=j.body,d=k.style.fontSize,e=c&&c.style.fontSize,f=!1;return b.style.cssText="position:absolute;font-size:1em;width:1em",c||(c=f=j.createElement("body"),c.style.background="none"),k.style.fontSize="100%",c.style.fontSize="100%",c.appendChild(b),f&&k.insertBefore(c,k.firstChild),a=b.offsetWidth,f?k.removeChild(c):c.removeChild(b),k.style.fontSize=d,e&&(c.style.fontSize=e),a=i=parseFloat(a)},u=function(b){var c="clientWidth",d=k[c],e="CSS1Compat"===j.compatMode&&d||j.body[c]||d,f={},o=s[s.length-1],r=(new Date).getTime();if(b&&g&&p>r-g)return a.clearTimeout(h),h=a.setTimeout(u,p),void 0;g=r;for(var v in l)if(l.hasOwnProperty(v)){var w=l[v],x=w.minw,y=w.maxw,z=null===x,A=null===y,B="em";x&&(x=parseFloat(x)*(x.indexOf(B)>-1?i||t():1)),y&&(y=parseFloat(y)*(y.indexOf(B)>-1?i||t():1)),w.hasquery&&(z&&A||!(z||e>=x)||!(A||y>=e))||(f[w.media]||(f[w.media]=[]),f[w.media].push(m[w.rules]))}for(var C in n)n.hasOwnProperty(C)&&n[C]&&n[C].parentNode===q&&q.removeChild(n[C]);n.length=0;for(var D in f)if(f.hasOwnProperty(D)){var E=j.createElement("style"),F=f[D].join("\n");E.type="text/css",E.media=D,q.insertBefore(E,o.nextSibling),E.styleSheet?E.styleSheet.cssText=F:E.appendChild(j.createTextNode(F)),n.push(E)}},v=function(a,b,d){var e=a.replace(c.regex.keyframes,"").match(c.regex.media),f=e&&e.length||0;b=b.substring(0,b.lastIndexOf("/"));var g=function(a){return a.replace(c.regex.urls,"$1"+b+"$2$3")},h=!f&&d;b.length&&(b+="/"),h&&(f=1);for(var i=0;f>i;i++){var j,k,n,o;h?(j=d,m.push(g(a))):(j=e[i].match(c.regex.findStyles)&&RegExp.$1,m.push(RegExp.$2&&g(RegExp.$2))),n=j.split(","),o=n.length;for(var p=0;o>p;p++)k=n[p],l.push({media:k.split("(")[0].match(c.regex.only)&&RegExp.$2||"all",rules:m.length-1,hasquery:k.indexOf("(")>-1,minw:k.match(c.regex.minw)&&parseFloat(RegExp.$1)+(RegExp.$2||""),maxw:k.match(c.regex.maxw)&&parseFloat(RegExp.$1)+(RegExp.$2||"")})}u()},w=function(){if(d.length){var b=d.shift();f(b.href,function(c){v(c,b.href,b.media),o[b.href]=!0,a.setTimeout(function(){w()},0)})}},x=function(){for(var b=0;b<s.length;b++){var c=s[b],e=c.href,f=c.media,g=c.rel&&"stylesheet"===c.rel.toLowerCase();e&&g&&!o[e]&&(c.styleSheet&&c.styleSheet.rawCssText?(v(c.styleSheet.rawCssText,e,f),o[e]=!0):(!/^([a-zA-Z:]*\/\/)/.test(e)&&!r||e.replace(RegExp.$1,"").split("/")[0]===a.location.host)&&("//"===e.substring(0,2)&&(e=a.location.protocol+e),d.push({href:e,media:f})))}w()};x(),c.update=x,c.getEmValue=t,a.addEventListener?a.addEventListener("resize",b,!1):a.attachEvent&&a.attachEvent("onresize",b)}}(this);
\ No newline at end of file
diff --git a/js/meta-box.js b/js/meta-box.js
index 5cd4cb1..1b540cf 100755
--- a/js/meta-box.js
+++ b/js/meta-box.js
@@ -1,12 +1,6 @@
-
-/**
- * Sets up the behaviour of the meta box
- *
- * @author Andreas Gohr <gohr@cosmocode.de>
- * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
- */
-(function($) {
-
+jQuery(function () {
+    var $metaBox = jQuery('#spr__meta-box');
+    if (!$metaBox.length) return;
 
     /**
      * Register the click handler for the tabs
@@ -14,78 +8,32 @@
      * Tabs can be added dynamically later on and this handler will still
      * provide the open/close functionality
      */
-    var registerClickForTabsInMetaBox = function($metaBox) {
+    $metaBox.on('click', '.meta-tabs a', function (e) {
+        e.preventDefault();
+        var $tab = jQuery(this),
+            isopen = $tab.attr('aria-expanded') === 'true';
 
-            $metaBox.on('click', '.meta-tabs a', function (e) {
-                e.preventDefault();
-                var $tab = $(this),
-                    isopen = $tab.attr('aria-expanded') === 'true';
+        // disable all existing tabs
+        $metaBox.find('.meta-tabs li')
+            .removeClass('active')
+            .find('a')
+            .attr('aria-expanded', 'false');
+        $metaBox.find('.meta-content .tab-pane')
+            .removeClass('active')
+            .attr('aria-hidden', 'false');
 
-                // disable all existing tabs
-                disableExistingTabs($metaBox);
+        if (isopen) return; // tab was open, we closed it. we're done
 
+        // enable current tab
+        $tab
+            .attr('aria-expanded', 'true')
+            .closest('li')
+            .addClass('active');
+        $metaBox.find($tab.attr('href'))
+            .addClass('active')
+            .attr('aria-hidden', 'false');
 
-                if (isopen) return; // tab was open, we closed it. we're done
-
-                // enable current tab
-                $tab
-                    .attr('aria-expanded', 'true')
-                    .closest('li')
-                    .addClass('active');
-                $metaBox.find($tab.attr('href'))
-                    .addClass('active')
-                    .attr('aria-hidden', 'false');
-
-            }).find('.meta-content').on('click', 'a[href*="#"]', function (e) {
-                disableExistingTabs($metaBox);
-                /* uses custome event handler hide see spc.js */
-            }).find('#tagging__edit').on('hide', function(e){
-                disableExistingTabs($metaBox);
-            });
-
-            /**
-             * in admin templates show toc tab, if available
-             */
-            if($('body').hasClass('do-admin')) {
-                var $tocLink = $metaBox.find('a[href="#spr__tab-toc"]');
-                if($tocLink.length === 1) {
-                    $tocLink.trigger('click');
-                }
-            }
-        },
-        disableExistingTabs = function($metaBox) {
-            $metaBox.find('.meta-tabs li')
-                .removeClass('active')
-                .find('a')
-                .attr('aria-expanded', 'false');
-            $metaBox.find('.meta-content .tab-pane')
-                .removeClass('active')
-                .attr('aria-hidden', 'false');
-        };
-
-
-    var stickyBox = function ($metaBox, topOffset, leftOffset) {
-        if (window.pageYOffset >= topOffset) {
-            $metaBox.addClass("sticky").attr("style", "left: " + leftOffset + "px");
-        } else {
-            $metaBox.removeClass("sticky").removeAttr("style");
-        }
-    };
-
-
-    $(function(){
-        var $metaBox = $('#spr__meta-box');
-        if (!$metaBox.length) return;
-
-        registerClickForTabsInMetaBox($metaBox);
-
-        var topOffset = $metaBox.offset().top;
-        window.onscroll = function () {
-            // check while scrolling, or window resizing will break horizontal positioning
-            var leftOffset = $metaBox.offset().left;
-            stickyBox($metaBox, topOffset, leftOffset)
-        };
     });
 
 
-})(jQuery);
+});
diff --git a/js/plugins/bookcreator.js b/js/plugins/bookcreator.js
deleted file mode 100644
index 10ca372..0000000
--- a/js/plugins/bookcreator.js
+++ /dev/null
@@ -1,26 +0,0 @@
-/**
- * prevents Uncaught TypeError in detail template if bookcreator plug-in is installed
- *
- * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
- *
- */
-(function($) {
-
-
-    var debugBookCreatorOnDetailTemplate = function(){
-
-        var $detail = $('#dokuwiki__detail');
-        if (!$detail.length) return;
-
-        if(JSINFO.bookcreator === undefined) {
-            JSINFO.bookcreator = {};
-            JSINFO.bookcreator.areToolsVisible = false;
-        }
-    };
-
-    $(function(){
-        debugBookCreatorOnDetailTemplate();
-    });
-
-
-})(jQuery);
diff --git a/js/plugins/do_tasks.js b/js/plugins/do_tasks.js
index 1ff8717..78a8f34 100755
--- a/js/plugins/do_tasks.js
+++ b/js/plugins/do_tasks.js
@@ -1,49 +1,47 @@
-// FIXME figure out what this did and why
+( function( $, spc ) {
+
+    var togglePageAnalysis = function(){
+            var $this = $('.page-attributes').find('.plugin__qc');
+            try{
+                var $link = $this.find('#plugin__qc__link'),
+                    $container = $this.find('#plugin__qc__wrapper');
+
+                if($container.length < 1){
+                    $this.remove();
+                }else{
+                    $container.attr('aria-hidden','true');
+                    var $icon = $container.find('#plugin__qc__icon');
+                    $container.find('#plugin__qc__out').removeAttr('style');
+                    $link.on( 'click', function(e){
+                        e.preventDefault();
+                        $icon.trigger('click');
+                        var oldState = ($link.attr('aria-expanded')=== "true" );
+                        $container.attr('aria-hidden',oldState);
+                        $(this).attr('aria-expanded',!oldState);
+
+                    });
+
+                    if($container.length > 0){
+                        var num = $container.attr('data-errors');
+                        if(num){
+                            $link.find('.num').empty().append(num);
+                            $link.closest('li').removeClass('do_none');
+                        }
+                    }
+
+                }
+
+            }catch(err){
+                $this.remove();
+            }
+    };
+
+    $(function(){
+        togglePageAnalysis();
+    });
+
+} )( jQuery, spc );
+
+
+
 
-// ( function( $, spc ) {
-//
-//     var togglePageAnalysis = function(){
-//             var $this = $('.page-attributes').find('.plugin__qc');
-//             try{
-//                 var $link = $this.find('#plugin__qc__link'),
-//                     $container = $this.find('#plugin__qc__wrapper');
-//
-//                 if($container.length < 1){
-//                     $this.remove();
-//                 }else{
-//                     $container.attr('aria-hidden','true');
-//                     var $icon = $container.find('#plugin__qc__icon');
-//                     $container.find('#plugin__qc__out').removeAttr('style');
-//                     $link.on( 'click', function(e){
-//                         e.preventDefault();
-//                         $icon.trigger('click');
-//                         var oldState = ($link.attr('aria-expanded')=== "true" );
-//                         $container.attr('aria-hidden',oldState);
-//                         $(this).attr('aria-expanded',!oldState);
-//
-//                     });
-//
-//                     if($container.length > 0){
-//                         var num = $container.attr('data-errors');
-//                         if(num){
-//                             $link.find('.num').empty().append(num);
-//                             $link.closest('li').removeClass('do_none');
-//                         }
-//                     }
-//
-//                 }
-//
-//             }catch(err){
-//                 $this.remove();
-//             }
-//     };
-//
-//     $(function(){
-//         togglePageAnalysis();
-//     });
-//
-// } )( jQuery, spc );
-//
-//
-//
-//
diff --git a/js/plugins/folded.js b/js/plugins/folded.js
deleted file mode 100644
index 9540842..0000000
--- a/js/plugins/folded.js
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * prevents Uncaught TypeError in detail template if folded plug-in is installed
- *
- * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
- *
- */
-(function($) {
-
-
-    var debugFoldedOnDetailTemplate = function(){
-
-        var $detail = $('#dokuwiki__detail');
-        if (!$detail.length) return;
-
-        if(JSINFO.plugin_folded === undefined) {
-            JSINFO.plugin_folded = {};
-            JSINFO.plugin_folded.reveal = '';
-            JSINFO.plugin_folded.hide = '';
-        }
-    };
-
-    $(function(){
-        debugFoldedOnDetailTemplate();
-    });
-
-
-})(jQuery);
diff --git a/js/plugins/qc.js b/js/plugins/qc.js
deleted file mode 100644
index 4d768f1..0000000
--- a/js/plugins/qc.js
+++ /dev/null
@@ -1,40 +0,0 @@
-/**
- * Add custom QC functionality instead of using the plugin's mechanism
- *
- * @author Andreas Gohr <gohr@cosmocode.de>
- * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
- */
-jQuery(function () {
-    var $panel = jQuery('div.qc-output').hide();
-
-    // load summary
-    jQuery('.page-attributes .plugin_qc a').load(
-        DOKU_BASE + 'lib/exe/ajax.php',
-        {
-            call: 'plugin_qc_short',
-            id: JSINFO['id']
-        },
-        function () {
-            jQuery(this).find('span span').addClass('num');
-        }
-    ).click(function (e) {
-        e.preventDefault();
-
-        if ($panel.html() == '') {
-            // load output
-            $panel.load(
-                DOKU_BASE + 'lib/exe/ajax.php',
-                {
-                    call: 'plugin_qc_long',
-                    id: JSINFO['id']
-                },
-                function () {
-                    $panel.dw_show();
-                }
-            );
-        } else {
-            $panel.dw_toggle();
-        }
-    });
-
-});
diff --git a/js/sidebar.js b/js/sidebar.js
index 86036f6..c7d1104 100644
--- a/js/sidebar.js
+++ b/js/sidebar.js
@@ -1,42 +1,16 @@
 /**
  * Sets up the sidebar behaviour
- *
- *  @author Andreas Gohr <gohr@cosmocode.de>
- *  @author Michael Große <gohr@cosmocode.de>
- *  @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 jQuery(function () {
     var $nav = jQuery('#dokuwiki__aside');
     if (!$nav.length) return;
 
-    // id of the current sidebar, used to differentiate states
-    var sidebarId = '';
-    var divId = jQuery('#sidebarId');
-    if (typeof divId !== 'undefined') {
-        sidebarId = divId.attr('class').split(' ')[0];
-    }
-
         /**
          * closes sidebar
          */
     var setWideContent = function () {
             $nav.find('div.nav-panel').hide(); // close all panels
             jQuery('body').addClass('wide-content');
-            removeToggleStorage();
-            window.sessionStorage.setItem('wide-content', true);
-        },
-
-        /**
-         * removes information about the toggle-state
-         */
-        removeToggleStorage = function () {
-            for (var index=0; index <= window.sessionStorage.length; index += 1) {
-                var item = window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + index + '-open');
-                if (!item) {
-                    continue;
-                }
-                window.sessionStorage.setItem('sidebar-section-' + sidebarId + '-' + index + '-open', 'false');
-            }
         },
 
         /**
@@ -44,7 +18,7 @@ jQuery(function () {
          */
         setDefaultContent = function () {
             jQuery('body').removeClass('wide-content');
-            window.sessionStorage.setItem('wide-content', false);
+
         },
 
         /**
@@ -56,17 +30,13 @@ jQuery(function () {
             $elem.find('a').first().focus();
         },
 
-        removeOpenStates = function() {
-            $nav.find('.is-open').removeClass('is-open');
-        },
-
         /**
          * Toggle a navigation panel
          *
-         * @param {jQuery} $toggler The a toggler
+         * @param {jQuery} $toggler The h6 toggler
          */
          toggleNav = function ($toggler) {
-            var $panel = $toggler.parent().next('div.nav-panel');
+            var $panel = $toggler.next('div.nav-panel');
             var isOpen = $panel.is(':visible');
             // open sidebar on interaction
             setDefaultContent();
@@ -74,12 +44,8 @@ jQuery(function () {
             $panel.dw_toggle(!isOpen, function () {
                 if (!isOpen) {
                     focusFirstSubLink($panel);
-                    $toggler.addClass('is-open');
-                } else {
-                    $toggler.removeClass('is-open');
                 }
             });
-            window.sessionStorage.setItem('sidebar-section-' + sidebarId + '-' + $toggler.data('index') + '-open', !isOpen);
         },
 
         /**
@@ -91,13 +57,9 @@ jQuery(function () {
             var $main = $nav.find('nav.nav-main');
             if (!$main.length) return;
 
-            if(jQuery('body').hasClass('wide-content')) {
-                removeToggleStorage();
-            }
-
-            var ELEMENT = JSINFO.template.sprintdoc.sidebar_toggle_elements;
+            var ELEMENT = 'h1,h2,h3,h4,h5'; // FIXME move to config
             var $elements = $main.find(ELEMENT);
-            $elements.each(function (index) {
+            $elements.each(function () {
                 var $me = jQuery(this),
 
                 // prepare text and the optional icon
@@ -114,92 +76,41 @@ jQuery(function () {
 
                 // make the new toggler
                 var $toggler = jQuery('<a>')
+                        .addClass('nav')
                         .attr('href', '#')
                         .attr('role', 'heading')
                         .attr('aria-level', '2')
                         .text(text)
                         .wrapInner('<span class="lbl">')
                         .prepend($icon)
-                        .data('index', index)
                     ;
-                $toggler = jQuery('<div class="nav">').prepend($toggler);
 
                 // wrap all following siblings til the next element in a wrapper
                 var $wrap = jQuery('<div>')
                     .addClass('nav-panel');
                 var $sibs = $me.nextAll();
-
                 for (var i = 0; i < $sibs.length; i++) {
                     var $sib = jQuery($sibs[i]);
                     if ($sib.is(ELEMENT)) break;
                     $sib.detach().appendTo($wrap);
-                    addContentMenuCurrentStates($sib, $toggler);
-                }
-
-                /*
-                 * if there is only one subitem with a link, disable toggling
-                 * and use a direct link.
-                 */
-                var $links = jQuery($wrap[0]).find('a');
-                if ($links.length === 1 && $links.first().attr('href') !== '#') {
-                    $toggler.children().first().attr('href', jQuery($links[0]).attr('href'));
-                } else {
-                    $wrap.insertAfter($me);
-
-                    if ($toggler.parent('li').length) {
-                        $toggler.parent('li').addClass('toggler');
-                    }
-
-                    if (window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + index + '-open') === 'true') {
-                        $wrap.css('display', 'block');
-                        setTogglerClass($toggler,'is-open');
-                    }
                 }
+                $wrap.insertAfter($me);
 
                 // replace element with toggler
                 $me.replaceWith($toggler);
             });
-
-            // fade in the navigation (was hidden until now
-            $main.css({opacity: 0, visibility: "visible"}).animate({opacity: 1}, 200);
         },
 
         /**
          * Initialize the open/close toggling of menu entries
          */
         initMenuHandling = function () {
-            $nav.on('click', 'div.nav a', function (e) {
-                if (jQuery(this).attr('href').startsWith('#')) {
-                    toggleNav(jQuery(this));
-                    e.preventDefault();
-                }
+            $nav.on('click', 'a.nav', function (e) {
+                toggleNav(jQuery(this));
+                e.preventDefault();
             });
         },
 
-        /**
-         * adds a given class to the toggler link
-         * @param $toggler link or parent of link to whom the class is added
-         * @param classVal class to be added
-         */
-        setTogglerClass = function ($toggler, classVal) {
-            if($toggler.is('a')) {
-                $toggler.addClass(classVal);
-            } else {
-                $toggler.find('a').addClass(classVal);
-            }
-        },
-
-        /**
-         * marks a $toggler link as active if the following menu has an active state
-         * @param $menuObj jQuery Object of the menu / container
-         * @param $toggler
-         */
-        addContentMenuCurrentStates = function ($menuObj, $toggler) {
-            if($menuObj[0] && String($menuObj[0].innerHTML).indexOf('curid') > 0) {
-                setTogglerClass($toggler,'is-active');
-            }
-        },
-
         /**
          * Make sure the content area is always as high as the sidebar
          */
@@ -224,13 +135,8 @@ jQuery(function () {
                     setDefaultContent();
                 } else {
                     setWideContent();
-                    removeOpenStates();
                 }
             });
-
-            if (window.sessionStorage.getItem('wide-content') === 'true') {
-                setWideContent();
-            }
         },
 
         /**
@@ -254,79 +160,11 @@ jQuery(function () {
                 var $body = jQuery('body');
                 $body.toggleClass('show-mobile-sidebar');
             });
-        },
-
-        /**
-         * set is-active class if body has at least one of the given selectors
-         * @param selectorArray Array of selectors
-         * @param $nav container in which the $toggler is situated
-         */
-        setActive = function(selectorArray, $nav) {
-            for(var i=0; i< selectorArray.length; i++) {
-                var mode = selectorArray[i];
-                if(jQuery('body').is('.do-'+mode)){
-                    setTogglerClass($nav.find('.nav'),'is-active');
-                    $nav.find('a[href*="do='+mode+'"]').wrapAll('<span class="curid"></span>');
-                }
-            }
-        },
-
-        /**
-         * sets active states in site tool menu and user tool menu for certain modes
-         * adds sessionStorage behaviour equivalent approach to content menus
-         *
-         */
-        initTemplateMenues = function () {
-            var $body = jQuery('body'),
-                $siteTools = $nav.find('> .nav-sitetools'),
-                $userTools = $nav.find('> .nav-usermenu'),
-                $templateMenus = $nav.find('> nav:not(.nav-main)'),
-
-                stModes = ['recent', 'media', 'index'],
-                utModes = ['profile','admin'],
-                isWideContent = false;
-
-            /* set active states for site tool menu and user tool menu */
-            setActive(stModes,$siteTools);
-            setActive(utModes,$userTools);
-
-            if($body.is('.do-show') && $body.is('.wide-content')) {
-                window.sessionStorage.setItem('wide-content', true);
-                isWideContent = true;
-            }
-
-
-
-            /* set data attributes for sessionStorage and check onload if one of the template menus should be opened */
-            $templateMenus.each(function( index ) {
-                var $t = jQuery(this).find('.nav'),
-                    y = $nav.find('.nav-main').find('.nav').length,
-                    $toggler = ($t.is('a')) ? $t : $t.find('a:last'),
-                    tIndex = y + index;
-                $toggler.data('index', tIndex);
-
-                var item = window.sessionStorage.getItem('sidebar-section-' + sidebarId + '-' + tIndex + '-open');
-                if (item) {
-                    if(isWideContent) {
-                        window.sessionStorage.setItem('sidebar-section-' + sidebarId + '-' + tIndex + '-open', 'false');
-                    } else {
-                        if (item === 'true') {
-                            jQuery(this).find('.nav-panel').css('display', 'block');
-                            setTogglerClass($toggler, 'is-open');
-                        }
-                    }
-                }
-                //console.log(window.sessionStorage);
-
-            });
-
         };
 
-
     // main
     initContentNav();
     initSidebarToggling();
-    initTemplateMenues();
     initMenuHandling();
     initContentMinHeight();
     initSearchToggling();
diff --git a/lang/cs/lang.php b/lang/cs/lang.php
deleted file mode 100755
index acf9ac9..0000000
--- a/lang/cs/lang.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * English language file for template
- *
- *  @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-
-$lang['direct_prefix']              = 'jdi na';
-$lang['direct_content_main']        = 'Hlavní Obsah';
-$lang['direct_quick_search']        = 'Hledat';
-$lang['direct_content_toggle']      = 'Změnit šířku obsahu';
-
-$lang['adjunct_linked_logo_text']   = ' - hlavní stránka';
-$lang['a11y_sidebartoggle']         = 'Zobrazit/Skrýt Navigaci';
-
-$lang['nav-area-head']              = 'Menu a rychlé hledání';
-$lang['head_magic_matcher']         = 'MagicMatcher';
-$lang['head_quick_search']          = 'rychlé hledání';
-$lang['head_menu_status']           = 'stav stránky';
-$lang['head_breadcrumb_youarehere'] = 'jsi zde';
-$lang['head_menu_trace']            = 'Poslední navštívené stránky';
-$lang['head_meta_box']              = 'meta data stránky';
-$lang['head_menu_starred']          = 'Starred Pages';
-$lang['head_menu_tool-select']      = 'Nástroje';
-
-$lang['jump_to_quicksearch']        = 'Jdi na rychlé hledání';
-
-/** it will be shown from plugin lang.php:
-$lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none';
-$lang['meta_box_tags_none']         = 'tags found: none';
-$lang['js']['meta_box_toc_none']    = 'no Table of Contents available';
-$lang['prefix_tasks_user']          = 'Your open tasks: ';
-*/
-
-$lang['tab_tags']                   = 'Značky';
-$lang['tab_issues']                 = 'Problémy';
-
-$lang['quality_trigger']            = 'Zobrazit/skrýt analýzu stránky';
-
-$lang['prefix_tasks_page']          = 'otevřít úkoly na této stránce: ';
-
-$lang['tasks_page_none']            = 'žádné úkoly na ťéto stránce';
-$lang['tasks_page_intime']          = 'otevřít úkoly na této stránce: %1$d';
-$lang['tasks_page_late']            = 'otevřít úkly na této stránce: %1$d, až po: %2$d';
-
-/** is not used
-$lang['discussion']                 = 'Diskuze';
-$lang['back_to_article']            = 'Zpět na článek';
-$lang['userpage']                   = 'Uživatelská stránka';
-*/
-
-$lang['meta_data']                  = 'Meta Data';
-$lang['osm_zoom_link_text']         = 'zobrazit větší mapu';
-$lang['osm_zoom_link_title']        = 'externí odkazy otevřít v novém okně';
-
-$lang['image_detail']               = 'Detaily obrázku';
-
-$lang['mode_edit']                  = 'Editovat stránku';
-
-
-$lang['nav_sidebar']                = 'Navigace';
-$lang['nav_sitemap']                = 'Struktura stránky';
-
-/**
- * preferences colors
- */
-
-$lang['__site_width__']             = 'content - width (in %)';
-
-$lang['__background_site__']        = 'website - background color';
-$lang['__text_webframe__']          = 'claim, title, footer (unlinked), navigation (unlinked) - font color';
-
-$lang['__nav_menu_color__']         = 'navigation (link), footer (link), pagetools icons, tabbox - font color';
-$lang['__nav_menu_hover_color__']   = 'navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color';
-$lang['__nav_menu_hover_bg__']      = 'navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - font color';
-
-$lang['__background__']             = '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, table cell (hover), struct Label (hover) - background color (alternative)';
-$lang['__text_alt__']               = 'table head: unlinked, table cell (hover), struct Label (hover) - font color (alternative)';
-$lang['__link_alt__']               = 'table head: linked - 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/lang/cs/settings.php b/lang/cs/settings.php
deleted file mode 100755
index adc7401..0000000
--- a/lang/cs/settings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Czech language file for config
- */
-
-
-$lang['sidebar_sections']   = 'Automaticky přepínat postranní panel do sekcí na těchto prvcích:';
-$lang['sidebar_sections_o_h1']   = '!. nadpis v pořadí';
-$lang['sidebar_sections_o_h1,h2']   = '1. a 2. nadpisy v pořadí';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5']   = 'Všechny nadpisy';
-$lang['sidebar_sections_o_li.level1 > .li']   = 'První položka v seznamu';
-
-$lang['header_layout']   = 'Nastavit rozvrže`ní záhlaví:';
-$lang['header_layout_o_default']   = 'široké záhlaví s dlouhým nadpisem a sloganem';
-$lang['header_layout_o_compact']   = 'kompaktní záhlaví s krátkým nadpisem a skrytým sloganem';
-
diff --git a/lang/cs/style.txt b/lang/cs/style.txt
deleted file mode 100755
index 8e132de..0000000
--- a/lang/cs/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-Pokud chcete zménit //favicon//, jednoduše použijte Správu médií pro nahrátí ''favicon.ico'' do prostoru ''wiki'' nebo ''root''. Potom bude ikona automaticky použita. Pokud máte neveřejnou wiki, je doporučené nastavit prostor ''wiki'' (nebo root) čitelný pro všechny, jinak favicon nebude zobrazena nepřihlášeným uživatelům.
diff --git a/lang/de-informal/lang.php b/lang/de-informal/lang.php
deleted file mode 100755
index c39687d..0000000
--- a/lang/de-informal/lang.php
+++ /dev/null
@@ -1,107 +0,0 @@
-<?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_quick_search']        = 'Schnellsuche';
-$lang['direct_content_toggle']      = 'Breite des Contents ändern';
-
-$lang['adjunct_linked_logo_text']   = ' - Link zur Startseite';
-$lang['a11y_sidebartoggle']         = 'Navigation anzeigen/verbergen';
-
-$lang['nav-area-head']              = 'Navigationsmenüs und Suche';
-$lang['head_magic_matcher']         = 'MagicMatcher';
-$lang['head_quick_search']          = 'Wikiübergreifende Schnellsuche';
-$lang['head_menu_status']           = 'Seitenstatus';
-$lang['head_breadcrumb_youarehere'] = 'Standortanzeiger';
-$lang['head_menu_trace']            = 'Zuletzt Angesehen';
-$lang['head_meta_box']              = 'Metainformationen zur Seite';
-$lang['head_menu_starred']          = 'Gemerkte Seiten';
-$lang['head_menu_tool-select']      = 'Werkzeuge';
-
-$lang['jump_to_quicksearch']        = 'Springe zur Schnellsuche';
-
-/** it will be shown from plugin lang.php:
-$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['prefix_tasks_user']          = 'Ihre offenen Aufgaben: ';
-*/
-
-$lang['custom_modeswitch']          = 'Lichtschalter';
-
-$lang['tab_tags']                   = 'Tags';
-$lang['tab_issues']                 = 'Issues';
-
-$lang['quality_trigger']            = 'Seitenanalyse anzeigen/verbergen';
-
-$lang['prefix_tasks_page']          = 'offene Aufgaben auf dieser Seite: ';
-
-$lang['tasks_page_none']            = 'keine offenen Aufgaben für diese Seite';
-$lang['tasks_page_intime']          = 'offenen Aufgaben für diese Seite: %1$d';
-$lang['tasks_page_late']            = 'offenen Aufgaben für diese Seite: %1$d, zu spät: %2$d';
-
-/** is not used
-$lang['discussion']                 = 'xxx Diskussion';
-$lang['back_to_article']            = 'xxx Zurück zum Artikel';
-$lang['userpage']                   = 'xxx Benutzer-Seite';
- */
-
-$lang['meta_data']                  = 'Meta Daten des Bildes'; /** wird aufgerufen aber nicht ausgegeben - Fehler? */
-$lang['osm_zoom_link_text']         = 'größere Karte anzeigen';
-$lang['osm_zoom_link_title']        = 'externer Link - öffnet in neuem Fenster'; /** in streetmaps - konnte ich nicht finden */
-
-$lang['image_detail']               = 'Detailinformationen zum Bild';
-
-$lang['mode_edit']                  = 'Seite bearbeiten';
-
-
-$lang['nav_sidebar']                = 'Navigation';
-$lang['nav_sitemap']                = 'Seitenbaum';
-
-
-/**
- * preferences colors
- */
-
-$lang['__site_width__']             = 'Content - Breite (in %)';
-
-$lang['__background_site__']        = 'Website - Hintergrundfarbe';
-$lang['__text_webframe__']          = 'Claim, Titel, Footer (unverlinkt), Navigation (unverlinkt) - Schriftfarbe';
-
-$lang['__nav_menu_color__']         = 'Navigation (verlinkt), Footer (verlinkt), Pagetools Icons, Tabbox - Schriftfarbe';
-$lang['__nav_menu_hover_color__']   = 'Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
-$lang['__nav_menu_hover_bg__']      = 'Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - Schriftfarbe';
-
-$lang['__background__']             = '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, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)';
-$lang['__text_alt__']               = 'Tabellenkopf: unverlinkt, Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)';
-$lang['__link_alt__']               = 'Tabellenkopf: verlinkt - Schriftfarbe (alternativ)';
-
-$lang['__border__']                 = 'Tabellen, Formularfelder, Zitate - Rahmenfarbe';
-$lang['__default_border_radius__']  = 'Wiki Icons, Content (oben rechts) - Borderradius';
diff --git a/lang/de-informal/settings.php b/lang/de-informal/settings.php
deleted file mode 100755
index 5bbe996..0000000
--- a/lang/de-informal/settings.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-/**
- * Deutsche Übersetzung Einstellungen
- *
- */
-
-
-$lang['sidebar_sections']   = 'Automatisches Ein- und Ausblenden der Sidebar Abschnitte orientieren sich an diesen Elementen:';
-$lang['sidebar_sections_o_h1']   = 'Überschriften 1. Ordnung';
-$lang['sidebar_sections_o_h1,h2']   = 'Überschriften der 1. und 2. Ordnung';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5']   = 'Alle Überschriften';
-$lang['sidebar_sections_o_li.level1 > .li']   = 'Top-level Listeneinträge in verschachtelten Listen';
-
-$lang['header_layout']   = 'Layout des Headers anpassen:';
-$lang['header_layout_o_default']   = 'großer Header für langen Wiki Titel und Tagline';
-$lang['header_layout_o_compact']   = 'kompakter Header für kurzen Wiki Titel ohne Tagline';
-
-$lang['autocollapse'] = 'Sidebar automatisch einklappen wenn Nicht-Inhaltsseiten angezigt werden, um mehr Platz zu haben.';
diff --git a/lang/de/lang.php b/lang/de/lang.php
index c39687d..2de4372 100755
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -8,77 +8,56 @@
 
 $lang['direct_prefix']              = 'Direkt';
 $lang['direct_content_main']        = 'Hauptinhalt dieser Seite';
-$lang['direct_quick_search']        = 'Schnellsuche';
-$lang['direct_content_toggle']      = 'Breite des Contents ändern';
+$lang['direct_menu_main']           = 'Hauptmenü';
 
-$lang['adjunct_linked_logo_text']   = ' - Link zur Startseite';
-$lang['a11y_sidebartoggle']         = 'Navigation anzeigen/verbergen';
+$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';
-$lang['head_quick_search']          = 'Wikiübergreifende Schnellsuche';
+$lang['head_quick_search']          = 'wikiübergreifende Schnellsuche';
+$lang['head_menu_main']             = 'Hauptmenü';
 $lang['head_menu_status']           = 'Seitenstatus';
-$lang['head_breadcrumb_youarehere'] = 'Standortanzeiger';
+$lang['head_breadcrumb']            = 'Standortanzeiger';
 $lang['head_menu_trace']            = 'Zuletzt Angesehen';
 $lang['head_meta_box']              = 'Metainformationen zur Seite';
-$lang['head_menu_starred']          = 'Gemerkte Seiten';
-$lang['head_menu_tool-select']      = 'Werkzeuge';
 
 $lang['jump_to_quicksearch']        = 'Springe zur Schnellsuche';
 
-/** it will be shown from plugin lang.php:
 $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['prefix_tasks_user']          = 'Ihre offenen Aufgaben: ';
-*/
-
-$lang['custom_modeswitch']          = 'Lichtschalter';
 
 $lang['tab_tags']                   = 'Tags';
-$lang['tab_issues']                 = 'Issues';
 
-$lang['quality_trigger']            = 'Seitenanalyse anzeigen/verbergen';
+$lang['quality_trigger']            = 'Seitenanalyse ein- bzw. ausblenden';
 
+$lang['prefix_tasks']               = 'offene Aufgaben: ';
+$lang['prefix_tasks_user']          = 'Ihre offenen Aufgaben: ';
 $lang['prefix_tasks_page']          = 'offene Aufgaben auf dieser Seite: ';
-
 $lang['tasks_page_none']            = 'keine offenen Aufgaben für diese Seite';
-$lang['tasks_page_intime']          = 'offenen Aufgaben für diese Seite: %1$d';
-$lang['tasks_page_late']            = 'offenen Aufgaben für diese Seite: %1$d, zu spät: %2$d';
 
-/** is not used
-$lang['discussion']                 = 'xxx Diskussion';
-$lang['back_to_article']            = 'xxx Zurück zum Artikel';
-$lang['userpage']                   = 'xxx Benutzer-Seite';
- */
-
-$lang['meta_data']                  = 'Meta Daten des Bildes'; /** wird aufgerufen aber nicht ausgegeben - Fehler? */
-$lang['osm_zoom_link_text']         = 'größere Karte anzeigen';
-$lang['osm_zoom_link_title']        = 'externer Link - öffnet in neuem Fenster'; /** in streetmaps - konnte ich nicht finden */
-
-$lang['image_detail']               = 'Detailinformationen zum Bild';
-
-$lang['mode_edit']                  = 'Seite bearbeiten';
-
-
-$lang['nav_sidebar']                = 'Navigation';
-$lang['nav_sitemap']                = 'Seitenbaum';
+$lang['discussion']                 = 'Diskussion';
+$lang['back_to_article']            = 'Zurück zum Artikel';
+$lang['userpage']                   = 'Benutzer-Seite';
 
 
 /**
- * preferences colors
+ * colors
  */
 
 $lang['__site_width__']             = 'Content - Breite (in %)';
 
-$lang['__background_site__']        = 'Website - Hintergrundfarbe';
-$lang['__text_webframe__']          = 'Claim, Titel, Footer (unverlinkt), Navigation (unverlinkt) - Schriftfarbe';
+$lang['__background__']             = 'Website - Hintergrundfarbe';
+$lang['__text_webframe__']          = 'Website unverlinkt: Claim, Titel, Footer, Navigation - Schriftfarbe';
 
-$lang['__nav_menu_color__']         = 'Navigation (verlinkt), Footer (verlinkt), Pagetools Icons, Tabbox - Schriftfarbe';
-$lang['__nav_menu_hover_color__']   = 'Navigation (hover) - Schriftfarbe, Rahmenfarbe; Wiki Icons - Schriftfarbe; Wiki Icons (hover) - Hintergrundfarbe';
-$lang['__nav_menu_hover_bg__']      = 'Navigation (hover) - Hintergrundfarbe; Wiki Icons - Hintergrundfarbe; Wiki Icons (hover) - 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, Breadcrumb, Pagetools (hover) - Hintergrundfarbe';
+$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';
@@ -99,9 +78,8 @@ $lang['__missing__']                = 'Links zu nicht vorhandenen Wikiseiten - S
 $lang['__button_color__']           = 'Buttons - Schriftfarbe';
 $lang['__button_background__']      = 'Buttons - Hintergrundfarbe';
 
-$lang['__background_alt__']         = 'Tabellenkopf, Tabellenzeile (hover), struct Label (hover) - Hintergrundfarbe (alternativ)';
-$lang['__text_alt__']               = 'Tabellenkopf: unverlinkt, Tabellenzeile (hover), struct Label (hover) - Schriftfarbe (alternativ)';
-$lang['__link_alt__']               = 'Tabellenkopf: verlinkt - Schriftfarbe (alternativ)';
+$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/de/settings.php b/lang/de/settings.php
index 5bbe996..e6430be 100755
--- a/lang/de/settings.php
+++ b/lang/de/settings.php
@@ -4,15 +4,7 @@
  *
  */
 
-
-$lang['sidebar_sections']   = 'Automatisches Ein- und Ausblenden der Sidebar Abschnitte orientieren sich an diesen Elementen:';
-$lang['sidebar_sections_o_h1']   = 'Überschriften 1. Ordnung';
-$lang['sidebar_sections_o_h1,h2']   = 'Überschriften der 1. und 2. Ordnung';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5']   = 'Alle Überschriften';
-$lang['sidebar_sections_o_li.level1 > .li']   = 'Top-level Listeneinträge in verschachtelten Listen';
-
-$lang['header_layout']   = 'Layout des Headers anpassen:';
-$lang['header_layout_o_default']   = 'großer Header für langen Wiki Titel und Tagline';
-$lang['header_layout_o_compact']   = 'kompakter Header für kurzen Wiki Titel ohne Tagline';
-
-$lang['autocollapse'] = 'Sidebar automatisch einklappen wenn Nicht-Inhaltsseiten angezigt werden, um mehr Platz zu haben.';
+$lang['discussionPage']   = 'Diskussion-Seite (leer lassen, um Funktion zu deaktivieren)';
+$lang['userPage']         = 'Benutzer seite (leer lassen, um Funktion zu deaktivieren)';
+$lang['hideTools']        = 'Tools abschalten, wenn der Benutzer nicht angemeldet ist?';
+$lang['user_ns']          = 'Ort an dem Nutzerseiten gespeichert werden';
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 2c146f8..f634485 100755
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -7,77 +7,58 @@
 
 
 $lang['direct_prefix']              = 'jump to';
-$lang['direct_content_main']        = 'Main Content';
-$lang['direct_quick_search']        = 'Search';
-$lang['direct_content_toggle']      = 'Change Content Width';
+$lang['direct_content_main']        = 'main content';
+$lang['direct_menu_main']           = 'main menu';
 
-$lang['adjunct_linked_logo_text']   = ' - homepage link';
-$lang['a11y_sidebartoggle']         = 'Show/Hide Navigation';
+$lang['adjunct_start_logo_text']    = 'Logo: ';
+$lang['adjunct_linked_logo_text']   = '. homepage link';
+$lang['a11y_search']                = 'Jump to the search';
+$lang['a11y_sidebartoggle']         = 'Open/Close Sidebar';
 
 $lang['nav-area-head']              = 'menus and quick search';
 $lang['head_magic_matcher']         = 'MagicMatcher';
 $lang['head_quick_search']          = 'quick search';
+$lang['head_menu_main']             = 'main menu';
 $lang['head_menu_status']           = 'site status';
-$lang['head_breadcrumb_youarehere'] = 'location indicator';
+$lang['head_breadcrumb']            = 'location indicator';
 $lang['head_menu_trace']            = 'Last Visited Pages';
 $lang['head_meta_box']              = 'meta data for this page';
-$lang['head_menu_starred']          = 'Starred Pages';
-$lang['head_menu_tool-select']      = 'Tools';
 
 $lang['jump_to_quicksearch']        = 'Jump to quick search';
 
-/** it will be shown from plugin lang.php:
 $lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none';
 $lang['meta_box_tags_none']         = 'tags found: none';
 $lang['js']['meta_box_toc_none']    = 'no Table of Contents available';
-$lang['prefix_tasks_user']          = 'Your open tasks: ';
-*/
-
-$lang['custom_modeswitch']          = 'Light switch';
 
 $lang['tab_tags']                   = 'Tags';
 $lang['tab_issues']                 = 'Issues';
 
-$lang['quality_trigger']            = 'Show/Hide page analysis';
+$lang['quality_trigger']            = 'toggle page analysis';
 
+$lang['prefix_tasks']               = 'open tasks: ';
+$lang['prefix_tasks_user']          = 'your open tasks: ';
 $lang['prefix_tasks_page']          = 'open tasks for this page: ';
+$lang['tasks_page_none']            = 'no open tasks for this page';
 
-$lang['tasks_page_none']            = 'no open tasks on this page';
-$lang['tasks_page_intime']          = 'open tasks on this page: %1$d';
-$lang['tasks_page_late']            = 'open tasks on this page: %1$d, to late: %2$d';
-
-/** is not used
 $lang['discussion']                 = 'Discussion';
 $lang['back_to_article']            = 'Back to article';
 $lang['userpage']                   = 'User page';
-*/
 
-$lang['meta_data']                  = 'Meta Data';
-$lang['osm_zoom_link_text']         = 'view larger map';
-$lang['osm_zoom_link_title']        = 'external link opens new window';
-
-$lang['image_detail']               = 'image details';
-
-$lang['mode_edit']                  = 'Editing Page';
-
-
-$lang['nav_sidebar']                = 'Navigation';
-$lang['nav_sitemap']                = 'Site Tree';
 
 /**
- * preferences colors
+ * colors
  */
 
 $lang['__site_width__']             = 'content - width (in %)';
 
-$lang['__background_site__']        = 'website - background color';
-$lang['__text_webframe__']          = 'claim, title, footer (unlinked), navigation (unlinked) - font color';
+$lang['__background__']             = 'website - background color';
+$lang['__text_webframe__']          = 'website unlinked: claim, title, footer, navigation - font color';
 
-$lang['__nav_menu_color__']         = 'navigation (link), footer (link), pagetools icons, tabbox - font color';
-$lang['__nav_menu_hover_color__']   = 'navigation (hover) - font color, border color; wiki icons - font color; wiki icons (hover) - background color';
-$lang['__nav_menu_hover_bg__']      = 'navigation (hover) - background color; wiki icons - background color; wiki icons (hover) - 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, breadcrumb, pagetools (hover) - background 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';
@@ -98,9 +79,8 @@ $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, table cell (hover), struct Label (hover) - background color (alternative)';
-$lang['__text_alt__']               = 'table head: unlinked, table cell (hover), struct Label (hover) - font color (alternative)';
-$lang['__link_alt__']               = 'table head: linked - font color (alternative)';
+$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/lang/en/settings.php b/lang/en/settings.php
index e71229c..4e9d810 100755
--- a/lang/en/settings.php
+++ b/lang/en/settings.php
@@ -4,17 +4,7 @@
  *
  */
 
-
-$lang['sidebar_sections']   = 'Auto-toggle the sidebar into sections on these elements:';
-$lang['sidebar_sections_o_h1']   = '1st order headings';
-$lang['sidebar_sections_o_h1,h2']   = '1st and 2nd order headings';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5']   = 'All headings';
-$lang['sidebar_sections_o_li.level1 > .li']   = 'Top-level list items';
-
-$lang['header_layout']   = 'Adjust header layout:';
-$lang['header_layout_o_default']   = 'generous header layout for long wiki titel and tagline';
-$lang['header_layout_o_compact']   = 'compact header layout for short wiki title and hidden tagline';
-
-$lang['autocollapse'] = 'Automatically collapse the sidebar when viewing non-content pages for more screen estate.';
-$lang['closedwiki'] = 'This is a closed wiki. Hide most wiki functionality before user has logged in.';
-$lang['copyright'] = 'Copyright notice. Use %year%, %title%, and %TITLE% as placeholders. May contain HTML. You probably want to disable the default license notice.';
+$lang['discussionPage']   = 'Discussion page (leave empty to disable discussions)';
+$lang['userPage']         = 'User page (leave empty to disable user pages)';
+$lang['hideTools']        = 'Hide tools when not logged in?';
+$lang['user_ns']          = 'Where to store user pages.';
diff --git a/lang/es/lang.php b/lang/es/lang.php
deleted file mode 100755
index e8c2321..0000000
--- a/lang/es/lang.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * English language file for template
- *
- *  @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-
-$lang['direct_prefix']              = 'ir a';
-$lang['direct_content_main']        = 'Contenido Principal';
-$lang['direct_quick_search']        = 'Buscar';
-$lang['direct_content_toggle']      = 'Cambiar Ancho del Contenido';
-
-$lang['adjunct_linked_logo_text']   = ' - enlace a inicio';
-$lang['a11y_sidebartoggle']         = 'Mostrar/Ocultar Navegación';
-
-$lang['nav-area-head']              = 'menues y búsqueda rápida';
-$lang['head_magic_matcher']         = 'MagicMatcher';
-$lang['head_quick_search']          = 'búsqueda rápida';
-$lang['head_menu_status']           = 'estado del sitio';
-$lang['head_breadcrumb_youarehere'] = 'indicador de ubicación';
-$lang['head_menu_trace']            = 'Últimas Páginas Visitadas';
-$lang['head_meta_box']              = 'meta data de esta página';
-$lang['head_menu_starred']          = 'Páginas Favoritas';
-$lang['head_menu_tool-select']      = 'Herramientas';
-
-$lang['jump_to_quicksearch']        = 'Ir a búsqueda rápida';
-
-/** it will be shown from plugin lang.php:
-$lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none';
-$lang['meta_box_tags_none']         = 'tags found: none';
-$lang['js']['meta_box_toc_none']    = 'no Table of Contents available';
-$lang['prefix_tasks_user']          = 'Your open tasks: ';
-*/
-
-$lang['tab_tags']                   = 'Etiquetas';
-$lang['tab_issues']                 = 'Asuntos';
-
-$lang['quality_trigger']            = 'Mostrar/Ocultar análisis de página';
-
-$lang['prefix_tasks_page']          = 'tareas pendientes para esta página: ';
-
-$lang['tasks_page_none']            = 'no hay tareas pendientes en esta página';
-$lang['tasks_page_intime']          = 'tareas pendientes en esta página: %1$d';
-$lang['tasks_page_late']            = 'tareas pendientes en esta página: %1$d, vencidas: %2$d';
-
-/** is not used
-$lang['discussion']                 = 'Discussion';
-$lang['back_to_article']            = 'Back to article';
-$lang['userpage']                   = 'User page';
-*/
-
-$lang['meta_data']                  = 'Meta Data';
-$lang['osm_zoom_link_text']         = 'ver mapa más grande';
-$lang['osm_zoom_link_title']        = 'enlaces externas abren en nueva ventana';
-
-$lang['image_detail']               = 'detalles de la imagen';
-
-$lang['mode_edit']                  = 'Página de Edición';
-
-
-$lang['nav_sidebar']                = 'Navegación';
-$lang['nav_sitemap']                = 'Árbol del Sitio';
-
-/**
- * preferences colors
- */
-
-$lang['__site_width__']             = 'contenido - ancho (en %)';
-
-$lang['__background_site__']        = 'sitio web - color de fondo';
-$lang['__text_webframe__']          = 'claim, título, pié (no enlazado), navegacion (no enlazado) - color de fuente';
-
-$lang['__nav_menu_color__']         = 'navegación (link), pié (enlace), íconos de herramientas de página, tabbox - color de fuente';
-$lang['__nav_menu_hover_color__']   = 'navegación (hover) - color de fuente, color de borde; íconos wiki - color de fuente; íconos wiki (hover) - color de fondo';
-$lang['__nav_menu_hover_bg__']      = 'navegación (hover) - color de fondo; íconos wiki - color de fondo; íconos wiki (hover) - color de fuente';
-
-$lang['__background__']             = 'contenido, traza, herramientas de página (hover) - color de fondo';
-$lang['__text__']                   = 'contenido: text - color de fuente';
-
-$lang['__background_neu__']         = 'contenido neutral (no demasiado diferente del fondo del contenido) - color de fondo';
-$lang['__text_neu__']               = 'contenido neutral: texto - color de fuente';
-
-$lang['__background_page_header__'] = 'contenido: cabezal, pié, tabinclude tab controlls deactivate - color de fondo';
-$lang['__background_page_footer__'] = 'contenido: pié, tabinclude tab controlls deactivate - color de fuente';
-
-$lang['__border_light__']           = 'contenido: cabezal, pié - color de borde';
-
-$lang['__highlight__']              = 'texto enfatizado (ej. para resultados de búsqueda) - color de fondo';
-$lang['__highlight_text__']         = 'texto enfatizado (ej. para resultados de búsqueda) - color de fuente';
-
-$lang['__existing__']               = 'enlaces a páginas de la wiki, lápiz, herramientas de página (hover) - color de fuente; tabbox (hover) - color de fuente, color de borde';
-$lang['__link__']                   = 'enlaces a páginas no de la wiki (enlaces externos) - color de fuente';
-$lang['__missing__']                = 'enlaces a páginas no existentess - color de fuente';
-
-$lang['__button_color__']           = 'botones - color de fuente';
-$lang['__button_background__']      = 'botones - color de fondo';
-
-$lang['__background_alt__']         = 'cabezal de tabla, celda de tabla (hover), struct Label (hover) - color de fondo (alternativo)';
-$lang['__text_alt__']               = 'cabezal de tabla: no enlazadod, celda de tabla (hover), struct Label (hover) - color de fuente (alternativo)';
-$lang['__link_alt__']               = 'cabezal de tabla: enlazado - color de fuente (alternativo)';
-
-$lang['__border__']                 = 'tablas, campos de formularios, bloques de citas - color de borde';
-$lang['__default_border_radius__']  = 'íconos wiki, contenido (arriba a la derecha) - radio del borde';
diff --git a/lang/es/settings.php b/lang/es/settings.php
deleted file mode 100755
index f8c9d7b..0000000
--- a/lang/es/settings.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<?php
-/**
- * Spanish language file for config
- *
- */
-
-
-$lang['sidebar_sections']   = 'Auto-cambiar la barra lateral en secciones en estos elementos:';
-$lang['sidebar_sections_o_h1']   = 'encabezados de 1er orden';
-$lang['sidebar_sections_o_h1,h2']   = 'encabezados de 1er y 2do orden';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5']   = 'Todos los encabezados';
-$lang['sidebar_sections_o_li.level1 > .li']   = 'Items del mayor nivel en listas';
-
-$lang['header_layout']   = 'Adjust header layout:';
-$lang['header_layout_o_default']   = 'disposición generosa del encabezado (para título y lema de la wiki largos)';
-$lang['header_layout_o_compact']   = 'disposición compacta del encabezado (para título corto de la wiki y lema oculto)';
diff --git a/lang/es/style.txt b/lang/es/style.txt
deleted file mode 100755
index df61094..0000000
--- a/lang/es/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-Si desea cambiar el favicon, use el Administrador de Ficheros para subir un ''favicon.ico'' en el subespacio ''wiki'' o RAIZ, y se utilizará automáticamente. Si usa una wiki cerrada, se recomienda dar permiso de lectura para todo el mundo en la configuracion de ACL, en el espacio de nombres ''wiki'' (o RAIZ), o los usuarios no conectados, no podrán ver el favicon.
\ No newline at end of file
diff --git a/lang/fr/lang.php b/lang/fr/lang.php
deleted file mode 100644
index 7c83a66..0000000
--- a/lang/fr/lang.php
+++ /dev/null
@@ -1,63 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
- * @author ISKANDER REKIK <rekik.iskander@gmail.com>
- */
-$lang['direct_prefix']         = 'sauter à ';
-$lang['direct_content_main']   = 'Contenu principal';
-$lang['direct_quick_search']   = 'Chercher';
-$lang['direct_content_toggle'] = 'Changer la largeur du contenu';
-$lang['adjunct_linked_logo_text'] = '- lien page d\'accueil';
-$lang['a11y_sidebartoggle']    = 'Cacher/Afficher Navigation';
-$lang['nav-area-head']         = 'menus et recherche rapide';
-$lang['head_magic_matcher']    = 'Correspondance Magique';
-$lang['head_quick_search']     = 'recherche rapide';
-$lang['head_menu_status']      = 'statut du site';
-$lang['head_breadcrumb_youarehere'] = 'indicateur d\'emplacement';
-$lang['head_menu_trace']       = 'Pages récemment visitées';
-$lang['head_meta_box']         = 'meta données pour cette page';
-$lang['head_menu_starred']     = 'Pages suivies';
-$lang['head_menu_tool-select'] = 'Outils';
-$lang['jump_to_quicksearch']   = 'Sauter à la recherche rapide';
-$lang['tab_tags']              = 'Étiquettes';
-$lang['tab_issues']            = 'problèmes';
-$lang['quality_trigger']       = 'Afficher/Cacher les analyses de la page';
-$lang['prefix_tasks_page']     = 'tâches ouvertes sur cette page:';
-$lang['tasks_page_none']       = 'pas de tâches ouvertes sur cette page';
-$lang['tasks_page_intime']     = 'tâches ouvertes sur cette page: %1$d';
-$lang['tasks_page_late']       = 'tâches ouvertes sur cette page: %1$d, sur %2$d';
-$lang['meta_data']             = 'Meta données';
-$lang['osm_zoom_link_text']    = 'Voire carte plus large';
-$lang['osm_zoom_link_title']   = 'lien externe ouvre une nouvelle fenêtre';
-$lang['image_detail']          = 'détails de l\'image';
-$lang['mode_edit']             = 'Page d\'édition';
-$lang['nav_sidebar']           = 'Navigation';
-$lang['nav_sitemap']           = 'Arborescence du site';
-$lang['__site_width__']        = 'contenu - largeur en %';
-$lang['__background_site__']   = 'site - coleur de fond';
-$lang['__text_webframe__']     = 'Annonce, titre, pied de page (sans lien), navigation (sans lien) - couleur de police';
-$lang['__nav_menu_color__']    = 'navigation (lien), pied de page (lien), icône outils de page, boîte d\'onglets - couleur de police';
-$lang['__nav_menu_hover_color__'] = 'navigation (survol) - couleur de police, de bord ; icônes du wiki - couleur de police ; icônes du wiki (survol) - couleur de fond';
-$lang['__nav_menu_hover_bg__'] = 'navigation (survol) - couleur de fond ; icônes du wiki - couleur de fond ; icônes du wiki (survol) - couleur de police';
-$lang['__background__']        = 'contenu, miettes, outils de page (survol) - couleur de fond';
-$lang['__text__']              = 'contenu : texte - couleur de police';
-$lang['__background_neu__']    = 'Contenu neutre (pas trop différent du fond du contenu) - couleur de fond';
-$lang['__text_neu__']          = 'contenu neutre : texte - couleur de police';
-$lang['__background_page_header__'] = 'Contenu : entête, pied de page, contrôle d\'onglet tabinclude inactifs - couleur de fond';
-$lang['__background_page_footer__'] = 'contenu : pied de page, contrôle d\'onglet tabinclude inactifs - couleur de police';
-$lang['__border_light__']      = 'contenu : entête, pied de page - couleur de bordure';
-$lang['__highlight__']         = 'texte emphatique (e.g. résultats de recherche) - couleur de fond';
-$lang['__highlight_text__']    = 'texte emphatique (e.g. résultats de recherche) - couleur de police';
-$lang['__existing__']          = 'liens vers des pages, crayon, outils de page (survol) - couleur de police ; boîte d\'onglets (survol) - couleur de bordure, couleur de police';
-$lang['__link__']              = 'liens vers des pages non wiki (sites externes) - couleur de police';
-$lang['__missing__']           = 'liens vers des pages inexistantes - couleur de police';
-$lang['__button_color__']      = 'boutons - couleur de police';
-$lang['__button_background__'] = 'boutons - couleur de fond';
-$lang['__background_alt__']    = 'entête de tableau, cellules (survol), labels «struct» (survol) - couleur de fond (alternative)';
-$lang['__text_alt__']          = 'entête de tableau : sans lien, cellules (survol), labels «struct» (survol) - couleur de police (alternative)';
-$lang['__link_alt__']          = 'entête de tableau : avec liens -  couleur de police (alternative)';
-$lang['__border__']            = 'tableau, champ de formulaire, citations - couleur de bordure';
-$lang['__default_border_radius__'] = 'icônes du wiki, contenu (en haut à droite) - rayon de l\'arrondi de la bordure';
diff --git a/lang/fr/settings.php b/lang/fr/settings.php
deleted file mode 100644
index 4350307..0000000
--- a/lang/fr/settings.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * @author Schplurtz le Déboulonné <schplurtz@laposte.net>
- */
-$lang['sidebar_sections']      = 'Convertir automatiquement en section ces éléments :';
-$lang['sidebar_sections_o_h1'] = 'titres de premier rang';
-$lang['sidebar_sections_o_h1,h2'] = 'titres de premier et second rang';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'tous les titres';
-$lang['sidebar_sections_o_li.level1 > .li'] = 'items de premier niveau des listes';
-$lang['header_layout']         = 'Ajuster la disposition de l\'entête :';
-$lang['header_layout_o_default'] = 'Disposition d\'entête généreuse pour un titre long et un descriptif';
-$lang['header_layout_o_compact'] = 'Disposition compacte de l\'entête pour un titre court sans descriptif';
-$lang['autocollapse']          = 'Replier automatiquement la barre latérale quand on n\'est pas sur une page de wiki pour donner plus de place aux outils.';
-$lang['closedwiki']            = 'Ceci est un wiki fermé. Cacher la plupart des fonctionnalités avant que l\'utilisateur ne se connecte.';
-$lang['copyright']             = 'Notice de Copyright. Utilisez les expressions %year% pour l\'année, %title% et %TITLE% pour le titre. Peut contenir de l\'HTML. Vous voudrez probablement désactiver la notice de licence par défaut.';
diff --git a/lang/fr/style.txt b/lang/fr/style.txt
deleted file mode 100644
index 77e21a9..0000000
--- a/lang/fr/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-Si vous voulez changer le //favicon//, utilisez simplement le gestionnaire de médias et envoyez un ''favicon.ico'' dans la catégorie racine ou ''wiki'' et il sera automatiquement utilisé. Si vous utilisez un wiki privé on vous recommande de rendre la catégorie ''wiki'' (ou racine) publique dans les réglages d'ACL, sans quoi votre //favicon// sera invisible aux utilisateurs non connectés.
\ No newline at end of file
diff --git a/lang/it/lang.php b/lang/it/lang.php
deleted file mode 100644
index f6287f8..0000000
--- a/lang/it/lang.php
+++ /dev/null
@@ -1,104 +0,0 @@
-<?php
-/**
- * File di lingua Italiana per il template
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- */
-
-
-$lang['direct_prefix']              = 'Vai a';
-$lang['direct_content_main']        = 'Contenuto Principale';
-$lang['direct_quick_search']        = 'Ricerca';
-$lang['direct_content_toggle']      = 'Cambia Larghezza del Contenuto';
-
-$lang['adjunct_linked_logo_text']   = ' - link alla homepage';
-$lang['a11y_sidebartoggle']         = 'Mostra/Nascondi Navigazione';
-
-$lang['nav-area-head']              = 'Menu e Ricerca rapida';
-$lang['head_magic_matcher']         = 'MagicMatcher';
-$lang['head_quick_search']          = 'Ricerca rapida';
-$lang['head_menu_status']           = 'Stato del sito';
-$lang['head_breadcrumb_youarehere'] = 'Indicatore di posizione';
-$lang['head_menu_trace']            = 'Ultime Pagine Visitate';
-$lang['head_meta_box']              = 'meta dati per questa pagina';
-$lang['head_menu_starred']          = 'Pagine Preferite';
-$lang['head_menu_tool-select']      = 'Strumenti';
-
-$lang['jump_to_quicksearch']        = 'Vai alla ricerca rapida';
-
-/** it will be shown from plugin lang.php:
-$lang['meta_box_jira_tickets_none'] = 'Ticket jira associati trovati: nessuno';
-$lang['meta_box_tags_none']         = 'Tag trovati: nessuno';
-$lang['js']['meta_box_toc_none']    = 'Nessun Sommario disponibile';
-$lang['prefix_tasks_user']          = 'I tuoi task aperti: ';
-*/
-
-$lang['tab_tags']                   = 'Tag';
-$lang['tab_issues']                 = 'Problemi';
-
-$lang['quality_trigger']            = 'Mostra/Nascondi l\'analisi della pagina';
-
-$lang['prefix_tasks_page']          = 'aprire le attività per questa pagina: ';
-
-$lang['tasks_page_none']            = 'nessuna attività aperta in questa pagina';
-$lang['tasks_page_intime']          = 'attività aperte su questa pagina: %1$d';
-$lang['tasks_page_late']            = 'attività aperte su questa pagina: %1$d, troppo tardi: %2$d';
-
-/** is not used
-$lang['discussion']                 = 'Discussione';
-$lang['back_to_article']            = 'Torna all'articolo';
-$lang['userpage']                   = 'Pagina utente';
-*/
-
-$lang['meta_data']                  = 'Meta dati dell\'immagine';
-$lang['osm_zoom_link_text']         = 'visualizza una mappa più grande';
-$lang['osm_zoom_link_title']        = 'link esterno - si apre in una nuova finestra';
-
-$lang['image_detail']               = 'Dettagli dell\'immagine';
-
-$lang['mode_edit']                  = 'Modifica pagina';
-
-
-$lang['nav_sidebar']                = 'Navigazione';
-$lang['nav_sitemap']                = 'Indice';
-
-/**
- * preferences colors
- */
-
-$lang['__site_width__']             = 'Contenuto - Larghezza (in %)';
-
-$lang['__background_site__']        = 'Sito Web - Colore di sfondo';
-$lang['__text_webframe__']          = 'Claim, Titolo, Pi&egrave; di pagina (non collegato), Navigazione (non collegata) - Colore del carattere';
-
-$lang['__nav_menu_color__']         = 'Navigazione (collegamento),  Pi&egrave; di pagina (collegamento), Icone strumenti di pagina, Tabbox - Colore del carattere';
-$lang['__nav_menu_hover_color__']   = 'Navigazione (passaggio) - Colore del carattere, Colore del bordo; Icone Wiki - Colore del carattere; Icone Wiki (passaggio) - Colore di sfondo';
-$lang['__nav_menu_hover_bg__']      = 'Navigazione (passaggio) - Colore di sfondo; Icone Wiki - Colore di sfondo; Icone Wiki (passaggio) - Colore del carattere';
-
-$lang['__background__']             = 'Contenuto, percorso, strumenti di pagina (passaggio) - Colore di sfondo';
-$lang['__text__']                   = 'Contenuto: Testo - Colore del carattere';
-
-$lang['__background_neu__']         = 'Contenuto neutro (non troppo diverso dallo sfondo del contenuto) - Colore di sfondo';
-$lang['__text_neu__']               = 'Contenuto neutro: Testo - Tolore del carattere';
-
-$lang['__background_page_header__'] = 'Contenuto: Intestazione, Pi&egrave; di pagina, Linguette tab disattivate per Tabinclude - Colore di sfondo';
-$lang['__background_page_footer__'] = 'Contenuto: Pi&egrave; di pagina, Linguette tab disattivate per Tabinclude - Colore del carattere';
-
-$lang['__border_light__']           = 'Contenuto: Intestazione, pi&egrave; di pagina - Colore del bordo';
-
-$lang['__highlight__']              = 'Enfasi del testo (ad esempio per i risultati di ricerca) - Colore di sfondo';
-$lang['__highlight_text__']         = 'Enfasi del testo (ad esempio per i risultati di ricerca) - Colore del carattere';
-
-$lang['__existing__']               = 'Collegamenti a pagine Wiki, matita, strumenti di pagina (passaggio) - Colore del carattere; Tabbox (passaggio) - Colore del carattere, Colore del bordo';
-$lang['__link__']                   = 'Collegamenti a pagine non Wiki (link esterni) - Colore del carattere';
-$lang['__missing__']                = 'Collegamenti a pagine non esistenti - Colore del carattere';
-
-$lang['__button_color__']           = 'Pulsanti - Colore del carattere';
-$lang['__button_background__']      = 'Pulsanti - Colore di sfondo';
-
-$lang['__background_alt__']         = 'Intestazione tabella, Cella tabella (passaggio), Etichetta Struct (passaggio) - Colore di sfondo (alternativo)';
-$lang['__text_alt__']               = 'Intestazione tabella: non collegata, Cella tabella (passaggio), Etichetta Struct (passaggio)- Colore del carattere (alternativo)';
-$lang['__link_alt__']               = 'Intestazione tabella: collegata - Colore del carattere (alternativo)';
-
-$lang['__border__']                 = 'Tabelle, Campi modulo, Blockquote - Colore del bordo';
-$lang['__default_border_radius__']  = 'Icone Wiki, Contenuto (in alto a destra) - raggio del bordo';
diff --git a/lang/it/settings.php b/lang/it/settings.php
deleted file mode 100644
index 5c88524..0000000
--- a/lang/it/settings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-/**
- * File di lingua Italiana per la pagina di configurazione
- *
- */
-
-
-$lang['sidebar_sections']   = 'Attiva/disattiva la barra laterale nelle sezioni su questi elementi:';
-$lang['sidebar_sections_o_h1']   = 'Intestazioni di primo ordine';
-$lang['sidebar_sections_o_h1,h2']   = 'Intestazioni di primo e secondo ordine';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5']   = 'Tutte le intestazioni';
-$lang['sidebar_sections_o_li.level1 > .li']   = 'Primo livello degli elementi di elenco';
-
-$lang['header_layout']   = 'Regola il layout dell\'intestazione:';
-$lang['header_layout_o_header-default']   = 'layout di intestazione generoso per un lungo titolo e una tagline';
-$lang['header_layout_o_header-compact']   = 'layout di intestazione compatto per un breve titolo e tagline nascosta';
-
diff --git a/lang/it/style.txt b/lang/it/style.txt
deleted file mode 100644
index 07f41e3..0000000
--- a/lang/it/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-Se vuoi cambiare la favicon, usa semplicemente il Gestore Media per caricare un ''favicon.ico'' nel ''wiki'' o nel namespace di root e verrà automaticamente usato. Se si utilizza un wiki chiuso, si consiglia di rendere leggibile per chiunque lo spazio dei nomi ''wiki'' (o root) nelle impostazioni ACL o il proprio favicon non verrà mostrato agli utenti che hanno effettuato il logout.
diff --git a/lang/nl/lang.php b/lang/nl/lang.php
deleted file mode 100644
index 0393b34..0000000
--- a/lang/nl/lang.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * @author Henk <meinsma@hotmail.com>
- */
-$lang['direct_prefix']         = 'ga naar';
-$lang['direct_content_main']   = 'Hoofdinhoud';
-$lang['direct_quick_search']   = 'Zoeken';
-$lang['direct_content_toggle'] = 'Wijzig inhoud breedte';
-$lang['adjunct_linked_logo_text'] = 'link naar home pagina';
-$lang['a11y_sidebartoggle']    = 'Toon/Verberg navigatie';
-$lang['nav-area-head']         = 'Menu en snelzoeken';
-$lang['head_quick_search']     = 'Snelzoeken';
-$lang['head_menu_status']      = 'website status';
-$lang['head_menu_trace']       = 'Laatst bezochte pagina\'s';
-$lang['head_meta_box']         = 'meta data voor deze pagina';
-$lang['head_menu_starred']     = 'Gemarkeerde pagina\'s';
-$lang['head_menu_tool-select'] = 'Hulpmiddelen';
-$lang['jump_to_quicksearch']   = 'Ga naar snelzoeken';
-$lang['tab_tags']              = 'Tags';
-$lang['tab_issues']            = 'Onderwerpen';
-$lang['quality_trigger']       = 'Toon/Verberg pagina analyse';
-$lang['prefix_tasks_page']     = 'open taken voor deze pagina';
-$lang['tasks_page_none']       = 'geen openstaande taken voor deze pagina';
-$lang['tasks_page_intime']     = 'open taken op deze pagina: %1$d';
-$lang['tasks_page_late']       = 'open taken op deze pagina: %1$d, over tijd: %2$d';
-$lang['meta_data']             = 'meta data';
-$lang['osm_zoom_link_text']    = 'bekijk grotere kaart';
-$lang['osm_zoom_link_title']   = 'externe link opent in een nieuw venster';
-$lang['image_detail']          = 'afbeelding details';
-$lang['mode_edit']             = 'Bewerk pagina';
-$lang['nav_sidebar']           = 'Navigatie';
-$lang['nav_sitemap']           = 'Site structuur';
-$lang['__site_width__']        = 'inhoud - breedte (in %)';
-$lang['__background_site__']   = 'website - kleur achtergrond';
-$lang['__text_webframe__']     = 'claim, titel, footer (niet gelinkt), navigatie (niet gelinkt) - tekstkleur';
-$lang['__nav_menu_color__']    = 'navigatie (link), footer (link), pagina-hulpmiddelen iconen, tabbox, tekstkleur';
-$lang['__nav_menu_hover_color__'] = 'navigatie (hover), tekstkleur, kader kleur; wiki iconen - tekstkleur; wiki iconen (hover) - kleur achtergrond';
-$lang['__nav_menu_hover_bg__'] = 'navigatie (hover), kleur achtergrond; wiki iconen - kleur achtergrond; wiki iconen (hover) - tekstkleur';
-$lang['__background__']        = 'inhoud, broodkruimels, pagina hulpmiddelen (hover) - kleur achtergrond';
-$lang['__text__']              = 'inhoud: tekst - tekstkleur';
-$lang['__highlight__']         = 'tekst accentuering (bijv. voor zoekresultaten) - kleur achtergrond';
-$lang['__highlight_text__']    = 'tekst accentuering (bijv. voor zoekresultaten) - tekstkleur';
-$lang['__existing__']          = 'links naar wiki-pagina\'s, pen, pagina-hulpmiddelen (hover) - tekstkleur; tabbox (hover) - tekstkleur, kader kleur';
-$lang['__link__']              = 'links naar niet wiki-pagina\'s (externe links) - tekstkleur';
-$lang['__missing__']           = 'links naar niet niet bestaande pagina\'s (externe links) - tekstkleur';
-$lang['__button_color__']      = 'buttons - tekstkleur';
-$lang['__button_background__'] = 'buttons - kleur achtergrond';
diff --git a/lang/nl/settings.php b/lang/nl/settings.php
deleted file mode 100644
index cad6dc5..0000000
--- a/lang/nl/settings.php
+++ /dev/null
@@ -1,8 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * @author Henk <meinsma@hotmail.com>
- */
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'Alle koppen';
diff --git a/lang/nl/style.txt b/lang/nl/style.txt
deleted file mode 100644
index e13bbde..0000000
--- a/lang/nl/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-Gebruik de Media Manager voor het wijzigen van de favicon. Upload  een "favicon.ico" naar de "wiki" of root namespace en deze wordt automatisch gebruikt. Bij een gesloten Wiki wordt aanbevolen om de "wiki" of root namespace leesbaar te maken in de ACL settings, anders is de favicon niet zichtbaar voor niet ingelogde gebruikers.
\ No newline at end of file
diff --git a/lang/ru/lang.php b/lang/ru/lang.php
deleted file mode 100644
index 4f7479c..0000000
--- a/lang/ru/lang.php
+++ /dev/null
@@ -1,75 +0,0 @@
-<?php
-
-/**
- * Russian language file for template
- *
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- * it will be shown from plugin lang.php:
- * $lang['meta_box_jira_tickets_none'] = 'jira associated tickets found: none';
- * $lang['meta_box_tags_none']         = 'tags found: none';
- * $lang['js']['meta_box_toc_none']    = 'no Table of Contents available';
- * $lang['prefix_tasks_user']          = 'Your open tasks: ';
- * is not used
- * $lang['discussion']                 = 'Discussion';
- * $lang['back_to_article']            = 'Back to article';
- * $lang['userpage']                   = 'User page';
- *
- * preferences colors
- *
- * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
- */
-$lang['direct_prefix']         = 'перейти к';
-$lang['direct_content_main']   = 'Главная страница';
-$lang['direct_quick_search']   = 'Поиск';
-$lang['direct_content_toggle'] = 'Изменить ширину рабочей области';
-$lang['adjunct_linked_logo_text'] = ' - homepage link';
-$lang['a11y_sidebartoggle']    = 'Показать/скрыть навигацию';
-$lang['nav-area-head']         = 'меню и быстрый поиск';
-$lang['head_magic_matcher']    = 'MagicMatcher';
-$lang['head_quick_search']     = 'быстрый поиск';
-$lang['head_menu_status']      = 'статус сайта';
-$lang['head_breadcrumb_youarehere'] = '«хлебные крошки»';
-$lang['head_menu_trace']       = 'Последние посещённые страницы';
-$lang['head_meta_box']         = 'мета-данные страницы';
-$lang['head_menu_starred']     = 'Избранные страницы';
-$lang['head_menu_tool-select'] = 'Инструменты';
-$lang['jump_to_quicksearch']   = 'Переход к быстрому поиску';
-$lang['tab_tags']              = 'Теги';
-$lang['tab_issues']            = 'Вопросы';
-$lang['quality_trigger']       = 'Показать/скрыть аналитику';
-$lang['prefix_tasks_page']     = 'открытые задачи по странице: ';
-$lang['tasks_page_none']       = 'нет открытых задач по странице';
-$lang['tasks_page_intime']     = 'открытых задач на странице: %1$d';
-$lang['tasks_page_late']       = 'открытых задач на странице: %1$d, до: %2$d';
-$lang['meta_data']             = 'Мета-данные';
-$lang['osm_zoom_link_text']    = 'открыть расширенную карту';
-$lang['osm_zoom_link_title']   = 'внешние ссылки в новом окне';
-$lang['image_detail']          = 'информация по изображению';
-$lang['mode_edit']             = 'Редактирование страницы';
-$lang['nav_sidebar']           = 'Навигация';
-$lang['nav_sitemap']           = 'Карта сайта';
-$lang['__site_width__']        = 'ширина области для контента (в %)';
-$lang['__background_site__']   = 'сайт — цвет фона';
-$lang['__text_webframe__']     = 'заглавие, подвал (без ссылок), навигация (без ссылок) — цвет шрифта';
-$lang['__nav_menu_color__']    = 'навигация (ссылка), подвал (ссылка), иконки инструментов страницы, панель вкладок — цвет шрифта';
-$lang['__nav_menu_hover_color__'] = 'навигация (при наведении) — цвет шрифта, цвет границы; иконки вики — цвет шрифта; иконки вики (при наведении) — цвет фона';
-$lang['__nav_menu_hover_bg__'] = 'навигация (при наведении) — цвет фона; иконки вики — цвет фона; иконки вики (при наведении) — цвет шрифта';
-$lang['__background__']        = 'содержимое, «хлебные крошки», инструменты страницы (при наведении) — цвет фона';
-$lang['__text__']              = 'содержимое: текст — цвет шрифта';
-$lang['__background_neu__']    = 'нейтральное содержимое (не сильно отличается от фонового содержимого) — цвет фона';
-$lang['__text_neu__']          = 'нейтральное содержимое: текст — цвет шрифта';
-$lang['__background_page_header__'] = 'содержимое: заголовок, подвал, неактивные вкладки (плагин TabInclude) — цвет фона';
-$lang['__background_page_footer__'] = 'содержимое: подвал, неактивные вкладки (плагин TabInclude) — цвет шрифта';
-$lang['__border_light__']      = 'содержимое: заголовок, подвал — цвет границы';
-$lang['__highlight__']         = 'подчёркнутый текст (например, результаты поиска) — цвет фона';
-$lang['__highlight_text__']    = 'подчёркнутый текст (например, результаты поиска) — цвет шрифта';
-$lang['__existing__']          = 'ссылки на вики-страницы, карандаш, инструменты страницы (при наведении) — цвет шрифта; панель вкладок (при наведении) — цвет шрифта, цвет границы';
-$lang['__link__']              = 'ссылки на внешние страницы — цвет шрифта';
-$lang['__missing__']           = 'ссылки на не существующие страницы — цвет шрифта';
-$lang['__button_color__']      = 'кнопки — цвет шрифта';
-$lang['__button_background__'] = 'кнопки — цвет фона';
-$lang['__background_alt__']    = 'заголовок таблицы, ячейка таблицы (при наведении), метка (Label) плагина Stuct (при наведении) — цвет фона (альтернативный)';
-$lang['__text_alt__']          = 'заголовок таблицы: без ссылки, ячейка таблицы (при наведении), метка (Label) плагина Stuct (при наведении) — цвет шрифта (альтернативный)';
-$lang['__link_alt__']          = 'заголовок таблицы: связанная — цвет шрифта (альтернативный)';
-$lang['__border__']            = 'таблицы, поля форм, цитаты — цвет границы';
-$lang['__default_border_radius__'] = 'иконки вики, содержимое (верхний правый угол) — радиус скругления углов';
diff --git a/lang/ru/settings.php b/lang/ru/settings.php
deleted file mode 100644
index 37b8459..0000000
--- a/lang/ru/settings.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * Russian language file for config
- *
- * @author Aleksandr Selivanov <alexgearbox@yandex.ru>
- */
-$lang['sidebar_sections']      = 'Автоматически переключать боковую панель в секциях';
-$lang['sidebar_sections_o_h1'] = 'Заголовок 1 уровня';
-$lang['sidebar_sections_o_h1,h2'] = 'Заголовки 1 и 2 уровня';
-$lang['sidebar_sections_o_h1,h2,h3,h4,h5'] = 'Все заголовки';
-$lang['sidebar_sections_o_li.level1 > .li'] = 'Первые элементы в списках';
-$lang['header_layout']         = 'Настройка размещения заголовков';
-$lang['header_layout_o_default'] = 'разрежённое размещение длинных вики-заголовков и блоков тегов';
-$lang['header_layout_o_compact'] = 'компактное размещение длинных вики-заголовков и блоков тегов';
diff --git a/lang/ru/style.txt b/lang/ru/style.txt
deleted file mode 100644
index 99f0a95..0000000
--- a/lang/ru/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-If you'd like to change the favicon, simply use the Media Manager to upload a ''favicon.ico'' into the ''wiki'' or the root namespace and it will automatically be used. If you use a closed wiki it is recommended to make the ''wiki'' (or root) namespace world readable in the ACL settings or your favicon will not be shown to logged-out users.
diff --git a/lang/zh-tw/lang.php b/lang/zh-tw/lang.php
deleted file mode 100644
index 003e4ad..0000000
--- a/lang/zh-tw/lang.php
+++ /dev/null
@@ -1,13 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * @author GHSRobert Ciang <robertus0617@gmail.com>
- */
-$lang['head_menu_trace']       = '最近瀏覽的頁面';
-$lang['head_menu_tool-select'] = '工具';
-$lang['tab_tags']              = '標籤';
-$lang['quality_trigger']       = '顯示/隱藏頁面分析';
-$lang['prefix_tasks_page']     = '此頁尚未完成的工作：';
-$lang['tasks_page_none']       = '此頁工作都已完成';
diff --git a/lang/zh-tw/settings.php b/lang/zh-tw/settings.php
deleted file mode 100644
index 991a7e1..0000000
--- a/lang/zh-tw/settings.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-/**
- * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
- *
- * @author GHSRobert Ciang <robertus0617@gmail.com>
- */
-$lang['sidebar_sections_o_li.level1 > .li'] = '上層清單項目';
-$lang['header_layout_o_default'] = '寬裕的頁首佈局（適用於較長的 wiki 標題及副標題）';
-$lang['header_layout_o_compact'] = '精簡的頁首佈局（適用於較短的 wiki 標題及隱藏副標題）';
diff --git a/lang/zh-tw/style.txt b/lang/zh-tw/style.txt
deleted file mode 100644
index d0ea161..0000000
--- a/lang/zh-tw/style.txt
+++ /dev/null
@@ -1 +0,0 @@
-若您想變更 favicon，只要將一個 ''favicon.ico'' 檔案上傳到 ''wiki'' 或 root 分類名稱下，系統就會自動使用該檔案。如果您使用封閉的 wiki，建議您在 ACL 設定中將 ''wiki''（或 root）分類名稱設為公開，不然未登入的使用者將無法看到您的 favicon。
\ No newline at end of file
diff --git a/main.php b/main.php
index fdb3d9c..35bb210 100755
--- a/main.php
+++ b/main.php
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <?php
 
 /**
@@ -9,34 +10,15 @@
  */
 
 use dokuwiki\template\sprintdoc\Template;
-Template::getInstance();
 
 if (!defined('DOKU_INC')) die();                        /* must be run from within DokuWiki */
 header('X-UA-Compatible: IE=edge,chrome=1');
 
-global $JSINFO;
-if (empty($JSINFO['template'])) {
-    $JSINFO['template'] = array();
-}
-$JSINFO['template']['sprintdoc'] = array('sidebar_toggle_elements' => tpl_getConf('sidebar_sections'));
-
-$showTools = true;
-$showSidebar =  true;
+$showTools = !tpl_getConf('hideTools') || ( tpl_getConf('hideTools') && !empty($_SERVER['REMOTE_USER']) );
+$showSidebar =  true; /*  */
 ?>
-<!DOCTYPE html>
 <html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
 <head>
-    <script>
-        const setTheme = (theme) => {
-            theme ??= localStorage.theme || "system";
-            document.getElementById("themeLight").checked = theme === "light";
-            document.getElementById("themeDark").checked = theme === "dark";
-            localStorage.theme = theme;
-        };
-        document.addEventListener("DOMContentLoaded", function () {
-            setTheme();
-        });
-    </script>
 <?php
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* meta and link relations */
@@ -79,11 +61,11 @@ $showSidebar =  true;
 
 
 /* #dokuwiki__top used as anchor for "back to top" button/link links */
-$classWideContent = (Template::getInstance())->fullWidthClass();
+$classWideContent = ($ACT === "show") ? "": "wide-content ";
 ?>
-<body id="dokuwiki__top" class="<?php echo ($ACT) ? 'do-'.$ACT : 'do-none'; ?> <?php echo $classWideContent; ?><?php echo ($showSidebar) ? 'showSidebar' : ''; ?> <?php echo tpl_getConf('header_layout'); ?>">
+<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?> <?php echo ($ACT) ? 'do-'.$ACT : 'do-none'; ?> <?php echo $classWideContent; ?><?php echo ($showSidebar) ? 'showSidebar' : ''; ?>">
 
-<div id="dokuwiki__site" class="<?php echo tpl_classes(); ?>">
+<div id="dokuwiki__site">
     <?php
 
 
@@ -100,38 +82,20 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 /* Include Hook: header.html */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
             tpl_includeFile('header.html');
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* User Tools and MagicMatcher Bar */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-
-            /** @var \helper_plugin_magicmatcher_context $mm */
-            $mm = plugin_load('helper', 'magicmatcher_context');
-            $headerClass = ""; /* for additionial class in #dokuwiki__header */
-            $navClass = "";    /* for additionial class in #dokuwiki__usertools (header.html) */
-
-            if($mm){
-                $matcher = $mm->getIssueContextBar();
-                if($matcher !== ""){
-                    $headerClass = "has-magicmatcher";
-                    $navClass = "has-bar";
-                }
-            }
         ?>
 
-        <div id="dokuwiki__header" class="header <?php echo $headerClass; ?> no-print">
+        <div id="dokuwiki__header" class="header no-print">
             <div class="container">
                 <div class="row">
-                    <div class="">
-                            <?php if(!tpl_getConf('closedwiki') || $INPUT->server->has('REMOTE_USER')) { ?>
-                                <div class="menu-togglelink mobile-only">
-                                    <a href="#">
-                                        <span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle'); ?></span>
-                                    </a>
-                                </div>
-                            <?php } ?>
+                    <div class="col-xs-12">
+                        <div class="claim main-sidebar">
+                            <div class="menu-togglelink mobile-only">
+                                <a href="#">
+                                    <span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle'); ?></span>
+                                </a>
+                            </div>
 
-                            <?php
+                            <?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@@ -139,21 +103,37 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' in der template config accordingly: */
                                 include('tpl/main-sidebar-logo.php');
-                            ?>
+                             } ?>
+                            <div class="main-title">
+                                <?php if ($conf['title']):
 
-                            <div class="menu-tool-select">
-                                <h5 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_menu_tool-select') ?></h5>
-                                <?php
-                                if (file_exists(DOKU_INC . 'inc/Menu/MobileMenu.php')) {
-                                    echo (new \dokuwiki\Menu\MobileMenu())->getDropdown();
-                                } else {
-                                    //Pre-Greebo Backwards compatibility
-                                    tpl_actiondropdown($lang['tools'], "test");
-                                }
-                                ?>
-                            </div><!-- .menu-tool-select -->
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Wiki Title Mobile */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
+                                    <p class="title mobile-only"><?php echo $conf['title'] ?></p>
+                                <?php endif ?>
+                            </div><!-- .main-title -->
+                        </div><!-- .headings -->
                     </div><!-- .col -->
 
+                    <div class="col-xs-12">
+                        <div class="main-title desktop-only">
+                            <?php if ($conf['title']):
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Wiki Title Desktop */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
+                                <p class="title"><?php echo $conf['title'] ?></p>
+                            <?php endif ?>
+                            <?php if ($conf['tagline']):
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Wiki Tagline Desktop */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */ ?>
+                                <p class="claim"><?php echo $conf['tagline'] ?></p>
+                            <?php endif ?>
+                        </div><!-- .main-title -->
+                    </div><!-- .col -->
                 </div><!-- .row -->
             </div><!-- .container -->
         </div><!-- .header -->
@@ -169,21 +149,10 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
             <h5 class="sr-only" role="heading" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
         </div><!-- .nav-area-head -->
 
-        <?php if(!tpl_getConf('closedwiki') || $INPUT->server->has('REMOTE_USER')) { ?>
-            <div class="tools">
+        <div class="tools">
             <div class="container">
                 <div class="row">
                     <div class="col-xs-12">
-                        <div class="search main-sidebar">
-                            <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* search form */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                include('tpl/main-sidebar-search.php');
-                            ?>
-                        </div><!-- .search -->
 
                         <div class="sidebarheader main-sidebar">
                             <?php
@@ -196,6 +165,17 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
                             ?>
                         </div><!-- .sidebarheader -->
 
+                        <div class="search main-sidebar">
+                            <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* search form */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                include('tpl/main-sidebar-search.php');
+                            ?>
+                        </div><!-- .search -->
+
                         <div id="dokuwiki__aside">
 
                             <?php
@@ -207,8 +187,6 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
                             ?>
 
                             <?php
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* sidebar */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@@ -228,7 +206,7 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
                 </div><!-- .row -->
             </div><!-- .container -->
         </div><!-- .tools -->
-        <?php } // closed wiki check?>
+
 
         <div class="top-header">
             <div class="container">
@@ -241,10 +219,25 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* User Tools and MagicMatcher Bar */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                            /** @var \helper_plugin_magicmatcher_context $mm */
+                            $mm = plugin_load('helper', 'magicmatcher_context');
+                            $navClass = "";
+                            if($mm){
+                                $matcher = $mm->getIssueContextBar();
+                                if($matcher !== ""){
+                                    $navClass = "has-bar";
+                                }
+                            }
+
                             include('tpl/nav-usertools-buttons.php');
                             if($mm && $matcher !== ""){
                                 include('tpl/nav-magicmatcher.php');
                             }
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: header.html */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                            tpl_includeFile('header.html');
                         ?>
 
                     </div><!-- .col -->
@@ -272,11 +265,9 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 
                         <div class="breadcrumbs" data-do="<?php echo $ACT?>">
 
-                            <?php if(!tpl_getConf('closedwiki') || $INPUT->server->has('REMOTE_USER')) { ?>
                             <div class="togglelink page_main-content">
-                                <a id="spr__toggle-content" href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
+                                <a href="#"><span class="sr-out"><?php echo tpl_getLang('a11y_sidebartoggle')?></span></a>
                             </div>
-                            <?php } ?>
 
                             <h6 class="sr-only" role="heading" aria-level="2"><?php echo  tpl_getLang('head_menu_status')  ?></h6>
 
@@ -285,7 +276,7 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* page quality / page tasks */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                include('tpl/nav-page-attributes.php');
+                                include('tpl/nav-page-quality-tasks.php');
                             ?>
 
                             <?php
@@ -303,9 +294,7 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* page tools */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                                if(!tpl_getConf('closedwiki') || $INPUT->server->has('REMOTE_USER')) {
-                                    include('tpl/nav-page-tools.php');
-                                }
+                                include('tpl/nav-page-tools.php');
                             ?>
 
                         </div>
@@ -323,25 +312,8 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
                                 include('tpl/nav-meta-box.php'); ?>
                             </div>
 
-                            <div class="qc-output"></div>
-                            <?php
-                            /** @var action_plugin_highlightparent $highlightParent */
-                            $highlightParent = plugin_load('action', 'highlightparent');
-                            if ($highlightParent) {
-                                echo $highlightParent->tpl();
-                            }
-                            ?>
-                            <?php
-                            /** @var helper_plugin_translation $translation */
-                            $translation = plugin_load('helper','translation');
-                            if ($translation) {
-                                echo $translation->showTranslations();
-                            }
-                            ?>
-                            <div class="page-content">
-                                <div class="msg-area"><?php html_msgarea();/*msg('Information.', 0);msg('Success', 1);msg('Notification', 2);msg('Fehler', -1);*/ ?></div>
-                                <div class="clearer"></div>
-                            </div>
+
+                            <div class="msg-area"><?php html_msgarea();/*msg('Information.', 0);msg('Success', 1);msg('Notification', 2);msg('Fehler', -1);*/ ?></div>
                             <?php
 
 
@@ -403,7 +375,16 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
                 <div class="col-xs-12">
 
                     <div class="main-footer">
-                        <?php include 'tpl/main-footer.php'; ?>
+                        <p>
+                            <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* copyright */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                            tpl_license($img = false, $imgonly = false, $return = false, $wrap = false);
+                            ?>
+                        </p>
                     </div>
 
                 </div>
@@ -417,14 +398,5 @@ $classWideContent = (Template::getInstance())->fullWidthClass();
 
 <div class="no"><?php tpl_indexerWebBug() /* provide DokuWiki housekeeping, required in all templates */ ?></div>
 
-<script type="text/javascript">
-    document.querySelector("#themeDark").addEventListener("change", (e) => {
-      setTheme(e.target.checked ? "dark" : "system");
-    });
-
-    document.querySelector("#themeLight").addEventListener("change", (e) => {
-      setTheme(e.target.checked ? "light" : "system");
-    });
-</script>
 </body>
 </html>
diff --git a/mediamanager.php b/mediamanager.php
index 7d45615..dd98bf3 100755
--- a/mediamanager.php
+++ b/mediamanager.php
@@ -1,3 +1,4 @@
+<!DOCTYPE html>
 <?php
 /**
  * DokuWiki Media Manager Popup
@@ -11,7 +12,6 @@ if (!defined('DOKU_INC')) die();
 header('X-UA-Compatible: IE=edge,chrome=1');
 
 ?>
-<!DOCTYPE html>
 <html class="edge no-js" lang="<?php echo $conf['lang'] ?>" dir="<?php echo $lang['direction'] ?>">
 <head>
     <?php
diff --git a/script.js b/script.js
index a4c34e3..0636fe1 100755
--- a/script.js
+++ b/script.js
@@ -1,10 +1,9 @@
+/* DOKUWIKI:include js/base/helper.js */
+/* DOKUWIKI:include js/base/spc.js */
+
 /* DOKUWIKI:include js/plugins/do_tasks.js */
-/* DOKUWIKI:include js/plugins/qc.js */
-/* DOKUWIKI:include js/plugins/bookcreator.js */
-/* DOKUWIKI:include js/plugins/folded.js */
 
 /* DOKUWIKI:include js/meta-box.js */
 /* DOKUWIKI:include js/sidebar.js */
-/* DOKUWIKI:include js/direct.js */
-/* DOKUWIKI:include js/anchor.js */
+/* DOKUWIKI:include js/breadcrumb.js */
 
diff --git a/style.ini b/style.ini
index 8418c54..1fd8b20 100755
--- a/style.ini
+++ b/style.ini
@@ -32,13 +32,14 @@
 ../dokuwiki/css/_links.css            = screen
 ../dokuwiki/css/_toc.css              = screen
 ../dokuwiki/css/_footnotes.css        = screen
-../dokuwiki/css/_search.less          = screen
+../dokuwiki/css/_search.css           = screen
 ../dokuwiki/css/_recent.css           = screen
 ../dokuwiki/css/_diff.css             = screen
 ../dokuwiki/css/_edit.css             = screen
 ../dokuwiki/css/_modal.css            = screen
 ../dokuwiki/css/_forms.css            = screen
 ../dokuwiki/css/_admin.less           = screen
+../dokuwiki/css/pagetools.less        = screen
 ../dokuwiki/css/content.less          = screen
 
 
@@ -50,9 +51,7 @@
 
 ; _____________  basic styles  _____________
 
-css/base_vars.less                    = all
 css/base.less                         = all
-css/icons.less                        = all
 css/base_mixins.less                  = all
 css/base_fontello-icons.less          = all
 css/base_structure.less               = all
@@ -64,33 +63,24 @@ css/base_design.less                  = all
 css/area_content.less                 = all
 css/area_header.less                  = all
 css/area_footer.less                  = all
-css/area_footnotes.less               = all
 css/area_msg.less                     = all
 css/area_nav-direct.less              = all
 css/area_nav-breadcrumb.less          = all
-css/area_nav-page-attributes.less     = all
 css/area_nav-usertools.less           = all
+css/area_sidebar-search.less          = all
 css/area_nav-pagetools.less           = all
 css/area_nav-metabox.less             = all
 css/area_main-sidebar-nav.less        = all
-css/area_main-sidebar-tabs.less       = all
-css/area_main-sidebar-search.less     = all
+css/area_main-sidebar-content.less    = all
+;css/area_sidetools.less               = all
 css/area_main-content.less            = all
 css/area_main-content-secedit.less    = all
-css/area_main-content-anchor.less     = all
 css/area_togglelink.less              = all
 css/area_forms.less                   = all
 css/area_search.less                  = all
 css/area_tabs.less                    = all
-css/area_recent.less                  = all
-
-; ____________ template styles _____________
 
 css/template_admin.less               = all
-css/template_detail.less              = all
-
-; ____________ block styles ________________
-css/toollist.less                     = all
 
 
 ; _____________  plugin styles _____________
@@ -100,30 +90,22 @@ css/plugins/magic-matcher.less        = all
 css/plugins/do_tasks.less             = all
 css/plugins/qc.less                   = all
 css/plugins/struct.less               = all
-css/plugins/structstatus.less         = all
 css/plugins/bureaucracy.less          = all
 css/plugins/highlight_parent.less     = all
 css/plugins/edit.less                 = all
 css/plugins/mediamanager.less         = all
 css/plugins/tabinclude.less           = all
 css/plugins/tagging.less              = all
+css/plugins/include.less              = all
 css/plugins/edittable.less            = all
-css/plugins/tablelayout.less          = all
 css/plugins/extension__manager.less   = all
 css/plugins/folded.less               = all
 css/plugins/configmanager.less        = all
-css/plugins/starred.less              = all
-css/plugins/sitemapnavi.less          = all
-css/plugins/data.less                 = all
-css/plugins/fastwiki.less             = all
-css/plugins/tplinc.less               = all
-css/plugins/translation.less          = all
-css/plugins/wrap.less                 = all
 
 
 ; _____________  print styles  _____________
 
-css/print.less                        = print
+css/print.css                         = print
 
 
 
@@ -145,7 +127,7 @@ __site_width__              = "73%"              ; @ini_site_width
 
 
 ; alternative text and background colors
-__background_site__         = "#ECECEC"          ; @ini_background_site
+__background__              = "#ECECEC"          ; @ini_background                         (guaranteed for every plugin)
 
 __text_webframe__           = "#696969"          ; @ini_text_webframe
 
@@ -155,19 +137,19 @@ __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__              = "#FFF"             ; @ini_background                         (guaranteed for every plugin)
+__background_content__      = "#FFF"             ; @ini_background_content
 __text__                    = "#252525"          ; @ini_text                               (guaranteed for every plugin)
 
-__background_neu__          = "#FFF"             ; @ini_background_neu                     (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
+__border_light__            = "#dadada"          ; @ini_border_light
 __background_page_footer__  = "#252525"          ; @ini_background_page_footer
 
 
 ; highlighted text (e.g. search snippets)
-__highlight__               = "#EFEFEF"          ; @ini_highlight                          (guaranteed for every plugin)
+__highlight__               = "#efefef"          ; @ini_highlight                          (guaranteed for every plugin)
 __highlight_text__          = "#252525"          ; @ini_highlight_text
 
 
@@ -181,13 +163,12 @@ __link__                    = "#286DA8"          ; @ini_link
 __button_color__            = "#FFF"             ; @ini_button_color
 __button_background__       = "#286DA8"          ; @ini_button_background
 
-__background_alt__          = "#F6F6F6"          ; @ini_background_alt                     (guaranteed for every plugin)
+__background_alt__          = "#f6f6f6"          ; @ini_background_alt                     (guaranteed for every plugin)
 __text_alt__                = "#454545"          ; @ini_text_alt                           (guaranteed for every plugin)
-__link_alt__                = "#286DA8"          ; @ini_link_alt
 
 
 ; border color
-__border__                  = "#BBB"             ; @ini_border                             (guaranteed for every plugin)
+__border__                  = "#bbbbbb"          ; @ini_border                             (guaranteed for every plugin)
 
 __default_border_radius__   = "3px"              ; @ini_default_border_radius
 
diff --git a/svg.php b/svg.php
index 6688fc8..f0bad62 100644
--- a/svg.php
+++ b/svg.php
@@ -86,7 +86,7 @@ class SVG {
 
     const IMGDIR = __DIR__ . '/img/';
     const BACKGROUNDCLASS = 'sprintdoc-background';
-    const CDNBASE = 'https://raw.githubusercontent.com/Templarian/MaterialDesign/master/svg/';
+    const CDNBASE = 'https://cdn.rawgit.com/Templarian/MaterialDesign/master/icons/svg/';
 
     protected $file;
     protected $replacements;
@@ -111,9 +111,7 @@ class SVG {
             } else {
                 // get it from material design icons
                 $file = getCacheName($svg, '.svg');
-                if (!file_exists($file)) {
-                    io_download(self::CDNBASE . $svg, $file);
-                }
+                io_download(self::CDNBASE . $svg, $file);
             }
 
         }
@@ -133,8 +131,8 @@ class SVG {
 
         header('Content-Type: image/svg+xml');
         $cachekey = md5($file . serialize($params) . $conf['template'] . filemtime(__FILE__));
-        $cache = new \dokuwiki\Cache\Cache($cachekey, '.svg');
-        $cache->setEvent('SVG_CACHE');
+        $cache = new \cache($cachekey, '.svg');
+        $cache->_event = 'SVG_CACHE';
 
         http_cached($cache->cache, $cache->useCache(array('files' => array($file, __FILE__))));
         if($params['e']) {
@@ -175,16 +173,11 @@ class SVG {
         $xml = simplexml_load_file($file, SvgNode::class);
 
         $def = hsc((string) $xml->path['d']);
-        $w = hsc($xml['width'] ?? '100%');
-        $h = hsc($xml['height'] ?? '100%');
+        $w = hsc($xml['width']);
+        $h = hsc($xml['height']);
         $v = hsc($xml['viewBox']);
 
-        // if viewbox is not defined, construct it from width and height, if available
-        if (empty($v) && !empty($w) && !empty($h)) {
-            $v = hsc("0 0 $w $h");
-        }
-
-        return "<svg viewBox=\"$v\"><path d=\"$def\" /></svg>";
+        return "<svg width=\"$w\" height=\"$h\" viewBox=\"$v\"><path d=\"$def\" /></svg>";
     }
 
     /**
@@ -323,18 +316,9 @@ class SVG {
      */
     protected function initReplacements() {
         global $conf;
-        if (!class_exists('\dokuwiki\StyleUtils')) {
-            // Pre-Greebo Compatibility
-
-            define('SIMPLE_TEST', 1); // hacky shit
-            include DOKU_INC . 'lib/exe/css.php';
-            $ini = css_styleini($conf['template']);
-            $this->replacements = $ini['replacements'];
-            return;
-        }
-
-        $stuleUtils = new \dokuwiki\StyleUtils();
-        $ini = $stuleUtils->cssStyleini('sprintdoc');
+        define('SIMPLE_TEST', 1); // hacky shit
+        include DOKU_INC . 'lib/exe/css.php';
+        $ini = css_styleini($conf['template']);
         $this->replacements = $ini['replacements'];
     }
 }
diff --git a/template.info.txt b/template.info.txt
index fd40cd9..861a96e 100755
--- a/template.info.txt
+++ b/template.info.txt
@@ -1,7 +1,7 @@
 base     sprintdoc
 author   Jana Deutschlaender
-email    dokuwiki@cosmocode.de
-date     2024-10-14
+email    deutschlaender@cosmocode.de
+date     2017-04-13
 name     sprintDoc Template
-desc     modern, responsive template that integrates multiple plugins
-url      https://www.dokuwiki.org/template:sprintdoc
+desc     DokuWiki Template for sprintDoc Project
+url      FIXME URL
diff --git a/tpl.php b/tpl.php
index 1334488..98a8663 100644
--- a/tpl.php
+++ b/tpl.php
@@ -45,7 +45,7 @@ class tpl {
                       $linktarget = wl($data['id'], $data['params'], false, '&');
                   }
       $caption = $lang['btn_' . $data['type']];
-      if(strpos($caption, '%s') !== false) {
+      if(strpos($caption, '%s')) {
                       $caption = sprintf($caption, $data['replacement']);
                   }
 
@@ -83,7 +83,7 @@ class tpl {
                       $args['rel'] = 'nofollow';
                   }
 
-      $args['href'] = $link ?: '#';
+      $args['href'] = $link;
 
       $svg = inlineSVG($svg);
       if(!$svg) $svg = inlineSVG(__DIR__ . '/images/tools/' . self::$icons['default']);
@@ -97,90 +97,4 @@ class tpl {
 
       return $out;
   }
-
-    /**
-     * Assemble the tools for the current page
-     *
-     * It also includes the tools for some plugins, if they are installed and enabled. This does currently not trigger
-     * any events, but should be adjusted to the standard dokuwiki template, once that has svg-functionality implemented.
-     *
-     * @return array
-     */
-    static public function assemblePageTools() {
-      $data = array(
-          'view'  => 'main-svg',
-          'items' => array(
-              'edit'      => static::pageToolAction('edit'),
-              'revert'    => static::pageToolAction('revert'),
-              'revisions' => static::pageToolAction('revisions'),
-              'backlink'  => static::pageToolAction('backlink'),
-              'subscribe' => static::pageToolAction('subscribe'),
-          )
-      );
-
-      $data['items'] = array_map(function ($elem) {
-          return '<li>' . $elem . '</li>';
-      },array_filter($data['items']));
-
-      /**
-       * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-       * Begin shims as a temporary solution until the svg-approach is mainlined and the plugins have adapted
-       * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-       */
-      global $ACT;
-      if (act_clean($ACT) === 'show') {
-          /** @var \action_plugin_move_rename $move */
-          $move = plugin_load('action', 'move_rename');
-          if ($move && $move->getConf('pagetools_integration')) {
-              $attr = array(
-                  'style' => 'background-image: none;',
-              );
-              $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem('', $move->getLang('renamepage'), __DIR__ . '/images/tools/41-format-paint.svg', $attr);
-              $data['items'][] = '<li class="plugin_move_page">' . $item . '</li>';
-          }
-
-          /** @var \action_plugin_odt_export $odt */
-          $odt = plugin_load('action', 'odt_export');
-          if ($odt && $odt->getConf('showexportbutton')) {
-              global $ID, $REV;
-              $params = array('do' => 'export_odt');
-              if ($REV) {
-                  $params['rev'] = $REV;
-              }
-              $attr = array(
-                  'class' => 'action export_pdf',
-                  'style' => 'background-image: none;',
-              );
-              $svg = __DIR__ . '/images/tools/43-file-delimeted.svg';
-              $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem(wl($ID, $params, false, '&'), $odt->getLang('export_odt_button'), $svg, $attr);
-              $data['items'][] = '<li>' . $item . '</li>';
-          }
-
-          /** @var \action_plugin_dw2pdf $dw2pdf */
-          $dw2pdf = plugin_load('action', 'dw2pdf');
-          if ($dw2pdf && $dw2pdf->getConf('showexportbutton')) {
-              global $ID, $REV;
-
-              $params = array('do' => 'export_pdf');
-              if ($REV) {
-                  $params['rev'] = $REV;
-              }
-              $attr = array(
-                  'class' => 'action export_pdf',
-                  'style' => 'background-image: none;',
-              );
-              $svg = __DIR__ . '/images/tools/40-pdf-file.svg';
-              $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem(wl($ID, $params, false, '&'), $dw2pdf->getLang('export_pdf_button'), $svg, $attr);
-              $data['items'][] = '<li>' . $item . '</li>';
-          }
-      }
-      /**
-       * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-       * End of shims
-       * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
-       */
-
-      $data['items']['top'] = '<li>' . static::pageToolAction('top') . '</li>';
-      return $data;
-  }
 }
diff --git a/tpl/favicon_tiles.php b/tpl/favicon_tiles.php
index ebd8d8a..81bd26a 100755
--- a/tpl/favicon_tiles.php
+++ b/tpl/favicon_tiles.php
@@ -17,7 +17,7 @@ echo Template::getResizedImgTag(
     'link',
     array(
         'rel' => 'shortcut icon',
-        'href' => array('wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo-square.png')
+        'href' => array('wiki:favicon.ico', 'wiki:favicon.png', tpl_getConf('logo'))
     ),
     0, 0 // no scaling
 );
@@ -29,7 +29,7 @@ foreach(array(57, 60, 72, 76, 114, 120, 144, 152, 180) as $size) {
         array(
             'rel' => 'apple-touch-icon',
             'sizes' => $size . 'x' . $size,
-            'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png'),
+            'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo'))
         ),
         $size, $size
     );
@@ -42,7 +42,7 @@ foreach(array(32, 96, 192) as $size) {
         array(
             'rel' => 'icon',
             'sizes' => $size . 'x' . $size,
-            'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png')
+            'href' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo'))
         ),
         $size, $size
     );
@@ -54,7 +54,7 @@ foreach(array(70, 310) as $size) {
         'meta',
         array(
             'name' => 'msapplication-square' . $size . 'x' . $size . 'logo',
-            'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:favicon.ico', 'wiki:favicon.png', 'wiki:logo.png'),
+            'content' => array('wiki:logo-' . $size . 'x' . $size . '.png', 'wiki:logo-square.png', 'wiki:logo.png', tpl_getConf('logo'))
         ),
         $size, $size
     );
@@ -66,7 +66,7 @@ foreach(array(array(310, 150)) as $size) {
         'meta',
         array(
             'name' => 'msapplication-wide' . $size[0] . 'x' . $size[1] . 'logo',
-            'content' => array('wiki:logo-' . $size[0] . 'x' . $size[1] . '.png', 'wiki:logo-wide.png', 'wiki:logo.png')
+            'content' => array('wiki:logo-' . $size[0] . 'x' . $size[1] . '.png', 'wiki:logo-wide.png', 'wiki:logo.png', tpl_getConf('logo'))
         ),
         $size[0], $size[1]
     );
diff --git a/tpl/main-footer.php b/tpl/main-footer.php
deleted file mode 100644
index 7e12ae8..0000000
--- a/tpl/main-footer.php
+++ /dev/null
@@ -1,25 +0,0 @@
-<?php
-global $conf;
-
-if ($conf['license']) {
-    echo '<p>';
-    tpl_license($img = false, $imgonly = false, $return = false, $wrap = false);
-    echo '</p>';
-}
-
-if (tpl_getConf('copyright')) {
-    $copy = str_replace(
-        [
-            '%year%',
-            '%title%',
-            '%TITLE%',
-        ],
-        [
-            date('Y'),
-            $conf['title'],
-            dokuwiki\Utf8\PhpString::strtoupper($conf['title']),
-        ],
-        tpl_getConf('copyright')
-    );
-    echo '<p>' . $copy . '</p>';
-}
diff --git a/tpl/main-sidebar-nav.php b/tpl/main-sidebar-nav.php
index d97fa87..4fe6344 100644
--- a/tpl/main-sidebar-nav.php
+++ b/tpl/main-sidebar-nav.php
@@ -1,127 +1,62 @@
-<?php
-echo \dokuwiki\template\sprintdoc\Template::getInstance()->getNavigation();
-?>
+<nav class="nav-main">
+    <?php /* main navigation, loaded from sidebar, fixed up by javascript */
+    tpl_include_page($conf['sidebar'], 1, 1);
+    ?>
+</nav>
 
 <nav class="nav-sitetools">
-    <div class="nav themeToggle" id="themeToggleLight">
-        <input
-          id="themeLight"
-          type="checkbox"
-          aria-label="Switch between dark and light mode"
-        />
-        <label for="themeLight">
-          <span class="ico">
-              <i data-icon="light"></i>
-          </span>
-          <span class="lbl"><?php echo tpl_getLang('custom_modeswitch'); ?></span>
-        </label>
-    </div>
-    <div class="nav themeToggle" id="themeToggleDark">
-        <input
-          id="themeDark"
-          type="checkbox"
-          aria-label="Switch between dark and light mode"
-        />
-        <label for="themeDark">
-          <span class="ico">
-              <i data-icon="light"></i>
-          </span>
-          <span class="lbl"><?php echo tpl_getLang('custom_modeswitch'); ?></span>
-        </label>
-    </div>
-    <div class="nav-panel hidden"></div>
-    <div class="nav"><a href="#sidebar-site-tools" role="heading" aria-level="2">
-            <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/sitemap.svg') ?></span>
-            <span class="lbl"><?php echo $lang['site_tools']; ?></span>
-        </a></div>
+    <a class="nav" role="heading" aria-level="2">
+        <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/sitemap.svg') ?></span>
+        <span class="lbl"><?php echo $lang['site_tools']; ?></span>
+    </a>
     <div class="nav-panel level1">
-        <ul id="sidebar-site-tools" class="toollist">
+        <ul>
             <?php
-            if (file_exists(DOKU_INC . 'inc/Menu/SiteMenu.php')) {
-                echo (new \dokuwiki\Menu\SiteMenu())->getListItems('toollist__listitem ');
-            } else {
-                //Pre-Greebo Backwards compatibility
-                tpl_toolsevent(
-                    'sitetools',
-                    array(
-                        'recent' => tpl_action('recent', 1, 'li', 1),
-                        'media' => tpl_action('media', 1, 'li', 1),
-                        'index' => tpl_action('index', 1, 'li', 1),
-                    )
-                );
-            }
+            tpl_toolsevent(
+                'sitetools',
+                array(
+                    'recent' => tpl_action('recent', 1, 'li', 1),
+                    'media' => tpl_action('media', 1, 'li', 1),
+                    'index' => tpl_action('index', 1, 'li', 1),
+                )
+            );
             ?>
         </ul>
     </div>
 </nav>
 
 
-
 <nav class="nav-usermenu">
-    <div class="nav"><a href="#sidebar-user-tools" role="heading" aria-level="2">
-            <span class="ico"><i data-icon="creature" class="glow"></i></span>
-            <span class="lbl"><?php echo $lang['user_tools']; ?></span>
-        </a></div>
+    <a class="nav" role="heading" aria-level="2">
+        <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/account-settings.svg') ?></span>
+        <span class="lbl"><?php echo $lang['user_tools']; ?></span>
+    </a>
     <div class="nav-panel level1">
-        <ul id="sidebar-user-tools" class="toollist">
+        <ul>
             <?php /* dokuwiki user tools */
-            if (file_exists(DOKU_INC . 'inc/Menu/UserMenu.php')) {
-                echo (new \dokuwiki\Menu\UserMenu())->getListItems('toollist__listitem ');
-            } else {
-                //Pre-Greebo Backwards compatibility
-                tpl_toolsevent(
-                    'usertools',
-                    array(
-                        'login' => tpl_action('login', 1, 'li', 1),
-                        'profile' => tpl_action('profile', 1, 'li', 1),
-                        'admin' => tpl_action('admin', 1, 'li', 1),
-                        'register' => tpl_action('register', 1, 'li', 1),
-                    )
-                );
-            }
+            tpl_toolsevent(
+                'usertools',
+                array(
+                    'login' => tpl_action('login', 1, 'li', 1),
+                    'profile' => tpl_action('profile', 1, 'li', 1),
+                    'admin' => tpl_action('admin', 1, 'li', 1),
+                    'register' => tpl_action('register', 1, 'li', 1),
+                )
+            );
             ?>
         </ul>
     </div>
 </nav>
 
-<?php
-/** @var helper_plugin_starred $plugin_starred */
-$plugin_starred = plugin_load('helper', 'starred');
-$stars = array();
-if($plugin_starred) $stars = $plugin_starred->loadStars();
-if($stars):
-    ?>
-    <nav class="nav-starred">
-        <div class="nav"><a href="#sidebar-menu-starred" role="heading" aria-level="2">
-                <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/star-circle.svg') ?></span>
-                <span class="lbl"><?php echo tpl_getLang('head_menu_starred'); ?></span>
-            </a></div>
-        <div class="nav-panel level1 plugin_starred">
-            <ul id="sidebar-menu-starred">
-                <?php
-                foreach($stars as $pid => $time) {
-                    echo '<li>';
-                    echo $plugin_starred->starHtml($ID, $pid);
-                    echo '&nbsp;';
-                    echo html_wikilink(":$pid");
-                    echo '</li>';
-                }
-                ?>
-            </ul>
-        </div>
-    </nav>
-<?php endif; ?>
-
-
 
 <?php if($conf['breadcrumbs']): ?>
     <nav class="nav-trace">
-        <div class="nav"><a href="#sidebar-menu_trace" role="heading" aria-level="2">
-                <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/apple-safari.svg') ?></span>
-                <span class="lbl"><?php echo tpl_getLang('head_menu_trace'); ?></span>
-            </a></div>
+        <a class="nav" role="heading" aria-level="2">
+            <span class="ico"><?php echo inlineSVG(__DIR__ . '/../img/apple-safari.svg') ?></span>
+            <span class="lbl"><?php echo tpl_getLang('head_menu_trace'); ?></span>
+        </a>
         <div class="nav-panel level1">
-            <ul id="sidebar-menu_trace">
+            <ul>
                 <?php /* trace breadcrumbs as list */
                 // FIXME move to helper class
                 $crumbs = breadcrumbs();
diff --git a/tpl/main-sidebar-search.php b/tpl/main-sidebar-search.php
index c6c2b7e..f375d13 100755
--- a/tpl/main-sidebar-search.php
+++ b/tpl/main-sidebar-search.php
@@ -2,5 +2,5 @@
 if(!defined('DOKU_INC')) die();
 
 echo '<h6 class="sr-only" role="heading" aria-level="2">' . tpl_getLang('head_quick_search') . '</h6>';
-echo '<p class="toggleSearch"><a href="#qsearch__out"><span class="prefix">' . tpl_getLang('jump_to_quicksearch') . '</span></a></p>';
+echo '<p class="toggleSearch"><a href="#qsearch__out"><span class="prefix">' . tpl_getLang('a11y_search') . '</span></a></p>';
 tpl_searchform(true, false);
diff --git a/tpl/nav-breadcrumb.php b/tpl/nav-breadcrumb.php
index a8c2680..4ce634a 100755
--- a/tpl/nav-breadcrumb.php
+++ b/tpl/nav-breadcrumb.php
@@ -1,13 +1,11 @@
 <?php
-if(!defined('DOKU_INC')) die();
+    if (!defined('DOKU_INC')) die();
 
-    if ($conf['youarehere']): ?>
-        <h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_breadcrumb_youarehere') ?></h6>
-        <p>
-            <?php
-            tpl_youarehere();
-            \dokuwiki\template\sprintdoc\Template::getInstance()->breadcrumbSuffix();
-            ?>
-        </p>
+    if ($conf['breadcrumbs']): ?>
 
-<?php endif ?>
+
+                                    <h6 class="sr-only" role="heading" aria-level="2"><?php echo tpl_getLang('head_breadcrumb') ?></h6>
+                                    <p><?php tpl_youarehere() ?></p>
+
+
+    <?php endif ?>
diff --git a/tpl/nav-direct.php b/tpl/nav-direct.php
index 09b91dd..6f4b6d9 100755
--- a/tpl/nav-direct.php
+++ b/tpl/nav-direct.php
@@ -10,10 +10,9 @@
                         <p>
                             <span class="sr-out"><?php echo tpl_getLang('direct_prefix'); ?>: </span>
                             <span class="skip">
-                                <a rel="nofollow" href="#qsearch__in"><?php echo tpl_getLang('direct_quick_search'); ?></a><span class="sr-out"> /</span>
+                                <a rel="nofollow" href="#content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
                                 <a rel="nofollow" href="#dokuwiki__usertools"><?php echo $lang['user_tools']; ?></a><span class="sr-out"> /</span>
-                                <a rel="nofollow" href="#dokuwiki__content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
-                                <a rel="nofollow" href="#spr__toggle-content"><?php echo tpl_getLang('direct_content_toggle');  ?></a>
+                                <a rel="nofollow" href="#nav-main"><?php echo tpl_getLang('direct_menu_main');  ?></a>
                             </span>
                         </p>
 
diff --git a/tpl/nav-meta-box.php b/tpl/nav-meta-box.php
index d8b9e5c..c83145d 100755
--- a/tpl/nav-meta-box.php
+++ b/tpl/nav-meta-box.php
@@ -12,7 +12,7 @@ $tabs = \dokuwiki\template\sprintdoc\Template::getInstance()->getMetaBoxTabs();
             if (empty($tab['tab']) || trim($tab['tab']) === '') {
                 continue;
             }
-            echo '<li class="' . $tab['id'] . '">';
+            echo '<li>';
             echo '<a href="#' . $tab['id'] . '" aria-expanded="false">';
             echo '<span class="prefix">';
             echo $tab['label'];
diff --git a/tpl/nav-page-attributes.php b/tpl/nav-page-attributes.php
deleted file mode 100755
index 58d220e..0000000
--- a/tpl/nav-page-attributes.php
+++ /dev/null
@@ -1,65 +0,0 @@
-<?php
-if(!defined('DOKU_INC')) die();
-
-/** @var \helper_plugin_do $doPlugin */
-$doPlugin = plugin_load('helper', 'do');
-/** @var \helper_plugin_qc $qcPlugin */
-$qcPlugin = plugin_load('helper', 'qc');
-/** @var \action_plugin_starred $starredPlugin */
-$starredPlugin = plugin_load('action', 'starred');
-/** @var \helper_plugin_quicksubscribe $quickSubPlugin */
-$quickSubPlugin = plugin_load('helper', 'quicksubscribe');
-
-if($doPlugin !== null || $qcPlugin !== null || $starredPlugin !== null) {
-    echo '<ul class="page-attributes">';
-}
-
-
-if($qcPlugin && $qcPlugin->shouldShow()) {
-    $qcPrefix = tpl_getLang('quality_trigger');
-    echo '<li class="plugin_qc"><strong class="sr-out">'.$qcPrefix.':</strong><a href="#"></a></li>'; // filled by javascript
-}
-
-
-if($doPlugin !== null) {
-    $count = $doPlugin->getPageTaskCount();
-    $num = $count['count'];
-    $title = "";
-
-    if($num == 0) { // no tasks - does not exist do in plug-in
-        $class = "do_none";
-        $title = tpl_getLang('tasks_page_none');
-    } elseif($count['undone'] == 0) { // all tasks done
-        $class = 'do_done';
-        $title = $doPlugin->getLang('title_alldone');
-    } elseif($count['late'] == 0) { // open tasks but none late
-        $class = 'do_undone';
-        $title = sprintf(tpl_getLang('tasks_page_intime'), $count['undone']);
-    } else { // late tasks
-        $class = 'do_late';
-        $title = sprintf(tpl_getLang('tasks_page_late'), $count['undone'], $count['late']);
-    }
-
-    echo '<li class="plugin_do_pagetasks">';
-    echo '<span title="'.$title.'" class="'.$class.'">';
-    echo inlineSVG(DOKU_PLUGIN . 'do/pix/clipboard-text.svg');
-    echo '</span>';
-    echo '<span class="num">' . $count['undone'] . '</span>';
-    echo '</li>';
-}
-
-if($starredPlugin !== null) {
-    echo '<li class="plugin_starred">';
-    $starredPlugin->tpl_starred();
-    echo '</li>';
-}
-
-if($quickSubPlugin !== null) {
-    echo '<li class="plugin_quicksubscribe">';
-    echo $quickSubPlugin->tpl_subscribe();
-    echo '</li>';
-}
-
-if($doPlugin !== null || $qcPlugin !== null || $starredPlugin !== null) {
-    echo "</ul>";
-}
diff --git a/tpl/nav-page-quality-tasks.php b/tpl/nav-page-quality-tasks.php
new file mode 100755
index 0000000..2a1977c
--- /dev/null
+++ b/tpl/nav-page-quality-tasks.php
@@ -0,0 +1,54 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+?>
+
+<?php
+    /** @var \helper_plugin_do $doPlugin */
+    $doPlugin = plugin_load('helper','do');
+
+    /** @var \helper_plugin_qc $qc */
+    $qc = plugin_load('helper','qc');
+    if ($doPlugin !== null ||$qc ) {
+        echo "<ul class=\"page-attributes\">";
+    }
+    if ($qc) {
+        echo "<li class=\"plugin__qc do_none\"><a id=\"plugin__qc__link\" aria-expanded=\"false\" href=\"#plugin__qc__wrapper\"><span class=\"prefix\">".tpl_getLang('quality_trigger')."</span><span class=\"num\">0</span></strong></a>";
+        $qc->tplErrorCount();
+        echo "</li>";
+    }
+    if ($doPlugin !== null ) {
+        $count = $doPlugin->getPageTaskCount();
+        $num = $count['count'];
+        $title = "";
+
+        if($num == 0){ // no tasks - does not exist do in plug-in
+            $class = "do_none";
+            $title = tpl_getLang('tasks_page_none');
+        } elseif($count['undone'] == 0){ // all tasks done
+            $class = 'do_done';
+            $title = $this->getLang('title_alldone');
+        }elseif($count['late'] == 0) { // open tasks but none late
+            $class = 'do_undone';
+            $title = sprintf($this->getLang('title_intime'), $count['undone']);
+        } else { // late tasks
+            $class = 'do_late';
+            $title = sprintf($this->getLang('title_late'), $count['undone'], $count['late']);
+        }
+        $markup = "<li class=\"plugin__do_pagetasks ".$class."\" title=\"'.$title.'\"><strong><span class=\"prefix\">".tpl_getLang('prefix_tasks_page')." </span><span class=\"num\">".$num."</span></strong></li>";
+
+        echo $markup;
+    }
+
+    if ($doPlugin !== null ||$qc ) {
+        echo "</ul>";
+    }
+
+/*
+
+
+$out = '<div class="plugin__do_pagetasks" title="' . $title . '"><span class="' . $class . '">';
+$out .= $count['undone'];
+$out .= '</span></div>';
+
+if($return) return $out;
+echo $out;*/
diff --git a/tpl/nav-page-tools.php b/tpl/nav-page-tools.php
index bf4e352..f57d335 100755
--- a/tpl/nav-page-tools.php
+++ b/tpl/nav-page-tools.php
@@ -1,27 +1,93 @@
 <?php
-if (!defined('DOKU_INC')) {
-    die();
-}
+    if (!defined('DOKU_INC')) die();
 ?>
 
+<?php if ($showTools): ?>
+    <nav id="dokuwiki__pagetools">
+        <div class="tools">
 
-<nav id="dokuwiki__pagetools">
-    <div class="tools">
+        <?php include('nav-status.php');?>
+            <ul>
+                <?php
+                $data = array(
+                    'view'  => 'main-svg',
+                    'items' => array(
+                            'edit'      => dokuwiki\template\sprintdoc\tpl::pageToolAction('edit'),
+                            'revert'    => dokuwiki\template\sprintdoc\tpl::pageToolAction('revert'),
+                            'revisions' => dokuwiki\template\sprintdoc\tpl::pageToolAction('revisions'),
+                            'backlink'  => dokuwiki\template\sprintdoc\tpl::pageToolAction('backlink'),
+                            'subscribe' => dokuwiki\template\sprintdoc\tpl::pageToolAction('subscribe'),
+                            'top'       => dokuwiki\template\sprintdoc\tpl::pageToolAction('top'),
+                         )
+                     );
 
-        <?php include('nav-status.php'); ?>
-        <ul>
-            <?php
-            if (file_exists(DOKU_INC . '/inc/Menu/PageMenu.php')) {
-                echo (new \dokuwiki\Menu\PageMenu())->getListItems();
-            } else {
-                //Pre-Greebo Backwards compatibility
-                $data = dokuwiki\template\sprintdoc\tpl::assemblePageTools();
 
                 foreach ($data['items'] as $k => $html) {
-                    echo $html;
+                    if ($html) {
+                        echo "<li>$html</li>";
+                    }
                 }
-            }
-            ?>
-        </ul>
-    </div>
-</nav>
+
+                /**
+                 * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                 * Begin shims as a temporary solution until the svg-approach is mainlined and the plugins have adapted
+                 * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                 */
+                global $ACT;
+                if (act_clean($ACT) === 'show') {
+                    /** @var action_plugin_move_rename $move */
+                    $move = plugin_load('action', 'move_rename');
+                    if ($move && $move->getConf('pagetools_integration')) {
+                        $attr = array(
+                            'style' => 'background-image: none;',
+                        );
+                        $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem('', $move->getLang('renamepage'), __DIR__ . '/../images/tools/41-format-paint.svg', $attr);
+                        echo '<li class="plugin_move_page">' . $item . '</li>';
+                    }
+
+                    /** @var action_plugin_odt_export $odt */
+                    $odt = plugin_load('action', 'odt_export');
+                    if ($odt && $odt->getConf('showexportbutton')) {
+                        global $ID, $REV;
+                        $params = array('do' => 'export_odt');
+                        if ($REV) {
+                            $params['rev'] = $REV;
+                        }
+                        $attr = array(
+                            'class' => 'action export_pdf',
+                            'style' => 'background-image: none;',
+                        );
+                        $svg = __DIR__ . '/../images/tools/43-file-delimeted.svg';
+                        $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem(wl($ID, $params, false, '&'), $odt->getLang('export_odt_button'), $svg, $attr);
+                        echo '<li>' . $item . '</li>';
+                    }
+
+                    /** @var action_plugin_dw2pdf $dw2pdf */
+                    $dw2pdf = plugin_load('action', 'dw2pdf');
+                    if ($dw2pdf && $dw2pdf->getConf('showexportbutton')) {
+                        global $ID, $REV;
+
+                        $params = array('do' => 'export_pdf');
+                        if ($REV) {
+                            $params['rev'] = $REV;
+                        }
+                        $attr = array(
+                            'class' => 'action export_pdf',
+                            'style' => 'background-image: none;',
+                        );
+                        $svg = __DIR__ . '/../images/tools/40-pdf-file.svg';
+                        $item = \dokuwiki\template\sprintdoc\tpl::pageToolItem(wl($ID, $params, false, '&'), $dw2pdf->getLang('export_pdf_button'), $svg, $attr);
+                        echo '<li>' . $item . '</li>';
+                    }
+                }
+                /**
+                 * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                 * End of shims
+                 * ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
+                 */
+
+                ?>
+            </ul>
+        </div>
+    </nav>
+<?php endif; ?>
diff --git a/tpl/nav-status.php b/tpl/nav-status.php
index 32888a1..7085553 100755
--- a/tpl/nav-status.php
+++ b/tpl/nav-status.php
@@ -2,5 +2,5 @@
     if (!defined('DOKU_INC')) die();
 ?>
 <div class="nav-status">
-    <!-- FIXME: structstatus integration -->
+    <?php tpl_include_page($conf['statusbar'], 1, 1) /* includes the nearest statusbar page */ ?>
 </div>
diff --git a/tpl/nav-usertools-buttons.php b/tpl/nav-usertools-buttons.php
index 5952401..1caff4c 100755
--- a/tpl/nav-usertools-buttons.php
+++ b/tpl/nav-usertools-buttons.php
@@ -1,59 +1,55 @@
 <?php
+    if (!defined('DOKU_INC')) die();
 
-use dokuwiki\Menu\Item\AbstractItem;
-use dokuwiki\Menu\Item\Admin;
-use dokuwiki\Menu\Item\Login;
-use dokuwiki\Menu\Item\Register;
+    if ($conf['useacl'] && $showTools): ?>
 
-if (!defined('DOKU_INC')) die();
+        <nav id="dokuwiki__usertools" class="nav-usertools <?php echo $navClass?>">
+            <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['user_tools']; ?></h6>
+            <ul>
+                <li class="log"><?php tpl_actionlink('login'); ?></li>
 
-if ($conf['useacl']): ?>
+                <?php
+                if (!empty($_SERVER['REMOTE_USER'])) {
+                    echo '<li class="user"><span class="sr-only">'.$lang['loggedinas'].' </span>'.userlink().'</li>';
+                }?>
 
-    <nav id="dokuwiki__usertools" class="nav-usertools <?php echo $navClass ?>">
-        <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['user_tools']; ?></h6>
-        <ul>
-            <?php
-            try {
-                $item = new Login();
-                if ($item->visibleInContext(AbstractItem::CTX_DESKTOP))
-                    echo '<li class="log">' . $item->asHtmlLink() . '</li>';
-            } catch (RuntimeException $ignored) {
-                // item not available
-            }
+                <?php /* dokuwiki user tools */
+                tpl_toolsevent('usertools', array(
+                    'admin'     => tpl_action('admin', 1, 'li', 1),
+                    'register'  => tpl_action('register', 1, 'li', 1),
+                )); ?>
 
-            if (!empty($_SERVER['REMOTE_USER'])) {
-                echo '<li class="user"><span class="sr-only">' . $lang['loggedinas'] . ' </span>' . userlink() . '</li>';
-            }
+                <?php /* tasks do Plug-In */
+                /** @var \helper_plugin_do $doplugin */
+                $doplugin = plugin_load('helper','do');
+                if ($doplugin !== null && isset($_SERVER['REMOTE_USER'])) {
+                    $tasks = $doplugin->loadTasks(array('status' => array('undone'),'user'   => $_SERVER['REMOTE_USER']));
+                    $num = count($tasks);
+                    switch ($num) {
+                        case 0: $class = 'noopentasks'; break;
+                        case 1:  $class = 'opentask'; break;
+                        default:
+                            $class = 'opentask opentasks';
+                            break;
+                    }
+                    $linktarget = tpl_getConf('tasks_page');
+                    $doInner = "<span class=\"prefix\">".tpl_getLang('prefix_tasks_user')." </span><span class=\"num\">".count($tasks)."</span>";
+                    if($linktarget){
+                        if (substr($linktarget, 0, 1) !== ':') {
+                            $linktarget = tpl_getConf('user_ns'). $_SERVER['REMOTE_USER'] .':' . $linktarget;
+                        }
+                        if($num == 0){
+                            echo '<li class="user-task '.$class.'"><strong>'.$doInner.'</strong></li>';
+                        }else{
+                            echo '<li class="user-task '.$class.'"><a href="'.wl($linktarget).'">'.$doInner.'</a></li>';
+                        }
+                    }
+                    else{
+                        echo '<li class="user-task '.$class.'"><strong>'.$doInner.'</strong></li>';
+                    }
+                } ?>
 
-            try {
-                $item = new Admin();
-                if ($item->visibleInContext(AbstractItem::CTX_DESKTOP)) {
-                    echo '<li class="admin">' . $item->asHtmlLink() . '</li>';
-                }
-            } catch (RuntimeException $ignored) {
-                // item not available
-            }
-
-            try {
-                $item = new Register();
-                if ($item->visibleInContext(AbstractItem::CTX_DESKTOP)) {
-                    echo '<li class="register">' . $item->asHtmlLink() . '</li>';
-                }
-            } catch (RuntimeException $ignored) {
-                // item not available
-            }
-
-            /** @var helper_plugin_do $doplugin */
-            $doplugin = plugin_load('helper', 'do');
-            if ($doplugin !== null && isset($_SERVER['REMOTE_USER'])) {
-                $icon = $doplugin->tpl_getUserTasksIconHTML();
-                if ($icon) {
-                    echo '<li class="user-task">' . $icon . '</li>';
-                }
-            }
-            ?>
-
-        </ul>
-    </nav><!-- #dokuwiki__usertools -->
-<?php endif ?>
+            </ul>
+        </nav><!-- #dokuwiki__usertools -->
+    <?php endif ?>