diff --git a/bdeploy.version b/bdeploy.version
index 28ec592b9..d1428a7e9 100644
--- a/bdeploy.version
+++ b/bdeploy.version
@@ -1 +1 @@
-3.7.0-SNAPSHOT
\ No newline at end of file
+3.6.1
\ No newline at end of file
diff --git a/doc/user/images/BDeploy_Application_Template_Choose.png b/doc/user/images/BDeploy_Application_Template_Choose.png
index b63c9b9b5..9a73a5d49 100644
Binary files a/doc/user/images/BDeploy_Application_Template_Choose.png and b/doc/user/images/BDeploy_Application_Template_Choose.png differ
diff --git a/doc/user/images/BDeploy_CfgFile_New.png b/doc/user/images/BDeploy_CfgFile_New.png
index a0c0e7ee7..f72636706 100644
Binary files a/doc/user/images/BDeploy_CfgFile_New.png and b/doc/user/images/BDeploy_CfgFile_New.png differ
diff --git a/doc/user/images/BDeploy_Cleanup_Actions.png b/doc/user/images/BDeploy_Cleanup_Actions.png
index d26a4c426..8775d4fda 100644
Binary files a/doc/user/images/BDeploy_Cleanup_Actions.png and b/doc/user/images/BDeploy_Cleanup_Actions.png differ
diff --git a/doc/user/images/BDeploy_DataFiles_Browser.png b/doc/user/images/BDeploy_DataFiles_Browser.png
index bd59e0201..1c02ef223 100644
Binary files a/doc/user/images/BDeploy_DataFiles_Browser.png and b/doc/user/images/BDeploy_DataFiles_Browser.png differ
diff --git a/doc/user/images/BDeploy_Demo-Repository_Permissions_AddUser1.png b/doc/user/images/BDeploy_Demo-Repository_Permissions_AddUser1.png
index e73a03b40..79501c762 100644
Binary files a/doc/user/images/BDeploy_Demo-Repository_Permissions_AddUser1.png and b/doc/user/images/BDeploy_Demo-Repository_Permissions_AddUser1.png differ
diff --git a/doc/user/images/BDeploy_Demo_Permissions_AddUser1.png b/doc/user/images/BDeploy_Demo_Permissions_AddUser1.png
index 9818b47ad..73cbdd35a 100644
Binary files a/doc/user/images/BDeploy_Demo_Permissions_AddUser1.png and b/doc/user/images/BDeploy_Demo_Permissions_AddUser1.png differ
diff --git a/doc/user/images/BDeploy_Instance_Create.png b/doc/user/images/BDeploy_Instance_Create.png
index 8f5124ffd..434ead10f 100644
Binary files a/doc/user/images/BDeploy_Instance_Create.png and b/doc/user/images/BDeploy_Instance_Create.png differ
diff --git a/doc/user/images/BDeploy_Instance_List.png b/doc/user/images/BDeploy_Instance_List.png
index a169af611..e3d4efdc3 100644
Binary files a/doc/user/images/BDeploy_Instance_List.png and b/doc/user/images/BDeploy_Instance_List.png differ
diff --git a/doc/user/images/BDeploy_Instance_Menu.png b/doc/user/images/BDeploy_Instance_Menu.png
index ffb585c75..4fa6ef06b 100644
Binary files a/doc/user/images/BDeploy_Instance_Menu.png and b/doc/user/images/BDeploy_Instance_Menu.png differ
diff --git a/doc/user/images/BDeploy_Instance_Template_Dialog_Groups.png b/doc/user/images/BDeploy_Instance_Template_Dialog_Groups.png
index 85e0e5185..163d8512c 100644
Binary files a/doc/user/images/BDeploy_Instance_Template_Dialog_Groups.png and b/doc/user/images/BDeploy_Instance_Template_Dialog_Groups.png differ
diff --git a/doc/user/images/BDeploy_Instance_Version_Activated.png b/doc/user/images/BDeploy_Instance_Version_Activated.png
index 92b8d659b..44588be13 100644
Binary files a/doc/user/images/BDeploy_Instance_Version_Activated.png and b/doc/user/images/BDeploy_Instance_Version_Activated.png differ
diff --git a/doc/user/images/BDeploy_Instance_Version_Menu.png b/doc/user/images/BDeploy_Instance_Version_Menu.png
index b64abc202..577b88636 100644
Binary files a/doc/user/images/BDeploy_Instance_Version_Menu.png and b/doc/user/images/BDeploy_Instance_Version_Menu.png differ
diff --git a/doc/user/images/BDeploy_Main_Menu.png b/doc/user/images/BDeploy_Main_Menu.png
index be14272ef..883cd59ed 100644
Binary files a/doc/user/images/BDeploy_Main_Menu.png and b/doc/user/images/BDeploy_Main_Menu.png differ
diff --git a/doc/user/images/BDeploy_Process_Crashed.png b/doc/user/images/BDeploy_Process_Crashed.png
index 341d44968..7793ddc48 100644
Binary files a/doc/user/images/BDeploy_Process_Crashed.png and b/doc/user/images/BDeploy_Process_Crashed.png differ
diff --git a/doc/user/images/BDeploy_Process_Crashed_Repeatedly.png b/doc/user/images/BDeploy_Process_Crashed_Repeatedly.png
index 945ac5ad5..67a8ab8dd 100644
Binary files a/doc/user/images/BDeploy_Process_Crashed_Repeatedly.png and b/doc/user/images/BDeploy_Process_Crashed_Repeatedly.png differ
diff --git a/doc/user/images/BDeploy_Process_List.png b/doc/user/images/BDeploy_Process_List.png
index bd781fd37..fd87f00da 100644
Binary files a/doc/user/images/BDeploy_Process_List.png and b/doc/user/images/BDeploy_Process_List.png differ
diff --git a/doc/user/images/BDeploy_Process_Manual_Confirm.png b/doc/user/images/BDeploy_Process_Manual_Confirm.png
index b5d576c4a..185632eeb 100644
Binary files a/doc/user/images/BDeploy_Process_Manual_Confirm.png and b/doc/user/images/BDeploy_Process_Manual_Confirm.png differ
diff --git a/doc/user/images/BDeploy_Process_Optional_Parameters.png b/doc/user/images/BDeploy_Process_Optional_Parameters.png
index e697ed32c..ffad6196f 100644
Binary files a/doc/user/images/BDeploy_Process_Optional_Parameters.png and b/doc/user/images/BDeploy_Process_Optional_Parameters.png differ
diff --git a/doc/user/images/BDeploy_Process_Output.png b/doc/user/images/BDeploy_Process_Output.png
index 96ecba51f..80e5dadfe 100644
Binary files a/doc/user/images/BDeploy_Process_Output.png and b/doc/user/images/BDeploy_Process_Output.png differ
diff --git a/doc/user/images/BDeploy_Process_Started.png b/doc/user/images/BDeploy_Process_Started.png
index ec4fb695c..0dff24319 100644
Binary files a/doc/user/images/BDeploy_Process_Started.png and b/doc/user/images/BDeploy_Process_Started.png differ
diff --git a/doc/user/images/BDeploy_Product_Upgrade_Local_Changes.png b/doc/user/images/BDeploy_Product_Upgrade_Local_Changes.png
index c53003bc2..4c8231aba 100644
Binary files a/doc/user/images/BDeploy_Product_Upgrade_Local_Changes.png and b/doc/user/images/BDeploy_Product_Upgrade_Local_Changes.png differ
diff --git a/doc/user/images/BDeploy_Product_Upload_Before.png b/doc/user/images/BDeploy_Product_Upload_Before.png
index 6e1d9cc6c..8203de541 100644
Binary files a/doc/user/images/BDeploy_Product_Upload_Before.png and b/doc/user/images/BDeploy_Product_Upload_Before.png differ
diff --git a/doc/user/images/BDeploy_Product_Upload_Success.png b/doc/user/images/BDeploy_Product_Upload_Success.png
index 040659e74..78edb2298 100644
Binary files a/doc/user/images/BDeploy_Product_Upload_Success.png and b/doc/user/images/BDeploy_Product_Upload_Success.png differ
diff --git a/doc/user/images/BDeploy_Products.png b/doc/user/images/BDeploy_Products.png
index cbb52fa98..b263aed00 100644
Binary files a/doc/user/images/BDeploy_Products.png and b/doc/user/images/BDeploy_Products.png differ
diff --git a/doc/user/images/BDeploy_Products_Details.png b/doc/user/images/BDeploy_Products_Details.png
index ac5c1e1c5..8f383a368 100644
Binary files a/doc/user/images/BDeploy_Products_Details.png and b/doc/user/images/BDeploy_Products_Details.png differ
diff --git a/doc/user/images/BDeploy_SWRepo_Ext_Software_Details.png b/doc/user/images/BDeploy_SWRepo_Ext_Software_Details.png
index f98477348..ba570c8af 100644
Binary files a/doc/user/images/BDeploy_SWRepo_Ext_Software_Details.png and b/doc/user/images/BDeploy_SWRepo_Ext_Software_Details.png differ
diff --git a/doc/user/images/BDeploy_System_With_Launcher.png b/doc/user/images/BDeploy_System_With_Launcher.png
index 1861de72d..fce6acd2c 100644
Binary files a/doc/user/images/BDeploy_System_With_Launcher.png and b/doc/user/images/BDeploy_System_With_Launcher.png differ
diff --git a/doc/user/images/BDeploy_Tutorial_Process_Control.png b/doc/user/images/BDeploy_Tutorial_Process_Control.png
index 9744c6e77..0fe012810 100644
Binary files a/doc/user/images/BDeploy_Tutorial_Process_Control.png and b/doc/user/images/BDeploy_Tutorial_Process_Control.png differ
diff --git a/doc/user/images/BDeploy_UserAccounts.png b/doc/user/images/BDeploy_UserAccounts.png
index 104ba5cbe..25d01f81b 100644
Binary files a/doc/user/images/BDeploy_UserAccounts.png and b/doc/user/images/BDeploy_UserAccounts.png differ
diff --git a/doc/user/images/BDeploy_UserAccounts_Add.png b/doc/user/images/BDeploy_UserAccounts_Add.png
index c45f993fb..ec1d296d6 100644
Binary files a/doc/user/images/BDeploy_UserAccounts_Add.png and b/doc/user/images/BDeploy_UserAccounts_Add.png differ
diff --git a/doc/user/images/BDeploy_User_History_ComparisonDialog.png b/doc/user/images/BDeploy_User_History_ComparisonDialog.png
index 9d3dfd005..60909c0fb 100644
Binary files a/doc/user/images/BDeploy_User_History_ComparisonDialog.png and b/doc/user/images/BDeploy_User_History_ComparisonDialog.png differ
diff --git a/doc/user/images/BDeploy_User_History_OpenedCard.png b/doc/user/images/BDeploy_User_History_OpenedCard.png
index 84e6730cd..28f7bdba7 100644
Binary files a/doc/user/images/BDeploy_User_History_OpenedCard.png and b/doc/user/images/BDeploy_User_History_OpenedCard.png differ
diff --git a/doc/user/images/BDeploy_User_History_Overview.png b/doc/user/images/BDeploy_User_History_Overview.png
index 278a385b2..4bf235865 100644
Binary files a/doc/user/images/BDeploy_User_History_Overview.png and b/doc/user/images/BDeploy_User_History_Overview.png differ
diff --git a/doc/user/images/BDeploy_User_History_RuntimeHistory.png b/doc/user/images/BDeploy_User_History_RuntimeHistory.png
index 5c0441b23..208986014 100644
Binary files a/doc/user/images/BDeploy_User_History_RuntimeHistory.png and b/doc/user/images/BDeploy_User_History_RuntimeHistory.png differ
diff --git a/doc/user/images/BDeploy_User_History_ShowMenu.png b/doc/user/images/BDeploy_User_History_ShowMenu.png
index 4cd3e9b51..9d20e24cb 100644
Binary files a/doc/user/images/BDeploy_User_History_ShowMenu.png and b/doc/user/images/BDeploy_User_History_ShowMenu.png differ
diff --git a/test-data/bin-test-data/3.6.1.zip b/test-data/bin-test-data/3.6.1.zip
new file mode 100644
index 000000000..ba56c7cac
Binary files /dev/null and b/test-data/bin-test-data/3.6.1.zip differ