From 56d522059f0615d444970392b2f73fef5a870a7d Mon Sep 17 00:00:00 2001
From: Andreas Abraham <aabraham@iaik.tugraz.at>
Date: Fri, 23 Mar 2018 17:54:13 +0100
Subject: small changes

---
 installer/windows/PDF-Over-signed.aip              | 72 ++++++++++++++--------
 pdf-over-gui/src/main/resources/izpack/install.xml |  5 +-
 2 files changed, 47 insertions(+), 30 deletions(-)

diff --git a/installer/windows/PDF-Over-signed.aip b/installer/windows/PDF-Over-signed.aip
index 7080e2be..5d464cd8 100644
--- a/installer/windows/PDF-Over-signed.aip
+++ b/installer/windows/PDF-Over-signed.aip
@@ -26,27 +26,41 @@
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiDirsComponent">
     <ROW Directory="APPDIR" Directory_Parent="TARGETDIR" DefaultDir="APPDIR:." IsPseudoRoot="1"/>
+    <ROW Directory="AppDataFolder" Directory_Parent="TARGETDIR" DefaultDir="AppDat~1|AppDataFolder" IsPseudoRoot="1"/>
+    <ROW Directory="DesktopFolder" Directory_Parent="TARGETDIR" DefaultDir="Deskto~1|DesktopFolder" IsPseudoRoot="1"/>
     <ROW Directory="SHORTCUTDIR" Directory_Parent="TARGETDIR" DefaultDir="SHORTC~1|SHORTCUTDIR" IsPseudoRoot="1"/>
+    <ROW Directory="StartMenuFolder" Directory_Parent="TARGETDIR" DefaultDir="StartM~1|StartMenuFolder" IsPseudoRoot="1"/>
     <ROW Directory="TARGETDIR" DefaultDir="SourceDir"/>
-    <ROW Directory="icons_Dir" Directory_Parent="APPDIR" DefaultDir="icons"/>
-    <ROW Directory="lib_Dir" Directory_Parent="APPDIR" DefaultDir="lib"/>
-    <ROW Directory="libswt_Dir" Directory_Parent="APPDIR" DefaultDir="lib-swt"/>
-    <ROW Directory="scripts_Dir" Directory_Parent="APPDIR" DefaultDir="scripts"/>
+    <ROW Directory="Uninstaller_Dir" Directory_Parent="AppDataFolder" DefaultDir="Uninst~1|Uninstaller"/>
+    <ROW Directory="icons_Dir" Directory_Parent="AppDataFolder" DefaultDir="icons"/>
+    <ROW Directory="lib_Dir" Directory_Parent="AppDataFolder" DefaultDir="lib"/>
+    <ROW Directory="libswt_Dir" Directory_Parent="AppDataFolder" DefaultDir="lib-swt"/>
+    <ROW Directory="scripts_Dir" Directory_Parent="AppDataFolder" DefaultDir="scripts"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiCompsComponent">
     <ROW Component="AIShRegAnswer" ComponentId="{19C5B0EB-63C2-4BE4-B2C8-B5EFC6393279}" Directory_="APPDIR" Attributes="4" KeyPath="AIShRegAnswer"/>
+    <ROW Component="PDFOver.exe" ComponentId="{E63A499D-82F0-4410-B7B9-B349E1BA27DD}" Directory_="AppDataFolder" Attributes="0" KeyPath="PDFOver.exe"/>
+    <ROW Component="PDFOvercli.exe" ComponentId="{337509DC-872F-42CA-8658-2B67A06B0E5E}" Directory_="AppDataFolder" Attributes="0" KeyPath="PDFOvercli.exe"/>
     <ROW Component="ProductInformation" ComponentId="{8126D538-2928-475F-8DBB-9BFB1EB29D9F}" Directory_="APPDIR" Attributes="4" KeyPath="Version"/>
-    <ROW Component="activation1.1.1.jar" ComponentId="{5A3CCF53-8D57-4335-94FD-A6997BE6C938}" Directory_="lib_Dir" Attributes="0" KeyPath="activation1.1.1.jar" Type="0"/>
-    <ROW Component="icon.icns" ComponentId="{6AF4C48A-67F2-4834-B92A-3BD385330513}" Directory_="icons_Dir" Attributes="0" KeyPath="icon.icns" Type="0"/>
-    <ROW Component="pdfover_linux.sh" ComponentId="{E0008BB3-9A30-4864-8AEA-6DA6AF4082CB}" Directory_="scripts_Dir" Attributes="0" KeyPath="postInstall_win.bat" Type="0"/>
-    <ROW Component="swtwindows32.jar" ComponentId="{7BE75155-5A2F-4D98-B5C9-A70B144C37EB}" Directory_="libswt_Dir" Attributes="0" KeyPath="swtwindows32.jar" Type="0"/>
+    <ROW Component="Uninstaller.exe" ComponentId="{D20DBA73-1FDC-4590-834F-9FB0BE35F589}" Directory_="Uninstaller_Dir" Attributes="0" KeyPath="Uninstaller.exe"/>
+    <ROW Component="activation1.1.1.jar" ComponentId="{CF49334B-2EA6-41AF-A492-FD8719720375}" Directory_="lib_Dir" Attributes="0" KeyPath="activation1.1.1.jar" Type="0"/>
+    <ROW Component="icon.icns" ComponentId="{93D14003-CABA-4D9F-9BC6-7F097F514EF8}" Directory_="icons_Dir" Attributes="0" KeyPath="icon.icns" Type="0"/>
+    <ROW Component="installationinformation" ComponentId="{FB5470AC-FE55-445A-8C6E-633071E45296}" Directory_="AppDataFolder" Attributes="0" KeyPath="installationinformation" Type="0"/>
+    <ROW Component="pdfover_linux.sh" ComponentId="{95DBCF00-A7D0-4462-BF30-272308A63AE7}" Directory_="scripts_Dir" Attributes="0" KeyPath="pdfover_linux.sh" Type="0"/>
+    <ROW Component="pdfover_win.bat" ComponentId="{736C240F-0BB6-44AB-9AF9-4E360F857F06}" Directory_="scripts_Dir" Attributes="0" KeyPath="pdfover_win.bat"/>
+    <ROW Component="swtwindows32.jar" ComponentId="{B8E9F214-1975-46E3-BD6F-3ACF3E5ACB64}" Directory_="libswt_Dir" Attributes="0" KeyPath="swtwindows32.jar" Type="0"/>
+    <ROW Component="uninstaller.jar" ComponentId="{5EF44DC7-7DC8-4776-9628-E82604C3ED60}" Directory_="Uninstaller_Dir" Attributes="0" KeyPath="uninstaller.jar" Type="0"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFeatsComponent">
-    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer ProductInformation activation1.1.1.jar icon.icns pdfover_linux.sh swtwindows32.jar"/>
+    <ROW Feature="MainFeature" Title="MainFeature" Description="Description" Display="1" Level="1" Directory_="APPDIR" Attributes="0" Components="AIShRegAnswer PDFOver.exe PDFOvercli.exe ProductInformation Uninstaller.exe activation1.1.1.jar icon.icns installationinformation pdfover_linux.sh pdfover_win.bat swtwindows32.jar uninstaller.jar"/>
     <ATTRIBUTE name="CurrentFeature" value="MainFeature"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiFilesComponent">
     <ROW File="FastInfoset1.2.13.jar" Component_="activation1.1.1.jar" FileName="FastIn~1.jar|FastInfoset-1.2.13.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\FastInfoset-1.2.13.jar" SelfReg="false" NextFile="fontbox1.8.11.jar"/>
+    <ROW File="PDFOver.exe" Component_="PDFOver.exe" FileName="PDF-Over.exe" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\PDF-Over.exe" SelfReg="false" NextFile="PDFOvercli.exe" DigSign="true"/>
+    <ROW File="PDFOvercli.exe" Component_="PDFOvercli.exe" FileName="PDF-Ov~1.exe|PDF-Over-cli.exe" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\PDF-Over-cli.exe" SelfReg="false" NextFile="ReadMe.txt" DigSign="true"/>
+    <ROW File="ReadMe.txt" Component_="installationinformation" FileName="ReadMe.txt" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\ReadMe.txt" SelfReg="false"/>
+    <ROW File="Uninstaller.exe" Component_="Uninstaller.exe" FileName="Uninst~1.exe|Uninstaller.exe" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\Uninstaller\Uninstaller.exe" SelfReg="false" NextFile="uninstaller.jar" DigSign="true"/>
     <ROW File="activation1.1.1.jar" Component_="activation1.1.1.jar" FileName="activa~1.jar|activation-1.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\activation-1.1.1.jar" SelfReg="false" NextFile="commonscodec1.6.jar"/>
     <ROW File="commonscodec1.6.jar" Component_="activation1.1.1.jar" FileName="common~1.jar|commons-codec-1.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-codec-1.6.jar" SelfReg="false" NextFile="commonscollections3.2.2.jar"/>
     <ROW File="commonscollections3.2.2.jar" Component_="activation1.1.1.jar" FileName="common~2.jar|commons-collections-3.2.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\commons-collections-3.2.2.jar" SelfReg="false" NextFile="commonscollections44.1.jar"/>
@@ -66,13 +80,14 @@
     <ROW File="iaik_jce_full_signed5.5.jar" Component_="activation1.1.1.jar" FileName="iaik_j~1.jar|iaik_jce_full_signed-5.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\iaik_jce_full_signed-5.5.jar" SelfReg="false" NextFile="istackcommonsruntime3.0.5.jar"/>
     <ROW File="icon.icns" Component_="icon.icns" FileName="icon~1.icn|icon.icns" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.icns" SelfReg="false" NextFile="icon.ico"/>
     <ROW File="icon.ico" Component_="icon.icns" FileName="icon.ico" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.ico" SelfReg="false" NextFile="icon.png"/>
-    <ROW File="icon.png" Component_="icon.icns" FileName="icon.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.png" SelfReg="false" NextFile="icon16x16.png"/>
-    <ROW File="icon144x144.png" Component_="icon.icns" FileName="icon14~1.png|icon144x144.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon144x144.png" SelfReg="false"/>
+    <ROW File="icon.png" Component_="icon.icns" FileName="icon.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.png" SelfReg="false" NextFile="icon144x144.png"/>
+    <ROW File="icon144x144.png" Component_="icon.icns" FileName="icon14~1.png|icon144x144.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon144x144.png" SelfReg="false" NextFile="icon16x16.png"/>
     <ROW File="icon16x16.png" Component_="icon.icns" FileName="icon16~1.png|icon16x16.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon16x16.png" SelfReg="false" NextFile="icon24x24.png"/>
     <ROW File="icon24x24.png" Component_="icon.icns" FileName="icon24~1.png|icon24x24.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon24x24.png" SelfReg="false" NextFile="icon32x32.png"/>
     <ROW File="icon32x32.png" Component_="icon.icns" FileName="icon32~1.png|icon32x32.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon32x32.png" SelfReg="false" NextFile="icon48x48.png"/>
     <ROW File="icon48x48.png" Component_="icon.icns" FileName="icon48~1.png|icon48x48.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon48x48.png" SelfReg="false" NextFile="icon96x96.png"/>
-    <ROW File="icon96x96.png" Component_="icon.icns" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="icon144x144.png"/>
+    <ROW File="icon96x96.png" Component_="icon.icns" FileName="icon96~1.png|icon96x96.png" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon96x96.png" SelfReg="false" NextFile="activation1.1.1.jar"/>
+    <ROW File="installationinformation" Component_="installationinformation" FileName="instal~1|.installationinformation" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\.installationinformation" SelfReg="false" NextFile="PDFOver.exe"/>
     <ROW File="istackcommonsruntime3.0.5.jar" Component_="activation1.1.1.jar" FileName="istack~1.jar|istack-commons-runtime-3.0.5.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\istack-commons-runtime-3.0.5.jar" SelfReg="false" NextFile="javase3.2.0.jar"/>
     <ROW File="javase3.2.0.jar" Component_="activation1.1.1.jar" FileName="javase~1.jar|javase-3.2.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javase-3.2.0.jar" SelfReg="false" NextFile="javassist3.11.0.GA.jar"/>
     <ROW File="javassist3.11.0.GA.jar" Component_="activation1.1.1.jar" FileName="javass~1.jar|javassist-3.11.0.GA.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\javassist-3.11.0.GA.jar" SelfReg="false" NextFile="jaxbapi2.3.0.jar"/>
@@ -87,19 +102,19 @@
     <ROW File="ognl3.0.8.jar" Component_="activation1.1.1.jar" FileName="ognl-3~1.jar|ognl-3.0.8.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\ognl-3.0.8.jar" SelfReg="false" NextFile="pdfascommon4.1.1.jar"/>
     <ROW File="pdfascommon4.1.1.jar" Component_="activation1.1.1.jar" FileName="pdf-as~1.jar|pdf-as-common-4.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-common-4.1.1.jar" SelfReg="false" NextFile="pdfaslib4.1.1.jar"/>
     <ROW File="pdfaslib4.1.1.jar" Component_="activation1.1.1.jar" FileName="pdf-as~2.jar|pdf-as-lib-4.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-lib-4.1.1.jar" SelfReg="false" NextFile="pdfaspdfbox4.1.1.jar"/>
-    <ROW File="pdfaspdfbox4.1.1.jar" Component_="activation1.1.1.jar" FileName="pdf-as~3.jar|pdf-as-pdfbox-4.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-4.1.1.jar" SelfReg="false" NextFile="pdfovergui4.1.17SNAPSHOT.jar"/>
+    <ROW File="pdfaspdfbox4.1.1.jar" Component_="activation1.1.1.jar" FileName="pdf-as~3.jar|pdf-as-pdfbox-4.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-as-pdfbox-4.1.1.jar" SelfReg="false" NextFile="pdfovergui4.1.17.jar"/>
     <ROW File="pdfbox1.8.11.jar" Component_="activation1.1.1.jar" FileName="pdfbox~1.jar|pdfbox-1.8.11.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfbox-1.8.11.jar" SelfReg="false" NextFile="pdfview0.9.3CyBot.jar"/>
     <ROW File="pdfover_linux.sh" Component_="pdfover_linux.sh" FileName="pdf-ov~1.sh|pdf-over_linux.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_linux.sh" SelfReg="false" NextFile="pdfover_mac.sh"/>
-    <ROW File="pdfover_mac.sh" Component_="pdfover_linux.sh" FileName="pdf-ov~2.sh|pdf-over_mac.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_mac.sh" SelfReg="false" NextFile="postInstall_linux.sh"/>
-    <ROW File="pdfover_win.bat" Component_="pdfover_linux.sh" FileName="pdf-ov~1.bat|pdf-over_win.bat" Attributes="0" SourcePath="..\..\pdf-over-gui\src\main\resources\scripts\pdf-over_win.bat" SelfReg="false" NextFile="activation1.1.1.jar"/>
-    <ROW File="pdfovergui4.1.17SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="pdfoverinstallhelper1.0.0.jar"/>
-    <ROW File="pdfoverinstallhelper1.0.0.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~2.jar|pdf-over-install-helper-1.0.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-install-helper-1.0.0.jar" SelfReg="false" NextFile="pdfoversignator4.1.17SNAPSHOT.jar"/>
-    <ROW File="pdfoversignator4.1.17SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~3.jar|pdf-over-signator-4.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="pdfoversigpdfas44.1.17SNAPSHOT.jar"/>
-    <ROW File="pdfoversigpdfas44.1.17SNAPSHOT.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~4.jar|pdf-over-sigpdfas4-4.1.17-SNAPSHOT.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.1.17-SNAPSHOT.jar" SelfReg="false" NextFile="pdfbox1.8.11.jar"/>
+    <ROW File="pdfover_mac.sh" Component_="pdfover_linux.sh" FileName="pdf-ov~2.sh|pdf-over_mac.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_mac.sh" SelfReg="false" NextFile="pdfover_win.bat"/>
+    <ROW File="pdfover_win.bat" Component_="pdfover_win.bat" FileName="pdf-ov~1.bat|pdf-over_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\pdf-over_win.bat" SelfReg="false" NextFile="postInstall_linux.sh"/>
+    <ROW File="pdfovergui4.1.17.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~1.jar|pdf-over-gui-4.1.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-gui-4.1.17.jar" SelfReg="false" NextFile="pdfoverinstallhelper1.0.0.jar"/>
+    <ROW File="pdfoverinstallhelper1.0.0.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~2.jar|pdf-over-install-helper-1.0.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-install-helper-1.0.0.jar" SelfReg="false" NextFile="pdfoversignator4.1.17.jar"/>
+    <ROW File="pdfoversignator4.1.17.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~3.jar|pdf-over-signator-4.1.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-signator-4.1.17.jar" SelfReg="false" NextFile="pdfoversigpdfas44.1.17.jar"/>
+    <ROW File="pdfoversigpdfas44.1.17.jar" Component_="activation1.1.1.jar" FileName="pdf-ov~4.jar|pdf-over-sigpdfas4-4.1.17.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdf-over-sigpdfas4-4.1.17.jar" SelfReg="false" NextFile="pdfbox1.8.11.jar"/>
     <ROW File="pdfview0.9.3CyBot.jar" Component_="activation1.1.1.jar" FileName="pdfvie~1.jar|pdfview-0.9.3-CyBot.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\pdfview-0.9.3-CyBot.jar" SelfReg="false" NextFile="sigspades4.1.1.jar"/>
     <ROW File="postInstall_linux.sh" Component_="pdfover_linux.sh" FileName="postIn~1.sh|postInstall_linux.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\postInstall_linux.sh" SelfReg="false" NextFile="postinstall_mac.sh"/>
-    <ROW File="postInstall_win.bat" Component_="pdfover_linux.sh" FileName="postIn~1.bat|postInstall_win.bat" Attributes="0" SourcePath="..\..\pdf-over-gui\src\main\resources\scripts\postInstall_win.bat" SelfReg="false" NextFile="pdfover_win.bat"/>
-    <ROW File="postinstall_mac.sh" Component_="pdfover_linux.sh" FileName="postin~2.sh|postinstall_mac.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\postinstall_mac.sh" SelfReg="false" NextFile="uninstall_linux.sh"/>
+    <ROW File="postInstall_win.bat" Component_="pdfover_linux.sh" FileName="postIn~1.bat|postInstall_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\postInstall_win.bat" SelfReg="false" NextFile="uninstall_linux.sh"/>
+    <ROW File="postinstall_mac.sh" Component_="pdfover_linux.sh" FileName="postin~2.sh|postinstall_mac.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\postinstall_mac.sh" SelfReg="false" NextFile="postInstall_win.bat"/>
     <ROW File="sigspades4.1.1.jar" Component_="activation1.1.1.jar" FileName="sigs-p~1.jar|sigs-pades-4.1.1.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\sigs-pades-4.1.1.jar" SelfReg="false" NextFile="slf4japi1.6.6.jar"/>
     <ROW File="slf4japi1.6.6.jar" Component_="activation1.1.1.jar" FileName="slf4j-~1.jar|slf4j-api-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-api-1.6.6.jar" SelfReg="false" NextFile="slf4jlog4j121.6.6.jar"/>
     <ROW File="slf4jlog4j121.6.6.jar" Component_="activation1.1.1.jar" FileName="slf4j-~2.jar|slf4j-log4j12-1.6.6.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\slf4j-log4j12-1.6.6.jar" SelfReg="false" NextFile="staxex1.7.8.jar"/>
@@ -108,11 +123,12 @@
     <ROW File="swtwindows64.jar" Component_="swtwindows32.jar" FileName="swt-wi~2.jar|swt-windows-64.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib-swt\swt-windows-64.jar" SelfReg="false" NextFile="pdfover_linux.sh"/>
     <ROW File="txw22.3.0.jar" Component_="activation1.1.1.jar" FileName="txw2-2~1.jar|txw2-2.3.0.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\txw2-2.3.0.jar" SelfReg="false" NextFile="xmpcore5.1.2.jar"/>
     <ROW File="uninstall_linux.sh" Component_="pdfover_linux.sh" FileName="uninst~1.sh|uninstall_linux.sh" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\uninstall_linux.sh" SelfReg="false" NextFile="uninstall_win.bat"/>
-    <ROW File="uninstall_win.bat" Component_="pdfover_linux.sh" FileName="uninst~1.bat|uninstall_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\uninstall_win.bat" SelfReg="false" NextFile="icon.icns"/>
+    <ROW File="uninstall_win.bat" Component_="pdfover_linux.sh" FileName="uninst~1.bat|uninstall_win.bat" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\scripts\uninstall_win.bat" SelfReg="false" NextFile="Uninstaller.exe"/>
+    <ROW File="uninstaller.jar" Component_="uninstaller.jar" FileName="uninst~1.jar|uninstaller.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\Uninstaller\uninstaller.jar" SelfReg="false" NextFile="installationinformation"/>
     <ROW File="xmpcore5.1.2.jar" Component_="activation1.1.1.jar" FileName="xmpcor~1.jar|xmpcore-5.1.2.jar" Attributes="0" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\lib\xmpcore-5.1.2.jar" SelfReg="false" NextFile="swtwindows32.jar"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" UseLargeSchema="true"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="0" Languages="en;de" LangOpt="1" InstallationType="4" PackageType="1" UseLargeSchema="true"/>
     <ATTRIBUTE name="CurrentBuild" value="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DictionaryComponent">
@@ -199,7 +215,6 @@
     <ROW Action="SET_APPDIR" Type="307" Source="APPDIR" Target="[ProgramFilesFolder][Manufacturer]\[ProductName]" MultiBuildTarget="DefaultBuild:[ProgramFilesFolder][ProductName]"/>
     <ROW Action="SET_SHORTCUTDIR" Type="307" Source="SHORTCUTDIR" Target="[ProgramMenuFolder][ProductName]"/>
     <ROW Action="SET_TARGETDIR_TO_APPDIR" Type="51" Source="TARGETDIR" Target="[APPDIR]"/>
-    <ROW Action="postInstall_win.bat" Type="82" Source="postInstall_win.bat"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiIconsComponent">
     <ROW Name="icon.exe" SourcePath="..\..\..\..\AppData\Roaming\PDF-Over\icons\icon.ico" Index="0"/>
@@ -213,9 +228,8 @@
     <ROW Action="AI_ResolveLocalizedCredentials" Sequence="51"/>
     <ROW Action="AI_SETMIXINSTLOCATION" Sequence="748"/>
     <ROW Action="AI_DELETE_SHORTCUTS" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="1401"/>
-    <ROW Action="AI_DEL_EMPTY_SHORTCUTDIR" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6403"/>
-    <ROW Action="AI_DATA_SETTER" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6402"/>
-    <ROW Action="postInstall_win.bat" Condition="( ( NOT Installed ) OR ( Installed AND REMOVE &lt;&gt; &quot;ALL&quot; AND AI_INSTALL_MODE &lt;&gt; &quot;Remove&quot; ) )" Sequence="6401"/>
+    <ROW Action="AI_DEL_EMPTY_SHORTCUTDIR" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6402"/>
+    <ROW Action="AI_DATA_SETTER" Condition="NOT (REMOVE=&quot;ALL&quot;)" Sequence="6401"/>
     <ROW Action="AI_DetectJRE" Condition="1" Sequence="399" Builds="DefaultBuild"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiInstallUISequenceComponent">
@@ -238,6 +252,10 @@
     <ROW Registry="Path" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Path" Value="[APPDIR]" Component_="ProductInformation"/>
     <ROW Registry="Version" Root="-1" Key="Software\[Manufacturer]\[ProductName]" Name="Version" Value="[ProductVersion]" Component_="ProductInformation"/>
   </COMPONENT>
+  <COMPONENT cid="caphyon.advinst.msicomp.MsiShortsComponent">
+    <ROW Shortcut="PDFOver" Directory_="StartMenuFolder" Name="PDF-Over" Component_="pdfover_win.bat" Target="[#pdfover_win.bat]" Description="PDF-Over 4.1" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1" WkDir="StartMenuFolder"/>
+    <ROW Shortcut="PDFOver_1" Directory_="DesktopFolder" Name="PDF-Over" Component_="pdfover_win.bat" Target="[#pdfover_win.bat]" Description="PDF-Over 4.1" Hotkey="0" Icon_="icon.exe" IconIndex="0" ShowCmd="1" WkDir="DesktopFolder"/>
+  </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.MsiThemeComponent">
     <ATTRIBUTE name="UsedTheme" value="classic"/>
   </COMPONENT>
diff --git a/pdf-over-gui/src/main/resources/izpack/install.xml b/pdf-over-gui/src/main/resources/izpack/install.xml
index 03f6a56f..0fa038a2 100644
--- a/pdf-over-gui/src/main/resources/izpack/install.xml
+++ b/pdf-over-gui/src/main/resources/izpack/install.xml
@@ -64,10 +64,9 @@
 			<file src="scripts" targetdir="$INSTALL_PATH" />
 			<file src="icons" targetdir="$INSTALL_PATH" />
 			<file src="ReadMe.txt" targetdir="$INSTALL_PATH" />
-<!-- 			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/> -->
-<!-- 			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/> -->
+			<file src="PDF-Over.exe" targetdir="$INSTALL_PATH" os="windows"/>
+			<file src="PDF-Over-cli.exe" targetdir="$INSTALL_PATH" os="windows"/>
 			<file src="Uninstaller.exe" targetdir="$INSTALL_PATH/Uninstaller" os="windows"/>
-<!--             <file src="pdf-over-install-helper-1.0.0.jar" targetdir="$INSTALL_PATH/libs" /> -->
             <executable targetfile="$INSTALL_PATH/scripts/pdf-over_linux.sh"
 				os="unix" stage="never"></executable>
 			<executable targetfile="$INSTALL_PATH/scripts/uninstall_linux.sh"
-- 
cgit v1.2.3