diff --git a/kali-config/common/bootloaders/grub-pc/config.cfg b/kali-config/common/bootloaders/grub-pc/config.cfg
index 02e3e99..da16aa0 100644
--- a/kali-config/common/bootloaders/grub-pc/config.cfg
+++ b/kali-config/common/bootloaders/grub-pc/config.cfg
@@ -2,7 +2,6 @@
 set default=0
 
 loadfont $prefix/dejavu-bold-16.pf2
-loadfont $prefix/dejavu-bold-14.pf2
 loadfont $prefix/unicode.pf2
 set gfxmode=auto
 insmod all_video
diff --git a/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2 b/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2
deleted file mode 100644
index 9b093b2..0000000
Binary files a/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2 and /dev/null differ
diff --git a/kali-config/common/bootloaders/grub-pc/grub-theme.in b/kali-config/common/bootloaders/grub-pc/grub-theme.in
new file mode 100644
index 0000000..05b023c
--- /dev/null
+++ b/kali-config/common/bootloaders/grub-pc/grub-theme.in
@@ -0,0 +1,93 @@
+# Installer Image (UEFI boot)
+title-text: ""
+desktop-image: "../splash.png"
+desktop-color: "#2f5595"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
++ vbox {
+  top = 80
+  left = 65%
+  width = 30%
+  height = 100
+#ifdef MENU1
+  + hbox {
+    left = 0
+    + label {text = " >" font = "Sans 10" color = "white" align = "left"}
+    + label {text = MENU1 font = "Sans 10" color = "#c0c0c0" align = "left"}
+  }
+#endif
+#ifdef MENU2
+  + hbox {
+    left = 0
+    + label {text = "   >" font = "Sans 10" color = "white" align = "left"}
+    + label {text = MENU2 font = "Sans 10" color = "#c0c0c0" align = "left"}
+  }
+#endif
+#ifdef MENU3
+  + hbox {
+    left = 0
+    + label {text = "     >" font = "Sans 10" color = "white" align = "left"}
+    + label {text = MENU3 font = "Sans 10" color = "#c0c0c0" align = "left"}
+  }
+#endif
+#ifdef MENU4
+  + hbox {
+    left = 0
+    + label {text = "       >" font = "Sans 10" color = "white" align = "left"}
+    + label {text = MENU4 font = "Sans 10" color = "#c0c0c0" align = "left"}
+  }
+#endif
+}
+
++ label {
+  top = 39%-45
+  left = 0
+  width = 100%
+  height = 35
+  align = "center"
+  color = "#ffffff"
+  font = "DejaVu Sans Bold 16"
+  text = "Kali Linux installer menu (UEFI mode)"
+}
+
++ boot_menu {
+  left = 14%
+  width = 73%
+  top = 39%
+  height = 39%
+  item_color = "#f3f3f3"
+  selected_item_color = "#ffffff"
+  item_height = 36
+  item_padding = 0
+  item_spacing = 4
+  selected_item_pixmap_style = "select_*.png"
+}
+
++ vbox {
+  top = 100%-60
+  left = 14%
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "Enter: " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Select             " font = "Sans 10" color = "#c0c0c0" align = "left"}
+#ifdef MENU1
+    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Esc:   " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Back up one level  " font = "Sans 10" color = "#c0c0c0" align = "left"}
+#endif
+  }
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "E:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Edit Selection     " font = "Sans 10" color = "#c0c0c0" align = "left"}
+    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "C:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "GRUB Command line" font = "Sans 10" color = "#c0c0c0" align = "left"}
+  }
+}
diff --git a/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt b/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt
deleted file mode 100644
index d0ae137..0000000
--- a/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt
+++ /dev/null
@@ -1,64 +0,0 @@
-# Live Image (UEFI boot)
-desktop-image: "../splash.png"
-title-color: "#ffffff"
-title-font: "DejaVu Sans Bold 16"
-title-text: ""
-message-font: "Unifont Regular 16"
-terminal-font: "Unifont Regular 16"
-
-#help bar at the bottom
-+ label {
-        top = 100%-50
-        left = 0
-        width = 100%
-        height = 20
-        text = "@KEYMAP_SHORT@"
-        align = "center"
-        color = "#ffffff"
-        font = "DejaVu Sans Bold 14"
-}
-
-# Title in the middle box
-+ label {
-        top = 33%
-        left = 0
-        width = 100%
-        height = 35
-        align = "center"
-        color = "#ffffff"
-        text = "Kali Linux live menu (UEFI)"
-        font = "DejaVu Sans Bold 16"
-}
-
-#boot menu
-+ boot_menu {
-        left = 14%
-        width = 73%
-        top = 33%+40
-        height = 320
-        item_font = "Unifont Regular 16"
-        item_color = "#f3f3f3"
-        selected_item_color = "#ffffff"
-        icon_width = 0
-        icon_height = 0
-        item_icon_space = 10
-        item_height = 36
-        item_padding = 0
-        item_spacing = 4
-        selected_item_pixmap_style = "select_*.png"
-}
-
-#progress bar
-+ progress_bar {
-        id = "__timeout__"
-        left = 13%
-        top = 100%-80
-        height = 16
-        width = 74%
-        font = "DejaVu Sans Bold 14"
-        text_color = "#000000"
-        fg_color = "#ffffff"
-        bg_color = "#a8a8a8"
-        border_color = "#ffffff"
-        text = "@TIMEOUT_NOTIFICATION_LONG@"
-}
diff --git a/kali-config/common/bootloaders/grub-pc/theme.cfg b/kali-config/common/bootloaders/grub-pc/theme.cfg
index 12b0d82..9bac08a 100644
--- a/kali-config/common/bootloaders/grub-pc/theme.cfg
+++ b/kali-config/common/bootloaders/grub-pc/theme.cfg
@@ -1,13 +1,4 @@
 set color_normal=light-gray/black
 set color_highlight=white/black
 
-if [ -e /isolinux/splash.png ]; then
-    # binary_syslinux modifies the theme file to point to the correct
-    # background picture
-    set theme=/boot/grub/live-theme/theme.txt
-elif [ -e /boot/grub/splash.png ]; then
-    set theme=/boot/grub/live-theme/theme.txt
-else
-    set menu_color_normal=cyan/blue
-    set menu_color_highlight=white/blue
-fi
+set theme=/boot/grub/theme/theme.txt
diff --git a/kali-config/common/bootloaders/grub-pc/live-theme/select_c.png b/kali-config/common/bootloaders/grub-pc/theme/select_c.png
similarity index 100%
rename from kali-config/common/bootloaders/grub-pc/live-theme/select_c.png
rename to kali-config/common/bootloaders/grub-pc/theme/select_c.png
diff --git a/kali-config/common/bootloaders/grub-pc/live-theme/select_e.png b/kali-config/common/bootloaders/grub-pc/theme/select_e.png
similarity index 100%
rename from kali-config/common/bootloaders/grub-pc/live-theme/select_e.png
rename to kali-config/common/bootloaders/grub-pc/theme/select_e.png
diff --git a/kali-config/common/bootloaders/grub-pc/live-theme/select_w.png b/kali-config/common/bootloaders/grub-pc/theme/select_w.png
similarity index 100%
rename from kali-config/common/bootloaders/grub-pc/live-theme/select_w.png
rename to kali-config/common/bootloaders/grub-pc/theme/select_w.png
diff --git a/kali-config/common/bootloaders/grub-pc/theme/theme.txt b/kali-config/common/bootloaders/grub-pc/theme/theme.txt
new file mode 100644
index 0000000..2def5a4
--- /dev/null
+++ b/kali-config/common/bootloaders/grub-pc/theme/theme.txt
@@ -0,0 +1,93 @@
+# Live Image (UEFI boot)
+title-text: ""
+desktop-image: "../splash.png"
+desktop-color: "#2f5595"
+terminal-left: "0"
+terminal-top: "0"
+terminal-width: "100%"
+terminal-height: "100%"
+terminal-border: "0"
+
+#+ vbox {
+#  top = 80
+#  left = 65%
+#  width = 30%
+#  height = 100
+#ifdef MENU1
+#  + hbox {
+#    left = 0
+#    + label {text = " >" font = "Sans 10" color = "white" align = "left"}
+#    + label {text = MENU1 font = "Sans 10" color = "#c0c0c0" align = "left"}
+#  }
+#endif
+#ifdef MENU2
+#  + hbox {
+#    left = 0
+#    + label {text = "   >" font = "Sans 10" color = "white" align = "left"}
+#    + label {text = MENU2 font = "Sans 10" color = "#c0c0c0" align = "left"}
+#  }
+#endif
+#ifdef MENU3
+#  + hbox {
+#    left = 0
+#    + label {text = "     >" font = "Sans 10" color = "white" align = "left"}
+#    + label {text = MENU3 font = "Sans 10" color = "#c0c0c0" align = "left"}
+#  }
+#endif
+#ifdef MENU4
+#  + hbox {
+#    left = 0
+#    + label {text = "       >" font = "Sans 10" color = "white" align = "left"}
+#    + label {text = MENU4 font = "Sans 10" color = "#c0c0c0" align = "left"}
+#  }
+#endif
+#}
+
++ label {
+  top = 39%-45
+  left = 0
+  width = 100%
+  height = 35
+  align = "center"
+  color = "#ffffff"
+  font = "DejaVu Sans Bold 16"
+  text = "Kali Linux installer menu (UEFI mode)"
+}
+
++ boot_menu {
+  left = 14%
+  width = 73%
+  top = 39%
+  height = 39%
+  item_color = "#f3f3f3"
+  selected_item_color = "#ffffff"
+  item_height = 36
+  item_padding = 0
+  item_spacing = 4
+  selected_item_pixmap_style = "select_*.png"
+}
+
++ vbox {
+  top = 100%-60
+  left = 14%
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "Enter: " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Select             " font = "Sans 10" color = "#c0c0c0" align = "left"}
+#ifdef MENU1
+#    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+#    + label {text = "Esc:   " font = "Sans 10" color = "white" align = "left"}
+#    + label {text = "Back up one level  " font = "Sans 10" color = "#c0c0c0" align = "left"}
+#endif
+  }
+  + hbox {
+    top = 0
+    left = 20%
+    + label {text = "E:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "Edit Selection     " font = "Sans 10" color = "#c0c0c0" align = "left"}
+    + label {text = "           " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "C:     " font = "Sans 10" color = "white" align = "left"}
+    + label {text = "GRUB Command line" font = "Sans 10" color = "#c0c0c0" align = "left"}
+  }
+}