[Gpg4win-commits] [git] Gpg4win - branch, kleo-kf5, updated. gpg4win-2.3.0-58-g7eccb7a

by Andre Heinecke cvs at cvs.gnupg.org
Thu Feb 4 16:04:01 CET 2016


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG for Windows".

The branch, kleo-kf5 has been updated
       via  7eccb7a7780b1dc64e6d99eeb5233bffd8062f15 (commit)
       via  b8d3627cd017e366c51a6c80ff557cc908edcec1 (commit)
       via  b9f95b92d813c53bdcce381f8244b0f616604a37 (commit)
       via  d3fd0974b50b543639cf4b80b9acdddd977aabb9 (commit)
       via  c9474bebd270fb4e12ec425fb5bf284b2f57e694 (commit)
       via  fe48e23fe666d6a758298555fec6e6bcaec9ae1d (commit)
      from  7df70cf214a6ece070186b813f1f74b257037415 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 7eccb7a7780b1dc64e6d99eeb5233bffd8062f15
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Feb 4 15:56:34 2016 +0100

    Build Kleopatra from source. Switch to breeze.
    
    * configure.ac: Change kleo to KDEPKG add breeze icons.
    * packages/packages.current (kleopatra): New.
    * src/Makefile.am(EXTRA_DIST): Update. Add index.theme.
      (gpg4win_kdepkgs): Declare new packages
      (gpg4win_bpkgs): Remove kleo and oxygen-icons.
      (gpg4win_bpkgs): Remove bsfilter as its not packaged.
      (gpg4win_pkg_kleopatra_post_install): Disable for now.
    * src/config.in.nsi: Update defines.
    * src/inst-sections.nsi: Update. Fix kiconthemes include.
    * src/inst-kleopatra.nsi, src/uninst-kleopatra.nsi: Update.
    * src/inst-breeze-icons.nsi, src/uninst-breeze-icons.nsi:
     New. Generated with help from pkg2nsi.
    * src/inst-oxygen-icons.nsi, src/uninst-oxygen-icons.nsi: Removed.
    * src/index.theme: Index for hicolor theme is neccessary for QTheme
     support.
    
    --
    Phew. For now this installs breeze and breeze-dark themes. Removing
    one later will be quick.
    Localization is not yet done and Kleopatra itself has some regressions
    that need to be fixed.

diff --git a/configure.ac b/configure.ac
index 515345f..432b448 100644
--- a/configure.ac
+++ b/configure.ac
@@ -339,13 +339,13 @@ GPG4WIN_IPKG([compendium])
 GPG4WIN_BPKG_BINSRC([gnupg-w32])
 
 # Qt related stuff.
-GPG4WIN_BPKG_BINSRC([oxygen-icons])
 GPG4WIN_SPKG([qtbase], [libpng])
 GPG4WIN_SPKG([qttools], [qtbase])
 GPG4WIN_SPKG([qtwinextras], [qtbase])
 GPG4WIN_SPKG([qtsvg], [qtbase])
 GPG4WIN_SPKG([boost], [expat zlib bzip2])
-GPG4WIN_BPKG_BINSRC([kleopatra], [kxmlgui libkleo oxygen-icons])
+GPG4WIN_KDEPKG([breeze-icons], [extra-cmake-modules])
+GPG4WIN_KDEPKG([kleopatra], [breeze-icons kxmlgui libkleo])
 GPG4WIN_KDEPKG([extra-cmake-modules])
 GPG4WIN_KDEPKG([kconfig], [qtbase qttools extra-cmake-modules])
 GPG4WIN_KDEPKG([ki18n], [qtbase gettext qttools extra-cmake-modules])
diff --git a/packages/packages.current b/packages/packages.current
index 21ef378..c805957 100644
--- a/packages/packages.current
+++ b/packages/packages.current
@@ -470,6 +470,13 @@ chk c10a50c6607e548f9d5727040971cbe8e1074851
 file 5.18/kiconthemes-5.18.0.tar.xz
 chk 015547e8939aad42bcff53daee344011cc3772f4
 
+# breeze-icons
+# last changed: 2016-02-04
+# by: ah
+# verified: https://www.kde.org/info/kde-frameworks-5.18.0.php
+file 5.18/breeze-icons-5.18.0.tar.xz
+chk 89efd0ae68895326747b8e2b2577bd2b4cc46e13
+
 # KDE Applications
 #
 # Devel versions are needed until Kleopatra can be based on
@@ -516,28 +523,9 @@ chk 0a9bbe73a2a2f24ee2addfb47f642646d2eae996
 file libkleo/libkleo-201601221448.tar.xz
 chk 668b115e7e025b5408f53ced73056f5c4f660993
 
-# oxygen-icons
-server http://files.kolab.org/local/gpg4win
-
-file oxygen-icons-20141125-bin.tar.bz2
-chk  744dbbc7585205948fa62d63c9dbb8c6dd8fc9fb
-
-file oxygen-icons-20141125-src.tar.bz2
-chk  e2af27d711d528c21fd2bf73639da1cd2c811f7a
-
-
-#
-# kleopatra (and her KDE dependencies)
-#
-#
-server http://files.kolab.org/local/gpg4win
-
-# This is kdepim/gpg4win branch fb4ae3dc8
-file kleopatra-20151117-bin.tar.xz
-chk  5ebb215985ecf379b16d49c251fb0d92aff902c5
-
-# This also includes the sources for kdelibs
-# kdewin win-iconv and kdepimlibs which
-# are part of binaries in the kleopatra bin package
-file kleopatra-20151117-src.tar.xz
-chk  c7d6b7fa4b9d7a354ddce726913a65fcc59b9323
+# Kleopatra
+# last changed: 2016-02-04
+# by: ah
+# verified: Tarball created by ah.
+file kleopatra/kleopatra-201602041528.tar.gz
+chk c377cbf3acbd8c415d1d1f7f5ff956fc37d0d33c
diff --git a/src/Makefile.am b/src/Makefile.am
index 99e490a..d631732 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -57,7 +57,6 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
         inst-w32pth.nsi		   uninst-w32pth.nsi	      \
         inst-zlib.nsi        	   uninst-zlib.nsi            \
         inst-kconfig.nsi        uninst-kconfig.nsi              \
-        inst-oxygen-icons.nsi  	   uninst-oxygen-icons.nsi    \
         inst-kleopatra.nsi  	   uninst-kleopatra.nsi       \
 	inst-bzip2.nsi             uninst-bzip2.nsi           \
         uninst-claws-mail.nsi uninst-claws-mail-cmds.nsi \
@@ -73,6 +72,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
         inst-kconfigwidgets.nsi uninst-kconfigwidgets.nsi \
         inst-kxmlgui.nsi uninst-kxmlgui.nsi \
         inst-kiconthemes.nsi uninst-kiconthemes.nsi \
+        inst-breeze-icons.nsi uninst-breeze-icons.nsi \
         inst-kitemviews.nsi uninst-kitemviews.nsi \
         inst-kguiaddons.nsi uninst-kguiaddons.nsi \
         inst-kmime.nsi uninst-kmime.nsi \
@@ -80,7 +80,7 @@ EXTRA_DIST = pkg-config gpg4win.nsi gpg4win-src.nsi \
         inst-qttools.nsi uninst-qttools.nsi \
         inst-boost.nsi uninst-boost.nsi \
         inst-extra-cmake-modules.nsi uninst-extra-cmake-modules.nsi \
-        inst-final.nsi
+        inst-final.nsi index.theme
 
 SUBDIRS = dictionaries
 
@@ -113,7 +113,7 @@ gpg4win_spkgs = glib libffi gdk-pixbuf gtk+ \
 gpg4win_kdepkgs = kconfig kwidgetsaddons gpgmepp ki18n extra-cmake-modules \
                   kcompletion kwindowsystem kcoreaddons libkleo kcodecs \
                   kmime kconfigwidgets kxmlgui kguiaddons kitemviews \
-                  kiconthemes
+                  kiconthemes kleopatra breeze-icons
 
 # Supported source packages to build in an additional architecture
 gpg4win_expkgs = libgpg-error libassuan libiconv gettext w32pth gpgex gpgol \
@@ -333,6 +333,9 @@ define gpg4win_pkg_qtsvg_post_install
   mv $$$${pkgidir}/lib/*.dll $$$${pkgidir}/bin;)
 endef
 
+gpg4win_pkg_kleopatra_configure = \
+    -DFORCE_DISABLE_KCMUTILS=ON
+
 # Supported make-only source packages.
 gpg4win_mpkgs = bzip2 zlib
 
@@ -353,7 +356,7 @@ gpg4win_pkg_zlib_make_args_inst = -fwin32/Makefile.gcc install \
 
 # Supported binary packages.
 gpg4win_bpkgs = pkgconfig pango expat freetype fontconfig \
-                cairo atk oxygen-icons kleopatra bsfilter gnupg-w32
+                cairo atk gnupg-w32
 
 # libiconv needs some special magic to generate a usable import
 # library.
@@ -453,13 +456,14 @@ endef
 
 # We don't use khelpcenter in kleopatra so remove the help links and
 # point to the correct common folder
-define gpg4win_pkg_kleopatra_post_install
- (for i in de en ; do \
-    (cd $$$${pkgidir}/share/doc/HTML/$$$${i}; \
-     perl -pi -e 's/help:\///g' `find . -name \*.html`; \
-     perl -pi -e 's at common/@../../common/@g' `find . -name \*.html`); \
- done)
-endef
+# TODO Needs to be fixed with current doc
+#define gpg4win_pkg_kleopatra_post_install
+# (for i in de en ; do \
+#    (cd $$$${pkgidir}/share/doc/HTML/$$$${i}; \
+#     perl -pi -e 's/help:\///g' `find . -name \*.html`; \
+#     perl -pi -e 's at common/@../../common/@g' `find . -name \*.html`); \
+# done)
+#endef
 
 
 #define gpg4win_pkg_libiconv_post_install
diff --git a/src/config.nsi.in b/src/config.nsi.in
index d80c1d9..e4c58f4 100644
--- a/src/config.nsi.in
+++ b/src/config.nsi.in
@@ -177,10 +177,10 @@
 !define gpg4win_pkg_qtbase_version @gpg4win_pkg_qtbase_version@
 !define gpg4win_pkg_qtbase_src @gpg4win_pkg_qtbase_src@
 
- at HAVE_PKG_OXYGEN_ICONS@
-!define gpg4win_pkg_oxygen_icons @gpg4win_pkg_oxygen_icons@
-!define gpg4win_pkg_oxygen_icons_version @gpg4win_pkg_oxygen_icons_version@
-!define gpg4win_pkg_oxygen_icons_src @gpg4win_pkg_oxygen_icons_src@
+ at HAVE_PKG_BREEZE_ICONS@
+!define gpg4win_pkg_breeze_icons @gpg4win_pkg_breeze_icons@
+!define gpg4win_pkg_breeze_icons_version @gpg4win_pkg_breeze_icons_version@
+!define gpg4win_pkg_breeze_icons_src @gpg4win_pkg_breeze_icons_src@
 
 @HAVE_PKG_KLEOPATRA@
 !define gpg4win_pkg_kleopatra @gpg4win_pkg_kleopatra@
diff --git a/src/index.theme b/src/index.theme
new file mode 100644
index 0000000..033734f
--- /dev/null
+++ b/src/index.theme
@@ -0,0 +1,43 @@
+[Icon Theme]
+Name=Hicolor
+Name[de]=Hicolor
+
+DisplayDepth=32
+
+Inherits=hicolor
+Directories=16x16/apps,22x22/apps,32x32/apps,48x48/apps,64x64/apps,128x129/apps,256x256/apps
+
+[16x16/apps]
+Size=16
+Context=Applications
+Type=Threshold
+
+[22x22/apps]
+Size=22
+Context=Applications
+Type=Threshold
+
+[32x32/apps]
+Size=32
+Context=Applications
+Type=Threshold
+
+[48x48/apps]
+Size=48
+Context=Applications
+Type=Threshold
+
+[64x64/apps]
+Size=64
+Context=Applications
+Type=Threshold
+
+[128x128/apps]
+Size=128
+Context=Applications
+Type=Threshold
+
+[256x256/apps]
+Size=256
+Context=Applications
+Type=Threshold
diff --git a/src/inst-breeze-icons.nsi b/src/inst-breeze-icons.nsi
new file mode 100644
index 0000000..6ac038a
--- /dev/null
+++ b/src/inst-breeze-icons.nsi
@@ -0,0 +1,533 @@
+# inst-breeze-icons.nsi - Snippet for breeze-icons.   -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 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}/breeze-icons-${gpg4win_pkg_breeze_icons_version}
+
+!ifdef DEBUG
+Section "breeze-icons" SEC_breeze_icons
+!else
+Section "-breeze-icons" SEC_breeze_icons
+!endif
+  SetOutPath "$INSTDIR"
+!ifdef SOURCES
+  File "${gpg4win_pkg_breeze_icons_src}"
+!else
+
+  #
+  # Note: You may want to use the pkg-to-nsi.pl script to create the
+  # list of icons.
+  #
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\16"
+
+  File ${prefix}/share/icons/breeze-dark/actions/16/application-exit.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/arrow-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/arrow-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/configure-shortcuts.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/configure-toolbars.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/dialog-close.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/dialog-ok.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-edit-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-open.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-print.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/document-revert.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/draw-arrow-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/draw-arrow-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-clear-locationbar-rtl.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-delete.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-find.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-paste.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-redo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-rename.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/edit-undo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-bottom.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-first.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-last.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-next.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-previous.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-top.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/go-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/help-contents.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/help-contextual.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/list-add.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/list-remove.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/process-stop.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/run-build-configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/settings-configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/tab-close.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/tab-duplicate.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/tab-new-background.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/tools-report-bug.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/view-refresh.svg
+  File ${prefix}/share/icons/breeze-dark/actions/16/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\22"
+
+  File ${prefix}/share/icons/breeze-dark/actions/22/application-exit.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/arrow-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/arrow-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/configure-shortcuts.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/configure-toolbars.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/dialog-close.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/dialog-ok.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-edit-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-open.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-print.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/document-revert.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/draw-arrow-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/draw-arrow-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-clear-locationbar-rtl.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-delete.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-find.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-paste.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-redo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-rename.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/edit-undo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-bottom.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-first.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-last.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-next.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-previous.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-top.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/go-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/help-contents.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/help-contextual.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/list-add.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/list-remove.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/process-stop.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/run-build-configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/settings-configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/tab-close.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/tab-duplicate.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/tab-new-background.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/tools-report-bug.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-add.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-export-secret.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-export-server.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-export.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-import.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-server-configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-certificate-sign.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/view-refresh.svg
+  File ${prefix}/share/icons/breeze-dark/actions/22/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\24"
+
+  File ${prefix}/share/icons/breeze-dark/actions/24/application-exit.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/arrow-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/arrow-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/configure-toolbars.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/dialog-close.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/dialog-ok.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-edit-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-open.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-print.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/document-revert.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/draw-arrow-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/draw-arrow-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-clear-locationbar-rtl.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-delete.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-find.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-paste.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-redo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-rename.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/edit-undo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-bottom.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-down.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-first.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-last.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-next.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-previous.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-top.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/go-up.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/gtk-tab-duplicate.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/help-contextual.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/list-add.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/list-remove.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/process-stop.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/run-build-configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/tab-close.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/tab-duplicate.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/tab-new-background.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/tools-report-bug.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/view-refresh.svg
+  File ${prefix}/share/icons/breeze-dark/actions/24/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\actions\32"
+
+  File ${prefix}/share/icons/breeze-dark/actions/32/application-exit.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/configure.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-open.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-print.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/document-revert.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/edit-delete.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/edit-redo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/edit-undo.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/view-refresh.svg
+  File ${prefix}/share/icons/breeze-dark/actions/32/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\apps\22"
+
+  File ${prefix}/share/icons/breeze-dark/apps/22/internet-mail.svg
+  File ${prefix}/share/icons/breeze-dark/apps/22/kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\apps\32"
+
+  File ${prefix}/share/icons/breeze-dark/apps/32/preferences-desktop-locale.svg
+  File ${prefix}/share/icons/breeze-dark/apps/32/preferences-system-network.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\apps\48"
+
+  File ${prefix}/share/icons/breeze-dark/apps/48/internet-mail.svg
+  File ${prefix}/share/icons/breeze-dark/apps/48/telepathy-kde.svg
+  File ${prefix}/share/icons/breeze-dark/apps/48/usb-creator-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\categories\32"
+
+  File ${prefix}/share/icons/breeze-dark/categories/32/applications-graphics.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark"
+
+  File ${prefix}/share/icons/breeze-dark/index.theme
+  File ${prefix}/share/icons/breeze-dark/icon-theme.cache
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\places\16"
+
+  File ${prefix}/share/icons/breeze-dark/places/16/start-here-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\places\22"
+
+  File ${prefix}/share/icons/breeze-dark/places/22/start-here-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\places\64"
+
+  File ${prefix}/share/icons/breeze-dark/places/64/start-here-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\status\16"
+
+  File ${prefix}/share/icons/breeze-dark/status/16/dialog-information.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\status\22"
+
+  File ${prefix}/share/icons/breeze-dark/status/22/dialog-information.svg
+  File ${prefix}/share/icons/breeze-dark/status/22/security-high.svg
+  File ${prefix}/share/icons/breeze-dark/status/22/security-low.svg
+  File ${prefix}/share/icons/breeze-dark/status/22/security-medium.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\status\24"
+
+  File ${prefix}/share/icons/breeze-dark/status/24/dialog-information.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze-dark\status\64"
+
+  File ${prefix}/share/icons/breeze-dark/status/64/dialog-error.svg
+  File ${prefix}/share/icons/breeze-dark/status/64/dialog-information.svg
+  File ${prefix}/share/icons/breeze-dark/status/64/dialog-password.svg
+  File ${prefix}/share/icons/breeze-dark/status/64/dialog-warning.svg
+  File ${prefix}/share/icons/breeze-dark/status/64/security-high.svg
+  File ${prefix}/share/icons/breeze-dark/status/64/security-low.svg
+  File ${prefix}/share/icons/breeze-dark/status/64/security-medium.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\actions\16"
+
+  File ${prefix}/share/icons/breeze/actions/16/application-exit.svg
+  File ${prefix}/share/icons/breeze/actions/16/arrow-down.svg
+  File ${prefix}/share/icons/breeze/actions/16/arrow-up.svg
+  File ${prefix}/share/icons/breeze/actions/16/configure-shortcuts.svg
+  File ${prefix}/share/icons/breeze/actions/16/configure-toolbars.svg
+  File ${prefix}/share/icons/breeze/actions/16/configure.svg
+  File ${prefix}/share/icons/breeze/actions/16/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze/actions/16/dialog-close.svg
+  File ${prefix}/share/icons/breeze/actions/16/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze/actions/16/dialog-ok.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-edit-verify.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-open.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-print.svg
+  File ${prefix}/share/icons/breeze/actions/16/document-revert.svg
+  File ${prefix}/share/icons/breeze/actions/16/draw-arrow-down.svg
+  File ${prefix}/share/icons/breeze/actions/16/draw-arrow-up.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-clear-locationbar-rtl.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-delete.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-find.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-paste.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-redo.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-rename.svg
+  File ${prefix}/share/icons/breeze/actions/16/edit-undo.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-bottom.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-down.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-first.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-last.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-next.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-previous.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-top.svg
+  File ${prefix}/share/icons/breeze/actions/16/go-up.svg
+  File ${prefix}/share/icons/breeze/actions/16/help-contents.svg
+  File ${prefix}/share/icons/breeze/actions/16/help-contextual.svg
+  File ${prefix}/share/icons/breeze/actions/16/list-add.svg
+  File ${prefix}/share/icons/breeze/actions/16/list-remove.svg
+  File ${prefix}/share/icons/breeze/actions/16/process-stop.svg
+  File ${prefix}/share/icons/breeze/actions/16/run-build-configure.svg
+  File ${prefix}/share/icons/breeze/actions/16/settings-configure.svg
+  File ${prefix}/share/icons/breeze/actions/16/tab-close.svg
+  File ${prefix}/share/icons/breeze/actions/16/tab-duplicate.svg
+  File ${prefix}/share/icons/breeze/actions/16/tab-new-background.svg
+  File ${prefix}/share/icons/breeze/actions/16/tools-report-bug.svg
+  File ${prefix}/share/icons/breeze/actions/16/view-refresh.svg
+  File ${prefix}/share/icons/breeze/actions/16/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\actions\22"
+
+  File ${prefix}/share/icons/breeze/actions/22/application-exit.svg
+  File ${prefix}/share/icons/breeze/actions/22/arrow-down.svg
+  File ${prefix}/share/icons/breeze/actions/22/arrow-up.svg
+  File ${prefix}/share/icons/breeze/actions/22/configure-shortcuts.svg
+  File ${prefix}/share/icons/breeze/actions/22/configure-toolbars.svg
+  File ${prefix}/share/icons/breeze/actions/22/configure.svg
+  File ${prefix}/share/icons/breeze/actions/22/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze/actions/22/dialog-close.svg
+  File ${prefix}/share/icons/breeze/actions/22/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze/actions/22/dialog-ok.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-edit-verify.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-open.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-print.svg
+  File ${prefix}/share/icons/breeze/actions/22/document-revert.svg
+  File ${prefix}/share/icons/breeze/actions/22/draw-arrow-down.svg
+  File ${prefix}/share/icons/breeze/actions/22/draw-arrow-up.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-clear-locationbar-rtl.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-delete.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-find.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-paste.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-redo.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-rename.svg
+  File ${prefix}/share/icons/breeze/actions/22/edit-undo.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-bottom.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-down.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-first.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-last.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-next.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-previous.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-top.svg
+  File ${prefix}/share/icons/breeze/actions/22/go-up.svg
+  File ${prefix}/share/icons/breeze/actions/22/help-contents.svg
+  File ${prefix}/share/icons/breeze/actions/22/help-contextual.svg
+  File ${prefix}/share/icons/breeze/actions/22/list-add.svg
+  File ${prefix}/share/icons/breeze/actions/22/list-remove.svg
+  File ${prefix}/share/icons/breeze/actions/22/process-stop.svg
+  File ${prefix}/share/icons/breeze/actions/22/run-build-configure.svg
+  File ${prefix}/share/icons/breeze/actions/22/settings-configure.svg
+  File ${prefix}/share/icons/breeze/actions/22/tab-close.svg
+  File ${prefix}/share/icons/breeze/actions/22/tab-duplicate.svg
+  File ${prefix}/share/icons/breeze/actions/22/tab-new-background.svg
+  File ${prefix}/share/icons/breeze/actions/22/tools-report-bug.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-add.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-export-secret.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-export-server.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-export.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-import.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-server-configure.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-certificate-sign.svg
+  File ${prefix}/share/icons/breeze/actions/22/view-refresh.svg
+  File ${prefix}/share/icons/breeze/actions/22/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\actions\24"
+
+  File ${prefix}/share/icons/breeze/actions/24/application-exit.svg
+  File ${prefix}/share/icons/breeze/actions/24/arrow-down.svg
+  File ${prefix}/share/icons/breeze/actions/24/arrow-up.svg
+  File ${prefix}/share/icons/breeze/actions/24/configure-toolbars.svg
+  File ${prefix}/share/icons/breeze/actions/24/configure.svg
+  File ${prefix}/share/icons/breeze/actions/24/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze/actions/24/dialog-close.svg
+  File ${prefix}/share/icons/breeze/actions/24/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze/actions/24/dialog-ok.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-edit-verify.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-open.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-print.svg
+  File ${prefix}/share/icons/breeze/actions/24/document-revert.svg
+  File ${prefix}/share/icons/breeze/actions/24/draw-arrow-down.svg
+  File ${prefix}/share/icons/breeze/actions/24/draw-arrow-up.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-clear-locationbar-rtl.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-delete.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-find.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-paste.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-redo.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-rename.svg
+  File ${prefix}/share/icons/breeze/actions/24/edit-undo.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-bottom.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-down.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-first.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-last.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-next.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-previous.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-top.svg
+  File ${prefix}/share/icons/breeze/actions/24/go-up.svg
+  File ${prefix}/share/icons/breeze/actions/24/gtk-tab-duplicate.svg
+  File ${prefix}/share/icons/breeze/actions/24/help-contextual.svg
+  File ${prefix}/share/icons/breeze/actions/24/list-add.svg
+  File ${prefix}/share/icons/breeze/actions/24/list-remove.svg
+  File ${prefix}/share/icons/breeze/actions/24/process-stop.svg
+  File ${prefix}/share/icons/breeze/actions/24/run-build-configure.svg
+  File ${prefix}/share/icons/breeze/actions/24/tab-close.svg
+  File ${prefix}/share/icons/breeze/actions/24/tab-duplicate.svg
+  File ${prefix}/share/icons/breeze/actions/24/tab-new-background.svg
+  File ${prefix}/share/icons/breeze/actions/24/tools-report-bug.svg
+  File ${prefix}/share/icons/breeze/actions/24/view-refresh.svg
+  File ${prefix}/share/icons/breeze/actions/24/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\actions\32"
+
+  File ${prefix}/share/icons/breeze/actions/32/application-exit.svg
+  File ${prefix}/share/icons/breeze/actions/32/configure.svg
+  File ${prefix}/share/icons/breeze/actions/32/dialog-cancel.svg
+  File ${prefix}/share/icons/breeze/actions/32/dialog-ok-apply.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-edit-decrypt-verify.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-edit-decrypt.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-edit-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-edit-sign-encrypt.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-edit-sign.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-open.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-print.svg
+  File ${prefix}/share/icons/breeze/actions/32/document-revert.svg
+  File ${prefix}/share/icons/breeze/actions/32/edit-delete.svg
+  File ${prefix}/share/icons/breeze/actions/32/edit-redo.svg
+  File ${prefix}/share/icons/breeze/actions/32/edit-undo.svg
+  File ${prefix}/share/icons/breeze/actions/32/view-refresh.svg
+  File ${prefix}/share/icons/breeze/actions/32/window-close.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\apps\22"
+
+  File ${prefix}/share/icons/breeze/apps/22/internet-mail.svg
+  File ${prefix}/share/icons/breeze/apps/22/kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\apps\32"
+
+  File ${prefix}/share/icons/breeze/apps/32/preferences-desktop-locale.svg
+  File ${prefix}/share/icons/breeze/apps/32/preferences-system-network.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\apps\48"
+
+  File ${prefix}/share/icons/breeze/apps/48/internet-mail.svg
+  File ${prefix}/share/icons/breeze/apps/48/telepathy-kde.svg
+  File ${prefix}/share/icons/breeze/apps/48/usb-creator-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\categories\32"
+
+  File ${prefix}/share/icons/breeze/categories/32/applications-graphics.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze"
+
+  File ${prefix}/share/icons/breeze/index.theme
+  File ${prefix}/share/icons/breeze/icon-theme.cache
+
+  SetOutPath "$INSTDIR\share\icons\breeze\places\16"
+
+  File ${prefix}/share/icons/breeze/places/16/start-here-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\places\22"
+
+  File ${prefix}/share/icons/breeze/places/22/start-here-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\places\64"
+
+  File ${prefix}/share/icons/breeze/places/64/start-here-kde.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\status\16"
+
+  File ${prefix}/share/icons/breeze/status/16/dialog-information.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\status\22"
+
+  File ${prefix}/share/icons/breeze/status/22/dialog-information.svg
+  File ${prefix}/share/icons/breeze/status/22/security-high.svg
+  File ${prefix}/share/icons/breeze/status/22/security-low.svg
+  File ${prefix}/share/icons/breeze/status/22/security-medium.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\status\24"
+
+  File ${prefix}/share/icons/breeze/status/24/dialog-information.svg
+
+  SetOutPath "$INSTDIR\share\icons\breeze\status\64"
+
+  File ${prefix}/share/icons/breeze/status/64/dialog-error.svg
+  File ${prefix}/share/icons/breeze/status/64/dialog-information.svg
+  File ${prefix}/share/icons/breeze/status/64/dialog-password.svg
+  File ${prefix}/share/icons/breeze/status/64/dialog-warning.svg
+  File ${prefix}/share/icons/breeze/status/64/security-high.svg
+  File ${prefix}/share/icons/breeze/status/64/security-low.svg
+  File ${prefix}/share/icons/breeze/status/64/security-medium.svg
+
+!endif
+SectionEnd
diff --git a/src/inst-kleopatra.nsi b/src/inst-kleopatra.nsi
index bab6f58..09779bb 100644
--- a/src/inst-kleopatra.nsi
+++ b/src/inst-kleopatra.nsi
@@ -28,193 +28,140 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 !ifdef SOURCES
   # Kleopatra Source Package also contains kdepimlibs, kdelibs and
   # kde-runtime, as well as win-iconv and attica
-  File "${gpg4win_pkg_kleopatra_src}"
+  File "${gpg4win_pkg_kleopatra}"
 !else
 
-  # Relocate this when dbus-daemon is relocated.
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/kleopatra.exe
-  File ${prefix}/bin/kdebugdialog.exe
-  File ${prefix}/bin/kwatchgnupg.exe
-  File ${prefix}/bin/kbuildsycoca4.exe
-
-  # Path lookups are relative to libkdecore so it currently needs to be
-  # in bin
-  File ${prefix}/bin/libkdecore.dll
-
-#  File ${prefix}/bin/kcmdwrapper.exe
-  File ${prefix}/bin/libattica.dll
-  File ${prefix}/bin/libdbusmenu-qt.dll
-  File ${prefix}/bin/libgcc_s_sjlj-1.dll
-  File ${prefix}/bin/libgpgme++.dll
-  File ${prefix}/bin/libintl.dll
-  File ${prefix}/bin/libkcmutils.dll
-  File ${prefix}/bin/libkdeui.dll
-  File ${prefix}/bin/libkdewin.dll
-  File ${prefix}/bin/libkleo.dll
+  #File ${prefix}/bin/kwatchgnupg.exe
+
   File ${prefix}/bin/libkleopatraclientcore.dll
   File ${prefix}/bin/libkleopatraclientgui.dll
-  File ${prefix}/bin/libkmime.dll
-  File ${prefix}/bin/libqgpgme.dll
-
-  SetOutPath "$INSTDIR\lib\kde4"
-
-  # This should be made build static
-  File ${prefix}/lib/kde4/kcm_kleopatra.dll
-
-  SetOutPath "$INSTDIR\share\applications\kde4"
-
-  File ${prefix}/share/applications/kde4/kleopatra.desktop
-  File ${prefix}/share/applications/kde4/kleopatra_import.desktop
-
-  SetOutPath "$INSTDIR\share\apps\kleopatra"
-
-  File ${prefix}/share/apps/kleopatra/kleopatra.rc
-
-  SetOutPath "$INSTDIR\share\apps\kleopatra\pics"
-
-  File ${prefix}/share/apps/kleopatra/pics/gpg4win-compact.png
-  File ${prefix}/share/apps/kleopatra/pics/gpg4win.png
-  File ${prefix}/share/apps/kleopatra/pics/kleopatra_splashscreen.png
-  File ${prefix}/share/apps/kleopatra/pics/kleopatra_splashscreen.svgz
-  File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.png
-  File ${prefix}/share/apps/kleopatra/pics/kleopatra_wizard.svgz
-
-  SetOutPath "$INSTDIR\share\apps\kwatchgnupg"
-
-  File ${prefix}/share/apps/kwatchgnupg/kwatchgnupgui.rc
-
-  SetOutPath "$INSTDIR\share\apps\kwatchgnupg\pics"
-
-  File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg.png
-  File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg2.png
-
-  SetOutPath "$INSTDIR\share\apps\libkleopatra\pics"
-
-  File ${prefix}/share/apps/libkleopatra/pics/chiasmus_chi.png
-  File ${prefix}/share/apps/libkleopatra/pics/hi16-app-gpg.png
-  File ${prefix}/share/apps/libkleopatra/pics/hi16-app-gpgsm.png
-  File ${prefix}/share/apps/libkleopatra/pics/hi22-app-gpg.png
-  File ${prefix}/share/apps/libkleopatra/pics/hi22-app-gpgsm.png
-  File ${prefix}/share/apps/libkleopatra/pics/hi32-app-gpg.png
-  File ${prefix}/share/apps/libkleopatra/pics/hi32-app-gpgsm.png
-  File ${prefix}/share/apps/libkleopatra/pics/key.png
-  File ${prefix}/share/apps/libkleopatra/pics/key_bad.png
-  File ${prefix}/share/apps/libkleopatra/pics/key_ok.png
-  File ${prefix}/share/apps/libkleopatra/pics/key_unknown.png
-  File ${prefix}/share/apps/libkleopatra/pics/smartcard.xpm
-
-  SetOutPath "$INSTDIR\share\config"
-
-  File ${prefix}/share/config/libkleopatrarc
-
-  # TODO Can't mix localized and en commons when we install
-  # more then one kde langanuage
-  SetOutPath "$INSTDIR\share\doc\HTML\common"
-
-  File ${prefix}/share/doc/HTML/en/common/1.png
-  File ${prefix}/share/doc/HTML/en/common/10.png
-  File ${prefix}/share/doc/HTML/en/common/2.png
-  File ${prefix}/share/doc/HTML/en/common/3.png
-  File ${prefix}/share/doc/HTML/en/common/4.png
-  File ${prefix}/share/doc/HTML/en/common/5.png
-  File ${prefix}/share/doc/HTML/en/common/6.png
-  File ${prefix}/share/doc/HTML/en/common/7.png
-  File ${prefix}/share/doc/HTML/en/common/8.png
-  File ${prefix}/share/doc/HTML/en/common/9.png
-  File ${prefix}/share/doc/HTML/en/common/artistic-license.html
-  File ${prefix}/share/doc/HTML/en/common/block_title_bottom.png
-  File ${prefix}/share/doc/HTML/en/common/block_title_mid.png
-  File ${prefix}/share/doc/HTML/en/common/block_title_top.png
-  File ${prefix}/share/doc/HTML/en/common/bottom-left.png
-  File ${prefix}/share/doc/HTML/en/common/bottom-middle.png
-  File ${prefix}/share/doc/HTML/en/common/bottom-right.png
-  File ${prefix}/share/doc/HTML/en/common/bsd-license.html
-  File ${prefix}/share/doc/HTML/en/common/doxygen.css
-  File ${prefix}/share/doc/HTML/en/common/favicon.ico
-  File ${prefix}/share/doc/HTML/en/common/fdl-license.html
-  File ${prefix}/share/doc/HTML/en/common/fdl-license
-  File ${prefix}/share/doc/HTML/en/common/fdl-notice.html
-  File ${prefix}/share/doc/HTML/en/common/kde-docs.css
-  File ${prefix}/share/doc/HTML/en/common/footer.html
-  File ${prefix}/share/doc/HTML/en/common/gpl-license.html
-  File ${prefix}/share/doc/HTML/en/common/gpl-license
-  File ${prefix}/share/doc/HTML/en/common/header.html
-  File ${prefix}/share/doc/HTML/en/common/kde-default.css
-  File ${prefix}/share/doc/HTML/en/common/kde-docs.css
-  File ${prefix}/share/doc/HTML/en/common/kde_logo_bg.png
-  File ${prefix}/share/doc/HTML/en/common/lgpl-license.html
-  File ${prefix}/share/doc/HTML/en/common/lgpl-license
-  File ${prefix}/share/doc/HTML/en/common/mainfooter.html
-  File ${prefix}/share/doc/HTML/en/common/mainheader.html
-  File ${prefix}/share/doc/HTML/en/common/qpl-license.html
-  File ${prefix}/share/doc/HTML/en/common/tabs.css
-  File ${prefix}/share/doc/HTML/en/common/top-kde.jpg
-  File ${prefix}/share/doc/HTML/en/common/top-left.jpg
-  File ${prefix}/share/doc/HTML/en/common/top-left.png
-  File ${prefix}/share/doc/HTML/en/common/top-middle.png
-  File ${prefix}/share/doc/HTML/en/common/top-right.jpg
-  File ${prefix}/share/doc/HTML/en/common/top-right.png
-  File ${prefix}/share/doc/HTML/en/common/top.jpg
-  File ${prefix}/share/doc/HTML/en/common/x11-license.html
-  File ${prefix}/share/doc/HTML/en/common/xml.dcl
-
-  File ${prefix}/share/doc/HTML/de/common/fdl-translated.html
-  File ${prefix}/share/doc/HTML/de/common/gpl-translated.html
-  File ${prefix}/share/doc/HTML/de/common/kde-localised.css
-  File ${prefix}/share/doc/HTML/de/common/lgpl-translated.html
-
-  SetOutPath "$INSTDIR\share\doc\HTML\de\kleopatra"
-
-  File ${prefix}/share/doc/HTML/de/kleopatra/admin-archive-definitions.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/admin-checksum-definitions.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/admin-key-filters.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/admin.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/commandline-options.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-appearance.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-crypto-operations.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-gnupg-system.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-smime-validation.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/configuration.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/credits-and-license.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/functions-newkey.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/functions-search.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/functions.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/index.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/introduction.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menu.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menucertificates.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menuhelp.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menusettings.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menutools.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menuview.html
-  File ${prefix}/share/doc/HTML/de/kleopatra/menuwindow.html
-
-  SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
-
-  File ${prefix}/share/doc/HTML/en/kleopatra/admin-archive-definitions.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/admin-checksum-definitions.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-crypto-operations.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-gnupg-system.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-smime-validation.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/index.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menuview.html
-  File ${prefix}/share/doc/HTML/en/kleopatra/menuwindow.html
+
+  # The KCM lib is directly linked
+  File ${prefix}/lib/plugins/kcm_kleopatra.dll
+
+  SetOutPath "$INSTDIR\share\kleopatra\pics"
+
+  File ${prefix}/share/kleopatra/pics/gpg4win-compact.png
+  File ${prefix}/share/kleopatra/pics/gpg4win.png
+  File ${prefix}/share/kleopatra/pics/kleopatra_splashscreen.png
+  File ${prefix}/share/kleopatra/pics/kleopatra_splashscreen.svgz
+  File ${prefix}/share/kleopatra/pics/kleopatra_wizard.png
+  File ${prefix}/share/kleopatra/pics/kleopatra_wizard.svgz
+
+#  SetOutPath "$INSTDIR\share\apps\kwatchgnupg\pics"
+
+#  File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg.png
+#  File ${prefix}/share/apps/kwatchgnupg/pics/kwatchgnupg2.png
+
+#  # TODO Can't mix localized and en commons when we install
+#  # more then one kde langanuage
+#  SetOutPath "$INSTDIR\share\doc\HTML\common"
+#
+#  File ${prefix}/share/doc/HTML/en/common/1.png
+#  File ${prefix}/share/doc/HTML/en/common/10.png
+#  File ${prefix}/share/doc/HTML/en/common/2.png
+#  File ${prefix}/share/doc/HTML/en/common/3.png
+#  File ${prefix}/share/doc/HTML/en/common/4.png
+#  File ${prefix}/share/doc/HTML/en/common/5.png
+#  File ${prefix}/share/doc/HTML/en/common/6.png
+#  File ${prefix}/share/doc/HTML/en/common/7.png
+#  File ${prefix}/share/doc/HTML/en/common/8.png
+#  File ${prefix}/share/doc/HTML/en/common/9.png
+#  File ${prefix}/share/doc/HTML/en/common/artistic-license.html
+#  File ${prefix}/share/doc/HTML/en/common/block_title_bottom.png
+#  File ${prefix}/share/doc/HTML/en/common/block_title_mid.png
+#  File ${prefix}/share/doc/HTML/en/common/block_title_top.png
+#  File ${prefix}/share/doc/HTML/en/common/bottom-left.png
+#  File ${prefix}/share/doc/HTML/en/common/bottom-middle.png
+#  File ${prefix}/share/doc/HTML/en/common/bottom-right.png
+#  File ${prefix}/share/doc/HTML/en/common/bsd-license.html
+#  File ${prefix}/share/doc/HTML/en/common/doxygen.css
+#  File ${prefix}/share/doc/HTML/en/common/favicon.ico
+#  File ${prefix}/share/doc/HTML/en/common/fdl-license.html
+#  File ${prefix}/share/doc/HTML/en/common/fdl-license
+#  File ${prefix}/share/doc/HTML/en/common/fdl-notice.html
+#  File ${prefix}/share/doc/HTML/en/common/kde-docs.css
+#  File ${prefix}/share/doc/HTML/en/common/footer.html
+#  File ${prefix}/share/doc/HTML/en/common/gpl-license.html
+#  File ${prefix}/share/doc/HTML/en/common/gpl-license
+#  File ${prefix}/share/doc/HTML/en/common/header.html
+#  File ${prefix}/share/doc/HTML/en/common/kde-default.css
+#  File ${prefix}/share/doc/HTML/en/common/kde-docs.css
+#  File ${prefix}/share/doc/HTML/en/common/kde_logo_bg.png
+#  File ${prefix}/share/doc/HTML/en/common/lgpl-license.html
+#  File ${prefix}/share/doc/HTML/en/common/lgpl-license
+#  File ${prefix}/share/doc/HTML/en/common/mainfooter.html
+#  File ${prefix}/share/doc/HTML/en/common/mainheader.html
+#  File ${prefix}/share/doc/HTML/en/common/qpl-license.html
+#  File ${prefix}/share/doc/HTML/en/common/tabs.css
+#  File ${prefix}/share/doc/HTML/en/common/top-kde.jpg
+#  File ${prefix}/share/doc/HTML/en/common/top-left.jpg
+#  File ${prefix}/share/doc/HTML/en/common/top-left.png
+#  File ${prefix}/share/doc/HTML/en/common/top-middle.png
+#  File ${prefix}/share/doc/HTML/en/common/top-right.jpg
+#  File ${prefix}/share/doc/HTML/en/common/top-right.png
+#  File ${prefix}/share/doc/HTML/en/common/top.jpg
+#  File ${prefix}/share/doc/HTML/en/common/x11-license.html
+#  File ${prefix}/share/doc/HTML/en/common/xml.dcl
+#
+#  File ${prefix}/share/doc/HTML/de/common/fdl-translated.html
+#  File ${prefix}/share/doc/HTML/de/common/gpl-translated.html
+#  File ${prefix}/share/doc/HTML/de/common/kde-localised.css
+#  File ${prefix}/share/doc/HTML/de/common/lgpl-translated.html
+#
+#  SetOutPath "$INSTDIR\share\doc\HTML\de\kleopatra"
+#
+#  File ${prefix}/share/doc/HTML/de/kleopatra/admin-archive-definitions.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/admin-checksum-definitions.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/admin-key-filters.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/admin.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/commandline-options.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-appearance.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-crypto-operations.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-gnupg-system.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/configuration-smime-validation.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/configuration.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/credits-and-license.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/functions-newkey.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/functions-search.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/functions.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/index.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/introduction.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menu.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menucertificates.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menuhelp.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menusettings.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menutools.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menuview.html
+#  File ${prefix}/share/doc/HTML/de/kleopatra/menuwindow.html
+#
+#  SetOutPath "$INSTDIR\share\doc\HTML\en\kleopatra"
+#
+#  File ${prefix}/share/doc/HTML/en/kleopatra/admin-archive-definitions.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/admin-checksum-definitions.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/admin-key-filters.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/admin.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/commandline-options.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-appearance.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-crypto-operations.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-gnupg-system.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration-smime-validation.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/configuration.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/credits-and-license.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/functions-newkey.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/functions-search.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/functions.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/index.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/introduction.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menu.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menucertificates.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menuhelp.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menusettings.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menutools.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menuview.html
+#  File ${prefix}/share/doc/HTML/en/kleopatra/menuwindow.html
 
   SetOutPath "$INSTDIR\share\icons\hicolor\128x128\apps"
 
@@ -244,175 +191,15 @@ ${MementoSection} "Kleopatra" SEC_kleopatra
 
   File ${prefix}/share/icons/hicolor/64x64/apps/kleopatra.png
 
-  SetOutPath "$INSTDIR\share\icons\hicolor\scalable\apps"
-
-  File ${prefix}/share/icons/hicolor/scalable/apps/kleopatra.svgz
-
   SetOutPath "$INSTDIR\share\icons\hicolor"
-  File ${prefix}/share/icons/hicolor/index.theme
-
-  SetOutPath "$INSTDIR\share\kde4\services"
-
-  File ${prefix}/share/kde4/services/kleopatra_config_appear.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_cryptooperations.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_dirserv.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_gnupgsystem.desktop
-  File ${prefix}/share/kde4/services/kleopatra_config_smimevalidation.desktop
-  File ${prefix}/share/kde4/services/kleopatra_decryptverifyfiles.desktop
-  File ${prefix}/share/kde4/services/kleopatra_decryptverifyfolders.desktop
-  File ${prefix}/share/kde4/services/kleopatra_signencryptfiles.desktop
-  File ${prefix}/share/kde4/services/kleopatra_signencryptfolders.desktop
-
-  # Parts formerly in the kdelibs section:
-
-  SetOutPath "$INSTDIR\share\apps\kcharselect"
-
-  File ${prefix}/share/apps/kcharselect/kcharselect-data
-
-  SetOutPath "$INSTDIR\share\apps\kdeui\about"
-
-  File ${prefix}/share/apps/kdeui/about/bar-bottom-left.png
-  File ${prefix}/share/apps/kdeui/about/bar-bottom-middle.png
-  File ${prefix}/share/apps/kdeui/about/bar-bottom-right.png
-  File ${prefix}/share/apps/kdeui/about/bar-middle-left.png
-  File ${prefix}/share/apps/kdeui/about/bar-middle-right.png
-  File ${prefix}/share/apps/kdeui/about/bar-top-left.png
-  File ${prefix}/share/apps/kdeui/about/bar-top-middle.png
-  File ${prefix}/share/apps/kdeui/about/bar-top-right.png
-  File ${prefix}/share/apps/kdeui/about/box-bottom-left.png
-  File ${prefix}/share/apps/kdeui/about/box-bottom-middle.png
-  File ${prefix}/share/apps/kdeui/about/box-bottom-right.png
-  File ${prefix}/share/apps/kdeui/about/box-middle-left.png
-  File ${prefix}/share/apps/kdeui/about/box-middle-right.png
-  File ${prefix}/share/apps/kdeui/about/box-top-left.png
-  File ${prefix}/share/apps/kdeui/about/box-top-middle.png
-  File ${prefix}/share/apps/kdeui/about/box-top-right.png
-  File ${prefix}/share/apps/kdeui/about/kde_infopage.css
-  File ${prefix}/share/apps/kdeui/about/kde_infopage_rtl.css
-  File ${prefix}/share/apps/kdeui/about/top-middle.png
-
-  SetOutPath "$INSTDIR\share\apps\kdeui\pics"
-
-  File ${prefix}/share/apps/kdeui/pics/aboutkde.png
-  File ${prefix}/share/apps/kdeui/pics/kdeprint_nup1.png
-  File ${prefix}/share/apps/kdeui/pics/kdeprint_nup2.png
-  File ${prefix}/share/apps/kdeui/pics/kdeprint_nup4.png
-  File ${prefix}/share/apps/kdeui/pics/kdeprint_nupother.png
-  File ${prefix}/share/apps/kdeui/pics/ktip-bulb.png
-
-  SetOutPath "$INSTDIR\share\config\colors"
-
-  File ${prefix}/share/config/colors/40.colors
-  File ${prefix}/share/config/colors/Oxygen.colors
-  File ${prefix}/share/config/colors/Rainbow.colors
-  File ${prefix}/share/config/colors/Royal.colors
-  File ${prefix}/share/config/colors/Web.colors
-
-  SetOutPath "$INSTDIR\share\config"
-
-  File ${prefix}/share/config/kdebug.areas
-  File ${prefix}/share/config/kdebugrc
-
-  SetOutPath "$INSTDIR\share\config\ui"
-
-  File ${prefix}/share/config/ui/ui_standards.rc
-
-#  SetOutPath "$INSTDIR\share\kde4\services\kded"
-
-#  File ${prefix}/share/kde4/services/kded/kdedglobalaccel.desktop
-
-#  SetOutPath "$INSTDIR\share\kde4\servicetypes"
-
-#  File ${prefix}/share/kde4/servicetypes/kconfigbackend.desktop
-#  File ${prefix}/share/kde4/servicetypes/kplugininfo.desktop
-#  File ${prefix}/share/kde4/servicetypes/sonnetspeller.desktop
-
-  SetOutPath "$INSTDIR\share\xdg\menus"
-
-  File ${prefix}/share/xdg/menus/applications.menu
-
-  SetOutPath "$INSTDIR\share\locale"
-
-  File ${prefix}/share/locale/all_languages
-
-  SetOutPath "$INSTDIR\share\locale\en_US"
-  File ${prefix}/share/locale/en_US/entry.desktop
-
-  SetOutPath "$INSTDIR\share\locale\de"
-  File ${prefix}/share/locale/de/entry.desktop
-
-  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
-  # TODO This is way too much
-  File ${prefix}/share/locale/de/LC_MESSAGES/akonaditray.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/akregator.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabc.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabc_dir.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabc_file.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabc_ldapkio.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabc_net.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabcclient.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kabcformat_binary.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook-mobile.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kaddressbook.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kalarm.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/katepart4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kcertpart.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kcmcrypto.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdelibs_colors4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kdeqt.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kfileaudiopreview4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_help4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_imap4.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_ldap.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_mbox.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_nntp.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_pop3.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_sieve.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kio_smtp.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kjots.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kleopatra.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kmail-mobile.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kmail.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kmailcvt.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/knode.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/knotes.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/konsolekalendar.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kontact.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kontactinterfaces.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/korganizer-mobile.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/korganizer.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kres_blog.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kres_remote.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditor_plugins.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/ktexteditorkabcbridge_plugin.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/ktimetracker.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/ktnef.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/kwatchgnupg.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libakonadi.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkblog.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkcal.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkdepim.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkholidays.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkldap.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkleopatra.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkmime.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkpgp.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkpimidentities.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkpimutils.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkresources.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libksieve.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libktnef.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libkxmlrpcclient.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/libmailtransport.mo
-  File ${prefix}/share/locale/de/LC_MESSAGES/timezones4.mo
+  File ${prefix}/share/icons/hicolor/icon-theme.cache
+  File index.theme
 
   # In KDE 4.10 the locale detection in kdelibs is broken so we
   # install a kdeglobals with the language setting chosen in the
   # installer
   push $1
-  FileOpen $1 "$INSTDIR\share\config\kdeglobals" "w"
+  FileOpen $1 "$INSTDIR\share\kdeglobals" "w"
   FileWrite $1 '[Locale] $\r$\n'
   StrCmp $LANGUAGE "1031" german_locale 0
   FileWrite $1 'Country=en $\r$\n'
diff --git a/src/inst-oxygen-icons.nsi b/src/inst-oxygen-icons.nsi
deleted file mode 100644
index 62319e5..0000000
--- a/src/inst-oxygen-icons.nsi
+++ /dev/null
@@ -1,470 +0,0 @@
-# inst-oxygen-icons.nsi - Snippet for oxygen-icons.   -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 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}/oxygen-icons-${gpg4win_pkg_oxygen_icons_version}
-
-!ifdef DEBUG
-Section "oxygen-icons" SEC_oxygen_icons
-!else
-Section "-oxygen-icons" SEC_oxygen_icons
-!endif
-  SetOutPath "$INSTDIR"
-!ifdef SOURCES
-  File "${gpg4win_pkg_oxygen_icons_src}"
-!else
-
-  #
-  # Note: You may want to use the pkg-to-nsi.pl script to create the
-  # list of icons.
-  #
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\actions"
-
-  File ${prefix}/share/icons/oxygen/128x128/actions/application-exit.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/configure.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/dialog-ok-apply.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/dialog-ok.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/edit-find.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/edit-paste.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-bottom.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-first.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-previous.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-top.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/list-remove.png
-  File ${prefix}/share/icons/oxygen/128x128/actions/tools-report-bug.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\apps"
-
-  File ${prefix}/share/icons/oxygen/128x128/apps/kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\categories"
-
-  File ${prefix}/share/icons/oxygen/128x128/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/128x128/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\devices"
-
-  File ${prefix}/share/icons/oxygen/128x128/devices/secure-card.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\128x128\status"
-
-  File ${prefix}/share/icons/oxygen/128x128/status/dialog-error.png
-  File ${prefix}/share/icons/oxygen/128x128/status/dialog-information.png
-  File ${prefix}/share/icons/oxygen/128x128/status/dialog-password.png
-  File ${prefix}/share/icons/oxygen/128x128/status/dialog-warning.png
-  File ${prefix}/share/icons/oxygen/128x128/status/security-high.png
-  File ${prefix}/share/icons/oxygen/128x128/status/security-low.png
-  File ${prefix}/share/icons/oxygen/128x128/status/security-medium.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\actions"
-
-  File ${prefix}/share/icons/oxygen/16x16/actions/application-exit.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/arrow-down.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/arrow-up.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/configure-shortcuts.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/configure-toolbars.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/configure.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/dialog-cancel.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/dialog-close.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/dialog-ok-apply.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/dialog-ok.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-edit-decrypt-verify.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-edit-decrypt.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-edit-encrypt.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-edit-sign-encrypt.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-edit-sign.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-edit-verify.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-encrypt.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-open.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-print.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/document-revert.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-clear-locationbar-rtl.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-delete.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-find.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-paste.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-redo.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-rename.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/edit-undo.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-bottom.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-first.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-previous.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-top.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/help-contents.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/help-contextual.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/list-add.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/list-remove.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/process-stop.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/tab-close.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/tab-duplicate.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/tab-new-background.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/tools-report-bug.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-add.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-export-secret.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-export-server.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-export.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-import.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-server-configure.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-certificate-sign.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/view-refresh.png
-  File ${prefix}/share/icons/oxygen/16x16/actions/window-close.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\animations"
-
-  File ${prefix}/share/icons/oxygen/16x16/animations/process-working-kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\apps"
-
-  File ${prefix}/share/icons/oxygen/16x16/apps/kde.png
-  File ${prefix}/share/icons/oxygen/16x16/apps/internet-mail.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\categories"
-
-  File ${prefix}/share/icons/oxygen/16x16/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/16x16/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\devices"
-
-  File ${prefix}/share/icons/oxygen/16x16/devices/secure-card.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\16x16\status"
-
-  File ${prefix}/share/icons/oxygen/16x16/status/dialog-error.png
-  File ${prefix}/share/icons/oxygen/16x16/status/dialog-information.png
-  File ${prefix}/share/icons/oxygen/16x16/status/dialog-password.png
-  File ${prefix}/share/icons/oxygen/16x16/status/dialog-warning.png
-  File ${prefix}/share/icons/oxygen/16x16/status/security-high.png
-  File ${prefix}/share/icons/oxygen/16x16/status/security-low.png
-  File ${prefix}/share/icons/oxygen/16x16/status/security-medium.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\actions"
-
-  File ${prefix}/share/icons/oxygen/22x22/actions/application-exit.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/arrow-down.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/arrow-up.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/configure-shortcuts.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/configure-toolbars.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/configure.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/dialog-cancel.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/dialog-close.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/dialog-ok-apply.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/dialog-ok.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-edit-decrypt-verify.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-edit-decrypt.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-edit-encrypt.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-edit-sign-encrypt.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-edit-sign.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-edit-verify.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-encrypt.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-open.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-print.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/document-revert.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-clear-locationbar-rtl.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-delete.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-find.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-paste.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-redo.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-rename.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/edit-undo.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-bottom.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-first.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-previous.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-top.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/help-contents.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/help-contextual.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/list-add.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/list-remove.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/process-stop.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/tab-close.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/tab-duplicate.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/tab-new-background.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/tools-report-bug.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-add.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-export-secret.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-export-server.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-export.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-import.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-server-configure.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-certificate-sign.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/view-refresh.png
-  File ${prefix}/share/icons/oxygen/22x22/actions/window-close.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\animations"
-
-  File ${prefix}/share/icons/oxygen/22x22/animations/process-working-kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\apps"
-
-  File ${prefix}/share/icons/oxygen/22x22/apps/kde.png
-  File ${prefix}/share/icons/oxygen/22x22/apps/internet-mail.png
-  File ${prefix}/share/icons/oxygen/22x22/apps/preferences-desktop-locale.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\categories"
-
-  File ${prefix}/share/icons/oxygen/22x22/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/22x22/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\devices"
-
-  File ${prefix}/share/icons/oxygen/22x22/devices/secure-card.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\22x22\status"
-
-  File ${prefix}/share/icons/oxygen/22x22/status/dialog-error.png
-  File ${prefix}/share/icons/oxygen/22x22/status/dialog-information.png
-  File ${prefix}/share/icons/oxygen/22x22/status/dialog-password.png
-  File ${prefix}/share/icons/oxygen/22x22/status/dialog-warning.png
-  File ${prefix}/share/icons/oxygen/22x22/status/security-high.png
-  File ${prefix}/share/icons/oxygen/22x22/status/security-low.png
-  File ${prefix}/share/icons/oxygen/22x22/status/security-medium.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\256x256\categories"
-
-  File ${prefix}/share/icons/oxygen/256x256/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/256x256/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\256x256\devices"
-
-  File ${prefix}/share/icons/oxygen/256x256/devices/secure-card.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\actions"
-
-  File ${prefix}/share/icons/oxygen/32x32/actions/application-exit.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/arrow-down.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/arrow-up.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/configure-shortcuts.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/configure-toolbars.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/configure.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/dialog-cancel.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/dialog-close.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/dialog-ok-apply.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/dialog-ok.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-edit-decrypt-verify.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-edit-decrypt.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-edit-encrypt.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-edit-sign-encrypt.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-edit-sign.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-edit-verify.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-encrypt.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-open.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-print.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/document-revert.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-clear-locationbar-rtl.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-delete.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-find.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-paste.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-redo.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-rename.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/edit-undo.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-bottom.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-first.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-previous.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-top.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/help-contents.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/help-contextual.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/list-add.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/list-remove.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/process-stop.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/tab-close.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/tab-duplicate.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/tab-new-background.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/tools-report-bug.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-add.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-export-secret.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-export-server.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-export.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-import.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-server-configure.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-certificate-sign.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/view-refresh.png
-  File ${prefix}/share/icons/oxygen/32x32/actions/window-close.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\animations"
-
-  File ${prefix}/share/icons/oxygen/32x32/animations/process-working-kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\apps"
-
-  File ${prefix}/share/icons/oxygen/32x32/apps/kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\categories"
-
-  File ${prefix}/share/icons/oxygen/32x32/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/32x32/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\devices"
-
-  File ${prefix}/share/icons/oxygen/32x32/devices/secure-card.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\32x32\status"
-
-  File ${prefix}/share/icons/oxygen/32x32/status/dialog-error.png
-  File ${prefix}/share/icons/oxygen/32x32/status/dialog-information.png
-  File ${prefix}/share/icons/oxygen/32x32/status/dialog-password.png
-  File ${prefix}/share/icons/oxygen/32x32/status/dialog-warning.png
-  File ${prefix}/share/icons/oxygen/32x32/status/security-high.png
-  File ${prefix}/share/icons/oxygen/32x32/status/security-low.png
-  File ${prefix}/share/icons/oxygen/32x32/status/security-medium.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\actions"
-
-  File ${prefix}/share/icons/oxygen/48x48/actions/application-exit.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/arrow-down.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/arrow-up.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/configure-shortcuts.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/configure-toolbars.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/configure.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/dialog-cancel.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/dialog-close.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/dialog-ok-apply.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/dialog-ok.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-edit-decrypt-verify.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-edit-decrypt.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-edit-encrypt.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-edit-sign-encrypt.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-edit-sign.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-edit-verify.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-encrypt.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-open.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-print.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/document-revert.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-clear-locationbar-rtl.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-delete.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-find.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-paste.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-redo.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-rename.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/edit-undo.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-bottom.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-first.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-previous.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-top.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/help-contents.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/help-contextual.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/list-add.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/list-remove.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/process-stop.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/tab-close.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/tab-duplicate.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/tab-new-background.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/tools-report-bug.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-add.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-export-secret.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-export-server.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-export.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-import.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-server-configure.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-certificate-sign.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/view-refresh.png
-  File ${prefix}/share/icons/oxygen/48x48/actions/window-close.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\animations"
-
-  File ${prefix}/share/icons/oxygen/48x48/animations/process-working-kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\apps"
-
-  File ${prefix}/share/icons/oxygen/48x48/apps/kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\categories"
-
-  File ${prefix}/share/icons/oxygen/48x48/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/48x48/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\devices"
-
-  File ${prefix}/share/icons/oxygen/48x48/devices/secure-card.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\48x48\status"
-
-  File ${prefix}/share/icons/oxygen/48x48/status/dialog-error.png
-  File ${prefix}/share/icons/oxygen/48x48/status/dialog-information.png
-  File ${prefix}/share/icons/oxygen/48x48/status/dialog-password.png
-  File ${prefix}/share/icons/oxygen/48x48/status/dialog-warning.png
-  File ${prefix}/share/icons/oxygen/48x48/status/security-high.png
-  File ${prefix}/share/icons/oxygen/48x48/status/security-low.png
-  File ${prefix}/share/icons/oxygen/48x48/status/security-medium.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\actions"
-
-  File ${prefix}/share/icons/oxygen/64x64/actions/application-exit.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/configure.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/dialog-ok-apply.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/dialog-ok.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/edit-find.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/edit-paste.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-bottom.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-down.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-first.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-last.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-next.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-previous.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-top.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/go-up.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/list-remove.png
-  File ${prefix}/share/icons/oxygen/64x64/actions/tools-report-bug.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\apps"
-
-  File ${prefix}/share/icons/oxygen/64x64/apps/kde.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\categories"
-
-  File ${prefix}/share/icons/oxygen/64x64/categories/applications-graphics.png
-  File ${prefix}/share/icons/oxygen/64x64/categories/preferences-system-network.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen\64x64\status"
-
-  File ${prefix}/share/icons/oxygen/64x64/status/dialog-error.png
-  File ${prefix}/share/icons/oxygen/64x64/status/dialog-information.png
-  File ${prefix}/share/icons/oxygen/64x64/status/dialog-password.png
-  File ${prefix}/share/icons/oxygen/64x64/status/dialog-warning.png
-  File ${prefix}/share/icons/oxygen/64x64/status/security-high.png
-  File ${prefix}/share/icons/oxygen/64x64/status/security-low.png
-  File ${prefix}/share/icons/oxygen/64x64/status/security-medium.png
-
-  SetOutPath "$INSTDIR\share\icons\oxygen"
-
-  File ${prefix}/share/icons/oxygen/index.theme
-
-
-!endif
-SectionEnd
diff --git a/src/inst-sections.nsi b/src/inst-sections.nsi
index c7bd1e2..d4c3d84 100644
--- a/src/inst-sections.nsi
+++ b/src/inst-sections.nsi
@@ -35,8 +35,8 @@
 !ifdef HAVE_PKG_LIBTASN1
 !include "inst-libtasn1.nsi"
 !endif
-!ifdef HAVE_PKG_OXYGEN_ICONS
-!include "inst-oxygen-icons.nsi"
+!ifdef HAVE_PKG_BREEZE_ICONS
+!include "inst-breeze-icons.nsi"
 !endif
 !ifdef HAVE_PKG_PKGCONFIG
 !include "inst-pkgconfig.nsi"
@@ -149,6 +149,9 @@
 !ifdef HAVE_PKG_KICONTHEMES
 !include "inst-kiconthemes.nsi"
 !endif
+!ifdef HAVE_PKG_KITEMVIEWS
+!include "inst-kitemviews.nsi"
+!endif
 !ifdef HAVE_PKG_LIBKLEO
 !include "inst-libkleo.nsi"
 !endif
@@ -296,8 +299,8 @@
 !ifdef HAVE_PKG_PKGCONFIG
 !include "uninst-pkgconfig.nsi"
 !endif
-!ifdef HAVE_PKG_OXYGEN_ICONS
-!include "uninst-oxygen-icons.nsi"
+!ifdef HAVE_PKG_BREEZE_ICONS
+!include "uninst-breeze-icons.nsi"
 !endif
 !ifdef HAVE_PKG_MAN_ADVANCED_DE
 !include "uninst-man_advanced_de.nsi"
@@ -604,8 +607,8 @@ Function CalcDepends
 !ifdef HAVE_PKG_QTWINEXTRAS
   !insertmacro UnselectSection ${SEC_qtwinextras}
 !endif
-!ifdef HAVE_PKG_OXYGEN_ICONS
-  !insertmacro UnselectSection ${SEC_oxygen_icons}
+!ifdef HAVE_PKG_BREEZE_ICONS
+  !insertmacro UnselectSection ${SEC_breeze_icons}
 !endif
 !ifdef HAVE_PKG_KCONFIG
   !insertmacro UnselectSection ${SEC_kconfig}
@@ -744,7 +747,7 @@ Function CalcDepends
 		${SF_SELECTED} have_kleopatra_libs skip_kleopatra_libs
   have_kleopatra_libs:
   !insertmacro SelectSection ${SEC_qtbase}
-  !insertmacro SelectSection ${SEC_oxygen_icons}
+  !insertmacro SelectSection ${SEC_breeze_icons}
   !insertmacro SelectSection ${SEC_kconfig}
   !insertmacro SelectSection ${SEC_ki18n}
   !insertmacro SelectSection ${SEC_gpgmepp}
@@ -776,8 +779,6 @@ Function CalcDepends
   skip_qt:
 !endif
 
-  # Package "oxygen-icons" has no dependencies.
-
 !ifdef HAVE_PKG_GPGME
   !insertmacro SectionFlagIsSet ${SEC_gpgme} \
 		${SF_SELECTED} have_gpgme skip_gpgme
diff --git a/src/uninst-breeze-icons.nsi b/src/uninst-breeze-icons.nsi
new file mode 100644
index 0000000..d302650
--- /dev/null
+++ b/src/uninst-breeze-icons.nsi
@@ -0,0 +1,476 @@
+# uninst-breeze-icons.nsi - Snippet for breeze-icons.  -*- coding: latin-1; -*-
+# Copyright (C) 2005, 2007, 2008 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}/breeze-icons-${gpg4win_pkg_breeze_icons_version}
+
+
+; Uninstaller section.
+Section "-un.breeze-icons"
+!ifdef SOURCES
+  Push "${gpg4win_pkg_breeze_icons_src}"
+  Call un.SourceDelete
+!else
+  Delete "$INSTDIR\share\icons\breeze\status\64\security-medium.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\64\security-low.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\64\security-high.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\64\dialog-warning.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\64\dialog-password.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\64\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\64\dialog-error.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\24\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\22\security-medium.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\22\security-low.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\22\security-high.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\22\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze\status\16\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze\places\64\start-here-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze\places\22\start-here-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze\places\16\start-here-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze\index.theme"
+  Delete "$INSTDIR\share\icons\breeze\icon-theme.cache"
+  Delete "$INSTDIR\share\icons\breeze\categories\32\applications-graphics.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\48\usb-creator-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\48\telepathy-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\48\internet-mail.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\32\preferences-system-network.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\32\preferences-desktop-locale.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\22\kde.svg"
+  Delete "$INSTDIR\share\icons\breeze\apps\22\internet-mail.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\32\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\tools-report-bug.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\tab-new-background.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\tab-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\run-build-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\process-stop.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\list-remove.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\list-add.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\help-contextual.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\gtk-tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-top.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-previous.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-next.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-last.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-first.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\go-bottom.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-rename.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-paste.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-find.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\edit-clear-locationbar-rtl.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\draw-arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\draw-arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-ok.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\configure-toolbars.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\24\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-server-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-import.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-export.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-export-server.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-export-secret.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\view-certificate-add.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\tools-report-bug.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\tab-new-background.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\tab-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\settings-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\run-build-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\process-stop.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\list-remove.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\list-add.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\help-contextual.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\help-contents.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-top.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-previous.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-next.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-last.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-first.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\go-bottom.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-rename.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-paste.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-find.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\edit-clear-locationbar-rtl.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\draw-arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\draw-arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-ok.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\configure-toolbars.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\configure-shortcuts.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\22\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\tools-report-bug.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\tab-new-background.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\tab-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\settings-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\run-build-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\process-stop.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\list-remove.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\list-add.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\help-contextual.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\help-contents.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-top.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-previous.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-next.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-last.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-first.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\go-bottom.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-rename.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-paste.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-find.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\edit-clear-locationbar-rtl.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\draw-arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\draw-arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-ok.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-close.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\configure-toolbars.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\configure-shortcuts.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze\actions\16\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-medium.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-low.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\security-high.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-warning.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-password.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\64\dialog-error.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\24\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\22\security-medium.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\22\security-low.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\22\security-high.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\22\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\status\16\dialog-information.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\places\64\start-here-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\places\22\start-here-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\places\16\start-here-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\index.theme"
+  Delete "$INSTDIR\share\icons\breeze-dark\icon-theme.cache"
+  Delete "$INSTDIR\share\icons\breeze-dark\categories\32\applications-graphics.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\48\usb-creator-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\48\telepathy-kde.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\48\internet-mail.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\32\preferences-system-network.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\32\preferences-desktop-locale.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\22\kde.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\apps\22\internet-mail.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\32\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tools-report-bug.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tab-new-background.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\tab-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\run-build-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\process-stop.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\list-remove.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\list-add.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\help-contextual.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\gtk-tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-top.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-previous.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-next.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-last.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-first.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\go-bottom.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-rename.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-paste.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-find.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\edit-clear-locationbar-rtl.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\draw-arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\draw-arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-ok.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\configure-toolbars.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\24\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-server-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-import.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-export.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-export-server.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-export-secret.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\view-certificate-add.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tools-report-bug.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tab-new-background.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\tab-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\settings-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\run-build-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\process-stop.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\list-remove.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\list-add.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\help-contextual.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\help-contents.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-top.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-previous.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-next.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-last.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-first.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\go-bottom.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-rename.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-paste.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-find.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\edit-clear-locationbar-rtl.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\draw-arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\draw-arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-ok.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\configure-toolbars.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\configure-shortcuts.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\22\application-exit.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\window-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\view-refresh.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tools-report-bug.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tab-new-background.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tab-duplicate.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\tab-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\settings-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\run-build-configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\process-stop.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\list-remove.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\list-add.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\help-contextual.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\help-contents.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-top.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-previous.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-next.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-last.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-first.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\go-bottom.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-undo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-rename.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-redo.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-paste.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-find.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-delete.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\edit-clear-locationbar-rtl.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\draw-arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\draw-arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-revert.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-print.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-open.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-sign.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-sign-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-encrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-decrypt.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\document-edit-decrypt-verify.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-ok.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-ok-apply.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-close.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\dialog-cancel.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\configure.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\configure-toolbars.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\configure-shortcuts.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\arrow-up.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\arrow-down.svg"
+  Delete "$INSTDIR\share\icons\breeze-dark\actions\16\application-exit.svg"
+
+  RMDir "$INSTDIR\share\icons\breeze\status\64"
+  RMDir "$INSTDIR\share\icons\breeze\status\24"
+  RMDir "$INSTDIR\share\icons\breeze\status\22"
+  RMDir "$INSTDIR\share\icons\breeze\status\16"
+  RMDir "$INSTDIR\share\icons\breeze\status"
+  RMDir "$INSTDIR\share\icons\breeze\places\64"
+  RMDir "$INSTDIR\share\icons\breeze\places\22"
+  RMDir "$INSTDIR\share\icons\breeze\places\16"
+  RMDir "$INSTDIR\share\icons\breeze\places"
+  RMDir "$INSTDIR\share\icons\breeze\categories\32"
+  RMDir "$INSTDIR\share\icons\breeze\categories"
+  RMDir "$INSTDIR\share\icons\breeze\apps\48"
+  RMDir "$INSTDIR\share\icons\breeze\apps\32"
+  RMDir "$INSTDIR\share\icons\breeze\apps\22"
+  RMDir "$INSTDIR\share\icons\breeze\apps"
+  RMDir "$INSTDIR\share\icons\breeze\actions\32"
+  RMDir "$INSTDIR\share\icons\breeze\actions\24"
+  RMDir "$INSTDIR\share\icons\breeze\actions\22"
+  RMDir "$INSTDIR\share\icons\breeze\actions\16"
+  RMDir "$INSTDIR\share\icons\breeze\actions"
+  RMDir "$INSTDIR\share\icons\breeze"
+  RMDir "$INSTDIR\share\icons\breeze-dark\status\64"
+  RMDir "$INSTDIR\share\icons\breeze-dark\status\24"
+  RMDir "$INSTDIR\share\icons\breeze-dark\status\22"
+  RMDir "$INSTDIR\share\icons\breeze-dark\status\16"
+  RMDir "$INSTDIR\share\icons\breeze-dark\status"
+  RMDir "$INSTDIR\share\icons\breeze-dark\places\64"
+  RMDir "$INSTDIR\share\icons\breeze-dark\places\22"
+  RMDir "$INSTDIR\share\icons\breeze-dark\places\16"
+  RMDir "$INSTDIR\share\icons\breeze-dark\places"
+  RMDir "$INSTDIR\share\icons\breeze-dark\categories\32"
+  RMDir "$INSTDIR\share\icons\breeze-dark\categories"
+  RMDir "$INSTDIR\share\icons\breeze-dark\apps\48"
+  RMDir "$INSTDIR\share\icons\breeze-dark\apps\32"
+  RMDir "$INSTDIR\share\icons\breeze-dark\apps\22"
+  RMDir "$INSTDIR\share\icons\breeze-dark\apps"
+  RMDir "$INSTDIR\share\icons\breeze-dark\actions\32"
+  RMDir "$INSTDIR\share\icons\breeze-dark\actions\24"
+  RMDir "$INSTDIR\share\icons\breeze-dark\actions\22"
+  RMDir "$INSTDIR\share\icons\breeze-dark\actions\16"
+  RMDir "$INSTDIR\share\icons\breeze-dark\actions"
+  RMDir "$INSTDIR\share\icons\breeze-dark"
+  RMDir "$INSTDIR\share\icons"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
+!endif
+SectionEnd
diff --git a/src/uninst-kleopatra.nsi b/src/uninst-kleopatra.nsi
index ad6e8f9..bf6820c 100644
--- a/src/uninst-kleopatra.nsi
+++ b/src/uninst-kleopatra.nsi
@@ -30,30 +30,10 @@ Section "-un.kleopatra"
   Push "${gpg4win_pkg_kleopatra_src}"
   Call un.SourceDelete
 !else
-  # Try to terminate kleopatra.
-  ExecWait '"$INSTDIR\qdbus.exe" org.kde.kleopatra /MainApplication quit'
-  Sleep 1000
-
-  # FIXME: See inst-kleopatra.nsi
   Delete "$INSTDIR\bin\kleopatra.exe"
-  Delete "$INSTDIR\bin\kwatchgnupg.exe"
-  Delete "$INSTDIR\bin\kgpgconf.exe"
-  Delete "$INSTDIR\bin\kbuildsycoca4.exe"
-  Delete "$INSTDIR\bin\kdebugdialog.exe"
-  Delete "$INSTDIR\bin\libkdecore.dll"
+ # Delete "$INSTDIR\bin\kwatchgnupg.exe"
   RMDir "$INSTDIR\bin"
 
-  Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfolders.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_signencryptfiles.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfolders.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_decryptverifyfiles.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_smimevalidation.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_gnupgsystem.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dirserv.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_cryptooperations.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_appear.desktop"
-  Delete "$INSTDIR\share\kde4\services\kleopatra_config_dnorder.desktop"
-  Delete "$INSTDIR\share\icons\hicolor\scalable\apps\kleopatra.svgz"
   Delete "$INSTDIR\share\icons\hicolor\64x64\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\48x48\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\32x32\apps\kleopatra.png"
@@ -61,389 +41,8 @@ Section "-un.kleopatra"
   Delete "$INSTDIR\share\icons\hicolor\22x22\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\16x16\apps\kleopatra.png"
   Delete "$INSTDIR\share\icons\hicolor\128x128\apps\kleopatra.png"
+  Delete "$INSTDIR\share\icons\hicolor\icon-theme.cache"
   Delete "$INSTDIR\share\icons\hicolor\index.theme"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuview.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menusettings.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuhelp.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menucertificates.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menu.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\introduction.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-search.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-newkey.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-keybox-management.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\credits-and-license.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-dn-order.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-smime-validation.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-gnupg-system.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-crypto-operations.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-appearance.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\commandline-options.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-key-filters.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-checksum-definitions.html"
-  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-archive-definitions.html"
-
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuwindow.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuview.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menutools.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menusettings.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuhelp.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucertificates.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menu.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\introduction.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\index.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-search.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-newkey.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-keybox-management.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\credits-and-license.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-dn-order.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-smime-validation.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-gnupg-system.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-crypto-operations.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-appearance.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\commandline-options.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-key-filters.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-checksum-definitions.html"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-archive-definitions.html"
-
-  Delete "$INSTDIR\share\doc\HTML\common\xml.dcl"
-  Delete "$INSTDIR\share\doc\HTML\common\x11-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\top.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-right.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-right.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-middle.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-left.png"
-  Delete "$INSTDIR\share\doc\HTML\common\top-left.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\top-kde.jpg"
-  Delete "$INSTDIR\share\doc\HTML\common\tabs.css"
-  Delete "$INSTDIR\share\doc\HTML\common\qpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\print.css"
-  Delete "$INSTDIR\share\doc\HTML\common\mainheader.html"
-  Delete "$INSTDIR\share\doc\HTML\common\mainfooter.html"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\kde_logo_bg.png"
-  Delete "$INSTDIR\share\doc\HTML\common\kde_logo.png"
-  Delete "$INSTDIR\share\doc\HTML\common\kde.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css.template"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-docs.css"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-default.css"
-  Delete "$INSTDIR\share\doc\HTML\common\header.html"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\footer.html"
-  Delete "$INSTDIR\share\doc\HTML\common\flat.css"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-notice.html"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-license"
-  Delete "$INSTDIR\share\doc\HTML\common\favicon.ico"
-  Delete "$INSTDIR\share\doc\HTML\common\doxygen.css"
-  Delete "$INSTDIR\share\doc\HTML\common\bsd-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-right.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-middle.png"
-  Delete "$INSTDIR\share\doc\HTML\common\bottom-left.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_top.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_mid.png"
-  Delete "$INSTDIR\share\doc\HTML\common\block_title_bottom.png"
-  Delete "$INSTDIR\share\doc\HTML\common\artistic-license.html"
-  Delete "$INSTDIR\share\doc\HTML\common\9.png"
-  Delete "$INSTDIR\share\doc\HTML\common\8.png"
-  Delete "$INSTDIR\share\doc\HTML\common\7.png"
-  Delete "$INSTDIR\share\doc\HTML\common\6.png"
-  Delete "$INSTDIR\share\doc\HTML\common\5.png"
-  Delete "$INSTDIR\share\doc\HTML\common\4.png"
-  Delete "$INSTDIR\share\doc\HTML\common\3.png"
-  Delete "$INSTDIR\share\doc\HTML\common\2.png"
-  Delete "$INSTDIR\share\doc\HTML\common\10.png"
-  Delete "$INSTDIR\share\doc\HTML\common\1.png"
-  Delete "$INSTDIR\share\doc\HTML\common\fdl-translated.html"
-  Delete "$INSTDIR\share\doc\HTML\common\gpl-translated.html"
-  Delete "$INSTDIR\share\doc\HTML\common\lgpl-translated.html"
-  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css"
-
-  Delete "$INSTDIR\share\config\libkleopatrarc"
-  Delete "$INSTDIR\share\config\kdeglobals"
-  Delete "$INSTDIR\share\xdg\menus\applications.menu"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\smartcard.xpm"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\key_unknown.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\key_ok.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\key_bad.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\key.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi32-app-gpgsm.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi32-app-gpg.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi22-app-gpgsm.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi22-app-gpg.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi16-app-gpgsm.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\hi16-app-gpg.png"
-  Delete "$INSTDIR\share\apps\libkleopatra\pics\chiasmus_chi.png"
-  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg2.png"
-  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg.png"
-  Delete "$INSTDIR\share\apps\kwatchgnupg\kwatchgnupgui.rc"
-  Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_wizard.svgz"
-  Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_wizard.png"
-  Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_splashscreen.svgz"
-  Delete "$INSTDIR\share\apps\kleopatra\pics\kleopatra_splashscreen.png"
-  Delete "$INSTDIR\share\apps\kleopatra\pics\gpg4win.png"
-  Delete "$INSTDIR\share\apps\kleopatra\pics\gpg4win-compact.png"
-  Delete "$INSTDIR\share\apps\kleopatra\kleopatra.rc"
-  Delete "$INSTDIR\share\applications\kde4\kleopatra_import.desktop"
-  Delete "$INSTDIR\share\applications\kde4\kleopatra.desktop"
-  Delete "$INSTDIR\lib\kde4\kcm_kleopatra.dll"
-  Delete "$INSTDIR\lib\kde4\kded_globalaccel.dll"
-  Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
-  Delete "$INSTDIR\bin\libkleopatraclientcore.dll"
-  Delete "$INSTDIR\bin\libkleo.dll"
-  Delete "$INSTDIR\bin\libattica.dll"
-  Delete "$INSTDIR\bin\libdbusmenu-qt.dll"
-  Delete "$INSTDIR\bin\libgcc_s_sjlj-1.dll"
-  Delete "$INSTDIR\bin\libgpgme++.dll"
-  Delete "$INSTDIR\bin\libintl.dll"
-  Delete "$INSTDIR\bin\libkcmutils.dll"
-  Delete "$INSTDIR\bin\libkdeui.dll"
-  Delete "$INSTDIR\bin\libkdewin.dll"
-  Delete "$INSTDIR\bin\libkleo.dll"
-  Delete "$INSTDIR\bin\libkleopatraclientcore.dll"
-  Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
-  Delete "$INSTDIR\bin\libkmime.dll"
-  Delete "$INSTDIR\bin\libqgpgme.dll"
-
-  # Parts formerly in the kdelibs section
-
-  Delete "$INSTDIR\bin\kded_globalaccel.dll"
-  Delete "$INSTDIR\bin\libkdeui.dll"
-  Delete "$INSTDIR\bin\libkdecore.dll"
-  Delete "$INSTDIR\bin\libkcmutils.dll"
-  Delete "$INSTDIR\bin\libqgpgme.dll"
-  Delete "$INSTDIR\bin\libkmime.dll"
-  Delete "$INSTDIR\bin\libgpgme++.dll"
-  Delete "$INSTDIR\bin\libgpgme++-qt.dll"
-  Delete "$INSTDIR\bin\libgpgme++-glib.dll"
-  # Old (but correct) location, better delete it too.
-  Delete "$INSTDIR\bin\kbuildsycoca4.exe"
-
-  Delete "$INSTDIR\share\locale\all_languages"
-
-  Delete "$INSTDIR\share\locale\de\entry.desktop"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akonaditray.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\akregator.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_dir.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_file.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_ldapkio.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_net.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcclient.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcformat_binary.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook-mobile.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kaddressbook.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kalarm.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\katepart4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcertpart.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmcrypto.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdelibs_colors4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdeqt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfileaudiopreview4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_help4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_imap4.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_ldap.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_mbox.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_nntp.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_pop3.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_sieve.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_smtp.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kjots.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kleopatra.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail-mobile.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmailcvt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knode.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\knotes.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\konsolekalendar.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontact.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kontactinterfaces.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer-mobile.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korganizer.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_blog.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_remote.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditor_plugins.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktexteditorkabcbridge_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktimetracker.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\ktnef.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kwatchgnupg.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libakonadi.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkblog.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkcal.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkdepim.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkholidays.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkldap.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkleopatra.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkmime.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpgp.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimidentities.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkpimutils.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkresources.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libksieve.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libktnef.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libkxmlrpcclient.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\libmailtransport.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\timezones4.mo"
-
-
-#  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
-#  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
-#  Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
-#  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
-  Delete "$INSTDIR\share\config\ui\ui_standards.rc"
-  Delete "$INSTDIR\share\config\kdebugrc"
-  Delete "$INSTDIR\share\config\kdebug.areas"
-  Delete "$INSTDIR\share\config\colors\Web.colors"
-  Delete "$INSTDIR\share\config\colors\Royal.colors"
-  Delete "$INSTDIR\share\config\colors\Rainbow.colors"
-  Delete "$INSTDIR\share\config\colors\Oxygen.colors"
-  Delete "$INSTDIR\share\config\colors\40.colors"
-  Delete "$INSTDIR\share\apps\kdeui\pics\ktip-bulb.png"
-  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nupother.png"
-  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup4.png"
-  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup2.png"
-  Delete "$INSTDIR\share\apps\kdeui\pics\kdeprint_nup1.png"
-  Delete "$INSTDIR\share\apps\kdeui\pics\aboutkde.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\top-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage_rtl.css"
-  Delete "$INSTDIR\share\apps\kdeui\about\kde_infopage.css"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-top-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-top-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-top-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-middle-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\box-bottom-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-top-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-middle-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bar-bottom-left.png"
-  Delete "$INSTDIR\share\apps\kcharselect\kcharselect-data"
-
-  # Files installed by old versions, mainly from the former
-  # kdesupport package
-  Delete "$INSTDIR\bin\giflib4.dll"
-  Delete "$INSTDIR\bin\libexpatw.dll"
-  Delete "$INSTDIR\bin\libexslt.dll"
-  Delete "$INSTDIR\bin\libkdewin32.dll"
-  Delete "$INSTDIR\bin\libxml2.dll"
-  Delete "$INSTDIR\bin\libxslt.dll"
-  Delete "$INSTDIR\bin\mingw-pcrecpp.dll"
-  Delete "$INSTDIR\bin\mingwm10.dll"
-  Delete "$INSTDIR\bin\pcre.dll"
-  Delete "$INSTDIR\bin\pcrecpp.dll"
-  Delete "$INSTDIR\bin\pcregrep.exe"
-  Delete "$INSTDIR\bin\pcreposix.dll"
-  Delete "$INSTDIR\bin\update-mime-database.exe"
-  Delete "$INSTDIR\bin\xmlcatalog.exe"
-  Delete "$INSTDIR\bin\xmllint.exe"
-  Delete "$INSTDIR\bin\xsltproc.exe"
-  Delete "$INSTDIR\bin\bin\kcmdwrapper.exe"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdelibs.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepim.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_kdepimlibs.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\desktop_l10n.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc2mutt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabcakonadi.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kabc_slox.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkabconfig.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kcmkontactnt.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimresources.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdepimwizards.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kdgantt1.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kfile_vcf.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kio_groupwise.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kitchensync.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_calendar_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_vcard_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmail_text_xdiff_plugin.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kmobiletools_at_engine.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kode.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\korn.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kpilot.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_birthday.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_featureplan.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupware.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_groupwise.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_kolab.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_scalix.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_tvanytime.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kres_xmlrpc.mo"
-  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxforms.mo"
-  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucrls.html"
-  Delete "$INSTDIR\share\doc\HTML\common\CMakeLists.txt"
-  Delete "$INSTDIR\share\doc\HTML\common\Doxyfile.global"
-  Delete "$INSTDIR\share\doc\HTML\common\README.Doxygen"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-left.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-middle.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\bottom-right.png"
-  Delete "$INSTDIR\share\apps\kdeui\about\top-right.png"
-  Delete "$INSTDIR\share\icons\oxygen\scalable\apps\kleopatra.svgz"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\256x256\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kleopatra.png"
-  Delete "$INSTDIR\share\icons\oxygen\index.theme"
-  Delete "$INSTDIR\share\kde4\servicetypes\kconfigbackend.desktop"
-  Delete "$INSTDIR\share\kde4\servicetypes\kplugininfo.desktop"
-  Delete "$INSTDIR\share\kde4\servicetypes\sonnetspeller.desktop"
-  Delete "$INSTDIR\share\kde4\services\kded\kdedglobalaccel.desktop"
-
-  Delete "$INSTDIR\share\locale\en_US\entry.desktop"
-
-  RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\ar"
-  RMDir "$INSTDIR\share\locale\en_US"
-  RMDir "$INSTDIR\share\xdg\menus"
-  RMDir "$INSTDIR\share\xdg"
-  RMDir "$INSTDIR\share\locale\de"
-  RMDir "$INSTDIR\share\locale"
-  RMDir "$INSTDIR\share\kde4\servicetypes"
-  RMDir "$INSTDIR\share\kde4\services\kded"
-  RMDir "$INSTDIR\share\kde4\services"
-  RMDir "$INSTDIR\share\kde4"
-  RMDir "$INSTDIR\share\config\ui"
-  RMDir "$INSTDIR\share\config\colors"
-  RMDir "$INSTDIR\share\config"
-  RMDir "$INSTDIR\share\apps\kdeui\pics"
-  RMDir "$INSTDIR\share\apps\kdeui\about"
-  RMDir "$INSTDIR\share\apps\kdeui"
-  RMDir "$INSTDIR\share\apps\kcharselect"
-  RMDir "$INSTDIR\share\apps"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR\lib\kde4"
-  RMDir "$INSTDIR\lib"
-  RMDir "$INSTDIR\etc\xdg\menus"
-  RMDir "$INSTDIR\etc\xdg"
-  RMDir "$INSTDIR\etc"
-  RMDir "$INSTDIR"
-
-
-  RMDir "$INSTDIR\share\kde4\services"
-  RMDir "$INSTDIR\share\kde4"
-  RMDir "$INSTDIR\share\icons\hicolor\scalable\apps"
-  RMDir "$INSTDIR\share\icons\hicolor\scalable"
   RMDir "$INSTDIR\share\icons\hicolor\64x64\apps"
   RMDir "$INSTDIR\share\icons\hicolor\64x64"
   RMDir "$INSTDIR\share\icons\hicolor\48x48\apps"
@@ -459,48 +58,135 @@ Section "-un.kleopatra"
   RMDir "$INSTDIR\share\icons\hicolor\128x128\apps"
   RMDir "$INSTDIR\share\icons\hicolor\128x128"
   RMDir "$INSTDIR\share\icons\hicolor"
-  RMDir "$INSTDIR\share\icons\oxygen\scalable\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\scalable"
-  RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\64x64"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32"
-  RMDir "$INSTDIR\share\icons\oxygen\256x256\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\256x256"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128"
-  RMDir "$INSTDIR\share\icons\oxygen"
-  RMDir "$INSTDIR\share\icons"
-  RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
-  RMDir "$INSTDIR\share\doc\HTML\en"
-  RMDir "$INSTDIR\share\doc\HTML\common"
-  RMDir "$INSTDIR\share\doc\HTML\de\kleopatra"
-  RMDir "$INSTDIR\share\doc\HTML\de"
-  RMDir "$INSTDIR\share\doc\HTML"
-  RMDir "$INSTDIR\share\doc"
-  RMDir "$INSTDIR\share\config"
-  RMDir "$INSTDIR\share\apps\libkleopatra\pics"
-  RMDir "$INSTDIR\share\apps\libkleopatra"
-  RMDir "$INSTDIR\share\apps\kwatchgnupg\pics"
-  RMDir "$INSTDIR\share\apps\kwatchgnupg"
-  RMDir "$INSTDIR\share\apps\kleopatra\pics"
-  RMDir "$INSTDIR\share\apps\kleopatra"
-  RMDir "$INSTDIR\share\apps"
-  RMDir "$INSTDIR\share\applications\kde4"
-  RMDir "$INSTDIR\share\applications"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR\lib\kde4"
-  RMDir "$INSTDIR\lib"
-  RMDir "$INSTDIR\bin"
-  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
-  RMDir "$INSTDIR\share\locale\de"
-  RMDir "$INSTDIR\share\locale"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuwindow.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuview.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menutools.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menusettings.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menuhelp.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menucertificates.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\menu.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\introduction.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\index.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-search.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-newkey.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\functions-keybox-management.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\credits-and-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-dn-order.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-smime-validation.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-gnupg-system.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-crypto-operations.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\configuration-appearance.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\commandline-options.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-key-filters.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-checksum-definitions.html"
+#  Delete "$INSTDIR\share\doc\HTML\en\kleopatra\admin-archive-definitions.html"
+#
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuwindow.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuview.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menutools.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menusettings.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menuhelp.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menucertificates.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\menu.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\introduction.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\index.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-search.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-newkey.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\functions-keybox-management.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\credits-and-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-dn-order.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-smime-validation.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-gnupg-system.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-crypto-operations.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\configuration-appearance.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\commandline-options.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-key-filters.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-checksum-definitions.html"
+#  Delete "$INSTDIR\share\doc\HTML\de\kleopatra\admin-archive-definitions.html"
+#
+#  Delete "$INSTDIR\share\doc\HTML\common\xml.dcl"
+#  Delete "$INSTDIR\share\doc\HTML\common\x11-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\top.jpg"
+#  Delete "$INSTDIR\share\doc\HTML\common\top-right.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\top-right.jpg"
+#  Delete "$INSTDIR\share\doc\HTML\common\top-middle.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\top-left.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\top-left.jpg"
+#  Delete "$INSTDIR\share\doc\HTML\common\top-kde.jpg"
+#  Delete "$INSTDIR\share\doc\HTML\common\tabs.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\qpl-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\print.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\mainheader.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\mainfooter.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\lgpl-license"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde_logo_bg.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde_logo.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css.template"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde-docs.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde-default.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\header.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\gpl-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\gpl-license"
+#  Delete "$INSTDIR\share\doc\HTML\common\footer.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\flat.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\fdl-notice.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\fdl-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\fdl-license"
+#  Delete "$INSTDIR\share\doc\HTML\common\favicon.ico"
+#  Delete "$INSTDIR\share\doc\HTML\common\doxygen.css"
+#  Delete "$INSTDIR\share\doc\HTML\common\bsd-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\bottom-right.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\bottom-middle.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\bottom-left.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\block_title_top.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\block_title_mid.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\block_title_bottom.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\artistic-license.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\9.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\8.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\7.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\6.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\5.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\4.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\3.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\2.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\10.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\1.png"
+#  Delete "$INSTDIR\share\doc\HTML\common\fdl-translated.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\gpl-translated.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\lgpl-translated.html"
+#  Delete "$INSTDIR\share\doc\HTML\common\kde-localised.css"
+
+  Delete "$INSTDIR\share\config\kdeglobals"
+#  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg2.png"
+#  Delete "$INSTDIR\share\apps\kwatchgnupg\pics\kwatchgnupg.png"
+#  Delete "$INSTDIR\share\apps\kwatchgnupg\kwatchgnupgui.rc"
+  Delete "$INSTDIR\share\kleopatra\pics\kleopatra_wizard.svgz"
+  Delete "$INSTDIR\share\kleopatra\pics\kleopatra_wizard.png"
+  Delete "$INSTDIR\share\kleopatra\pics\kleopatra_splashscreen.svgz"
+  Delete "$INSTDIR\share\kleopatra\pics\kleopatra_splashscreen.png"
+  Delete "$INSTDIR\share\kleopatra\pics\gpg4win.png"
+  Delete "$INSTDIR\share\kleopatra\pics\gpg4win-compact.png"
+  Delete "$INSTDIR\share\kleopatra\kleopatra.rc"
+  Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
+  Delete "$INSTDIR\bin\libkleopatraclientcore.dll"
+  Delete "$INSTDIR\bin\libkleopatraclientgui.dll"
+
+#  RMDir "$INSTDIR\share\doc\HTML\en\kleopatra"
+#  RMDir "$INSTDIR\share\doc\HTML\en"
+#  RMDir "$INSTDIR\share\doc\HTML\common"
+#  RMDir "$INSTDIR\share\doc\HTML\de\kleopatra"
+#  RMDir "$INSTDIR\share\doc\HTML\de"
+#  RMDir "$INSTDIR\share\doc\HTML"
+#  RMDir "$INSTDIR\share\doc"
   RMDir "$INSTDIR"
 
 !endif
diff --git a/src/uninst-oxygen-icons.nsi b/src/uninst-oxygen-icons.nsi
deleted file mode 100644
index 98b6c33..0000000
--- a/src/uninst-oxygen-icons.nsi
+++ /dev/null
@@ -1,403 +0,0 @@
-# uninst-oxygen-icons.nsi - Snippet for oxygen-icons.  -*- coding: latin-1; -*-
-# Copyright (C) 2005, 2007, 2008 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}/oxygen-icons-${gpg4win_pkg_oxygen_icons_version}
-
-
-; Uninstaller section.
-Section "-un.oxygen-icons"
-!ifdef SOURCES
-  Push "${gpg4win_pkg_oxygen_icons_src}"
-  Call un.SourceDelete
-!else
-
-  Delete "$INSTDIR\share\icons\oxygen\index.theme"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\security-medium.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\security-low.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\security-high.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\dialog-warning.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\dialog-password.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\dialog-information.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\status\dialog-error.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\apps\kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\tools-report-bug.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\list-remove.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-top.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\go-bottom.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\edit-find.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\edit-paste.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\dialog-ok.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\dialog-ok-apply.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\64x64\actions\application-exit.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\security-medium.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\security-low.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\security-high.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\dialog-warning.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\dialog-password.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\dialog-information.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\status\dialog-error.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\devices\secure-card.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\apps\kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\animations\process-working-kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\window-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-refresh.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-server-configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-import.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-export.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-export-server.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-export-secret.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\view-certificate-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\tools-report-bug.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\tab-new-background.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\tab-duplicate.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\tab-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\process-stop.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\list-remove.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\list-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\help-contextual.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\help-contents.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-top.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\go-bottom.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-undo.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-rename.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-redo.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-find.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-paste.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-delete.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\edit-clear-locationbar-rtl.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-revert.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-print.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-open.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-edit-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-edit-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-edit-sign-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-edit-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-edit-decrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\document-edit-decrypt-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\dialog-ok.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\dialog-ok-apply.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\dialog-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\dialog-cancel.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\configure-toolbars.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\configure-shortcuts.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\arrow-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\arrow-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\48x48\actions\application-exit.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\security-medium.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\security-low.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\security-high.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\dialog-warning.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\dialog-password.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\dialog-information.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\status\dialog-error.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\devices\secure-card.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\apps\kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\animations\process-working-kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\window-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-refresh.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-server-configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-import.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-export.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-export-server.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-export-secret.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\view-certificate-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\tools-report-bug.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\tab-new-background.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\tab-duplicate.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\tab-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\process-stop.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\list-remove.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\list-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\help-contextual.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\help-contents.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-top.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\go-bottom.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-undo.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-rename.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-redo.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-find.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-paste.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-delete.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\edit-clear-locationbar-rtl.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-revert.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-print.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-open.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-edit-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-edit-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-edit-sign-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-edit-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-edit-decrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\document-edit-decrypt-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\dialog-ok.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\dialog-ok-apply.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\dialog-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\dialog-cancel.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\configure-toolbars.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\configure-shortcuts.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\arrow-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\arrow-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\32x32\actions\application-exit.png"
-  Delete "$INSTDIR\share\icons\oxygen\256x256\devices\secure-card.png"
-  Delete "$INSTDIR\share\icons\oxygen\256x256\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\256x256\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\security-medium.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\security-low.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\security-high.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\dialog-warning.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\dialog-password.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\dialog-information.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\status\dialog-error.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\devices\secure-card.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\preferences-desktop-locale.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\apps\internet-mail.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\internet-mail.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\animations\process-working-kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\window-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-refresh.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-server-configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-import.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-export.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-export-server.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-export-secret.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\view-certificate-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\tools-report-bug.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\tab-new-background.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\tab-duplicate.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\tab-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\process-stop.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\list-remove.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\list-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\help-contextual.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\help-contents.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-top.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\go-bottom.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-undo.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-rename.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-redo.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-find.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-paste.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-delete.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\edit-clear-locationbar-rtl.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-revert.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-print.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-open.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-edit-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-edit-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-edit-sign-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-edit-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-edit-decrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\document-edit-decrypt-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\dialog-ok.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\dialog-ok-apply.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\dialog-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\dialog-cancel.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\configure-toolbars.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\configure-shortcuts.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\arrow-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\arrow-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\22x22\actions\application-exit.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\security-medium.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\security-low.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\security-high.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\dialog-warning.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\dialog-password.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\dialog-information.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\status\dialog-error.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\devices\secure-card.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\apps\kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\animations\process-working-kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\window-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-refresh.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-server-configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-import.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-export.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-export-server.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-export-secret.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\view-certificate-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tools-report-bug.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-new-background.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-duplicate.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\tab-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\process-stop.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\list-remove.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\list-add.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-contextual.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\help-contents.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-top.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\go-bottom.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-undo.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-rename.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-redo.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-find.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-paste.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-delete.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\edit-clear-locationbar-rtl.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-revert.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-print.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-open.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-edit-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-edit-sign.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-edit-sign-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-edit-encrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-edit-decrypt.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\document-edit-decrypt-verify.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-ok.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-ok-apply.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-close.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\dialog-cancel.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\configure-toolbars.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\configure-shortcuts.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\arrow-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\arrow-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\16x16\actions\application-exit.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\security-medium.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\security-low.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\security-high.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\dialog-warning.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\dialog-password.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\dialog-information.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\status\dialog-error.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\devices\secure-card.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\categories\preferences-system-network.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\categories\applications-graphics.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\apps\kde.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\tools-report-bug.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\list-remove.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-up.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-top.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-previous.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-next.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-last.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-first.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-down.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\go-bottom.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\edit-find.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\edit-paste.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\dialog-ok.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\dialog-ok-apply.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\configure.png"
-  Delete "$INSTDIR\share\icons\oxygen\128x128\actions\application-exit.png"
-
-  RMDir "$INSTDIR\share\icons\oxygen\64x64\status"
-  RMDir "$INSTDIR\share\icons\oxygen\64x64\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\64x64\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\64x64\actions"
-  RMDir "$INSTDIR\share\icons\oxygen\64x64"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\status"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\devices"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\animations"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48\actions"
-  RMDir "$INSTDIR\share\icons\oxygen\48x48"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\status"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\devices"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\animations"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32\actions"
-  RMDir "$INSTDIR\share\icons\oxygen\32x32"
-  RMDir "$INSTDIR\share\icons\oxygen\256x256\devices"
-  RMDir "$INSTDIR\share\icons\oxygen\256x256\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\256x256"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\status"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\devices"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\animations"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22\actions"
-  RMDir "$INSTDIR\share\icons\oxygen\22x22"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\status"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\devices"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\animations"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16\actions"
-  RMDir "$INSTDIR\share\icons\oxygen\16x16"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128\status"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128\devices"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128\categories"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128\apps"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128\actions"
-  RMDir "$INSTDIR\share\icons\oxygen\128x128"
-  RMDir "$INSTDIR\share\icons\oxygen"
-  RMDir "$INSTDIR\share\icons"
-  RMDir "$INSTDIR\share"
-  RMDir "$INSTDIR"
-
-!endif
-SectionEnd

commit b8d3627cd017e366c51a6c80ff557cc908edcec1
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Feb 4 15:52:44 2016 +0100

    Install qtsvg iconengine and imageformat
    
    * src/inst-qtsvg.nsi, src/uninst-qtsvg.nsi: Add files.
    
    --
    Needed for breeze icons which are svg only

diff --git a/src/inst-qtsvg.nsi b/src/inst-qtsvg.nsi
index e5b7c16..45e6aa8 100644
--- a/src/inst-qtsvg.nsi
+++ b/src/inst-qtsvg.nsi
@@ -31,5 +31,9 @@ Section "-qtsvg" SEC_qtsvg
 !else
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/Qt5Svg.dll
+  SetOutPath "$INSTDIR\iconengines"
+  File ${prefix}/plugins/iconengines/qtsvgicon.dll
+  SetOutPath "$INSTDIR\imageformats"
+  File ${prefix}/plugins/imageformats/qtsvg.dll
 !endif
 SectionEnd
diff --git a/src/uninst-qtsvg.nsi b/src/uninst-qtsvg.nsi
index 54d23e4..b9326c1 100644
--- a/src/uninst-qtsvg.nsi
+++ b/src/uninst-qtsvg.nsi
@@ -27,6 +27,10 @@ Section "-un.qtsvg"
   Call un.SourceDelete
 !else
   Delete "$INSTDIR\bin\Qt5Svg.dll"
+  Delete "$INSTDIR\bin\iconengines\qtsvgicon.dll"
+  Delete "$INSTDIR\bin\imageformats\qtsvg.dll"
+  RmDir "$INSTDIR\bin\imageformats"
+  RmDir "$INSTDIR\bin\iconengines"
   RmDir "$INSTDIR\bin"
 !endif
 SectionEnd

commit b9f95b92d813c53bdcce381f8244b0f616604a37
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Feb 4 15:50:41 2016 +0100

    Add tar.xz support to pkg-to-nsi.pl
    
    * src/pkg-to-nsi.pl: Add tar.xz support

diff --git a/src/pkg-to-nsi.pl b/src/pkg-to-nsi.pl
index 99fbae8..8f226fb 100644
--- a/src/pkg-to-nsi.pl
+++ b/src/pkg-to-nsi.pl
@@ -84,6 +84,10 @@ elsif ($_ =~ m/\.tar\.bz2$/)
 {
     @::files = `tar tjf $_`;
 }
+elsif ($_ =~ m/\.tar\.xz$/)
+{
+    @::files = `tar tJf $_`;
+}
 else
 {
     die "unknown file type $_";

commit d3fd0974b50b543639cf4b80b9acdddd977aabb9
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Thu Feb 4 11:40:26 2016 +0100

    Add patch to use convert to generate icon
    
    * Makefile.am (EXTRA_DIST): Add patch.
    * patches/extra-cmake-modules/
     0001-Add-convert-utility-support-for-Windows-icons.patch: New.
    
    --
    Convert is more readily available in most distributions
    then png2ico. Convert also does not have the 128px size restriction.

diff --git a/Makefile.am b/Makefile.am
index e372e4f..1d68d5a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -45,7 +45,8 @@ EXTRA_DIST = autogen.sh README.GIT ONEWS \
         patches/kconfigwidgets/0001-Make-QDbus-optional.patch \
         patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch \
         patches/kiconthemes/0001-Make-DBus-optional.patch \
-        patches/qtsvg/qtsvg-link-zlib.patch
+        patches/qtsvg/qtsvg-link-zlib.patch \
+        patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
 
 copy-news:
 	cp NEWS doc/website/NEWS.last
diff --git a/patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch b/patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
new file mode 100755
index 0000000..27e8e1a
--- /dev/null
+++ b/patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
@@ -0,0 +1,143 @@
+#! /bin/sh
+patch -p1 -l -f $* < $0
+exit $?
+
+From 9032d5c41ada1c50eddf6ea5562887af7a941aa9 Mon Sep 17 00:00:00 2001
+From: Andre Heinecke <aheinecke at intevation.de>
+Date: Thu, 4 Feb 2016 11:00:31 +0100
+Subject: [PATCH] Add convert utility support for Windows icons
+
+---
+ find-modules/FindConvert.cmake | 66 ++++++++++++++++++++++++++++++++++++++++++
+ modules/ECMAddAppIcon.cmake    | 27 +++++++++++++----
+ 2 files changed, 88 insertions(+), 5 deletions(-)
+ create mode 100644 find-modules/FindConvert.cmake
+
+diff --git a/find-modules/FindConvert.cmake b/find-modules/FindConvert.cmake
+new file mode 100644
+index 0000000..a723c37
+--- /dev/null
++++ b/find-modules/FindConvert.cmake
+@@ -0,0 +1,66 @@
++#.rst:
++# FindConvert
++# -----------
++#
++# Try to find convert.
++#
++# If the convert executable is not in your PATH, you can provide
++# an alternative name or full path location with the ``Convert_EXECUTABLE``
++# variable.
++#
++#=============================================================================
++# Copyright 2016 Intevation GmbH <intevation at intevation.org>
++#
++# Redistribution and use in source and binary forms, with or without
++# modification, are permitted provided that the following conditions
++# are met:
++#
++# 1. Redistributions of source code must retain the copyright
++#    notice, this list of conditions and the following disclaimer.
++# 2. Redistributions in binary form must reproduce the copyright
++#    notice, this list of conditions and the following disclaimer in the
++#    documentation and/or other materials provided with the distribution.
++# 3. The name of the author may not be used to endorse or promote products
++#    derived from this software without specific prior written permission.
++#
++# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
++# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
++# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
++# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
++# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
++# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
++# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
++# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
++# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
++# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
++
++include(${CMAKE_CURRENT_LIST_DIR}/ECMFindModuleHelpersStub.cmake)
++
++ecm_find_package_version_check(Convert)
++
++find_program(Convert_EXECUTABLE NAMES convert)
++
++include(FindPackageHandleStandardArgs)
++find_package_handle_standard_args(Convert
++    FOUND_VAR
++        Convert_FOUND
++    REQUIRED_VARS
++        Convert_EXECUTABLE
++)
++
++mark_as_advanced(Convert_EXECUTABLE)
++
++if (Convert_FOUND)
++    if (NOT TARGET Convert::Convert)
++        add_executable(Convert::Convert IMPORTED)
++        set_target_properties(Convert::Convert PROPERTIES
++            IMPORTED_LOCATION "${Convert_EXECUTABLE}"
++        )
++    endif()
++endif()
++
++include(FeatureSummary)
++set_package_properties(Convert PROPERTIES
++    URL "http://www.imagemagick.org/"
++    DESCRIPTION "Generic image format conversion tool from imagemagick."
++)
+diff --git a/modules/ECMAddAppIcon.cmake b/modules/ECMAddAppIcon.cmake
+index 5233a5f..2b5dca1 100644
+--- a/modules/ECMAddAppIcon.cmake
++++ b/modules/ECMAddAppIcon.cmake
+@@ -128,10 +128,22 @@ function(ecm_add_app_icon appsources)
+     if (WIN32 AND windows_icons)
+         set(saved_CMAKE_MODULE_PATH "${CMAKE_MODULE_PATH}")
+         set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_FIND_MODULE_DIR})
+-        find_package(Png2Ico)
++        find_package(Convert)
++        if (NOT Convert_FOUND)
++            find_package(Png2Ico)
++        endif()
+         set(CMAKE_MODULE_PATH "${saved_CMAKE_MODULE_PATH}")
+
+-        if (Png2Ico_FOUND)
++        if (Convert_FOUND)
++            set(windows_icons ${windows_icons} ${icons_at_256px})
++            add_custom_command(
++                OUTPUT "${_outfilename}.ico"
++                COMMAND Convert::Convert
++                ARGS ${windows_icons} "${_outfilename}.ico"
++                DEPENDS ${windows_icons}
++                WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
++            )
++        elseif (Png2Ico_FOUND)
+             if (Png2Ico_HAS_RCFILE_ARGUMENT)
+                 add_custom_command(
+                     OUTPUT "${_outfilename}.rc" "${_outfilename}.ico"
+@@ -151,6 +163,14 @@ function(ecm_add_app_icon appsources)
+                     DEPENDS ${windows_icons}
+                     WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}"
+                 )
++            endif()
++        else()
++            message(WARNING "Unable to find the png2ico or convert utility - application will not have an application icon!")
++        endif()
++
++        if (Convert_FOUND OR Png2Ico_FOUND)
++            set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
++            if (NOT Png2Ico_HAS_RCFILE_ARGUMENT)
+                 # this bit's a little hacky to make the dependency stuff work
+                 file(WRITE "${_outfilename}.rc.in" "IDI_ICON1        ICON        DISCARDABLE    \"${_outfilename}.ico\"\n")
+                 add_custom_command(
+@@ -161,9 +181,6 @@ function(ecm_add_app_icon appsources)
+                     WORKING_DIRECTORY "${CMAKE_CURRENT_BINARY_DIR}"
+                 )
+             endif()
+-            set(${appsources} "${${appsources}};${_outfilename}.rc" PARENT_SCOPE)
+-        else()
+-            message(WARNING "Unable to find the png2ico utility - application will not have an application icon!")
+         endif()
+     elseif (APPLE AND mac_icons)
+         # first generate .iconset directory structure, then convert to .icns format using the Mac OS X "iconutil" utility,
+--
+2.1.4

commit c9474bebd270fb4e12ec425fb5bf284b2f57e694
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 3 18:51:13 2016 +0100

    Install various additional files
    
    * inst-gpgmepp.nsi: Install QGpgme.
    * inst-kconfig.nsi: Install gui parts.
    * inst-kxmgui.nsi: Install translations for generic KDE Strings.
    * inst-qtbase.nsi: Install qtnetwork, qtxml and printsupport.
    * inst-gpgmepp.nsi,
     inst-kconfig.nsi,
     inst-kxmgui.nsi,
     inst-qtbase.nsi: Update accordingly.

diff --git a/src/inst-gpgmepp.nsi b/src/inst-gpgmepp.nsi
index 9b80869..3e09cd2 100644
--- a/src/inst-gpgmepp.nsi
+++ b/src/inst-gpgmepp.nsi
@@ -31,5 +31,6 @@ Section "-gpgmepp" SEC_gpgmepp
 !else
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libKF5Gpgmepp.dll
+  File ${prefix}/bin/libKF5QGpgme.dll
 !endif
 SectionEnd
diff --git a/src/inst-kconfig.nsi b/src/inst-kconfig.nsi
index 5939b67..8941984 100644
--- a/src/inst-kconfig.nsi
+++ b/src/inst-kconfig.nsi
@@ -31,5 +31,6 @@ Section "-kconfig" SEC_kconfig
 !else
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libKF5ConfigCore.dll
+  File ${prefix}/bin/libKF5ConfigGui.dll
 !endif
 SectionEnd
diff --git a/src/inst-kxmlgui.nsi b/src/inst-kxmlgui.nsi
index 2eb9815..ef9f0ba 100644
--- a/src/inst-kxmlgui.nsi
+++ b/src/inst-kxmlgui.nsi
@@ -31,5 +31,206 @@ Section "-kxmlgui" SEC_kxmlgui
 !else
   SetOutPath "$INSTDIR\bin"
   File ${prefix}/bin/libKF5XmlGui.dll
+
+  SetOutPath "$INSTDIR\share\locale\csb\LC_MESSAGES"
+  File ${prefix}/share/locale/csb/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\hi\LC_MESSAGES"
+  File ${prefix}/share/locale/hi/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\cy\LC_MESSAGES"
+  File ${prefix}/share/locale/cy/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\it\LC_MESSAGES"
+  File ${prefix}/share/locale/it/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sl\LC_MESSAGES"
+  File ${prefix}/share/locale/sl/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\gd\LC_MESSAGES"
+  File ${prefix}/share/locale/gd/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ka\LC_MESSAGES"
+  File ${prefix}/share/locale/ka/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\crh\LC_MESSAGES"
+  File ${prefix}/share/locale/crh/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sq\LC_MESSAGES"
+  File ${prefix}/share/locale/sq/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\hne\LC_MESSAGES"
+  File ${prefix}/share/locale/hne/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\mk\LC_MESSAGES"
+  File ${prefix}/share/locale/mk/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
+  File ${prefix}/share/locale/pt_BR/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\bg\LC_MESSAGES"
+  File ${prefix}/share/locale/bg/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ar\LC_MESSAGES"
+  File ${prefix}/share/locale/ar/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\eu\LC_MESSAGES"
+  File ${prefix}/share/locale/eu/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sv\LC_MESSAGES"
+  File ${prefix}/share/locale/sv/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sk\LC_MESSAGES"
+  File ${prefix}/share/locale/sk/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ko\LC_MESSAGES"
+  File ${prefix}/share/locale/ko/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ga\LC_MESSAGES"
+  File ${prefix}/share/locale/ga/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\tg\LC_MESSAGES"
+  File ${prefix}/share/locale/tg/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ug\LC_MESSAGES"
+  File ${prefix}/share/locale/ug/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\nds\LC_MESSAGES"
+  File ${prefix}/share/locale/nds/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\oc\LC_MESSAGES"
+  File ${prefix}/share/locale/oc/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\fa\LC_MESSAGES"
+  File ${prefix}/share/locale/fa/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\lb\LC_MESSAGES"
+  File ${prefix}/share/locale/lb/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\th\LC_MESSAGES"
+  File ${prefix}/share/locale/th/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sr\LC_MESSAGES"
+  File ${prefix}/share/locale/sr/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\uz\LC_MESSAGES"
+  File ${prefix}/share/locale/uz/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\mai\LC_MESSAGES"
+  File ${prefix}/share/locale/mai/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ja\LC_MESSAGES"
+  File ${prefix}/share/locale/ja/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\eo\LC_MESSAGES"
+  File ${prefix}/share/locale/eo/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\uk\LC_MESSAGES"
+  File ${prefix}/share/locale/uk/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ne\LC_MESSAGES"
+  File ${prefix}/share/locale/ne/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\bn\LC_MESSAGES"
+  File ${prefix}/share/locale/bn/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\fi\LC_MESSAGES"
+  File ${prefix}/share/locale/fi/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\hy\LC_MESSAGES"
+  File ${prefix}/share/locale/hy/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\mr\LC_MESSAGES"
+  File ${prefix}/share/locale/mr/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES"
+  File ${prefix}/share/locale/sr at ijekavianlatin/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\xh\LC_MESSAGES"
+  File ${prefix}/share/locale/xh/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\bs\LC_MESSAGES"
+  File ${prefix}/share/locale/bs/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\zh_HK\LC_MESSAGES"
+  File ${prefix}/share/locale/zh_HK/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\cs\LC_MESSAGES"
+  File ${prefix}/share/locale/cs/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\hsb\LC_MESSAGES"
+  File ${prefix}/share/locale/hsb/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\vi\LC_MESSAGES"
+  File ${prefix}/share/locale/vi/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\hr\LC_MESSAGES"
+  File ${prefix}/share/locale/hr/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\kk\LC_MESSAGES"
+  File ${prefix}/share/locale/kk/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\hu\LC_MESSAGES"
+  File ${prefix}/share/locale/hu/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
+  File ${prefix}/share/locale/zh_TW/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\nn\LC_MESSAGES"
+  File ${prefix}/share/locale/nn/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\nb\LC_MESSAGES"
+  File ${prefix}/share/locale/nb/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\de\LC_MESSAGES"
+  File ${prefix}/share/locale/de/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\pl\LC_MESSAGES"
+  File ${prefix}/share/locale/pl/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\et\LC_MESSAGES"
+  File ${prefix}/share/locale/et/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ast\LC_MESSAGES"
+  File ${prefix}/share/locale/ast/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\he\LC_MESSAGES"
+  File ${prefix}/share/locale/he/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ia\LC_MESSAGES"
+  File ${prefix}/share/locale/ia/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\si\LC_MESSAGES"
+  File ${prefix}/share/locale/si/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\lt\LC_MESSAGES"
+  File ${prefix}/share/locale/lt/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ps\LC_MESSAGES"
+  File ${prefix}/share/locale/ps/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES"
+  File ${prefix}/share/locale/sr at ijekavian/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ru\LC_MESSAGES"
+  File ${prefix}/share/locale/ru/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ro\LC_MESSAGES"
+  File ${prefix}/share/locale/ro/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\br\LC_MESSAGES"
+  File ${prefix}/share/locale/br/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\kn\LC_MESSAGES"
+  File ${prefix}/share/locale/kn/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\fy\LC_MESSAGES"
+  File ${prefix}/share/locale/fy/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\be at latin\LC_MESSAGES"
+  File ${prefix}/share/locale/be at latin/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\pt\LC_MESSAGES"
+  File ${prefix}/share/locale/pt/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\is\LC_MESSAGES"
+  File ${prefix}/share/locale/is/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\wa\LC_MESSAGES"
+  File ${prefix}/share/locale/wa/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\fr\LC_MESSAGES"
+  File ${prefix}/share/locale/fr/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\or\LC_MESSAGES"
+  File ${prefix}/share/locale/or/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ha\LC_MESSAGES"
+  File ${prefix}/share/locale/ha/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\tt\LC_MESSAGES"
+  File ${prefix}/share/locale/tt/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\lv\LC_MESSAGES"
+  File ${prefix}/share/locale/lv/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\uz at cyrillic\LC_MESSAGES"
+  File ${prefix}/share/locale/uz at cyrillic/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\tr\LC_MESSAGES"
+  File ${prefix}/share/locale/tr/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\gl\LC_MESSAGES"
+  File ${prefix}/share/locale/gl/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ta\LC_MESSAGES"
+  File ${prefix}/share/locale/ta/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\gu\LC_MESSAGES"
+  File ${prefix}/share/locale/gu/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\af\LC_MESSAGES"
+  File ${prefix}/share/locale/af/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\es\LC_MESSAGES"
+  File ${prefix}/share/locale/es/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ku\LC_MESSAGES"
+  File ${prefix}/share/locale/ku/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\en_GB\LC_MESSAGES"
+  File ${prefix}/share/locale/en_GB/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\bn_IN\LC_MESSAGES"
+  File ${prefix}/share/locale/bn_IN/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ca\LC_MESSAGES"
+  File ${prefix}/share/locale/ca/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\el\LC_MESSAGES"
+  File ${prefix}/share/locale/el/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\se\LC_MESSAGES"
+  File ${prefix}/share/locale/se/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\sr at latin\LC_MESSAGES"
+  File ${prefix}/share/locale/sr at latin/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\km\LC_MESSAGES"
+  File ${prefix}/share/locale/km/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\te\LC_MESSAGES"
+  File ${prefix}/share/locale/te/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\be\LC_MESSAGES"
+  File ${prefix}/share/locale/be/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\as\LC_MESSAGES"
+  File ${prefix}/share/locale/as/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ml\LC_MESSAGES"
+  File ${prefix}/share/locale/ml/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\pa\LC_MESSAGES"
+  File ${prefix}/share/locale/pa/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\id\LC_MESSAGES"
+  File ${prefix}/share/locale/id/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ms\LC_MESSAGES"
+  File ${prefix}/share/locale/ms/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\ca at valencia\LC_MESSAGES"
+  File ${prefix}/share/locale/ca at valencia/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\da\LC_MESSAGES"
+  File ${prefix}/share/locale/da/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\nl\LC_MESSAGES"
+  File ${prefix}/share/locale/nl/LC_MESSAGES/kxmlgui5.mo
+  SetOutPath "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
+  File ${prefix}/share/locale/zh_CN/LC_MESSAGES/kxmlgui5.mo
 !endif
 SectionEnd
diff --git a/src/inst-qtbase.nsi b/src/inst-qtbase.nsi
index 343e7e9..301a638 100644
--- a/src/inst-qtbase.nsi
+++ b/src/inst-qtbase.nsi
@@ -37,6 +37,9 @@ Section "-qtbase" SEC_qtbase
   File ${prefix}/bin/Qt5Core.dll
   File ${prefix}/bin/Qt5Gui.dll
   File ${prefix}/bin/Qt5Widgets.dll
+  File ${prefix}/bin/Qt5Network.dll
+  File ${prefix}/bin/Qt5PrintSupport.dll
+  File ${prefix}/bin/Qt5Xml.dll
 
   SetOutPath "$INSTDIR\platforms"
 
diff --git a/src/uninst-gpgmepp.nsi b/src/uninst-gpgmepp.nsi
index 97bd0d2..485db7c 100644
--- a/src/uninst-gpgmepp.nsi
+++ b/src/uninst-gpgmepp.nsi
@@ -27,6 +27,7 @@ Section "-un.gpgmepp"
   Call un.SourceDelete
 !else
   Delete "$INSTDIR\bin\libKF5Gpgmepp.dll"
+  Delete "$INSTDIR\bin\libKF5QGpgmepp.dll"
   RmDir "$INSTDIR\bin"
 
 !endif
diff --git a/src/uninst-kconfig.nsi b/src/uninst-kconfig.nsi
index 1ac7a8d..a5ff9d5 100644
--- a/src/uninst-kconfig.nsi
+++ b/src/uninst-kconfig.nsi
@@ -27,6 +27,7 @@ Section "-un.kconfig"
   Call un.SourceDelete
 !else
   Delete "$INSTDIR\bin\libKF5ConfigCore.dll"
+  Delete "$INSTDIR\bin\libKF5ConfigGui.dll"
   RmDir "$INSTDIR\bin"
 
 !endif
diff --git a/src/uninst-kxmlgui.nsi b/src/uninst-kxmlgui.nsi
index 5a9b6a5..f72d286 100644
--- a/src/uninst-kxmlgui.nsi
+++ b/src/uninst-kxmlgui.nsi
@@ -29,5 +29,308 @@ Section "-un.kxmlgui"
   Delete "$INSTDIR\bin\libKF5XmlGui.dll"
   RmDir "$INSTDIR\bin"
 
+  Delete "$INSTDIR\share\locale\csb\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\csb\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\csb"
+  Delete "$INSTDIR\share\locale\hi\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\hi\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hi"
+  Delete "$INSTDIR\share\locale\cy\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\cy\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\cy"
+  Delete "$INSTDIR\share\locale\it\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\it\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\it"
+  Delete "$INSTDIR\share\locale\sl\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sl"
+  Delete "$INSTDIR\share\locale\gd\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\gd\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\gd"
+  Delete "$INSTDIR\share\locale\ka\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ka\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ka"
+  Delete "$INSTDIR\share\locale\crh\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\crh\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\crh"
+  Delete "$INSTDIR\share\locale\sq\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sq\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sq"
+  Delete "$INSTDIR\share\locale\hne\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\hne\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hne"
+  Delete "$INSTDIR\share\locale\mk\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\mk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\mk"
+  Delete "$INSTDIR\share\locale\pt_BR\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\pt_BR\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pt_BR"
+  Delete "$INSTDIR\share\locale\bg\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\bg\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\bg"
+  Delete "$INSTDIR\share\locale\ar\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ar\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ar"
+  Delete "$INSTDIR\share\locale\eu\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\eu\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\eu"
+  Delete "$INSTDIR\share\locale\sv\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sv\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sv"
+  Delete "$INSTDIR\share\locale\sk\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sk"
+  Delete "$INSTDIR\share\locale\ko\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ko\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ko"
+  Delete "$INSTDIR\share\locale\ga\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ga\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ga"
+  Delete "$INSTDIR\share\locale\tg\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\tg\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\tg"
+  Delete "$INSTDIR\share\locale\ug\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ug\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ug"
+  Delete "$INSTDIR\share\locale\nds\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\nds\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\nds"
+  Delete "$INSTDIR\share\locale\oc\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\oc\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\oc"
+  Delete "$INSTDIR\share\locale\fa\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\fa\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fa"
+  Delete "$INSTDIR\share\locale\lb\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\lb\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\lb"
+  Delete "$INSTDIR\share\locale\th\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\th\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\th"
+  Delete "$INSTDIR\share\locale\sr\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sr"
+  Delete "$INSTDIR\share\locale\uz\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\uz\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\uz"
+  Delete "$INSTDIR\share\locale\mai\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\mai\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\mai"
+  Delete "$INSTDIR\share\locale\ja\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ja\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ja"
+  Delete "$INSTDIR\share\locale\eo\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\eo\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\eo"
+  Delete "$INSTDIR\share\locale\uk\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\uk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\uk"
+  Delete "$INSTDIR\share\locale\ne\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ne\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ne"
+  Delete "$INSTDIR\share\locale\bn\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\bn\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\bn"
+  Delete "$INSTDIR\share\locale\fi\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\fi\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fi"
+  Delete "$INSTDIR\share\locale\hy\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\hy\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hy"
+  Delete "$INSTDIR\share\locale\mr\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\mr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\mr"
+  Delete "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sr at ijekavianlatin\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sr at ijekavianlatin"
+  Delete "$INSTDIR\share\locale\xh\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\xh\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\xh"
+  Delete "$INSTDIR\share\locale\bs\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\bs\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\bs"
+  Delete "$INSTDIR\share\locale\zh_HK\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\zh_HK\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_HK"
+  Delete "$INSTDIR\share\locale\cs\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\cs\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\cs"
+  Delete "$INSTDIR\share\locale\hsb\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\hsb\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hsb"
+  Delete "$INSTDIR\share\locale\vi\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\vi\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\vi"
+  Delete "$INSTDIR\share\locale\hr\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\hr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hr"
+  Delete "$INSTDIR\share\locale\kk\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\kk\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\kk"
+  Delete "$INSTDIR\share\locale\hu\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\hu\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\hu"
+  Delete "$INSTDIR\share\locale\zh_TW\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\zh_TW\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_TW"
+  Delete "$INSTDIR\share\locale\nn\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\nn\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\nn"
+  Delete "$INSTDIR\share\locale\nb\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\nb\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\nb"
+  Delete "$INSTDIR\share\locale\de\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\de\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\de"
+  Delete "$INSTDIR\share\locale\pl\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\pl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pl"
+  Delete "$INSTDIR\share\locale\et\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\et\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\et"
+  Delete "$INSTDIR\share\locale\ast\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ast\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ast"
+  Delete "$INSTDIR\share\locale\he\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\he\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\he"
+  Delete "$INSTDIR\share\locale\ia\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ia\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ia"
+  Delete "$INSTDIR\share\locale\si\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\si\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\si"
+  Delete "$INSTDIR\share\locale\lt\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\lt\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\lt"
+  Delete "$INSTDIR\share\locale\ps\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ps\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ps"
+  Delete "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sr at ijekavian\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sr at ijekavian"
+  Delete "$INSTDIR\share\locale\ru\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ru\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ru"
+  Delete "$INSTDIR\share\locale\ro\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ro\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ro"
+  Delete "$INSTDIR\share\locale\br\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\br\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\br"
+  Delete "$INSTDIR\share\locale\kn\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\kn\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\kn"
+  Delete "$INSTDIR\share\locale\fy\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\fy\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fy"
+  Delete "$INSTDIR\share\locale\be at latin\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\be at latin\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\be at latin"
+  Delete "$INSTDIR\share\locale\pt\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\pt\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pt"
+  Delete "$INSTDIR\share\locale\is\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\is\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\is"
+  Delete "$INSTDIR\share\locale\wa\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\wa\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\wa"
+  Delete "$INSTDIR\share\locale\fr\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\fr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\fr"
+  Delete "$INSTDIR\share\locale\or\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\or\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\or"
+  Delete "$INSTDIR\share\locale\ha\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ha\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ha"
+  Delete "$INSTDIR\share\locale\tt\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\tt\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\tt"
+  Delete "$INSTDIR\share\locale\lv\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\lv\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\lv"
+  Delete "$INSTDIR\share\locale\uz at cyrillic\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\uz at cyrillic\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\uz at cyrillic"
+  Delete "$INSTDIR\share\locale\tr\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\tr\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\tr"
+  Delete "$INSTDIR\share\locale\gl\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\gl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\gl"
+  Delete "$INSTDIR\share\locale\ta\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ta\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ta"
+  Delete "$INSTDIR\share\locale\gu\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\gu\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\gu"
+  Delete "$INSTDIR\share\locale\af\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\af\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\af"
+  Delete "$INSTDIR\share\locale\es\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\es\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\es"
+  Delete "$INSTDIR\share\locale\ku\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ku\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ku"
+  Delete "$INSTDIR\share\locale\en_GB\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\en_GB\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\en_GB"
+  Delete "$INSTDIR\share\locale\bn_IN\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\bn_IN\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\bn_IN"
+  Delete "$INSTDIR\share\locale\ca\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ca\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ca"
+  Delete "$INSTDIR\share\locale\el\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\el\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\el"
+  Delete "$INSTDIR\share\locale\se\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\se\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\se"
+  Delete "$INSTDIR\share\locale\sr at latin\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\sr at latin\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\sr at latin"
+  Delete "$INSTDIR\share\locale\km\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\km\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\km"
+  Delete "$INSTDIR\share\locale\te\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\te\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\te"
+  Delete "$INSTDIR\share\locale\be\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\be\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\be"
+  Delete "$INSTDIR\share\locale\as\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\as\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\as"
+  Delete "$INSTDIR\share\locale\ml\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ml\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ml"
+  Delete "$INSTDIR\share\locale\pa\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\pa\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\pa"
+  Delete "$INSTDIR\share\locale\id\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\id\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\id"
+  Delete "$INSTDIR\share\locale\ms\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ms\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ms"
+  Delete "$INSTDIR\share\locale\ca at valencia\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\ca at valencia\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\ca at valencia"
+  Delete "$INSTDIR\share\locale\da\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\da\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\da"
+  Delete "$INSTDIR\share\locale\nl\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\nl\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\nl"
+  Delete "$INSTDIR\share\locale\zh_CN\LC_MESSAGES\kxmlgui5.mo"
+  RMDir "$INSTDIR\share\locale\zh_CN\LC_MESSAGES"
+  RMDir "$INSTDIR\share\locale\zh_CN"
+  RMDir "$INSTDIR\share\locale"
+  RMDir "$INSTDIR\share"
+  RMDir "$INSTDIR"
 !endif
 SectionEnd
diff --git a/src/uninst-qtbase.nsi b/src/uninst-qtbase.nsi
index 326e882..eab906f 100644
--- a/src/uninst-qtbase.nsi
+++ b/src/uninst-qtbase.nsi
@@ -34,6 +34,9 @@ Section "-un.qtbase"
   Delete "$INSTDIR\bin\Qt5Core.dll"
   Delete "$INSTDIR\bin\Qt5Gui.dll"
   Delete "$INSTDIR\bin\Qt5Widgets.dll"
+  Delete "$INSTDIR\bin\Qt5Network.dll"
+  Delete "$INSTDIR\bin\Qt5Xml.dll"
+  Delete "$INSTDIR\bin\Qt5PrintSupport.dll"
 
   Delete "$INSTDIR\platforms\qwindows.dll"
 

commit fe48e23fe666d6a758298555fec6e6bcaec9ae1d
Author: Andre Heinecke <aheinecke at intevation.de>
Date:   Wed Feb 3 18:48:38 2016 +0100

    Also build KCModule from configwidgets
    
    * patches/kconfigwidgets/
     0002-Crudely-remove-KF5Auth-depedency.patch: Updated.
    
    --
    They will still be used in Kleopatra but without
    the KAuth dependency.
    
    This patch is not ready for upstream and is more
    of a hack.

diff --git a/patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch b/patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch
index 32166cd..9cfc0ef 100755
--- a/patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch
+++ b/patches/kconfigwidgets/0002-Crudely-remove-KF5Auth-depedency.patch
@@ -2,57 +2,27 @@
 patch -p1 -l -f $* < $0
 exit $?
 
-From bb6e1b9bf227a0276d35f9edb6e5b9240bd3cd69 Mon Sep 17 00:00:00 2001
-From: Andre Heinecke <aheinecke at intevation.de>
-Date: Thu, 28 Jan 2016 17:30:10 +0100
-Subject: [PATCH 2/2] Crudely remove KF5Auth depedency
+commit 1726c63ba424a3392a1cba5a993c1388f0c3eadc
+Author: Andre Heinecke <aheinecke at intevation.de>
+Date:   Tue Feb 2 13:39:27 2016 +0100
 
-This is not intended for upstream
----
- CMakeLists.txt     | 1 -
- src/CMakeLists.txt | 3 ---
- 2 files changed, 4 deletions(-)
+    Crudely remove KF5Auth depedency
+
+    This is not intended for upstream
 
 diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 87f976c..c150897 100644
+index 87f976c..43d447f 100644
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -36,7 +36,6 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIGWIDGETS
+@@ -36,7 +36,7 @@ ecm_setup_version(${KF5_VERSION} VARIABLE_PREFIX KCONFIGWIDGETS
                          PACKAGE_VERSION_FILE "${CMAKE_CURRENT_BINARY_DIR}/KF5ConfigWidgetsConfigVersion.cmake"
                          SOVERSION 5)
 
 -find_package(KF5Auth ${KF5_DEP_VERSION} REQUIRED)
++find_package(KF5Auth ${KF5_DEP_VERSION})
  find_package(KF5CoreAddons ${KF5_DEP_VERSION} REQUIRED)
  find_package(KF5Codecs ${KF5_DEP_VERSION} REQUIRED)
  find_package(KF5Config ${KF5_DEP_VERSION} REQUIRED)
-diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 104b118..d2a5c50 100644
---- a/src/CMakeLists.txt
-+++ b/src/CMakeLists.txt
-@@ -10,7 +10,6 @@ set(kconfigwidgets_SRCS
-   kconfigdialog.cpp
-   kconfigviewstatesaver.cpp
-   kconfigdialogmanager.cpp
--  kcmodule.cpp
-   khelpclient.cpp
-   klanguagebutton.cpp
-   kpastetextaction.cpp
-@@ -32,7 +31,6 @@ target_link_libraries(KF5ConfigWidgets
-     KF5::Codecs # KCodecActions uses KCharsets, KEncodingProber
-     KF5::WidgetsAddons # For K*Action, KPage*, KViewStateSerializer, KAcceleratorManager, K*GuiItem
-     KF5::ConfigGui # KStandardAction uses KStandardShortcut
--    KF5::Auth # KCModule uses KAuth::Action
-   PRIVATE
-     ${KCONFIGWIDGETS_QDBUS_LIBS} # KPasteTextAction talks to Klipper via DBus
-     KF5::CoreAddons # KCModule uses KAboutData, KTipDialog uses KRandom
-@@ -53,7 +51,6 @@ ecm_generate_headers(KConfigWidgets_HEADERS
-   KConfigDialog
-   KConfigViewStateSaver
-   KConfigDialogManager
--  KCModule
-   KHelpClient
-   KLanguageButton
-   KPasteTextAction
 diff --git a/KF5ConfigWidgetsConfig.cmake.in b/KF5ConfigWidgetsConfig.cmake.in
 index 9096da6..660db4c 100644
 --- a/KF5ConfigWidgetsConfig.cmake.in
@@ -64,5 +34,114 @@ index 9096da6..660db4c 100644
  find_dependency(KF5Codecs "@KF5_DEP_VERSION@")
  find_dependency(KF5Config "@KF5_DEP_VERSION@")
  find_dependency(KF5WidgetsAddons "@KF5_DEP_VERSION@")
---
-2.1.4
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 104b118..ebce4ec 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -32,7 +32,6 @@ target_link_libraries(KF5ConfigWidgets
+     KF5::Codecs # KCodecActions uses KCharsets, KEncodingProber
+     KF5::WidgetsAddons # For K*Action, KPage*, KViewStateSerializer, KAcceleratorManager, K*GuiItem
+     KF5::ConfigGui # KStandardAction uses KStandardShortcut
+-    KF5::Auth # KCModule uses KAuth::Action
+   PRIVATE
+     ${KCONFIGWIDGETS_QDBUS_LIBS} # KPasteTextAction talks to Klipper via DBus
+     KF5::CoreAddons # KCModule uses KAboutData, KTipDialog uses KRandom
+@@ -78,5 +77,5 @@ install(PROGRAMS preparetips5 DESTINATION ${KDE_INSTALL_BINDIR} )
+ install( FILES entry.desktop  DESTINATION  ${KDE_INSTALL_LOCALEDIR}/en_US RENAME kf5_entry.desktop )
+
+ include(ECMGeneratePriFile)
+-ecm_generate_pri_file(BASE_NAME KConfigWidgets LIB_NAME KF5ConfigWidgets DEPS "KCodecs KWidgetsAddons KConfigGui KAuth" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigWidgets)
++ecm_generate_pri_file(BASE_NAME KConfigWidgets LIB_NAME KF5ConfigWidgets DEPS "KCodecs KWidgetsAddons KConfigGui" FILENAME_VAR PRI_FILENAME INCLUDE_INSTALL_DIR ${KDE_INSTALL_INCLUDEDIR_KF5}/KConfigWidgets)
+ install(FILES ${PRI_FILENAME} DESTINATION ${ECM_MKSPECS_INSTALL_DIR})
+diff --git a/src/kcmodule.cpp b/src/kcmodule.cpp
+index db6c966..cfa3ac9 100644
+--- a/src/kcmodule.cpp
++++ b/src/kcmodule.cpp
+@@ -32,7 +32,9 @@
+ #include <kconfigskeleton.h>
+ #include <kconfigdialogmanager.h>
+ #include <klocalizedstring.h>
++#if 0
+ #include <kauthexecutejob.h>
++#endif
+
+ class KCModulePrivate
+ {
+@@ -43,7 +45,9 @@ public:
+         _useRootOnlyMessage(false),
+         _firstshow(true),
+         _needsAuthorization(false),
++#if 0
+         _authAction(),
++#endif
+         _unmanagedWidgetChangeState(false)
+     { }
+
+@@ -59,7 +63,9 @@ public:
+     bool _firstshow : 1;
+
+     bool  _needsAuthorization : 1;
++#if 0
+     KAuth::Action _authAction;
++#endif
+
+     // this member is used to record the state on non-automatically
+     // managed widgets, allowing for mixed KConfigXT-drive and manual
+@@ -118,6 +124,7 @@ KConfigDialogManager *KCModule::addConfig(KConfigSkeleton *config, QWidget *widg
+     return manager;
+ }
+
++#if 0
+ void KCModule::setNeedsAuthorization(bool needsAuth)
+ {
+     d->_needsAuthorization = needsAuth;
+@@ -173,6 +180,7 @@ void KCModule::authStatusChanged(KAuth::Action::AuthStatus status)
+
+     qDebug() << useRootOnlyMessage();
+ }
++#endif
+
+ KCModule::~KCModule()
+ {
+diff --git a/src/kcmodule.h b/src/kcmodule.h
+index b01c3dc..e77b465 100644
+--- a/src/kcmodule.h
++++ b/src/kcmodule.h
+@@ -25,7 +25,9 @@
+
+ #include <kconfigwidgets_export.h>
+
++#if 0
+ #include <kauthaction.h>
++#endif
+
+ #include <QVariant>
+ #include <QWidget>
+@@ -197,6 +199,7 @@ public:
+      */
+     QList<KConfigDialogManager *> configs() const;
+
++#if 0
+     /**
+      * @brief Set if the module's save() method requires authorization to be executed.
+      *
+@@ -241,6 +244,7 @@ public:
+      * @return The action that has to be authorized to execute the save() method.
+      */
+     KAuth::Action authAction() const;
++#endif
+
+     /**
+      * Returns the value set by setExportText();
+@@ -378,10 +382,12 @@ protected Q_SLOTS:
+      */
+     void widgetChanged();
+
++#if 0
+     /**
+      * The status of the auth action, if one, has changed
+      */
+     void authStatusChanged(KAuth::Action::AuthStatus status);
++#endif
+
+ protected:

-----------------------------------------------------------------------

Summary of changes:
 Makefile.am                                        |   3 +-
 configure.ac                                       |   4 +-
 packages/packages.current                          |  38 +-
 ...convert-utility-support-for-Windows-icons.patch | 143 +++++
 .../0002-Crudely-remove-KF5Auth-depedency.patch    | 161 ++++--
 src/Makefile.am                                    |  26 +-
 src/config.nsi.in                                  |   8 +-
 src/index.theme                                    |  43 ++
 src/inst-breeze-icons.nsi                          | 533 +++++++++++++++++++
 src/inst-gpgmepp.nsi                               |   1 +
 src/inst-kconfig.nsi                               |   1 +
 src/inst-kleopatra.nsi                             | 475 +++++------------
 src/inst-kxmlgui.nsi                               | 201 +++++++
 src/inst-oxygen-icons.nsi                          | 470 -----------------
 src/inst-qtbase.nsi                                |   3 +
 src/inst-qtsvg.nsi                                 |   4 +
 src/inst-sections.nsi                              |  19 +-
 src/pkg-to-nsi.pl                                  |   4 +
 src/uninst-breeze-icons.nsi                        | 476 +++++++++++++++++
 src/uninst-gpgmepp.nsi                             |   1 +
 src/uninst-kconfig.nsi                             |   1 +
 src/uninst-kleopatra.nsi                           | 576 +++++----------------
 src/uninst-kxmlgui.nsi                             | 303 +++++++++++
 src/uninst-oxygen-icons.nsi                        | 403 --------------
 src/uninst-qtbase.nsi                              |   3 +
 src/uninst-qtsvg.nsi                               |   4 +
 26 files changed, 2149 insertions(+), 1755 deletions(-)
 create mode 100755 patches/extra-cmake-modules/0001-Add-convert-utility-support-for-Windows-icons.patch
 create mode 100644 src/index.theme
 create mode 100644 src/inst-breeze-icons.nsi
 delete mode 100644 src/inst-oxygen-icons.nsi
 create mode 100644 src/uninst-breeze-icons.nsi
 delete mode 100644 src/uninst-oxygen-icons.nsi


hooks/post-receive
-- 
GnuPG for Windows
http://git.gnupg.org



More information about the Gpg4win-commits mailing list