diff --git a/backgrounds/cat_kitten_brown_black_fur_green_leaf_stone_blur_background_4k_hd_cat-1920x1080.jpg b/backgrounds/cat_kitten_brown_black_fur_green_leaf_stone_blur_background_4k_hd_cat-1920x1080.jpg
new file mode 100644
index 00000000..82347598
Binary files /dev/null and b/backgrounds/cat_kitten_brown_black_fur_green_leaf_stone_blur_background_4k_hd_cat-1920x1080.jpg differ
diff --git a/backgrounds/frozen_snow_sea_rock_coast_relief_long_exposure_landscape_stones_blue_sky_4k_hd_nature-1920x1080.jpg b/backgrounds/frozen_snow_sea_rock_coast_relief_long_exposure_landscape_stones_blue_sky_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..133232cd
Binary files /dev/null and b/backgrounds/frozen_snow_sea_rock_coast_relief_long_exposure_landscape_stones_blue_sky_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/frozen_water_sea_waves_wheel_sunset_4k_hd_nature-1920x1080.jpg b/backgrounds/frozen_water_sea_waves_wheel_sunset_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..9bc25406
Binary files /dev/null and b/backgrounds/frozen_water_sea_waves_wheel_sunset_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/grass_leaves_grass_clouds_sunshine_blue_sky_scenery_ocean_waves_4k_hd_nature-1920x1080.jpg b/backgrounds/grass_leaves_grass_clouds_sunshine_blue_sky_scenery_ocean_waves_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..52b7f409
Binary files /dev/null and b/backgrounds/grass_leaves_grass_clouds_sunshine_blue_sky_scenery_ocean_waves_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/grass_trail_field_bushes_trees_twilight_stars_blue_sky_milky_way_4k_hd_nature-1920x1080.jpg b/backgrounds/grass_trail_field_bushes_trees_twilight_stars_blue_sky_milky_way_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..304bd339
Binary files /dev/null and b/backgrounds/grass_trail_field_bushes_trees_twilight_stars_blue_sky_milky_way_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/lake_coast_rocks_mountains_landscape_nature_blue_sky_slope_background_reflection_4k_hd_nature-1920x1080.jpg b/backgrounds/lake_coast_rocks_mountains_landscape_nature_blue_sky_slope_background_reflection_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..5881dbb1
Binary files /dev/null and b/backgrounds/lake_coast_rocks_mountains_landscape_nature_blue_sky_slope_background_reflection_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/mountains_stones_snow_relief_nature_landscape_trees_blue_sky_4k_hd_nature-1920x1080.jpg b/backgrounds/mountains_stones_snow_relief_nature_landscape_trees_blue_sky_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..4c91664f
Binary files /dev/null and b/backgrounds/mountains_stones_snow_relief_nature_landscape_trees_blue_sky_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/path_road_autumn_trees_nature_view_scenery_beautiful_4k_hd_nature-1920x1080.jpg b/backgrounds/path_road_autumn_trees_nature_view_scenery_beautiful_4k_hd_nature-1920x1080.jpg
new file mode 100644
index 00000000..6bba422b
Binary files /dev/null and b/backgrounds/path_road_autumn_trees_nature_view_scenery_beautiful_4k_hd_nature-1920x1080.jpg differ
diff --git a/backgrounds/yellow_grey_black_abstract_digital_graphic_4k_hd_abstract-1920x1080.jpg b/backgrounds/yellow_grey_black_abstract_digital_graphic_4k_hd_abstract-1920x1080.jpg
new file mode 100644
index 00000000..81c657ff
Binary files /dev/null and b/backgrounds/yellow_grey_black_abstract_digital_graphic_4k_hd_abstract-1920x1080.jpg differ
diff --git a/build-32-non-pae.sh b/build-32-non-pae.sh
index 4e9eb209..1da38242 100755
--- a/build-32-non-pae.sh
+++ b/build-32-non-pae.sh
@@ -239,6 +239,7 @@ mkdir -p $build32/build32/config/includes.chroot/usr/share/plymouth
 mkdir -p $build32/build32/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build32/build32/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build32/build32/config/includes.chroot/etc/default
+mkdir -p $build32/build/config/includes.chroot/boot/grub/themes
 
 # Copy Configs to the chroot
 cp $build32/userconfig/* $build32/build32/config/includes.chroot/etc/live/config.conf.d
@@ -248,7 +249,7 @@ cp $build32/hooks/normal/* $build32/build32/config/hooks/normal
 cp $build32/install-debian/* $build32/build32/config/includes.chroot/usr/share/pixmaps
 cp $build32/sources-final/* $build32/build32/config/includes.chroot/usr/sbin
 cp $build32/bootloader-config-32bit/* $build32/build32/config/includes.chroot/usr/sbin
-cp $build32/grub/* $build32/build32/config/includes.chroot/etc/default
+cp $build32/grub/grub $build32/build32/config/includes.chroot/etc/default
 
 cp -r $build32/lightdm/* $build32/build32/config/includes.chroot/etc/lightdm
 cp -r $build32/bootloaders/* $build32/build32/config/bootloaders
@@ -261,6 +262,7 @@ cp -r $build32/themes/* $build32/build32/config/includes.chroot/usr/share/themes
 cp -r $build32/desktop-base/* $build32/build32/config/includes.chroot/usr/share/desktop-base
 cp -r $build32/plymouth/* $build32/build32/config/includes.chroot/usr/share/plymouth
 cp -r $build32/packages32/* $build32/build32/config/packages.chroot
+cp -r $build32/grub/themes/* $build32/build32/config/includes.chroot/boot/grub/themes
 
 # Resolves Synaptics issue. Might be better in a conf hook.
 mkdir -p $build32/build32/config/includes.chroot/usr/share/distro-info
diff --git a/build-32.sh b/build-32.sh
index fdfd799d..8bf92631 100755
--- a/build-32.sh
+++ b/build-32.sh
@@ -238,6 +238,7 @@ mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/plymouth
 mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build32pae/build32pae/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build32pae/build32pae/config/includes.chroot/etc/default
+mkdir -p $build32pae/build/config/includes.chroot/boot/grub/themes
 
 # Copy Configs to the chroot
 cp $build32pae/userconfig/* $build32pae/build32pae/config/includes.chroot/etc/live/config.conf.d
@@ -247,7 +248,7 @@ cp $build32pae/hooks/normal/* $build32pae/build32pae/config/hooks/normal
 cp $build32pae/install-debian/* $build32pae/build32pae/config/includes.chroot/usr/share/pixmaps
 cp $build32pae/sources-final/* $build32pae/build32pae/config/includes.chroot/usr/sbin
 cp $build32pae/bootloader-config-32bit/* $build32pae/build32pae/config/includes.chroot/usr/sbin
-cp $build32pae/grub/* $build32pae/build32pae/config/includes.chroot/etc/default
+cp $build32pae/grub/grub $build32pae/build32pae/config/includes.chroot/etc/default
 
 cp -r $build32pae/lightdm/* $build32pae/build32pae/config/includes.chroot/etc/lightdm
 cp -r $build32pae/bootloaders/* $build32pae/build32pae/config/bootloaders
@@ -260,6 +261,7 @@ cp -r $build32pae/themes/* $build32pae/build32pae/config/includes.chroot/usr/sha
 cp -r $build32pae/desktop-base/* $build32pae/build32pae/config/includes.chroot/usr/share/desktop-base
 cp -r $build32pae/plymouth/* $build32pae/build32pae/config/includes.chroot/usr/share/plymouth
 cp -r $build32pae/packages32/* $build32pae/build32pae/config/packages.chroot
+cp -r $build32pae/grub/themes/* $build32pae/build32pae/config/includes.chroot/boot/grub/themes
 
 # Resolves Synaptics issue. Might be better in a conf hook.
 mkdir -p $build32pae/build32pae/config/includes.chroot/usr/share/distro-info
diff --git a/build-64.sh b/build-64.sh
index 62e79642..a548911c 100755
--- a/build-64.sh
+++ b/build-64.sh
@@ -239,6 +239,7 @@ mkdir -p $build/build/config/includes.chroot/usr/share/plymouth
 mkdir -p $build/build/config/includes.chroot/usr/share/desktop-base
 mkdir -p $build/build/config/includes.chroot/etc/skel/Desktop
 mkdir -p $build/build/config/includes.chroot/etc/default
+mkdir -p $build/build/config/includes.chroot/boot/grub/themes
 
 # Copy Configs to the chroot
 cp $build/userconfig/* $build/build/config/includes.chroot/etc/live/config.conf.d
@@ -247,7 +248,7 @@ cp $build/hooks/live/* $build/build/config/hooks/live
 cp $build/hooks/normal/* $build/build/config/hooks/normal
 cp $build/install-debian/* $build/build/config/includes.chroot/usr/share/pixmaps
 cp $build/sources-final/* $build/build/config/includes.chroot/usr/sbin
-cp $build/grub/* $build/build/config/includes.chroot/etc/default
+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
@@ -260,6 +261,7 @@ cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/desktop-base/* $build/build/config/includes.chroot/usr/share/desktop-base
 cp -r $build/plymouth/* $build/build/config/includes.chroot/usr/share/plymouth
 cp -r $build/packages64/* $build/build/config/packages.chroot
+cp -r $build/grub/themes/* $build/build/config/includes.chroot/boot/grub/themes
 
 # Resolves Synaptics issue. Might be better in a conf hook.
 mkdir -p $build/build/config/includes.chroot/usr/share/distro-info
diff --git a/grub/grub b/grub/grub
index 48d3d2fe..b3636885 100755
--- a/grub/grub
+++ b/grub/grub
@@ -20,7 +20,7 @@ GRUB_CMDLINE_LINUX=""
 # The resolution used on graphical terminal
 # note that you can use only modes which your graphic card supports via VBE
 # you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=1360x768
+GRUB_GFXMODE=1440x900
 
 # Uncomment if you don't want GRUB to pass "root=UUID=xxx" parameter to Linux
 #GRUB_DISABLE_LINUX_UUID=true
@@ -30,3 +30,6 @@ GRUB_GFXMODE=1360x768
 
 # Uncomment to get a beep at grub start
 #GRUB_INIT_TUNE="480 440 1"
+
+#Grub theme
+GRUB_THEME="/boot/grub/themes/my-distro/theme.txt"
diff --git a/grub/themes/my-distro/background.png b/grub/themes/my-distro/background.png
new file mode 100644
index 00000000..59b84691
Binary files /dev/null and b/grub/themes/my-distro/background.png differ
diff --git a/grub/themes/my-distro/icons/4MLinux.png b/grub/themes/my-distro/icons/4MLinux.png
new file mode 100644
index 00000000..1c6fe5e2
Binary files /dev/null and b/grub/themes/my-distro/icons/4MLinux.png differ
diff --git a/grub/themes/my-distro/icons/AlpineLinux.png b/grub/themes/my-distro/icons/AlpineLinux.png
new file mode 100644
index 00000000..6212a1fa
Binary files /dev/null and b/grub/themes/my-distro/icons/AlpineLinux.png differ
diff --git a/grub/themes/my-distro/icons/Manjaro.i686.png b/grub/themes/my-distro/icons/Manjaro.i686.png
new file mode 100644
index 00000000..611a6fbc
Binary files /dev/null and b/grub/themes/my-distro/icons/Manjaro.i686.png differ
diff --git a/grub/themes/my-distro/icons/Manjaro.x86_64.png b/grub/themes/my-distro/icons/Manjaro.x86_64.png
new file mode 100644
index 00000000..611a6fbc
Binary files /dev/null and b/grub/themes/my-distro/icons/Manjaro.x86_64.png differ
diff --git a/grub/themes/my-distro/icons/SystemRescueCD.png b/grub/themes/my-distro/icons/SystemRescueCD.png
new file mode 100644
index 00000000..7c41182f
Binary files /dev/null and b/grub/themes/my-distro/icons/SystemRescueCD.png differ
diff --git a/grub/themes/my-distro/icons/android.png b/grub/themes/my-distro/icons/android.png
new file mode 100644
index 00000000..dad066f5
Binary files /dev/null and b/grub/themes/my-distro/icons/android.png differ
diff --git a/grub/themes/my-distro/icons/anonymous.png b/grub/themes/my-distro/icons/anonymous.png
new file mode 100644
index 00000000..7d165b67
Binary files /dev/null and b/grub/themes/my-distro/icons/anonymous.png differ
diff --git a/grub/themes/my-distro/icons/antergos.png b/grub/themes/my-distro/icons/antergos.png
new file mode 100644
index 00000000..32e3a3a3
Binary files /dev/null and b/grub/themes/my-distro/icons/antergos.png differ
diff --git a/grub/themes/my-distro/icons/arch.png b/grub/themes/my-distro/icons/arch.png
new file mode 100644
index 00000000..f6cd8704
Binary files /dev/null and b/grub/themes/my-distro/icons/arch.png differ
diff --git a/grub/themes/my-distro/icons/archlinux.png b/grub/themes/my-distro/icons/archlinux.png
new file mode 100644
index 00000000..f6cd8704
Binary files /dev/null and b/grub/themes/my-distro/icons/archlinux.png differ
diff --git a/grub/themes/my-distro/icons/arcolinux.png b/grub/themes/my-distro/icons/arcolinux.png
new file mode 100644
index 00000000..c5e5e5ea
Binary files /dev/null and b/grub/themes/my-distro/icons/arcolinux.png differ
diff --git a/grub/themes/my-distro/icons/artix.png b/grub/themes/my-distro/icons/artix.png
new file mode 100644
index 00000000..0cbeb11c
Binary files /dev/null and b/grub/themes/my-distro/icons/artix.png differ
diff --git a/grub/themes/my-distro/icons/bedrock.png b/grub/themes/my-distro/icons/bedrock.png
new file mode 100644
index 00000000..58ff48a8
Binary files /dev/null and b/grub/themes/my-distro/icons/bedrock.png differ
diff --git a/grub/themes/my-distro/icons/cancel.png b/grub/themes/my-distro/icons/cancel.png
new file mode 100644
index 00000000..fca2ac9d
Binary files /dev/null and b/grub/themes/my-distro/icons/cancel.png differ
diff --git a/grub/themes/my-distro/icons/centos.png b/grub/themes/my-distro/icons/centos.png
new file mode 100644
index 00000000..23fe2fa5
Binary files /dev/null and b/grub/themes/my-distro/icons/centos.png differ
diff --git a/grub/themes/my-distro/icons/chakra.png b/grub/themes/my-distro/icons/chakra.png
new file mode 100644
index 00000000..6f63a959
Binary files /dev/null and b/grub/themes/my-distro/icons/chakra.png differ
diff --git a/grub/themes/my-distro/icons/debian.png b/grub/themes/my-distro/icons/debian.png
new file mode 100644
index 00000000..20bea8c2
Binary files /dev/null and b/grub/themes/my-distro/icons/debian.png differ
diff --git a/grub/themes/my-distro/icons/deepin.png b/grub/themes/my-distro/icons/deepin.png
new file mode 100644
index 00000000..61c92fb4
Binary files /dev/null and b/grub/themes/my-distro/icons/deepin.png differ
diff --git a/grub/themes/my-distro/icons/devuan.png b/grub/themes/my-distro/icons/devuan.png
new file mode 100644
index 00000000..ff654016
Binary files /dev/null and b/grub/themes/my-distro/icons/devuan.png differ
diff --git a/grub/themes/my-distro/icons/driver.png b/grub/themes/my-distro/icons/driver.png
new file mode 100644
index 00000000..1621ee7f
Binary files /dev/null and b/grub/themes/my-distro/icons/driver.png differ
diff --git a/grub/themes/my-distro/icons/edit.png b/grub/themes/my-distro/icons/edit.png
new file mode 100644
index 00000000..6a43bd99
Binary files /dev/null and b/grub/themes/my-distro/icons/edit.png differ
diff --git a/grub/themes/my-distro/icons/efi.png b/grub/themes/my-distro/icons/efi.png
new file mode 100644
index 00000000..4ecf3b98
Binary files /dev/null and b/grub/themes/my-distro/icons/efi.png differ
diff --git a/grub/themes/my-distro/icons/elementary.png b/grub/themes/my-distro/icons/elementary.png
new file mode 100644
index 00000000..2840354c
Binary files /dev/null and b/grub/themes/my-distro/icons/elementary.png differ
diff --git a/grub/themes/my-distro/icons/endeavouros.png b/grub/themes/my-distro/icons/endeavouros.png
new file mode 100644
index 00000000..6b1e530d
Binary files /dev/null and b/grub/themes/my-distro/icons/endeavouros.png differ
diff --git a/grub/themes/my-distro/icons/fedora.png b/grub/themes/my-distro/icons/fedora.png
new file mode 100644
index 00000000..926b56d1
Binary files /dev/null and b/grub/themes/my-distro/icons/fedora.png differ
diff --git a/grub/themes/my-distro/icons/find.efi.png b/grub/themes/my-distro/icons/find.efi.png
new file mode 100644
index 00000000..0e32321a
Binary files /dev/null and b/grub/themes/my-distro/icons/find.efi.png differ
diff --git a/grub/themes/my-distro/icons/find.none.png b/grub/themes/my-distro/icons/find.none.png
new file mode 100644
index 00000000..87d4d0ec
Binary files /dev/null and b/grub/themes/my-distro/icons/find.none.png differ
diff --git a/grub/themes/my-distro/icons/freebsd.png b/grub/themes/my-distro/icons/freebsd.png
new file mode 100644
index 00000000..fb9408cf
Binary files /dev/null and b/grub/themes/my-distro/icons/freebsd.png differ
diff --git a/grub/themes/my-distro/icons/garuda.png b/grub/themes/my-distro/icons/garuda.png
new file mode 100644
index 00000000..f699718a
Binary files /dev/null and b/grub/themes/my-distro/icons/garuda.png differ
diff --git a/grub/themes/my-distro/icons/gentoo.png b/grub/themes/my-distro/icons/gentoo.png
new file mode 100644
index 00000000..bc0ed705
Binary files /dev/null and b/grub/themes/my-distro/icons/gentoo.png differ
diff --git a/grub/themes/my-distro/icons/gnu-linux.png b/grub/themes/my-distro/icons/gnu-linux.png
new file mode 100644
index 00000000..326b6596
Binary files /dev/null and b/grub/themes/my-distro/icons/gnu-linux.png differ
diff --git a/grub/themes/my-distro/icons/haiku.png b/grub/themes/my-distro/icons/haiku.png
new file mode 100644
index 00000000..ce7f8182
Binary files /dev/null and b/grub/themes/my-distro/icons/haiku.png differ
diff --git a/grub/themes/my-distro/icons/help.png b/grub/themes/my-distro/icons/help.png
new file mode 100644
index 00000000..d8b5a173
Binary files /dev/null and b/grub/themes/my-distro/icons/help.png differ
diff --git a/grub/themes/my-distro/icons/kali.png b/grub/themes/my-distro/icons/kali.png
new file mode 100644
index 00000000..900dc82e
Binary files /dev/null and b/grub/themes/my-distro/icons/kali.png differ
diff --git a/grub/themes/my-distro/icons/kaos.png b/grub/themes/my-distro/icons/kaos.png
new file mode 100644
index 00000000..9fd4e891
Binary files /dev/null and b/grub/themes/my-distro/icons/kaos.png differ
diff --git a/grub/themes/my-distro/icons/kbd.png b/grub/themes/my-distro/icons/kbd.png
new file mode 100644
index 00000000..6ace3ace
Binary files /dev/null and b/grub/themes/my-distro/icons/kbd.png differ
diff --git a/grub/themes/my-distro/icons/korora.png b/grub/themes/my-distro/icons/korora.png
new file mode 100644
index 00000000..456e8764
Binary files /dev/null and b/grub/themes/my-distro/icons/korora.png differ
diff --git a/grub/themes/my-distro/icons/kubuntu.png b/grub/themes/my-distro/icons/kubuntu.png
new file mode 100644
index 00000000..7a79ff32
Binary files /dev/null and b/grub/themes/my-distro/icons/kubuntu.png differ
diff --git a/grub/themes/my-distro/icons/lang.png b/grub/themes/my-distro/icons/lang.png
new file mode 100644
index 00000000..3c9c1d79
Binary files /dev/null and b/grub/themes/my-distro/icons/lang.png differ
diff --git a/grub/themes/my-distro/icons/lfs.png b/grub/themes/my-distro/icons/lfs.png
new file mode 100644
index 00000000..326b6596
Binary files /dev/null and b/grub/themes/my-distro/icons/lfs.png differ
diff --git a/grub/themes/my-distro/icons/linux.png b/grub/themes/my-distro/icons/linux.png
new file mode 100644
index 00000000..326b6596
Binary files /dev/null and b/grub/themes/my-distro/icons/linux.png differ
diff --git a/grub/themes/my-distro/icons/linuxmint.png b/grub/themes/my-distro/icons/linuxmint.png
new file mode 100644
index 00000000..7d9da816
Binary files /dev/null and b/grub/themes/my-distro/icons/linuxmint.png differ
diff --git a/grub/themes/my-distro/icons/lubuntu.png b/grub/themes/my-distro/icons/lubuntu.png
new file mode 100644
index 00000000..057c8e25
Binary files /dev/null and b/grub/themes/my-distro/icons/lubuntu.png differ
diff --git a/grub/themes/my-distro/icons/macosx.png b/grub/themes/my-distro/icons/macosx.png
new file mode 100644
index 00000000..ea03e779
Binary files /dev/null and b/grub/themes/my-distro/icons/macosx.png differ
diff --git a/grub/themes/my-distro/icons/mageia.png b/grub/themes/my-distro/icons/mageia.png
new file mode 100644
index 00000000..79afa761
Binary files /dev/null and b/grub/themes/my-distro/icons/mageia.png differ
diff --git a/grub/themes/my-distro/icons/manjaro.png b/grub/themes/my-distro/icons/manjaro.png
new file mode 100644
index 00000000..611a6fbc
Binary files /dev/null and b/grub/themes/my-distro/icons/manjaro.png differ
diff --git a/grub/themes/my-distro/icons/mate.png b/grub/themes/my-distro/icons/mate.png
new file mode 100644
index 00000000..b2fc22aa
Binary files /dev/null and b/grub/themes/my-distro/icons/mate.png differ
diff --git a/grub/themes/my-distro/icons/memtest.png b/grub/themes/my-distro/icons/memtest.png
new file mode 100644
index 00000000..1621ee7f
Binary files /dev/null and b/grub/themes/my-distro/icons/memtest.png differ
diff --git a/grub/themes/my-distro/icons/mx-linux.png b/grub/themes/my-distro/icons/mx-linux.png
new file mode 100644
index 00000000..49f11336
Binary files /dev/null and b/grub/themes/my-distro/icons/mx-linux.png differ
diff --git a/grub/themes/my-distro/icons/neon.png b/grub/themes/my-distro/icons/neon.png
new file mode 100644
index 00000000..e41906e8
Binary files /dev/null and b/grub/themes/my-distro/icons/neon.png differ
diff --git a/grub/themes/my-distro/icons/opensuse.png b/grub/themes/my-distro/icons/opensuse.png
new file mode 100644
index 00000000..d844fd5a
Binary files /dev/null and b/grub/themes/my-distro/icons/opensuse.png differ
diff --git a/grub/themes/my-distro/icons/parrot.png b/grub/themes/my-distro/icons/parrot.png
new file mode 100644
index 00000000..3333de91
Binary files /dev/null and b/grub/themes/my-distro/icons/parrot.png differ
diff --git a/grub/themes/my-distro/icons/pop-os.png b/grub/themes/my-distro/icons/pop-os.png
new file mode 100644
index 00000000..014d9f32
Binary files /dev/null and b/grub/themes/my-distro/icons/pop-os.png differ
diff --git a/grub/themes/my-distro/icons/pop.png b/grub/themes/my-distro/icons/pop.png
new file mode 100644
index 00000000..014d9f32
Binary files /dev/null and b/grub/themes/my-distro/icons/pop.png differ
diff --git a/grub/themes/my-distro/icons/recovery.png b/grub/themes/my-distro/icons/recovery.png
new file mode 100644
index 00000000..7b69b142
Binary files /dev/null and b/grub/themes/my-distro/icons/recovery.png differ
diff --git a/grub/themes/my-distro/icons/regolith.png b/grub/themes/my-distro/icons/regolith.png
new file mode 100644
index 00000000..5ece07ba
Binary files /dev/null and b/grub/themes/my-distro/icons/regolith.png differ
diff --git a/grub/themes/my-distro/icons/restart.png b/grub/themes/my-distro/icons/restart.png
new file mode 100644
index 00000000..97153021
Binary files /dev/null and b/grub/themes/my-distro/icons/restart.png differ
diff --git a/grub/themes/my-distro/icons/rocky.png b/grub/themes/my-distro/icons/rocky.png
new file mode 100644
index 00000000..be144f6d
Binary files /dev/null and b/grub/themes/my-distro/icons/rocky.png differ
diff --git a/grub/themes/my-distro/icons/shutdown.png b/grub/themes/my-distro/icons/shutdown.png
new file mode 100644
index 00000000..fc9cf16b
Binary files /dev/null and b/grub/themes/my-distro/icons/shutdown.png differ
diff --git a/grub/themes/my-distro/icons/siduction.png b/grub/themes/my-distro/icons/siduction.png
new file mode 100644
index 00000000..d16549bc
Binary files /dev/null and b/grub/themes/my-distro/icons/siduction.png differ
diff --git a/grub/themes/my-distro/icons/slackware.png b/grub/themes/my-distro/icons/slackware.png
new file mode 100644
index 00000000..4c31a3f5
Binary files /dev/null and b/grub/themes/my-distro/icons/slackware.png differ
diff --git a/grub/themes/my-distro/icons/solus.png b/grub/themes/my-distro/icons/solus.png
new file mode 100644
index 00000000..338718b3
Binary files /dev/null and b/grub/themes/my-distro/icons/solus.png differ
diff --git a/grub/themes/my-distro/icons/steamos.png b/grub/themes/my-distro/icons/steamos.png
new file mode 100644
index 00000000..df28bccc
Binary files /dev/null and b/grub/themes/my-distro/icons/steamos.png differ
diff --git a/grub/themes/my-distro/icons/type.png b/grub/themes/my-distro/icons/type.png
new file mode 100644
index 00000000..5c48476d
Binary files /dev/null and b/grub/themes/my-distro/icons/type.png differ
diff --git a/grub/themes/my-distro/icons/tz.png b/grub/themes/my-distro/icons/tz.png
new file mode 100644
index 00000000..220b29b1
Binary files /dev/null and b/grub/themes/my-distro/icons/tz.png differ
diff --git a/grub/themes/my-distro/icons/ubuntu.png b/grub/themes/my-distro/icons/ubuntu.png
new file mode 100644
index 00000000..352fbe08
Binary files /dev/null and b/grub/themes/my-distro/icons/ubuntu.png differ
diff --git a/grub/themes/my-distro/icons/unknown.png b/grub/themes/my-distro/icons/unknown.png
new file mode 100644
index 00000000..326b6596
Binary files /dev/null and b/grub/themes/my-distro/icons/unknown.png differ
diff --git a/grub/themes/my-distro/icons/unset.png b/grub/themes/my-distro/icons/unset.png
new file mode 100644
index 00000000..15e3d3cb
Binary files /dev/null and b/grub/themes/my-distro/icons/unset.png differ
diff --git a/grub/themes/my-distro/icons/ventoy.png b/grub/themes/my-distro/icons/ventoy.png
new file mode 100644
index 00000000..7abdc6c4
Binary files /dev/null and b/grub/themes/my-distro/icons/ventoy.png differ
diff --git a/grub/themes/my-distro/icons/void.png b/grub/themes/my-distro/icons/void.png
new file mode 100644
index 00000000..01cc2f3a
Binary files /dev/null and b/grub/themes/my-distro/icons/void.png differ
diff --git a/grub/themes/my-distro/icons/windows.png b/grub/themes/my-distro/icons/windows.png
new file mode 100644
index 00000000..d5c7cc34
Binary files /dev/null and b/grub/themes/my-distro/icons/windows.png differ
diff --git a/grub/themes/my-distro/icons/windows11.png b/grub/themes/my-distro/icons/windows11.png
new file mode 100644
index 00000000..fe97d9f7
Binary files /dev/null and b/grub/themes/my-distro/icons/windows11.png differ
diff --git a/grub/themes/my-distro/icons/xero.png b/grub/themes/my-distro/icons/xero.png
new file mode 100644
index 00000000..2221c73d
Binary files /dev/null and b/grub/themes/my-distro/icons/xero.png differ
diff --git a/grub/themes/my-distro/icons/xerolinux.png b/grub/themes/my-distro/icons/xerolinux.png
new file mode 100644
index 00000000..2221c73d
Binary files /dev/null and b/grub/themes/my-distro/icons/xerolinux.png differ
diff --git a/grub/themes/my-distro/icons/xubuntu.png b/grub/themes/my-distro/icons/xubuntu.png
new file mode 100644
index 00000000..f43abc7b
Binary files /dev/null and b/grub/themes/my-distro/icons/xubuntu.png differ
diff --git a/grub/themes/my-distro/icons/zorin.png b/grub/themes/my-distro/icons/zorin.png
new file mode 100644
index 00000000..c1506c44
Binary files /dev/null and b/grub/themes/my-distro/icons/zorin.png differ
diff --git a/grub/themes/my-distro/select_c.png b/grub/themes/my-distro/select_c.png
new file mode 100644
index 00000000..b1f8d580
Binary files /dev/null and b/grub/themes/my-distro/select_c.png differ
diff --git a/grub/themes/my-distro/select_e.png b/grub/themes/my-distro/select_e.png
new file mode 100644
index 00000000..93323686
Binary files /dev/null and b/grub/themes/my-distro/select_e.png differ
diff --git a/grub/themes/my-distro/select_w.png b/grub/themes/my-distro/select_w.png
new file mode 100644
index 00000000..28f6424e
Binary files /dev/null and b/grub/themes/my-distro/select_w.png differ
diff --git a/grub/themes/my-distro/terminal_box_c.png b/grub/themes/my-distro/terminal_box_c.png
new file mode 100644
index 00000000..d0dd52a2
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_c.png differ
diff --git a/grub/themes/my-distro/terminal_box_e.png b/grub/themes/my-distro/terminal_box_e.png
new file mode 100644
index 00000000..394cbe4f
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_e.png differ
diff --git a/grub/themes/my-distro/terminal_box_n.png b/grub/themes/my-distro/terminal_box_n.png
new file mode 100644
index 00000000..476f8bc6
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_n.png differ
diff --git a/grub/themes/my-distro/terminal_box_ne.png b/grub/themes/my-distro/terminal_box_ne.png
new file mode 100644
index 00000000..9e26959b
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_ne.png differ
diff --git a/grub/themes/my-distro/terminal_box_nw.png b/grub/themes/my-distro/terminal_box_nw.png
new file mode 100644
index 00000000..5c3cba87
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_nw.png differ
diff --git a/grub/themes/my-distro/terminal_box_s.png b/grub/themes/my-distro/terminal_box_s.png
new file mode 100644
index 00000000..85a8901d
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_s.png differ
diff --git a/grub/themes/my-distro/terminal_box_se.png b/grub/themes/my-distro/terminal_box_se.png
new file mode 100644
index 00000000..d8627ee5
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_se.png differ
diff --git a/grub/themes/my-distro/terminal_box_sw.png b/grub/themes/my-distro/terminal_box_sw.png
new file mode 100644
index 00000000..67c600c8
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_sw.png differ
diff --git a/grub/themes/my-distro/terminal_box_w.png b/grub/themes/my-distro/terminal_box_w.png
new file mode 100644
index 00000000..d066e2db
Binary files /dev/null and b/grub/themes/my-distro/terminal_box_w.png differ
diff --git a/grub/themes/my-distro/terminus-12.pf2 b/grub/themes/my-distro/terminus-12.pf2
new file mode 100644
index 00000000..60920353
Binary files /dev/null and b/grub/themes/my-distro/terminus-12.pf2 differ
diff --git a/grub/themes/my-distro/terminus-14.pf2 b/grub/themes/my-distro/terminus-14.pf2
new file mode 100644
index 00000000..8ab8bd10
Binary files /dev/null and b/grub/themes/my-distro/terminus-14.pf2 differ
diff --git a/grub/themes/my-distro/terminus-16.pf2 b/grub/themes/my-distro/terminus-16.pf2
new file mode 100644
index 00000000..6e6b25d3
Binary files /dev/null and b/grub/themes/my-distro/terminus-16.pf2 differ
diff --git a/grub/themes/my-distro/terminus-18.pf2 b/grub/themes/my-distro/terminus-18.pf2
new file mode 100644
index 00000000..129cef14
Binary files /dev/null and b/grub/themes/my-distro/terminus-18.pf2 differ
diff --git a/grub/themes/my-distro/theme.txt b/grub/themes/my-distro/theme.txt
new file mode 100644
index 00000000..3f26eea5
--- /dev/null
+++ b/grub/themes/my-distro/theme.txt
@@ -0,0 +1,42 @@
+# Main options
+title-text: ""
+desktop-image: "background.png"
+desktop-color: "#000000"
+terminal-font: "Terminus Regular 14"
+terminal-box: "terminal_box_*.png"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+# Boot menu
++ boot_menu {
+  left = 15%
+  top = 40%
+  width = 60%
+  height = 65%
+  item_font = "Ubuntu Regular 20"
+  item_color = "#cccccc"
+  selected_item_color = "#ffffff"
+  icon_width = 36
+  icon_height = 36
+  item_icon_space = 20
+  item_height = 40
+  item_padding = 2
+  item_spacing = 10
+  selected_item_pixmap_style = "select_*.png"
+}
+
+
+# Countdown label
+# You can change the name of default starting OS here
++ label {
+  left = 15%
+  top = 31%
+  align = "center"
+  id = "__timeout__"
+  text = "My-distro will start in %d seconds"
+  color = "#cccccc"
+  font = "Ubuntu Regular 17"
+}
diff --git a/grub/themes/my-distro/ubuntu_regular_17.pf2 b/grub/themes/my-distro/ubuntu_regular_17.pf2
new file mode 100644
index 00000000..9405954e
Binary files /dev/null and b/grub/themes/my-distro/ubuntu_regular_17.pf2 differ
diff --git a/grub/themes/my-distro/ubuntu_regular_20.pf2 b/grub/themes/my-distro/ubuntu_regular_20.pf2
new file mode 100644
index 00000000..3d903bae
Binary files /dev/null and b/grub/themes/my-distro/ubuntu_regular_20.pf2 differ
diff --git a/packages32/calamares_3.2.57-2_i386.deb b/packages32/calamares_3.2.57-2_i386.deb
deleted file mode 100644
index 75b85fc9..00000000
Binary files a/packages32/calamares_3.2.57-2_i386.deb and /dev/null differ
diff --git a/packages32/calamares_3.2.61-1_i386.deb b/packages32/calamares_3.2.61-1_i386.deb
new file mode 100644
index 00000000..bbfc8b92
Binary files /dev/null and b/packages32/calamares_3.2.61-1_i386.deb differ
diff --git a/packages64/calamares_3.2.57-0_amd64.deb b/packages64/calamares_3.2.57-0_amd64.deb
deleted file mode 100644
index 3e6d95ff..00000000
Binary files a/packages64/calamares_3.2.57-0_amd64.deb and /dev/null differ
diff --git a/packages64/calamares_3.2.61-1.1_amd64.deb b/packages64/calamares_3.2.61-1.1_amd64.deb
new file mode 100644
index 00000000..5486e1fb
Binary files /dev/null and b/packages64/calamares_3.2.61-1.1_amd64.deb differ