diff --git a/desktop-base/emerald-theme/plymouth b/desktop-base/emerald-theme/plymouth
deleted file mode 120000
index cc824273..00000000
--- a/desktop-base/emerald-theme/plymouth
+++ /dev/null
@@ -1 +0,0 @@
-../../plymouth/themes/homeworld
\ No newline at end of file
diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh
index 60ff438b..78db27ec 100755
--- a/my-distro-debian-32-pae/build.sh
+++ b/my-distro-debian-32-pae/build.sh
@@ -244,7 +244,7 @@ mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
@@ -269,7 +269,7 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
-cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
 
diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh
index de0f42f0..d09bb76c 100755
--- a/my-distro-debian-32/build.sh
+++ b/my-distro-debian-32/build.sh
@@ -245,7 +245,7 @@ mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
@@ -270,7 +270,7 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
-cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes $build/build/config/includes.chroot/boot/grub
 
diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh
index d5702463..e85c92f3 100755
--- a/my-distro-debian-64/build.sh
+++ b/my-distro-debian-64/build.sh
@@ -244,7 +244,7 @@ mkdir -p $build/build/config/includes.chroot/etc/live/config.conf.d
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
@@ -268,7 +268,7 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
-cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
 
diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh
index f76f2559..9025c5dc 100755
--- a/my-distro-devuan-32-pae/build.sh
+++ b/my-distro-devuan-32-pae/build.sh
@@ -244,7 +244,7 @@ mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
@@ -270,7 +270,7 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
-cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
 
diff --git a/my-distro-devuan-32-pae/packages/desktop-base_12.0.6+custom1_all.deb b/my-distro-devuan-32-pae/packages/desktop-base_12.0.6+custom1_all.deb
new file mode 100644
index 00000000..b244c14c
Binary files /dev/null and b/my-distro-devuan-32-pae/packages/desktop-base_12.0.6+custom1_all.deb differ
diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh
index 0a97d038..ee09ad8f 100755
--- a/my-distro-devuan-32/build.sh
+++ b/my-distro-devuan-32/build.sh
@@ -245,7 +245,7 @@ mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
@@ -270,7 +270,7 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
-cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
 
diff --git a/my-distro-devuan-32/packages/desktop-base_12.0.6+custom1_all.deb b/my-distro-devuan-32/packages/desktop-base_12.0.6+custom1_all.deb
new file mode 100644
index 00000000..b244c14c
Binary files /dev/null and b/my-distro-devuan-32/packages/desktop-base_12.0.6+custom1_all.deb differ
diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh
index 3c80c2c9..bf28e3ed 100755
--- a/my-distro-devuan-64/build.sh
+++ b/my-distro-devuan-64/build.sh
@@ -245,7 +245,7 @@ mkdir -p $build/build/config/includes.chroot/etc/dpkg/origins
 mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
-mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
+mkdir -p $build/build/config/includes.chroot/usr/share/plymouth/themes
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
@@ -271,7 +271,7 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
-cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
+cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
 cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
 
diff --git a/my-distro-devuan-64/packages/desktop-base_12.0.6+custom1_all.deb b/my-distro-devuan-64/packages/desktop-base_12.0.6+custom1_all.deb
new file mode 100644
index 00000000..b244c14c
Binary files /dev/null and b/my-distro-devuan-64/packages/desktop-base_12.0.6+custom1_all.deb differ
diff --git a/plymouth/themes/emerald/debian.png b/plymouth/emerald/debian.png
similarity index 100%
rename from plymouth/themes/emerald/debian.png
rename to plymouth/emerald/debian.png
diff --git a/plymouth/themes/emerald/emerald.plymouth b/plymouth/emerald/emerald.plymouth
similarity index 100%
rename from plymouth/themes/emerald/emerald.plymouth
rename to plymouth/emerald/emerald.plymouth
diff --git a/plymouth/themes/emerald/emerald.script b/plymouth/emerald/emerald.script
similarity index 100%
rename from plymouth/themes/emerald/emerald.script
rename to plymouth/emerald/emerald.script
diff --git a/plymouth/themes/emerald/logo.png b/plymouth/emerald/logo.png
similarity index 100%
rename from plymouth/themes/emerald/logo.png
rename to plymouth/emerald/logo.png
diff --git a/plymouth/themes/emerald/logo_circle.png b/plymouth/emerald/logo_circle.png
similarity index 100%
rename from plymouth/themes/emerald/logo_circle.png
rename to plymouth/emerald/logo_circle.png
diff --git a/plymouth/themes/emerald/password_dot.png b/plymouth/emerald/password_dot.png
similarity index 100%
rename from plymouth/themes/emerald/password_dot.png
rename to plymouth/emerald/password_dot.png
diff --git a/plymouth/themes/emerald/password_dot16.png b/plymouth/emerald/password_dot16.png
similarity index 100%
rename from plymouth/themes/emerald/password_dot16.png
rename to plymouth/emerald/password_dot16.png
diff --git a/plymouth/themes/emerald/password_field.png b/plymouth/emerald/password_field.png
similarity index 100%
rename from plymouth/themes/emerald/password_field.png
rename to plymouth/emerald/password_field.png
diff --git a/plymouth/themes/emerald/password_field16.png b/plymouth/emerald/password_field16.png
similarity index 100%
rename from plymouth/themes/emerald/password_field16.png
rename to plymouth/emerald/password_field16.png
diff --git a/plymouth/themes/emerald/plymouth_background_homeworld.png b/plymouth/emerald/plymouth_background_homeworld.png
similarity index 100%
rename from plymouth/themes/emerald/plymouth_background_homeworld.png
rename to plymouth/emerald/plymouth_background_homeworld.png
diff --git a/plymouth/themes/debian-theme b/plymouth/themes/debian-theme
deleted file mode 120000
index 132ecfa1..00000000
--- a/plymouth/themes/debian-theme
+++ /dev/null
@@ -1 +0,0 @@
-../../desktop-base/active-theme/plymouth
\ No newline at end of file