diff --git a/css/base.less b/css/base.less
index f09d399..4528654 100755
--- a/css/base.less
+++ b/css/base.less
@@ -3,3 +3,158 @@
  *
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
+
+@media screen{
+
+    html {
+        -ms-text-size-adjust: 100%;
+        -webkit-text-size-adjust: 100%;
+    }
+
+    article, aside, details, figcaption, figure, footer, header,
+    main, menu, nav, section, summary {
+        display: block;
+    }
+
+    audio, canvas, progress, video {
+        display: inline-block;
+        vertical-align: baseline;
+    }
+
+    audio:not([controls]) {
+        display: none;
+        height: 0;
+    }
+
+    [hidden],
+    template {
+        display: none;
+    }
+
+    a:active,
+    a:hover {
+        outline: 0;
+    }
+
+    abbr[title] {
+        border-bottom: 1px dotted;
+    }
+
+    small {
+        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;
+    }
+
+    hr {
+        box-sizing: content-box;
+        height: 0;
+    }
+    pre {
+        overflow: auto;
+    }
+    code,
+    kbd,
+    pre,
+    samp {
+        font-family: monospace, monospace;
+        font-size: 1em;
+    }
+
+    button,
+    input,
+    optgroup,
+    select,
+    textarea {
+        color: inherit;
+        font: inherit;
+        margin: 0;
+    }
+    button {
+        overflow: visible;
+    }
+
+    button,
+    select {
+        text-transform: none;
+    }
+
+    input[type="checkbox"],
+    input[type="radio"] {
+        box-sizing: border-box;
+        padding: 0;
+    }
+
+    input[type="number"]::-webkit-inner-spin-button,
+    input[type="number"]::-webkit-outer-spin-button {
+        height: auto;
+    }
+
+    input[type="search"] {
+        -webkit-appearance: textfield;
+        box-sizing: content-box;
+    }
+
+    input[type="search"]::-webkit-search-cancel-button,
+    input[type="search"]::-webkit-search-decoration {
+        -webkit-appearance: none;
+    }
+    legend {
+        border: 0;
+        padding: 0;
+    }
+    textarea {
+        overflow: auto;
+    }
+    table {
+        border-collapse: collapse;
+        border-spacing: 0;
+    }
+
+    td,
+    th {
+        padding: 0;
+    }
+
+    html, body, div, span, applet, object, iframe,
+    h1, h2, h3, h4, h5, h6, p, blockquote, pre,
+    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: @ini_text;
+    }
+
+    code{
+
+    }
+}
+
+@media print{
+
+}
diff --git a/css/base_design.less b/css/base_design.less
index ad535d4..2ba899f 100755
--- a/css/base_design.less
+++ b/css/base_design.less
@@ -5,3 +5,11 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
+
+html, body{
+    background-color: @ini_background;
+}
+
+a{
+    color: @ini_existing;
+}
diff --git a/css/base_fonts.less b/css/base_fonts.less
index e3f2ce7..294490a 100755
--- a/css/base_fonts.less
+++ b/css/base_fonts.less
@@ -3,3 +3,59 @@
  *
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
+
+
+/* roboto light */
+@font-face {
+    font-family: 'roboto';
+    font-style: normal;
+    font-weight: 300;
+    src: local('Roboto Light'), local('Roboto-Light'), url('/lib/tpl/sprintdoc-template/fonts/roboto-light.eot');
+    src: url('/lib/tpl/sprintdoc-template/fonts/roboto-light.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-light.woff') format('woff');
+}
+
+/* roboto regular */
+@font-face {
+    font-family: 'roboto';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Roboto'), local('Roboto-Regular'), url('/lib/tpl/sprintdoc-template/fonts/roboto-regular.eot');
+    src: url('/lib/tpl/sprintdoc-template/fonts/roboto-regular.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-regular.woff') format('woff');
+}
+
+/* roboto medium */
+@font-face {
+    font-family: 'roboto';
+    font-style: normal;
+    font-weight: 500;
+    src: local('Roboto Medium'), local('Roboto-Medium'), url('/lib/tpl/sprintdoc-template/fonts/roboto-medium.eot');
+    src: url('/lib/tpl/sprintdoc-template/fonts/roboto-medium.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-medium.woff') format('woff');
+}
+
+/* roboto bold */
+@font-face {
+    font-family: 'roboto';
+    font-style: normal;
+    font-weight: 700;
+    src: local('Roboto Bold'), local('Roboto-Bold'), url('/lib/tpl/sprintdoc-template/fonts/roboto-bold.eot');
+    src: url('/lib/tpl/sprintdoc-template/fonts/roboto-bold.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-bold.woff') format('woff');
+}
+
+/* roboto condensed  */
+@font-face {
+    font-family: 'roboto condensed';
+    font-style: normal;
+    font-weight: 400;
+    src: local('Roboto Condensed'), local('RobotoCondensed-Regular'), url('/lib/tpl/sprintdoc-template/fonts/roboto-condensed.eot');
+    src: url('/lib/tpl/sprintdoc-template/fonts/roboto-condensed.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-condensed.woff') format('woff');
+}
+
+/* roboto condensed bold  */
+@font-face {
+    font-family: 'roboto condensed';
+    font-style: normal;
+    font-weight: 700;
+    src: local('Roboto Condensed Bold'), local('RobotoCondensed-Bold'), url('/lib/tpl/sprintdoc-template/fonts/roboto-boldcondensed.eot');
+    src: url('/lib/tpl/sprintdoc-template/fonts/roboto-boldcondensed.eot?#iefix') format('embedded-opentype'), url('/lib/tpl/sprintdoc-template/fonts/roboto-boldcondensed.woff') format('woff');
+}
+
diff --git a/fonts/roboto-bold.eot b/fonts/roboto-bold.eot
new file mode 100644
index 0000000..09ad044
Binary files /dev/null and b/fonts/roboto-bold.eot differ
diff --git a/fonts/roboto-bold.woff b/fonts/roboto-bold.woff
new file mode 100644
index 0000000..32339df
Binary files /dev/null and b/fonts/roboto-bold.woff differ
diff --git a/fonts/roboto-boldcondensed.eot b/fonts/roboto-boldcondensed.eot
new file mode 100644
index 0000000..e0f64c1
Binary files /dev/null and b/fonts/roboto-boldcondensed.eot differ
diff --git a/fonts/roboto-boldcondensed.woff b/fonts/roboto-boldcondensed.woff
new file mode 100644
index 0000000..d2481fe
Binary files /dev/null and b/fonts/roboto-boldcondensed.woff differ
diff --git a/fonts/roboto-condensed.eot b/fonts/roboto-condensed.eot
new file mode 100644
index 0000000..b091c6e
Binary files /dev/null and b/fonts/roboto-condensed.eot differ
diff --git a/fonts/roboto-condensed.woff b/fonts/roboto-condensed.woff
new file mode 100644
index 0000000..c7b6fdd
Binary files /dev/null and b/fonts/roboto-condensed.woff differ
diff --git a/fonts/roboto-light.eot b/fonts/roboto-light.eot
new file mode 100644
index 0000000..50a0f9a
Binary files /dev/null and b/fonts/roboto-light.eot differ
diff --git a/fonts/roboto-light.woff b/fonts/roboto-light.woff
new file mode 100644
index 0000000..876ae73
Binary files /dev/null and b/fonts/roboto-light.woff differ
diff --git a/fonts/roboto-medium.eot b/fonts/roboto-medium.eot
new file mode 100644
index 0000000..ee68d7b
Binary files /dev/null and b/fonts/roboto-medium.eot differ
diff --git a/fonts/roboto-medium.woff b/fonts/roboto-medium.woff
new file mode 100644
index 0000000..63c805c
Binary files /dev/null and b/fonts/roboto-medium.woff differ
diff --git a/fonts/roboto-regular.eot b/fonts/roboto-regular.eot
new file mode 100644
index 0000000..9792dc6
Binary files /dev/null and b/fonts/roboto-regular.eot differ
diff --git a/fonts/roboto-regular.woff b/fonts/roboto-regular.woff
new file mode 100644
index 0000000..70519ff
Binary files /dev/null and b/fonts/roboto-regular.woff differ
diff --git a/main.php b/main.php
index c517d19..dc6d887 100755
--- a/main.php
+++ b/main.php
@@ -97,27 +97,10 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 
 
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
-/* nav-direct */
+/* template Include: tpl/nav-direct */
 /* + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + */
         ?>
-
-        <div id="dokuwiki_direct" class="nav-direct no-print">
-            <div class="container">
-                <div class="row">
-                    <div class="col-xs-12">
-
-                        <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="#nav-main"><?php echo tpl_getLang('direct_menu_main');  ?></a>
-                            </span>
-                        </p>
-
-                    </div><!-- .col -->
-                </div><!-- .row -->
-            </div><!-- .container -->
-        </div><!-- .nav-direct -->
+        <?php include('tpl/nav-direct.php') ?>
 
 
         <div class="page-wrapper <?php echo ($showSidebar) ? 'hasSidebar' : ''; ?>">
@@ -144,6 +127,12 @@ $showSidebar = page_findnearest($conf['sidebar']) && ($ACT=='show');
 
             <div id="dokuwiki_magic-matcher" class="magic-matcher no-print">
                 <div class="container">
+                    <?php
+                        $mm = plugin_load('helper', 'magicmatcher_context');
+                        if($mm){
+                            $mm->tpl();
+                        }
+                    ?>
                 </div><!-- .container -->
             </div><!-- .magic-matcher -->
             <?php
diff --git a/style.ini b/style.ini
index 8622ff1..311b47c 100755
--- a/style.ini
+++ b/style.ini
@@ -19,10 +19,10 @@
 
 [stylesheets]
 
-; * * * * * * * * * * * * * * * * * * * * *
-; DokuWiki Default Template Styles
-; * * * * * * * * * * * * * * * * * * * * *
 
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+; DokuWiki Default Template Styles
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
 ../dokuwiki/css/_imgdetail.css        = screen
 ../dokuwiki/css/_media_popup.css      = screen
@@ -41,10 +41,9 @@
 ../dokuwiki/css/_admin.css            = screen
 
 
-
-; * * * * * * * * * * * * * * * * * * * * *
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 ; sprintDoc Template Styles
-; * * * * * * * * * * * * * * * * * * * * *
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
 ; responsive behaviour for structure and areas is handled in style modules
 
@@ -81,30 +80,44 @@ css/print.css                         = print
 
 [replacements]
 
-;--------------------------------------------------------------------------
-;------ guaranteed dokuwiki color placeholders that every plugin can use
+
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+; guaranteed dokuwiki color placeholders that every plugin can use
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
 ; main text and background colors
-__text__           = "#333"                 ; @ini_text
-__background__     = "#fff"                 ; @ini_background
+__text__                = "#252525"              ; @ini_text
+__background__          = "#ECECEC"              ; @ini_background
+
 ; alternative text and background colors
-__text_alt__       = "#999"                 ; @ini_text_alt
-__background_alt__ = "#eee"                 ; @ini_background_alt
+__text_alt__            = "#454545"              ; @ini_text_alt
+__background_alt__      = "#e8e8e8"              ; @ini_background_alt
+
 ; neutral text and background colors
-__text_neu__       = "#666"                 ; @ini_text_neu
-__background_neu__ = "#ddd"                 ; @ini_background_neu
+__text_neu__            = "#656565"              ; @ini_text_neu
+__background_neu__      = "#ffffff"              ; @ini_background_neu
+
 ; border color
-__border__         = "#ccc"                 ; @ini_border
+__border__              = "#3c3c3c"              ; @ini_border
 
 ; highlighted text (e.g. search snippets)
-__highlight__      = "#ff9"                 ; @ini_highlight
+__highlight__           = "#efefef"              ; @ini_highlight
 
-;--------------------------------------------------------------------------
+
+
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+; template specific placeholders
+; + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
 
 ; these are used for links
-__existing__       = "#090"                 ; @ini_existing
-__missing__        = "#f30"                 ; @ini_missing
+__existing__            = "#286da8"                                                 ; @ini_existing
+__missing__             = "#CD5360"                                                 ; @ini_missing
 
 ; widths
-__site_width__     = "64em"                 ; @ini_site_width
-__sidebar_width__  = "16em"                 ; @ini_sidebar_width
+__site_width__          = "64em"                                                    ; @ini_site_width
+__sidebar_width__       = "16em"                                                    ; @ini_sidebar_width
+
+__font_family_screen__  = "roboto, 'helvetica', arial, sans-serif"                  
+__font_family_menu__    = "'roboto condensed', 'helvetica neue', arial, sans-serif"
+__font_family_print__   = "'times new roman', serif"
+
diff --git a/tpl/nav-direct.php b/tpl/nav-direct.php
new file mode 100644
index 0000000..55895fb
--- /dev/null
+++ b/tpl/nav-direct.php
@@ -0,0 +1,22 @@
+<?php
+    if (!defined('DOKU_INC')) die();
+?>
+
+        <div id="dokuwiki_direct" class="nav-direct no-print">
+            <div class="container">
+                <div class="row">
+                    <div class="col-xs-12">
+
+                        <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="#nav-main"><?php echo tpl_getLang('direct_menu_main');  ?></a>
+                            </span>
+                        </p>
+
+                    </div><!-- .col -->
+                </div><!-- .row -->
+            </div><!-- .container -->
+        </div><!-- .nav-direct -->
+