diff --git a/docs/README.xml b/docs/README.xml
index 59f445b3..1acf82c6 100644
--- a/docs/README.xml
+++ b/docs/README.xml
@@ -49,7 +49,7 @@
         <a href="getstarted.xml">Getting started</a> - How to install and make AssaultCube work.
       </li>
       <li>
-        <a href="game.xml">Introduction</a> - Basic information about the game including gameplay, modes, weapons.
+        <a href="introduction.xml">Introduction</a> - Basic information about the game including gameplay, modes, weapons.
       </li>
       <li>
         <a href="basics.xml">The basics</a> - How to do basic things like join a game, change your name/team.
@@ -66,13 +66,17 @@
         <a href="reference.xml">Reference</a> - Documentation of available commands and variables.
       </li>
       <li>
-        <a href="startup.xml">Startup</a> - Command line arguments
-      </li>
+        <a href="commandline.xml">Command line</a> - Command line arguments
+      </li>      
       <li>
         <a href="server.xml">Servers</a> - Information on how to set up your own server, administration of servers, running LAN games.
       </li>
       <li>
-        <a href="mappers_readme.txt">Mappers readme</a> - The official mapping guidelines.
+        <a href="mapediting.xml">Map editing</a> - Information about creating maps for AssaultCube.
+      </li>
+      <li>
+        <a href="mappers_readme.txt">Mappers readme</a> - Guidelines about the types of maps the developers are looking for if you want
+        to try and create maps for the official AssaultCube package.
       </li>      
       <li>
         <a href="cubescript.xml">CubeScript</a> - A CubeScript introduction.
diff --git a/docs/getstarted.xml b/docs/getstarted.xml
index c15403bc..92c65924 100644
--- a/docs/getstarted.xml
+++ b/docs/getstarted.xml
@@ -3,11 +3,11 @@
 <?xml-stylesheet type="text/xsl" href="transformations/cubedoc2xhtml.xslt"?>
 <html xmlns="http://www.w3.org/1999/xhtml" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" lang="en" xml:lang="en">
   <head>
-    <title>Get Started</title>
+    <title>Get started</title>
   </head>
   <body>
     <h1>
-      Get Started
+      Get started
     </h1>
     <h2 id="requirements">
       System requirements
@@ -126,12 +126,12 @@
       defaults to how you would like them. Some display settings can be changed here.
     </p>
     <p>
-      To change more display settings, press ESCAPE and then go: Settings > Video Settings.
+      To change more display settings, press ESCAPE and then navigate to: Settings &rArr; Video Settings.
     </p>
     <p>
       If you are having technical problems and need to change settings in a way that doesn't start the game
       to do it, you can modify the batch/shell script by adding parameters into it. How to edit the batch/shell and the 
-      different parameters can be found in <a href="startup.xml">command-line options</a>. You can also add 
+      different parameters can be found in <a href="commandline.xml">command-line arguments</a>. You can also add 
       <a href="reference.xml">commands</a> to <i>config/autoexec.cfg</i> so they automatically execute on startup.
     </p>
     <h2>
@@ -159,7 +159,7 @@
           <b>Mac OS X</b>
         </td>
         <td>
-          Open the applications folder. Click on AssaultCube. Follow the on-screen launchers instructions.
+          Open the applications folder. Click on AssaultCube. Select the options you want to use to run AssaultCube and then press <i>play</i>.
         </td>
       </tr>
     </table>
diff --git a/docs/pics/weapon_shotgun.jpg b/docs/pics/weapon_shotgun.jpg
index f796b079..e4e050a7 100644
Binary files a/docs/pics/weapon_shotgun.jpg and b/docs/pics/weapon_shotgun.jpg differ
diff --git a/docs/pics/weapon_subgun.jpg b/docs/pics/weapon_subgun.jpg
index d74aec42..e924f23f 100644
Binary files a/docs/pics/weapon_subgun.jpg and b/docs/pics/weapon_subgun.jpg differ