--- a/HuginSetup_common.nsh
+++ b/HuginSetup_common.nsh
@@ -97,6 +97,8 @@
   SectionIn RO
   AddSize ${HUGIN_SIZE}
   SetOutPath "$INSTDIR"
+  
+  Call CleanRegistryOnInstallIfSelected
 
   SetCompress off
   DetailPrint $(TEXT_HuginExtracting)
@@ -115,13 +117,17 @@
   Delete "$OUTDIR\${HUGIN_BIN_ARCHIVE}" 
   Delete "$OUTDIR\${HUGIN_SHARE_ARCHIVE}"
   
-  Call AddCPAutoPanoSiftCStacked
+  ; Call AddCPAutoPanoSiftCStacked
   Call AddCPAlignImageStack
   
   Call WriteUninstallRegistry
   
   ;Create uninstaller
   WriteUninstaller "$INSTDIR\Uninstall.exe"
+SectionEnd
+
+Section /o $(TEXT_SecCleanRegistrySettings) SecCleanRegistrySettings
+  ; done during install
 SectionEnd
 
 ; Hugin documentation section
@@ -167,8 +173,10 @@
   ; External upgradable CP generators download and setup  
   !include "CPGenerators\Match-n-shift.nsh"
   !include "CPGenerators\Autopano-sift-c.nsh"
-  !include "CPGenerators\Panomatic.nsh"
-  !include "CPGenerators\Autopano.nsh"
+  !include "CPGenerators\Autopano-sift-c-lemur.nsh"
+  !include "CPGenerators\Autopano-sift-jenny.nsh"
+  ; !include "CPGenerators\Autopano-sift-nowozin.nsh"
+  !include "CPGenerators\Panomatic.nsh"  
   
 SectionGroupEnd
 
@@ -180,10 +188,14 @@
     !insertmacro MUI_DESCRIPTION_TEXT ${SecHuginDoc} $(DESC_SecHuginDoc)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecCPGenerators} $(DESC_SecCPGenerators)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecPanomatic} $(DESC_SecPanomatic)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecAutopano} $(DESC_SecAutopano)
-    !insertmacro MUI_DESCRIPTION_TEXT ${SecAutopanoSIFTC} $(DESC_SecAutopanoSIFTC)
+    
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecAutopano_Jenny} $(DESC_SecAutopano_Jenny)
+    ; !insertmacro MUI_DESCRIPTION_TEXT ${SecAutopano_Nowozin} $(DESC_SecAutopano_Nowozin)    
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecAutopano_SIFTC} $(DESC_SecAutopano_SIFTC)
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecAutopano_SIFTC_Lemur} $(DESC_SecAutopano_SIFTC_Lemur)
+    
     !insertmacro MUI_DESCRIPTION_TEXT ${SecMatchNShift} $(DESC_SecMatchNShift)
-    
+    !insertmacro MUI_DESCRIPTION_TEXT ${SecCleanRegistrySettings} $(DESC_SecCleanRegistrySettings)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcuts} $(DESC_SecShortcuts)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcutPrograms} $(DESC_SecShortcutPrograms)
     !insertmacro MUI_DESCRIPTION_TEXT ${SecShortcutDesktop} $(DESC_SecShortcutDesktop)
@@ -216,7 +228,7 @@
   ; DeleteRegKey /ifempty HKCU "Software\Modern UI Test"
 SectionEnd
 
-Section /o "un.$(TEXT_UN_SecCleanRegistrySettings)"
+Section /o "un.$(TEXT_SecCleanRegistrySettings)"
   DeleteRegKey  HKCU "Software\Hugin"
 SectionEnd
 
@@ -274,7 +286,23 @@
 FunctionEnd
 
 
-; Add Align_Image_stack control point generator settings to registry
+;Clean registry on install if selected
+Function CleanRegistryOnInstallIfSelected
+ 
+  SectionGetFlags ${SecCleanRegistrySettings} $R0 
+  IntOp $R0 $R0 & ${SF_SELECTED} 
+  IntCmp $R0 ${SF_SELECTED} CleanRegistry DoNotCleanRegistry
+ 
+  CleanRegistry: 
+    DeleteRegKey  HKCU "Software\Hugin" 
+ 
+  DoNotCleanRegistry:
+    ;do nothing
+FunctionEnd
+
+
+; Add Align_Image_Stack control point generator settings to registry
+; Align_image_stack.exe is provided directly from Hugin 
 Function AddCPAlignImageStack
   StrCpy $R0 1 ; R0 = Type
   StrCpy $R1 1 ; R1 = Option
@@ -285,34 +313,9 @@
 FunctionEnd
 
 
-; Add Autopano-Sift-C STACKED settings
-; @todo: check if Autopano-sift-c is installed (with generatekeys.exe and align_image_stack.exe)
-Function AddCPAutoPanoSiftCStacked
-  StrCpy $R0 4 ; R0 = Type
-  StrCpy $R1 1 ; R1 = Option
-  StrCpy $R2 "$INSTDIR\bin\generatekeys.exe" ; R2 = Program
-  StrCpy $R3 "%i %k 800" ; R3 = Arguments
-  StrCpy $R4 "Autopano-SIFT-C (multirow/stacked)";  R4 = Description
-  Call ControlPointRegistryAdd
-  
-  StrCpy $R0 "Matcher" ; R0 = Type [Matcher|Stack]
-  StrCpy $R1 "-1"; R1 = Autopano_ID (-1 for last setting present)
-  StrCpy $R2 "$INSTDIR\bin\autopano.exe" ; R2 = Program
-  StrCpy $R3 "--maxmatches %p %o %k"; R3 = Arguments
-  Call ControlPointRegistryAddMulti
-  
-  StrCpy $R0 "Stack" ; R0 = Type [Matcher|Stack]
-  StrCpy $R1 "-1"; R1 = Autopano_ID (-1 for last setting present)
-  StrCpy $R2 "$INSTDIR\bin\align_image_stack.exe" ; R2 = Program
-  StrCpy $R3 "-f %v -v -p %o %i"; R3 = Arguments
-  Call ControlPointRegistryAddMulti  
-  
-FunctionEnd
-
-
-
-
-
-
-
-
+
+
+
+
+
+