diff --git a/system/boot/grub2/files/grub-defaults b/system/boot/grub2/files/grub-defaults
index e8551197..70ff93f4 100644
--- a/system/boot/grub2/files/grub-defaults
+++ b/system/boot/grub2/files/grub-defaults
@@ -1,7 +1,8 @@
-GRUB_DEFAULT=0
+GRUB_SAVEDEFAULT=true
+GRUB_DEFAULT=saved
 GRUB_TIMEOUT=10
 GRUB_DISTRIBUTOR="Pisilinux"
-GRUB_CMDLINE_LINUX_DEFAULT="quiet splash"
+GRUB_CMDLINE_LINUX_DEFAULT="splash quiet"
 #GRUB_CMDLINE_LINUX=""
 
 # Preload both GPT and MBR modules so that they are not missed
@@ -20,7 +21,7 @@ GRUB_TERMINAL_INPUT=console
 # The resolution used on graphical terminal
 # note that you can use only modes which your graphic card supports via VBE
 # you can see them in real GRUB with the command `vbeinfo'
-GRUB_GFXMODE=1024x768
+GRUB_GFXMODE=auto
 
 # Uncomment to allow the kernel use the same resolution used by grub
 GRUB_GFXPAYLOAD_LINUX=keep
@@ -38,18 +39,15 @@ GRUB_DISABLE_RECOVERY=true
 GRUB_COLOR_NORMAL="white/black"
 GRUB_COLOR_HIGHLIGHT="black/white"
 
-#GRUB_BACKGROUND="/usr/share/grub/pisi-grub-bg.png"
+#GRUB_BACKGROUND="/boot/grub2/pisi-grub-bg.png"
 
-#GRUB_FONT="/usr/share/grub/unicode.pf2"
+#GRUB_FONT="/boot/grub2/unicode.pf2"
 
 # Uncomment one of them for the gfx desired, a image background or a gfxtheme
 #GRUB_THEME="/path/to/gfxtheme"
 #Possible locations
 GRUB_THEME="/usr/share/grub/themes/pisilinux/theme.txt"
-#GRUB_THEME="/boot/grub/themes/Pisilinux-Bluez/theme.txt"
 # Uncomment to get a beep at GRUB start
 #GRUB_INIT_TUNE="480 440 1"
 
-#GRUB_SAVEDEFAULT="true"
-
-GRUB_DISABLE_OS_PROBER="false"
+GRUB_DISABLE_OS_PROBER=false