diff --git a/docs/Haiku-doc.css b/docs/Haiku-doc.css
index 493fc8ff77..4ba92ca6f0 100644
--- a/docs/Haiku-doc.css
+++ b/docs/Haiku-doc.css
@@ -88,7 +88,6 @@ div.title {
 }
 div.topnav {
 	background: #e0e0e0;
-	line-height: 1.0;
 }
 div.topnav p {
 	margin-left: 40px;
diff --git a/docs/userguide/en/deskbar.html b/docs/userguide/en/deskbar.html
index 00a6b5cb70..fda6d01680 100644
--- a/docs/userguide/en/deskbar.html
+++ b/docs/userguide/en/deskbar.html
@@ -42,13 +42,14 @@
 <p>You can move the Deskbar to any corner or as a bar along the upper or lower border of the screen by gripping the knobbly area on the left side of the tray and drag&amp;drop it into the new position. You can also fold it into a more compact layout by drag&amp;dropping the knobbly area onto the Deskbar menu.</p>
 
 <h1><a id="deskbar-menu" name="deskbar-menu">The Deskbar Menu</a></h1>
-<p>A menu opens when you click on the Deskbar's uppermost part:</p>
-<img src="../images/deskbar-images/settings.png" alt="settings.png" width="521" height="309" />
+<p>A menu opens when you click on the Deskbar's top:</p>
+<img src="../images/deskbar-images/settings.png" alt="settings.png" width="521" height="284" />
 <ul>
 <li><p><b>About This System...</b> - Shows some basic information of the system, licenses and the credits of the Haiku project.</p></li>
 
 <li><p><b>Find...</b> - Opens the <a href="queries.html">Query</a> dialog.</p></li>
 <li><p><b>Show Replicants</b> - Shows/hides the little Replicant widget you use to drag it around, remove or access its context menu.</p></li>
+<li><p><b>Mount</b> - Offers the same options as when invoked by right-clicking the Desktop (see <a href="tracker.html#mounting-volumes">Mounting Volumes</a>).</p></li>
 <li><p><b>Deskbar Settings</b></p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
 <tr><td><span class="menu">Configure Deskbar Menu...</span></td><td>&#160;</td><td>Opens a panel to configure the Deskbar menu (see below).</td></tr>
@@ -63,9 +64,8 @@
 <tr><td class="onelinetop"><span class="menu">Show Application Expander</span></td><td>&#160;</td><td>Provides a small widget to show/hide all windows of a program directly under its entry in the Deskbar.</td></tr>
 <tr><td><span class="menu">Expand New Applications</span></td><td>&#160;</td><td>Newly launched programs have their windows automatically expanded under their entry in the Deskbar.</td></tr>
     </table></li>
-<li><p><b>Restart</b> - Restarts the system.</p></li>
-<li><p><b>Shutdown</b> - Shuts down the system.</p></li>
-<li><p><b>Recent Documents, Folders, Applications</b> - List the last recently opened documents, folders and applications (see <span class="menu">Configure Deskbar Menu...</span> below).
+<li><p><b>Shutdown</b> - Offers options to either <span class="menu">Restart System</span> or <span class="menu">Power Off</span>.</p></li>
+<li><p><b>Recent Documents, Folders, Applications</b> - List of the last recently opened documents, folders and applications (see <span class="menu">Configure Deskbar Menu...</span> below).
 <li><p><b>Applications, Demos, Deskbar Applets, Preferences</b> - List of installed applications, demos, applets and preferences (see <span class="menu">Configure Deskbar Menu...</span> below).</p></li>
 </ul>
 
diff --git a/docs/userguide/en/preferences/prefs-fonts.html b/docs/userguide/en/preferences/prefs-fonts.html
index 6658f1beaa..c28cb3d8ca 100644
--- a/docs/userguide/en/preferences/prefs-fonts.html
+++ b/docs/userguide/en/preferences/prefs-fonts.html
@@ -52,7 +52,7 @@
 </table>
 
 <h1><a id="install" name="install">Installing new fonts</a></h1>
-<p>You install new fonts by copying them into their respective user folder, i.e. <span class="path">/boot/common/fonts/</span> or <span class="path">/boot/home/config/fonts/</span> (see topic <a href="filesystem-layout.html">Filesystem layout</a>).</p>
+<p>You install new fonts by copying them into their respective user folder, i.e. <span class="path">/boot/common/fonts/</span> or <span class="path">/boot/home/config/fonts/</span> (see topic <a href="../filesystem-layout.html">Filesystem layout</a>).</p>
 
 </div>
 
diff --git a/docs/userguide/en/preferences/prefs-keymap.html b/docs/userguide/en/preferences/prefs-keymap.html
index 7b65f28171..9839f09577 100644
--- a/docs/userguide/en/preferences/prefs-keymap.html
+++ b/docs/userguide/en/preferences/prefs-keymap.html
@@ -5,7 +5,7 @@
 <head>
 <!-- 
  *
- * Copyright 2008, Haiku. All rights reserved.
+ * Copyright 2008-2009, Haiku. All rights reserved.
  * Distributed under the terms of the MIT License.
  *
  * Authors:
@@ -44,20 +44,310 @@
 <span class="path">~/config/settings/Key_map</span></td></tr>
 </table>
 <p><br /></p>
-<img src="../../images/prefs-images/keymap.png" alt="keymap.png" width="681" height="287" />
-<p>The Keymap window shows a representation of your keyboard. When you press a key, the corresponding key is inverted and the assigned symbol is entered into the text field at the top. From there you can copy and paste it into any document.<br />
-Thus, the Keymap preferences are not only for configuring your local keymap, but are also useful when looking for a special symbol used in other languages. For example, you can switch the keymap to "French", find the "&ccedil;" and copy it into your mail to Fran&ccedil;ois. (Though you'll find the "cedil" also in other keymaps...")</p>
-<p>Pressing modifier keys like <span class="key">SHIFT</span> or <span class="key">AltGr</span>, you'll find more special characters.</p>
-<p>Then there are the keys that are marked with a yellow outline. These are keys that can change the key you press after that. If you press a yellow key twice, those changeable keys are marked with a red outline. Examples are &eacute;, &ntilde;, &oacute; or &euml;.</p>
-<p>You set the used font, which may or may not contain all symbols for a specific keymap from the <span class="menu">Font</span> menu.</p>
+<img src="../../images/prefs-images/keymap.png" alt="keymap.png" width="1053" height="442" />
+<p>To the right, the Keymap window shows a representation of your keyboard. When you press a key, the corresponding key is darkened and the assigned symbol is entered into the <i>Sample and Clipboard</i> text field at the bottom. From there you can also copy and paste it into a document.<br />
+Thus, the Keymap preferences are not only for configuring your local keymap, but are also useful when looking for a special symbol used in other languages. For example, you can switch the keymap to "French", find the "&ccedil;" and copy it into your mail to Fran&ccedil;ois. (Though you'll find the "cedil" also in other keymaps...)</p>
+<p>Pressing modifier keys like <span class="key">SHIFT</span>, <span class="key">CONTROL</span> or <span class="key">OPTION</span> changes the displayed keyboard accordingly.</p>
+<p>Then there are the keys that are marked with a blue background. These keys are called <i>Dead Keys</i> that can change the key you press after that. If you click on such a blue key with your mouse, those changeable keys light up yellow. Click again and everything's back to normal. Examples are &eacute;, &ntilde;, &oacute; or &euml;.</p>
+<p>Below the keyboard representation are two more options:</p>
 <table summary="layout" border="0" cellpadding="2" cellspacing="0">
-<tr><td><span class="button">Revert</span></td><td>&#160;</td><td>brings back the settings that were active when you started the Keymap preferences.</td></tr>
-<tr><td><span class="button">Use</span></td><td>&#160;</td><td>applies your changes.</td></tr>
+<tr><td><span class="menu">Select Dead Keys</span></td><td>&#160;</td><td>for setting the above mentioned blue keys.</td></tr>
+<tr><td class="onelinetop"><span class="menu">Switch Shortcut Key...</span></td><td>&#160;</td><td>for using the shortcut key in Windows/Linux mode, i.e. <span class="key">CONTROL</span> (normally <span class="key">CTRL</span>) or Haiku mode, i.e. <span class="key">COMMAND</span> (normally <span class="key">ALT</span>).</td></tr>
 </table>
+<p>The lists on the left offer the available pre-configured keymaps of the system, and below that, if available, user-defined maps. You can change a keymap via drag&drop in the keyboard representation: a left-click-drag copies a key, a right-click-drag exchanges the two keys.<br />
+When you're done you can save the result from the menu <span class="menu">File | Save...</span>. Your modified map will only appear in the user-defined list if it's stored in <span class="path">~/config/settings/Keymap/</span>. Otherwise you'll have to manually load it via <span class="menu">File | Open...</span>.</p>
+<p>To better match the Keymap panel to your physical keyboard, there are several different settings available from the <span class="menu">Layout</span> menu.</p>
+<p>The font used in the keyboard representation is set from the <span class="menu">Font</span> menu. Note, that it may or may not contain all symbols for a specific keymap.</p>
+<p>Finally, there's a <span class="button">Revert</span> button to bring back the settings that were active when you started the Keymap preferences.</p>
+
+<h1><a id="advanced-keymapping" name="advanced-keymapping">Advanced keymap manipulation</a></h1>
+<p>There's another method to customize your keymap besides the Keymap preference panel. It involves editing a text file containing loads of hex values, which may appear daunting on first sight, but isn't really that impossible to grasp.</p>
+<p>You can dump the current keymap with a command in Terminal:<p>
+<pre class="terminal">keymap -d > MyKeymap</pre>
+<p>The generated text file can then be opened in a text editor. Make sure to use a fixed font in that editor or you'll never grok that file...<br />
+At the beginning of that file, you'll find a legend of a stylized keyboard with the hex value corresponding to each key. Below that are the actual assignments of every value. You can do all the customizing that's also available from the Keymap preference panel, and then some. If you happen to have some special keys on your keyboard, you may be able to activate them. That is, use them as ordinary keys or like an option or control key. You won't be able to, for example, have your multimedia keys de/increase the volume or start some application. For this you can use e.g. <a href="http://www.haikuware.com/directory/view-details/utilities/desktop-accessories/spicykeys" class="noprinturl">SpicyKeys</a>.</p>
+<p>When you're finished, you'll save the file and have your system use the modified keymap with this command:</p>
+<pre class="terminal">keymap -l &lt; MyKeymap</pre>
+<p>This is the dumped file (the rightmost keys of the stylized keyboard are cut-off for a nicer display on this page):</p>
+
+<pre>#!/bin/keymap -l
+#
+#	Raw key numbering for 101 keyboard...
+#                                                                                    
+#                                                                                    
+# [esc]       [ f1] [ f2] [ f3] [ f4] [ f5] [ f6] [ f7] [ f8] [ f9] [f10] [f11] [f12]
+#  0x01        0x02  0x03  0x04  0x05  0x06  0x07  0x08  0x09  0x0a  0x0b  0x0c  0x0d
+#
+# [ ` ] [ 1 ] [ 2 ] [ 3 ] [ 4 ] [ 5 ] [ 6 ] [ 7 ] [ 8 ] [ 9 ] [ 0 ] [ - ] [ = ] [bck]
+#  0x11  0x12  0x13  0x14  0x15  0x16  0x17  0x18  0x19  0x1a  0x1b  0x1c  0x1d  0x1e
+#
+# [tab] [ q ] [ w ] [ e ] [ r ] [ t ] [ y ] [ u ] [ i ] [ o ] [ p ] [ [ ] [ ] ] [ \ ]
+#  0x26  0x27  0x28  0x29  0x2a  0x2b  0x2c  0x2d  0x2e  0x2f  0x30  0x31  0x32  0x33
+#
+# [cap] [ a ] [ s ] [ d ] [ f ] [ g ] [ h ] [ j ] [ k ] [ l ] [ ; ] [ ' ] [  enter  ]
+#  0x3b  0x3c  0x3d  0x3e  0x3f  0x40  0x41  0x42  0x43  0x44  0x45  0x46     0x47   
+#
+# [shift]     [ z ] [ x ] [ c ] [ v ] [ b ] [ n ] [ m ] [ , ] [ . ] [ / ]     [shift]
+#   0x4b       0x4c  0x4d  0x4e  0x4f  0x50  0x51  0x52  0x53  0x54  0x55       0x56 
+#
+# [ctr]             [cmd]             [  space  ]             [cmd]             [ctr]
+#  0x5c              0x5d                 0x5e                 0x5f              0x60
+#
+#	NOTE: On a Microsoft Natural Keyboard:
+#			left option  = 0x66
+#			right option = 0x67
+#			menu key     = 0x68
+#	NOTE: On an Apple Extended Keyboard:
+#			left option  = 0x66
+#			right option = 0x67
+#			keypad '='   = 0x6a
+#			power key    = 0x6b
+Version = 3
+CapsLock = 0x3b
+ScrollLock = 0x0f
+NumLock = 0x22
+LShift = 0x4b
+RShift = 0x56
+LCommand = 0x5d
+RCommand = 0x60
+LControl = 0x5c
+RControl = 0x00
+LOption = 0x66
+ROption = 0x5f
+Menu = 0x68
+#
+# Lock settings
+# To set NumLock, do the following:
+#   LockSettings = NumLock
+#
+# To set everything, do the following:
+#   LockSettings = CapsLock NumLock ScrollLock
+#
+LockSettings = 
+# Legend:
+#   n = Normal
+#   s = Shift
+#   c = Control
+#   C = CapsLock
+#   o = Option
+# Key      n        s        c        o        os       C        Cs       Co       Cos     
+Key 0x00 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x01 = 0x1b     0x1b     0x1b     0x1b     0x1b     0x1b     0x1b     0x1b     0x1b     
+Key 0x02 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x03 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x04 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x05 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x06 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x07 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x08 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x09 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x0a = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x0b = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x0c = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x0d = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x0e = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x0f = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x10 = 0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     0x10     
+Key 0x11 = '^'      0xc2b0   ''       ' '      ''       '^'      0xc2b0   ' '      ''       
+Key 0x12 = '1'      '!'      ''       ' '      ''       '!'      '1'      ' '      ''       
+Key 0x13 = '2'      '"'      ''       0xc2b2   ''       '"'      '2'      0xc2b2   ''       
+Key 0x14 = '3'      0xc2a7   ''       0xc2b3   ''       0xc2a7   '3'      0xc2b3   ''       
+Key 0x15 = '4'      '$'      ''       ' '      ''       '$'      '4'      ' '      ''       
+Key 0x16 = '5'      '%'      ''       ' '      ''       '%'      '5'      ' '      ''       
+Key 0x17 = '6'      '&'      ''       ' '      ''       '&'      '6'      ' '      ''       
+Key 0x18 = '7'      '/'      ''       '{'      ''       '/'      '7'      '{'      ''       
+Key 0x19 = '8'      '('      ''       '['      ''       '('      '8'      '['      ''       
+Key 0x1a = '9'      ')'      ''       ']'      ''       ')'      '9'      ']'      ''       
+Key 0x1b = '0'      '='      ''       '}'      ''       '='      '0'      '}'      ''       
+Key 0x1c = 0xc39f   '?'      ''       '\\'     ''       '?'      0xc39f   '\\'     ''       
+Key 0x1d = 0xc2b4   '`'      ''       ' '      ''       0xc2b4   '`'      ' '      ''       
+Key 0x1e = 0x08     0x08     0x08     0x08     0x08     0x08     0x08     0x08     0x08     
+Key 0x1f = 0x05     0x05     0x05     0x05     0x05     0x05     0x05     0x05     0x05     
+Key 0x20 = 0x01     0x01     0x01     0x01     0x01     0x01     0x01     0x01     0x01     
+Key 0x21 = 0x0b     0x0b     0x0b     0x0b     0x0b     0x0b     0x0b     0x0b     0x0b     
+Key 0x22 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x23 = '/'      '/'      '/'      '/'      '/'      '/'      '/'      '/'      '/'      
+Key 0x24 = '*'      '*'      '*'      '*'      '*'      '*'      '*'      '*'      '*'      
+Key 0x25 = '-'      '-'      '-'      '-'      '-'      '-'      '-'      '-'      '-'      
+Key 0x26 = 0x09     0x09     0x09     0x09     0x09     0x09     0x09     0x09     0x09     
+Key 0x27 = 'q'      'Q'      0x11     '@'      ''       'Q'      'q'      '@'      ''       
+Key 0x28 = 'w'      'W'      0x17     ' '      ''       'W'      'w'      ' '      ''       
+Key 0x29 = 'e'      'E'      0x05     0xe282ac ''       'E'      'e'      0xe282ac ''       
+Key 0x2a = 'r'      'R'      0x12     ' '      ''       'R'      'r'      ' '      ''       
+Key 0x2b = 't'      'T'      0x14     ' '      ''       'T'      't'      ' '      ''       
+Key 0x2c = 'z'      'Z'      0x1a     ' '      ''       'Z'      'z'      ' '      ''       
+Key 0x2d = 'u'      'U'      0x15     ' '      ''       'U'      'u'      ' '      ''       
+Key 0x2e = 'i'      'I'      0x09     ' '      ''       'I'      'i'      ' '      ''       
+Key 0x2f = 'o'      'O'      0x0f     ' '      ''       'O'      'o'      ' '      ''       
+Key 0x30 = 'p'      'P'      0x10     ' '      ''       'P'      'p'      ' '      ''       
+Key 0x31 = 0xc3bc   0xc39c   0x1b     ' '      ''       0xc39c   0xc3bc   ' '      ''       
+Key 0x32 = '+'      '*'      0x1d     '~'      ''       '*'      '+'      '~'      ''       
+Key 0x33 = '#'      '\''     0x1c     ' '      ''       '\''     '#'      ' '      ''       
+Key 0x34 = 0x7f     0x7f     0x7f     0x7f     0x7f     0x7f     0x7f     0x7f     0x7f     
+Key 0x35 = 0x04     0x04     0x04     0x04     0x04     0x04     0x04     0x04     0x04     
+Key 0x36 = 0x0c     0x0c     0x0c     0x0c     0x0c     0x0c     0x0c     0x0c     0x0c     
+Key 0x37 = 0x01     '7'      0x01     0x01     '7'      0x01     '7'      0x01     '7'      
+Key 0x38 = 0x1e     '8'      0x1e     0x1e     '8'      0x1e     '8'      0x1e     '8'      
+Key 0x39 = 0x0b     '9'      0x0b     0x0b     '9'      0x0b     '9'      0x0b     '9'      
+Key 0x3a = '+'      '+'      '+'      '+'      '+'      '+'      '+'      '+'      '+'      
+Key 0x3b = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x3c = 'a'      'A'      0x01     ' '      ''       'A'      'a'      ' '      ''       
+Key 0x3d = 's'      'S'      0x13     ' '      ''       'S'      's'      ' '      ''       
+Key 0x3e = 'd'      'D'      0x04     ' '      ''       'D'      'd'      ' '      ''       
+Key 0x3f = 'f'      'F'      0x06     ' '      ''       'F'      'f'      ' '      ''       
+Key 0x40 = 'g'      'G'      0x07     ' '      ''       'G'      'g'      ' '      ''       
+Key 0x41 = 'h'      'H'      0x08     ' '      ''       'H'      'h'      ' '      ''       
+Key 0x42 = 'j'      'J'      0x0a     ' '      ''       'J'      'j'      ' '      ''       
+Key 0x43 = 'k'      'K'      0x0b     ' '      ''       'K'      'k'      ' '      ''       
+Key 0x44 = 'l'      'L'      0x0c     ' '      ''       'L'      'l'      ' '      ''       
+Key 0x45 = 0xc3b6   0xc396   ''       ' '      ''       0xc396   0xc3b6   ' '      ''       
+Key 0x46 = 0xc3a4   0xc384   ''       ' '      ''       0xc384   0xc3a4   ' '      ''       
+Key 0x47 = 0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     
+Key 0x48 = 0x1c     '4'      0x1c     0x1c     '4'      0x1c     '4'      0x1c     '4'      
+Key 0x49 = ''       '5'      ''       ''       '5'      ''       '5'      ''       '5'      
+Key 0x4a = 0x1d     '6'      0x1d     0x1d     '6'      0x1d     '6'      0x1d     '6'      
+Key 0x4b = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x4c = 'y'      'Y'      0x19     ' '      ''       'Y'      'y'      ' '      ''       
+Key 0x4d = 'x'      'X'      0x18     ' '      ''       'X'      'x'      ' '      ''       
+Key 0x4e = 'c'      'C'      0x03     ' '      ''       'C'      'c'      ' '      ''       
+Key 0x4f = 'v'      'V'      0x16     ' '      ''       'V'      'v'      ' '      ''       
+Key 0x50 = 'b'      'B'      0x02     ' '      ''       'B'      'b'      ' '      ''       
+Key 0x51 = 'n'      'N'      0x0e     ' '      ''       'N'      'n'      ' '      ''       
+Key 0x52 = 'm'      'M'      0x0d     0xc2b5   ''       'M'      'm'      0xc2b5   ''       
+Key 0x53 = ','      ';'      ','      ' '      ''       ';'      ','      ' '      ''       
+Key 0x54 = '.'      ':'      '.'      ' '      ''       ':'      '.'      ' '      ''       
+Key 0x55 = '-'      '_'      ''       ' '      ''       '-'      '_'      ' '      ''       
+Key 0x56 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x57 = 0x1e     0x1e     0x1e     0x1e     0x1e     0x1e     0x1e     0x1e     0x1e     
+Key 0x58 = 0x04     '1'      0x04     0x04     '1'      0x04     '1'      0x04     '1'      
+Key 0x59 = 0x1f     '2'      0x1f     0x1f     '2'      0x1f     '2'      0x1f     '2'      
+Key 0x5a = 0x0c     '3'      0x0c     0x0c     '3'      0x0c     '3'      0x0c     '3'      
+Key 0x5b = 0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     0x0a     
+Key 0x5c = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x5d = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x5e = ' '      ' '      0x00     ' '      ' '      ' '      ' '      ' '      ' '      
+Key 0x5f = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x60 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x61 = 0x1c     0x1c     0x1c     0x1c     0x1c     0x1c     0x1c     0x1c     0x1c     
+Key 0x62 = 0x1f     0x1f     0x1f     0x1f     0x1f     0x1f     0x1f     0x1f     0x1f     
+Key 0x63 = 0x1d     0x1d     0x1d     0x1d     0x1d     0x1d     0x1d     0x1d     0x1d     
+Key 0x64 = 0x05     '0'      0x05     0x05     '0'      0x05     '0'      0x05     '0'      
+Key 0x65 = 0x7f     ','      0x7f     0x7f     ','      0x7f     ','      0x7f     ','      
+Key 0x66 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x67 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x68 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x69 = '<'      '>'      ''       '|'      ''       '<'      '>'      '|'      ''       
+Key 0x6a = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x6b = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x6c = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x6d = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x6e = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x6f = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x70 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x71 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x72 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x73 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x74 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x75 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x76 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x77 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x78 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x79 = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x7a = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x7b = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x7c = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x7d = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x7e = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Key 0x7f = ''       ''       ''       ''       ''       ''       ''       ''       ''       
+Acute ' '       = 0xc2b4   
+Acute 'A'       = 0xc381   
+Acute 'E'       = 0xc389   
+Acute 'I'       = 0xc38d   
+Acute 'O'       = 0xc393   
+Acute 'U'       = 0xc39a   
+Acute 'Y'       = 0xc39d   
+Acute 'a'       = 0xc3a1   
+Acute 'e'       = 0xc3a9   
+Acute 'i'       = 0xc3ad   
+Acute 'o'       = 0xc3b3   
+Acute 'u'       = 0xc3ba   
+Acute 'y'       = 0xc3bd   
+Acute ''        = ''       
+Acute ''        = ''       
+Acute ''        = ''       
+AcuteTab = Normal Shift Option Option-Shift CapsLock CapsLock-Shift CapsLock-Option CapsLock-Option-Shift 
+Grave ' '       = '`'      
+Grave 'A'       = 0xc380   
+Grave 'E'       = 0xc388   
+Grave 'I'       = 0xc38c   
+Grave 'O'       = 0xc392   
+Grave 'U'       = 0xc399   
+Grave 'a'       = 0xc3a0   
+Grave 'e'       = 0xc3a8   
+Grave 'i'       = 0xc3ac   
+Grave 'o'       = 0xc3b2   
+Grave 'u'       = 0xc3b9   
+Grave ''        = ''       
+Grave ''        = ''       
+Grave ''        = ''       
+Grave ''        = ''       
+Grave ''        = ''       
+GraveTab = Normal Shift Option Option-Shift CapsLock CapsLock-Shift CapsLock-Option CapsLock-Option-Shift 
+Circumflex ' '       = '^'      
+Circumflex 'A'       = 0xc382   
+Circumflex 'E'       = 0xc38a   
+Circumflex 'I'       = 0xc38e   
+Circumflex 'O'       = 0xc394   
+Circumflex 'U'       = 0xc39b   
+Circumflex 'a'       = 0xc3a2   
+Circumflex 'e'       = 0xc3aa   
+Circumflex 'i'       = 0xc3ae   
+Circumflex 'o'       = 0xc3b4   
+Circumflex 'u'       = 0xc3bb   
+Circumflex ''        = ''       
+Circumflex ''        = ''       
+Circumflex ''        = ''       
+Circumflex ''        = ''       
+Circumflex ''        = ''       
+CircumflexTab = Normal Shift Option Option-Shift CapsLock CapsLock-Shift CapsLock-Option CapsLock-Option-Shift 
+Diaeresis ' '       = 0xc2a8   
+Diaeresis 'A'       = 0xc384   
+Diaeresis 'E'       = 0xc38b   
+Diaeresis 'I'       = 0xc38f   
+Diaeresis 'O'       = 0xc396   
+Diaeresis 'U'       = 0xc39c   
+Diaeresis 'Y'       = 0xc5b8   
+Diaeresis 'a'       = 0xc3a4   
+Diaeresis 'e'       = 0xc3ab   
+Diaeresis 'i'       = 0xc3af   
+Diaeresis 'o'       = 0xc3b6   
+Diaeresis 'u'       = 0xc3bc   
+Diaeresis 'y'       = 0xc3bf   
+Diaeresis ''        = ''       
+Diaeresis ''        = ''       
+Diaeresis ''        = ''       
+DiaeresisTab = Normal Shift Option Option-Shift CapsLock CapsLock-Shift CapsLock-Option CapsLock-Option-Shift 
+Tilde ' '       = '~'      
+Tilde 'A'       = 0xc383   
+Tilde 'O'       = 0xc395   
+Tilde 'N'       = 0xc391   
+Tilde 'a'       = 0xc3a3   
+Tilde 'o'       = 0xc3b5   
+Tilde 'n'       = 0xc3b1   
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+Tilde ''        = ''       
+TildeTab = Normal Shift Option Option-Shift CapsLock CapsLock-Shift CapsLock-Option CapsLock-Option-Shift </pre>
 
 </div>
 
-<!--
+
 <div class="bottomnav">
 	<p>
 		<a href="../preferences.html">Preferences</a>
@@ -67,7 +357,7 @@ Thus, the Keymap preferences are not only for configuring your local keymap, but
 		Next: <a href="prefs-media">Media</a>
 	</p>
 </div>
--->
+
 
 </body>
 </html>
diff --git a/docs/userguide/en/tracker.html b/docs/userguide/en/tracker.html
index 8e5a542b0e..438354f270 100644
--- a/docs/userguide/en/tracker.html
+++ b/docs/userguide/en/tracker.html
@@ -40,7 +40,7 @@
 <p>Being an application like any other (the Desktop with its icons is really just a fullscreen window in the background), Tracker appears with its windows in the Deskbar and can be quit and restarted. The easiest way to quit and restart a crashed or frozen Tracker (or a wayward Deskbar) is to call the <a href="teammonitor.html">Team Monitor</a>.</p>
 
 <h1><a id="mounting-volumes" name="mounting-volumes">Mounting Volumes</a></h1>
-<p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume, that is, let the system know it's there. This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the <span class="menu">Mount</span> submenu.</p>
+<p>In order to access a harddisk, CD, USB stick etc., you first have to mount the volume, that is, let the system know it's there. This is done with a right-click on the Desktop or an already mounted volume (like the boot disk) and choosing the volume from the <span class="menu">Mount</span> submenu. You find the same <span class="menu">Mount</span> menu in the Deskbar.</p>
 <img src="../images/tracker-images/mount-settings.png" alt="drill-down.png" width="581" height="290" />
 <p>There are also <span class="menu">Mount Settings</span> so you don't have to mount everything manually after every bootup.<br />
 The above settings will automatically mount any storage device you connect/insert and also mount all disks on bootup that were mounted previously.</p>
diff --git a/docs/userguide/images/deskbar-images/settings.png b/docs/userguide/images/deskbar-images/settings.png
index f7cf3f92f3..2b6eaa752d 100644
Binary files a/docs/userguide/images/deskbar-images/settings.png and b/docs/userguide/images/deskbar-images/settings.png differ
diff --git a/docs/userguide/images/prefs-images/keymap.png b/docs/userguide/images/prefs-images/keymap.png
index 612f113b8e..0b5232841f 100644
Binary files a/docs/userguide/images/prefs-images/keymap.png and b/docs/userguide/images/prefs-images/keymap.png differ