diff --git a/conf/default.php b/conf/default.php
index 417a7e1..102ef3b 100755
--- a/conf/default.php
+++ b/conf/default.php
@@ -4,6 +4,8 @@
  *
  */
 
+$conf['logo']             = 'logo.png';
+
 $conf['discussionPage']   = 'discussion:@ID@';
 $conf['userPage']         = 'user:@USER@:';
 $conf['hideTools']        = 0;
diff --git a/conf/metadata.php b/conf/metadata.php
index 9a62ec3..8ca9404 100755
--- a/conf/metadata.php
+++ b/conf/metadata.php
@@ -4,6 +4,8 @@
  *
  */
 
+$meta['logo']             = array('string');
+
 $meta['discussionPage']   = array('string');
 $meta['userPage']         = array('string');
 $meta['hideTools']        = array('onoff');
diff --git a/css/area_nav-usertools.less b/css/area_nav-usertools.less
index bcbadcd..0b19a1d 100644
--- a/css/area_nav-usertools.less
+++ b/css/area_nav-usertools.less
@@ -7,6 +7,7 @@
 .nav-usertools {
     ul{
         float: right;
+        padding: 0; margin: .2rem 0 0 0;
         li{
             display: inline-block;
             float: right;
diff --git a/images/logo.png b/images/logo.png
deleted file mode 100644
index 662f7ab..0000000
Binary files a/images/logo.png and /dev/null differ
diff --git a/lang/de/lang.php b/lang/de/lang.php
index 4479980..8145edc 100755
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -5,20 +5,24 @@
  * @license    GPL 2 (http://www.gnu.org/licenses/gpl.html)
  */
 
-$lang['direct_prefix']          = 'Direkt';
-$lang['direct_content_main']    = 'Hauptinhalt dieser Seite';
-$lang['direct_menu_main']       = 'Hauptmenü';
+$lang['direct_prefix']              = 'Direkt';
+$lang['direct_content_main']        = 'Hauptinhalt dieser Seite';
+$lang['direct_menu_main']           = 'Hauptmenü';
 
-$lang['nav-area-head']          = 'Navigationsmenüs und Suche';
-$lang['head_magic_matcher']     = 'MagicMatcher';
+$lang['adjunct_start_logo_text']    = 'Logo: ';
+$lang['adjunct_linked_logo_text']   = '. Link zur Startseite';
 
+$lang['nav-area-head']              = 'Navigationsmenüs und Suche';
+$lang['head_magic_matcher']         = 'MagicMatcher';
+$lang['head_quick_search']          = 'wikiübergreifende Schnellsuche';
+$lang['head_menu_main']             = 'Hauptmenü';
 
-$lang['discussion']             = 'Diskussion';
-$lang['back_to_article']        = 'Zurück zum Artikel';
-$lang['userpage']               = 'Benutzer-Seite';
-$lang['__existing__']           = 'The color for links to existing pages';
-$lang['__missing__']            = 'The color for links to non-existing pages';
-$lang['__site_width__']         = 'The width of the full site (can be any length unit: %, px, em, ...)';
-$lang['__sidebar_width__']      = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
+$lang['discussion']                 = 'Diskussion';
+$lang['back_to_article']            = 'Zurück zum Artikel';
+$lang['userpage']                   = 'Benutzer-Seite';
+$lang['__existing__']               = 'The color for links to existing pages';
+$lang['__missing__']                = 'The color for links to non-existing pages';
+$lang['__site_width__']             = 'The width of the full site (can be any length unit: %, px, em, ...)';
+$lang['__sidebar_width__']          = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
 
 //Setup VIM: ex: et ts=2 :
diff --git a/lang/en/lang.php b/lang/en/lang.php
index a961924..6f81d58 100755
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -4,17 +4,22 @@
  *
  */
 
-$lang['direct_prefix']          = 'jump to';
-$lang['direct_content_main']    = 'main content';
-$lang['direct_menu_main']       = 'main menu';
+$lang['direct_prefix']              = 'jump to';
+$lang['direct_content_main']        = 'main content';
+$lang['direct_menu_main']           = 'main menu';
 
-$lang['nav-area-head']          = 'menus and quick search';
-$lang['head_magic_matcher']     = 'MagicMatcher';
+$lang['adjunct_start_logo_text']    = 'Logo: ';
+$lang['adjunct_linked_logo_text']   = '. homepage link';
 
-$lang['discussion']             = 'Discussion';
-$lang['back_to_article']        = 'Back to article';
-$lang['userpage']               = 'User page';
-$lang['__existing__']           = 'The color for links to existing pages';
-$lang['__missing__']            = 'The color for links to non-existing pages';
-$lang['__site_width__']         = 'The width of the full site (can be any length unit: %, px, em, ...)';
-$lang['__sidebar_width__']      = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
+$lang['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['discussion']                 = 'Discussion';
+$lang['back_to_article']            = 'Back to article';
+$lang['userpage']                   = 'User page';
+$lang['__existing__']               = 'The color for links to existing pages';
+$lang['__missing__']                = 'The color for links to non-existing pages';
+$lang['__site_width__']             = 'The width of the full site (can be any length unit: %, px, em, ...)';
+$lang['__sidebar_width__']          = 'The width of the sidebar, if any (can be any length unit: %, px, em, ...)';
diff --git a/main.php b/main.php
index fe464fc..a7f99ed 100755
--- a/main.php
+++ b/main.php
@@ -79,10 +79,13 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 ?>
 <?php tpl_includeFile('meta.html') ?>
 </head>
-<?php /* #dokuwiki__top used as anchor for "back to top" button/link links */ ?>
-<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?>">
+<?php
 
 
+/* #dokuwiki__top used as anchor for "back to top" button/link links */
+?>
+<body id="dokuwiki__top" class="<?php echo tpl_classes(); ?>">
+
     <div id="dokuwiki__site">
         <?php
 
@@ -105,24 +108,6 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
             html_msgarea();
 
 
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* Headline Menu AREA */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-            ?>
-
-            <div class="nav-area-head">
-                <h5 class="sr-only" role="heading" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
-            </div><!-- .nav-area-head -->
-
-            <?php
-
-
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* MagicMatcher */
-/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-            include('tpl/nav-magicmatcher.php');
-
-
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* Include Hook: header.html */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
@@ -133,72 +118,139 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
                 <div class="container">
                     <div class="row">
                         <div class="col-xs-12">
+                            <div class="headings main-sidebar">
+
+                                <?php if (tpl_getConf('logo') && file_exists(mediaFN(tpl_getConf('logo')))){
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* 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');
+                                 } ?>
+                                <?php if ($conf['tagline']): ?>
+                                    <p class="claim"><?php echo $conf['tagline'] ?></p>
+                                <?php endif ?>
+                            </div><!-- .headings -->
+                        </div><!-- .col -->
+                    </div><!-- .row -->
+                </div><!-- .container -->
+            </div><!-- .header -->
+            <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Headline Menu AREA */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+            ?>
+            <div class="sr-only nav-area-head">
+                <h5 class="sr-only" role="heading" aria-level="1"><?php echo tpl_getLang('nav-area-head') ?></h5>
+            </div><!-- .nav-area-head -->
+
+            <?php if ($showSidebar): ?>
+            <div class="tools">
+                <div class="container">
+                    <div class="row">
+                        <div class="col-xs-12">
+
+                            <div class="sidebarheader main-sidebar">
+                                <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: sidebarheader.html */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                tpl_includeFile('sidebarheader.html') ?>
+                            </div><!-- .sidebarheader -->
+
+                            <div class="search main-sidebar">
+                            <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Searchform */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                include('tpl/main-sidebar-search.php');
+                            ?>
+                            </div><!-- .search -->
+
+                            <div id="dokuwiki__aside" class="menu main-sidebar">
+                                <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* main menu */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                include('tpl/nav-main.php');
+                                ?>
+                            </div><!-- .search -->
+
+                            <div class="site-tools main-sidebar">
+                                <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Sitetools */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                include('tpl/nav-sitetools.php');
+                                ?>
+                            </div><!-- .site-tools -->
+
+
+                            <div class="sidebarfooter main-sidebar">
+                                <?php
+
+
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: sidebarfooter.html */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                                tpl_includeFile('sidebarfooter.html')
+                                ?>
+                            </div><!-- .sidebarheader -->
+
+                        </div><!-- .col -->
+                    </div><!-- .row -->
+                </div><!-- .container -->
+            </div><!-- .tools -->
+            <?php endif ?>
+
+
+        <div class="top-header">
+            <div class="container">
+                <div class="row">
+                    <div class="col-xs-12">
+
                         <?php
 
 
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* MagicMatcher */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                        include('tpl/nav-magicmatcher.php');
+
+
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
 /* User Tools */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-                        include('tpl/nav-usertools.php'); ?>
-                        </div><!-- .col -->
-                    </div><!-- .row -->
-                </div><!-- .container -->
-
-            <div class="headings">
-                <h1><?php tpl_link(wl(),$conf['title'],'accesskey="h" title="[H]"') ?></h1>
-                <?php /* how to insert logo instead (if no CSS image replacement technique is used):
-                        upload your logo into the data/media folder (root of the media manager) and replace 'logo.png' accordingly:
-                        tpl_link(wl(),'<img src="'.ml('logo.png').'" alt="'.$conf['title'].'" />','id="dokuwiki__top" accesskey="h" title="[H]"') */ ?>
-                <?php if ($conf['tagline']): ?>
-                    <p class="claim"><?php echo $conf['tagline'] ?></p>
-                <?php endif ?>
+                        include('tpl/nav-usertools.php');
 
 
-                <div class="clearer"></div>
-            </div>
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+/* Include Hook: header.html */
+/* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
+                        tpl_includeFile('header.html');
+                        ?>
 
-            <div class="tools">
-
-                <!-- SITE TOOLS -->
-                <div id="dokuwiki__sitetools">
-                    <h3 class="a11y"><?php echo $lang['site_tools'] ?></h3>
-                    <?php tpl_searchform() ?>
-                    <ul>
-                        <?php 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>
-
-            </div>
-            <div class="clearer"></div>
-
-            <!-- BREADCRUMBS -->
-            <?php if($conf['breadcrumbs']){ ?>
-                <div class="breadcrumbs"><?php tpl_breadcrumbs() ?></div>
-            <?php } ?>
-            <?php if($conf['youarehere']){ ?>
-                <div class="breadcrumbs"><?php tpl_youarehere() ?></div>
-            <?php } ?>
-
-            <div class="clearer"></div>
-            <hr class="a11y" />
-        </div></div><!-- /header -->
+                    </div><!-- .col -->
+                </div><!-- .row -->
+            </div><!-- .container -->
+        </div><!-- /top-header -->
 
 
         <div class="wrapper">
 
-            <!-- ********** ASIDE ********** -->
-            <?php if ($showSidebar): ?>
-                <div id="dokuwiki__aside"><div class="pad aside include group">
-                    <?php tpl_includeFile('sidebarheader.html') ?>
-                    <?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?>
-                    <?php tpl_includeFile('sidebarfooter.html') ?>
-                    <div class="clearer"></div>
-                </div></div><!-- /aside -->
-            <?php endif; ?>
+
 
             <!-- ********** CONTENT ********** -->
             <div id="dokuwiki__content"><div class="pad">
diff --git a/tpl/main-sidebar-logo.php b/tpl/main-sidebar-logo.php
new file mode 100644
index 0000000..a47255f
--- /dev/null
+++ b/tpl/main-sidebar-logo.php
@@ -0,0 +1,13 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+
+    echo '<div class="logo">';
+
+    /* homepage logo should not link to itself (BITV accessibility requirement) */
+    if (strcmp(wl(), $_SERVER['REQUEST_URI']) === 0 ){
+        echo '<img src="'.ml(tpl_getConf('logo')).'" alt="'.tpl_getLang('adjunct_start_logo_text').$conf['title'].'" />';
+    } else{
+        tpl_link( wl(),'<img src="'.ml(tpl_getConf('logo')).'" alt="'.$conf['title'].tpl_getLang('adjunct_linked_logo_text').'" />','accesskey="h" title="[H]"' );
+
+    }
+    echo "</div><!-- .logo -->";
diff --git a/tpl/main-sidebar-search.php b/tpl/main-sidebar-search.php
new file mode 100644
index 0000000..2088c41
--- /dev/null
+++ b/tpl/main-sidebar-search.php
@@ -0,0 +1,5 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+    echo '<h6 class="sr-only" role="heading" aria-level="2">'.tpl_getLang('head_quick_search').'</h6>';
+
+    tpl_searchform();
diff --git a/tpl/nav-direct.php b/tpl/nav-direct.php
index 3b3c74e..8bf91c0 100644
--- a/tpl/nav-direct.php
+++ b/tpl/nav-direct.php
@@ -10,9 +10,9 @@
                         <p>
                             <span class="sr-out"><?php echo tpl_getLang('direct_prefix'); ?>: </span>
                             <span class="skip">
-                                <a href="#content"><?php echo tpl_getLang('direct_content_main'); ?></a><span class="sr-out"> /</span>
-                                <a href="#dokuwiki__usertools"><?php echo $lang['user_tools']; ?></a><span class="sr-out"> /</span>
-                                <a href="#nav-main"><?php echo tpl_getLang('direct_menu_main');  ?></a>
+                                <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="#nav-main"><?php echo tpl_getLang('direct_menu_main');  ?></a>
                             </span>
                         </p>
 
diff --git a/tpl/nav-main.php b/tpl/nav-main.php
new file mode 100644
index 0000000..0f62471
--- /dev/null
+++ b/tpl/nav-main.php
@@ -0,0 +1,7 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+?>
+    <nav class="nav-main">
+        <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['site_tools']; ?></h6>
+        <?php tpl_include_page($conf['sidebar'], 1, 1) /* includes the nearest sidebar page */ ?>
+    </nav>
diff --git a/tpl/nav-sitetools.php b/tpl/nav-sitetools.php
new file mode 100644
index 0000000..7bbc513
--- /dev/null
+++ b/tpl/nav-sitetools.php
@@ -0,0 +1,15 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+?>
+        <nav id="dokuwiki__sitetools" class="nav-usertools">
+            <h6 class="sr-only" role="heading" aria-level="2"><?php echo $lang['site_tools']; ?></h6>
+            <ul>
+                <?php
+                    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>
+        </nav>