diff --git a/debian/kali-desktop-base.postinst b/debian/kali-desktop-base.postinst
index 144762e0..5d25def3 100644
--- a/debian/kali-desktop-base.postinst
+++ b/debian/kali-desktop-base.postinst
@@ -30,29 +30,29 @@ if [ "$1" = "configure" ] || [ "$1" = "abort-upgrade" ] || [ "$1" = "abort-remov
     # Desktop background alternatives
     update-alternatives --install \
 	/usr/share/images/desktop-base/desktop-background \
-	desktop-background /usr/share/backgrounds/kali/kali-logo-16x9.png 200
+	desktop-background /usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png 210
 
     # Set up an alternative for the XML version of the background
     # (for GNOME)
     update-alternatives --install \
 	/usr/share/images/desktop-base/desktop-background.xml \
-	desktop-background.xml /usr/share/backgrounds/kali/kali-logo.xml 200
+	desktop-background.xml /usr/share/desktop-base/active-theme/wallpaper/gnome-background.xml 210
 
     # Set up an alternative for the XML version of the lock screen
     # (for GNOME)
     update-alternatives --install \
 	/usr/share/images/desktop-base/desktop-lockscreen.xml \
-	desktop-lockscreen.xml /usr/share/backgrounds/kali/kali-light.xml 200
+	desktop-lockscreen.xml /usr/share/desktop-base/active-theme/lockscreen/gnome-background.xml 210
 
     # Set up an alternative for the wallpaper for Plasma 5/KDE
     update-alternatives --install \
 	/usr/share/wallpapers/DebianTheme \
-	desktop-plasma5-wallpaper /usr/share/wallpapers/KaliLogo 200
+	desktop-plasma5-wallpaper /usr/share/desktop-base/active-theme/wallpaper 210
 
     # Login theme
     # Highest priority for active theme
     update-alternatives --install /usr/share/images/desktop-base/login-background.svg \
-	desktop-login-background /usr/share/backgrounds/kali/kali-light.svg 200
+	desktop-login-background /usr/share/desktop-base/active-theme/login/background.svg 210
 
     # Set up an alternative for the GRUB background/colors config
     # Highest priority for active theme
@@ -154,6 +154,29 @@ EOF
 	update-alternatives --remove \
 	    desktop-grub \
 	    /usr/share/desktop-base/kali-theme/grub/grub-16x9.png
+
+    elif dpkg --compare-versions "$2" lt-nl "2020.2.3"; then
+	# Remove invalid alternatives that moved to /usr/share/desktop-base/active-theme/*
+        update-alternatives --remove \
+            desktop-background \
+            /usr/share/backgrounds/kali/kali-logo-16x9.png
+
+        update-alternatives --remove \
+            desktop-background.xml \
+            /usr/share/backgrounds/kali/kali-logo.xml
+
+        update-alternatives --remove \
+            desktop-lockscreen.xml \
+            /usr/share/backgrounds/kali/kali-light.xml
+
+        update-alternatives --remove \
+            desktop-plasma5-wallpaper \
+            /usr/share/wallpapers/KaliLogo
+
+        update-alternatives --remove \
+            desktop-login-background \
+            /usr/share/backgrounds/kali/kali-light.svg
+
     fi
 fi
 
diff --git a/debian/kali-desktop-base.prerm b/debian/kali-desktop-base.prerm
index c3e2e28a..d5329c8f 100644
--- a/debian/kali-desktop-base.prerm
+++ b/debian/kali-desktop-base.prerm
@@ -10,27 +10,7 @@ if [ "$1" = "remove" ]; then
     # Remove background alternatives for theme packages
     update-alternatives --remove \
 	desktop-background \
-	/usr/share/backgrounds/kali/kali-logo-16x9.png
-
-    # Remove desktop-background.xml alternatives
-    update-alternatives --remove \
-	desktop-background.xml \
-	/usr/share/backgrounds/kali/kali-logo.xml
-
-    # Remove desktop-lockscreen.xml alternatives
-    update-alternatives --remove \
-	desktop-lockscreen.xml \
-	/usr/share/backgrounds/kali/kali-light.xml
-
-    # Remove Plasma 5/KDE wallpaper alternatives
-    update-alternatives --remove \
-	desktop-plasma5-wallpaper \
-	/usr/share/wallpapers/KaliLogo
-
-    # Remove login theme alternatives
-    update-alternatives --remove \
-	desktop-login-background \
-	/usr/share/backgrounds/kali/kali-light.svg
+	/usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png
 
     # Remove GRUB alternatives
     update-alternatives --remove \
diff --git a/share/desktop-base/kali-theme/wallpaper/contents b/share/desktop-base/kali-theme/wallpaper/contents
new file mode 120000
index 00000000..8d689559
--- /dev/null
+++ b/share/desktop-base/kali-theme/wallpaper/contents
@@ -0,0 +1 @@
+/usr/share/wallpapers/KaliMesh/contents
\ No newline at end of file
diff --git a/share/desktop-base/kali-theme/wallpaper/metadata.desktop b/share/desktop-base/kali-theme/wallpaper/metadata.desktop
new file mode 100644
index 00000000..62506e73
--- /dev/null
+++ b/share/desktop-base/kali-theme/wallpaper/metadata.desktop
@@ -0,0 +1,7 @@
+[Desktop Entry]
+Name=Kali
+
+X-KDE-PluginInfo-Name=Kali
+X-KDE-PluginInfo-Author=Kali Devel Team
+X-KDE-PluginInfo-Email=devel@kali.org
+X-KDE-PluginInfo-License=GPL-3.0+