diff --git a/docs/game.xml b/docs/game.xml
index e923bfc2..bbd01cc9 100644
--- a/docs/game.xml
+++ b/docs/game.xml
@@ -44,10 +44,13 @@
     <h2>Controls</h2>
 
     <p>
-        This is the default controls setting:
+        These are the default controls:
     </p>
 
     <table>
+        <tr>
+            <td width="150">Escape</td><td>Main menu</td>
+        </tr>
         <tr>
             <td>W</td><td>Move forward</td>
         </tr>
@@ -63,12 +66,18 @@
         <tr>
             <td>Space</td><td>Jump</td>
         </tr>
+        <tr>
+            <td>Left-shift</td><td>Crouch</td>
+        </tr>
         <tr>
             <td>R</td><td>Reload</td>
         </tr>
         <tr>
             <td>T</td><td>Chat and console</td>
         </tr>
+        <tr>
+            <td>Y</td><td>Team-chat</td>
+        </tr>
         <tr>
             <td>G</td><td>Quick nade throw</td>
         </tr>
@@ -76,10 +85,13 @@
             <td>B</td><td>Weapon menu</td>
         </tr>            
         <tr>
-            <td>Left Mousebutton</td><td>Attack</td>
+            <td>Left mouse-click</td><td>Attack</td>
         </tr>
         <tr>
-            <td>Right Mousebutton</td><td>Quick nade throw / Scope when using the sniper</td>
+            <td>Right mouse-click</td><td>Quick nade throw / Scope when using the sniper</td>
+        </tr>
+        <tr>
+            <td>Center mouse-click</td><td>Knife</td>
         </tr>
         <tr>
             <td>Mousewheel</td><td>Cycle weapons</td>
@@ -96,27 +108,44 @@
         <tr>
             <td>4</td><td>Knife</td>
         </tr>
+        <tr>
+            <td>Tab</td><td>Show scores</td>
+        </tr>
+        <tr>
+            <td>Left alt</td><td>Show mini-map</td>
+        </tr>
+        <tr>
+            <td>Backspace</td><td>Drop-flag</td>
+        </tr>
+        <tr>
+            <td>F1</td><td>Vote yes</td>
+        </tr>
+        <tr>
+            <td>F2</td><td>Vote no</td>
+        </tr>
+        <tr>
+            <td>F7</td><td>Spectate</td>
+        </tr>
+        <tr>
+            <td>F8</td><td>Follow player (spectate)</td>
+        </tr>
+        <tr>
+            <td>F11</td><td>Show extended console</td>
+        </tr>
+        <tr>
+            <td>F12</td><td>Create screenshot</td>
+        </tr>
+        <tr>
+            <td>V</td><td>Voice-com menu</td>
+        </tr>
     </table>
 
     <p>
-        You can also assign custom keys to specific weapons. 
-        Just modify the <i>config/autoexec.cfg</i> accordingly. Example:
+        You can also assign custom keys to specific weapons by using the keybinding menu in-game.
+        This can be found by pressing escape and going into settings, and then keyboard/mouse controls.
     </p>
 
-    <div class="code">
-        bind f "primary"<br />
-        bind e "secondary"<br />
-        bind c "melee"<br />
-        bind q "grenades"<br />
-    </div>
-
-    <p>
-        You will find suggestions for more ergonomical key setups in this config file.
-    </p>
-
-
-    <a name="weapons"></a>
-    <h2>Weapons</h2>
+    <h2 id="weapons">Weapons</h2>
 
     <p>
         There are seven weapons you can use to frag your enemies:
diff --git a/docs/getstarted.xml b/docs/getstarted.xml
index 897ce06b..3fa6a5bb 100644
--- a/docs/getstarted.xml
+++ b/docs/getstarted.xml
@@ -19,30 +19,58 @@
     </p>
     <p id="minspecs">
       Minimum specs:
+      <ul>
+        <li>Processor: Pentium III 500 Mhz (or AMD equivalent).</li>
+        <li>Graphics: GeForce 1 / ATi Radeon or better.</li>
+        <li>Ram: 192 MB ram</li>
+      </ul>
     </p>
-    <ul>
-      <li>Processor: Pentium III 500 Mhz (or AMD equivalent).</li>
-      <li>Graphics: GeForce 1 / ATi Radeon or better.</li>
-      <li>Ram: 192 MB ram</li>
-    </ul>
     <p>
       Keep in mind these are the bare minimums, so you may need a lot of adjustment to get AssaultCube to run. 
       We recommend that you run AssaultCube on better hardware than this.
     </p>
     <p>
       Recommended GFX settings for low/medium end machines:
+      <ul>
+        <li>Resolution: 800x600@16bpp</li>
+        <li>Antialiasing: OFF</li>
+        <li>Anisotropic Filtering: OFF</li>
+      </ul>
     </p>
-    <ul>
-      <li>Resolution: 800x600@16bpp</li>
-      <li>Antialiasing: OFF</li>
-      <li>Anisotropic Filtering: OFF</li>
-    </ul>
+    <h3>Linux users</h3>
     <p>
-      Linux users: Make sure you have <i>libSDL 1.2</i>, <i>libSDL_image</i> and <i>libSDL_mixer</i>
-      installed.
+      Make sure you have these libraries installed:
+      <ul>
+        <li>
+          libSDL 1.2
+        </li>
+        <li>
+          libSDL_image
+        </li>
+        <li>
+          libSDL_mixer
+        </li>
+        <li>
+          Appropriate OpenGL drivers (if they're not installed already)
+        </li>
+      </ul>
+      Note: Settings for AssaultCube will be saved in the <i>.assaultcube</i> folder in your home directory.
     </p>
+    <h3>Windows 98 users</h3>
     <p>
-      Help for installing AssaultCube on different Operating Systems can be found on the wiki 
+      You may find that you need to rename the file <i>DbgHelp_RemoveThisPartIfOnWin98.DLL</i> in your <i>bin_win32</i>
+      folder to <i>DbgHelp.DLL</i> for AssaultCube to work.
+    </p>
+    <h3>Windows Vista users</h3>
+    <p>
+      Windows Vista PLACEHOLDER
+    </p>
+    <h3>Mac OS X users</h3>
+    <p>
+      OS X PLACEHOLDER
+    </p>     
+    <p>
+      More help for installing AssaultCube on different Operating Systems can be found on the wiki 
       <a href="http://assault.cubers.net/wiki/Running_AC_on_different_platforms" target="_blank">here</a>.
     </p>
     <h2>
@@ -61,13 +89,13 @@
       be found in <a href="startup.xml">command-line options</a>.
     </p>
     <h2>
-      Running AssaultCube
+      Running AssaultCube`
     </h2>
     <p>
       <b>Windows</b>: Use the shortcut provided. Or execute the <i>AssaultCube.bat</i> file in your AssaultCube folder.
     </p>
     <p>
-      <b>Linux</b>: In a console, change your location to the main AssaultCube directory and then execute <i>AssaultCube.sh</i>.
+      <b>Linux</b>: In a console, change your location (cd) to the main AssaultCube directory and then execute <i>AssaultCube.sh</i>.
     </p>
     <h1>
       Basics