diff --git a/bootloaders/grub-pc/config.cfg b/bootloaders/boot/grub/config.cfg similarity index 100% rename from bootloaders/grub-pc/config.cfg rename to bootloaders/boot/grub/config.cfg diff --git a/bootloaders/grub-pc/dejavu-bold-14.pf2 b/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from bootloaders/grub-pc/dejavu-bold-14.pf2 rename to bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/bootloaders/grub-pc/dejavu-bold-16.pf2 b/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from bootloaders/grub-pc/dejavu-bold-16.pf2 rename to bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/bootloaders/grub-pc/font.pf2 b/bootloaders/boot/grub/font.pf2 similarity index 100% rename from bootloaders/grub-pc/font.pf2 rename to bootloaders/boot/grub/font.pf2 diff --git a/bootloaders/grub-pc/grub.cfg b/bootloaders/boot/grub/grub.cfg similarity index 100% rename from bootloaders/grub-pc/grub.cfg rename to bootloaders/boot/grub/grub.cfg diff --git a/bootloaders/grub-pc/live-theme/background.png b/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from bootloaders/grub-pc/live-theme/background.png rename to bootloaders/boot/grub/live-theme/background.png diff --git a/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/bootloaders/grub-pc/live-theme/icons/android.png b/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/android.png rename to bootloaders/boot/grub/live-theme/icons/android.png diff --git a/bootloaders/grub-pc/live-theme/icons/anonymous.png b/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/anonymous.png rename to bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/bootloaders/grub-pc/live-theme/icons/antergos.png b/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/antergos.png rename to bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/bootloaders/grub-pc/live-theme/icons/arch.png b/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/arch.png rename to bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/bootloaders/grub-pc/live-theme/icons/archlinux.png b/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/archlinux.png rename to bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/artix.png b/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/artix.png rename to bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/bootloaders/grub-pc/live-theme/icons/bedrock.png b/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/bedrock.png rename to bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/bootloaders/grub-pc/live-theme/icons/cancel.png b/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/cancel.png rename to bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/bootloaders/grub-pc/live-theme/icons/centos.png b/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/centos.png rename to bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/bootloaders/grub-pc/live-theme/icons/chakra.png b/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/chakra.png rename to bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/bootloaders/grub-pc/live-theme/icons/debian.png b/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/debian.png rename to bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/bootloaders/grub-pc/live-theme/icons/deepin.png b/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/deepin.png rename to bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/bootloaders/grub-pc/live-theme/icons/devuan.png b/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/devuan.png rename to bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/bootloaders/grub-pc/live-theme/icons/driver.png b/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/driver.png rename to bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/bootloaders/grub-pc/live-theme/icons/edit.png b/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/edit.png rename to bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/bootloaders/grub-pc/live-theme/icons/efi.png b/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/efi.png rename to bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/bootloaders/grub-pc/live-theme/icons/elementary.png b/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/elementary.png rename to bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/bootloaders/grub-pc/live-theme/icons/fedora.png b/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/fedora.png rename to bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/bootloaders/grub-pc/live-theme/icons/find.efi.png b/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/find.efi.png rename to bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/bootloaders/grub-pc/live-theme/icons/find.none.png b/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/find.none.png rename to bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/bootloaders/grub-pc/live-theme/icons/freebsd.png b/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/freebsd.png rename to bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/bootloaders/grub-pc/live-theme/icons/garuda.png b/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/garuda.png rename to bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/bootloaders/grub-pc/live-theme/icons/gentoo.png b/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/gentoo.png rename to bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/haiku.png b/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/haiku.png rename to bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/bootloaders/grub-pc/live-theme/icons/help.png b/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/help.png rename to bootloaders/boot/grub/live-theme/icons/help.png diff --git a/bootloaders/grub-pc/live-theme/icons/kali.png b/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kali.png rename to bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/bootloaders/grub-pc/live-theme/icons/kaos.png b/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kaos.png rename to bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/bootloaders/grub-pc/live-theme/icons/kbd.png b/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kbd.png rename to bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/bootloaders/grub-pc/live-theme/icons/korora.png b/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/korora.png rename to bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/lang.png b/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lang.png rename to bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/bootloaders/grub-pc/live-theme/icons/lfs.png b/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lfs.png rename to bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/bootloaders/grub-pc/live-theme/icons/linux.png b/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/linux.png rename to bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/macosx.png b/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/macosx.png rename to bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/bootloaders/grub-pc/live-theme/icons/mageia.png b/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mageia.png rename to bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/bootloaders/grub-pc/live-theme/icons/manjaro.png b/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/manjaro.png rename to bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/bootloaders/grub-pc/live-theme/icons/mate.png b/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mate.png rename to bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/bootloaders/grub-pc/live-theme/icons/memtest.png b/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/memtest.png rename to bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/bootloaders/grub-pc/live-theme/icons/neon.png b/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/neon.png rename to bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/bootloaders/grub-pc/live-theme/icons/opensuse.png b/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/opensuse.png rename to bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/bootloaders/grub-pc/live-theme/icons/parrot.png b/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/parrot.png rename to bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/bootloaders/grub-pc/live-theme/icons/pop-os.png b/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/pop-os.png rename to bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/bootloaders/grub-pc/live-theme/icons/pop.png b/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/pop.png rename to bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/bootloaders/grub-pc/live-theme/icons/recovery.png b/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/recovery.png rename to bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/bootloaders/grub-pc/live-theme/icons/regolith.png b/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/regolith.png rename to bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/bootloaders/grub-pc/live-theme/icons/restart.png b/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/restart.png rename to bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/bootloaders/grub-pc/live-theme/icons/rocky.png b/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/rocky.png rename to bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/bootloaders/grub-pc/live-theme/icons/shutdown.png b/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/shutdown.png rename to bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/bootloaders/grub-pc/live-theme/icons/siduction.png b/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/siduction.png rename to bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/bootloaders/grub-pc/live-theme/icons/slackware.png b/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/slackware.png rename to bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/bootloaders/grub-pc/live-theme/icons/solus.png b/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/solus.png rename to bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/bootloaders/grub-pc/live-theme/icons/steamos.png b/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/steamos.png rename to bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/bootloaders/grub-pc/live-theme/icons/type.png b/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/type.png rename to bootloaders/boot/grub/live-theme/icons/type.png diff --git a/bootloaders/grub-pc/live-theme/icons/tz.png b/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/tz.png rename to bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/unknown.png b/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/unknown.png rename to bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/bootloaders/grub-pc/live-theme/icons/unset.png b/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/unset.png rename to bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/bootloaders/grub-pc/live-theme/icons/ventoy.png b/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/ventoy.png rename to bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/bootloaders/grub-pc/live-theme/icons/void.png b/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/void.png rename to bootloaders/boot/grub/live-theme/icons/void.png diff --git a/bootloaders/grub-pc/live-theme/icons/windows.png b/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/windows.png rename to bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/bootloaders/grub-pc/live-theme/icons/windows11.png b/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/windows11.png rename to bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/bootloaders/grub-pc/live-theme/icons/xero.png b/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xero.png rename to bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/bootloaders/grub-pc/live-theme/icons/zorin.png b/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from bootloaders/grub-pc/live-theme/icons/zorin.png rename to bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/bootloaders/grub-pc/live-theme/select_c.png b/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_c.png rename to bootloaders/boot/grub/live-theme/select_c.png diff --git a/bootloaders/grub-pc/live-theme/select_e.png b/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_e.png rename to bootloaders/boot/grub/live-theme/select_e.png diff --git a/bootloaders/grub-pc/live-theme/select_w.png b/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from bootloaders/grub-pc/live-theme/select_w.png rename to bootloaders/boot/grub/live-theme/select_w.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_c.png b/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_c.png rename to bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_e.png b/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_e.png rename to bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_n.png b/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_n.png rename to bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_s.png b/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_s.png rename to bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_se.png b/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_se.png rename to bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/bootloaders/grub-pc/live-theme/terminal_box_w.png b/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from bootloaders/grub-pc/live-theme/terminal_box_w.png rename to bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/bootloaders/grub-pc/live-theme/theme.txt b/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from bootloaders/grub-pc/live-theme/theme.txt rename to bootloaders/boot/grub/live-theme/theme.txt diff --git a/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/bootloaders/grub-pc/loopback.cfg b/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from bootloaders/grub-pc/loopback.cfg rename to bootloaders/boot/grub/loopback.cfg diff --git a/bootloaders/grub-pc/splash.png b/bootloaders/boot/grub/splash.png similarity index 100% rename from bootloaders/grub-pc/splash.png rename to bootloaders/boot/grub/splash.png diff --git a/bootloaders/grub-pc/theme.cfg b/bootloaders/boot/grub/theme.cfg similarity index 100% rename from bootloaders/grub-pc/theme.cfg rename to bootloaders/boot/grub/theme.cfg diff --git a/my-distro-debian-32-pae/build.sh b/my-distro-debian-32-pae/build.sh index 8b8f2c55..9cce85a6 100755 --- a/my-distro-debian-32-pae/build.sh +++ b/my-distro-debian-32-pae/build.sh @@ -261,7 +261,7 @@ cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares diff --git a/my-distro-debian-32/build.sh b/my-distro-debian-32/build.sh index 284110d6..2d14fd2d 100755 --- a/my-distro-debian-32/build.sh +++ b/my-distro-debian-32/build.sh @@ -262,7 +262,7 @@ cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares diff --git a/my-distro-debian-64/build.sh b/my-distro-debian-64/build.sh index 586faa05..72cb6bb4 100755 --- a/my-distro-debian-64/build.sh +++ b/my-distro-debian-64/build.sh @@ -260,7 +260,7 @@ cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/config.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/config.cfg rename to my-distro-devuan-32-pae/bootloaders/boot/grub/config.cfg diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/dejavu-bold-14.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/dejavu-bold-14.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/dejavu-bold-16.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/dejavu-bold-16.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/font.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/font.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/font.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/font.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/grub.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/grub.cfg rename to my-distro-devuan-32-pae/bootloaders/boot/grub/grub.cfg diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/background.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/background.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/background.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/android.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/android.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/android.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/anonymous.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/anonymous.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/antergos.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/antergos.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/arch.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/arch.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/archlinux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/archlinux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/artix.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/artix.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/bedrock.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/bedrock.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/cancel.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/cancel.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/centos.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/centos.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/chakra.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/chakra.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/debian.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/debian.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/deepin.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/deepin.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/devuan.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/devuan.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/driver.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/driver.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/edit.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/edit.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/efi.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/efi.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/elementary.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/elementary.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/fedora.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/fedora.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/find.efi.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/find.efi.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/find.none.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/find.none.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/freebsd.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/freebsd.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/garuda.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/garuda.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/gentoo.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/gentoo.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/haiku.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/haiku.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/help.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/help.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/help.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kali.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kali.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kaos.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kaos.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kbd.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kbd.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/korora.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/korora.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/lang.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/lang.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/lfs.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/lfs.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/linux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/linux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/macosx.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/macosx.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/mageia.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/mageia.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/manjaro.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/manjaro.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/mate.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/mate.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/memtest.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/memtest.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/neon.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/neon.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/opensuse.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/opensuse.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/parrot.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/parrot.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/pop-os.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/pop-os.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/pop.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/pop.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/recovery.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/recovery.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/regolith.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/regolith.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/restart.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/restart.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/rocky.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/rocky.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/shutdown.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/shutdown.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/siduction.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/siduction.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/slackware.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/slackware.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/solus.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/solus.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/steamos.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/steamos.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/type.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/type.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/type.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/tz.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/tz.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/unknown.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/unknown.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/unset.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/unset.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/ventoy.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/ventoy.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/void.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/void.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/void.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/windows.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/windows.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/windows11.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/windows11.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/xero.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/xero.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/zorin.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/icons/zorin.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/select_c.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/select_c.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/select_c.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/select_e.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/select_e.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/select_e.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/select_w.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/select_w.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/select_w.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_c.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_c.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_e.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_e.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_n.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_n.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_s.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_s.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_se.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_se.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_w.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminal_box_w.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/theme.txt b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/theme.txt rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/theme.txt diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to my-distro-devuan-32-pae/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/loopback.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/loopback.cfg rename to my-distro-devuan-32-pae/bootloaders/boot/grub/loopback.cfg diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/splash.png b/my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/splash.png rename to my-distro-devuan-32-pae/bootloaders/boot/grub/splash.png diff --git a/my-distro-devuan-32-pae/bootloaders/grub-pc/theme.cfg b/my-distro-devuan-32-pae/bootloaders/boot/grub/theme.cfg similarity index 100% rename from my-distro-devuan-32-pae/bootloaders/grub-pc/theme.cfg rename to my-distro-devuan-32-pae/bootloaders/boot/grub/theme.cfg diff --git a/my-distro-devuan-32-pae/build.sh b/my-distro-devuan-32-pae/build.sh index 7f2cea79..5c5adae2 100755 --- a/my-distro-devuan-32-pae/build.sh +++ b/my-distro-devuan-32-pae/build.sh @@ -262,7 +262,7 @@ cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares diff --git a/my-distro-devuan-32/bootloaders/grub-pc/config.cfg b/my-distro-devuan-32/bootloaders/boot/grub/config.cfg similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/config.cfg rename to my-distro-devuan-32/bootloaders/boot/grub/config.cfg diff --git a/my-distro-devuan-32/bootloaders/grub-pc/dejavu-bold-14.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/dejavu-bold-14.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/dejavu-bold-16.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/dejavu-bold-16.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/font.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/font.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/font.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/font.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/grub.cfg b/my-distro-devuan-32/bootloaders/boot/grub/grub.cfg similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/grub.cfg rename to my-distro-devuan-32/bootloaders/boot/grub/grub.cfg diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/background.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/background.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/background.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/android.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/android.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/android.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/anonymous.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/anonymous.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/antergos.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/antergos.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/arch.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/arch.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/archlinux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/archlinux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/artix.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/artix.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/bedrock.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/bedrock.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/cancel.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/cancel.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/centos.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/centos.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/chakra.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/chakra.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/debian.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/debian.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/deepin.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/deepin.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/devuan.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/devuan.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/driver.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/driver.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/edit.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/edit.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/efi.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/efi.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/elementary.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/elementary.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/fedora.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/fedora.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/find.efi.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/find.efi.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/find.none.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/find.none.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/freebsd.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/freebsd.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/garuda.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/garuda.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/gentoo.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/gentoo.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/haiku.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/haiku.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/help.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/help.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/help.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kali.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kali.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kaos.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kaos.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kbd.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kbd.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/korora.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/korora.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/lang.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/lang.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/lfs.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/lfs.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/linux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/linux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/macosx.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/macosx.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/mageia.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/mageia.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/manjaro.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/manjaro.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/mate.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/mate.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/memtest.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/memtest.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/neon.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/neon.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/opensuse.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/opensuse.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/parrot.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/parrot.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/pop-os.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/pop-os.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/pop.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/pop.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/recovery.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/recovery.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/regolith.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/regolith.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/restart.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/restart.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/rocky.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/rocky.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/shutdown.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/shutdown.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/siduction.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/siduction.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/slackware.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/slackware.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/solus.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/solus.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/steamos.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/steamos.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/type.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/type.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/type.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/tz.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/tz.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/unknown.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/unknown.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/unset.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/unset.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/ventoy.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/ventoy.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/void.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/void.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/void.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/windows.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/windows.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/windows11.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/windows11.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/xero.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/xero.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/zorin.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/icons/zorin.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/select_c.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/select_c.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/select_c.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/select_e.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/select_e.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/select_e.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/select_w.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/select_w.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/select_w.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_c.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_c.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_e.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_e.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_n.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_n.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_s.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_s.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_se.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_se.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_w.png b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminal_box_w.png rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/theme.txt b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/theme.txt rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/theme.txt diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/my-distro-devuan-32/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to my-distro-devuan-32/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/my-distro-devuan-32/bootloaders/grub-pc/loopback.cfg b/my-distro-devuan-32/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/loopback.cfg rename to my-distro-devuan-32/bootloaders/boot/grub/loopback.cfg diff --git a/my-distro-devuan-32/bootloaders/grub-pc/splash.png b/my-distro-devuan-32/bootloaders/boot/grub/splash.png similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/splash.png rename to my-distro-devuan-32/bootloaders/boot/grub/splash.png diff --git a/my-distro-devuan-32/bootloaders/grub-pc/theme.cfg b/my-distro-devuan-32/bootloaders/boot/grub/theme.cfg similarity index 100% rename from my-distro-devuan-32/bootloaders/grub-pc/theme.cfg rename to my-distro-devuan-32/bootloaders/boot/grub/theme.cfg diff --git a/my-distro-devuan-32/build.sh b/my-distro-devuan-32/build.sh index 22d95035..3d248632 100755 --- a/my-distro-devuan-32/build.sh +++ b/my-distro-devuan-32/build.sh @@ -262,7 +262,7 @@ cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares diff --git a/my-distro-devuan-64/bootloaders/grub-pc/config.cfg b/my-distro-devuan-64/bootloaders/boot/grub/config.cfg similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/config.cfg rename to my-distro-devuan-64/bootloaders/boot/grub/config.cfg diff --git a/my-distro-devuan-64/bootloaders/grub-pc/dejavu-bold-14.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/dejavu-bold-14.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/dejavu-bold-16.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/dejavu-bold-16.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/font.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/font.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/font.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/font.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/grub.cfg b/my-distro-devuan-64/bootloaders/boot/grub/grub.cfg similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/grub.cfg rename to my-distro-devuan-64/bootloaders/boot/grub/grub.cfg diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/background.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/background.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/background.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/android.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/android.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/android.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/anonymous.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/anonymous.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/antergos.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/antergos.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/arch.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/arch.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/archlinux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/archlinux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/artix.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/artix.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/bedrock.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/bedrock.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/cancel.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/cancel.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/centos.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/centos.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/chakra.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/chakra.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/debian.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/debian.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/deepin.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/deepin.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/devuan.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/devuan.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/driver.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/driver.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/edit.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/edit.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/efi.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/efi.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/elementary.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/elementary.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/fedora.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/fedora.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/find.efi.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/find.efi.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/find.none.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/find.none.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/freebsd.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/freebsd.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/garuda.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/garuda.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/gentoo.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/gentoo.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/haiku.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/haiku.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/help.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/help.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/help.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kali.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kali.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kaos.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kaos.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kbd.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kbd.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/korora.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/korora.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/lang.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/lang.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/lfs.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/lfs.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/linux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/linux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/macosx.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/macosx.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/mageia.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/mageia.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/manjaro.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/manjaro.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/mate.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/mate.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/memtest.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/memtest.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/neon.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/neon.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/opensuse.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/opensuse.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/parrot.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/parrot.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/pop-os.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/pop-os.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/pop.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/pop.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/recovery.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/recovery.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/regolith.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/regolith.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/restart.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/restart.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/rocky.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/rocky.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/shutdown.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/shutdown.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/siduction.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/siduction.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/slackware.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/slackware.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/solus.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/solus.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/steamos.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/steamos.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/type.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/type.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/type.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/tz.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/tz.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/unknown.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/unknown.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/unset.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/unset.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/ventoy.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/ventoy.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/void.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/void.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/void.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/windows.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/windows.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/windows11.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/windows11.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/xero.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/xero.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/zorin.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/icons/zorin.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/select_c.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/select_c.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/select_c.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/select_e.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/select_e.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/select_e.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/select_w.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/select_w.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/select_w.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_c.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_c.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_e.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_e.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_n.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_n.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_s.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_s.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_se.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_se.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_w.png b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminal_box_w.png rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/theme.txt b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/theme.txt rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/theme.txt diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/my-distro-devuan-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to my-distro-devuan-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/my-distro-devuan-64/bootloaders/grub-pc/loopback.cfg b/my-distro-devuan-64/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/loopback.cfg rename to my-distro-devuan-64/bootloaders/boot/grub/loopback.cfg diff --git a/my-distro-devuan-64/bootloaders/grub-pc/splash.png b/my-distro-devuan-64/bootloaders/boot/grub/splash.png similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/splash.png rename to my-distro-devuan-64/bootloaders/boot/grub/splash.png diff --git a/my-distro-devuan-64/bootloaders/grub-pc/theme.cfg b/my-distro-devuan-64/bootloaders/boot/grub/theme.cfg similarity index 100% rename from my-distro-devuan-64/bootloaders/grub-pc/theme.cfg rename to my-distro-devuan-64/bootloaders/boot/grub/theme.cfg diff --git a/my-distro-devuan-64/build.sh b/my-distro-devuan-64/build.sh index 347cc1a1..40aae3ee 100755 --- a/my-distro-devuan-64/build.sh +++ b/my-distro-devuan-64/build.sh @@ -263,7 +263,7 @@ cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/repos/* $build/build/config/archives cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/config.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/config.cfg rename to my-distro-ubuntu-64/bootloaders/boot/grub/config.cfg diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/dejavu-bold-14.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-14.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/dejavu-bold-14.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-14.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/dejavu-bold-16.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-16.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/dejavu-bold-16.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/dejavu-bold-16.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/font.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/font.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/font.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/font.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/grub.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/grub.cfg rename to my-distro-ubuntu-64/bootloaders/boot/grub/grub.cfg diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/background.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/background.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/background.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/background.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/4MLinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/4MLinux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/4MLinux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/AlpineLinux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/AlpineLinux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/Manjaro.i686.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.i686.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/Manjaro.x86_64.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/Manjaro.x86_64.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/SystemRescueCD.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/SystemRescueCD.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/android.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/android.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/android.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/android.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/anonymous.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/anonymous.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/anonymous.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/anonymous.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/antergos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/antergos.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/antergos.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/antergos.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/arch.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arch.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/arch.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arch.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/archlinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/archlinux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/archlinux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/archlinux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/arcolinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/arcolinux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/arcolinux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/artix.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/artix.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/artix.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/artix.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/bedrock.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/bedrock.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/bedrock.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/bedrock.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/cancel.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/cancel.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/cancel.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/cancel.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/centos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/centos.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/centos.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/centos.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/chakra.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/chakra.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/chakra.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/chakra.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/debian.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/debian.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/debian.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/debian.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/deepin.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/deepin.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/deepin.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/deepin.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/devuan.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/devuan.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/devuan.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/devuan.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/driver.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/driver.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/driver.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/driver.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/edit.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/edit.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/edit.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/edit.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/efi.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/efi.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/efi.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/efi.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/elementary.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/elementary.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/elementary.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/elementary.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/endeavouros.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/endeavouros.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/endeavouros.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/fedora.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/fedora.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/fedora.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/fedora.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/find.efi.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.efi.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/find.efi.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.efi.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/find.none.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.none.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/find.none.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/find.none.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/freebsd.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/freebsd.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/freebsd.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/freebsd.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/garuda.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/garuda.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/garuda.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/garuda.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/gentoo.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gentoo.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/gentoo.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gentoo.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/gnu-linux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/gnu-linux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/gnu-linux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/haiku.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/haiku.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/haiku.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/haiku.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/help.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/help.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/help.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/help.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kali.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kali.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kali.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kali.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kaos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kaos.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kaos.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kaos.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kbd.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kbd.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kbd.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kbd.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/korora.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/korora.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/korora.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/korora.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/kubuntu.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/kubuntu.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/lang.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lang.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/lang.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lang.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/lfs.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lfs.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/lfs.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lfs.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/linux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/linux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/linuxmint.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/linuxmint.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/linuxmint.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/lubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/lubuntu.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/lubuntu.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/macosx.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/macosx.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/macosx.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/macosx.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/mageia.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mageia.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/mageia.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mageia.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/manjaro.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/manjaro.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/manjaro.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/manjaro.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/mate.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mate.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/mate.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mate.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/memtest.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/memtest.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/memtest.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/memtest.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/mx-linux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/mx-linux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/mx-linux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/neon.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/neon.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/neon.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/neon.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/opensuse.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/opensuse.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/opensuse.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/opensuse.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/parrot.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/parrot.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/parrot.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/parrot.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/pop-os.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop-os.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/pop-os.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop-os.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/pop.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/pop.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/pop.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/recovery.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/recovery.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/recovery.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/recovery.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/regolith.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/regolith.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/regolith.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/regolith.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/restart.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/restart.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/restart.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/restart.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/rocky.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/rocky.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/rocky.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/rocky.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/shutdown.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/shutdown.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/shutdown.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/shutdown.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/siduction.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/siduction.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/siduction.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/siduction.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/slackware.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/slackware.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/slackware.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/slackware.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/solus.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/solus.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/solus.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/solus.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/steamos.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/steamos.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/steamos.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/steamos.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/type.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/type.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/type.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/type.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/tz.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/tz.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/tz.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/tz.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/ubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/ubuntu.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ubuntu.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/unknown.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unknown.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/unknown.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unknown.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/unset.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unset.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/unset.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/unset.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/ventoy.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ventoy.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/ventoy.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/ventoy.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/void.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/void.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/void.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/void.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/windows.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/windows.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/windows11.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows11.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/windows11.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/windows11.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/xero.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xero.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/xero.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xero.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/xerolinux.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/xerolinux.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xerolinux.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/xubuntu.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/xubuntu.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/xubuntu.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/zorin.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/zorin.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/icons/zorin.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/icons/zorin.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/select_c.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_c.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/select_c.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_c.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/select_e.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_e.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/select_e.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_e.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/select_w.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_w.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/select_w.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/select_w.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_c.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_c.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_c.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_c.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_e.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_e.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_e.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_e.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_n.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_n.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_n.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_n.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_ne.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_ne.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_ne.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_nw.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_nw.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_nw.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_s.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_s.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_s.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_s.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_se.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_se.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_se.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_se.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_sw.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_sw.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_sw.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_w.png b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_w.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminal_box_w.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminal_box_w.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-12.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-12.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-12.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-14.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-14.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-14.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-16.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-16.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-16.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-18.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/terminus-18.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/terminus-18.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/theme.txt b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/theme.txt similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/theme.txt rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/theme.txt diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/ubuntu_regular_17.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_17.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 b/my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/live-theme/ubuntu_regular_20.pf2 rename to my-distro-ubuntu-64/bootloaders/boot/grub/live-theme/ubuntu_regular_20.pf2 diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/loopback.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/loopback.cfg similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/loopback.cfg rename to my-distro-ubuntu-64/bootloaders/boot/grub/loopback.cfg diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/splash.png b/my-distro-ubuntu-64/bootloaders/boot/grub/splash.png similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/splash.png rename to my-distro-ubuntu-64/bootloaders/boot/grub/splash.png diff --git a/my-distro-ubuntu-64/bootloaders/grub-pc/theme.cfg b/my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg similarity index 100% rename from my-distro-ubuntu-64/bootloaders/grub-pc/theme.cfg rename to my-distro-ubuntu-64/bootloaders/boot/grub/theme.cfg diff --git a/my-distro-ubuntu-64/build.sh b/my-distro-ubuntu-64/build.sh index 5581b8a3..345e582f 100755 --- a/my-distro-ubuntu-64/build.sh +++ b/my-distro-ubuntu-64/build.sh @@ -255,7 +255,7 @@ cp $build/bootloader-config/* $build/build/config/includes.chroot/usr/sbin cp $build/grub/grub $build/build/config/includes.chroot/etc/default cp -r $build/lightdm/* $build/build/config/includes.chroot/etc/lightdm -cp -r $build/bootloaders/* $build/build/config/bootloaders +cp -r $build/bootloaders/* $build/build/config/includes.binary cp -r $build/backgrounds/* $build/build/config/includes.chroot/usr/share/backgrounds cp -r $build/calamares/* $build/build/config/includes.chroot/etc/calamares cp -r $build/configs/* $build/build/config/includes.chroot/etc/