Index: DamClients/DamUI/trunk/Dam.Setup/ApplicationDefines.wxi
===================================================================
diff -u -r6704 -r6706
--- DamClients/DamUI/trunk/Dam.Setup/ApplicationDefines.wxi	(.../ApplicationDefines.wxi)	(revision 6704)
+++ DamClients/DamUI/trunk/Dam.Setup/ApplicationDefines.wxi	(.../ApplicationDefines.wxi)	(revision 6706)
@@ -6,7 +6,8 @@
     <?define ProductExtension=".damx"?>
     <?define ProductDescription="Analysis and management of flood defence systems"?>
     <?define ProductManualTitle="DAM UI - User manual"?>
-  
+    
+    <!-- Derived definitions needed for side-by-side installation -->
     <?define ProductNameWithVersion= "$(var.ProductName) $(var.ProductVersion)"?>
     <?define ProductIdWithVersion= "$(var.ProductId)_$(var.ProductVersion)"?>
 
Index: DamClients/DamUI/trunk/Dam.Setup/Product.wxs
===================================================================
diff -u -r6704 -r6706
--- DamClients/DamUI/trunk/Dam.Setup/Product.wxs	(.../Product.wxs)	(revision 6704)
+++ DamClients/DamUI/trunk/Dam.Setup/Product.wxs	(.../Product.wxs)	(revision 6706)
@@ -23,13 +23,15 @@
                       Type="raw" />
     </Property>
 
-    <!-- Add the launch condition for the check on Ds_Flex version (>= MinimumDsFlexVersion) -->
-    <Launch Message="There is a problem. The Ds_Flex Files are missing or too old (Found [DSFLEXVERSION] is smaller than required $(var.MinimumDsFlexVersion)). A new version must be installed before we can install [ProductName]."
-            Condition="Installed OR (DSFLEXVERSION >= &quot;$(var.MinimumDsFlexVersion)&quot;)" />
-
     <!-- Add the launch condition for the check on Common Files version (>= MinimumCommonFilesVersion) -->
     <Launch Message="There is a problem. The Common Files Files are missing or too old (Found [COMMONFILESVERSION] is smaller than required $(var.MinimumCommonFilesVersion)). A new version must be installed before we can install [ProductName].>"
             Condition="Installed OR (COMMONFILESVERSION >= &quot;$(var.MinimumCommonFilesVersion)&quot;)" />
+
+    <!-- Add the launch condition for the check on Ds_Flex version (>= MinimumDsFlexVersion) -->
+    <!-- This launch condition should not be needed when the common files are installed properly  -->
+    <!-- but we keep it for when DAM or other programs do not (or no longer) need the common files  -->
+    <Launch Message="There is a problem. The Ds_Flex Files are missing or too old (Found [DSFLEXVERSION] is smaller than required $(var.MinimumDsFlexVersion)). A new version must be installed before we can install [ProductName]."
+            Condition="Installed OR (DSFLEXVERSION >= &quot;$(var.MinimumDsFlexVersion)&quot;)" />
     
     <!-- Specify the required product components -->
     <!-- Program and manual -->
@@ -67,6 +69,7 @@
     <Feature Id="ProductFeature" Title="$(var.ProductIdWithVersion).Setup" Level="1">
       <ComponentGroupRef Id="ProductComponent" />
       <ComponentGroupRef Id="TutorialFilesComponent" />
+      <ComponentRef Id="DesktopShortcut" />
       <ComponentRef Id="ApplicationShortcut" />
       <ComponentRef Id="ManualShortcut" />
       <ComponentRef Id="UninstallShortcut" />
@@ -89,32 +92,39 @@
 
   <!-- define directory structure -->
   <Fragment>
+      <!-- desktop shortcut -->
+      <StandardDirectory Id="DesktopFolder">
+        <Directory Id="DesktopFolderDeltares" Name="Desktop" />
+      </StandardDirectory>  
+      
       <!-- installation folder -->
       <StandardDirectory Id="ProgramFilesFolder">
         <Directory Id="ProgramFilesDeltares" Name="Deltares">
           <Directory Id="INSTALLFOLDER" Name="$(var.ProductIdWithVersion)" />
             <Directory Id="MANUALFOLDER" Name="Manual" />
         </Directory>
       </StandardDirectory>
+    
       <!-- Start menu folder -->
       <StandardDirectory Id="ProgramMenuFolder">
         <Directory Id="ProgramMenuDeltares" Name="$(var.ProductNameWithVersion)">
           <Directory Id="ProgramMenuShortcut" Name="$(var.ProductNameWithVersion)" />
         </Directory>
       </StandardDirectory>
+      
       <!-- Public Documents folder for the tutorials -->
       <Directory Id="PROGRAMTUTORIALS" Name="$(var.ProductIdWithVersion)"/>
   </Fragment>
 
   <!-- Desktop application shortcut -->
   <Fragment>
     <Component Id="DesktopShortcut" Guid="$(var.DesktopShortcutGuid)">
-      <Shortcut Id="desktop" Directory="DesktopFolder" Name="$(var.ProductNameWithVersion)" 
+      <Shortcut Id="DesktopShortcut" Directory="DesktopFolder" 
+                Name="$(var.ProductNameWithVersion)" 
                 WorkingDirectory="INSTALLFOLDER" Icon="icon.ico" IconIndex="0" 
                 Target="[INSTALLFOLDER]\$(var.ProductId).exe" />
       <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
                      Name="installedDesktopShortcut" Type="integer" Value="1" KeyPath="yes" />
-      <RemoveFolder Id="CleanUpDesktopShortcut" Directory="DeltaresDir" On="uninstall" />
     </Component>
   </Fragment>
   <!-- Start Menu application shortcut -->
@@ -125,6 +135,7 @@
                 Target="[INSTALLFOLDER]$(var.ProductId).exe" WorkingDirectory="INSTALLFOLDER" />
       <RemoveFolder Id="RemoveProgramMenuShortcut" Directory="ProgramMenuShortcut" On="uninstall" />
       <RemoveFolder Id="RemoveProgramMenuDeltares" Directory="ProgramMenuDeltares" On="uninstall" />
+      <RemoveFolder Id="RemoveDesktopShortcut" Directory="DesktopFolderDeltares" On="uninstall" />
       <RegistryValue Root="HKCU" Key="Software\[Manufacturer]\$(var.ProductIdWithVersion)" 
                      Name="installed" Type="integer" Value="1" KeyPath="yes" />
     </Component>