diff --git a/bootloaders/boot/grub/splash.png b/bootloaders/boot/grub/splash.png
deleted file mode 100644
index afbe78d0..00000000
Binary files a/bootloaders/boot/grub/splash.png and /dev/null differ
diff --git a/bootloaders/boot/grub/splash.png b/bootloaders/boot/grub/splash.png
new file mode 120000
index 00000000..66d99feb
--- /dev/null
+++ b/bootloaders/boot/grub/splash.png
@@ -0,0 +1 @@
+../../isolinux/splash800x60.png
\ No newline at end of file
diff --git a/bootloaders/boot/grub/theme.cfg b/bootloaders/boot/grub/theme.cfg
index 56e4c18f..fb4d5ef7 100644
--- a/bootloaders/boot/grub/theme.cfg
+++ b/bootloaders/boot/grub/theme.cfg
@@ -8,6 +8,6 @@ if [ -e /isolinux/splash.png ]; then
 elif [ -e /boot/grub/splash.png ]; then
     set theme=/boot/grub/live-theme/theme.txt
 else
-    set menu_color_normal=white/red
-    set menu_color_highlight=white/red
+    set menu_color_normal=cyan/blue
+    set menu_color_highlight=white/blue
 fi
diff --git a/bootloaders/isolinux/splash800x60.png b/bootloaders/isolinux/splash800x60.png
new file mode 100644
index 00000000..2a187a7d
Binary files /dev/null and b/bootloaders/isolinux/splash800x60.png differ
diff --git a/calamares/modules/mount.conf b/calamares/modules/mount.conf
index b22676f1..5bc886d2 100644
--- a/calamares/modules/mount.conf
+++ b/calamares/modules/mount.conf
@@ -21,12 +21,12 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: bind
+
+extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
 
-btrfsSwapSubvol: /@swap
-
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@
diff --git a/my-distro-devuan-32-pae/calamares/modules/mount.conf b/my-distro-devuan-32-pae/calamares/modules/mount.conf
index b22676f1..5bc886d2 100644
--- a/my-distro-devuan-32-pae/calamares/modules/mount.conf
+++ b/my-distro-devuan-32-pae/calamares/modules/mount.conf
@@ -21,12 +21,12 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: bind
+
+extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
 
-btrfsSwapSubvol: /@swap
-
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@
diff --git a/my-distro-devuan-32/bootloaders/boot/grub/splash.png b/my-distro-devuan-32/bootloaders/boot/grub/splash.png
deleted file mode 100644
index 59b84691..00000000
Binary files a/my-distro-devuan-32/bootloaders/boot/grub/splash.png and /dev/null differ
diff --git a/my-distro-devuan-32/bootloaders/boot/grub/splash.png b/my-distro-devuan-32/bootloaders/boot/grub/splash.png
new file mode 120000
index 00000000..66d99feb
--- /dev/null
+++ b/my-distro-devuan-32/bootloaders/boot/grub/splash.png
@@ -0,0 +1 @@
+../../isolinux/splash800x60.png
\ No newline at end of file
diff --git a/my-distro-devuan-32/bootloaders/isolinux/splash800x60.png b/my-distro-devuan-32/bootloaders/isolinux/splash800x60.png
new file mode 100644
index 00000000..d3fc4752
Binary files /dev/null and b/my-distro-devuan-32/bootloaders/isolinux/splash800x60.png differ
diff --git a/my-distro-devuan-32/calamares/modules/mount.conf b/my-distro-devuan-32/calamares/modules/mount.conf
index b22676f1..5bc886d2 100644
--- a/my-distro-devuan-32/calamares/modules/mount.conf
+++ b/my-distro-devuan-32/calamares/modules/mount.conf
@@ -21,12 +21,12 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: bind
+
+extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
 
-btrfsSwapSubvol: /@swap
-
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@
diff --git a/my-distro-devuan-64/calamares/modules/mount.conf b/my-distro-devuan-64/calamares/modules/mount.conf
index b22676f1..5bc886d2 100644
--- a/my-distro-devuan-64/calamares/modules/mount.conf
+++ b/my-distro-devuan-64/calamares/modules/mount.conf
@@ -21,12 +21,12 @@ extraMounts:
     - device: /run/udev
       mountPoint: /run/udev
       options: bind
+
+extraMountsEfi:
     - device: efivarfs
       fs: efivarfs
       mountPoint: /sys/firmware/efi/efivars
 
-btrfsSwapSubvol: /@swap
-
 btrfsSubvolumes:
     - mountPoint: /
       subvolume: /@