diff --git a/css/area_content.less b/css/area_content.less
index 8475b3a..d00d057 100755
--- a/css/area_content.less
+++ b/css/area_content.less
@@ -4,56 +4,58 @@
  * @author Jana Deutschlaender <deutschlaender@cosmocode.de>
  */
 
-
 .content .row {
     > .col-xs-12 {
         box-shadow: @box-shadow;
-        #dokuwiki__content{
+
+        #dokuwiki__content {
             position: relative;
             z-index: 10;
-            &::before{
+
+            &::before {
                 content: "";
+                position: absolute;
+                top: 0;
+                left: 0;
+                z-index: -1;
+                height: 2.6rem;
+                width: 100%;
                 background-color: @background_page-header;
                 border-bottom: 1px solid @color-border-light;
-                position: absolute;
-                top: 0; left: 0;
-                height: 3rem; width: 100%;
-                z-index: -1;
             }
-            #meta-box{
+
+            #meta-box {
                 display: inline-block;
                 min-height: 1.95rem;
                 max-width: 40%;
                 float: right;
             }
 
-            #plugin__highlightparent{
+            #plugin__highlightparent {
                 display: block;
             }
         }
     }
 }
 
-.structaggregation{
-
-    td, th{
-
+.structaggregation {
+    td,
+    th {
         line-height: 125%;
-        a{
+
+        a {
 
             line-height: 125%;
         }
     }
-    > a.export{
 
+    > a.export {
         line-height: 135%;
         padding-top: .5em;
     }
-    ~ ul li .li{
-
-    }
 }
-.dokuwiki .structaggregation a.export{
+
+.dokuwiki .structaggregation a.export {
     padding-top: .3em;
 }
 
@@ -62,21 +64,28 @@
 .main-content > .level3,
 .main-content > .level4,
 .main-content > .level5,
-.main-content > .level6{
+.main-content > .level6 {
     padding-bottom: 1rem;
-    > p, > ul > li .li{
-        a{
+
+    > p, > ul > li .li {
+        a {
             font-size: inherit;
         }
     }
 }
 
 
-.level1, .level2, .level3, .level4, .level5, .level6{
+.level1,
+.level2,
+.level3,
+.level4,
+.level5,
+.level6 {
     line-height: 125%;
-    div, h1, h2, h3, h4, h5, h6, p, dl, dt, dd, ol, ul, li, th, td, textarea{
+
+    div, p, th, td, textarea,
+    h1, h2, h3, h4, h5, h6,
+    dl, dt, dd, ol, ul, li {
         line-height: 125%;
     }
 }
-
-
diff --git a/css/area_main-sidebar.less b/css/area_main-sidebar.less
index abb4a9f..0c84228 100755
--- a/css/area_main-sidebar.less
+++ b/css/area_main-sidebar.less
@@ -119,7 +119,7 @@
                             position: relative;
                             display: block;
                             border: 1px solid transparent;
-                            border-radius: 2px;
+                            border-radius: @fix_border-radius;
                             margin-bottom: -.3rem;
                             padding: .7em 0 .7em (@margin-big + 1);
                             transition: @transition color, @transition background-color, @transition border-color;
@@ -181,6 +181,7 @@
 
                             &::before {
                                 background-color: @color-site-bg;
+                                border-radius: @fix_border-radius 0 0 @fix_border-radius;
                             }
 
                             &::after {
diff --git a/css/area_nav-breadcrumb.less b/css/area_nav-breadcrumb.less
index 853bf17..36bef0c 100755
--- a/css/area_nav-breadcrumb.less
+++ b/css/area_nav-breadcrumb.less
@@ -7,7 +7,7 @@
 .breadcrumbs {
     position: relative;
     border-bottom: 1px solid @color-border-light;
-    padding: .8rem @margin-default @very-small-spacing;
+    padding: 1rem 1.8rem @very-small-spacing;
 
     > p {
         font-size: @font-size-small;
@@ -31,14 +31,14 @@
                 width: auto;
                 box-sizing: border-box;
                 border: solid 1px transparent;
-                border-radius: 2px;
+                border-radius: @border-radius;
                 vertical-align: middle;
                 text-decoration: none;
                 margin-top: -.2em;
                 transition: @transition border-color;
 
                 &:before {
-                    font-size: @font-size-default + (@font-scale-factor*2);
+                    font-size: @font-size-default + (@font-scale-factor * 2);
                     margin-top: .17rem;
                 }
 
@@ -62,7 +62,7 @@
         float: right;
         display: inline-block;
         max-width: 30%;
-        margin: -.4em 0 0;
+        margin: -.6em 0 0;
         padding: 0;
 
         > li {
diff --git a/css/area_nav-metabox.less b/css/area_nav-metabox.less
index 3094c97..103961d 100755
--- a/css/area_nav-metabox.less
+++ b/css/area_nav-metabox.less
@@ -2,6 +2,7 @@
     .tab-container {
         display: table;
     }
+
     .box-content {
         position: relative;
         height: 0;
@@ -9,104 +10,129 @@
     }
 
     ul.meta-tabs {
+        list-style: none;
         background-color: @background_page-header;
         margin: 0;
         padding: 0;
-        list-style: none;
-        &::before, &::after {
+
+        &::before,
+        &::after {
             display: table;
             content: " ";
             box-sizing: border-box;
             clear: both;
         }
-        > li:first-child{
-            > a{
+
+        > li:first-child {
+            > a {
                 margin-left: 0;
             }
         }
+
         > li {
-            margin: 1px -1px -1px;
+            margin: 0 0 -1px;
             position: relative;
             display: inline-block;
+
             > a {
-                margin-left: 4px;
-                line-height: 1.42857143;
+                cursor: pointer;
                 position: relative;
                 display: block;
-                padding: .38em 2em .12em;
-                border: 1px solid @color-border;
-                border-bottom: 0 none;
                 background-color: @color-site-bg;
-                border-radius: 4px 4px 0 0;
+                border: 1px solid @color-border-light;
+                border-radius: @fix_border-radius @fix_border-radius 0 0;
                 color: @color-nav;
-                cursor: pointer;
-                text-decoration: none;
+                font-size: @font-size-small;
+                line-height: 1.42857143;
+                padding: .3em 1rem .1em;
+                margin-left: 4px;
                 transition: @transition color, @transition background-color, @transition border-color;
 
                 * {
                     cursor: pointer;
+                    color: inherit;
                 }
 
                 .prefix {
-                    color: @color-nav;
                     position: relative;
                     transition: @transition color;
                     font-size: @font-size-small;
                 }
-                .num {
 
-                }
                 &:hover,
                 &:focus,
                 &:active {
-                    background-color: @background_page-header;
-                    border-color: @color-border;
-                    border-bottom-color: transparent;
-                    color: @button_background;
+                    background-color: @color-content-bg;
+                    border-color: @color-link;
+                    color: @color-link;
+                    text-decoration: none;
 
                     .prefix {
-                        color: @button_background;
-                    }
-
-                    .num {
-                        background-color: @button_background;
-                        color: @button_color;
+                        color: inherit;
                     }
                 }
             }
-            &.active > a {
-                cursor: default;
-                tab-index: -1;
-                color: #555;
-                background-color: #fff;
+
+            &.active {
+                z-index: 1;
+
+                > a {
+                    cursor: default;
+                    tab-index: -1;
+                    background-color: @color-content-bg;
+                    border-color: @color-link;
+                    border-bottom-color: @color-content-bg;
+                    color: @color-link;
+                }
             }
         }
     }
+
     .meta-content {
         .tab-pane {
-            border: 1px solid @color-border;
-            border-top-color: transparent;
-            background-color: @background_page-header;
-            display: none;
             position: absolute;
+            top: 0;
+            display: none;
             width: 100%;
+            background-color: @color-content-bg;
+            border: 1px solid @color-link;
+            border-top-color: transparent;
+            border-radius: 0 0 @fix_border-radius @fix_border-radius;
+
+            &::before {
+                content: '';
+                position: absolute;
+                top: -1px;
+                left: 0;
+                z-index: 0;
+                width: 100%;
+                height: 1px;
+                background-color: @color-link;
+            }
+
             &.active {
                 display: block;
             }
+
             > div {
-                padding: .8rem .5rem .5rem;
                 font-size: @font-size-small;
-                *{
+                padding: .8rem .5rem .5rem;
+
+                * {
                     font-size: inherit;
                 }
-                p{
+
+                p {
                     padding-left: 1em;
                 }
-                ul{
+
+                ul {
                     list-style: none;
-                    padding-left:0;
-                    li{
-                        margin-left: 0; padding-left: 1em;
+                    padding-left: 0;
+
+                    li {
+                        margin-left: 0;
+                        padding-left: 1em;
                     }
                 }
             }
@@ -118,26 +144,34 @@
                 padding: .6rem .5rem .5rem .8rem;
                 background: transparent;
                 border: 0 none;
+
                 h3 {
                     display: none;
                 }
+
                 > div {
                     padding: 0;
                 }
+
                 > div ul.toc {
                     font-size: @font-size-small;
                     padding-left: .5em;
+
                     a {
                         font-size: @font-size-small;
                         display: inline-block;
                         padding-left: 10px;
                         position: relative;
                     }
+
                     li {
                     }
+
                     div.li {
                         position: relative;
-                        ::before {
+                        padding: .15em 0;
+
+                        &::before {
                             position: absolute;
                             top: .3em;
                             content: "";
@@ -148,16 +182,17 @@
                             overflow: hidden;
                             left: 0;
                         }
-                        padding: .15em 0;
                     }
                 }
+
                 > div > ul.toc {
                     padding: 0;
                 }
             }
         }
     }
-    + .msg-area + a{
+
+    + .msg-area + a {
         clear: right;
         margin-top: 20px;
     }
diff --git a/css/area_sidetools.less b/css/area_sidetools.less
index ba5652a..349c996 100755
--- a/css/area_sidetools.less
+++ b/css/area_sidetools.less
@@ -129,8 +129,8 @@
                 position: relative;
                 display: block;
                 border: 1px solid transparent;
-                border-radius: 2px;
-                padding: .6em 0 .6em (@margin-big + 1);
+                border-radius: @fix_border-radius;
+                padding: .6em 0 .6em (@icon-size + 1);
                 transition: @transition color, @transition background-color, @transition border-color;
 
                 &::before {
@@ -190,6 +190,7 @@
 
                 &::before {
                     background-color: @color-site-bg;
+                    border-radius: @fix_border-radius 0 0 @fix_border-radius;
                 }
 
                 &::after {
@@ -243,7 +244,7 @@
         overflow-y: auto;
         background-color: @color-content-bg;
         border: 1px solid @button_background;
-        border-radius: 2px;
+        border-radius: @fix_border-radius;
         font-size: @font-size-small;
         margin-top: .1rem;
         padding: .3rem .6em;
diff --git a/css/area_togglelink.less b/css/area_togglelink.less
index cc37018..6257b4e 100644
--- a/css/area_togglelink.less
+++ b/css/area_togglelink.less
@@ -22,7 +22,7 @@
             height: 100%;
             background-color: @button_background;
             border: solid 1px @button_background;
-            border-radius: 2px 0 0 2px;
+            border-radius: @fix_border-radius 0 0 @fix_border-radius;
             color: @button_color;
             text-decoration: none;
             text-align: center;
@@ -51,6 +51,7 @@
             a {
                 background-color: @button_background;
                 border-color: @button_background;
+                border-radius: 0 @fix_border-radius @fix_border-radius 0;
 
                 &:hover,
                 &:focus,
diff --git a/css/base.less b/css/base.less
index 68cb80d..e6e4d0d 100755
--- a/css/base.less
+++ b/css/base.less
@@ -12,6 +12,7 @@
 @background_page-header: __background_page-header__;
 
 @border-radius:          __default_border_radius__;
+@fix_border-radius:      2px;
 
 @font_family_screen:     __font_family_screen__;
 
diff --git a/css/base_design.less b/css/base_design.less
index 8bc942e..fe52ec4 100755
--- a/css/base_design.less
+++ b/css/base_design.less
@@ -395,14 +395,14 @@ kbd {
     background-color: @color-site-bg;
     color: @color-text;
     box-shadow: inset 0 0 .3em @color-border;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
 }
 
 pre {
     overflow: auto;
     word-wrap: normal;
     border: 1px solid @color-border;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
     box-shadow: inset 0 0 .5em @color-border;
     font-size: @font-size-default;
     line-height: 140%;
@@ -520,7 +520,7 @@ select,
 keygen {
     border: 1px solid #ccc;
     box-shadow: inset 0 0 1px #eee;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
 }
 
 input:active,
@@ -549,7 +549,7 @@ button {
     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%);
     border: 1px solid #ccc;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
     color: #333;
     padding: .1em .5em;
     cursor: pointer;
@@ -576,7 +576,7 @@ button[type=submit],
     background-image: none;
     background-color: @button_background;
     border: 1px solid @button_background;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
     color: @button_color;
     padding: .3em @grid;
     transition: @transition background-color, @transition color;
@@ -598,7 +598,7 @@ input[type=button] {
     background-image: linear-gradient(to bottom, #ffffff 0%, #f4f4f4 30%, #eeeeee 99%, #cccccc 99%);
     background-color: #eee;
     border: 1px solid #ccc;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
     color: #333;
     padding: .1em .5em;
     transition: @transition background-color, @transition color;
@@ -630,7 +630,7 @@ textarea[readonly] {
     background-color: #eee;
     opacity: .5;
     border: 1px solid #ccc;
-    border-radius: 2px;
+    border-radius: @fix_border-radius;
     color: #333;
     font-weight: normal;
     padding: .3em @grid;