diff --git a/config/bootloaders/grub-pc/grub.cfg b/config/bootloaders/grub-pc/grub.cfg
index bdd468c..66c30ea 100644
--- a/config/bootloaders/grub-pc/grub.cfg
+++ b/config/bootloaders/grub-pc/grub.cfg
@@ -1,4 +1,4 @@
-set default=0
+set default=defaultboot
 set timeout=5
 
 loadfont $prefix/dejavu-bold-16.pf2
@@ -35,7 +35,7 @@ menuentry "Live system " {
     initrd INITRD_LIVE
 }
 
-menuentry "Live system (ToRam)" {
+menuentry "Live system (ToRam)" --id defaultboot {
     echo "Loading ${1}... Please wait...".
     linux KERNEL_LIVE APPEND_LIVE toram locales=en_US.UTF-8
     initrd INITRD_LIVE
diff --git a/config/bootloaders/grub-pc/live-theme/theme.txt b/config/bootloaders/grub-pc/live-theme/theme.txt
index 04597d3..6e2c7af 100644
--- a/config/bootloaders/grub-pc/live-theme/theme.txt
+++ b/config/bootloaders/grub-pc/live-theme/theme.txt
@@ -1,7 +1,7 @@
 desktop-image: "../splash.png"
 title-color: "#ffffff"
 title-font: "DejaVu Sans Bold 16"
-title-text: "Gui-minimal-testing"
+title-text: "ISO-Main"
 message-font: "Unifont Regular 16"
 terminal-font: "Unifont Regular 16"
 
diff --git a/config/bootloaders/isolinux/menu.cfg b/config/bootloaders/isolinux/menu.cfg
index a501d09..33bc70b 100644
--- a/config/bootloaders/isolinux/menu.cfg
+++ b/config/bootloaders/isolinux/menu.cfg
@@ -2,18 +2,18 @@ timeout 100
 menu hshift 0
 menu width 82
 
-menu title Gui-minimal-testing
+menu title ISO-Main
 include stdmenu.cfg
 
 label live
         menu label ^Live system
-        menu default
         linux /live/vmlinuz
         initrd /live/initrd.img
         append boot=live config locales=en_US.UTF-8
 
 label live-ram
         menu label ^Live system (ToRam)
+        menu default
         linux /live/vmlinuz
         initrd /live/initrd.img
         append boot=live config toram locales=en_US.UTF-8