diff --git a/img/dock_devel.png b/img/dock_devel.png
index 684804a..f7332dc 100644
Binary files a/img/dock_devel.png and b/img/dock_devel.png differ
diff --git a/img/dock_docs.png b/img/dock_docs.png
index a0ca7fa..92331a3 100644
Binary files a/img/dock_docs.png and b/img/dock_docs.png differ
diff --git a/img/dock_home.png b/img/dock_home.png
index 7543e6f..0ed3314 100644
Binary files a/img/dock_home.png and b/img/dock_home.png differ
diff --git a/img/dock_links.png b/img/dock_links.png
index 71a1d3d..8571c5e 100644
Binary files a/img/dock_links.png and b/img/dock_links.png differ
diff --git a/img/dock_mail.png b/img/dock_mail.png
index de6479d..8e3b19b 100644
Binary files a/img/dock_mail.png and b/img/dock_mail.png differ
diff --git a/img/dock_news.png b/img/dock_news.png
index dec1088..3d8b09c 100644
Binary files a/img/dock_news.png and b/img/dock_news.png differ
diff --git a/img/dock_themes.png b/img/dock_themes.png
index f2b1e08..5ed5ea3 100644
Binary files a/img/dock_themes.png and b/img/dock_themes.png differ
diff --git a/img/prefs_devel.png b/img/prefs_devel.png
new file mode 100644
index 0000000..684804a
Binary files /dev/null and b/img/prefs_devel.png differ
diff --git a/img/prefs_docs.png b/img/prefs_docs.png
new file mode 100644
index 0000000..a0ca7fa
Binary files /dev/null and b/img/prefs_docs.png differ
diff --git a/img/prefs_home.png b/img/prefs_home.png
new file mode 100644
index 0000000..7543e6f
Binary files /dev/null and b/img/prefs_home.png differ
diff --git a/img/prefs_links.png b/img/prefs_links.png
new file mode 100644
index 0000000..71a1d3d
Binary files /dev/null and b/img/prefs_links.png differ
diff --git a/img/prefs_mail.png b/img/prefs_mail.png
new file mode 100644
index 0000000..de6479d
Binary files /dev/null and b/img/prefs_mail.png differ
diff --git a/img/prefs_news.png b/img/prefs_news.png
new file mode 100644
index 0000000..dec1088
Binary files /dev/null and b/img/prefs_news.png differ
diff --git a/img/prefs_themes.png b/img/prefs_themes.png
new file mode 100644
index 0000000..f2b1e08
Binary files /dev/null and b/img/prefs_themes.png differ
diff --git a/style.css b/style.css
index 9fbcff8..4d5e055 100644
--- a/style.css
+++ b/style.css
@@ -22,6 +22,10 @@ a:hover {color: #2c7abc;}
 a:visited {color: #371e7e;}
 a:visited {color: #574882;}
 
+pre {
+    overflow-x: auto;
+}
+
 .caption {
     font-style: italic;
     font-size: 0.8em;
@@ -116,7 +120,7 @@ header h1 a span.first {color: black;}
 
 #wrapper {
     position: relative;
-    width: 900px;
+    width: 800px;
     margin: 0 auto;
     margin-top: 1em;
     margin-bottom: 1em;
@@ -163,74 +167,81 @@ article {
     padding: 1em;
 }
 
-nav.menu {
-    padding: 0 1em 0 1em;
+/* 64 * 2 + width of the wrapper (800) == 928 + margin */
+@media screen and (min-width: 940px) {
+    aside {
+        position: fixed;
+        right: 0;
+        top: 0;
+        width: 64px;
+    }
+
+    nav.menu li#home {background-image: url(/img/dock_home.png);}
+    nav.menu li#news {background-image: url(/img/dock_news.png);}
+    nav.menu li#docs {background-image: url(/img/dock_docs.png);}
+    nav.menu li#devel {background-image: url(/img/dock_devel.png);}
+    nav.menu li#themes {background-image: url(/img/dock_themes.png);}
+    nav.menu li#links {background-image: url(/img/dock_links.png);}
+
+    nav.menu {
+        padding: 0;
+    }
+
+    nav.menu ul {
+        padding: 0;
+        margin: 0;
+        list-style:none;
+    }
+
+    nav.menu li {
+        float: left;
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        display: inline;
+    }
+
+    nav.menu a {
+        padding: 3px 12px;
+        text-decoration: none;
+        color: #999;
+        line-height: 100%;
+    }
+
+    nav.menu a:hover {
+        color: #BBB;
+    }
+
+    nav.menu form {
+        display: inline;
+    }
+
+    nav.menu .current a {
+        color: #fff;
+    }
+
+    nav.menu li {
+        display: block;
+        width: 64px;
+        height: 64px;
+        border: 0;
+        padding:0;
+    }
+
+    nav.menu li a {
+        display: block;
+        width: 64px;
+        height: 64px;
+        border: 0;
+        padding:0;
+        line-height: 0;
+        font-size: 0;
+        color: transparent;
+    }
+
 }
 
-nav.menu ul {
-    border: 3px groove black;
-    padding: 0;
-    margin: 0;
-    list-style:none;
-    display: flex;
-    flex-wrap: nowrap;
-    overflow-x: auto;
-}
-
-nav.menu li {
-    float: left;
-    margin: 0;
-    padding: 0;
-    list-style: none;
-    display: inline;
-}
-
-nav.menu a {
-    padding: 3px 12px;
-    text-decoration: none;
-    color: #999;
-    line-height: 100%;
-}
-
-nav.menu a:hover {
-    color: #BBB;
-}
-
-nav.menu form {
-    display: inline;
-}
-
-nav.menu .current a {
-    color: #fff;
-}
-
-nav.menu li {
-    display: block;
-    width: 64px;
-    height: 64px;
-    border: 0;
-    padding:0;
-}
-
-nav.menu li a {
-    display: block;
-    width: 64px;
-    height: 64px;
-    border: 0;
-    padding:0;
-    line-height: 0;
-    font-size: 0;
-    color: transparent;
-}
-
-nav.menu li#home {background-image: url(/img/dock_home.png);}
-nav.menu li#news {background-image: url(/img/dock_news.png);}
-nav.menu li#docs {background-image: url(/img/dock_docs.png);}
-nav.menu li#devel {background-image: url(/img/dock_devel.png);}
-nav.menu li#themes {background-image: url(/img/dock_themes.png);}
-nav.menu li#links {background-image: url(/img/dock_links.png);}
-
-@media screen and (max-width: 900px) {
+@media screen and (max-width: 939px) {
 
     #wrapper {
         width: 100%;
@@ -241,6 +252,73 @@ nav.menu li#links {background-image: url(/img/dock_links.png);}
         width: auto;
     }
 
+    nav.menu {
+        padding: 0 1em 0 1em;
+    }
+
+    nav.menu ul {
+        border: 3px groove black;
+        padding: 0;
+        margin: 0;
+        list-style:none;
+        display: flex;
+        flex-wrap: nowrap;
+        overflow-x: auto;
+    }
+
+    nav.menu li {
+        float: left;
+        margin: 0;
+        padding: 0;
+        list-style: none;
+        display: inline;
+    }
+
+    nav.menu a {
+        padding: 3px 12px;
+        text-decoration: none;
+        color: #999;
+        line-height: 100%;
+    }
+
+    nav.menu a:hover {
+        color: #BBB;
+    }
+
+    nav.menu form {
+        display: inline;
+    }
+
+    nav.menu .current a {
+        color: #fff;
+    }
+
+    nav.menu li {
+        display: block;
+        width: 64px;
+        height: 64px;
+        border: 0;
+        padding:0;
+    }
+
+    nav.menu li a {
+        display: block;
+        width: 64px;
+        height: 64px;
+        border: 0;
+        padding:0;
+        line-height: 0;
+        font-size: 0;
+        color: transparent;
+    }
+
+    nav.menu li#home {background-image: url(/img/prefs_home.png);}
+    nav.menu li#news {background-image: url(/img/prefs_news.png);}
+    nav.menu li#docs {background-image: url(/img/prefs_docs.png);}
+    nav.menu li#devel {background-image: url(/img/prefs_devel.png);}
+    nav.menu li#themes {background-image: url(/img/prefs_themes.png);}
+    nav.menu li#links {background-image: url(/img/prefs_links.png);}
+
 }
 
 @media screen and (max-width: 600px) {
@@ -266,5 +344,4 @@ nav.menu li#links {background-image: url(/img/dock_links.png);}
         width: auto;
         float: none;
     }
-
 }