diff --git a/config/binary b/config/binary
index 850cfb4..c9d1700 100644
--- a/config/binary
+++ b/config/binary
@@ -19,7 +19,10 @@ LB_BOOTAPPEND_INSTALL=""
# $LB_BOOTAPPEND_LIVE_FAILSAFE: set boot parameters
# (Default: empty)
-LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
+# noautologin should be added here, because it does not work the standard way
+# NOTE: grub-efi have the following values hard-coded because of a bug in live-build
+# See config/bootloaders/grub-pc/grub.cfg
+LB_BOOTAPPEND_LIVE_FAILSAFE="boot=live components noautologin memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal"
# $LB_BOOTLOADERS: set bootloaders
# (Default: syslinux,grub-efi)
diff --git a/config/bootloaders/grub-pc/dejavu-bold-14.pf2 b/config/bootloaders/grub-pc/dejavu-bold-14.pf2
new file mode 100644
index 0000000..9b093b2
Binary files /dev/null and b/config/bootloaders/grub-pc/dejavu-bold-14.pf2 differ
diff --git a/config/bootloaders/grub-pc/dejavu-bold-16.pf2 b/config/bootloaders/grub-pc/dejavu-bold-16.pf2
new file mode 100644
index 0000000..11e7f7a
Binary files /dev/null and b/config/bootloaders/grub-pc/dejavu-bold-16.pf2 differ
diff --git a/config/bootloaders/grub-pc/grub.cfg b/config/bootloaders/grub-pc/grub.cfg
new file mode 100644
index 0000000..8f8064f
--- /dev/null
+++ b/config/bootloaders/grub-pc/grub.cfg
@@ -0,0 +1,65 @@
+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 timeout=30
+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
+
+menuentry "Debian Admin CD" {
+ linux KERNEL_LIVE APPEND_LIVE
+ initrd INITRD_LIVE
+}
+
+menuentry "Debian Admin CD With SSH Server" {
+ linux KERNEL_LIVE APPEND_LIVE withssh
+ initrd INITRD_LIVE
+}
+
+# Substituting LB_BOOTAPPEND_LIVE_FAILSAFE does not work, because live-build
+# (binary_grub_cfg https://salsa.debian.org/live-team/live-build/-/blob/master/scripts/build/binary_grub_cfg#L247)
+# Substitutes the middle part because of the backward compatibility
+# This also causes @@-wrapped values failing to substitute
+# A bug report should be submitted to live-team...
+
+menuentry "Debian Admin CD Failsafe" {
+ linux KERNEL_LIVE boot=live components noautologin memtest noapic noapm nodma nomce nolapic nomodeset nosmp nosplash vga=normal
+ initrd INITRD_LIVE
+}
+
+submenu 'Tools' {
+
+# Installer (if any)
+LINUX_INSTALL
+
+# More installer entries (if any)
+LINUX_ADVANCED_INSTALL
+
+# Memtest (if any)
+MEMTEST
+
+}
diff --git a/config/bootloaders/grub-pc/live-theme/theme.txt b/config/bootloaders/grub-pc/live-theme/theme.txt
new file mode 100644
index 0000000..4ceef4b
--- /dev/null
+++ b/config/bootloaders/grub-pc/live-theme/theme.txt
@@ -0,0 +1,51 @@
+desktop-image: "../splash.png"
+title-color: "#ffffff"
+title-font: "DejaVu Sans Bold 16"
+title-text: "Live Boot Menu with GRUB"
+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"
+}
+
+#boot menu
++ boot_menu {
+ left = 10%
+ width = 80%
+ top = 52%
+ height = 48%-80
+ 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 = 15%
+ top = 100%-80
+ height = 16
+ width = 70%
+ font = "DejaVu Sans Regular 14"
+ text_color = "#000000"
+ fg_color = "#ffffff"
+ bg_color = "#a8a8a8"
+ border_color = "#ffffff"
+ text = "@TIMEOUT_NOTIFICATION_LONG@"
+}
diff --git a/config/bootloaders/isolinux/hdt.c32 b/config/bootloaders/isolinux/hdt.c32
new file mode 120000
index 0000000..f84c641
--- /dev/null
+++ b/config/bootloaders/isolinux/hdt.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/install.cfg b/config/bootloaders/isolinux/install.cfg
new file mode 100644
index 0000000..e71862a
--- /dev/null
+++ b/config/bootloaders/isolinux/install.cfg
@@ -0,0 +1,11 @@
+label install
+ menu label ^Debian Installer
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
+
+label installgui
+ menu label ^Debian Graphical installer
+ linux /install/gtk/vmlinuz
+ initrd /install/gtk/initrd.gz
+ append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/config/bootloaders/isolinux/isolinux.bin b/config/bootloaders/isolinux/isolinux.bin
new file mode 120000
index 0000000..33a2ad6
--- /dev/null
+++ b/config/bootloaders/isolinux/isolinux.bin
@@ -0,0 +1 @@
+/usr/lib/ISOLINUX/isolinux.bin
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/isolinux.cfg b/config/bootloaders/isolinux/isolinux.cfg
new file mode 100644
index 0000000..92c9e70
--- /dev/null
+++ b/config/bootloaders/isolinux/isolinux.cfg
@@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 300
diff --git a/config/bootloaders/isolinux/ldlinux.c32 b/config/bootloaders/isolinux/ldlinux.c32
new file mode 120000
index 0000000..df554c7
--- /dev/null
+++ b/config/bootloaders/isolinux/ldlinux.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libcom32.c32 b/config/bootloaders/isolinux/libcom32.c32
new file mode 120000
index 0000000..44ab36b
--- /dev/null
+++ b/config/bootloaders/isolinux/libcom32.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libgpl.c32 b/config/bootloaders/isolinux/libgpl.c32
new file mode 120000
index 0000000..81c83fb
--- /dev/null
+++ b/config/bootloaders/isolinux/libgpl.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libgpl.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libmenu.c32 b/config/bootloaders/isolinux/libmenu.c32
new file mode 120000
index 0000000..2491ff9
--- /dev/null
+++ b/config/bootloaders/isolinux/libmenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libmenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/libutil.c32 b/config/bootloaders/isolinux/libutil.c32
new file mode 120000
index 0000000..478194e
--- /dev/null
+++ b/config/bootloaders/isolinux/libutil.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/config/bootloaders/isolinux/live.cfg.in b/config/bootloaders/isolinux/live.cfg.in
new file mode 100644
index 0000000..181625c
--- /dev/null
+++ b/config/bootloaders/isolinux/live.cfg.in
@@ -0,0 +1,18 @@
+label live-@FLAVOUR@
+ menu label ^Debian Admin CD
+ menu default
+ linux @LINUX@
+ initrd @INITRD@
+ append @APPEND_LIVE@
+
+label live-@FLAVOUR@-ssh
+ menu label ^Debian Admin CD with SSH server
+ linux @LINUX@
+ initrd @INITRD@
+ append @APPEND_LIVE@ withssh
+
+label live-@FLAVOUR@-failsafe
+ menu label ^Debian Admin CD Failsafe
+ linux @LINUX@
+ initrd @INITRD@
+ append @APPEND_LIVE_FAILSAFE@
diff --git a/config/bootloaders/isolinux/menu.cfg b/config/bootloaders/isolinux/menu.cfg
new file mode 100644
index 0000000..98f16aa
--- /dev/null
+++ b/config/bootloaders/isolinux/menu.cfg
@@ -0,0 +1,17 @@
+menu hshift 0
+menu width 82
+
+menu title Boot menu
+include stdmenu.cfg
+include live.cfg
+menu begin tools
+ menu title Tools
+ include stdmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include install.cfg
+ include tools.cfg
+menu end
+
+menu clear
diff --git a/config/bootloaders/isolinux/splash.svg b/config/bootloaders/isolinux/splash.svg
new file mode 100644
index 0000000..63c41b1
--- /dev/null
+++ b/config/bootloaders/isolinux/splash.svg
@@ -0,0 +1,360 @@
+
+
+
+
diff --git a/config/bootloaders/isolinux/stdmenu.cfg b/config/bootloaders/isolinux/stdmenu.cfg
new file mode 100644
index 0000000..8e4b256
--- /dev/null
+++ b/config/bootloaders/isolinux/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background splash.png
+menu color title * #FFFFFFFF *
+menu color border * #00000000 #00000000 none
+menu color sel * #ffffffff #76a1d0ff *
+menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg * #ffffffff #00000000 *
+menu color help 37;40 #ffdddd00 #00000000 none
+menu vshift 14
+menu rows 10
+menu helpmsgrow 13
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 14
+menu timeoutrow 14
+menu tabmsgrow 16
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/config/bootloaders/isolinux/tools.cfg b/config/bootloaders/isolinux/tools.cfg
new file mode 100644
index 0000000..373451a
--- /dev/null
+++ b/config/bootloaders/isolinux/tools.cfg
@@ -0,0 +1,7 @@
+label hdt
+ menu label ^Hardware Detection Tool (HDT)
+ com32 hdt.c32
+
+label memtest
+ menu label ^Memory Diagnostic Tool (memtest86+)
+ linux /live/memtest
diff --git a/config/bootloaders/isolinux/vesamenu.c32 b/config/bootloaders/isolinux/vesamenu.c32
new file mode 120000
index 0000000..84e2eff
--- /dev/null
+++ b/config/bootloaders/isolinux/vesamenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/hdt.c32 b/config/bootloaders/syslinux/hdt.c32
new file mode 120000
index 0000000..f84c641
--- /dev/null
+++ b/config/bootloaders/syslinux/hdt.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/hdt.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/install.cfg b/config/bootloaders/syslinux/install.cfg
new file mode 100644
index 0000000..e71862a
--- /dev/null
+++ b/config/bootloaders/syslinux/install.cfg
@@ -0,0 +1,11 @@
+label install
+ menu label ^Debian Installer
+ linux /install/vmlinuz
+ initrd /install/initrd.gz
+ append vga=788 @APPEND_INSTALL@ --- quiet
+
+label installgui
+ menu label ^Debian Graphical installer
+ linux /install/gtk/vmlinuz
+ initrd /install/gtk/initrd.gz
+ append video=vesa:ywrap,mtrr vga=788 @APPEND_INSTALL@ --- quiet
diff --git a/config/bootloaders/syslinux/ldlinux.c32 b/config/bootloaders/syslinux/ldlinux.c32
new file mode 120000
index 0000000..df554c7
--- /dev/null
+++ b/config/bootloaders/syslinux/ldlinux.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/ldlinux.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libcom32.c32 b/config/bootloaders/syslinux/libcom32.c32
new file mode 120000
index 0000000..44ab36b
--- /dev/null
+++ b/config/bootloaders/syslinux/libcom32.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libcom32.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libgpl.c32 b/config/bootloaders/syslinux/libgpl.c32
new file mode 120000
index 0000000..81c83fb
--- /dev/null
+++ b/config/bootloaders/syslinux/libgpl.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libgpl.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libmenu.c32 b/config/bootloaders/syslinux/libmenu.c32
new file mode 120000
index 0000000..2491ff9
--- /dev/null
+++ b/config/bootloaders/syslinux/libmenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libmenu.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/libutil.c32 b/config/bootloaders/syslinux/libutil.c32
new file mode 120000
index 0000000..478194e
--- /dev/null
+++ b/config/bootloaders/syslinux/libutil.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/libutil.c32
\ No newline at end of file
diff --git a/config/bootloaders/syslinux/live.cfg.in b/config/bootloaders/syslinux/live.cfg.in
new file mode 100644
index 0000000..181625c
--- /dev/null
+++ b/config/bootloaders/syslinux/live.cfg.in
@@ -0,0 +1,18 @@
+label live-@FLAVOUR@
+ menu label ^Debian Admin CD
+ menu default
+ linux @LINUX@
+ initrd @INITRD@
+ append @APPEND_LIVE@
+
+label live-@FLAVOUR@-ssh
+ menu label ^Debian Admin CD with SSH server
+ linux @LINUX@
+ initrd @INITRD@
+ append @APPEND_LIVE@ withssh
+
+label live-@FLAVOUR@-failsafe
+ menu label ^Debian Admin CD Failsafe
+ linux @LINUX@
+ initrd @INITRD@
+ append @APPEND_LIVE_FAILSAFE@
diff --git a/config/bootloaders/syslinux/menu.cfg b/config/bootloaders/syslinux/menu.cfg
new file mode 100644
index 0000000..98f16aa
--- /dev/null
+++ b/config/bootloaders/syslinux/menu.cfg
@@ -0,0 +1,17 @@
+menu hshift 0
+menu width 82
+
+menu title Boot menu
+include stdmenu.cfg
+include live.cfg
+menu begin tools
+ menu title Tools
+ include stdmenu.cfg
+ label mainmenu
+ menu label ^Back..
+ menu exit
+ include install.cfg
+ include tools.cfg
+menu end
+
+menu clear
diff --git a/config/bootloaders/syslinux/splash.svg b/config/bootloaders/syslinux/splash.svg
new file mode 100644
index 0000000..63c41b1
--- /dev/null
+++ b/config/bootloaders/syslinux/splash.svg
@@ -0,0 +1,360 @@
+
+
+
+
diff --git a/config/bootloaders/syslinux/stdmenu.cfg b/config/bootloaders/syslinux/stdmenu.cfg
new file mode 100644
index 0000000..8e4b256
--- /dev/null
+++ b/config/bootloaders/syslinux/stdmenu.cfg
@@ -0,0 +1,15 @@
+menu background splash.png
+menu color title * #FFFFFFFF *
+menu color border * #00000000 #00000000 none
+menu color sel * #ffffffff #76a1d0ff *
+menu color hotsel 1;7;37;40 #ffffffff #76a1d0ff *
+menu color tabmsg * #ffffffff #00000000 *
+menu color help 37;40 #ffdddd00 #00000000 none
+menu vshift 14
+menu rows 10
+menu helpmsgrow 13
+# The command line must be at least one line from the bottom.
+menu cmdlinerow 14
+menu timeoutrow 14
+menu tabmsgrow 16
+menu tabmsg Press ENTER to boot or TAB to edit a menu entry
diff --git a/config/bootloaders/syslinux/syslinux.cfg b/config/bootloaders/syslinux/syslinux.cfg
new file mode 100644
index 0000000..92c9e70
--- /dev/null
+++ b/config/bootloaders/syslinux/syslinux.cfg
@@ -0,0 +1,4 @@
+include menu.cfg
+default vesamenu.c32
+prompt 0
+timeout 300
diff --git a/config/bootloaders/syslinux/tools.cfg b/config/bootloaders/syslinux/tools.cfg
new file mode 100644
index 0000000..373451a
--- /dev/null
+++ b/config/bootloaders/syslinux/tools.cfg
@@ -0,0 +1,7 @@
+label hdt
+ menu label ^Hardware Detection Tool (HDT)
+ com32 hdt.c32
+
+label memtest
+ menu label ^Memory Diagnostic Tool (memtest86+)
+ linux /live/memtest
diff --git a/config/bootloaders/syslinux/vesamenu.c32 b/config/bootloaders/syslinux/vesamenu.c32
new file mode 120000
index 0000000..84e2eff
--- /dev/null
+++ b/config/bootloaders/syslinux/vesamenu.c32
@@ -0,0 +1 @@
+/usr/lib/syslinux/modules/bios/vesamenu.c32
\ No newline at end of file