diff --git a/Backgrounds/kali-rings.svg b/Backgrounds/kali-rings.svg
new file mode 100644
index 00000000..5f88516d
--- /dev/null
+++ b/Backgrounds/kali-rings.svg
@@ -0,0 +1,12815 @@
+
+
+
+
\ No newline at end of file
diff --git a/Grub-Background/kali/Makefile b/Grub-Background/kali/Makefile
deleted file mode 100644
index 2906d3cb..00000000
--- a/Grub-Background/kali/Makefile
+++ /dev/null
@@ -1,22 +0,0 @@
-dir = usr/share/desktop-base/kali-theme/grub
-
-files = \
- grub-4x3.png \
- grub-16x9.png
-
-build: $(files)
-
-clean:
- rm -f grub-4x3.png grub-16x9.png
-
-install:
- # Do nothing, installed by top-level makefile into desktop-base
- # directory
-
-grub-4x3.png: grub-4x3.svg
- rsvg-convert $< > $@
-
-grub-16x9.png: grub-16x9.svg
- rsvg-convert $< > $@
-
-include ../../Makefile.inc
diff --git a/Grub-Background/kali/grub-16x9.svg b/Grub-Background/kali/grub-16x9.svg
deleted file mode 100644
index f25bed3c..00000000
--- a/Grub-Background/kali/grub-16x9.svg
+++ /dev/null
@@ -1,169 +0,0 @@
-
-
-
-
diff --git a/Grub-Background/kali/grub-4x3.svg b/Grub-Background/kali/grub-4x3.svg
deleted file mode 100644
index 8f910fbe..00000000
--- a/Grub-Background/kali/grub-4x3.svg
+++ /dev/null
@@ -1,163 +0,0 @@
-
-
-
-
diff --git a/Grub-Background/kali/grub_background.sh b/Grub-Background/kali/grub_background.sh
deleted file mode 100644
index c7ba469d..00000000
--- a/Grub-Background/kali/grub_background.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-WALLPAPER=/usr/share/images/desktop-base/desktop-grub.png
-COLOR_NORMAL=white/black
-COLOR_HIGHLIGHT=black/white
diff --git a/Grub-Background/kali-2019/grub-16x9.png b/Grub-Theme/kali/grub-16x9.png
similarity index 100%
rename from Grub-Background/kali-2019/grub-16x9.png
rename to Grub-Theme/kali/grub-16x9.png
diff --git a/Grub-Background/kali-2019/grub-4x3.png b/Grub-Theme/kali/grub-4x3.png
similarity index 100%
rename from Grub-Background/kali-2019/grub-4x3.png
rename to Grub-Theme/kali/grub-4x3.png
diff --git a/Grub-Background/kali-2019/grub_background.sh b/Grub-Theme/kali/grub_background.sh
similarity index 100%
rename from Grub-Background/kali-2019/grub_background.sh
rename to Grub-Theme/kali/grub_background.sh
diff --git a/LoginScreen/kali-2019/background.png b/LoginScreen/kali-2019/background.png
deleted file mode 100644
index b7d53746..00000000
Binary files a/LoginScreen/kali-2019/background.png and /dev/null differ
diff --git a/LoginScreen/kali/background.svg b/LoginScreen/kali/background.svg
deleted file mode 100644
index b2192b8f..00000000
--- a/LoginScreen/kali/background.svg
+++ /dev/null
@@ -1,830 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-]>
-
diff --git a/Makefile b/Makefile
index b97d886c..0b56085d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,23 +2,9 @@ SUBDIRS=emblems kali-logos
build:
$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) build &&) true
- # We populate desktop-base subdirectory with stuff to be installed into
- # 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-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
- ln -s /usr/share/plymouth/themes/kali desktop-base/kali-theme/plymouth
clean:
$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) clean &&) true
- rm -rf desktop-base/*
install:
- # We use debhelper to install most files, but some subdirectories
- # install files by themselves
$(foreach SUBDIR,$(SUBDIRS),$(MAKE) -C $(SUBDIR) install &&) true
-
-include Makefile.inc
diff --git a/debian/kali-themes-common.install b/debian/kali-themes-common.install
index f6134fab..4ff77d27 100644
--- a/debian/kali-themes-common.install
+++ b/debian/kali-themes-common.install
@@ -5,7 +5,7 @@ Icon-Theme/* usr/share/icons/
Window-Theme/* usr/share/themes/
Grub-Theme/* boot/grub/themes/
Plymouth-Theme/* usr/share/plymouth/themes/
-desktop-base/* usr/share/desktop-base/
+desktop-base/* usr/share/desktop-base/kali-theme/
kali-logos/* usr/images/kali-logos/
xfce/xsettings.xml usr/share/kali-themes-common/
# Those are created by "make install"
diff --git a/desktop-base/grub/grub-16x9.png b/desktop-base/grub/grub-16x9.png
new file mode 120000
index 00000000..d3453e09
--- /dev/null
+++ b/desktop-base/grub/grub-16x9.png
@@ -0,0 +1 @@
+/boot/grub/themes/kali/grub-16x9.png
\ No newline at end of file
diff --git a/desktop-base/grub/grub-4x3.png b/desktop-base/grub/grub-4x3.png
new file mode 120000
index 00000000..4bfc9f37
--- /dev/null
+++ b/desktop-base/grub/grub-4x3.png
@@ -0,0 +1 @@
+/boot/grub/themes/kali/grub-4x3.png
\ No newline at end of file
diff --git a/desktop-base/grub/grub_background.sh b/desktop-base/grub/grub_background.sh
new file mode 120000
index 00000000..b9ed4703
--- /dev/null
+++ b/desktop-base/grub/grub_background.sh
@@ -0,0 +1 @@
+/boot/grub/themes/kali/grub_background.sh
\ No newline at end of file
diff --git a/desktop-base/lockscreen/gnome-background.xml b/desktop-base/lockscreen/gnome-background.xml
new file mode 120000
index 00000000..2b823079
--- /dev/null
+++ b/desktop-base/lockscreen/gnome-background.xml
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings.xml
\ No newline at end of file
diff --git a/desktop-base/login/background.svg b/desktop-base/login/background.svg
new file mode 120000
index 00000000..4a8e9c4c
--- /dev/null
+++ b/desktop-base/login/background.svg
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-rings.svg
\ No newline at end of file
diff --git a/desktop-base/plymouth b/desktop-base/plymouth
new file mode 120000
index 00000000..5145b31f
--- /dev/null
+++ b/desktop-base/plymouth
@@ -0,0 +1 @@
+/usr/share/plymouth/themes/kali
\ No newline at end of file
diff --git a/desktop-base/wallpaper/gnome-background.xml b/desktop-base/wallpaper/gnome-background.xml
new file mode 120000
index 00000000..83e97b9f
--- /dev/null
+++ b/desktop-base/wallpaper/gnome-background.xml
@@ -0,0 +1 @@
+/usr/share/backgrounds/kali/kali-logo.xml
\ No newline at end of file