diff --git a/src/inst-okular.nsi b/src/inst-okular.nsi
index 227a8c66..73478933 100644
--- a/src/inst-okular.nsi
+++ b/src/inst-okular.nsi
@@ -1,130 +1,130 @@
 # Copyright (C) 2023 g10 Code GmbH
 #
 # This file is part of GPG4Win.
 #
 # GPG4Win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # GPG4Win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
 !ifdef prefix
 !undef prefix
 !endif
 !define prefix ${ipdir}/okular-${gpg4win_pkg_okular_version}
 
 # Okular - Opt in for now.
 ${MementoUnselectedSection} "Okular (experimental)" SEC_okular
 
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/okular.exe
   File ${prefix}/bin/libOkular5Core.dll
   SetOutPath "$INSTDIR\bin\plugins\okular\generators"
 #  File ${prefix}/plugins/okular/generators/okularGenerator_fb.dll
 #  File ${prefix}/plugins/okular/generators/okularGenerator_comicbook.dll
 #  File ${prefix}/plugins/okular/generators/okularGenerator_kimgio.dll
 #  File ${prefix}/plugins/okular/generators/okularGenerator_dvi.dll
 #  File ${prefix}/plugins/okular/generators/okularGenerator_txt.dll
 #  File ${prefix}/plugins/okular/generators/okularGenerator_fax.dll
   File ${prefix}/lib/plugins/okular/generators/okularGenerator_poppler.dll
 #  File ${prefix}/plugins/okular/generators/okularGenerator_xps.dll
   SetOutPath "$INSTDIR\bin\plugins"
   File ${prefix}/lib/plugins/okularpart.dll
 
 
   SetOutPath "$INSTDIR\share\icons\hicolor\128x128\apps"
 
   File ${prefix}/share/icons/hicolor/128x128/apps/okular.png
 
   SetOutPath "$INSTDIR\share\icons\hicolor\16x16\apps"
 
   File ${prefix}/share/icons/hicolor/16x16/apps/okular.png
 
   SetOutPath "$INSTDIR\share\icons\hicolor\22x22\apps"
 
   File ${prefix}/share/icons/hicolor/22x22/apps/okular.png
 
   SetOutPath "$INSTDIR\share\icons\hicolor\32x32\apps"
 
   File ${prefix}/share/icons/hicolor/32x32/apps/okular.png
 
   SetOutPath "$INSTDIR\share\icons\hicolor\48x48\apps"
 
   File ${prefix}/share/icons/hicolor/48x48/apps/okular.png
 
   SetOutPath "$INSTDIR\share\icons\hicolor\64x64\apps"
 
   File ${prefix}/share/icons/hicolor/64x64/apps/okular.png
 
   SetOutPath "$INSTDIR\share\kxmlgui5\okular"
   File ${prefix}/share/kxmlgui5/okular/part.rc
   File ${prefix}/share/kxmlgui5/okular/part-viewermode.rc
   File ${prefix}/share/kxmlgui5/okular/shell.rc
 
   SetOutPath "$INSTDIR\share\okular"
   File ${prefix}/share/okular/drawingtools.xml
   File ${prefix}/share/okular/toolsQuick.xml
   File ${prefix}/share/okular/tools.xml
 
   SetOutPath "$INSTDIR\share\okular\pics"
   File ${prefix}/share/okular/pics/checkmark.png
   File ${prefix}/share/okular/pics/circle.png
   File ${prefix}/share/okular/pics/comment.png
   File ${prefix}/share/okular/pics/cross.png
   File ${prefix}/share/okular/pics/help.png
   File ${prefix}/share/okular/pics/insert.png
   File ${prefix}/share/okular/pics/key.png
   File ${prefix}/share/okular/pics/newparagraph.png
   File ${prefix}/share/okular/pics/note.png
   File ${prefix}/share/okular/pics/paperclip.png
   File ${prefix}/share/okular/pics/paragraph.png
   File ${prefix}/share/okular/pics/pushpin.png
   File ${prefix}/share/okular/pics/rightarrow.png
   File ${prefix}/share/okular/pics/rightpointer.png
   File ${prefix}/share/okular/pics/stamps.svg
   File ${prefix}/share/okular/pics/star.png
   File ${prefix}/share/okular/pics/tool-base-okular@2x.png
   File ${prefix}/share/okular/pics/tool-base-okular.png
   File ${prefix}/share/okular/pics/tool-highlighter-okular-colorizable@2x.png
   File ${prefix}/share/okular/pics/tool-highlighter-okular-colorizable.png
   File ${prefix}/share/okular/pics/tool-ink-okular-colorizable@2x.png
   File ${prefix}/share/okular/pics/tool-ink-okular-colorizable.png
   File ${prefix}/share/okular/pics/tool-note-inline-okular-colorizable@2x.png
   File ${prefix}/share/okular/pics/tool-note-inline-okular-colorizable.png
   File ${prefix}/share/okular/pics/tool-note-inline.png
   File ${prefix}/share/okular/pics/tool-note-okular-colorizable@2x.png
   File ${prefix}/share/okular/pics/tool-note-okular-colorizable.png
   File ${prefix}/share/okular/pics/tool-note.png
   File ${prefix}/share/okular/pics/tool-typewriter-okular-colorizable@2x.png
   File ${prefix}/share/okular/pics/tool-typewriter-okular-colorizable.png
   File ${prefix}/share/okular/pics/uparrow.png
   File ${prefix}/share/okular/pics/upleftarrow.png
 
 
   WriteRegStr SHCTX "Software\RegisteredApplications" "Gpg4win.Okular" "SOFTWARE\Gpg4win\Okular\Capabilities"
-  WriteRegStr SHCTX "Software\Gpg4win\Okular" "" "Okular"
+  WriteRegStr SHCTX "Software\Gpg4win\Okular" "" "Okular (GnuPG Edition)"
   WriteRegStr SHCTX "Software\Gpg4win\Okular\Capabilities\FileAssociations" ".pdf" "gpg4win.AssocFile.Okular.PDF"
   WriteRegStr SHCTX "Software\Gpg4win\Okular\Capabilities\MimeAssociations" "application/pdf" "gpg4win.AssocFile.Okular.PDF"
   WriteRegStr SHCTX "Software\Gpg4win\kleopatra\Capabilities" "ApplicationDescription" "$(DESC_SEC_okular)"
   WriteRegStr SHCTX "Software\Gpg4win\kleopatra\Capabilities" "ApplicationIcon" "$INSTDIR\bin\okular.exe,0"
-  WriteRegStr SHCTX "Software\Gpg4win\kleopatra\Capabilities" "ApplicationName" "Okular"
+  WriteRegStr SHCTX "Software\Gpg4win\kleopatra\Capabilities" "ApplicationName" "Okular (GnuPG Edition)"
 
   WriteRegExpandStr SHCTX "Software\Classes\gpg4win.AssocFile.Okular.PDF\shell\open\command" "" "$\"$INSTDIR\bin\Okular.exe$\" -- $\"%1$\""
   WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.Okular.PDF\CurVer" "" "${VERSION}"
   # TODO need to generate a icon from application-pdf
   WriteRegStr SHCTX "Software\Classes\gpg4win.AssocFile.Okular.PDF\DefaultIcon" "" "$INSTDIR\bin\okular.exe,0"
 
 ${MementoSectionEnd}
 
 LangString DESC_SEC_okular ${LANG_ENGLISH} \
-   "A high security PDF reader to sign and verify pdf documents with GnuPG."
+   "A PDF viewer to sign and verify pdf documents with GnuPG."
 
 LangString DESC_Menu_okular ${LANG_ENGLISH} \
    "Run the Okular PDF viewer to sign and verify documents with GnuPG."
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index f89f6491..1083062a 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -1,1033 +1,1033 @@
 # inst-sections.nsi - Installer for GPG4Win sections.  -*- coding: latin-1; -*-
 # Copyright (C) 2005, 2006, 2007, 2008, 2009, 2023 g10 Code GmbH
 #
 # This file is part of GPG4Win.
 #
 # GPG4Win is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
 # the Free Software Foundation; either version 2 of the License, or
 # (at your option) any later version.
 #
 # GPG4Win is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, see <http://www.gnu.org/licenses/>.
 
 !include "inst-gpg4win.nsi"
 
 # The order of installation must be the same as the build order.  You
 # can use tsort on the info in configure.ac, or just check out
 # gpg4win_build_list in config.nsi.  The order determines also the
 # order in the packages selection dialog.
 
 !ifdef HAVE_PKG_BZIP2
 !include "inst-bzip2.nsi"
 !endif
 !ifdef HAVE_PKG_LIBICONV
 !include "inst-libiconv.nsi"
 !endif
 !ifdef HAVE_PKG_LIBTASN1
 !include "inst-libtasn1.nsi"
 !endif
 !ifdef HAVE_PKG_BREEZE_ICONS
 !include "inst-breeze-icons.nsi"
 !endif
 !ifdef HAVE_PKG_PKGCONFIG
 !include "inst-pkgconfig.nsi"
 !endif
 !ifdef HAVE_PKG_ZLIB
 !include "inst-zlib.nsi"
 !endif
 !ifdef HAVE_PKG_QTBASE
 !include "inst-qtbase.nsi"
 !endif
 !ifdef HAVE_PKG_GETTEXT
 !include "inst-gettext.nsi"
 !endif
 !ifdef HAVE_PKG_LIBASSUAN
 !include "inst-libassuan.nsi"
 !endif
 !ifdef HAVE_PKG_LIBGPG_ERROR
 !include "inst-libgpg-error.nsi"
 !endif
 !ifdef HAVE_PKG_PINENTRY
 !include "inst-pinentry.nsi"
 !endif
 # BEGIN MSI IGNORE
 !ifdef HAVE_PKG_GNUPG_W32
 !include "inst-gnupg-w32.nsi"
 !endif
 # END MSI IGNORE
 !ifdef HAVE_PKG_GPGME
 !include "inst-gpgme.nsi"
 !endif
 !ifdef HAVE_PKG_QTTOOLS
 !include "inst-qttools.nsi"
 !endif
 !ifdef HAVE_PKG_QTWINEXTRAS
 !include "inst-qtwinextras.nsi"
 !endif
 !ifdef HAVE_PKG_KCONFIG
 !include "inst-kconfig.nsi"
 !endif
 !ifdef HAVE_PKG_KI18N
 !include "inst-ki18n.nsi"
 !endif
 !ifdef HAVE_PKG_KWIDGETSADDONS
 !include "inst-kwidgetsaddons.nsi"
 !endif
 !ifdef HAVE_PKG_KCOMPLETION
 !include "inst-kcompletion.nsi"
 !endif
 !ifdef HAVE_PKG_KWINDOWSYSTEM
 !include "inst-kwindowsystem.nsi"
 !endif
 !ifdef HAVE_PKG_KCOREADDONS
 !include "inst-kcoreaddons.nsi"
 !endif
 !ifdef HAVE_PKG_KCODECS
 !include "inst-kcodecs.nsi"
 !endif
 !ifdef HAVE_PKG_KCONFIGWIDGETS
 !include "inst-kconfigwidgets.nsi"
 !endif
 !ifdef HAVE_PKG_KXMLGUI
 !include "inst-kxmlgui.nsi"
 !endif
 !ifdef HAVE_PKG_KGUIADDONS
 !include "inst-kguiaddons.nsi"
 !endif
 !ifdef HAVE_PKG_KMIME
 !include "inst-kmime.nsi"
 !endif
 # include translations unconditionally
 !include "inst-kde-l10n.nsi"
 !ifdef HAVE_PKG_KICONTHEMES
 !include "inst-kiconthemes.nsi"
 !endif
 !ifdef HAVE_PKG_KARCHIVE
 !include "inst-karchive.nsi"
 !endif
 !ifdef HAVE_PKG_KJOBWIDGETS
 !include "inst-kjobwidgets.nsi"
 !endif
 !ifdef HAVE_PKG_PCRE
 !include "inst-pcre.nsi"
 !endif
 !ifdef HAVE_PKG_LIBPNG
 !include "inst-libpng.nsi"
 !endif
 !ifdef HAVE_PKG_TIFF
 !include "inst-tiff.nsi"
 !endif
 !ifdef HAVE_PKG_OPENJPEG
 !include "inst-openjpeg.nsi"
 !endif
 !ifdef HAVE_PKG_JPEG
 !include "inst-jpeg.nsi"
 !endif
 !ifdef HAVE_PKG_KCRASH
 !include "inst-kcrash.nsi"
 !endif
 !ifdef HAVE_PKG_KIO
 !include "inst-kio.nsi"
 !endif
 !ifdef HAVE_PKG_SOLID
 !include "inst-solid.nsi"
 !endif
 !ifdef HAVE_PKG_FREETYPE
 !include "inst-freetype.nsi"
 !endif
 !ifdef HAVE_PKG_THREADWEAVER
 !include "inst-threadweaver.nsi"
 !endif
 !ifdef HAVE_PKG_POPPLER
 !include "inst-poppler.nsi"
 !endif
 !ifdef HAVE_PKG_KPARTS
 !include "inst-kparts.nsi"
 !endif
 !ifdef HAVE_PKG_OKULAR
 !include "inst-okular.nsi"
 !endif
 !ifdef HAVE_PKG_KBOOKMARKS
 !include "inst-kbookmarks.nsi"
 !endif
 !ifdef HAVE_PKG_KSERVICE
 !include "inst-kservice.nsi"
 !endif
 !ifdef HAVE_PKG_KITEMVIEWS
 !include "inst-kitemviews.nsi"
 !endif
 !ifdef HAVE_PKG_KITEMMODELS
 !include "inst-kitemmodels.nsi"
 !endif
 !ifdef HAVE_PKG_LIBKLEO
 !include "inst-libkleo.nsi"
 !endif
 !ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
 !include "inst-extra-cmake-modules.nsi"
 !endif
 !ifdef HAVE_PKG_QTSVG
 !include "inst-qtsvg.nsi"
 !endif
 !ifdef HAVE_PKG_QTTRANSLATIONS
 !include "inst-qttranslations.nsi"
 !endif
 !ifdef HAVE_PKG_GPG4WIN_TOOLS
 !include "inst-gpg4win-tools.nsi"
 !endif
 !ifdef HAVE_PKG_SCUTE
 !include "inst-scute.nsi"
 !endif
 !ifdef HAVE_PKG_PAPERKEY
 !include "inst-paperkey.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_EN
 !include "inst-man_novice_en.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_ADVANCED_EN
 !include "inst-man_advanced_en.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_DE
 !include "inst-man_novice_de.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_ADVANCED_DE
 !include "inst-man_advanced_de.nsi"
 !endif
 
 # These are displayed in the selection dialog.
 
 !ifdef HAVE_PKG_KLEOPATRA
 !include "inst-kleopatra.nsi"
 !endif
 !ifdef HAVE_PKG_GPGOL
 !include "inst-gpgol.nsi"
 !endif
 !ifdef HAVE_PKG_GPGEX
 !include "inst-gpgex.nsi"
 !endif
 !ifdef HAVE_PKG_COMPENDIUM
 !include "inst-compendium.nsi"
 !endif
 
 !include "inst-gpgme-browser.nsi"
 
 !include "inst-final.nsi"
 
 # We have to invoke the uninstallers in reverse order!
 
 !ifdef HAVE_PKG_MAN_ADVANCED_DE
 !include "uninst-man_advanced_de.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_DE
 !include "uninst-man_novice_de.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_ADVANCED_EN
 !include "uninst-man_advanced_en.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_EN
 !include "uninst-man_novice_en.nsi"
 !endif
 !ifdef HAVE_PKG_COMPENDIUM
 !include "uninst-compendium.nsi"
 !endif
 !ifdef HAVE_PKG_PAPERKEY
 !include "uninst-paperkey.nsi"
 !endif
 !ifdef HAVE_PKG_GPGEX
 !include "uninst-gpgex.nsi"
 !endif
 !ifdef HAVE_PKG_GPGOL
 !include "uninst-gpgol.nsi"
 !endif
 !ifdef HAVE_PKG_KLEOPATRA
 !include "uninst-kleopatra.nsi"
 !endif
 
 !ifdef HAVE_PKG_GPGME
 !include "uninst-gpgme.nsi"
 !endif
 !ifdef HAVE_PKG_GNUPG_W32
 !include "uninst-gnupg-w32.nsi"
 !endif
 !ifdef HAVE_PKG_PINENTRY
 !include "uninst-pinentry.nsi"
 !endif
 !ifdef HAVE_PKG_GNUTLS
 !include "uninst-gnutls.nsi"
 !endif
 !ifdef HAVE_PKG_CURL
 !include "uninst-curl.nsi"
 !endif
 !ifdef HAVE_PKG_LIBGPG_ERROR
 !include "uninst-libgpg-error.nsi"
 !endif
 !ifdef HAVE_PKG_LIBASSUAN
 !include "uninst-libassuan.nsi"
 !endif
 !ifdef HAVE_PKG_GETTEXT
 !include "uninst-gettext.nsi"
 !endif
 !ifdef HAVE_PKG_QTBASE
 !include "uninst-qtbase.nsi"
 !endif
 !ifdef HAVE_PKG_ZLIB
 !include "uninst-zlib.nsi"
 !endif
 !ifdef HAVE_PKG_PKGCONFIG
 !include "uninst-pkgconfig.nsi"
 !endif
 !ifdef HAVE_PKG_BREEZE_ICONS
 !include "uninst-breeze-icons.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_ADVANCED_DE
 !include "uninst-man_advanced_de.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_DE
 !include "uninst-man_novice_de.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_ADVANCED_EN
 !include "uninst-man_advanced_en.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_NOVICE_EN
 !include "uninst-man_novice_en.nsi"
 !endif
 !ifdef HAVE_PKG_LIBICONV
 !include "uninst-libiconv.nsi"
 !endif
 !ifdef HAVE_PKG_QTTOOLS
 !include "uninst-qttools.nsi"
 !endif
 !ifdef HAVE_PKG_QTWINEXTRAS
 !include "uninst-qtwinextras.nsi"
 !endif
 !ifdef HAVE_PKG_KCONFIG
 !include "uninst-kconfig.nsi"
 !endif
 !ifdef HAVE_PKG_KI18N
 !include "uninst-ki18n.nsi"
 !endif
 !ifdef HAVE_PKG_KWIDGETSADDONS
 !include "uninst-kwidgetsaddons.nsi"
 !endif
 !ifdef HAVE_PKG_KCOMPLETION
 !include "uninst-kcompletion.nsi"
 !endif
 !ifdef HAVE_PKG_KWINDOWSYSTEM
 !include "uninst-kwindowsystem.nsi"
 !endif
 !ifdef HAVE_PKG_KCOREADDONS
 !include "uninst-kcoreaddons.nsi"
 !endif
 !ifdef HAVE_PKG_KCODECS
 !include "uninst-kcodecs.nsi"
 !endif
 !ifdef HAVE_PKG_KCONFIGWIDGETS
 !include "uninst-kconfigwidgets.nsi"
 !endif
 !ifdef HAVE_PKG_KGUIADDONS
 !include "uninst-kguiaddons.nsi"
 !endif
 !ifdef HAVE_PKG_KXMLGUI
 !include "uninst-kxmlgui.nsi"
 !endif
 !ifdef HAVE_PKG_KICONTHEMES
 !include "uninst-kiconthemes.nsi"
 !endif
 !ifdef HAVE_PKG_KARCHIVE
 !include "uninst-karchive.nsi"
 !endif
 !ifdef HAVE_PKG_KJOBWIDGETS
 !include "uninst-kjobwidgets.nsi"
 !endif
 !ifdef HAVE_PKG_PCRE
 !include "uninst-pcre.nsi"
 !endif
 !ifdef HAVE_PKG_LIBPNG
 !include "uninst-libpng.nsi"
 !endif
 !ifdef HAVE_PKG_TIFF
 !include "uninst-tiff.nsi"
 !endif
 !ifdef HAVE_PKG_OPENJPEG
 !include "uninst-openjpeg.nsi"
 !endif
 !ifdef HAVE_PKG_JPEG
 !include "uninst-jpeg.nsi"
 !endif
 !ifdef HAVE_PKG_KCRASH
 !include "uninst-kcrash.nsi"
 !endif
 !ifdef HAVE_PKG_KIO
 !include "uninst-kio.nsi"
 !endif
 !ifdef HAVE_PKG_KJOBWIDGETS
 !include "uninst-kjobwidgets.nsi"
 !endif
 !ifdef HAVE_PKG_SOLID
 !include "uninst-solid.nsi"
 !endif
 !ifdef HAVE_PKG_FREETYPE
 !include "uninst-freetype.nsi"
 !endif
 !ifdef HAVE_PKG_THREADWEAVER
 !include "uninst-threadweaver.nsi"
 !endif
 !ifdef HAVE_PKG_POPPLER
 !include "uninst-poppler.nsi"
 !endif
 !ifdef HAVE_PKG_KPARTS
 !include "uninst-kparts.nsi"
 !endif
 !ifdef HAVE_PKG_OKULAR
 !include "uninst-okular.nsi"
 !endif
 !ifdef HAVE_PKG_KBOOKMARKS
 !include "uninst-kbookmarks.nsi"
 !endif
 !ifdef HAVE_PKG_KSERVICE
 !include "uninst-kservice.nsi"
 !endif
 !ifdef HAVE_PKG_KITEMVIEWS
 !include "uninst-kitemviews.nsi"
 !endif
 !ifdef HAVE_PKG_KITEMMODELS
 !include "uninst-kitemmodels.nsi"
 !endif
 !ifdef HAVE_PKG_KMIME
 !include "uninst-kmime.nsi"
 !endif
 !include "uninst-kde-l10n.nsi"
 !ifdef HAVE_PKG_LIBKLEO
 !include "uninst-libkleo.nsi"
 !endif
 !ifdef HAVE_PKG_EXTRA_CMAKE_MODULES
 !include "uninst-extra-cmake-modules.nsi"
 !endif
 !ifdef HAVE_PKG_BZIP2
 !include "uninst-bzip2.nsi"
 !endif
 !ifdef HAVE_PKG_QTSVG
 !include "uninst-qtsvg.nsi"
 !endif
 !ifdef HAVE_PKG_QTTRANSLATIONS
 !include "uninst-qttranslations.nsi"
 !endif
 !ifdef HAVE_PKG_GPG4WIN_TOOLS
 !include "uninst-gpg4win-tools.nsi"
 !endif
 !ifdef HAVE_PKG_SCUTE
 !include "uninst-scute.nsi"
 !endif
 
 !include "uninst-gpg4win.nsi"
 
 
 # Dependency Management
 
 ${MementoSectionDone}
 
 Function CalcDefaults
 
 !ifdef HAVE_PKG_KLEOPATRA
   g4wihelp::config_fetch_bool "inst_kleopatra"
   StrCmp $R0 "1" 0 calc_defaults_kleopatra_not_one
    !insertmacro SelectSection ${SEC_kleopatra}
    Goto calc_defaults_kleopatra_done
   calc_defaults_kleopatra_not_one:
   StrCmp $R0 "0" 0 calc_defaults_kleopatra_done
    !insertmacro UnselectSection ${SEC_kleopatra}
 calc_defaults_kleopatra_done:
 !endif
 
 !ifdef HAVE_PKG_OKULAR
   g4wihelp::config_fetch_bool "inst_okular"
   StrCmp $R0 "1" 0 calc_defaults_okular_not_one
    !insertmacro SelectSection ${SEC_okular}
    Goto calc_defaults_okular_done
   calc_defaults_okular_not_one:
   StrCmp $R0 "0" 0 calc_defaults_okular_done
    !insertmacro UnselectSection ${SEC_okular}
 calc_defaults_okular_done:
 !endif
 
 !ifdef HAVE_PKG_GPGOL
   g4wihelp::config_fetch_bool "inst_gpgol"
   StrCmp $R0 "1" 0 calc_defaults_gpgol_not_one
    !insertmacro SelectSection ${SEC_gpgol}
    Goto calc_defaults_gpgol_done
   calc_defaults_gpgol_not_one:
   StrCmp $R0 "0" 0 calc_defaults_gpgol_done
    !insertmacro UnselectSection ${SEC_gpgol}
 calc_defaults_gpgol_done:
 !endif
 
 !ifdef HAVE_PKG_GPGEX
   g4wihelp::config_fetch_bool "inst_gpgex"
   StrCmp $R0 "1" 0 calc_defaults_gpgex_not_one
    !insertmacro SelectSection ${SEC_gpgex}
    Goto calc_defaults_gpgex_done
   calc_defaults_gpgex_not_one:
   StrCmp $R0 "0" 0 calc_defaults_gpgex_done
    !insertmacro UnselectSection ${SEC_gpgex}
 calc_defaults_gpgex_done:
 !endif
 
 !ifdef HAVE_PKG_PAPERKEY
   g4wihelp::config_fetch_bool "inst_paperkey"
   StrCmp $R0 "1" 0 calc_defaults_paperkey_not_one
    !insertmacro SelectSection ${SEC_paperkey}
    Goto calc_defaults_paperkey_done
   calc_defaults_paperkey_not_one:
   StrCmp $R0 "0" 0 calc_defaults_paperkey_done
    !insertmacro UnselectSection ${SEC_paperkey}
 calc_defaults_paperkey_done:
 !endif
 
 !ifdef HAVE_PKG_COMPENDIUM
   g4wihelp::config_fetch_bool "inst_compendium"
   StrCmp $R0 "1" 0 calc_defaults_compendium_not_one
    !insertmacro SelectSection ${SEC_compendium}
    Goto calc_defaults_compendium_done
   calc_defaults_compendium_not_one:
   StrCmp $R0 "0" 0 calc_defaults_compendium_done
    !insertmacro UnselectSection ${SEC_compendium}
 calc_defaults_compendium_done:
 !endif
 
 
 !ifdef HAVE_PKG_MAN_NOVICE_DE
   g4wihelp::config_fetch_bool "inst_man_novice_de"
   StrCmp $R0 "1" 0 calc_defaults_man_novice_de_not_one
    !insertmacro SelectSection ${SEC_man_novice_de}
    Goto calc_defaults_man_novice_de_done
   calc_defaults_man_novice_de_not_one:
   StrCmp $R0 "0" 0 calc_defaults_man_novice_de_done
    !insertmacro UnselectSection ${SEC_man_novice_de}
 calc_defaults_man_novice_de_done:
 !endif
 
 !ifdef HAVE_PKG_MAN_NOVICE_EN
   g4wihelp::config_fetch_bool "inst_man_novice_en"
   StrCmp $R0 "1" 0 calc_defaults_man_novice_en_not_one
    !insertmacro SelectSection ${SEC_man_novice_en}
    Goto calc_defaults_man_novice_en_done
   calc_defaults_man_novice_en_not_one:
   StrCmp $R0 "0" 0 calc_defaults_man_novice_en_done
    !insertmacro UnselectSection ${SEC_man_novice_en}
 calc_defaults_man_novice_en_done:
 !endif
 
 !ifdef HAVE_PKG_MAN_ADVANCED_DE
   g4wihelp::config_fetch_bool "inst_man_advanced_de"
   StrCmp $R0 "1" 0 calc_defaults_man_advanced_de_not_one
    !insertmacro SelectSection ${SEC_man_advanced_de}
    Goto calc_defaults_man_advanced_de_done
   calc_defaults_man_advanced_de_not_one:
   StrCmp $R0 "0" 0 calc_defaults_man_advanced_de_done
    !insertmacro UnselectSection ${SEC_man_advanced_de}
 calc_defaults_man_advanced_de_done:
 !endif
 
 !ifdef HAVE_PKG_MAN_ADVANCED_EN
   g4wihelp::config_fetch_bool "inst_man_advanced_en"
   StrCmp $R0 "1" 0 calc_defaults_man_advanced_en_not_one
    !insertmacro SelectSection ${SEC_man_advanced_en}
    Goto calc_defaults_man_advanced_en_done
   calc_defaults_man_advanced_en_not_one:
   StrCmp $R0 "0" 0 calc_defaults_man_advanced_en_done
    !insertmacro UnselectSection ${SEC_man_advanced_en}
 calc_defaults_man_advanced_en_done:
 !endif
 
 # Check if minimal install was requested on the command line
 
 StrCmp $is_minimal '1' select_minimal continue
 select_minimal:
    !insertmacro UnselectSection ${SEC_kleopatra}
    !insertmacro UnselectSection ${SEC_okular}
    !insertmacro UnselectSection ${SEC_gpgol}
    !insertmacro UnselectSection ${SEC_gpgex}
    !insertmacro UnselectSection ${SEC_gpgme_browser}
    !insertmacro UnselectSection ${SEC_compendium}
 
 # We only do pinentry and gnupg-w32
    !insertmacro SelectSection ${SEC_paperkey}
    !insertmacro SelectSection ${SEC_gnupg_w32}
    !insertmacro SelectSection ${SEC_pinentry}
    !insertmacro SelectSection ${SEC_gpgme}
 continue:
 
 # Check if browser integration was selected on the command line
 # or in the ini
 # You can either select the browser integration by adding
 # inst_browser = true to a gpg4win.ini or adding a
 # /WITH_BROWSER=1 command line switch to the installer.
 g4wihelp::config_fetch_bool "inst_browser"
 StrCmp $R0 "1" select_browser 0
 StrCmp $with_browser '1' select_browser skip_browser
 select_browser:
     !insertmacro SelectSection ${SEC_gpgme_browser}
 skip_browser:
 
 FunctionEnd
 
 
 
 Function CalcDepends
   # This section could very well be autogenerated from the
   # information in configure.ac.  Note that it doesn't hurt to have
   # stuff here for packages that we don't include.
 
   # First clear all indirect dependencies.
 !ifdef HAVE_PKG_LIBICONV
   !insertmacro UnselectSection ${SEC_libiconv}
 !endif
 !ifdef HAVE_PKG_GETTEXT
   !insertmacro UnselectSection ${SEC_gettext}
 !endif
 !ifdef HAVE_PKG_ZLIB
   !insertmacro UnselectSection ${SEC_zlib}
 !endif
 !ifdef HAVE_PKG_PKGCONFIG
   !insertmacro UnselectSection ${SEC_pkgconfig}
 !endif
 !ifdef HAVE_PKG_BZIP2
   !insertmacro UnselectSection ${SEC_bzip2}
 !endif
 !ifdef HAVE_PKG_LIBGPG_ERROR
   !insertmacro UnselectSection ${SEC_libgpg_error}
 !endif
 !ifdef HAVE_PKG_LIBASSUAN
   !insertmacro UnselectSection ${SEC_libassuan}
 !endif
 !ifdef HAVE_PKG_GPGME
   !insertmacro UnselectSection ${SEC_gpgme}
 !endif
 !ifdef HAVE_PKG_QTBASE
   !insertmacro UnselectSection ${SEC_qtbase}
 !endif
 !ifdef HAVE_PKG_QTTOOLS
   !insertmacro UnselectSection ${SEC_qttools}
 !endif
 !ifdef HAVE_PKG_QTWINEXTRAS
   !insertmacro UnselectSection ${SEC_qtwinextras}
 !endif
 !ifdef HAVE_PKG_FREETYPE
   !insertmacro UnselectSection ${SEC_freetype}
 !endif
 !ifdef HAVE_PKG_BREEZE_ICONS
   !insertmacro UnselectSection ${SEC_breeze_icons}
 !endif
 !ifdef HAVE_PKG_KCONFIG
   !insertmacro UnselectSection ${SEC_kconfig}
 !endif
 !ifdef HAVE_PKG_KI18N
   !insertmacro UnselectSection ${SEC_ki18n}
 !endif
 !ifdef HAVE_PKG_KWIDGETSADDONS
   !insertmacro UnselectSection ${SEC_kwidgetsaddons}
 !endif
 !ifdef HAVE_PKG_KCOMPLETION
   !insertmacro UnselectSection ${SEC_kcompletion}
 !endif
 !ifdef HAVE_PKG_KWINDOWSYSTEM
   !insertmacro UnselectSection ${SEC_kwindowsystem}
 !endif
 !ifdef HAVE_PKG_KCOREADDONS
   !insertmacro UnselectSection ${SEC_kcoreaddons}
 !endif
 !ifdef HAVE_PKG_KCODECS
   !insertmacro UnselectSection ${SEC_kcodecs}
 !endif
 !ifdef HAVE_PKG_KCONFIGWIDGETS
   !insertmacro UnselectSection ${SEC_kconfigwidgets}
 !endif
 !ifdef HAVE_PKG_KXMLGUI
   !insertmacro UnselectSection ${SEC_kxmlgui}
 !endif
 !ifdef HAVE_PKG_KICONTHEMES
   !insertmacro UnselectSection ${SEC_kiconthemes}
 !endif
 !ifdef HAVE_PKG_KARCHIVE
   !insertmacro UnselectSection ${SEC_karchive}
 !endif
 !ifdef HAVE_PKG_KCRASH
   !insertmacro UnselectSection ${SEC_kcrash}
 !endif
 !ifdef HAVE_PKG_KIO
   !insertmacro UnselectSection ${SEC_kio}
 !endif
 !ifdef HAVE_PKG_KJOBWIDGETS
   !insertmacro UnselectSection ${SEC_kjobwidgets}
 !endif
 !ifdef HAVE_PKG_LIBPNG
   !insertmacro UnselectSection ${SEC_libpng}
 !endif
 !ifdef HAVE_PKG_TIFF
   !insertmacro UnselectSection ${SEC_tiff}
 !endif
 !ifdef HAVE_PKG_OPENJPEG
   !insertmacro UnselectSection ${SEC_openjpeg}
 !endif
 !ifdef HAVE_PKG_JPEG
   !insertmacro UnselectSection ${SEC_jpeg}
 !endif
 !ifdef HAVE_PKG_SOLID
   !insertmacro UnselectSection ${SEC_solid}
 !endif
 !ifdef HAVE_PKG_POPPLER
   !insertmacro UnselectSection ${SEC_poppler}
 !endif
 !ifdef HAVE_PKG_KPARTS
   !insertmacro UnselectSection ${SEC_kparts}
 !endif
 !ifdef HAVE_PKG_FREETYPE
   !insertmacro UnselectSection ${SEC_freetype}
 !endif
 !ifdef HAVE_PKG_KBOOKMARKS
   !insertmacro UnselectSection ${SEC_kbookmarks}
 !endif
 !ifdef HAVE_PKG_KSERVICE
   !insertmacro UnselectSection ${SEC_kservice}
 !endif
 !ifdef HAVE_PKG_KITEMVIEWS
   !insertmacro UnselectSection ${SEC_kitemviews}
 !endif
 !ifdef HAVE_PKG_KITEMMODELS
   !insertmacro UnselectSection ${SEC_kitemmodels}
 !endif
 !ifdef HAVE_PKG_KGUIADDONS
   !insertmacro UnselectSection ${SEC_kguiaddons}
 !endif
 !ifdef HAVE_PKG_LIBKLEO
   !insertmacro UnselectSection ${SEC_libkleo}
 !endif
 !ifdef HAVE_PKG_KMIME
   !insertmacro UnselectSection ${SEC_kmime}
 !endif
 !ifdef HAVE_PKG_KDE_L10N
   !insertmacro UnselectSection ${SEC_kde_l10n}
 !endif
 !ifdef HAVE_PKG_QTSVG
   !insertmacro UnselectSection ${SEC_qtsvg}
 !endif
 !ifdef HAVE_PKG_QTTRANSLATIONS
   !insertmacro UnselectSection ${SEC_qttranslations}
 !endif
 !ifdef HAVE_PKG_GPG4WIN_TOOLS
   !insertmacro UnselectSection ${SEC_gpg4win_tools}
 !endif
 
 # BEGIN MSI IGNORE
 # MSI pulls this in through the gnupg-w32 component.
   # Always install gnupg2.  This is also ensured by putting
   # these packages in the RO section and enabling them by default, but
   # it doesn't harm to add it explicitely here as well.
 
   # TODO: Handle newer / other gnupg versions
   !insertmacro SelectSection ${SEC_gnupg_w32}
   !insertmacro SelectSection ${SEC_gpgme}
 
   # Then enable all dependencies, mostly in reverse build list order!
 
   # First the explicitely installed packages.
 # END MSI IGNORE
 
 
 !ifdef HAVE_PKG_PAPERKEY
   !insertmacro SectionFlagIsSet ${SEC_paperkey} \
 		${SF_SELECTED} have_paperkey skip_paperkey
   have_paperkey:
   # All dependencies are linked in statically.
   skip_paperkey:
 !endif
 
 !ifdef HAVE_PKG_GPGEX
   !insertmacro SectionFlagIsSet ${SEC_gpgex} \
 		${SF_SELECTED} have_gpgex skip_gpgex
   have_gpgex:
 
   # This is not a build dependency, but it is a run-time dependency.
   !insertmacro SelectSection ${SEC_kleopatra}
 
   # Other dependencies are linked in statically.
   skip_gpgex:
 !endif
 
 !ifdef HAVE_PKG_GPGOL
   !insertmacro SectionFlagIsSet ${SEC_gpgol} \
 		${SF_SELECTED} have_gpgol skip_gpgol
   have_gpgol:
   !insertmacro SelectSection ${SEC_gpgme}
   !insertmacro SelectSection ${SEC_gpg4win_tools}
 
   # This is not a build dependency, but it is a run-time dependency.
   !insertmacro SelectSection ${SEC_kleopatra}
 
   skip_gpgol:
 !endif
 
 !ifdef HAVE_PKG_OKULAR
   ${IfNot} ${AtLeastWin7}
     # Disable Okular for Windows below 7
     SectionSetFlags ${SEC_okular} 16
   ${Endif}
   !insertmacro SectionFlagIsSet ${SEC_okular} ${SF_SELECTED} have_okular skip_okular
   have_okular:
   !insertmacro SelectSection ${SEC_gpgme}
   !insertmacro SelectSection ${SEC_qtbase}
   !insertmacro SelectSection ${SEC_breeze_icons}
   !insertmacro SelectSection ${SEC_kconfig}
   !insertmacro SelectSection ${SEC_ki18n}
   !insertmacro SelectSection ${SEC_kwidgetsaddons}
   !insertmacro SelectSection ${SEC_kcompletion}
   !insertmacro SelectSection ${SEC_kwindowsystem}
   !insertmacro SelectSection ${SEC_kcoreaddons}
   !insertmacro SelectSection ${SEC_kcodecs}
   !insertmacro SelectSection ${SEC_kconfigwidgets}
   !insertmacro SelectSection ${SEC_kxmlgui}
   !insertmacro SelectSection ${SEC_kitemviews}
   !insertmacro SelectSection ${SEC_kitemmodels}
   !insertmacro SelectSection ${SEC_kiconthemes}
   !insertmacro SelectSection ${SEC_karchive}
   !insertmacro SelectSection ${SEC_kio}
   !insertmacro SelectSection ${SEC_kjobwidgets}
   !insertmacro SelectSection ${SEC_solid}
   !insertmacro SelectSection ${SEC_kservice}
   !insertmacro SelectSection ${SEC_kbookmarks}
   !insertmacro SelectSection ${SEC_freetype}
   !insertmacro SelectSection ${SEC_poppler}
   !insertmacro SelectSection ${SEC_threadweaver}
   !insertmacro SelectSection ${SEC_kparts}
 # KArchive depdens on zlib
   !insertmacro SelectSection ${SEC_zlib}
   !insertmacro SelectSection ${SEC_kcrash}
   !insertmacro SelectSection ${SEC_kguiaddons}
   !insertmacro SelectSection ${SEC_qtsvg}
   !insertmacro SelectSection ${SEC_qttranslations}
   !insertmacro SelectSection ${SEC_kde_l10n}
   !insertmacro SelectSection ${SEC_qttools}
   !insertmacro SelectSection ${SEC_freetype}
   !insertmacro SelectSection ${SEC_qtwinextras}
   !insertmacro SelectSection ${SEC_extra-cmake-modules}
   !insertmacro SelectSection ${SEC_libpng}
   !insertmacro SelectSection ${SEC_tiff}
   !insertmacro SelectSection ${SEC_openjpeg}
   !insertmacro SelectSection ${SEC_jpeg}
   skip_okular:
 !endif
 
 !ifdef HAVE_PKG_KLEOPATRA
 !ifndef SOURCES
   ${IfNot} ${AtLeastWin7}
     # Disable Kleo for Windows below 7
     SectionSetFlags ${SEC_kleopatra} 16
   ${Endif}
 !endif
   !insertmacro SectionFlagIsSet ${SEC_kleopatra} ${SF_SELECTED} have_kleopatra skip_kleopatra
   have_kleopatra:
   !insertmacro SelectSection ${SEC_gpgme}
   !insertmacro SelectSection ${SEC_compendium}
   !insertmacro SelectSection ${SEC_qtbase}
   !insertmacro SelectSection ${SEC_breeze_icons}
   !insertmacro SelectSection ${SEC_kconfig}
   !insertmacro SelectSection ${SEC_ki18n}
   !insertmacro SelectSection ${SEC_kwidgetsaddons}
   !insertmacro SelectSection ${SEC_kcompletion}
   !insertmacro SelectSection ${SEC_kwindowsystem}
   !insertmacro SelectSection ${SEC_kcoreaddons}
   !insertmacro SelectSection ${SEC_kcodecs}
   !insertmacro SelectSection ${SEC_kconfigwidgets}
   !insertmacro SelectSection ${SEC_kxmlgui}
   !insertmacro SelectSection ${SEC_kitemviews}
   !insertmacro SelectSection ${SEC_kitemmodels}
   !insertmacro SelectSection ${SEC_kiconthemes}
   !insertmacro SelectSection ${SEC_karchive}
   !insertmacro SelectSection ${SEC_kio}
   !insertmacro SelectSection ${SEC_kjobwidgets}
   !insertmacro SelectSection ${SEC_solid}
   !insertmacro SelectSection ${SEC_kservice}
   !insertmacro SelectSection ${SEC_kbookmarks}
 # KArchive depdens on zlib
   !insertmacro SelectSection ${SEC_zlib}
   !insertmacro SelectSection ${SEC_kcrash}
   !insertmacro SelectSection ${SEC_kguiaddons}
   !insertmacro SelectSection ${SEC_qtsvg}
   !insertmacro SelectSection ${SEC_qttranslations}
   !insertmacro SelectSection ${SEC_kmime}
   !insertmacro SelectSection ${SEC_kde_l10n}
   !insertmacro SelectSection ${SEC_libkleo}
   !insertmacro SelectSection ${SEC_qttools}
   !insertmacro SelectSection ${SEC_qtwinextras}
   !insertmacro SelectSection ${SEC_extra-cmake-modules}
   skip_kleopatra:
 !endif
 
 
 !insertmacro SectionFlagIsSet ${SEC_gpgme_browser} ${SF_SELECTED} have_gpgme_browser skip_gpgme_browser
 have_gpgme_browser:
 !insertmacro SelectSection ${SEC_gpgme}
 skip_gpgme_browser:
 
 # Now the implicitely installed packages.
 
 !ifdef HAVE_PKG_GPGME
   !insertmacro SectionFlagIsSet ${SEC_gpgme} \
 		${SF_SELECTED} have_gpgme skip_gpgme
   have_gpgme:
   # GPGME does not depend on gnupg2.  Do this in the
   # actual application instead.
   !insertmacro SelectSection ${SEC_libgpg_error}
   !insertmacro SelectSection ${SEC_libassuan}
 !ifdef HAVE_PKG_QTBASE
   !insertmacro SelectSection ${SEC_qtbase}
 !endif
    skip_gpgme:
 !endif
 
 !ifdef HAVE_PKG_PINENTRY
   !insertmacro SectionFlagIsSet ${SEC_pinentry} \
 		${SF_SELECTED} have_pinentry skip_pinentry
   have_pinentry:
   !insertmacro SelectSection ${SEC_libiconv}
   !insertmacro SelectSection ${SEC_libgpg_error}
   !insertmacro SelectSection ${SEC_libassuan}
 !ifdef HAVE_PKG_QTBASE
   !insertmacro SelectSection ${SEC_qtbase}
 !endif
 # BEGIN MSI IGNORE
 !ifdef HAVE_PKG_GTK_
   !insertmacro SelectSection ${SEC_gtk_}
 !endif
 # END MSI IGNORE
    skip_pinentry:
 !endif
 
 !ifdef HAVE_PKG_QTBASE
   !ifndef SOURCES
   ${IfNot} ${AtLeastWin7}
     # Disable qt for Windows below 7
     !insertmacro UnSelectSection ${SEC_qtbase}
   ${Endif}
   !endif
   !insertmacro SectionFlagIsSet ${SEC_qtbase} \
 		${SF_SELECTED} have_qt skip_qt
   have_qt:
   !insertmacro SelectSection ${SEC_zlib}
   !insertmacro SelectSection ${SEC_qttranslations}
   skip_qt:
 !endif
 
 !ifdef HAVE_PKG_LIBASSUAN
   !insertmacro SectionFlagIsSet ${SEC_libassuan} ${SF_SELECTED} have_libassuan skip_libassuan
   have_libassuan:
   !insertmacro SelectSection ${SEC_libgpg_error}
   skip_libassuan:
 !endif
 
 !ifdef HAVE_PKG_LIBGPG_ERROR
   !insertmacro SectionFlagIsSet ${SEC_libgpg_error} ${SF_SELECTED} have_libgpg_error skip_libgpg_error
   have_libgpg_error:
   !insertmacro SelectSection ${SEC_libiconv}
   !insertmacro SelectSection ${SEC_gettext}
   skip_libgpg_error:
 !endif
 
   # Package "bzip2" has no dependencies.
 
   # Package "pkgconfig" has no dependencies.
 
   # Package "zlib" has no dependencies.
 
 !ifdef HAVE_PKG_GETTEXT
   !insertmacro SectionFlagIsSet ${SEC_gettext} \
 		${SF_SELECTED} have_gettext skip_gettext
   have_gettext:
   !insertmacro SelectSection ${SEC_libiconv}
   skip_gettext:
 !endif
 
   # Package "libiconv" has no dependencies.
 
 FunctionEnd
 
 Function .onInstFailed
   Delete $TEMP\gpgspltmp.wav
 FunctionEnd
 
 Function .onInstSuccess
   ${MementoSectionSave}
   Delete $TEMP\gpgspltmp.wav
 FunctionEnd
 
 Function .onSelChange
   Call CalcDepends
 FunctionEnd
 
 
 
 # This also must be in a central place.  Also Urgs.
 
 Section "-startmenu"
 
   UserInfo::GetAccountType
   Pop $1
   StrCmp $1 "Admin" is_admin is_no_admin
 is_admin:
   SetShellVarContext all
 
 is_no_admin:
 
   # NOT SetOutPath.
   StrCpy $OUTDIR "%HOMEDRIVE%%HOMEPATH%"
 
   # Check if the start menu entries where requested.
   g4wihelp::config_fetch_bool "inst_start_menu"
   StrCmp $R0 "0" no_start_menu
 
 
 !ifdef HAVE_PKG_KLEOPATRA
     SectionGetFlags ${SEC_kleopatra} $R0
     IntOp $R0 $R0 & ${SF_SELECTED}
     IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_menu
     CreateShortCut "$SMPROGRAMS\Kleopatra.lnk" \
 	"$INSTDIR\bin\kleopatra.exe" \
         "" "$INSTDIR\bin\kleopatra.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
   no_kleopatra_menu:
 !endif
 
 !ifdef HAVE_PKG_OKULAR
     SectionGetFlags ${SEC_okular} $R0
     IntOp $R0 $R0 & ${SF_SELECTED}
     IntCmp $R0 ${SF_SELECTED} 0 no_okular_menu
-    CreateShortCut "$SMPROGRAMS\Okular.lnk" \
+    CreateShortCut "$SMPROGRAMS\Okular (GnuPG Edition).lnk" \
 	"$INSTDIR\bin\okular.exe" \
         "" "$INSTDIR\bin\okular.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_okular)
   no_okular_menu:
 !endif
 
  no_start_menu:
 
   # Check if the desktop entries where requested.
   g4wihelp::config_fetch_bool "inst_desktop"
   StrCmp $R0 "0" no_desktop
 
 !ifdef HAVE_PKG_KLEOPATRA
     SectionGetFlags ${SEC_kleopatra} $R0
     IntOp $R0 $R0 & ${SF_SELECTED}
     IntCmp $R0 ${SF_SELECTED} 0 no_kleopatra_desktop
     StrCmp $is_update '1' no_kleopatra_desktop
     CreateShortCut "$DESKTOP\Kleopatra.lnk" \
 	"$INSTDIR\bin\kleopatra.exe" \
         "" "$INSTDIR\bin\kleopatra.exe" "" SW_SHOWNORMAL "" $(DESC_Menu_kleopatra)
   no_kleopatra_desktop:
 !endif
 
 no_desktop:
 
 SectionEnd