diff --git a/docs/cfclient_zmq.md b/docs/cfclient_zmq.md
index 267969061dd433df7d23de0853efc865e22f9123..e39a3551b4fbef38ac15d6fc4e23f3614830b3ad 100644
--- a/docs/cfclient_zmq.md
+++ b/docs/cfclient_zmq.md
@@ -4,7 +4,7 @@ page_id: cfclient_zmq
 ---
 
 
-The [Crazyflie Python client](/doc/crazyflie/client/pycfclient/index)
+The [Crazyflie Python client](/userguide_client/)
 runs a number of back-ends where you can set/get information from other
 applications via [ZMQ](http://zeromq.org/).
 
@@ -96,7 +96,7 @@ parameters, it\'s just the control part that\'s broken out.
 By default this is disabled in the configuration file and needs to be
 enabled. The configuration file parameter is named *enable\_zmq\_input*
 (see
-[this](/doc/crazyflie/dev/host/client/index#user_configuration_file) to
+[this](/dev_info_client#user-configuration-file) to
 edit the configuration). To enable controlling by the back-end select
 the *ZMQ\@127.0.0.1:1212* input device in the *Input device* menu.
 
diff --git a/docs/dev_info_client.md b/docs/dev_info_client.md
index b72b3056f400a81fe7893999bc9029c24d7fb634..cd2d66242225ff5580aeba3437bc665c20327d42 100644
--- a/docs/dev_info_client.md
+++ b/docs/dev_info_client.md
@@ -20,7 +20,7 @@ Here\'s a quick overview:
 Architecture
 ============
 
-![](/images/input-arch-mux.png){:.align-right
+![input arch mux](/images/input-arch-mux.png){:.align-right
 width="600"}
 
 Input devices
@@ -71,7 +71,7 @@ The input interfaces don\'t use any mapping, the devices itself directly
 generate useful values (like roll/pitch/yaw/thrust). Currently there\'s
 two implementations: LeapMotion and ZMQ. Values are read the same way as
 from normal gamepads/joysticks, at 100Hz. For more information on how
-the ZMQ interface works read [here](/doc/crazyflie/zmq/index).
+the ZMQ interface works read [here](/cfclient_zmq#input-device).
 
 ### The MUX
 
@@ -203,7 +203,7 @@ TOC cache files
 
 In order to speed up the connection procedure for the Crazyflie the TOCs
 are cached ([more info on logging/parameter frameworks and
-TOC](/doc/crazyflie/dev/arch/logparam)). The writable part of the TOC
+TOC](https://www.bitcraze.io/docs/crazyflie-firmware/master/)). The writable part of the TOC
 cache is located in */conf/cache* where each cache is saved in a file
 named after the CRC32 (in hex) of the TOC CRC32 (for example
 *1CB41680.json*). There\'s also a read-only part of the TOC cache
diff --git a/docs/inputdevices.md b/docs/inputdevices.md
index 5917b2d83e0e29df9dc849674198fbc671d8d282..376dafc8e81b0389de90873a9d07ad6fbe2f629c 100644
--- a/docs/inputdevices.md
+++ b/docs/inputdevices.md
@@ -73,8 +73,8 @@ us an email.
 
  | **Controller**    |        **Linux USB**       |                                                        **Linux BT**  |                                                                    **Win XP USB**  | **Win XP BT**  |                                                                    **Win7 USB**     |                                                                      **Win7 BT**        |                                                                          **Win8 USB**         |                                                             **Mac OSX USB**  | **Mac OSX BT**|
 |--|--|--|--|--|--|--|--|--|--|--|
- | Playstation 3 (or copy)  | Works           |                                                            [Instructions](#linux_using_bluetooth) |  Works       |     [Instructions?](#winxp_using_bluetooth) |  [Motion joy instructions?](#win7_using_usb)  | [Motion joy instructions?](#win7_using_bluetooth)  | [Instructions](http://www.wikihow.com/Set-Up-USB-Game-Controllers-on-Windows-8) |  Works     |        [Instructions](#max_osx_using_usb)|
-  Xbox 360 (or copy)      |  [Instructions](#linux_using_usb)  | N/A                  |                                                             Works    |        N/A                       |                                                                                                                                                Works        |                                                                                N/A            |                                                                   Not tested    |    Not tested|
+ | Playstation 3 (or copy)  | Works           |                                                            [Instructions](#linux-using-bluetooth) |  Works       |     [Instructions?](#winxp-using-bluetooth) |  [Motion joy instructions?](#win7-using-usb)  | [Motion joy instructions?](#win7-using-bluetooth)  | [Instructions](http://www.wikihow.com/Set-Up-USB-Game-Controllers-on-Windows-8) |  Works     |        [Instructions](#max-osx-using-usb)|
+  Xbox 360 (or copy)      |  [Instructions](#linux-using-usb)  | N/A                  |                                                             Works    |        N/A                       |                                                                                                                                                Works        |                                                                                N/A            |                                                                   Not tested    |    Not tested|
 
 Playstation 3 controller
 ========================
diff --git a/docs/macports.md b/docs/macports.md
index f9dd076a991738b67b8e33e166b60cf0c4fbdebc..fc40f2283d89727658b1c363e39da265df9beb61 100644
--- a/docs/macports.md
+++ b/docs/macports.md
@@ -21,9 +21,9 @@ I found that installing only the command line developer tools is enough
 for Crazyflie client dependencies. However installing Xcode seems to be
 recommended. I installed the command line developer tools:
 
-![](/images/image03.png)
-![](/images/image00.png)
-![](/images/image01.png)
+![Xcode 1](/images/image03.png)
+![Xcode 2](/images/image00.png)
+![Xcode 3](/images/image01.png)
 
 Update mac ports
 
@@ -43,7 +43,7 @@ Install Crazyflie client dependencies
 Most but not all packages are pre-compiled so this installation takes
 some time. It took about 12 minutes for me, YMMV.
 
-![](/images/image05.png)
+![bash](/images/image05.png)
 
 Now you are able to clone and run the Crazyflie client!
 
@@ -52,7 +52,7 @@ Now you are able to clone and run the Crazyflie client!
     cd crazyflie-clients-python
     /opt/local/bin/python2.7 bin/cfclient
 
-![](/images/image04.png)
+![CF client](/images/image04.png)
 
 Optional dependencies
 ---------------------
@@ -64,13 +64,13 @@ lot depending on how many ports are pre-compiled):
 
     sudo port install py27-pyqtgraph
 
-![](/images/image02.png)
+![bash 2](/images/image02.png)
 
 You can now access the plotter tab:
 
     /opt/local/bin/python2.7 bin/cfclient
 
-![](/images/image06.png)
+![plotter tab](/images/image06.png)
 
 Troubleshooting
 ---------------
diff --git a/docs/raspberrypi.md b/docs/raspberrypi.md
index e2862ed3644504ee5ee94b5af092a3d6c4cbd019..200d59a710bfe5b377f64e94fa048c08e573103a 100644
--- a/docs/raspberrypi.md
+++ b/docs/raspberrypi.md
@@ -17,10 +17,10 @@ We haven\'t removed anything from the image, just added our own stuff.
 So you can still log in and used the Raspberry Pi as you would with the
 Raspbian image, but as an added feature you can also use our stuff. If
 you would like to re-create the SD-image with your own Wheezy image then
-[have a look at what we did](/projects/crazyflie/pc_utils/raspberrypi).
+[have a look at what we did](https://wiki.bitcraze.io/projects:crazyflie:pc_utils:raspberrypi).
 
 The changes made to the SD-card is mostly based of the contributed
-instructions from the [hacks section](/misc/hacks/rasberrypi).
+instructions from the [hacks section](https://wiki.bitcraze.io/misc:hacks:rasberrypi).
 
 Download
 ========
@@ -29,17 +29,13 @@ The SD-card image can be downloaded here (version 2015.3 and onward is
 compatible with Raspberrypi 2):
 
 -   Bitcraze Raspbian image 2015.3
-    ([torrent](http://files.bitcraze.se/dl/cfpi-2015.3.7z.torrent))
     ([direct download](http://files.bitcraze.se/dl/cfpi-2015.3.7z))
     ([mega](https://mega.co.nz/#!uQYSFIDJ!6PwIwxM315B99ejveo_6zlTVWk_oYkMOW0fKQLQ74A0))
 -   Bitcraze Raspbian image 0.3
-    ([torrent](http://files.bitcraze.se/dl/cfpi-0_3.7z.torrent))
     ([direct download](http://files.bitcraze.se/dl/cfpi-0_3.7z))
 -   Bitcraze Raspbian image 0.2
-    ([torrent](http://tracker.bitcraze.se/torrents/cfpi-0_2.zip.torrent))
     ([mega](https://mega.co.nz/#!fVoTBIAQ!Akk80haC--oZjklJxCzCaS_nnlg8xVQhUcczPviaawA))
 -   Bitcraze Raspbian image 0.1
-    ([torrent](http://tracker.bitcraze.se/torrents/cfpi-0_1.zip.torrent))
     ([mega](https://mega.co.nz/#!HJpH2KDJ!bY-EdGtyxIRzOUu6xNVWnid_cco5wS-IQ6ELfc5Y1Q8))
 
 **Note:** Using Torrent is advised, we have
diff --git a/docs/userguide_client.md b/docs/userguide_client.md
index 1104ee6f1ed9b126412500d8f6f069f75e7fc55b..3c6eac0bd6b00b5d5abfa0518c071e2a651cd878 100644
--- a/docs/userguide_client.md
+++ b/docs/userguide_client.md
@@ -45,7 +45,7 @@ For more info on LED indicators etc. have a look at the
 Main UI
 =======
 
-![](/images/cf_client_1.png)
+![CF client main](/images/cf_client_1.png)
 
 1.  The window title will show the connection status
 2.  Connect/disconnect, scan and the drop-down connection list as well
@@ -78,7 +78,7 @@ client. The bootloader mode is accessed from the menu
 *Crazyflie-\>Bootloader*. If there is any problem during the flashing or
 a wrong firmware is flashed the process can just be started again.
 
-![](/images/crazyflie_bootloading.png)
+![CFclient bootloading](/images/crazyflie_bootloading.png)
 
 To update the firmware in the Crazyflie 1.0/2.0 do the following:
 
@@ -137,10 +137,10 @@ The procedure is described below and the parameters can be changed again
 any time the same way.
 
 
-|     **Crazyflie 1.0**                                                                        **Crazyflie 2.0**  |                                                                                                                                
+|     **Crazyflie 1.0**                                                |                        **Crazyflie 2.0**  |                                                                                                                                
 |-----|------------|  
 |   Click on the menu **\"Crazyflie-\>Configure 1.0\"** and then connect the bootloader by clicking on the \"cold boot\" button and by restarting the Crazyflie.  | First connect to the Crazyflie 2.0 with the normal connect button. Then open **\"Crazyflie-\>Configure 2.0\"** to reach the configure 2.0 dialog   |
- |    ![](/images/configure_cf1.png){:width="500"}             |                                                                      ![](/images/cfclient_cf2_config.png){:width="500"} |                                                            
+ |    ![CF1 config](/images/configure_cf1.png){:width="500"}             |                                                                      ![CF2 config](/images/cfclient_cf2_config.png){:width="500"} |                                                            
    |  Once the settings has been made press the program button to save them permanently in the Crazyflie flash.              |                                        Once the settings has been made press the write button to save them permanently in the Crazyflie 2.0 EEPROM.    |                                  
 
 
@@ -161,7 +161,7 @@ plotted in the plotter and saved to file in the log block tab.
 To setup a new log block click on the menu \"settings/logging
 configuration\", You then see the following toolbox:
 
-![](/images/client_log-configuration_anotated.png){:align-center}
+![cfclient logging configuration](/images/client_log-configuration_anotated.png){:align-center}
 
 1.  List of log variable in the Crazyflie
 2.  Log variables in the current log block
@@ -204,18 +204,18 @@ but if you have another input-device then it\'s quick to create your own
 configuration. Go to the menu *Input device -\> Configure device
 mapping*.
 
-![](/images/cfclient_devconfig_select.png){:align-center
+![cfclient configure device](/images/cfclient_devconfig_select.png){:align-center
 width="700"}
 
 Select the device you would like to configure and press *Configure*.
 
-![](/images/cfclient_devconfig_axis.png){:align-center
+![cfclient configure device axis](/images/cfclient_devconfig_axis.png){:align-center
 width="700"}
 
 For each functionality that can be mapped there\'s a *Detect* button, by
 pressing it the following dialog will appear.
 
-![](/images/cfclient_devconfig_dialog.png){:align-center
+![cfclient configure device detect](/images/cfclient_devconfig_dialog.png){:align-center
 width="300"}
 
 Follow the instructions to detect the axis or button that you would like
@@ -227,7 +227,7 @@ Go though all the functionality you would like to map by pressing the
 *Detect* button for each. To be able to save the mapping you will at
 least have to map roll, pitch, yaw and thrust.
 
-![](/images/cfclient_devconfig_feedback.png){:align-center
+![cfclient configure device feedback](/images/cfclient_devconfig_feedback.png){:align-center
 width="700"}
 
 Once you have mapped functionality you will be able to see the feedback
@@ -270,31 +270,31 @@ For normal usage just enter the *Normal* menu, select the device you
 would like to use and the correct mapping. As a device is selected the
 list of mappings are enabled.
 
-![](/images/cfclient_input_normal.png){:align-center
+![cfclient devices normal](/images/cfclient_input_normal.png){:align-center
 width="700"}
 
 If more than one input device is connected then it\'s possible to switch
 to one of the teacher modes.
 
-![](/images/cfclient_input_mux_select.png){:align-center
+![cfclient devices mux select](/images/cfclient_input_mux_select.png){:align-center
 width="700"}
 
 First select the device that should be used for the teacher and then
 it\'s mapping.
 
-![](/images/cfclient_input_teacher.png){:align-center
+![cfclient input teacher](/images/cfclient_input_teacher.png){:align-center
 width="700"}
 
 Then select the device that should be used for the student and then
 it\'s mapping.
 
-![](/images/cfclient_input_student.png){:align-center
+![cfclient input student](/images/cfclient_input_student.png){:align-center
 width="700"}
 
 Once this is done you will be able to see the open devices and
 configurations at the bottom of the user interface.
 
-![](/images/cfclient_input_mux_configured.png){:align-center
+![cfclient input mux configured](/images/cfclient_input_mux_configured.png){:align-center
 width="700"}
 
 Tabs
@@ -307,7 +307,7 @@ Flightcontrol
 -------------
 
 The normal view used when flying is the one seen below.
-![](/images/cfclient_flightab.png){:align-center}
+![cfclient flighttab](/images/cfclient_flightab.png){:align-center}
 
 1.  Flight mode selector (Normal and Advanced)
 
@@ -337,7 +337,7 @@ Plotter
 -------
 
 The plotter tab can be used to visualize data logged from the Crazyflie
-![](/images/cfclient_ploter.png){:align-center
+![cfclient plotter](/images/cfclient_ploter.png){:align-center
 width="700"}
 
 1.  Select logging configuration to plot. Read about how to create
@@ -358,7 +358,7 @@ that can be changed in real-time. The parameter tab can be used to view
 and update parameters. For more information about parameters see
 logging and parameter frameworks LINK TO CF-FIRMWARE!
 
-![](/images/cfclient_param.png){:align-center
+![cfclient parameter list](/images/cfclient_param.png){:align-center
 width="700"}
 
 1.  Parameter information fields
@@ -379,7 +379,7 @@ The log blocks tab shows all log configurations that are saved and if
 they are started. It\'s also possible to start/stop them as well as
 write the logged data to file.
 
-![](/images/cfclient_logblocks_marked.png){:align-center
+![cfclient log blocks](/images/cfclient_logblocks_marked.png){:align-center
 width="700"}
 
 1.  Fields
@@ -426,7 +426,7 @@ Console
 
 The console tab will show printouts from the Crazyflie firmware as it\'s
 running.
-![](/images/cfclient_console_marked.png){:align-center
+![cfclient console](/images/cfclient_console_marked.png){:align-center
 width="700"}
 
 1.  Console output from the Crazyflie
@@ -455,7 +455,7 @@ Displays the configured anchor positions and the estimated position of
 the Crazyflie. Can be used to make sure the system is set up correctly
 and that the estimated position is reasonable.
 
-![](/images/cfclient_position_estimate.png){:align-center
+![cfclient positioning](/images/cfclient_position_estimate.png){:align-center
 width="700"}
 
 1.  Plot for X/Y (top view) showing anchors and Crazyflie
@@ -498,7 +498,7 @@ displays the configured anchor positions. When the crazyflie is close to
 an anchor this is indicated in the graphs by highlighting it. This mode
 is useful to identify anchors and verify that the system is correctly
 configured.
-![](/images/cfclient_anchor_identification.png){:align-center
+![cfclient anchors](/images/cfclient_anchor_identification.png){:align-center
 width="700"}
 
 1.  Plot for X/Y (top view) showing anchors and Crazyflie
@@ -518,15 +518,15 @@ The UI is normally used to get/set parameters, view logged data and send
 control commands to the Crazyflie. Aside from this there\'s also the
 possibility to connect via ZMQ to the client and control several things:
 
--   [Parameters](cfclient_zmq.md#parameters):
+-   [Parameters](/cfclient_zmq#parameters):
     Get/set parameters by name
--   [LED-ring memory](cfclient_zmq.md#led-ring):
+-   [LED-ring memory](/cfclient_zmq#led-ring):
     Write LED ring memory
--   [Input-device](cfclient_zmq.md#input_device):
+-   [Input-device](/cfclient_zmq#input-device):
     Act as an input device
 
 The benefit of using this approach instead of the [stand-alone ZMQ
-server](/doc/crazyflie/client/cfzmq/index) is that you will not have to
+server](https://wiki.bitcraze.io/doc:crazyflie:client:cfzmq:index) is that you will not have to
 take care of everything, just the parts you are interested in for the
 moment. An example is [this video](https://vine.co/v/eZ3jZqxmeZh) where
 the light/sound is controlled via ZMQ though the client, but everything