diff --git a/files_to_inject/boot/grub/grub.cfg b/files_to_inject/boot/grub/grub.cfg
index a29042e..179813c 100644
--- a/files_to_inject/boot/grub/grub.cfg
+++ b/files_to_inject/boot/grub/grub.cfg
@@ -1,4 +1,10 @@
-if loadfont $prefix/font.pf2 ; then
+if [ x$feature_default_font_path = xy ] ; then
+   font=unicode
+else
+   font=$prefix/font.pf2
+fi
+
+if loadfont $font ; then
   set gfxmode=800x600
   set gfxpayload=keep
   insmod efi_gop
@@ -13,6 +19,9 @@ fi
 if background_image /isolinux/splash.png; then
   set color_normal=light-gray/black
   set color_highlight=white/black
+elif background_image /splash.png; then
+  set color_normal=light-gray/black
+  set color_highlight=white/black
 else
   set menu_color_normal=cyan/blue
   set menu_color_highlight=white/blue