diff --git a/PepBld-nightly.sh b/PepBld-nightly.sh
index 7f13beedc..739aa126b 100755
--- a/PepBld-nightly.sh
+++ b/PepBld-nightly.sh
@@ -216,7 +216,6 @@ mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps
 mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/xfce4/helpers
 mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/polkit-1/actions
 mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/fonts/pepconf
-mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds
 mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/bin
 mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/local/bin
 mkdir -p $uchinanchu/fusato/config/includes.chroot/usr/sbin
@@ -276,14 +275,13 @@ cp $uchinanchu/peppolkit/* $uchinanchu/fusato/config/includes.chroot/usr/share/p
 cp $uchinanchu/pepstartpage/* $uchinanchu/fusato/config/includes.chroot/opt/startpep
 cp $uchinanchu/pepdb/* $uchinanchu/fusato/config/includes.chroot/opt/pypep/dbpep
 cp $uchinanchu/pepuserconfig/* $uchinanchu/fusato/config/includes.chroot/etc/live/config.conf.d
-cp $uchinanchu/pepwallpaper/* $uchinanchu/fusato/config/includes.chroot/usr/share/backgrounds
 cp $uchinanchu/PepProPixMaps/* $uchinanchu/fusato/config/includes.chroot/usr/share/pixmaps
 cp $uchinanchu/PepProTools/* $uchinanchu/fusato/config/includes.chroot/opt/pypep
 
 # Copy recursive files and sub-directories, containing symlinks.
 cp -r $uchinanchu/pepcal/calamares/branding $uchinanchu/fusato/config/includes.chroot/etc/calamares
 cp -r $uchinanchu/pepcal/calamares/modules $uchinanchu/fusato/config/includes.chroot/etc/calamares
-cp -r $uchinanchu/pepmenu/menus $uchinanchu/fusato/config/includes.chroot/etc/xdg/menus
+cp -r $uchinanchu/pepmenu/menus/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/menus
 cp -r $uchinanchu/pepxfce/xfce4/panel/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4/panel
 cp -r $uchinanchu/pepxfce/xfce4/xfconf/xfce-perchannel-xml/* $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4/xfconf/xfce-perchannel-xml
 cp -r $uchinanchu/pepxfce/xfce4/defaults.rc $uchinanchu/fusato/config/includes.chroot/etc/xdg/xfce4/whiskermenu
diff --git a/pepwallpaper/44063.jpg b/pepwallpaper/44063.jpg
deleted file mode 100644
index a94d25b2e..000000000
Binary files a/pepwallpaper/44063.jpg and /dev/null differ
diff --git a/pepwallpaper/Godafoss_Iceland.jpg b/pepwallpaper/Godafoss_Iceland.jpg
deleted file mode 100644
index d46892114..000000000
Binary files a/pepwallpaper/Godafoss_Iceland.jpg and /dev/null differ
diff --git a/pepwallpaper/f6vpCy.jpeg b/pepwallpaper/f6vpCy.jpeg
deleted file mode 100644
index c4f097121..000000000
Binary files a/pepwallpaper/f6vpCy.jpeg and /dev/null differ
diff --git a/pepwallpaper/jonatan-pie-3l3RwQdHRHg-unsplash.jpg b/pepwallpaper/jonatan-pie-3l3RwQdHRHg-unsplash.jpg
deleted file mode 100644
index a714aaf2c..000000000
Binary files a/pepwallpaper/jonatan-pie-3l3RwQdHRHg-unsplash.jpg and /dev/null differ
diff --git a/pepwallpaper/wp9637279-no-copyright-wallpapers.jpg b/pepwallpaper/wp9637279-no-copyright-wallpapers.jpg
deleted file mode 100644
index 4b1435cca..000000000
Binary files a/pepwallpaper/wp9637279-no-copyright-wallpapers.jpg and /dev/null differ
diff --git a/pepwallpaper/wp9637304-no-copyright-wallpapers.jpg b/pepwallpaper/wp9637304-no-copyright-wallpapers.jpg
deleted file mode 100644
index 0ad4846c1..000000000
Binary files a/pepwallpaper/wp9637304-no-copyright-wallpapers.jpg and /dev/null differ
diff --git a/pepwallpaper/wp9637312-no-copyright-wallpapers.jpg b/pepwallpaper/wp9637312-no-copyright-wallpapers.jpg
deleted file mode 100644
index e93849111..000000000
Binary files a/pepwallpaper/wp9637312-no-copyright-wallpapers.jpg and /dev/null differ
diff --git a/pepwallpaper/wp9637315-no-copyright-wallpapers.jpg b/pepwallpaper/wp9637315-no-copyright-wallpapers.jpg
deleted file mode 100644
index e3002ca8e..000000000
Binary files a/pepwallpaper/wp9637315-no-copyright-wallpapers.jpg and /dev/null differ
diff --git a/pepwallpaper/wp9637329-no-copyright-wallpapers.jpg b/pepwallpaper/wp9637329-no-copyright-wallpapers.jpg
deleted file mode 100644
index a20101f5b..000000000
Binary files a/pepwallpaper/wp9637329-no-copyright-wallpapers.jpg and /dev/null differ
diff --git a/pepwallpaper/wp9637343-no-copyright-wallpapers.jpg b/pepwallpaper/wp9637343-no-copyright-wallpapers.jpg
deleted file mode 100644
index d5fd27525..000000000
Binary files a/pepwallpaper/wp9637343-no-copyright-wallpapers.jpg and /dev/null differ