diff --git a/Wallpapers/kali-2019/contents/images/2560x1600.png b/Backgrounds/kali-logo-16x10.png
similarity index 100%
rename from Wallpapers/kali-2019/contents/images/2560x1600.png
rename to Backgrounds/kali-logo-16x10.png
diff --git a/Backgrounds/kali-logo.png b/Backgrounds/kali-logo-16x9.png
similarity index 100%
rename from Backgrounds/kali-logo.png
rename to Backgrounds/kali-logo-16x9.png
diff --git a/Wallpapers/kali-2019/contents/images/1600x1200.png b/Backgrounds/kali-logo-4x3.png
similarity index 100%
rename from Wallpapers/kali-2019/contents/images/1600x1200.png
rename to Backgrounds/kali-logo-4x3.png
diff --git a/Backgrounds/kali-logo.xml b/Backgrounds/kali-logo.xml
new file mode 100644
index 00000000..8809c793
--- /dev/null
+++ b/Backgrounds/kali-logo.xml
@@ -0,0 +1,16 @@
+<background>
+  <static>
+    <duration>8640000.0</duration>
+    <file>
+      <size width="1024" height="768">/usr/share/backgrounds/kali/kali-logo-4x3.png</size>
+      <size width="1280" height="720">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+      <size width="1280" height="800">/usr/share/backgrounds/kali/kali-logo-16x10.png</size>
+      <size width="1600" height="1200">/usr/share/backgrounds/kali/kali-logo-4x3.png</size>
+      <size width="1920" height="1080">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+      <size width="1920" height="1200">/usr/share/backgrounds/kali/kali-logo-16x10.png</size>
+      <size width="2560" height="1440">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+      <size width="2560" height="1600">/usr/share/backgrounds/kali/kali-logo-16x10.png</size>
+      <size width="3840" height="2160">/usr/share/backgrounds/kali/kali-logo-16x9.png</size>
+    </file>
+  </static>
+</background>
diff --git a/LockScreen/kali-2019/contents/images/2560x1600.png b/Backgrounds/kali-rings-16x10.png
similarity index 100%
rename from LockScreen/kali-2019/contents/images/2560x1600.png
rename to Backgrounds/kali-rings-16x10.png
diff --git a/Backgrounds/kali-rings.png b/Backgrounds/kali-rings-16x9.png
similarity index 100%
rename from Backgrounds/kali-rings.png
rename to Backgrounds/kali-rings-16x9.png
diff --git a/LockScreen/kali-2019/contents/images/1600x1200.png b/Backgrounds/kali-rings-4x3.png
similarity index 100%
rename from LockScreen/kali-2019/contents/images/1600x1200.png
rename to Backgrounds/kali-rings-4x3.png
diff --git a/Backgrounds/kali-rings.xml b/Backgrounds/kali-rings.xml
new file mode 100644
index 00000000..8d708c46
--- /dev/null
+++ b/Backgrounds/kali-rings.xml
@@ -0,0 +1,16 @@
+<background>
+  <static>
+    <duration>8640000.0</duration>
+    <file>
+      <size width="1024" height="768">/usr/share/backgrounds/kali/kali-rings-4x3.png</size>
+      <size width="1280" height="720">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+      <size width="1280" height="800">/usr/share/backgrounds/kali/kali-rings-16x10.png</size>
+      <size width="1600" height="1200">/usr/share/backgrounds/kali/kali-rings-4x3.png</size>
+      <size width="1920" height="1080">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+      <size width="1920" height="1200">/usr/share/backgrounds/kali/kali-rings-16x10.png</size>
+      <size width="2560" height="1440">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+      <size width="2560" height="1600">/usr/share/backgrounds/kali/kali-rings-16x10.png</size>
+      <size width="3840" height="2160">/usr/share/backgrounds/kali/kali-rings-16x9.png</size>
+    </file>
+  </static>
+</background>
diff --git a/Gnome-Backgrounds/kali-2017.xml b/Gnome-Backgrounds/kali-2017.xml
deleted file mode 100644
index da285f3f..00000000
--- a/Gnome-Backgrounds/kali-2017.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
-<wallpapers>
-  <wallpaper>
-    <!-- don't include words such as "wallpaper" (avoids translations) -->
-    <name>Kali</name>
-    <filename>/usr/share/desktop-base/kali-theme/wallpaper/gnome-background.xml</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-  <wallpaper>
-    <!-- don't include words such as "wallpaper" (avoids translations) -->
-    <name>Kali Lock Screen</name>
-    <filename>/usr/share/desktop-base/kali-theme/lockscreen/gnome-background.xml</filename>
-    <options>zoom</options>
-    <pcolor>#ffffff</pcolor>
-    <scolor>#000000</scolor>
-  </wallpaper>
-</wallpapers>
diff --git a/LockScreen/kali-2019/contents/images/1024x768.png b/LockScreen/kali-2019/contents/images/1024x768.png
deleted file mode 100644
index b52310de..00000000
Binary files a/LockScreen/kali-2019/contents/images/1024x768.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/1280x1024.png b/LockScreen/kali-2019/contents/images/1280x1024.png
deleted file mode 100644
index 140be233..00000000
Binary files a/LockScreen/kali-2019/contents/images/1280x1024.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/1280x720.png b/LockScreen/kali-2019/contents/images/1280x720.png
deleted file mode 100644
index be848a6e..00000000
Binary files a/LockScreen/kali-2019/contents/images/1280x720.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/1280x800.png b/LockScreen/kali-2019/contents/images/1280x800.png
deleted file mode 100644
index 13acc624..00000000
Binary files a/LockScreen/kali-2019/contents/images/1280x800.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/1920x1080.png b/LockScreen/kali-2019/contents/images/1920x1080.png
deleted file mode 100644
index 4db875dc..00000000
Binary files a/LockScreen/kali-2019/contents/images/1920x1080.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/1920x1200.png b/LockScreen/kali-2019/contents/images/1920x1200.png
deleted file mode 100644
index c1430fa7..00000000
Binary files a/LockScreen/kali-2019/contents/images/1920x1200.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/2560x1080.png b/LockScreen/kali-2019/contents/images/2560x1080.png
deleted file mode 100644
index 17a5b6fa..00000000
Binary files a/LockScreen/kali-2019/contents/images/2560x1080.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/2560x1440.png b/LockScreen/kali-2019/contents/images/2560x1440.png
deleted file mode 100644
index 56e9cc0e..00000000
Binary files a/LockScreen/kali-2019/contents/images/2560x1440.png and /dev/null differ
diff --git a/LockScreen/kali-2019/contents/images/3840x2160.png b/LockScreen/kali-2019/contents/images/3840x2160.png
deleted file mode 100644
index b7d53746..00000000
Binary files a/LockScreen/kali-2019/contents/images/3840x2160.png and /dev/null differ
diff --git a/LockScreen/kali-2019/gnome-background.xml b/LockScreen/kali-2019/gnome-background.xml
deleted file mode 100644
index adad8c02..00000000
--- a/LockScreen/kali-2019/gnome-background.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1200.png</size>
-      <size width="2560" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1080.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>
diff --git a/LockScreen/kali-2019/metadata.desktop b/LockScreen/kali-2019/metadata.desktop
deleted file mode 100644
index 2bc4c167..00000000
--- a/LockScreen/kali-2019/metadata.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Kali Lockscreen
-Name[fr]=Écran de verrouillage pour Kali
-X-KDE-PluginInfo-Name=kaliLockScreen
-X-KDE-PluginInfo-Author=Kali Devel Team
-X-KDE-PluginInfo-Email=devel@kali.org
diff --git a/LockScreen/kali/contents/images/1024x768.png b/LockScreen/kali/contents/images/1024x768.png
deleted file mode 100644
index a810c174..00000000
Binary files a/LockScreen/kali/contents/images/1024x768.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/1280x1024.png b/LockScreen/kali/contents/images/1280x1024.png
deleted file mode 100644
index f5289cca..00000000
Binary files a/LockScreen/kali/contents/images/1280x1024.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/1280x720.png b/LockScreen/kali/contents/images/1280x720.png
deleted file mode 100644
index 91845ea4..00000000
Binary files a/LockScreen/kali/contents/images/1280x720.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/1280x800.png b/LockScreen/kali/contents/images/1280x800.png
deleted file mode 100644
index 45c4b1ea..00000000
Binary files a/LockScreen/kali/contents/images/1280x800.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/1600x1200.png b/LockScreen/kali/contents/images/1600x1200.png
deleted file mode 100644
index a42506b9..00000000
Binary files a/LockScreen/kali/contents/images/1600x1200.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/1920x1080.png b/LockScreen/kali/contents/images/1920x1080.png
deleted file mode 100644
index 47615d85..00000000
Binary files a/LockScreen/kali/contents/images/1920x1080.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/1920x1200.png b/LockScreen/kali/contents/images/1920x1200.png
deleted file mode 100644
index 827002a0..00000000
Binary files a/LockScreen/kali/contents/images/1920x1200.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/2560x1080.png b/LockScreen/kali/contents/images/2560x1080.png
deleted file mode 100644
index ce751a1b..00000000
Binary files a/LockScreen/kali/contents/images/2560x1080.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/2560x1440.png b/LockScreen/kali/contents/images/2560x1440.png
deleted file mode 100644
index 8d36964a..00000000
Binary files a/LockScreen/kali/contents/images/2560x1440.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/2560x1600.png b/LockScreen/kali/contents/images/2560x1600.png
deleted file mode 100644
index 1f6d6e22..00000000
Binary files a/LockScreen/kali/contents/images/2560x1600.png and /dev/null differ
diff --git a/LockScreen/kali/contents/images/3840x2160.png b/LockScreen/kali/contents/images/3840x2160.png
deleted file mode 100644
index 533a685a..00000000
Binary files a/LockScreen/kali/contents/images/3840x2160.png and /dev/null differ
diff --git a/LockScreen/kali/gnome-background.xml b/LockScreen/kali/gnome-background.xml
deleted file mode 100644
index adad8c02..00000000
--- a/LockScreen/kali/gnome-background.xml
+++ /dev/null
@@ -1,18 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/1920x1200.png</size>
-      <size width="2560" height="1080">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1080.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/lockscreen/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>
diff --git a/LockScreen/kali/metadata.desktop b/LockScreen/kali/metadata.desktop
deleted file mode 100644
index 2bc4c167..00000000
--- a/LockScreen/kali/metadata.desktop
+++ /dev/null
@@ -1,6 +0,0 @@
-[Desktop Entry]
-Name=Kali Lockscreen
-Name[fr]=Écran de verrouillage pour Kali
-X-KDE-PluginInfo-Name=kaliLockScreen
-X-KDE-PluginInfo-Author=Kali Devel Team
-X-KDE-PluginInfo-Email=devel@kali.org
diff --git a/Makefile b/Makefile
index c17c0c3e..b97d886c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-SUBDIRS=Grub-Background/kali emblems kali-logos
+SUBDIRS=emblems kali-logos
 
 build:
 	$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) build &&) true
@@ -6,7 +6,7 @@ build:
 	# kali-desktop-base in the file structure expected by desktop-base
 	rm -rf desktop-base
 	mkdir -p desktop-base/kali-theme/grub
-	cp Grub-Background/kali/*.png Grub-Background/kali/*.sh desktop-base/kali-theme/grub/
+	cp Grub-Background/kali-2019/*.png Grub-Background/kali-2019/*.sh desktop-base/kali-theme/grub/
 	cp -a LockScreen/kali desktop-base/kali-theme/lockscreen
 	cp -a Wallpapers/kali desktop-base/kali-theme/wallpaper
 	cp -a LoginScreen/kali desktop-base/kali-theme/login
@@ -20,10 +20,5 @@ install:
 	# We use debhelper to install most files, but some subdirectories
 	# install files by themselves
 	$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) install &&) true
-	# And we need a few supplementary symlinks for good integration
-	# KDE looks into /usr/share/wallpapers
-	install -d $(DESTDIR)/usr/share/wallpapers
-	cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/kali-theme/wallpaper Kali
-	cd $(DESTDIR)/usr/share/wallpapers && ln -s /usr/share/desktop-base/kali-theme/lockscreen KaliLockScreen
 
 include Makefile.inc
diff --git a/TODO b/TODO
new file mode 100644
index 00000000..ea59c3dc
--- /dev/null
+++ b/TODO
@@ -0,0 +1,2 @@
+- Add the missing files in kali-logos (compare to
+  /usr/share/desktop-base/debian-logos/).
diff --git a/Wallpapers/kali-2019/contents/images/1024x768.png b/Wallpapers/kali-2019/contents/images/1024x768.png
deleted file mode 100644
index f2ddaa80..00000000
Binary files a/Wallpapers/kali-2019/contents/images/1024x768.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/1280x1024.png b/Wallpapers/kali-2019/contents/images/1280x1024.png
deleted file mode 100644
index 0daacc3a..00000000
Binary files a/Wallpapers/kali-2019/contents/images/1280x1024.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/1280x720.png b/Wallpapers/kali-2019/contents/images/1280x720.png
deleted file mode 100644
index d8140b36..00000000
Binary files a/Wallpapers/kali-2019/contents/images/1280x720.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/1280x800.png b/Wallpapers/kali-2019/contents/images/1280x800.png
deleted file mode 100644
index 66a9ef5f..00000000
Binary files a/Wallpapers/kali-2019/contents/images/1280x800.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/1920x1080.png b/Wallpapers/kali-2019/contents/images/1920x1080.png
deleted file mode 100644
index e817abbc..00000000
Binary files a/Wallpapers/kali-2019/contents/images/1920x1080.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/1920x1200.png b/Wallpapers/kali-2019/contents/images/1920x1200.png
deleted file mode 100644
index aa72e780..00000000
Binary files a/Wallpapers/kali-2019/contents/images/1920x1200.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/2560x1080.png b/Wallpapers/kali-2019/contents/images/2560x1080.png
deleted file mode 100644
index 2c6e53a5..00000000
Binary files a/Wallpapers/kali-2019/contents/images/2560x1080.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/2560x1440.png b/Wallpapers/kali-2019/contents/images/2560x1440.png
deleted file mode 100644
index 2c2c060d..00000000
Binary files a/Wallpapers/kali-2019/contents/images/2560x1440.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/contents/images/3840x2160.png b/Wallpapers/kali-2019/contents/images/3840x2160.png
deleted file mode 100644
index 1ee84c4c..00000000
Binary files a/Wallpapers/kali-2019/contents/images/3840x2160.png and /dev/null differ
diff --git a/Wallpapers/kali-2019/gnome-background.xml b/Wallpapers/kali-2019/gnome-background.xml
deleted file mode 100644
index 260ef02e..00000000
--- a/Wallpapers/kali-2019/gnome-background.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1200.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>
diff --git a/Wallpapers/kali/contents/images/1024x768.png b/Wallpapers/kali/contents/images/1024x768.png
deleted file mode 100644
index 2c152496..00000000
Binary files a/Wallpapers/kali/contents/images/1024x768.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/1280x1024.png b/Wallpapers/kali/contents/images/1280x1024.png
deleted file mode 100644
index 41a2e4e4..00000000
Binary files a/Wallpapers/kali/contents/images/1280x1024.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/1280x720.png b/Wallpapers/kali/contents/images/1280x720.png
deleted file mode 100644
index 0e1fce2e..00000000
Binary files a/Wallpapers/kali/contents/images/1280x720.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/1280x800.png b/Wallpapers/kali/contents/images/1280x800.png
deleted file mode 100644
index c02c1280..00000000
Binary files a/Wallpapers/kali/contents/images/1280x800.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/1600x1200.png b/Wallpapers/kali/contents/images/1600x1200.png
deleted file mode 100644
index 9929b469..00000000
Binary files a/Wallpapers/kali/contents/images/1600x1200.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/1920x1080.png b/Wallpapers/kali/contents/images/1920x1080.png
deleted file mode 100644
index f63a00d8..00000000
Binary files a/Wallpapers/kali/contents/images/1920x1080.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/1920x1200.png b/Wallpapers/kali/contents/images/1920x1200.png
deleted file mode 100644
index 05944df8..00000000
Binary files a/Wallpapers/kali/contents/images/1920x1200.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/2560x1080.png b/Wallpapers/kali/contents/images/2560x1080.png
deleted file mode 100644
index 850b1b73..00000000
Binary files a/Wallpapers/kali/contents/images/2560x1080.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/2560x1440.png b/Wallpapers/kali/contents/images/2560x1440.png
deleted file mode 100644
index 97be4532..00000000
Binary files a/Wallpapers/kali/contents/images/2560x1440.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/2560x1600.png b/Wallpapers/kali/contents/images/2560x1600.png
deleted file mode 100644
index e71ad615..00000000
Binary files a/Wallpapers/kali/contents/images/2560x1600.png and /dev/null differ
diff --git a/Wallpapers/kali/contents/images/3840x2160.png b/Wallpapers/kali/contents/images/3840x2160.png
deleted file mode 100644
index d3eab171..00000000
Binary files a/Wallpapers/kali/contents/images/3840x2160.png and /dev/null differ
diff --git a/Wallpapers/kali/gnome-background.xml b/Wallpapers/kali/gnome-background.xml
deleted file mode 100644
index 260ef02e..00000000
--- a/Wallpapers/kali/gnome-background.xml
+++ /dev/null
@@ -1,17 +0,0 @@
-<background>
-  <static>
-    <duration>8640000.0</duration>
-    <file>
-      <size width="1024" height="768">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1024x768.png</size>
-      <size width="1280" height="720">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x720.png</size>
-      <size width="1280" height="800">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x800.png</size>
-      <size width="1280" height="1024">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1280x1024.png</size>
-      <size width="1600" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1600x1200.png</size>
-      <size width="1920" height="1080">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1080.png</size>
-      <size width="1920" height="1200">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/1920x1200.png</size>
-      <size width="2560" height="1440">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1440.png</size>
-      <size width="2560" height="1600">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/2560x1600.png</size>
-      <size width="3840" height="2160">/usr/share/desktop-base/kali-theme/wallpaper/contents/images/3840x2160.png</size>
-    </file>
-  </static>
-</background>
diff --git a/debian/kali-themes-common.install b/debian/kali-themes-common.install
index 79bc0b5e..f6134fab 100644
--- a/debian/kali-themes-common.install
+++ b/debian/kali-themes-common.install
@@ -1,13 +1,12 @@
 Backgrounds/* usr/share/backgrounds/
 Color-Schemes/* usr/share/
+share/* usr/share/
 Icon-Theme/* usr/share/icons/
 Window-Theme/* usr/share/themes/
 Grub-Theme/* boot/grub/themes/
 Plymouth-Theme/* usr/share/plymouth/themes/
-Gnome-Backgrounds/* usr/share/gnome-background-properties/
 desktop-base/* usr/share/desktop-base/
+kali-logos/* usr/images/kali-logos/
 xfce/xsettings.xml usr/share/kali-themes-common/
 # Those are created by "make install"
-usr/share/desktop-base/kali-logos/
 usr/share/icons/
-usr/share/wallpapers/
diff --git a/share/gnome-background-properties/kali-backgrounds.xml b/share/gnome-background-properties/kali-backgrounds.xml
new file mode 100644
index 00000000..8536e062
--- /dev/null
+++ b/share/gnome-background-properties/kali-backgrounds.xml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper>
+    <name>Kali Logo</name>
+    <filename>/usr/share/backgrounds/kali/kali-logo.xml</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Rings</name>
+    <filename>/usr/share/backgrounds/kali/kali-rings.xml</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Black</name>
+    <filename>/usr/share/backgrounds/kali/kali-black.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Blue Matrix</name>
+    <filename>/usr/share/backgrounds/kali/kali-blue-matrix.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Grid</name>
+    <filename>/usr/share/backgrounds/kali/kali-grid.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+  <wallpaper>
+    <name>Kali Small Logo</name>
+    <filename>/usr/share/backgrounds/kali/kali-small-logo.png</filename>
+    <options>zoom</options>
+    <pcolor>#ffffff</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>
diff --git a/share/wallpapers/KaliLogo/contents/images/1024x768.png b/share/wallpapers/KaliLogo/contents/images/1024x768.png
new file mode 120000
index 00000000..c3033c01
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1024x768.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-4x3.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/1280x1024.png b/share/wallpapers/KaliLogo/contents/images/1280x1024.png
new file mode 120000
index 00000000..c3033c01
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1280x1024.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-4x3.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/1280x720.png b/share/wallpapers/KaliLogo/contents/images/1280x720.png
new file mode 120000
index 00000000..43df2456
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1280x720.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/1280x800.png b/share/wallpapers/KaliLogo/contents/images/1280x800.png
new file mode 120000
index 00000000..589efa83
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1280x800.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x10.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/1600x1200.png b/share/wallpapers/KaliLogo/contents/images/1600x1200.png
new file mode 120000
index 00000000..c3033c01
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1600x1200.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-4x3.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/1920x1080.png b/share/wallpapers/KaliLogo/contents/images/1920x1080.png
new file mode 120000
index 00000000..43df2456
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1920x1080.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/1920x1200.png b/share/wallpapers/KaliLogo/contents/images/1920x1200.png
new file mode 120000
index 00000000..589efa83
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/1920x1200.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x10.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/2560x1080.png b/share/wallpapers/KaliLogo/contents/images/2560x1080.png
new file mode 120000
index 00000000..43df2456
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/2560x1080.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/2560x1440.png b/share/wallpapers/KaliLogo/contents/images/2560x1440.png
new file mode 120000
index 00000000..43df2456
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/2560x1440.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/2560x1600.png b/share/wallpapers/KaliLogo/contents/images/2560x1600.png
new file mode 120000
index 00000000..589efa83
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/2560x1600.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x10.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliLogo/contents/images/3840x2160.png b/share/wallpapers/KaliLogo/contents/images/3840x2160.png
new file mode 120000
index 00000000..43df2456
--- /dev/null
+++ b/share/wallpapers/KaliLogo/contents/images/3840x2160.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo-16x9.png
\ No newline at end of file
diff --git a/Wallpapers/kali-2019/metadata.desktop b/share/wallpapers/KaliLogo/metadata.desktop
similarity index 73%
rename from Wallpapers/kali-2019/metadata.desktop
rename to share/wallpapers/KaliLogo/metadata.desktop
index 6236f022..e42d8ea9 100644
--- a/Wallpapers/kali-2019/metadata.desktop
+++ b/share/wallpapers/KaliLogo/metadata.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
-Name=Kali
+Name=Kali Logo
 
-X-KDE-PluginInfo-Name=kali
+X-KDE-PluginInfo-Name=KaliLogo
 X-KDE-PluginInfo-Author=Kali Devel Team
 X-KDE-PluginInfo-Email=devel@kali.org
 #X-KDE-PluginInfo-License=GPL-2
diff --git a/share/wallpapers/KaliRings/contents/images/1024x768.png b/share/wallpapers/KaliRings/contents/images/1024x768.png
new file mode 120000
index 00000000..6a10c23e
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1024x768.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-4x3.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/1280x1024.png b/share/wallpapers/KaliRings/contents/images/1280x1024.png
new file mode 120000
index 00000000..6a10c23e
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1280x1024.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-4x3.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/1280x720.png b/share/wallpapers/KaliRings/contents/images/1280x720.png
new file mode 120000
index 00000000..0eb22aaa
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1280x720.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/1280x800.png b/share/wallpapers/KaliRings/contents/images/1280x800.png
new file mode 120000
index 00000000..1d827517
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1280x800.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x10.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/1600x1200.png b/share/wallpapers/KaliRings/contents/images/1600x1200.png
new file mode 120000
index 00000000..6a10c23e
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1600x1200.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-4x3.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/1920x1080.png b/share/wallpapers/KaliRings/contents/images/1920x1080.png
new file mode 120000
index 00000000..0eb22aaa
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1920x1080.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/1920x1200.png b/share/wallpapers/KaliRings/contents/images/1920x1200.png
new file mode 120000
index 00000000..1d827517
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/1920x1200.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x10.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/2560x1080.png b/share/wallpapers/KaliRings/contents/images/2560x1080.png
new file mode 120000
index 00000000..0eb22aaa
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/2560x1080.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/2560x1440.png b/share/wallpapers/KaliRings/contents/images/2560x1440.png
new file mode 120000
index 00000000..0eb22aaa
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/2560x1440.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/2560x1600.png b/share/wallpapers/KaliRings/contents/images/2560x1600.png
new file mode 120000
index 00000000..1d827517
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/2560x1600.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x10.png
\ No newline at end of file
diff --git a/share/wallpapers/KaliRings/contents/images/3840x2160.png b/share/wallpapers/KaliRings/contents/images/3840x2160.png
new file mode 120000
index 00000000..0eb22aaa
--- /dev/null
+++ b/share/wallpapers/KaliRings/contents/images/3840x2160.png
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings-16x9.png
\ No newline at end of file
diff --git a/Wallpapers/kali/metadata.desktop b/share/wallpapers/KaliRings/metadata.desktop
similarity index 57%
rename from Wallpapers/kali/metadata.desktop
rename to share/wallpapers/KaliRings/metadata.desktop
index 6236f022..f9ae27fd 100644
--- a/Wallpapers/kali/metadata.desktop
+++ b/share/wallpapers/KaliRings/metadata.desktop
@@ -1,7 +1,5 @@
 [Desktop Entry]
-Name=Kali
-
-X-KDE-PluginInfo-Name=kali
+Name=Kali Rings
+X-KDE-PluginInfo-Name=KaliRings
 X-KDE-PluginInfo-Author=Kali Devel Team
 X-KDE-PluginInfo-Email=devel@kali.org
-#X-KDE-PluginInfo-License=GPL-2