diff --git a/nsis/src/plugin-resources/templates/setup.jelly b/nsis/src/plugin-resources/templates/setup.jelly
index 7a87a8d6..c05a167c 100644
--- a/nsis/src/plugin-resources/templates/setup.jelly
+++ b/nsis/src/plugin-resources/templates/setup.jelly
@@ -125,7 +125,7 @@ SectionEnd
 
 <util:available file="${maven.nsis.src}/desktop-shortcuts.nsh">
 ; OPTIONAL Desktop Shortcut 
-Section "Create Desktop Shortcut"
+Section "Create Desktop Shortcut(s)"
   !include "desktop-shortcuts.nsh"
 SectionEnd
 </util:available>
@@ -136,28 +136,22 @@ Section "Install Uninstaller"
    WriteUninstaller "$$INSTDIR\Uninst.exe"
 SectionEnd
 
-; -------------------------------------------------------------- Maven Uninstaller
+; -------------------------------------------------------------- Uninstaller
 Section "Uninstall"
-  ; remove registry keys
-  DeleteRegKey HKLM "$${PROJECT_REG_UNINSTALL_KEY}"
-  DeleteRegKey HKLM "$${PROJECT_REG_KEY}"
-
-  <util:available file="${maven.nsis.src}/registry-uninstall.nsh">
-    !include "registry-uninstall.nsh"
-  </util:available>
-
-  ; remove files
+  DetailPrint "Remove files"
   Delete $$INSTDIR\*.*
-
   ; MUST REMOVE UNINSTALLER, too
   Delete $$INSTDIR\Uninst.exe
-
   !include "remove-shortcuts.nsh"
-
   ; Recursively remove files and directories used
   ; this should also take care of the installer  
   RMDir /r "$$INSTDIR"
-
+  DetailPrint "Remove registry keys"
+  DeleteRegKey HKLM "$${PROJECT_REG_UNINSTALL_KEY}"
+  DeleteRegKey HKLM "$${PROJECT_REG_KEY}"
+  <util:available file="${maven.nsis.src}/registry-uninstall.nsh">
+    !include "registry-uninstall.nsh"
+  </util:available>
 SectionEnd
 
 ; -------------------------------------------------------------- Add Images to the Installer / UnInstaller