diff --git a/Gemfile.lock b/Gemfile.lock
index 3010373..649a165 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -1,7 +1,7 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    activesupport (3.2.8)
+    activesupport (3.2.10)
       i18n (~> 0.6)
       multi_json (~> 1.0)
     chunky_png (1.2.6)
@@ -17,34 +17,34 @@ GEM
       compass (>= 0.11)
     execjs (1.4.0)
       multi_json (~> 1.0)
-    ffi (1.1.5)
+    ffi (1.2.0)
     fssm (0.2.9)
     haml (3.1.7)
     hike (1.2.1)
     http_router (0.10.2)
       rack (>= 1.0.0)
       url_mount (~> 0.2.1)
-    httpclient (2.2.7)
+    httpclient (2.3.1)
     i18n (0.6.1)
-    json (1.7.5)
-    listen (0.5.0)
-    maruku (0.6.0)
+    json (1.7.6)
+    listen (0.5.3)
+    maruku (0.6.1)
       syntax (>= 1.0.0)
-    middleman (3.0.2)
-      middleman-core (= 3.0.2)
-      middleman-more (= 3.0.2)
-      middleman-sprockets (~> 3.0.1)
-    middleman-core (3.0.2)
+    middleman (3.0.8.pre.2)
+      middleman-core (= 3.0.8.pre.2)
+      middleman-more (= 3.0.8.pre.2)
+      middleman-sprockets (~> 3.0.2)
+    middleman-core (3.0.8.pre.2)
       activesupport (~> 3.2.6)
       bundler (~> 1.1)
-      listen (~> 0.5.0)
+      listen (~> 0.5.2)
       rack (~> 1.4.1)
       rack-test (~> 0.6.1)
       rb-fsevent (~> 0.9.1)
       rb-inotify (~> 0.8.8)
       thor (~> 0.15.4)
       tilt (~> 1.3.1)
-    middleman-more (3.0.2)
+    middleman-more (3.0.8.pre.2)
       coffee-script (~> 2.2.0)
       coffee-script-source (~> 1.3.3)
       compass (>= 0.12.2)
@@ -52,18 +52,18 @@ GEM
       haml (>= 3.1.6)
       i18n (~> 0.6.0)
       maruku (~> 0.6.0)
-      middleman-core (= 3.0.2)
+      middleman-core (= 3.0.8.pre.2)
       padrino-helpers (= 0.10.7)
       sass (>= 3.1.20)
       uglifier (~> 1.2.6)
     middleman-smusher (3.0.0)
       middleman (>= 3.0.0)
       smusher (~> 0.4.9)
-    middleman-sprockets (3.0.1)
-      middleman-more (~> 3.0.1)
-      sprockets (~> 2.1)
-      sprockets-sass (~> 0.8.0)
-    multi_json (1.3.6)
+    middleman-sprockets (3.0.6)
+      middleman-more (>= 3.0.1)
+      sprockets (~> 2.1, < 2.5)
+      sprockets-sass (~> 0.9.0)
+    multi_json (1.5.0)
     oily_png (1.0.2)
       chunky_png (~> 1.2.1)
     padrino-core (0.10.7)
@@ -76,39 +76,39 @@ GEM
       i18n (~> 0.6)
       padrino-core (= 0.10.7)
     rack (1.4.1)
-    rack-protection (1.2.0)
+    rack-protection (1.3.2)
       rack
-    rack-test (0.6.1)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rake (0.9.2.2)
-    rb-fsevent (0.9.1)
+    rake (10.0.3)
+    rb-fsevent (0.9.3)
     rb-inotify (0.8.8)
       ffi (>= 0.5.0)
-    sass (3.2.1)
+    sass (3.2.4)
     sinatra (1.3.3)
       rack (~> 1.3, >= 1.3.6)
       rack-protection (~> 1.2)
       tilt (~> 1.3, >= 1.3.3)
-    slim (1.3.0)
-      temple (~> 0.4.1)
+    slim (1.3.5)
+      temple (~> 0.5.5)
       tilt (~> 1.3.3)
     smusher (0.4.9)
       httpclient (>= 2.2)
       json
       rake
-    sprockets (2.5.0)
+    sprockets (2.4.5)
       hike (~> 1.2)
       multi_json (~> 1.0)
       rack (~> 1.0)
       tilt (~> 1.1, != 1.3.0)
-    sprockets-sass (0.8.0)
+    sprockets-sass (0.9.1)
       sprockets (~> 2.0)
       tilt (~> 1.1)
-    susy (1.0)
+    susy (1.0.5)
       compass (>= 0.12.2)
       sass (>= 3.2.0)
     syntax (1.0.0)
-    temple (0.4.1)
+    temple (0.5.5)
     thor (0.15.4)
     tilt (1.3.3)
     uglifier (1.2.7)
diff --git a/Rakefile b/Rakefile
index 5f7e212..acbe3a5 100644
--- a/Rakefile
+++ b/Rakefile
@@ -21,8 +21,6 @@ task :deploy do
   ok_failed system("rsync -avze 'ssh -p #{ssh_port}' #{exclude} #{"--delete" unless rsync_delete == false} #{public_dir}/ #{ssh_user}:#{document_root}")
 end
 
-
-
 desc "Generate website and deploy"
 task :gen_deploy => [:generate, :deploy] do
 end
diff --git a/source/_navbar.slim b/source/_navbar.slim
index a8f581e..97e1f22 100644
--- a/source/_navbar.slim
+++ b/source/_navbar.slim
@@ -1,5 +1,7 @@
 nav
-  ==link_to "Higgs-Boson", "/", :id => "sitelink", :title => "Startpage"
+  a href="/" id="sitelink" title="Homepage"
+    ' H
+    span B
   ul
     li
       ==link_to "Impressum", "/impressum.html", :class => "navlink", :title => "Impressum"
diff --git a/source/fonts/fontawesome-webfont.eot b/source/fonts/fontawesome-webfont.eot
old mode 100755
new mode 100644
index 89070c1..11d2f41
Binary files a/source/fonts/fontawesome-webfont.eot and b/source/fonts/fontawesome-webfont.eot differ
diff --git a/source/fonts/fontawesome-webfont.ttf b/source/fonts/fontawesome-webfont.ttf
old mode 100755
new mode 100644
index c17e9f8..88ef262
Binary files a/source/fonts/fontawesome-webfont.ttf and b/source/fonts/fontawesome-webfont.ttf differ
diff --git a/source/fonts/fontawesome-webfont.woff b/source/fonts/fontawesome-webfont.woff
old mode 100755
new mode 100644
index 09f2469..7e892f8
Binary files a/source/fonts/fontawesome-webfont.woff and b/source/fonts/fontawesome-webfont.woff differ
diff --git a/source/img/.gitignore b/source/img/.gitignore
deleted file mode 100644
index 4397c3a..0000000
--- a/source/img/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-!.gitignore
-
diff --git a/source/index.html.slim b/source/index.html.slim
index e601990..9f29ae6 100644
--- a/source/index.html.slim
+++ b/source/index.html.slim
@@ -4,28 +4,36 @@ h2#pagesubtitle Where dreams become true
 section
   ul#overview.icons
     li
-      i.icon-github
-      a href="http://git.higgsboson.tk/pub" title="Webinterface to our public git repos" Git Web
+      i.icon-github.icon-3x
+      span
+        a href="http://git.higgsboson.tk/pub" title="Webinterface to our public git repos" Git Web
     li
-      i.icon-upload
-      a href="http://inbox.higgsboson.tk" title="An Uploader" Inbox
+      i.icon-upload.icon-3x
+      span
+        a href="http://inbox.higgsboson.tk" title="An Uploader" Inbox
     li
-      i.icon-rss
-      a href="http://blog.higgsboson.tk" title="My little Techblog" Blog
+      i.icon-rss.icon-3x
+      span
+        a href="http://blog.higgsboson.tk" title="My little Techblog" Blog
     li
-      i.icon-edit
-      a href="http://pad.higgsboson.tk" title="collaborative editing" Etherpad Lite
+      i.icon-edit.icon-3x
+      span
+        a href="http://pad.higgsboson.tk" title="collaborative editing" Etherpad Lite
     li
-      i.icon-download
-      a href="http://ftp.higgsboson.tk" title="Some static files" Files
+      i.icon-download.icon-3x
+      span
+        a href="http://ftp.higgsboson.tk" title="Some static files" Files
     li
-      i.icon-trash
-      a href="http://paste.higgsboson.tk" title="encrypted pastebin" Zerobin 
-      ' or
-      a href="http://phork.higgsboson.tk" title="gist clone" Phorkie
+      i.icon-trash.icon-3x
+      span
+        a href="http://paste.higgsboson.tk" title="encrypted pastebin" Zerobin 
+        ' or
+        a href="http://phork.higgsboson.tk" title="gist clone" Phorkie
     li
-      i.icon-qrcode
-      a href="http://higgsboson.tk/qr" title="html5 qr-code generator" QR-Generator
+      i.icon-qrcode.icon-3x
+      span
+        a href="http://higgsboson.tk/qr" title="html5 qr-code generator" QR-Generator
     li
-      i.icon-lock
-      a href="/privat.html" title="Internal pages" Privat
+      i.icon-lock.icon-3x
+      span
+        a href="/privat.html" title="Internal pages" Privat
diff --git a/source/joerg/index.slim b/source/joerg/index.slim
index bb10f07..87441ad 100644
--- a/source/joerg/index.slim
+++ b/source/joerg/index.slim
@@ -8,12 +8,15 @@ div.span3
     dt Email:
     dd.icon-envelope
       a rel="me" href="mailto:fake@example.com?cc=joerg@higgsboson.tk" joerg higgsboson.tk
+    br
     dd.icon-key
       a rel="me" href="https://higgsboson.tk/joerg/joerg.asc" D7CC79FA
       ' (PGP)
+    br
     dt Jabber:
     dd.icon-comment
       a rel="me" href="xmpp:jthalheim@jabber.ccc.de" jthalheim@jabber.ccc.de
+    br
     dt IRC:
     dd.icon-comment-alt
       a rel="me" href="irc://irc.freenode.net/" Mic92
@@ -24,11 +27,14 @@ div.span3
     dt Microblogging:
     dd.icon-twitter
       a rel="me" href="https://twitter.com/Mic_92" twitter.com/Mic_92
+    br
     dd.icon-comments
       a rel="me" href="https://identi.ca/mic92" identi.ca/mic92
+    br
     dt Code:
     dd.icon-github
       a rel="me" href="https://github.com/Mic92" github.com/Mic92
+    br
     dt Social:
     dd.icon-group
       a rel="me" href="https://pod.geraspora.de/u/jthalheim" jthalheim@pod.geraspora.de
@@ -41,6 +47,7 @@ div.span3_omega
     dt Github Achievements:
     dd.icon-star
       a rel="me" href="http://coderwall.com/mic92" coderwall.com/mic92
+    br
     dt Stackoverflow:
     dd.icon-user
       a rel="me" href="http://stackoverflow.com/users/1061240/mic92" stackoverflow.com/users/1061240
diff --git a/source/stylesheets/font-awesome.css.scss b/source/stylesheets/font-awesome.css.scss
index 2ae5182..55dcac5 100644
--- a/source/stylesheets/font-awesome.css.scss
+++ b/source/stylesheets/font-awesome.css.scss
@@ -1,4 +1,4 @@
-/*  Font Awesome
+/*  Font Awesome 3.0
     the iconic font designed for use with Twitter Bootstrap
     -------------------------------------------------------
     The full suite of pictographic icons, examples, and documentation
@@ -6,13 +6,12 @@
 
     License
     -------------------------------------------------------
-    The Font Awesome webfont, CSS, and LESS files are licensed under CC BY 3.0:
-    http://creativecommons.org/licenses/by/3.0/ A mention of
-    'Font Awesome - http://fortawesome.github.com/Font-Awesome' in human-readable
-    source code is considered acceptable attribution (most common on the web).
-    If human readable source code is not available to the end user, a mention in
-    an 'About' or 'Credits' screen is considered acceptable (most common in desktop
-    or mobile software).
+    • The Font Awesome font is licensed under the SIL Open Font License - http://scripts.sil.org/OFL
+    • Font Awesome CSS, LESS, and SASS files are licensed under the MIT License -
+      http://opensource.org/licenses/mit-license.html
+    • The Font Awesome pictograms are licensed under the CC BY 3.0 License - http://creativecommons.org/licenses/by/3.0/
+    • Attribution is no longer required in Font Awesome 3.0, but much appreciated:
+      "Font Awesome by Dave Gandy - http://fortawesome.github.com/Font-Awesome"
 
     Contact
     -------------------------------------------------------
@@ -22,47 +21,71 @@
 
     */
 
-@import "compass/css3/font-face";
-$fontAwesomePath: "fontawesome-webfont" !default;
+$fontAwesomePath:   "../fonts" !default;
+$borderColor:       #eee;
+$iconMuted:         #eee;
+@mixin border-radius($radius) { -webkit-border-radius: $radius; -moz-border-radius: $radius; border-radius: $radius; }
 
-@include font-face(
-    'FontAwesome',
-    font-files(
-        "#{$fontAwesomePath}.woff", woff,
-        "#{$fontAwesomePath}.ttf", truetype,
-        "#{$fontAwesomePath}.svg#FontAwesome", svg),
-    '#{$fontAwesomePath}.eot',
-    normal,
-    normal);
+
+@font-face {
+  font-family: 'FontAwesome';
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot');
+  src: url('#{$fontAwesomePath}/fontawesome-webfont.eot?#iefix') format("embedded-opentype"),
+    url('#{$fontAwesomePath}/fontawesome-webfont.woff') format("woff"),
+    url('#{$fontAwesomePath}/fontawesome-webfont.ttf') format("truetype");
+  font-weight: normal;
+  font-style: normal;
+}
 
 /*  Font Awesome styles
     ------------------------------------------------------- */
-[class^="icon-"]:before,
-[class*=" icon-"]:before {
+/* includes sprites.less reset */
+[class^="icon-"],
+[class*=" icon-"] {
   font-family: FontAwesome;
   font-weight: normal;
   font-style: normal;
-  display: inline-block;
   text-decoration: inherit;
+  display: inline;
+  width: auto;
+  height: auto;
+  line-height: normal;
+  vertical-align: baseline;
+  background-image: none !important;
+  background-position: 0% 0%;
+  background-repeat: repeat;
 }
 
-a [class^="icon-"],
-a [class*=" icon-"] {
-  display: inline-block;
+[class^="icon-"]:before,
+[class*=" icon-"]:before {
   text-decoration: inherit;
+  display: inline-block;
+  speak: none;
+}
+
+/* makes sure icons active on rollover in links */
+a {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    display: inline-block;
+  }
 }
 
 /* makes the font 33% larger relative to the icon container */
 .icon-large:before {
-  vertical-align: middle;
-  font-size: 4/3em;
+  vertical-align: -10%;
+  font-size: 1.3333333333333333em;
 }
 
-.btn, .nav-tabs {
+.btn, .nav {
   [class^="icon-"],
   [class*=" icon-"] {
-  /* keeps button heights with and without icons the same */
-    line-height: .9em;
+    display: inline;
+    /* keeps button heights with and without icons the same */
+    line-height: .6em;
+    &.icon-spin {
+      display: inline-block;
+    }
   }
 }
 
@@ -72,33 +95,139 @@ li {
     display: inline-block;
     width: 1.25em;
     text-align: center;
-  }
-  .icon-large:before,
-  .icon-large:before {
-    /* 1.5 increased font size for icon-large * 1.25 width */
-    width: 1.5*1.25em;
+    &.icon-large {
+      /* increased font size for icon-large */
+      width: 1.25*1.25em;
+    }
   }
 }
 
 ul.icons {
   list-style-type: none;
-  margin-left: 2em;
-  text-indent: -.8em;
+  text-indent: -.75em;
 
   li {
     [class^="icon-"],
     [class*=" icon-"] {
-      width: .8em;
-    }
-    .icon-large:before,
-    .icon-large:before {
-      /* 1.5 increased font size for icon-large * 1.25 width */
-      vertical-align: initial;
-//      width: 1.5*1.25em;
+      width: .75em;
     }
   }
 }
 
+.icon-muted {
+  color: $iconMuted;
+}
+
+// Icon Borders
+// -------------------------
+
+.icon-border {
+  border: solid 1px $borderColor;
+  padding: .2em .25em .15em;
+  @include border-radius(3px);
+}
+
+// Icon Sizes
+// -------------------------
+
+.icon-2x {
+  font-size: 2em;
+  &.icon-border {
+    border-width: 2px;
+    @include border-radius(4px);
+  }
+}
+.icon-3x {
+  font-size: 3em;
+  &.icon-border {
+    border-width: 3px;
+    @include border-radius(5px);
+  }
+}
+.icon-4x {
+  font-size: 4em;
+  &.icon-border {
+    border-width: 4px;
+    @include border-radius(6px);
+  }
+}
+
+// Floats
+// -------------------------
+
+// Quick floats
+.pull-right { float: right; }
+.pull-left { float: left; }
+
+[class^="icon-"],
+[class*=" icon-"] {
+  &.pull-left {
+    margin-right: .35em;
+  }
+  &.pull-right {
+    margin-left: .35em;
+  }
+}
+
+.btn {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right {
+      &.icon-2x { margin-top: .35em; }
+    }
+    &.icon-spin.icon-large { height: .75em; }
+  }
+}
+
+.btn.btn-small {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right {
+      &.icon-2x { margin-top: .45em; }
+    }
+  }
+}
+
+.btn.btn-large {
+  [class^="icon-"],
+  [class*=" icon-"] {
+    &.pull-left, &.pull-right {
+      &.icon-2x { margin-top: .2em; }
+    }
+  }
+}
+
+
+.icon-spin {
+  display: inline-block;
+  -moz-animation: spin 2s infinite linear;
+  -o-animation: spin 2s infinite linear;
+  -webkit-animation: spin 2s infinite linear;
+  animation: spin 2s infinite linear;
+}
+
+@-moz-keyframes spin {
+  0% { -moz-transform: rotate(0deg); }
+  100% { -moz-transform: rotate(359deg); }
+}
+@-webkit-keyframes spin {
+  0% { -webkit-transform: rotate(0deg); }
+  100% { -webkit-transform: rotate(359deg); }
+}
+@-o-keyframes spin {
+  0% { -o-transform: rotate(0deg); }
+  100% { -o-transform: rotate(359deg); }
+}
+@-ms-keyframes spin {
+  0% { -ms-transform: rotate(0deg); }
+  100% { -ms-transform: rotate(359deg); }
+}
+@keyframes spin {
+  0% { transform: rotate(0deg); }
+  100% { transform: rotate(359deg); }
+}
+
+
 /*  Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen
     readers do not read off random characters that represent icons */
 .icon-glass:before                { content: "\f000"; }
@@ -325,5 +454,46 @@ ul.icons {
 .icon-sitemap:before              { content: "\f0e8"; }
 .icon-umbrella:before             { content: "\f0e9"; }
 .icon-paste:before                { content: "\f0ea"; }
+.icon-lightbulb:before            { content: "\f0eb"; }
+.icon-exchange:before             { content: "\f0ec"; }
+.icon-cloud-download:before       { content: "\f0ed"; }
+.icon-cloud-upload:before         { content: "\f0ee"; }
 
-.icon-user-md:before              { content: "\f200"; }
+.icon-user-md:before              { content: "\f0f0"; }
+.icon-stethoscope:before          { content: "\f0f1"; }
+.icon-suitcase:before             { content: "\f0f2"; }
+.icon-bell-alt:before             { content: "\f0f3"; }
+.icon-coffee:before               { content: "\f0f4"; }
+.icon-food:before                 { content: "\f0f5"; }
+.icon-file-alt:before             { content: "\f0f6"; }
+.icon-building:before             { content: "\f0f7"; }
+.icon-hospital:before             { content: "\f0f8"; }
+.icon-ambulance:before            { content: "\f0f9"; }
+.icon-medkit:before               { content: "\f0fa"; }
+.icon-fighter-jet:before          { content: "\f0fb"; }
+.icon-beer:before                 { content: "\f0fc"; }
+.icon-h-sign:before               { content: "\f0fd"; }
+.icon-plus-sign-alt:before        { content: "\f0fe"; }
+
+.icon-double-angle-left:before    { content: "\f100"; }
+.icon-double-angle-right:before   { content: "\f101"; }
+.icon-double-angle-up:before      { content: "\f102"; }
+.icon-double-angle-down:before    { content: "\f103"; }
+.icon-angle-left:before           { content: "\f104"; }
+.icon-angle-right:before          { content: "\f105"; }
+.icon-angle-up:before             { content: "\f106"; }
+.icon-angle-down:before           { content: "\f107"; }
+.icon-desktop:before              { content: "\f108"; }
+.icon-laptop:before               { content: "\f109"; }
+.icon-tablet:before               { content: "\f10a"; }
+.icon-mobile-phone:before         { content: "\f10b"; }
+.icon-circle-blank:before         { content: "\f10c"; }
+.icon-quote-left:before           { content: "\f10d"; }
+.icon-quote-right:before          { content: "\f10e"; }
+
+.icon-spinner:before              { content: "\f110"; }
+.icon-circle:before               { content: "\f111"; }
+.icon-reply:before                { content: "\f112"; }
+.icon-github-alt:before           { content: "\f113"; }
+.icon-folder-close-alt:before     { content: "\f114"; }
+.icon-folder-open-alt:before      { content: "\f115"; }
diff --git a/source/stylesheets/site.css.scss b/source/stylesheets/site.css.scss
index e901151..f6ea872 100644
--- a/source/stylesheets/site.css.scss
+++ b/source/stylesheets/site.css.scss
@@ -109,9 +109,18 @@ footer {
   font-size: 1.1em;
   padding-right: 0.1em;
   padding-left: 0.1em;
+  font-family: 'Lobster', Georgia, Times, serif;
+  letter-spacing: -0.07em;
   &:hover {
     text-decoration: none;
   }
+  vertical-align: 0.2em;
+  padding-top: 0.2em;
+  line-height: 1em;
+  span {
+    vertical-align: -0.2em;
+    line-height: 1em;
+  }
 }
 
 #pagetitle {
@@ -119,8 +128,6 @@ footer {
 }
 
 #overview {
-  font-size: 2em;
-  li {
-    line-height: 0.8em;
-  }
+  span { font-size: 2em; };
+  li { line-height: 0.8em; };
 }
diff --git a/source/stylesheets/solarized.css.scss b/source/stylesheets/solarized.css.scss
index e033115..e9ef195 100644
--- a/source/stylesheets/solarized.css.scss
+++ b/source/stylesheets/solarized.css.scss
@@ -39,10 +39,19 @@ $green:     #859900;
     }
 
     #sitelink {
-      color: $rebase02; background-color: $rebase1;
-      &:hover{
+      color:$rebase03;
+      span {
         color: $rebase03;
       }
+      &:hover {
+        color: $rebase1;
+      }
+      span {
+        color: $rebase03
+      }
+    }
+    #sitelink span:hover {
+      color: inherit;
     }
   }
   footer {