Install all configuration files provided by Daniel

debian/kali-themes.preinst

@@ -2,19 +2,43 @@
 
 set -e
 
-DIVERT_FILE="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
+FILES_TO_DIVERT="
+/etc/lightdm/lightdm-gtk-greeter.conf
+/etc/xdg/qterminal.org/qterminal.ini
+/etc/xdg/xfce4/panel/default.xml
+/etc/xdg/xfce4/terminal/terminalrc
+/etc/xdg/xfce4/whiskermenu/defaults.rc
+/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml
+/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-keyboard-shortcuts.xml
+/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfce4-power-manager.xml
+/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xfwm4.xml
+/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+" # END FILES_TO_DIVERT
+
+setup_diversion() {
+    local file=$1
+    dpkg-divert --rename --package kali-themes \
+		--divert $file.original \
+		--add $file
+}
 
 case "$1" in
     install)
+	# Handle upgrade from kali-defaults
+	DIVERT_FILE="/etc/xdg/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml"
 	if [ "$(dpkg-divert --listpackage $DIVERT_FILE)" = "kali-defaults" ]; then
 	    rm -f $DIVERT_FILE
 	    dpkg-divert --rename --package kali-defaults \
 		--divert $DIVERT_FILE.original \
                 --remove $DIVERT_FILE
 	fi
-	dpkg-divert --rename --package kali-themes \
-		    --divert $DIVERT_FILE.original \
-		    --add $DIVERT_FILE
+	# Setup all the diversions
+	for file in $FILES_TO_DIVERT; do
+	    setup_diversion "$file"
+	done
+    ;;
+    upgrade)
+	# Dynamically add new diversions when required on upgrade
     ;;
 esac