diff --git a/auto/config b/auto/config
index 0f37bfe..6e8f3b8 100755
--- a/auto/config
+++ b/auto/config
@@ -4,7 +4,7 @@ set -e
 set -o pipefail # Bashism
 
 # You can put local mirrors here if you want
-kali_mirror=http://archive.kali.org/kali
+kali_mirror=http://192.168.1.4:9999/kali
 
 ### DO NOT EDIT THE REST OF THIS FILE ###
 
@@ -121,7 +121,8 @@ lb config noauto \
 	--iso-volume "Kali Live" \
 	--linux-packages linux-image \
 	--memtest memtest86 \
-	--bootappend-live "boot=live username=root hostname=kali" \
+	--bootappend-live "boot=live components splash username=root hostname=kali" \
+	--bootappend-live-failsafe "boot=live components username=root hostname=kali memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal" \
 	--security false \
 	$lb_opts \
 	"$@"
diff --git a/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2 b/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2
new file mode 100644
index 0000000..9b093b2
Binary files /dev/null and b/kali-config/common/bootloaders/grub-pc/dejavu-bold-14.pf2 differ
diff --git a/kali-config/common/bootloaders/grub-pc/dejavu-bold-16.pf2 b/kali-config/common/bootloaders/grub-pc/dejavu-bold-16.pf2
new file mode 100644
index 0000000..11e7f7a
Binary files /dev/null and b/kali-config/common/bootloaders/grub-pc/dejavu-bold-16.pf2 differ
diff --git a/kali-config/common/bootloaders/grub-pc/grub.cfg b/kali-config/common/bootloaders/grub-pc/grub.cfg
new file mode 100644
index 0000000..d9bfb74
--- /dev/null
+++ b/kali-config/common/bootloaders/grub-pc/grub.cfg
@@ -0,0 +1,62 @@
+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
+insmod gfxterm
+insmod png
+
+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
+
+terminal_output gfxterm
+
+insmod play
+play 960 440 1 0 4 440 1
+
+# Live boot
+LINUX_LIVE
+
+menuentry "Live system (forensic mode)" {
+	linux KERNEL_LIVE APPEND_LIVE noswap noautomount
+	initrd INITRD_LIVE
+}
+menuentry "Live system (persistence, check kali.org/prst)" {
+	linux KERNEL_LIVE APPEND_LIVE persistence
+	initrd INITRD_LIVE
+}
+menuentry "Live system (encrypted persistence, check kali.org/prst)" {
+	linux KERNEL_LIVE APPEND_LIVE persistent=cryptsetup persistence-encryption=luks persistence
+	initrd INITRD_LIVE
+}
+
+# Installer (if any)
+LINUX_INSTALL
+
+menuentry "Start installer with speech synthesis" {
+	linux KERNEL_GI speakup.synth=soft APPEND_GI 
+	initrd INITRD_GI
+}
+
+submenu 'Advanced options...' {
+
+# More installer entries (if any)
+LINUX_ADVANCED_INSTALL
+
+# Memtest (if any)
+MEMTEST
+
+}
diff --git a/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt b/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt
new file mode 100644
index 0000000..28fcc75
--- /dev/null
+++ b/kali-config/common/bootloaders/grub-pc/live-theme/theme.txt
@@ -0,0 +1,63 @@
+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 = 38%
+        left = 0
+        width = 100%
+        height = 35
+        align = "center"
+        color = "#ffffff"
+        text = "Kali Linux Live Boot Menu"
+        font = "DejaVu Sans Bold 16"
+}
+
+#boot menu
++ boot_menu {
+        left = 13%
+        width = 74%
+        top = 38%+35
+        height = 170
+        item_color = "#a8a8a8"
+        item_font = "DejaVu Sans Bold 14"
+        selected_item_color= "#ffffff"
+        selected_item_font = "DejaVu Sans Bold 14"
+        item_height = 16
+        item_padding = 0
+        item_spacing = 4
+        icon_width = 0
+        icon_heigh = 0
+        item_icon_space = 0
+}
+
+#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/splash.png b/kali-config/common/bootloaders/grub-pc/splash.png
new file mode 100644
index 0000000..5c1d704
Binary files /dev/null and b/kali-config/common/bootloaders/grub-pc/splash.png differ