diff --git a/build-lite.sh b/build-lite.sh
index b14f859a..7b504377 100755
--- a/build-lite.sh
+++ b/build-lite.sh
@@ -204,7 +204,6 @@ mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/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
@@ -215,7 +214,7 @@ 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/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
-cp $build/grub/grub $build/build/config/includes.chroot/etc/default
+cp $build/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
@@ -225,7 +224,6 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
-cp -r $build/grub/vimix $build/build/config/includes.chroot/boot/grub/themes
 
 
 # Build the ISO #
diff --git a/build.sh b/build.sh
index d32e4fcd..26e0da43 100755
--- a/build.sh
+++ b/build.sh
@@ -229,8 +229,6 @@ mkdir -p $build/build/config/includes.chroot/usr/sbin
 mkdir -p $build/build/config/includes.chroot/etc/lightdm
 mkdir -p $build/build/config/includes.chroot/usr/share/pixmaps
 mkdir -p $build/build/config/includes.chroot/etc/default
-mkdir -p $build/build/config/includes.chroot/etc/default
-mkdir -p $build/build/config/includes.chroot/boot/grub/themes
 
 
 # Copy Configs to the chroot
@@ -241,7 +239,7 @@ 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/bootloader-config/* $build/build/config/includes.chroot/usr/sbin
-cp $build/grub/grub $build/build/config/includes.chroot/etc/default
+cp $build/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
@@ -251,7 +249,6 @@ cp -r $build/configs/* $build/build/config/includes.chroot/etc/
 cp -r $build/icons/* $build/build/config/includes.chroot/usr/share/icons
 cp -r $build/themes/* $build/build/config/includes.chroot/usr/share/themes
 cp -r $build/packages/* $build/build/config/packages.chroot
-cp -r $build/grub/vimix $build/build/config/includes.chroot/boot/grub/themes
 
 
 
diff --git a/grub/grub b/grub/grub
index 8704101f..be7cbd64 100755
--- a/grub/grub
+++ b/grub/grub
@@ -32,4 +32,4 @@ GRUB_GFXMODE=1440x900
 #GRUB_INIT_TUNE="480 440 1"
 
 #Grub theme
-GRUB_THEME="/boot/grub/themes/vimix/theme.txt"
+#GRUB_THEME=""
diff --git a/grub/vimix/background.jpg b/grub/vimix/background.jpg
deleted file mode 100644
index 3227fe42..00000000
Binary files a/grub/vimix/background.jpg and /dev/null differ
diff --git a/grub/vimix/dejavu_32.pf2 b/grub/vimix/dejavu_32.pf2
deleted file mode 100644
index ab25446a..00000000
Binary files a/grub/vimix/dejavu_32.pf2 and /dev/null differ
diff --git a/grub/vimix/dejavu_sans_12.pf2 b/grub/vimix/dejavu_sans_12.pf2
deleted file mode 100644
index 19e04993..00000000
Binary files a/grub/vimix/dejavu_sans_12.pf2 and /dev/null differ
diff --git a/grub/vimix/dejavu_sans_14.pf2 b/grub/vimix/dejavu_sans_14.pf2
deleted file mode 100644
index dcc727e1..00000000
Binary files a/grub/vimix/dejavu_sans_14.pf2 and /dev/null differ
diff --git a/grub/vimix/dejavu_sans_16.pf2 b/grub/vimix/dejavu_sans_16.pf2
deleted file mode 100644
index 37f3ef42..00000000
Binary files a/grub/vimix/dejavu_sans_16.pf2 and /dev/null differ
diff --git a/grub/vimix/dejavu_sans_24.pf2 b/grub/vimix/dejavu_sans_24.pf2
deleted file mode 100644
index 8c3e4340..00000000
Binary files a/grub/vimix/dejavu_sans_24.pf2 and /dev/null differ
diff --git a/grub/vimix/dejavu_sans_48.pf2 b/grub/vimix/dejavu_sans_48.pf2
deleted file mode 100644
index 776c9822..00000000
Binary files a/grub/vimix/dejavu_sans_48.pf2 and /dev/null differ
diff --git a/grub/vimix/icons/Manjaro.i686.png b/grub/vimix/icons/Manjaro.i686.png
deleted file mode 100644
index 79643c4b..00000000
Binary files a/grub/vimix/icons/Manjaro.i686.png and /dev/null differ
diff --git a/grub/vimix/icons/Manjaro.x86_64.png b/grub/vimix/icons/Manjaro.x86_64.png
deleted file mode 100644
index 79643c4b..00000000
Binary files a/grub/vimix/icons/Manjaro.x86_64.png and /dev/null differ
diff --git a/grub/vimix/icons/antergos.png b/grub/vimix/icons/antergos.png
deleted file mode 100644
index f388d80f..00000000
Binary files a/grub/vimix/icons/antergos.png and /dev/null differ
diff --git a/grub/vimix/icons/arch.png b/grub/vimix/icons/arch.png
deleted file mode 100644
index a86a1623..00000000
Binary files a/grub/vimix/icons/arch.png and /dev/null differ
diff --git a/grub/vimix/icons/archlinux.png b/grub/vimix/icons/archlinux.png
deleted file mode 100644
index a86a1623..00000000
Binary files a/grub/vimix/icons/archlinux.png and /dev/null differ
diff --git a/grub/vimix/icons/arcolinux.png b/grub/vimix/icons/arcolinux.png
deleted file mode 100644
index 213090a0..00000000
Binary files a/grub/vimix/icons/arcolinux.png and /dev/null differ
diff --git a/grub/vimix/icons/cancel.png b/grub/vimix/icons/cancel.png
deleted file mode 100644
index c352c9ac..00000000
Binary files a/grub/vimix/icons/cancel.png and /dev/null differ
diff --git a/grub/vimix/icons/chakra.png b/grub/vimix/icons/chakra.png
deleted file mode 100644
index 940053ab..00000000
Binary files a/grub/vimix/icons/chakra.png and /dev/null differ
diff --git a/grub/vimix/icons/debian.png b/grub/vimix/icons/debian.png
deleted file mode 100644
index 4f503c17..00000000
Binary files a/grub/vimix/icons/debian.png and /dev/null differ
diff --git a/grub/vimix/icons/deepin.png b/grub/vimix/icons/deepin.png
deleted file mode 100644
index a0607e10..00000000
Binary files a/grub/vimix/icons/deepin.png and /dev/null differ
diff --git a/grub/vimix/icons/devuan.png b/grub/vimix/icons/devuan.png
deleted file mode 100644
index a3490a1a..00000000
Binary files a/grub/vimix/icons/devuan.png and /dev/null differ
diff --git a/grub/vimix/icons/driver.png b/grub/vimix/icons/driver.png
deleted file mode 100644
index db8a364e..00000000
Binary files a/grub/vimix/icons/driver.png and /dev/null differ
diff --git a/grub/vimix/icons/edit.png b/grub/vimix/icons/edit.png
deleted file mode 100644
index 2109dc49..00000000
Binary files a/grub/vimix/icons/edit.png and /dev/null differ
diff --git a/grub/vimix/icons/efi.png b/grub/vimix/icons/efi.png
deleted file mode 100644
index 1085045b..00000000
Binary files a/grub/vimix/icons/efi.png and /dev/null differ
diff --git a/grub/vimix/icons/elementary.png b/grub/vimix/icons/elementary.png
deleted file mode 100644
index 4543a922..00000000
Binary files a/grub/vimix/icons/elementary.png and /dev/null differ
diff --git a/grub/vimix/icons/endeavouros.png b/grub/vimix/icons/endeavouros.png
deleted file mode 100644
index 3d45b998..00000000
Binary files a/grub/vimix/icons/endeavouros.png and /dev/null differ
diff --git a/grub/vimix/icons/fedora.png b/grub/vimix/icons/fedora.png
deleted file mode 100644
index b06e6e70..00000000
Binary files a/grub/vimix/icons/fedora.png and /dev/null differ
diff --git a/grub/vimix/icons/find.efi.png b/grub/vimix/icons/find.efi.png
deleted file mode 100644
index b06454dd..00000000
Binary files a/grub/vimix/icons/find.efi.png and /dev/null differ
diff --git a/grub/vimix/icons/find.none.png b/grub/vimix/icons/find.none.png
deleted file mode 100644
index 3c91e940..00000000
Binary files a/grub/vimix/icons/find.none.png and /dev/null differ
diff --git a/grub/vimix/icons/gentoo.png b/grub/vimix/icons/gentoo.png
deleted file mode 100644
index 9fe51770..00000000
Binary files a/grub/vimix/icons/gentoo.png and /dev/null differ
diff --git a/grub/vimix/icons/gnu-linux.png b/grub/vimix/icons/gnu-linux.png
deleted file mode 100644
index c36f9605..00000000
Binary files a/grub/vimix/icons/gnu-linux.png and /dev/null differ
diff --git a/grub/vimix/icons/help.png b/grub/vimix/icons/help.png
deleted file mode 100644
index 11356dbe..00000000
Binary files a/grub/vimix/icons/help.png and /dev/null differ
diff --git a/grub/vimix/icons/kali.png b/grub/vimix/icons/kali.png
deleted file mode 100644
index 141bfeed..00000000
Binary files a/grub/vimix/icons/kali.png and /dev/null differ
diff --git a/grub/vimix/icons/kaos.png b/grub/vimix/icons/kaos.png
deleted file mode 100644
index 54395120..00000000
Binary files a/grub/vimix/icons/kaos.png and /dev/null differ
diff --git a/grub/vimix/icons/kbd.png b/grub/vimix/icons/kbd.png
deleted file mode 100644
index 5e177f78..00000000
Binary files a/grub/vimix/icons/kbd.png and /dev/null differ
diff --git a/grub/vimix/icons/korora.png b/grub/vimix/icons/korora.png
deleted file mode 100644
index d1469408..00000000
Binary files a/grub/vimix/icons/korora.png and /dev/null differ
diff --git a/grub/vimix/icons/kubuntu.png b/grub/vimix/icons/kubuntu.png
deleted file mode 100644
index 1a4230e6..00000000
Binary files a/grub/vimix/icons/kubuntu.png and /dev/null differ
diff --git a/grub/vimix/icons/lang.png b/grub/vimix/icons/lang.png
deleted file mode 100644
index 8051692d..00000000
Binary files a/grub/vimix/icons/lang.png and /dev/null differ
diff --git a/grub/vimix/icons/lfs.png b/grub/vimix/icons/lfs.png
deleted file mode 100644
index c36f9605..00000000
Binary files a/grub/vimix/icons/lfs.png and /dev/null differ
diff --git a/grub/vimix/icons/linux.png b/grub/vimix/icons/linux.png
deleted file mode 100644
index c36f9605..00000000
Binary files a/grub/vimix/icons/linux.png and /dev/null differ
diff --git a/grub/vimix/icons/linuxmint.png b/grub/vimix/icons/linuxmint.png
deleted file mode 100644
index 0db20100..00000000
Binary files a/grub/vimix/icons/linuxmint.png and /dev/null differ
diff --git a/grub/vimix/icons/lubuntu.png b/grub/vimix/icons/lubuntu.png
deleted file mode 100644
index effcd055..00000000
Binary files a/grub/vimix/icons/lubuntu.png and /dev/null differ
diff --git a/grub/vimix/icons/macosx.png b/grub/vimix/icons/macosx.png
deleted file mode 100644
index 68ff1057..00000000
Binary files a/grub/vimix/icons/macosx.png and /dev/null differ
diff --git a/grub/vimix/icons/mageia.png b/grub/vimix/icons/mageia.png
deleted file mode 100644
index 5133b975..00000000
Binary files a/grub/vimix/icons/mageia.png and /dev/null differ
diff --git a/grub/vimix/icons/manjaro.png b/grub/vimix/icons/manjaro.png
deleted file mode 100644
index 79643c4b..00000000
Binary files a/grub/vimix/icons/manjaro.png and /dev/null differ
diff --git a/grub/vimix/icons/memtest.png b/grub/vimix/icons/memtest.png
deleted file mode 100644
index db8a364e..00000000
Binary files a/grub/vimix/icons/memtest.png and /dev/null differ
diff --git a/grub/vimix/icons/opensuse.png b/grub/vimix/icons/opensuse.png
deleted file mode 100644
index 3ac99e0c..00000000
Binary files a/grub/vimix/icons/opensuse.png and /dev/null differ
diff --git a/grub/vimix/icons/pop-os.png b/grub/vimix/icons/pop-os.png
deleted file mode 100644
index cef4e1b1..00000000
Binary files a/grub/vimix/icons/pop-os.png and /dev/null differ
diff --git a/grub/vimix/icons/recovery.png b/grub/vimix/icons/recovery.png
deleted file mode 100644
index 259131a7..00000000
Binary files a/grub/vimix/icons/recovery.png and /dev/null differ
diff --git a/grub/vimix/icons/restart.png b/grub/vimix/icons/restart.png
deleted file mode 100644
index 15ba3d6e..00000000
Binary files a/grub/vimix/icons/restart.png and /dev/null differ
diff --git a/grub/vimix/icons/shutdown.png b/grub/vimix/icons/shutdown.png
deleted file mode 100644
index 10a9488b..00000000
Binary files a/grub/vimix/icons/shutdown.png and /dev/null differ
diff --git a/grub/vimix/icons/siduction.png b/grub/vimix/icons/siduction.png
deleted file mode 100644
index 5e4cdafd..00000000
Binary files a/grub/vimix/icons/siduction.png and /dev/null differ
diff --git a/grub/vimix/icons/solus.png b/grub/vimix/icons/solus.png
deleted file mode 100644
index c91e6b5d..00000000
Binary files a/grub/vimix/icons/solus.png and /dev/null differ
diff --git a/grub/vimix/icons/steamos.png b/grub/vimix/icons/steamos.png
deleted file mode 100644
index 23011cdf..00000000
Binary files a/grub/vimix/icons/steamos.png and /dev/null differ
diff --git a/grub/vimix/icons/type.png b/grub/vimix/icons/type.png
deleted file mode 100644
index 6e497dee..00000000
Binary files a/grub/vimix/icons/type.png and /dev/null differ
diff --git a/grub/vimix/icons/tz.png b/grub/vimix/icons/tz.png
deleted file mode 100644
index bd5ce0ae..00000000
Binary files a/grub/vimix/icons/tz.png and /dev/null differ
diff --git a/grub/vimix/icons/ubuntu.png b/grub/vimix/icons/ubuntu.png
deleted file mode 100644
index 761defac..00000000
Binary files a/grub/vimix/icons/ubuntu.png and /dev/null differ
diff --git a/grub/vimix/icons/unknown.png b/grub/vimix/icons/unknown.png
deleted file mode 100644
index c36f9605..00000000
Binary files a/grub/vimix/icons/unknown.png and /dev/null differ
diff --git a/grub/vimix/icons/unset.png b/grub/vimix/icons/unset.png
deleted file mode 100644
index 675cdf05..00000000
Binary files a/grub/vimix/icons/unset.png and /dev/null differ
diff --git a/grub/vimix/icons/void.png b/grub/vimix/icons/void.png
deleted file mode 100644
index 91ec9345..00000000
Binary files a/grub/vimix/icons/void.png and /dev/null differ
diff --git a/grub/vimix/icons/windows.png b/grub/vimix/icons/windows.png
deleted file mode 100644
index 0998c59f..00000000
Binary files a/grub/vimix/icons/windows.png and /dev/null differ
diff --git a/grub/vimix/icons/xubuntu.png b/grub/vimix/icons/xubuntu.png
deleted file mode 100644
index d592ee17..00000000
Binary files a/grub/vimix/icons/xubuntu.png and /dev/null differ
diff --git a/grub/vimix/select_c.png b/grub/vimix/select_c.png
deleted file mode 100644
index b1f8d580..00000000
Binary files a/grub/vimix/select_c.png and /dev/null differ
diff --git a/grub/vimix/select_e.png b/grub/vimix/select_e.png
deleted file mode 100644
index 93323686..00000000
Binary files a/grub/vimix/select_e.png and /dev/null differ
diff --git a/grub/vimix/select_w.png b/grub/vimix/select_w.png
deleted file mode 100644
index 28f6424e..00000000
Binary files a/grub/vimix/select_w.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_c.png b/grub/vimix/terminal_box_c.png
deleted file mode 100644
index d0dd52a2..00000000
Binary files a/grub/vimix/terminal_box_c.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_e.png b/grub/vimix/terminal_box_e.png
deleted file mode 100644
index 394cbe4f..00000000
Binary files a/grub/vimix/terminal_box_e.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_n.png b/grub/vimix/terminal_box_n.png
deleted file mode 100644
index 476f8bc6..00000000
Binary files a/grub/vimix/terminal_box_n.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_ne.png b/grub/vimix/terminal_box_ne.png
deleted file mode 100644
index 9e26959b..00000000
Binary files a/grub/vimix/terminal_box_ne.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_nw.png b/grub/vimix/terminal_box_nw.png
deleted file mode 100644
index 5c3cba87..00000000
Binary files a/grub/vimix/terminal_box_nw.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_s.png b/grub/vimix/terminal_box_s.png
deleted file mode 100644
index 85a8901d..00000000
Binary files a/grub/vimix/terminal_box_s.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_se.png b/grub/vimix/terminal_box_se.png
deleted file mode 100644
index d8627ee5..00000000
Binary files a/grub/vimix/terminal_box_se.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_sw.png b/grub/vimix/terminal_box_sw.png
deleted file mode 100644
index 67c600c8..00000000
Binary files a/grub/vimix/terminal_box_sw.png and /dev/null differ
diff --git a/grub/vimix/terminal_box_w.png b/grub/vimix/terminal_box_w.png
deleted file mode 100644
index d066e2db..00000000
Binary files a/grub/vimix/terminal_box_w.png and /dev/null differ
diff --git a/grub/vimix/terminus-12.pf2 b/grub/vimix/terminus-12.pf2
deleted file mode 100644
index 60920353..00000000
Binary files a/grub/vimix/terminus-12.pf2 and /dev/null differ
diff --git a/grub/vimix/terminus-14.pf2 b/grub/vimix/terminus-14.pf2
deleted file mode 100644
index 8ab8bd10..00000000
Binary files a/grub/vimix/terminus-14.pf2 and /dev/null differ
diff --git a/grub/vimix/terminus-16.pf2 b/grub/vimix/terminus-16.pf2
deleted file mode 100644
index 6e6b25d3..00000000
Binary files a/grub/vimix/terminus-16.pf2 and /dev/null differ
diff --git a/grub/vimix/terminus-18.pf2 b/grub/vimix/terminus-18.pf2
deleted file mode 100644
index 129cef14..00000000
Binary files a/grub/vimix/terminus-18.pf2 and /dev/null differ
diff --git a/grub/vimix/theme.txt b/grub/vimix/theme.txt
deleted file mode 100644
index b2fafabc..00000000
--- a/grub/vimix/theme.txt
+++ /dev/null
@@ -1,44 +0,0 @@
-# GRUB2 gfxmenu Linux theme
-# Designed for any resolution
-
-# Global Property
-title-text: ""
-desktop-image: "background.jpg"
-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"
-
-# Show the boot menu
-+ boot_menu {
-  left = 30%
-  top = 30%
-  width = 45%
-  height = 60%
-  item_font = "Unifont Regular 16"
-  item_color = "#cccccc"
-  selected_item_color = "#ffffff"
-  icon_width = 32
-  icon_height = 32
-  item_icon_space = 20
-  item_height = 36
-  item_padding = 5
-  item_spacing = 10
-  selected_item_pixmap_style = "select_*.png"
-}
-
-# Show a countdown message using the label component
-+ label {
-  top = 82%
-  left = 32%
-  width = 30%
-  align = "center"
-  id = "__timeout__"
-  text = "Booting in %d seconds"
-  color = "#cccccc"
-  font = "Unifont Regular 16"
-}