diff --git a/docs/certificates.rst b/docs/certificates.rst
index fb4d45ef..3d5aa2ad 100644
--- a/docs/certificates.rst
+++ b/docs/certificates.rst
@@ -39,7 +39,7 @@ This are usually password protected certificates in different file-formats. SEB
 
 .. image:: images/certificates/cert_list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/certificates/cert_list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/certificates/cert_list.png
 
 
 Use Cases
diff --git a/docs/config_template.rst b/docs/config_template.rst
index 2dad0aa1..9d9bab18 100644
--- a/docs/config_template.rst
+++ b/docs/config_template.rst
@@ -16,7 +16,7 @@ a specific template by name for example.
 
 .. image:: images/config_templates/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/list.png
 
 To create a new exam configuration template, use the "Add Configuration Template" action from the right action pane. You will see the creation form
 with a name and description for the new template. At least a unique name is mandatory, and the description is optional.
@@ -32,7 +32,7 @@ SEB Server. The name of an attribute is composed of the internal attribute name
 
 .. image:: images/config_templates/templateView.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/templateView.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/templateView.png
 
 The type of the attribute defines the input field type and cannot be changed in any way. The view defines the tab on which the settings attribute is placed.
 And the group defines the named group where a settings attribute belongs to. 
@@ -59,7 +59,7 @@ use the "View Configuration Template" action from the right action pane.
 
 .. image:: images/config_templates/templateAttribute.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/templateAttribute.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/templateAttribute.png
     
 Back in the exam configuration template view you are able to create a new SEB exam configuration directly from this template by using the "Create Exam Configuration"
 action from the right action pane. The application will present you a creation dialog within a pop-up where you can define a name and description for the
@@ -67,7 +67,7 @@ new SEB exam configuration. At least a unique name is mandatory.
 
  .. image:: images/config_templates/createConfig.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/config_templates/createConfig.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/config_templates/createConfig.png
     
 After defining a name and description for the new SEB exam configuration you can click on "OK" to do so, and the application will show you the new created 
 SEB exam configuration in the usual place.
diff --git a/docs/connection_config.rst b/docs/connection_config.rst
index ee8c5939..2fbad8b4 100644
--- a/docs/connection_config.rst
+++ b/docs/connection_config.rst
@@ -34,7 +34,7 @@ of the "Configuration" section on the menu on the left hand side.
 
 .. image:: images/connection_config/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/connection_config/list.png
 
 The list shows the name, the date of creation and the status of the connection configurations in a column. With SEB Server administrator role
 also an institution column is shown because a SEB Server administrator is able to see all connection configurations of all institutions.
@@ -46,7 +46,7 @@ or remove selection to hide all fallback related attributes.
 
 .. image:: images/connection_config/new.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/new.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/connection_config/new.png
 
 Short description of all attributes of a connection configuration:
 
@@ -113,7 +113,7 @@ these exams with the multi selector. It is also possible to filter the list by t
 
 .. image:: images/connection_config/examSelection.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/connection_config/examSelection.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/connection_config/examSelection.png
 
 
 
diff --git a/docs/exam.rst b/docs/exam.rst
index 912abba5..f711ec87 100644
--- a/docs/exam.rst
+++ b/docs/exam.rst
@@ -23,7 +23,7 @@ indicators for monitoring as well as defining details of the SEB restriction if
 
 .. image:: images/exam/examNotReady.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examNotReady.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examNotReady.png
     
 
 At the beginning of the page - if there is no note - you see all the details of the exam. 
@@ -70,7 +70,7 @@ the pop-up shows the description and the status of the selected configuration.
 
 .. image:: images/exam/addExamConfig.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/addExamConfig.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/addExamConfig.png
     
 There is also the possibility to encrypt the SEB exam configuration by a password. This is done before the SEB configuration is send to a connecting 
 SEB client. Since in the most cases the SEB client connections are over HTTPS / TSL there is already a good protection in place and an
@@ -85,7 +85,7 @@ The new action "Edit Encryption Password" can be used to open up the original ap
 
 .. image:: images/exam/editEncryptionPassword.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/editEncryptionPassword.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/editEncryptionPassword.png
 
 .. note::
     If you need to use the same SEB exam configuration for different exams, you can just make a copy of a SEB exam configuration that is already used
@@ -101,7 +101,7 @@ the SEB restriction details with the generated Config-Key. See :ref:`sebRestrict
 
 .. image:: images/exam/examConfig.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examConfig.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examConfig.png
     
 To just generate the Config-Key for testing purposes or to manually apply it on an LMS/Assessment Tool without the automated SEB restriction feature you can
 use the "Export Config-Key" action to generate the key. The Config-Key is presented by a pop-up and can be selected and copied to the clip-board.
@@ -170,7 +170,7 @@ section in the monitoring view.
 
 .. image:: images/exam/archiveExamsFilter.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/archiveExamsFilter.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/archiveExamsFilter.png
 
 This is also a good use-case if you want to remove an LMS/Assessment Tool and LMS/Assessment Tool Setup but still want to be able to access the exams data on the SEB Server.
 In this case you can archive all exams from that LMS/Assessment Tool Setup before deactivating or deleting the respective LMS/Assessment Tool Setup.
@@ -196,7 +196,7 @@ If you have "Exam Administrator" privileges you are able to entirely delete an e
 
 .. image:: images/exam/deleteExam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/deleteExam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/deleteExam.png
     
 - Within the delete exam dialog you see a list of a dependencies that also will be deleted. Please check them carefully before deletion.
 - Use the below action to either delete the exam or cancel the action and go back to the exam view.
diff --git a/docs/exam_ask.rst b/docs/exam_ask.rst
index 509224e3..ac194980 100644
--- a/docs/exam_ask.rst
+++ b/docs/exam_ask.rst
@@ -24,7 +24,7 @@ for this feature.
 
 .. image:: images/exam/examASK.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examASK.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASK.png
     
 Within this settings page you can enable or disable the feature any time also during a running exam. On the exam page you can see if the feature is enabled 
 when the shield-icon is not strike-through.
@@ -36,7 +36,7 @@ ASK for the same build.
 
 .. image:: images/exam/examASKedit.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examASKedit.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKedit.png
     
 In the following list you can see all APK that has been sent to the SEB Server by connected SEB clients. For a particular ASK you can also see
 how many SEB Clients has been sent this ASK and has the same signature. 
@@ -47,7 +47,7 @@ below. You can give a name for the grant and save the grant by using "OK" action
 
 .. image:: images/exam/examASKgrant.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examASKgrant.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKgrant.png
     
 You see all granted ASKs within the second list with the ASK hash and the name that was given on grant. All explicitly granted ASKs from that list are
 considered trusted for the exam. And future SEB client connection that connects with one of the ASKs from this list are granted. All SEB clients that
@@ -65,7 +65,7 @@ SEB connections are marked red and with the tag "- ASK Grant Denied" after the s
 
 .. image:: images/exam/examASKMonitoring1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examASKMonitoring1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKMonitoring1.png
     
 In the detail view of a SEB client connection you can see this too and you are able to apply a grant for a denied APK afterwards by using the 
 "Grant App Signature Key" action from the right action pane. This will open a pop-up with the ASK hash and an input field for the name of the 
@@ -73,11 +73,11 @@ grant.
 
 .. image:: images/exam/examASKMonitoring2.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examASKMonitoring2.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKMonitoring2.png
     
 .. image:: images/exam/examASKMonitoring3.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examASKMonitoring3.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examASKMonitoring3.png
 
 
 After you have granted a unknown ASK, the grant is also applied to the respective SEB connection and to all following SEB connections that
diff --git a/docs/exam_clientgroups.rst b/docs/exam_clientgroups.rst
index 041d649e..322af518 100644
--- a/docs/exam_clientgroups.rst
+++ b/docs/exam_clientgroups.rst
@@ -33,7 +33,7 @@ Client groups are located on an Exam setup page after the indicators at the end
 
 .. image:: images/exam/examClientgroupAdd.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examClientgroupAdd.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupAdd.png
 
 To add a new SEB Client Group use the respective action from the right action pane. You will be presented with the SEB Client Group edit page
 where you are able to give the new SEB Client Group a name and choose a type of the client group that you want to create.
@@ -45,7 +45,7 @@ the group type. With the additional, specific inputs, the SEB Client Group can b
 
 .. image:: images/exam/examClientgroupIP.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examClientgroupIP.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupIP.png
     
 For the IP range group type you can give a valid IP range defined with a start IP address and an end IP address. This two inputs are mandatory 
 and must be valid IPv4 addresses. The range must be a valid range and will be inclusive on the IP match (range-start >= IP <= range-end).
@@ -54,7 +54,7 @@ For the SEB OS grouping type you have to choose the OS type from the given types
 
 .. image:: images/exam/examClientgroupWin.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examClientgroupWin.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupWin.png
     
 If you have finished up your SEB Client Group definition you can save it with the "Save" action from the right action pane or cancel the modifications and
 go back to the Exam page. You will see your created SEB Client Groups within its respective section on the Exam page and are able to edit them again, or delete
@@ -62,7 +62,7 @@ a certain SEB Client group from the list.
 
 .. image:: images/exam/examClientgroups.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examClientgroups.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroups.png
     
 Monitoring with SEB Client Groups
 ---------------------------------
@@ -73,7 +73,7 @@ depending on what group(s) a particular SEB applies to.
 
 .. image:: images/exam/examClientgroupMonitoring1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examClientgroupMonitoring1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupMonitoring1.png
 
 With the "Client Group Filter" on the right action pane, you are able to show/hide individual groups. With this filtering you can adapt your monitoring view
 for specialized monitoring view, to only see SEB client connection from one particular room for example or of one particular client OS.
@@ -86,4 +86,4 @@ for specialized monitoring view, to only see SEB client connection from one part
 
 .. image:: images/exam/examClientgroupMonitoring2.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examClientgroupMonitoring2.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examClientgroupMonitoring2.png
diff --git a/docs/exam_config.rst b/docs/exam_config.rst
index c6c93366..a879de32 100644
--- a/docs/exam_config.rst
+++ b/docs/exam_config.rst
@@ -26,7 +26,7 @@ filter use the clear symbol right to the lens symbol. See :ref:`gui-label` for m
 
 .. image:: images/exam_config/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/list.png
     
 To view details of a specific exam configuration either double-click on a list entry or select a list entry and use the "View Exam Configuration"
 action from the right action pane. In the detail view all general settings are shown and also a list of exams that uses this exam configuration.
@@ -46,7 +46,7 @@ is assigned to an exam, the status changes automatically to "In Use" and the SEB
 
 .. image:: images/exam_config/view.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/view.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/view.png
 
 An exam configuration has a general settings part (like other domain objects has within SEB Server) that defines the name, description and status
 of the exam configuration that are used to maintain the exam configurations SEB Server internally. And an exam configuration has, separated from 
@@ -64,7 +64,7 @@ while also publish them to exams that uses this exam configuration.
 
 .. image:: images/exam_config/settings.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/settings.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/settings.png
 
 .. note:: 
     Changes in SEB settings must be published to be available on exports, exams, or other uses. Before publishing they are not
@@ -93,7 +93,7 @@ of the exam configuration. The key will be presented by a pop-up dialog where it
 
 .. image:: images/exam_config/config_key.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/config_key.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/config_key.png
 
 
 Batch Actions
@@ -110,7 +110,7 @@ For list multi-selection documentation see :ref:`List Multi-Selection <listmulti
 
 .. image:: images/exam_config/batch-actions.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/batch-actions.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/batch-actions.png
 
 
 
@@ -121,7 +121,7 @@ With this batch action you are able to change the state of all selected exam con
 
 .. image:: images/exam_config/batch-actions_statechange.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/batch-actions_statechange.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/batch-actions_statechange.png
     
 Within the batch-action pop-up you can see how many exam configurations you have selected for the action. Now you are able to select the target state
 to where you would like to change all selected exam configurations state to. Then you can apply the batch action with "Change State" or cancel the batch-action.
@@ -131,7 +131,7 @@ has been applied and how many has failed.
 
 .. image:: images/exam_config/batch-actions_statechange_finished.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_config/batch-actions_statechange_finished.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_config/batch-actions_statechange_finished.png
     
     
 **Reset To Template Settings**
diff --git a/docs/exam_import.rst b/docs/exam_import.rst
index e895d480..fca8da2f 100644
--- a/docs/exam_import.rst
+++ b/docs/exam_import.rst
@@ -20,7 +20,7 @@ are able to filter and sort the list as usual to find to right course for import
 
 .. image:: images/exam/lmsExamLookup.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/lmsExamLookup.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/lmsExamLookup.png
     
 You can view more details of a course by double-click on the specific list entry or by selecting the list entry and click the "Show LMS/Assessment Tool Exam Details"
 action form the action pane on the right hand side. The application will open a pop-up with available detail information of the course.
@@ -33,7 +33,7 @@ are available and fetched or not.
 
 .. image:: images/exam/lmsExamLookupLate.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/lmsExamLookupLate.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/lmsExamLookupLate.png
 
 To import a course as an exam find the specific course on the list by using the filter and select the list entry. Use the "Import As Exam" action 
 from the action pane on the right hand side. 
@@ -63,7 +63,7 @@ Initially choose a type for the exam - "Exam Type" - that is currently only used
 
 .. image:: images/exam/importExam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/importExam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/importExam.png
     
 Furthermore you can select and apply all exam supporter that shall be able to see and support this exam while running. To do so, click in the
 input field of the attribute "Exam Supporter" to see a drop down list of all available users for selection. To filter the drop down list, start
@@ -78,7 +78,7 @@ for monitoring the exam later on.
 
 .. image:: images/exam/examReady.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examReady.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examReady.png
 
 How all this different aspects of the exam are defined and prepared is part of the next chapters.
     
diff --git a/docs/exam_indicator.rst b/docs/exam_indicator.rst
index cb116230..dfef1ded 100644
--- a/docs/exam_indicator.rst
+++ b/docs/exam_indicator.rst
@@ -9,7 +9,7 @@ add some other indicators to the exam to be able to get notified while monitorin
 
 .. image:: images/exam/examIndicators.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examIndicators.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examIndicators.png
     
 To add a new indicator to the exam you can use the "Add Indicator" action from the right action pane. In the indicator edit page you are able to give the
 new indicator a name. This name will be displayed in the SEB client connection table on monitoring section as column name for the column of this
@@ -18,7 +18,7 @@ If you have selected one indicator type, a description will be shown just below
 
 .. image:: images/exam/editIndicator.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/editIndicator.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/editIndicator.png
     
 The type of indicators are pre-defined within the SEB Server and restricts the number of available indicators that can be used. Currently following
 indicators are supported:
diff --git a/docs/exam_list.rst b/docs/exam_list.rst
index 0c40792e..4914e979 100644
--- a/docs/exam_list.rst
+++ b/docs/exam_list.rst
@@ -9,14 +9,14 @@ once unreachable exam, the respective exam would change back to normal and is no
 
 .. image:: images/exam/examList.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examList.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examList.png
     
 Sometimes an entire LMS/Assessment Tool is not available and a lot of exams are grayed. In this case you can use the new filter "Show/Hide Missing Exams" from the
 action pane on the right to filter out this exams from the list.
 
 .. image:: images/exam/examListHideMissing.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examListHideMissing.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examListHideMissing.png
     
 To get more information about what is missing for an exam that is marked in red, just open the exam by select and use "View Exam" or by double-click
 on the list entry. In the Exam view page you will see a warning message pointing out all the missing things to setup the exam.
@@ -34,7 +34,7 @@ you want to archive or delete, select the respective batch action on the right a
 
 .. image:: images/exam/examBatchArchive.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examBatchArchive.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examBatchArchive.png
     
 You see your selection again within a list on the pop-up and when ready you can start the batch action and apply it to every selected exam
 that is in a valid state to apply the action. 
diff --git a/docs/exam_quit_password.rst b/docs/exam_quit_password.rst
index e1139767..9a40783c 100644
--- a/docs/exam_quit_password.rst
+++ b/docs/exam_quit_password.rst
@@ -27,14 +27,14 @@ The quit password can be set on Exam creation or import:
 
 .. image:: images/exam/quitPasswordImport.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/quitPasswordImport.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/quitPasswordImport.png
 
 
 As well as in the Exam edit view:
 
 .. image:: images/exam/quitPasswordEdit.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/quitPasswordEdit.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/quitPasswordEdit.png
 
 
 If the Exam was created from an LMS/Assessment Tool with SEB Server integration that allows to send the quit-password
diff --git a/docs/exam_restriction.rst b/docs/exam_restriction.rst
index 4c222afd..90cd74eb 100644
--- a/docs/exam_restriction.rst
+++ b/docs/exam_restriction.rst
@@ -11,7 +11,7 @@ In the exam details page you will see two action related to the SEB restriction
 
 .. image:: images/exam/sebRestriction.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/sebRestriction.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/sebRestriction.png
     
 Use the "Apply SEB Lock" on an exam that has not already locked the course for SEB on the LMS/Assessment Tool to do apply the restriction and lock the course or quiz
 for SEB access only. This will call the SEB course restriction API on the LMS/Assessment Tool and will send all information to lock the course on the LMS/Assessment Tool.
@@ -28,7 +28,7 @@ comma separated list if needed.
 
 .. image:: images/exam/sebRestrictionDetails.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/sebRestrictionDetails.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/sebRestrictionDetails.png
 
 **SEB restriction on Open edX**
 
diff --git a/docs/exam_template.rst b/docs/exam_template.rst
index 55ccb969..2f5c8ed9 100644
--- a/docs/exam_template.rst
+++ b/docs/exam_template.rst
@@ -17,7 +17,7 @@ and also shows which one is the default for the institution.
 
 .. image:: images/exam_template/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/list.png
     
 .. note:: 
     The "Default Template" flag indicates the one exam template that is the default template for an institution. This just means that this template
@@ -32,7 +32,7 @@ SEB Server will then present you the exam template creation view on that some in
 
 .. image:: images/exam_template/new.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/new.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/new.png
 
 - **Name** The name of the exam template to identify it in the list/library
 - **Description** A short description ideally describing the purpose of the exam template
@@ -46,7 +46,7 @@ view that looks similar to the exam administration view.
 
 .. image:: images/exam_template/view.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/view.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/view.png
 
 Here you can edit the settings done before by using the "Edit Exam Template" action form the right action pane.
 You can also delete an exam template entirely by using the "Delete Exam Template" action from the right action pane.
@@ -54,7 +54,7 @@ And you are able to add/edit/remove monitoring indicators for the exam template
 
 .. image:: images/exam_template/indicator.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/indicator.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/indicator.png
     
 TODO Screen Proctoring Settings
 
@@ -67,7 +67,7 @@ use the "Import as Exam" action for a LMS/Assessment Tool exam that you want to
 
 .. image:: images/exam_template/select1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam_template/select1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam_template/select1.png
     
 Now there is a new selector field named "Exam Template" where you can choose the exam template to use on import. When you select one the template attributes
 like "Exam Type" or "Exam Supporter" are automatically applied from the template settings. You are still able to edit the settings e.g. add more or remove supporter.
diff --git a/docs/exam_with_url.rst b/docs/exam_with_url.rst
index f0a6ebd2..467323b9 100644
--- a/docs/exam_with_url.rst
+++ b/docs/exam_with_url.rst
@@ -15,13 +15,13 @@ put with some fields you have to provide instead of they coming from LMS/Assessm
 
 .. image:: images/exam/examWithURL.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examWithURL.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examWithURL.png
 
 
 
 .. image:: images/exam/examWithURLNew.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examWithURLNew.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examWithURLNew.png
 
 
 
@@ -48,7 +48,7 @@ go one with setting up your Exam.
 
 .. image:: images/exam/examWithURLView.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/exam/examWithURLView.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/exam/examWithURLView.png
 
 If you want to edit the Exam settings please use the edit action on the right action pane. Here you can also modify
 the data that usually comes from LMS/Assessment Tool. You can change name, start- and end-date directly here within
diff --git a/docs/institution.rst b/docs/institution.rst
index 15f297e6..c649672e 100644
--- a/docs/institution.rst
+++ b/docs/institution.rst
@@ -34,7 +34,7 @@ Currently an institution has a name, an optional url-suffix and an optional logo
 
 .. image:: images/institution/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/institution/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/institution/list.png
 
 As an institutional administrator only the institution one belongs to can be seen and be modified by the user.
 The user will see the institution form in view mode by clicking on the "Institution" section on the left hand menu
@@ -44,7 +44,7 @@ therefore a SEB Server administrator role is needed.
 
 .. image:: images/institution/view_institutional.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/institution/view_institutional.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/institution/view_institutional.png
 
 
 
@@ -69,7 +69,7 @@ access the application with a web-browser and have the own logo.
   
 .. image:: images/institution/new.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/institution/new.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/institution/new.png
   
   
 **Change the name/logo of an existing or own Institution**
@@ -94,7 +94,7 @@ access the application with a web-browser and have the own logo.
   
 .. image:: images/institution/view_institutional.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/institution/view_institutional.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/institution/view_institutional.png
   
   
 **Activate / Deactivate an existing institution**
diff --git a/docs/lms_edx.rst b/docs/lms_edx.rst
index 74be9714..4de0e8a7 100644
--- a/docs/lms_edx.rst
+++ b/docs/lms_edx.rst
@@ -25,24 +25,24 @@ To be able to create an API access-account on Open edX you need a user-account w
 
 .. image:: images/lmssetup/openEdxAPIAccess1.bmp
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/lmssetup/openEdxAPIAccess1.bmp
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/openEdxAPIAccess1.bmp
     
 - Create a new User-Account that acts as an API account. The account must at least have the permissions to query the course API of Open edX and to access the seb_openedx plugin permission.
 - Make sure that "Staff" status is checked for the account.
 
 .. image:: images/lmssetup/openEdxAPIAccess2.bmp
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/lmssetup/openEdxAPIAccess2.bmp
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/openEdxAPIAccess2.bmp
     
 - Back in the administration homepage, find the OAUT2 - Client section and create a new API Client Access for the given User-Account. The Client id and Client secret are automatically generated by Open edx.
 
 .. image:: images/lmssetup/openEdxAPIAccess3.bmp
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/lmssetup/openEdxAPIAccess3.bmp
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/openEdxAPIAccess3.bmp
     
 .. image:: images/lmssetup/openEdxAPIAccess4.bmp
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/lmssetup/openEdxAPIAccess4.bmp
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/openEdxAPIAccess4.bmp
 
 Once the client registration was successful the client id and client secret can be used within the SEB Server to access the course- and SEB-restriction API of Open edX as described in the next step section
 
@@ -53,11 +53,11 @@ Once the client registration was successful the client id and client secret can
 
 .. image:: images/lmssetup/openEdxAPIAccess5.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/lmssetup/openEdxAPIAccess5.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/openEdxAPIAccess5.png
     
 .. image:: images/lmssetup/openEdxAPIAccess6.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/lmssetup/openEdxAPIAccess6.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/openEdxAPIAccess6.png
 
 .. _lms-setup-rest-plugin-label:
 
@@ -113,7 +113,7 @@ that has to be set on the existing Assessment Tool Setup on the SEB Server.
 
 .. image:: images/lmssetup/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/lmssetup/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/list.png
 
 - Sign into SEB Server with your institutional administrator role account.
 - Navigate to "Exam Administration" / "Assessment Tool Setup" within the navigation on the left hand side.
diff --git a/docs/lms_moodle.rst b/docs/lms_moodle.rst
index fa04842b..dca4b8d7 100644
--- a/docs/lms_moodle.rst
+++ b/docs/lms_moodle.rst
@@ -27,7 +27,7 @@ To do so please login to Moodle with an administrator account and go to "Side Ad
 
 .. image:: images/lmssetup/moodle_mobile.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/lmssetup/moodle_mobile.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/moodle_mobile.png
     
 If you have a restrictive Moodle setup and troubles with the Moodle API account to use with SEB Server, please try to import the following 
 Moodle role profile within your Moodle instance. This profile will create a SEB Server role within Moodle that can be used to apply to an 
@@ -93,20 +93,20 @@ Moodle integration:
 
 .. image:: images/moodle_full/exam_template.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/exam_template.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/exam_template.png
 
 On the Moodle site, a Teacher can then create a new quiz within a course:
 
 .. image:: images/moodle_full/moodle_new1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/moodle_new1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/moodle_new1.png
     
 An within the quiz settings a Moodle Teacher should see a new settings sections "SEB Server" among with the already known 
 "Safe Exam Browser" section:
 
 .. image:: images/moodle_full/moodle1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/moodle1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/moodle1.png
     
 If a Moodle Teacher wants to setup an Exam with SEB Server for the quiz, he/she can now activate SEB Server integration 
 for that quiz by selecting "yes" for "Enable SEB Server". The "Safe Exam Browser" section will then automatically switch 
@@ -114,7 +114,7 @@ to the right settings to use with SEB Server.with
 
 .. image:: images/moodle_full/moodle2.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/moodle2.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/moodle2.png
     
 Now the Moodle Teacher can select from the available Exam Templates that has been prepared and marked for Assessment Tool
 use on SEB Server site. The Moodle Teacher can also enable a SEB quit button or quit-link and set a SEB quit password for the Exam.
@@ -126,14 +126,14 @@ as soon as the Exam becomes running.
 
 .. image:: images/moodle_full/imported_exam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/imported_exam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/imported_exam.png
 
 After all this has successfully been created and applied, the Moodle Teacher can go to the quit preview and sees the following
 features:
 
 .. image:: images/moodle_full/moodle3.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/moodle3.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/moodle3.png
     
 In the students view, the student will only see the two buttons: 
 
@@ -149,7 +149,7 @@ Moodle site.
 
 .. image:: images/moodle_full/teacher_autologin.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/teacher_autologin.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/teacher_autologin.png
 
 An already imported Exam can also be deleted either from the SEB Server side or from the Moodle side. On the SEB Server
 site, a Exam Administrator can just delete the Exam as usual and SEB Server would reset all the integration settings 
@@ -157,12 +157,12 @@ in Moodle for the respective quiz.
 
 .. image:: images/moodle_full/delete_exam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/delete_exam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/delete_exam.png
 
 While on the Moodle side, a Moodle Teacher can disable SEB Server for a particular quiz and Moodle will trigger a deletion
 of the Exam on SEB Server and also reset all SEB Server settings on Moodle side.
 
 .. image:: images/moodle_full/delete_exam_moodle.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/documentation/docs/images/moodle_full/delete_exam_moodle.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/moodle_full/delete_exam_moodle.png
 
diff --git a/docs/lmssetup.rst b/docs/lmssetup.rst
index 5f439ef5..b88ed6ae 100644
--- a/docs/lmssetup.rst
+++ b/docs/lmssetup.rst
@@ -40,7 +40,7 @@ Therefore we need to create a Assessment Tool Setup on the SEB Server.
 
 .. image:: images/lmssetup/new.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/lmssetup/new.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/lmssetup/new.png
     
 A SEB Server administrator role will be able to see the institution to which the Assessment Tool Setup belongs to while an institutional administrator
 is only able to see and create Assessment Tool Setup for its own institution. The name of the Assessment Tool Setup should be unique and is to identify a Assessment Tool
diff --git a/docs/monitoring.rst b/docs/monitoring.rst
index 18f3cf4d..6da4c381 100644
--- a/docs/monitoring.rst
+++ b/docs/monitoring.rst
@@ -10,7 +10,7 @@ As an exam supporter you see all running exams where you have been assigned to b
 
 .. image:: images/monitoring/runningExams.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/runningExams.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/runningExams.png
     
 To navigate to this list, click on the "Running Exams" menu within the "Monitoring" category. And you will see the list with the name of the
 exam, the type and start- and end-time of the exam. If the exam you are looking for is not on the list, please check the start-time filter 
@@ -27,7 +27,7 @@ As default you should see at least all active connections instantly.
 
 .. image:: images/monitoring/examMonitoring.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/examMonitoring.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/examMonitoring.png
     
 The list is automatically sorted in the way that SEB connections with incidents came to the top of the list and are then sorted by the 
 "User Name or Session" identifier criteria. The general SEB client connection attributes are:
@@ -61,7 +61,7 @@ Double-click on an entry to go to the detail view of the specified SEB client co
 
 .. image:: images/monitoring/search.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/search.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/search.png
     
 
 **Instructions**
@@ -109,17 +109,17 @@ The image below shows active and inactive filter for active SEB connection as we
 
 .. image:: images/monitoring/issueFilter2.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/issueFilter2.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/issueFilter2.png
 
 .. image:: images/monitoring/issueFilter3.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/issueFilter3.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/issueFilter3.png
 
 - **SEB Client Group Filter** This issue filter filter all SEB client connection that are attached to a certain SEB client group.
 
 .. image:: images/monitoring/issueFilter1.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/issueFilter1.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/issueFilter1.png
 
 
 Detailed View
@@ -131,7 +131,7 @@ in a form and additional a list of all events and logs the SEB client has sent t
 
 .. image:: images/monitoring/clientMonitoring.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/clientMonitoring.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/clientMonitoring.png
 
 The table shows the event type that for all log-events is the log-level, The text and a value that has been sent with the event. The Value may be empty
 and marked as "Not a Number" (NaN). In this table we also have the client- and the server-time of the event. The client-time is the time the SEB client
@@ -157,7 +157,7 @@ In the "Finished Exams" list you can see all finished or archived exams and filt
 
 .. image:: images/monitoring/finishedExams.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/finishedExams.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/finishedExams.png
     
 To see a particular finished or archived exam you can just double-click in the list entry or use the View action on the right action pane.
 In the exam view you see all SEB connections that has been connected to the exam during the exam run just like in the usual monitoring view
@@ -166,7 +166,7 @@ User or Session Info, Connection Info or Status and are also able to sort the li
 
 .. image:: images/monitoring/finishedExam.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/finishedExam.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/finishedExam.png
     
 As in the usual monitoring view, you can show SEB client connection details by double-clicking on a list entry or by selecting a list entry
 and use the View action on the right action pane.
@@ -189,14 +189,14 @@ of an exam for example.
 
 .. image:: images/monitoring/sebClientLogs.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/sebClientLogs.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/sebClientLogs.png
 
 To show a detailed view of a specific SEB client log, just double click on the list entry or select the specific list entry and use the "Show Details"
 action form the right action pane to open up a pop-up containing all related information about the SEB client log event.
 
 .. image:: images/monitoring/sebClientLogDetail.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/monitoring/sebClientLogDetail.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/monitoring/sebClientLogDetail.png
 
 Currently there is no export functionality to export all interesting SEB client logs to a CSV table for example. But such a feature will probably come
 with a next version of SEB Server.
diff --git a/docs/overview.rst b/docs/overview.rst
index 8848685f..ada28a36 100644
--- a/docs/overview.rst
+++ b/docs/overview.rst
@@ -99,7 +99,7 @@ What one will see first when applying to a SEB Server application is the login-s
 
 .. image:: images/overview/login.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/login.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/login.png
 
 If you are already registered you can use your username and password to log in. Or use the "Register" button to go to the registration 
 page to create a new user account. The newly created user account will only have the Exam Supporter role assigned. If you need another 
@@ -107,7 +107,7 @@ role or more privileges, this must be given and granted by an institutional admi
 
 .. image:: images/overview/register.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/register.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/register.png
 
 Fill in the registration form and create a new account. After the user account has been successfully created, the application redirects to the login page for login. 
 On the current version, an e-mail confirmation is not a feature of the SEB Server application and therefore the e-mail address is currently just informative.
@@ -125,7 +125,7 @@ the main content section will show the activity content and the action that are
 
 .. image:: images/overview/overview.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/overview.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/overview.png
 
 In the header above on the right hand, we see the username of the currently logged-in user and an action button to sign out and go back to the login page.
 
@@ -151,7 +151,7 @@ there are different types of filters:
 
 .. image:: images/overview/list.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/list.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/list.png
 
 A list can be sorted within a column by clicking on the column header. The order of sorting can be changed by clicking again on the same 
 column header of the sorted column. If sorting functionality is available for a column depends on the column type. There are a few columns 
@@ -189,12 +189,12 @@ The following images show the same form, once in read-only mode and once in edit
 .. image:: images/overview/form_readonly.png
     :alt: Form in read-only mode
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/form_readonly.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/form_readonly.png
 
 .. image:: images/overview/form_edit.png
     :alt: Form in edit mode
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/form_edit.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/form_edit.png
 
 There usually is a tooltip on a form field element for almost all attributes that can be activated by either going over and staying on the form 
 field label or the input section. 
@@ -222,4 +222,4 @@ Actions are usually placed on the right action pane of the application and belon
     
 .. image:: images/overview/list_multiselect_actions.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/master/docs/images/overview/list_multiselect_actions.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/docs/images/overview/list_multiselect_actions.png
diff --git a/docs/screen_proctoring.rst b/docs/screen_proctoring.rst
index 5d5c880f..7490f1f7 100644
--- a/docs/screen_proctoring.rst
+++ b/docs/screen_proctoring.rst
@@ -19,7 +19,7 @@ SEB Server needs to send an instruction to SEB to capture the screen and send th
 
 .. image:: images/screen_proctoring/enable_screen_proctoring_seb_settings.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/enable_screen_proctoring_seb_settings.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/enable_screen_proctoring_seb_settings.png
 
 
 SEB-Server and SEB are now ready to capture and to display screenshots.
@@ -27,7 +27,7 @@ Navigate to exam monitoring and click the button in the Screen Proctoring sectio
 
 .. image:: images/screen_proctoring/open_screen_proctoring.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/open_screen_proctoring.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/open_screen_proctoring.png
 
 |
 |
@@ -43,7 +43,7 @@ Gallery View
 
 .. image:: images/screen_proctoring/gallery_view_live_grid_selection.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/gallery_view_live_grid_selection.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/gallery_view_live_grid_selection.png
 
 
 - Use your mouse to hover over a tile or press the tab key. A "selected" tile reveals information and actions for the session.
@@ -55,7 +55,7 @@ Gallery View
 
 .. image:: images/screen_proctoring/gallery_view_settings.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/gallery_view_settings.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/gallery_view_settings.png
 
 - The SEB-Client additionally sends metadata about the screenshot
 - Metadata changes according to the content displayed on the screenshot
@@ -66,7 +66,7 @@ Gallery View
 
 .. image:: images/screen_proctoring/gallery_view_expanded.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/gallery_view_expanded.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/gallery_view_expanded.png
 
 
 - A message box indicates that there are no live sessions available
@@ -86,7 +86,7 @@ To get an overview of all running exams which your user has access to click on t
 
 .. image:: images/screen_proctoring/running_exam_no_selection.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/running_exam_no_selection.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/running_exam_no_selection.png
 
 By clicking on the settings icon in the menu bar two options are displayed.
 
@@ -96,7 +96,7 @@ By clicking on the settings icon in the menu bar two options are displayed.
 
 .. image:: images/screen_proctoring/running_exam_selection.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/running_exam_selection.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/running_exam_selection.png
 
 
 |
@@ -122,7 +122,7 @@ A session can either be live or recorded.
 
 .. image:: images/screen_proctoring/proctoring_overview_live.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/proctoring_overview_live.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/proctoring_overview_live.png
 
 
 - The "Details"-Box on the right side displays information about the session and the current screenshot
@@ -133,7 +133,7 @@ A session can either be live or recorded.
 
 .. image:: images/screen_proctoring/proctoring_overview.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/proctoring_overview.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/proctoring_overview.png
 
 
 - The "Live" button disappears when the sessions disconnects from the server
@@ -163,7 +163,7 @@ Use the form fields and the time / date selection to tailor the search result to
 
 .. image:: images/screen_proctoring/search_form.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/search_form.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/search_form.png
 
 
 **Search Results**
@@ -179,7 +179,8 @@ Use the "date" button on the right side to change the sort oder.
 
 .. image:: images/screen_proctoring/search_results_sessions.png
     :align: center
-    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/docu/docs/images/screen_proctoring/search_results_sessions.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/search_results_sessions.png
+    :target: https://raw.githubusercontent.com/SafeExamBrowser/seb-server/dev-2.0/images/screen_proctoring/search_results_sessions.png
 
 - By default, the screenshot are sorted by "Capture-Time" in ascending order
 - The screenshots are grouped into the metadata "Application / Website"