From 71b2d44f98bd8faa5077823963a1ca0ab3e989f7 Mon Sep 17 00:00:00 2001
From: Kilian Saffran <ksaffran@dks.lu>
Date: Tue, 27 Mar 2018 08:50:09 +0200
Subject: [PATCH] remove windows install-scripts, debug modes and add db
 verification button

---
 .../content/modules/support/multisite.html    |   2 +-
 dev/db/dump_db2.bat                           |   2 +-
 dev/debug.bat                                 |   8 -
 dev/debug_basic.bat                           |   9 -
 dev/debug_director_nw.bat                     |   6 -
 dev/debug_free.bat                            |  12 -
 dev/debug_standard.bat                        |   8 -
 dev/start_chrome.bat                          |   4 -
 install/create_setup_windows.pl               |  89 ++---
 install/windows/creorga.wxs                   | 306 ------------------
 install/windows/creorga_setup.iss             |  97 ------
 install/windows/creorga_setup_basic.iss       |  96 ------
 install/windows/creorga_setup_director.iss    |   3 +-
 install/windows/creorga_setup_free.iss        |  98 ------
 .../windows/creorga_setup_localmanager.iss    |   2 +-
 install/windows/creorga_setup_staff.iss       |   2 +-
 install/windows/creorga_setup_standard.iss    |  98 ------
 17 files changed, 24 insertions(+), 818 deletions(-)
 delete mode 100644 dev/debug.bat
 delete mode 100644 dev/debug_basic.bat
 delete mode 100644 dev/debug_director_nw.bat
 delete mode 100644 dev/debug_free.bat
 delete mode 100644 dev/debug_standard.bat
 delete mode 100644 dev/start_chrome.bat
 delete mode 100644 install/windows/creorga.wxs
 delete mode 100644 install/windows/creorga_setup.iss
 delete mode 100644 install/windows/creorga_setup_basic.iss
 delete mode 100644 install/windows/creorga_setup_free.iss
 delete mode 100644 install/windows/creorga_setup_standard.iss

diff --git a/app_v3/chrome/content/modules/support/multisite.html b/app_v3/chrome/content/modules/support/multisite.html
index cf70271..e3b4f89 100644
--- a/app_v3/chrome/content/modules/support/multisite.html
+++ b/app_v3/chrome/content/modules/support/multisite.html
@@ -28,7 +28,7 @@
    <button onclick="save_multisite();" class="btn btn-primary" type="button" id="btnnewsite"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; nouveau site</button>
    <button onclick="dlg_addsite();" class="btn btn-primary" type="button" id="btnremotesite"><span class="glyphicon glyphicon-plus" aria-hidden="true"></span>&nbsp; site existant (partagé)</button>
    <button onclick="dlg_vpn();" class="btn btn-primary" type="button" id="btnvpnconfig" style="display: none;"><span class="glyphicons glyphicons-unlock" aria-hidden="true"></span>&nbsp; Configuration VPN</button>
-   <!-- <button onclick="checkdatabases();" class="btn btn-info" type="button" id="btncheckdb" style="display: none;"><span class="glyphicon glyphicon-reload" aria-hidden="true"></span>&nbsp; verification DB</button> -->
+    <button onclick="checkdatabases();" class="btn btn-info" type="button" id="btncheckdb" style="display: none;"><span class="glyphicon glyphicon-reload" aria-hidden="true"></span>&nbsp; verification DB</button>
    <button onclick="vpnconnection();" class="btn btn-warning" type="button" id="btnvpnconnection" style="display: none;"><span class="glyphicons glyphicons-database-lock" aria-hidden="true"></span>&nbsp; Connecter VPN</button>
    <!-- <button onclick="dlg_sync();" class="btn btn-primary" type="button" id="btnsyncconfig" style="display: none;"><span class="glyphicons glyphicons-reload" aria-hidden="true"></span>&nbsp; Configuration de Synchronisation</button>
    <button onclick="syncstart();" class="btn btn-warning" type="button" id="btnsyncstart" style="display: none;"><span class="glyphicons glyphicons-upload" aria-hidden="true"></span>&nbsp; Activer Synchronisation</button>
diff --git a/dev/db/dump_db2.bat b/dev/db/dump_db2.bat
index b06dcde..67ef1b9 100644
--- a/dev/db/dump_db2.bat
+++ b/dev/db/dump_db2.bat
@@ -1,3 +1,3 @@
 @echo off
 echo "dump schema"
-"C:\Tools\sqlite3.exe" "C:\Users\ksaff\Workspace\creorga\app\defaults\profile\creorga.sqlite" ".schema" > "C:\Users\ksaff\Workspace\creorga-devtools\dev\db\creorga.schema.new.sql"
+"C:\Tools\sqlite3.exe" "C:\Users\ksaff\Workspace\creorga\app_v3\defaults\profile\creorga.sqlite" ".schema" > "C:\Users\ksaff\Workspace\creorga\dev\db\creorga.schema.new.sql"
diff --git a/dev/debug.bat b/dev/debug.bat
deleted file mode 100644
index 3d5037f..0000000
--- a/dev/debug.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-echo "Copy files!"
-rem "C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\web\*" "C:\Apache24\htdocs\creorga\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome\*" "C:\Debug\Creorga\chrome\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\defaults\*" "C:\Debug\Creorga\defaults\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome.manifest" "C:\Debug\Creorga\chrome.manifest" /E /Y /Q
-"C:\Debug\Creorga\Creorga.exe"
diff --git a/dev/debug_basic.bat b/dev/debug_basic.bat
deleted file mode 100644
index 022c672..0000000
--- a/dev/debug_basic.bat
+++ /dev/null
@@ -1,9 +0,0 @@
-@echo off
-
-echo "Copy files!"
-rem "C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\web\*" "C:\Apache24\htdocs\creorga\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome\*" "C:\Debug\Creorga\chrome\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\defaults\*" "C:\Debug\Creorga\defaults\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome.manifest_basic" "C:\Debug\Creorga\chrome.manifest" /E /Y /Q
-"C:\Debug\Creorga\Creorga.exe"
-
diff --git a/dev/debug_director_nw.bat b/dev/debug_director_nw.bat
deleted file mode 100644
index e30453b..0000000
--- a/dev/debug_director_nw.bat
+++ /dev/null
@@ -1,6 +0,0 @@
-@echo off
-
-echo "Debug Creorga Director NW!"
-
-echo "%userprofile%"
-"C:\Users\ksaff\Software\Windows\development\nwjs-sdk-v0.28.3-win-x64\nw.exe" "%userprofile%\Workspace\creorga\app"
diff --git a/dev/debug_free.bat b/dev/debug_free.bat
deleted file mode 100644
index 45cbfac..0000000
--- a/dev/debug_free.bat
+++ /dev/null
@@ -1,12 +0,0 @@
-@echo off
-
-echo "Copy files!"
-rem "C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\web\*" "C:\Apache24\htdocs\creorga\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome\*" "C:\Debug\Creorga\chrome\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome\content\js\init_free.js" "C:\Debug\Creorga\chrome\content\js\init.js" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome\content\creorga_free.xul" "C:\Debug\Creorga\chrome\content\creorga.xul" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\defaults\*" "C:\Debug\Creorga\defaults\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome.manifest_free" "C:\Debug\Creorga\chrome.manifest" /E /Y /Q
-rmdir /S /Q "C:\Debug\Creorga\chrome\content\modules\multisite"
-"C:\Debug\Creorga\Creorga.exe"
-
diff --git a/dev/debug_standard.bat b/dev/debug_standard.bat
deleted file mode 100644
index 3d5037f..0000000
--- a/dev/debug_standard.bat
+++ /dev/null
@@ -1,8 +0,0 @@
-@echo off
-
-echo "Copy files!"
-rem "C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\web\*" "C:\Apache24\htdocs\creorga\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome\*" "C:\Debug\Creorga\chrome\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\defaults\*" "C:\Debug\Creorga\defaults\" /E /Y /Q
-"C:\Windows\system32\xcopy.exe" "C:\Workspace\Creorga\app\chrome.manifest" "C:\Debug\Creorga\chrome.manifest" /E /Y /Q
-"C:\Debug\Creorga\Creorga.exe"
diff --git a/dev/start_chrome.bat b/dev/start_chrome.bat
deleted file mode 100644
index d34baec..0000000
--- a/dev/start_chrome.bat
+++ /dev/null
@@ -1,4 +0,0 @@
-@echo off 
-cd C:\Users\ksaff\Software\Windows\development\chromium\chrome-win32 
-chrome.exe --app="file:///C:/Users/ksaff/Workspace/creorga/app/chrome/content/main/index.html" --start-maximized --allow-file-access --disable-extensions --no-first-run --disable-sync
-
diff --git a/install/create_setup_windows.pl b/install/create_setup_windows.pl
index 3e046ae..6588f17 100644
--- a/install/create_setup_windows.pl
+++ b/install/create_setup_windows.pl
@@ -75,7 +75,7 @@ if ($setup eq "director"){
     unlink($a);
   }
   remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\staff_basic");
-  remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\default_free");
+  #remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\default_free");
 } elsif ($setup eq "staff"){
 
   my @unused_files = File::Find::Rule->file()
@@ -120,53 +120,8 @@ if ($setup eq "director"){
   remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\default_standard");
   remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\accounting");
   #remove_tree("C:\\Users\\ksaff\\Release\\tag\\app\\chrome\\content\\modules\\staff");
-} elsif ($setup eq "free"){
-  my @unused_files = File::Find::Rule->file()
-                                  ->name( qr/.+_standard.*/  )
-                                  ->in("C:\\Users\\ksaff\\Release\\tag\\app_v3");
-  foreach my $a (@unused_files){
-    print "unlink $a\n";
-    unlink($a);
-  }
-  @unused_files = File::Find::Rule->file()
-                                  ->name( qr/.+_basic.*/  )
-                                  ->in("C:\\Users\\ksaff\\Release\\tag\\app_v3");
-  foreach my $a (@unused_files){
-    print "unlink $a\n";
-    unlink($a);
-  }
-  @unused_files = File::Find::Rule->file()
-                                  ->name( qr/logcominterne.*/  )
-                                  ->in("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook");
-  foreach my $a (@unused_files){
-    print "unlink $a\n";
-    unlink($a);
-  }
-  move("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\js\\init_free.js","C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\js\\init.js");
-  move("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\staff\\coworker_free.html","C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\staff\\coworker.html");
-  move("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\creorga_free.xul","C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\creorga.xul");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\js\\tools.js");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\js\\encrypt.js");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\support\\support.xul");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\support\\support.xul");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\support\\update.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\support\\multisite.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\support\\backup.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logstaff.html");
-  #unlink("C:\\Users\\ksaff\\Release\\tag\\app\\chrome\\content\\modules\\logbook\\logcominterne.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logchild.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logbook.xul");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logactivity.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\logcominterne.html");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\js\\logstaff.js");
-  #unlink("C:\\Users\\ksaff\\Release\\tag\\app\\chrome\\content\\modules\\logbook\\js\\logcominterne.js");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\js\\logchild.js");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\logbook\\js\\logactivity.js");
-  #unlink("C:\\Users\\ksaff\\Release\\tag\\app\\chrome\\content\\modules\\logbook\\js\\logcominterne.js");
-  remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\support\\js");
-  remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\default_standard");
-  remove_tree("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome\\content\\modules\\multisite");
-}
+} 
+
 system('"C:\\Tools\\7za.exe" a -r creorga_'.$setup.'.jar chrome');
 make_path("C:\\Users\\ksaff\\Release\\dist");
 rcopy("C:\\Users\\ksaff\\Workspace\\xulrunner\\xulrunner","C:\\Users\\ksaff\\Release\\dist\\xulrunner");
@@ -178,9 +133,8 @@ if ($setup eq "staff"){
   copy("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome.manifest_basic","C:\\Users\\ksaff\\Release\\dist\\chrome.manifest");
 } elsif ($setup eq "localmanager") {
   copy("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome.manifest_localmanager","C:\\Users\\ksaff\\Release\\dist\\chrome.manifest");
-} elsif ($setup eq "free") {
-  copy("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome.manifest_free","C:\\Users\\ksaff\\Release\\dist\\chrome.manifest");
-} else {
+}  
+else {
   copy("C:\\Users\\ksaff\\Release\\tag\\app_v3\\chrome.manifest","C:\\Users\\ksaff\\Release\\dist\\chrome.manifest");
 }
 
@@ -235,36 +189,29 @@ if (($setup eq "director")){
   unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnconnect.sh");
   unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpncfg.txt");
   #compile executeables
-  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" -g creorgadb.pl');
+  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" creorgadb.pl');
   system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\pdfextract.exe" pdfextract.pl');
-  #system('"C:\\Program Files (x86)\\ActiveState Perl Dev Kit 9.5.1\\bin\\perlapp.exe" --norunlib --clean --gui --force --info "CompanyName=DKS sarl;FileDescription=Schema Creorga DB Schema;FileVersion=1.0;InternalName=creorgadb.exe;LegalCopyright=2017 DKS sarl;OriginalFilename=creorgadb.exe;ProductName=creorgadb;ProductVersion=1.0" --exe "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" --perl "C:\\Strawberry\\perl\\bin\\perl.exe" "C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\creorgadb.pl"');
-  #system('"C:\\Program Files (x86)\\ActiveState Perl Dev Kit 9.5.1\\bin\\perlapp.exe" --norunlib --clean --gui --force --info "CompanyName=DKS sarl;FileDescription=extract data from Check-Service PDFs and save it in Creorga;FileVersion=1.0;InternalName=pdfextract.exe;LegalCopyright=2017 DKS sarl;OriginalFilename=pdfextract.exe;ProductName=pdfextract;ProductVersion=1.0" --exe "C:\\Users\\ksaff\\Release\\dist\\Tools\\pdfextract.exe" --perl "C:\\Stawberry\\perl\\bin\\perl.exe" "C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\pdfextract.pl"');
-}
-if ($setup eq "free"){
-  open(CHKS,">C:\\Users\\ksaff\\Release\\dist\\checkschema.txt");
-  close(CHKS);
-  make_path("C:\\Users\\ksaff\\Release\\dist\\Tools");
-  chdir("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnclose.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpnconnect.sh");
-  unlink("C:\\Users\\ksaff\\Release\\tag\\app_v3\\Tools\\vpncfg.txt");
-  system('"C:\\Strawberry\\perl\\site\\bin\\pp" -o "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" -g creorgadb.pl');
-  #system('"C:\\Program Files (x86)\\ActiveState Perl Dev Kit 9.5.1\\bin\\perlapp.exe" --norunlib --clean --gui --force --info "CompanyName=DKS sarl;FileDescription=Schema Creorga DB Schema;FileVersion=1.0;InternalName=creorgadb.exe;LegalCopyright=2017 DKS sarl;OriginalFilename=creorgadb.exe;ProductName=creorgadb;ProductVersion=1.0" --exe "C:\\Users\\ksaff\\Release\\dist\\Tools\\creorgadb.exe" --perl "C:\\perl\\bin\\perl.exe" "C:\\Users\\ksaff\\Release\\tag\\app\\Tools\\creorgadb.pl"');
 }
 
+
 print "Release compiled!\n";
 chdir("C:\\Users\\ksaff\\Release");
-#TODO: create MSI installer construct creorga.wxs -> WixToolkit
-#C:\Program Files (x86)\WiX Toolset v3.11\bin\candle.exe -nologo "C:\Users\ksaff\Documents\creorga.wxs" -out "C:\Users\ksaff\Documents\creorga.wixobj"  -ext WixUtilExtension  -ext WixUIExtension
-#C:\Program Files (x86)\WiX Toolset v3.11\bin\light.exe -nologo "C:\Users\ksaff\Documents\creorga.wixobj" -out "C:\Users\ksaff\Documents\creorga.msi"  -ext WixUtilExtension  -ext WixUIExtension
 
 system('"C:\\Program Files (x86)\\Inno Setup 5\\ISCC.exe" /dMyAppVersion='.$tag.' "C:\\Users\\ksaff\\Workspace\\creorga\\install\\windows\\creorga_setup_'.$setup.'.iss"');
-print "Setup created\n";
-move("C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag.".exe","C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag."_".$setup.".exe");
+if (-e "C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag."_".$setup.".exe"){
+	print "Setup created\n";	
+	copy("C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag."_".$setup.".exe","C:\\Users\\ksaff\\Setups\\Setup_Creorga_".$tag."_".$setup.".exe");
+	print "copied to C:\\Users\\ksaff\\Setups\n";
+} else {
+	#move("C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag.".exe","C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag."_".$setup.".exe");
+	print "FAILED to create Setup!!\n";
+}
+print "normal END!\n";
+
 #system('"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x86\\signtool.exe" sign /v /f "C:\\DKS\\Dokumente\\Certificates\\OS201603168961.pfx" /p "ltUedPZPjTTDke7pONAa" /v "C:\\Users\\ksaff\\Release\\Setup_Creorga_'.$tag.'_'.$setup.'.exe"');
 #system('"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x86\\signtool.exe" sign /v /f "C:\\DKS\\Dokumente\\Certificates\\OS201603168961.pfx" /p "ltUedPZPjTTDke7pONAa" /t http://timestamp.globalsign.com/scripts/timestamp.dll /v "C:\\Users\\ksaff\\Release\\Setup_Creorga_'.$tag.'_'.$setup.'.exe"');
 #system('"C:\\Program Files (x86)\\Windows Kits\\10\\bin\\x86\\signtool.exe" sign /v /f "C:\\DKS\\Dokumente\\Certificates\\OS201603168961.pfx" /p "ltUedPZPjTTDke7pONAa" /t http://timestamp.verisign.com/scripts/timestamp.dll /v "C:\\Users\\ksaff\\Release\\Setup_Creorga_'.$tag.'_'.$setup.'.exe"');
 
 #print "Setup signed\n";
-copy("C:\\Users\\ksaff\\Release\\Setup_Creorga_".$tag."_".$setup.".exe","C:\\Users\\ksaff\\Setups\\Setup_Creorga_".$tag."_".$setup.".exe");
+
 #set SERVERLIST=(http://timestamp.comodoca.com/authenticode http://timestamp.verisign.com/scripts/timestamp.dll http://timestamp.globalsign.com/scripts/timestamp.dll http://tsa.starfieldtech.com)
diff --git a/install/windows/creorga.wxs b/install/windows/creorga.wxs
deleted file mode 100644
index 1fc7765..0000000
--- a/install/windows/creorga.wxs
+++ /dev/null
@@ -1,306 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:util="http://schemas.microsoft.com/wix/UtilExtension">
-    <Product Id="3D5E73D5-D8EE-4F48-B736-D9ADB03EA59D" Name="Creorga" Language="1036" Version="3.17.4.1" Manufacturer="DKS" UpgradeCode="70E26DA3-6AFC-4E32-BB85-08E62B8E0C9E">
-        <Package Description="Logiciel pour Crèches au Luxembourg" Comments="Logiciel pour crèches au Luxembourg" InstallerVersion="200" Compressed="yes" />
-        <Media Id="1" Cabinet="simple.cab" EmbedCab="yes" />
-        <Directory Id="TARGETDIR" Name="SourceDir">
-        <Directory Id="ProgramFilesFolder">
-
-            <Directory Id="DIST" Name="Creorga">
-                <Component Id="APPLICATION.INI" DiskId="1" Guid="FAF3C427-600C-49E5-9686-F291AA6B856A">
-                    <File Id="APPLICATION.INI" Name="application.ini" Source="C:\Users\ksaff\Release\dist\application.ini" />
-                </Component>
-                <Component Id="CHROME.MANIFEST" DiskId="1" Guid="9CE1CE21-B418-4902-B8F6-E70D9505B5B0">
-                    <File Id="CHROME.MANIFEST" Name="chrome.manifest" Source="C:\Users\ksaff\Release\dist\chrome.manifest" />
-                </Component>
-                <Component Id="CREORGA.EXE" DiskId="1" Guid="BE01D4D1-5F89-4653-8030-04299974B0AF">
-                    <File Id="CREORGA.EXE" Name="Creorga.exe" Source="C:\Users\ksaff\Release\dist\Creorga.exe">
-                        <Shortcut Id="desktopShortcut" Directory="DesktopFolder" Name="Creorga" WorkingDirectory="INSTALLDIR" Advertise="yes" Icon="DesktopIcon.exe" IconIndex="0" />
-                        <Shortcut Id="ExeShortcut" Directory="ProgramMenuDir" Name="Creorga" Advertise="yes" Icon="StartMenuIcon.exe" IconIndex="0" />
-                    </File>
-                </Component>
-                <Component Id="CREORGA.JAR" DiskId="1" Guid="F9864E66-7188-4D48-ADCF-6BCEEDBF8DED">
-                    <File Id="CREORGA.JAR" Name="creorga.jar" Source="C:\Users\ksaff\Release\dist\creorga.jar" />
-                </Component>
-                <Component Id="VCREDIST_X86.EXE" DiskId="1" Guid="63AF4EE8-C71F-4019-853B-7E89ED4A5BBF">
-                    <File Id="VCREDIST_X86.EXE" Name="vcredist_x86.exe" Source="C:\Users\ksaff\Release\dist\vcredist_x86.exe" />
-                </Component>
-                <Directory Id="DEFAULTS" Name="defaults">
-                    <Directory Id="DATA" Name="data">
-                        <Component Id="_2016.SQL" DiskId="1" Guid="7245D5AD-1AEB-4103-A726-826883B50BD3">
-                            <File Id="_2016.SQL" Name="2016.sql" Source="C:\Users\ksaff\Release\dist\defaults\data\2016.sql" />
-                        </Component>
-                        <Component Id="_2017.SQL" DiskId="1" Guid="2ABC097E-E6FC-4817-91EA-911470D887A2">
-                            <File Id="_2017.SQL" Name="2017.sql" Source="C:\Users\ksaff\Release\dist\defaults\data\2017.sql" />
-                        </Component>
-                        <Component Id="_2018.SQL" DiskId="1" Guid="5CCE3EA4-BE84-456C-9152-A51E7667A9E1">
-                            <File Id="_2018.SQL" Name="2018.sql" Source="C:\Users\ksaff\Release\dist\defaults\data\2018.sql" />
-                        </Component>
-                    </Directory>
-                    <Directory Id="PREFERENCES" Name="preferences">
-                        <Component Id="CREORGA.JS" DiskId="1" Guid="F2050F3F-1BF0-44C8-9251-A20A74C78210">
-                            <File Id="CREORGA.JS" Name="creorga.js" Source="C:\Users\ksaff\Release\dist\defaults\preferences\creorga.js" />
-                        </Component>
-                        <Component Id="DEBUG.JS" DiskId="1" Guid="AA79B76D-C717-4C91-A2C8-754C7B9C20DB">
-                            <File Id="DEBUG.JS" Name="debug.js" Source="C:\Users\ksaff\Release\dist\defaults\preferences\debug.js" />
-                        </Component>
-                        <Component Id="PREFS.JS" DiskId="1" Guid="3D35BD76-2AB2-4594-96D2-4D13D320B2AB">
-                            <File Id="PREFS.JS" Name="prefs.js" Source="C:\Users\ksaff\Release\dist\defaults\preferences\prefs.js" />
-                        </Component>
-                    </Directory>
-                    <Directory Id="PROFILE" Name="profile">
-                        <Component Id="CREORGA.SQLITE" DiskId="1" Guid="5B3558B1-7CC1-47CC-BB90-D9D458E7C6AC">
-                            <File Id="CREORGA.SQLITE" Name="creorga.sqlite" Source="C:\Users\ksaff\Release\dist\defaults\profile\creorga.sqlite" />
-                        </Component>
-                    </Directory>
-                </Directory>
-                <Directory Id="XULRUNNER" Name="xulrunner">
-                    <Component Id="ACCESSIBLEMARSHAL.DLL" DiskId="1" Guid="D9E25EB6-96BB-4457-A852-4E128E58FB9F">
-                        <File Id="ACCESSIBLEMARSHAL.DLL" Name="AccessibleMarshal.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\AccessibleMarshal.dll" />
-                    </Component>
-                    <Component Id="BREAKPADINJECTOR.DLL" DiskId="1" Guid="7974467C-B813-44AC-A942-31EE6F745E14">
-                        <File Id="BREAKPADINJECTOR.DLL" Name="breakpadinjector.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\breakpadinjector.dll" />
-                    </Component>
-                    <Component Id="CRASHREPORTER.EXE" DiskId="1" Guid="659E2F28-1DF5-42E2-A784-0CDD26BCB849">
-                        <File Id="CRASHREPORTER.EXE" Name="crashreporter.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\crashreporter.exe" />
-                    </Component>
-                    <Component Id="CRASHREPORTER.INI" DiskId="1" Guid="D6CCD7E9-FFB3-4852-AE1D-9DA881C2CD05">
-                        <File Id="CRASHREPORTER.INI" Name="crashreporter.ini" Source="C:\Users\ksaff\Release\dist\xulrunner\crashreporter.ini" />
-                    </Component>
-                    <Component Id="D3DCOMPILER_43.DLL" DiskId="1" Guid="A477E0F5-4402-48C1-A5B9-05C251EB0593">
-                        <File Id="D3DCOMPILER_43.DLL" Name="D3DCompiler_43.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\D3DCompiler_43.dll" />
-                    </Component>
-                    <Component Id="D3DCOMPILER_47.DLL" DiskId="1" Guid="B07839D5-6125-4A06-BFD4-2F89759CFD01">
-                        <File Id="D3DCOMPILER_47.DLL" Name="d3dcompiler_47.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\d3dcompiler_47.dll" />
-                    </Component>
-                    <Component Id="DEPENDENTLIBS.LIST" DiskId="1" Guid="F963DB1C-1D97-4562-8B57-6C363A4347C5">
-                        <File Id="DEPENDENTLIBS.LIST" Name="dependentlibs.list" Source="C:\Users\ksaff\Release\dist\xulrunner\dependentlibs.list" />
-                    </Component>
-                    <Component Id="FREEBL3.CHK" DiskId="1" Guid="F27D7A1C-5DCB-46A8-9439-6AF116B53509">
-                        <File Id="FREEBL3.CHK" Name="freebl3.chk" Source="C:\Users\ksaff\Release\dist\xulrunner\freebl3.chk" />
-                    </Component>
-                    <Component Id="FREEBL3.DLL" DiskId="1" Guid="232720FA-AB0C-4333-B5DE-DAE7997A6AB6">
-                        <File Id="FREEBL3.DLL" Name="freebl3.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\freebl3.dll" />
-                    </Component>
-                    <Component Id="IA2MARSHAL.DLL" DiskId="1" Guid="0AFE1FC4-E087-4EB8-9B6B-D5CB8F75D8B3">
-                        <File Id="IA2MARSHAL.DLL" Name="IA2Marshal.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\IA2Marshal.dll" />
-                    </Component>
-                    <Component Id="ICUDT52.DLL" DiskId="1" Guid="8B025337-437B-4A69-9DD5-AA69DFE57D9C">
-                        <File Id="ICUDT52.DLL" Name="icudt52.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\icudt52.dll" />
-                    </Component>
-                    <Component Id="ICUIN52.DLL" DiskId="1" Guid="6B925366-EB7F-4C35-89E4-ED68A3D83265">
-                        <File Id="ICUIN52.DLL" Name="icuin52.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\icuin52.dll" />
-                    </Component>
-                    <Component Id="ICUUC52.DLL" DiskId="1" Guid="027678D6-F233-482F-AB68-015ACBBC175F">
-                        <File Id="ICUUC52.DLL" Name="icuuc52.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\icuuc52.dll" />
-                    </Component>
-                    <Component Id="JS_GDB.PY" DiskId="1" Guid="36E68681-1416-4FE5-890C-B45F6453173C">
-                        <File Id="JS_GDB.PY" Name="js-gdb.py" Source="C:\Users\ksaff\Release\dist\xulrunner\js-gdb.py" />
-                    </Component>
-                    <Component Id="JS.EXE" DiskId="1" Guid="C851B752-5E52-4188-9EC0-B88A51C655B0">
-                        <File Id="JS.EXE" Name="js.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\js.exe" />
-                    </Component>
-                    <Component Id="LIBEGL.DLL" DiskId="1" Guid="F37ACDA7-232B-456F-8B2F-DC9F6EDED108">
-                        <File Id="LIBEGL.DLL" Name="libEGL.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\libEGL.dll" />
-                    </Component>
-                    <Component Id="LIBGLESV2.DLL" DiskId="1" Guid="8446DF19-74B4-4DE3-B24F-EAE0771F4637">
-                        <File Id="LIBGLESV2.DLL" Name="libGLESv2.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\libGLESv2.dll" />
-                    </Component>
-                    <Component Id="LICENSE" DiskId="1" Guid="CE06DDA6-287D-44B4-A87B-221960ABA3B6">
-                        <File Id="LICENSE" Name="LICENSE" Source="C:\Users\ksaff\Release\dist\xulrunner\LICENSE" />
-                    </Component>
-                    <Component Id="MOZALLOC.DLL" DiskId="1" Guid="3DEA0C62-D4EE-4A77-B3DC-2AF37946CE09">
-                        <File Id="MOZALLOC.DLL" Name="mozalloc.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\mozalloc.dll" />
-                    </Component>
-                    <Component Id="MOZGLUE.DLL" DiskId="1" Guid="1FF116C9-5EC8-4EA9-BEE6-E7E3BEFB8A96">
-                        <File Id="MOZGLUE.DLL" Name="mozglue.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\mozglue.dll" />
-                    </Component>
-                    <Component Id="MSVCP120.DLL" DiskId="1" Guid="0C0B634D-E74C-4734-9F8C-7D126113D569">
-                        <File Id="MSVCP120.DLL" Name="msvcp120.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\msvcp120.dll" />
-                    </Component>
-                    <Component Id="MSVCR120.DLL" DiskId="1" Guid="3F6413D9-A05E-459B-B852-C796B5F364AB">
-                        <File Id="MSVCR120.DLL" Name="msvcr120.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\msvcr120.dll" />
-                    </Component>
-                    <Component Id="NSS3.DLL" DiskId="1" Guid="6098B19A-3252-4E41-9AC9-F3E731762A7E">
-                        <File Id="NSS3.DLL" Name="nss3.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\nss3.dll" />
-                    </Component>
-                    <Component Id="NSSCKBI.DLL" DiskId="1" Guid="B38111E7-F3B0-44A9-809A-07DB4B745943">
-                        <File Id="NSSCKBI.DLL" Name="nssckbi.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\nssckbi.dll" />
-                    </Component>
-                    <Component Id="NSSDBM3.CHK" DiskId="1" Guid="180E3A4B-00C9-44E5-A83C-85D28E406C67">
-                        <File Id="NSSDBM3.CHK" Name="nssdbm3.chk" Source="C:\Users\ksaff\Release\dist\xulrunner\nssdbm3.chk" />
-                    </Component>
-                    <Component Id="NSSDBM3.DLL" DiskId="1" Guid="9A5E5E55-FEA0-4369-831D-2772BA6414F2">
-                        <File Id="NSSDBM3.DLL" Name="nssdbm3.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\nssdbm3.dll" />
-                    </Component>
-                    <Component Id="OMNI.JA" DiskId="1" Guid="C6ECA699-2316-4A73-9BD1-253EB3DE58E7">
-                        <File Id="OMNI.JA" Name="omni.ja" Source="C:\Users\ksaff\Release\dist\xulrunner\omni.ja" />
-                    </Component>
-                    <Component Id="PLATFORM.INI" DiskId="1" Guid="02CB10B2-2BFE-423D-8C11-1731F0EF0E14">
-                        <File Id="PLATFORM.INI" Name="platform.ini" Source="C:\Users\ksaff\Release\dist\xulrunner\platform.ini" />
-                    </Component>
-                    <Component Id="PLUGIN_CONTAINER.EXE" DiskId="1" Guid="EE9052CA-C147-4F13-BD55-41EDC7E02CB4">
-                        <File Id="PLUGIN_CONTAINER.EXE" Name="plugin-container.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\plugin-container.exe" />
-                    </Component>
-                    <Component Id="PLUGIN_HANG_UI.EXE" DiskId="1" Guid="23BCA98D-8582-4DD3-978A-26FAE0379322">
-                        <File Id="PLUGIN_HANG_UI.EXE" Name="plugin-hang-ui.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\plugin-hang-ui.exe" />
-                    </Component>
-                    <Component Id="PRECOMPLETE" DiskId="1" Guid="CD3C06C6-3582-4505-A531-16B5D4949E77">
-                        <File Id="PRECOMPLETE" Name="precomplete" Source="C:\Users\ksaff\Release\dist\xulrunner\precomplete" />
-                    </Component>
-                    <Component Id="README.XULRUNNER" DiskId="1" Guid="CC592A34-0105-41DB-9700-8B33BF0C5B1A">
-                        <File Id="README.XULRUNNER" Name="README.xulrunner" Source="C:\Users\ksaff\Release\dist\xulrunner\README.xulrunner" />
-                    </Component>
-                    <Component Id="SANDBOXBROKER.DLL" DiskId="1" Guid="3AC6975D-6F23-49AB-91E3-383D2DBC786F">
-                        <File Id="SANDBOXBROKER.DLL" Name="sandboxbroker.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\sandboxbroker.dll" />
-                    </Component>
-                    <Component Id="SOFTOKN3.CHK" DiskId="1" Guid="3DE71749-B952-44B6-A3DB-19AE83C9F5D9">
-                        <File Id="SOFTOKN3.CHK" Name="softokn3.chk" Source="C:\Users\ksaff\Release\dist\xulrunner\softokn3.chk" />
-                    </Component>
-                    <Component Id="SOFTOKN3.DLL" DiskId="1" Guid="17840623-6253-4B6F-8CFA-27E203832BAB">
-                        <File Id="SOFTOKN3.DLL" Name="softokn3.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\softokn3.dll" />
-                    </Component>
-                    <Component Id="UPDATER.EXE" DiskId="1" Guid="79FC3A45-989E-4A7B-B5EC-5BB5B719B9C1">
-                        <File Id="UPDATER.EXE" Name="updater.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\updater.exe" />
-                    </Component>
-                    <Component Id="WOW_HELPER.EXE" DiskId="1" Guid="BEE2D86E-8A21-4697-A802-F0EC90C57097">
-                        <File Id="WOW_HELPER.EXE" Name="wow_helper.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\wow_helper.exe" />
-                    </Component>
-                    <Component Id="XUL.DLL" DiskId="1" Guid="3594F3B6-402A-4309-8816-1782E82B01C6">
-                        <File Id="XUL.DLL" Name="xul.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\xul.dll" />
-                    </Component>
-                    <Component Id="XULRUNNER.EXE" DiskId="1" Guid="4260A3F7-13B9-43C6-A90F-4432CA0F013D">
-                        <File Id="XULRUNNER.EXE" Name="xulrunner.exe" Source="C:\Users\ksaff\Release\dist\xulrunner\xulrunner.exe" />
-                    </Component>
-                    <Directory Id="DICTIONARIES" Name="dictionaries">
-                        <Component Id="EN_US.AFF" DiskId="1" Guid="BCE10C5E-D1EA-4343-AADB-36F958533097">
-                            <File Id="EN_US.AFF" Name="en-US.aff" Source="C:\Users\ksaff\Release\dist\xulrunner\dictionaries\en-US.aff" />
-                        </Component>
-                        <Component Id="EN_US.DIC" DiskId="1" Guid="C7B4E477-227A-4DA6-B37A-703EE4BAC8EA">
-                            <File Id="EN_US.DIC" Name="en-US.dic" Source="C:\Users\ksaff\Release\dist\xulrunner\dictionaries\en-US.dic" />
-                        </Component>
-                    </Directory>
-                    <Directory Id="GMP_CLEARKEY" Name="gmp-clearkey">
-                        <Directory Id="_0.1" Name="0.1">
-                            <Component Id="CLEARKEY.DLL" DiskId="1" Guid="5B2B3F58-FE75-417B-8ADC-04B5C42AFF14">
-                                <File Id="CLEARKEY.DLL" Name="clearkey.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-clearkey\0.1\clearkey.dll" />
-                            </Component>
-                            <Component Id="CLEARKEY.INFO" DiskId="1" Guid="427EDA2F-F068-4A8B-80A9-D0CF5CAF8EED">
-                                <File Id="CLEARKEY.INFO" Name="clearkey.info" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-clearkey\0.1\clearkey.info" />
-                            </Component>
-                        </Directory>
-                    </Directory>
-                    <Directory Id="GMP_FAKE" Name="gmp-fake">
-                        <Directory Id="_1.0" Name="1.0">
-                            <Component Id="FAKE.DLL" DiskId="1" Guid="93377F2A-B836-455E-95FE-25E0B0CFFB0D">
-                                <File Id="FAKE.DLL" Name="fake.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-fake\1.0\fake.dll" />
-                            </Component>
-                            <Component Id="FAKE.INFO" DiskId="1" Guid="80C657DB-F608-4064-AE08-B39DADDCF5D2">
-                                <File Id="FAKE.INFO" Name="fake.info" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-fake\1.0\fake.info" />
-                            </Component>
-                            <Component Id="FAKE.VOUCHER" DiskId="1" Guid="FDF91D13-50E7-425C-ACDE-B995C600EB40">
-                                <File Id="FAKE.VOUCHER" Name="fake.voucher" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-fake\1.0\fake.voucher" />
-                            </Component>
-                        </Directory>
-                    </Directory>
-                    <Directory Id="GMP_FAKEOPENH264" Name="gmp-fakeopenh264">
-                        <Directory Id="_1.0_1" Name="1.0">
-                            <Component Id="FAKEOPENH264.DLL" DiskId="1" Guid="46782E64-8952-4223-92FD-E0FBBAE9D412">
-                                <File Id="FAKEOPENH264.DLL" Name="fakeopenh264.dll" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-fakeopenh264\1.0\fakeopenh264.dll" />
-                            </Component>
-                            <Component Id="FAKEOPENH264.INFO" DiskId="1" Guid="113F03C3-C12B-43E2-91E7-A9A15DA832B5">
-                                <File Id="FAKEOPENH264.INFO" Name="fakeopenh264.info" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-fakeopenh264\1.0\fakeopenh264.info" />
-                            </Component>
-                            <Component Id="FAKEOPENH264.VOUCHER" DiskId="1" Guid="AE1526D1-E5FE-4E98-A3CC-3E76CED0DD48">
-                                <File Id="FAKEOPENH264.VOUCHER" Name="fakeopenh264.voucher" Source="C:\Users\ksaff\Release\dist\xulrunner\gmp-fakeopenh264\1.0\fakeopenh264.voucher" />
-                            </Component>
-                        </Directory>
-                    </Directory>
-                </Directory>
-            </Directory>
-            <Directory Id="DesktopFolder" />
-            <Directory Id="ProgramMenuFolder">
-                <Directory Id="ProgramMenuDir" Name="Creorga">
-                    <Component Id="StartMenuShortcuts" Guid="7B5F0821-B9F4-4553-A884-4E33A1D1FE48">
-                        <RemoveFolder Id="ProgramMenuDir" On="uninstall" />
-                        <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\[ProductName]" Type="string" Value="" />
-                        <Shortcut Id="UninstallProduct" Name="Désinstaller Creorga" Description="Déinstallation de Creorga" Target="[System64Folder]msiexec.exe" Arguments="/x [ProductCode]" />
-                        <util:InternetShortcut Id="WebsiteShortcut" Name="DKS Website" Target="http://www.dks.lu/products/creorga.html" />
-                    </Component>
-                </Directory>
-            </Directory>
-        </Directory>
-        </Directory>
-        <Feature Id="DefaultFeature" Title="Main Feature" Level="1">
-            <ComponentRef Id="APPLICATION.INI" />
-            <ComponentRef Id="CHROME.MANIFEST" />
-            <ComponentRef Id="CREORGA.EXE" />
-            <ComponentRef Id="CREORGA.JAR" />
-            <ComponentRef Id="VCREDIST_X86.EXE" />
-            <ComponentRef Id="_2016.SQL" />
-            <ComponentRef Id="_2017.SQL" />
-            <ComponentRef Id="_2018.SQL" />
-            <ComponentRef Id="CREORGA.JS" />
-            <ComponentRef Id="DEBUG.JS" />
-            <ComponentRef Id="PREFS.JS" />
-            <ComponentRef Id="CREORGA.SQLITE" />
-            <ComponentRef Id="ACCESSIBLEMARSHAL.DLL" />
-            <ComponentRef Id="BREAKPADINJECTOR.DLL" />
-            <ComponentRef Id="CRASHREPORTER.EXE" />
-            <ComponentRef Id="CRASHREPORTER.INI" />
-            <ComponentRef Id="D3DCOMPILER_43.DLL" />
-            <ComponentRef Id="D3DCOMPILER_47.DLL" />
-            <ComponentRef Id="DEPENDENTLIBS.LIST" />
-            <ComponentRef Id="FREEBL3.CHK" />
-            <ComponentRef Id="FREEBL3.DLL" />
-            <ComponentRef Id="IA2MARSHAL.DLL" />
-            <ComponentRef Id="ICUDT52.DLL" />
-            <ComponentRef Id="ICUIN52.DLL" />
-            <ComponentRef Id="ICUUC52.DLL" />
-            <ComponentRef Id="JS_GDB.PY" />
-            <ComponentRef Id="JS.EXE" />
-            <ComponentRef Id="LIBEGL.DLL" />
-            <ComponentRef Id="LIBGLESV2.DLL" />
-            <ComponentRef Id="LICENSE" />
-            <ComponentRef Id="MOZALLOC.DLL" />
-            <ComponentRef Id="MOZGLUE.DLL" />
-            <ComponentRef Id="MSVCP120.DLL" />
-            <ComponentRef Id="MSVCR120.DLL" />
-            <ComponentRef Id="NSS3.DLL" />
-            <ComponentRef Id="NSSCKBI.DLL" />
-            <ComponentRef Id="NSSDBM3.CHK" />
-            <ComponentRef Id="NSSDBM3.DLL" />
-            <ComponentRef Id="OMNI.JA" />
-            <ComponentRef Id="PLATFORM.INI" />
-            <ComponentRef Id="PLUGIN_CONTAINER.EXE" />
-            <ComponentRef Id="PLUGIN_HANG_UI.EXE" />
-            <ComponentRef Id="PRECOMPLETE" />
-            <ComponentRef Id="README.XULRUNNER" />
-            <ComponentRef Id="SANDBOXBROKER.DLL" />
-            <ComponentRef Id="SOFTOKN3.CHK" />
-            <ComponentRef Id="SOFTOKN3.DLL" />
-            <ComponentRef Id="UPDATER.EXE" />
-            <ComponentRef Id="WOW_HELPER.EXE" />
-            <ComponentRef Id="XUL.DLL" />
-            <ComponentRef Id="XULRUNNER.EXE" />
-            <ComponentRef Id="EN_US.AFF" />
-            <ComponentRef Id="EN_US.DIC" />
-            <ComponentRef Id="CLEARKEY.DLL" />
-            <ComponentRef Id="CLEARKEY.INFO" />
-            <ComponentRef Id="FAKE.DLL" />
-            <ComponentRef Id="FAKE.INFO" />
-            <ComponentRef Id="FAKE.VOUCHER" />
-            <ComponentRef Id="FAKEOPENH264.DLL" />
-            <ComponentRef Id="FAKEOPENH264.INFO" />
-            <ComponentRef Id="FAKEOPENH264.VOUCHER" />
-            <ComponentRef Id="StartMenuShortcuts" />
-        </Feature>
-        <UI />
-        <UIRef Id="WixUI_Minimal" />
-        <WixVariable Id="WixUILicenseRtf" Value="C:\Users\ksaff\Workspace\creorga\License.rtf" />
-        <WixVariable Id="WixUIBannerBmp" Value="C:\Users\ksaff\Workspace\creorga-devtools\install\windows\bannercreorga.bmp" />
-        <WixVariable Id="WixUIDialogBmp" Value="C:\Users\ksaff\Workspace\creorga-devtools\install\windows\wizcreorga1.bmp" />
-        <Icon Id="DesktopIcon.exe" SourceFile="C:\Users\ksaff\Release\dist\Creorga.exe" />
-        <Icon Id="StartMenuIcon.exe" SourceFile="C:\Users\ksaff\Release\dist\Creorga.exe" />
-    </Product>
-</Wix>
\ No newline at end of file
diff --git a/install/windows/creorga_setup.iss b/install/windows/creorga_setup.iss
deleted file mode 100644
index 5cfbb26..0000000
--- a/install/windows/creorga_setup.iss
+++ /dev/null
@@ -1,97 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.à r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Workspace\Creorga\install\windows\icons\creorga_setup.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
diff --git a/install/windows/creorga_setup_basic.iss b/install/windows/creorga_setup_basic.iss
deleted file mode 100644
index 112b841..0000000
--- a/install/windows/creorga_setup_basic.iss
+++ /dev/null
@@ -1,96 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.à r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Users\ksaff\Release\tag\app\chrome\icons\default\winmain.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
diff --git a/install/windows/creorga_setup_director.iss b/install/windows/creorga_setup_director.iss
index 4dd9f6e..2af2d1b 100644
--- a/install/windows/creorga_setup_director.iss
+++ b/install/windows/creorga_setup_director.iss
@@ -5,6 +5,7 @@
 #define MyAppPublisher "DKS s.à r.l."
 #define MyAppURL "http://www.dks.lu/products/creorga.html"
 #define MyAppExeName "Creorga.exe"
+
 ;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
 
 [Setup]
@@ -24,7 +25,7 @@ DisableDirPage=yes
 DefaultGroupName={#MyAppName}
 LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
+OutputBaseFilename=Setup_Creorga_{#MyAppVersion}_director
 SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
diff --git a/install/windows/creorga_setup_free.iss b/install/windows/creorga_setup_free.iss
deleted file mode 100644
index 19f0d24..0000000
--- a/install/windows/creorga_setup_free.iss
+++ /dev/null
@@ -1,98 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.à r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Users\ksaff\Release\tag\app\chrome\icons\default\winmain.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
diff --git a/install/windows/creorga_setup_localmanager.iss b/install/windows/creorga_setup_localmanager.iss
index a2169cd..022218e 100644
--- a/install/windows/creorga_setup_localmanager.iss
+++ b/install/windows/creorga_setup_localmanager.iss
@@ -24,7 +24,7 @@ DisableDirPage=yes
 DefaultGroupName={#MyAppName}
 LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
+OutputBaseFilename=Setup_Creorga_{#MyAppVersion}_localmanager
 SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
diff --git a/install/windows/creorga_setup_staff.iss b/install/windows/creorga_setup_staff.iss
index a2169cd..954fef4 100644
--- a/install/windows/creorga_setup_staff.iss
+++ b/install/windows/creorga_setup_staff.iss
@@ -24,7 +24,7 @@ DisableDirPage=yes
 DefaultGroupName={#MyAppName}
 LicenseFile=C:\Users\ksaff\Release\tag\License.txt
 OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
+OutputBaseFilename=Setup_Creorga_{#MyAppVersion}_staff
 SetupIconFile=C:\Users\ksaff\Release\tag\app_v3\chrome\icons\default\winmain.ico
 Compression=lzma
 SolidCompression=yes
diff --git a/install/windows/creorga_setup_standard.iss b/install/windows/creorga_setup_standard.iss
deleted file mode 100644
index 19f0d24..0000000
--- a/install/windows/creorga_setup_standard.iss
+++ /dev/null
@@ -1,98 +0,0 @@
-; Script generated by the Inno Setup Script Wizard.
-; SEE THE DOCUMENTATION FOR DETAILS ON CREATING INNO SETUP SCRIPT FILES!
-
-#define MyAppName "Creorga"
-#define MyAppPublisher "DKS s.à r.l."
-#define MyAppURL "http://www.dks.lu/products/creorga.html"
-#define MyAppExeName "Creorga.exe"
-;#define VCmsg "Installation de Microsoft Visual C++ Redistributable...."
-
-[Setup]
-; NOTE: The value of AppId uniquely identifies this application.
-; Do not use the same AppId value in installers for other applications.
-; (To generate a new GUID, click Tools | Generate GUID inside the IDE.)
-AppId={{31A01E9B-0999-4A24-8C69-B10F526961C7}
-AppName={#MyAppName}
-AppVersion={#MyAppVersion}
-;AppVerName={#MyAppName} {#MyAppVersion}
-AppPublisher={#MyAppPublisher}
-AppPublisherURL={#MyAppURL}
-AppSupportURL={#MyAppURL}
-AppUpdatesURL={#MyAppURL}
-DefaultDirName={pf}\{#MyAppName}
-DisableDirPage=yes
-DefaultGroupName={#MyAppName}
-LicenseFile=C:\Users\ksaff\Release\tag\License.txt
-OutputDir=C:\Users\ksaff\Release
-OutputBaseFilename=Setup_Creorga_{#MyAppVersion}
-SetupIconFile=C:\Users\ksaff\Release\tag\app\chrome\icons\default\winmain.ico
-Compression=lzma
-SolidCompression=yes
-WizardImageFile=wizcreorga.bmp
-WizardSmallImageFile=wizcreorgasmall.bmp
-;CloseApplications=force
-
-[Languages]
-Name: "french"; MessagesFile: "compiler:Languages\French.isl"
-
-[Tasks]
-Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
-
-[Files]
-Source: "C:\Users\ksaff\Release\dist\Creorga.exe"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\Tools\*"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\xulrunner\*"; DestDir: "{app}\xulrunner"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\application.ini"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\chrome.manifest"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\creorga.jar"; DestDir: "{app}"; Flags: overwritereadonly ignoreversion
-Source: "C:\Users\ksaff\Release\dist\defaults\*"; DestDir: "{app}\defaults"; Flags: overwritereadonly ignoreversion recursesubdirs createallsubdirs
-Source: "C:\Users\ksaff\Release\dist\checkschema.txt"; DestDir: "{userappdata}\Creorga\Profiles"; Flags: overwritereadonly ignoreversion 
-;Source: "C:\Users\ksaff\Release\dist\vcredist_x86.exe"; DestDir: "{app}\Tools"; Flags: overwritereadonly ignoreversion
-; NOTE: Don't use "Flags: ignoreversion" on any shared system files
-
-[Icons]
-Name: "{group}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"
-Name: "{group}\{cm:ProgramOnTheWeb,{#MyAppName}}"; Filename: "{#MyAppURL}"
-Name: "{group}\{cm:UninstallProgram,{#MyAppName}}"; Filename: "{uninstallexe}"
-Name: "{commondesktop}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"; Tasks: desktopicon
-
-[Run]
-;Filename: "{app}\Tools\vcredist_x86.exe"; Parameters:"/q /passive /verysilent /norestart /q:a /c:""msiexec /i vcredist.msi /qn""" ;Check: VCRedistNeedsInstall; WorkingDir: {app}\Tools; StatusMsg: Installation Microsoft Visual C++ Redistributable ...;
-;Filename: {tmp}\vcredist_x86.exe; Parameters: "/q /passive /Q:a /c:""msiexec /q /i vcredist.msi"" "; 
-;Filename: "{app}\bin\vcredist_x86.exe"; Parameters: "/q /norestart /q:a /c:""VCREDI~3.EXE /q:a /c:""""msiexec /i vcredist.msi /qn"""" """; Check: VCRedistNeedsInstall; WorkingDir: {app}\bin;
-Filename: "{app}\{#MyAppExeName}"; Description: "{cm:LaunchProgram,{#StringChange(MyAppName, '&', '&&')}}"; Flags: nowait postinstall skipifsilent
-
-;[Code]
-;#IFDEF UNICODE
-;  #DEFINE AW "W"
-;#ELSE
-;  #DEFINE AW "A"
-;#ENDIF
-;type
-;    INSTALLSTATE = Longint;
-;const
-;    INSTALLSTATE_INVALIDARG = -2;  // An invalid parameter was passed to the function.
-;    INSTALLSTATE_UNKNOWN = -1;     // The product is neither advertised or installed.
-;    INSTALLSTATE_ADVERTISED = 1;   // The product is advertised but not installed.
-;    INSTALLSTATE_ABSENT = 2;       // The product is installed for a different user.
-;    INSTALLSTATE_DEFAULT = 5;      // The product is installed for the current user.
-
-;// Visual C++ 2015 Redistributable 14.0.23026
-;  VC_2015_REDIST_X86_MIN = '{A2563E55-3BEC-3828-8D67-E5E8B9E8B675}';
-;  VC_2015_REDIST_X64_MIN = '{0D3E9E15-DE7A-300B-96F1-B4AF12B96488}';
-
-;  VC_2015_REDIST_X86_ADD = '{BE960C1C-7BAD-3DE6-8B1A-2616FE532845}';
-;  VC_2015_REDIST_X64_ADD = '{BC958BD2-5DAC-3862-BB1A-C1BE0790438D}';
-
-;function MsiQueryProductState(szProduct: string): INSTALLSTATE;
-;    external 'MsiQueryProductState{#AW}@msi.dll stdcall';
-
-;function VCVersionInstalled(const ProductID: string): Boolean;
-;begin
-;    Result := MsiQueryProductState(ProductID) = INSTALLSTATE_DEFAULT;
-;end;
-
-;function VCRedistNeedsInstall: Boolean;
-;begin
-;    Result := not (VCVersionInstalled(VC_2015_REDIST_X86_MIN) or VCVersionInstalled(VC_2015_REDIST_X86_ADD));
-;end;
-- 
2.39.5