diff --git a/images/ConEmu.jpg b/images/ConEmu.jpg
index 891fa9c2..02370d62 100644
Binary files a/images/ConEmu.jpg and b/images/ConEmu.jpg differ
diff --git a/images/Linux.jpg b/images/Linux.jpg
index 710b22de..f4d1198e 100644
Binary files a/images/Linux.jpg and b/images/Linux.jpg differ
diff --git a/images/Pxelinux.jpg b/images/Pxelinux.jpg
deleted file mode 100644
index e29bae0c..00000000
Binary files a/images/Pxelinux.jpg and /dev/null differ
diff --git a/images/Syslinux.jpg b/images/Syslinux.jpg
index a25065cf..4fcd24fb 100644
Binary files a/images/Syslinux.jpg and b/images/Syslinux.jpg differ
diff --git a/images/WinPE.jpg b/images/WinPE.jpg
index d604fc2f..e84382fc 100644
Binary files a/images/WinPE.jpg and b/images/WinPE.jpg differ
diff --git a/images/macOS-10.11.jpg b/images/macOS-10.11.jpg
new file mode 100644
index 00000000..884822af
Binary files /dev/null and b/images/macOS-10.11.jpg differ
diff --git a/images/macOS-10.13.jpg b/images/macOS-10.13.jpg
new file mode 100644
index 00000000..55f50e75
Binary files /dev/null and b/images/macOS-10.13.jpg differ
diff --git a/images/macOS-10.15.jpg b/images/macOS-10.15.jpg
new file mode 100644
index 00000000..27835503
Binary files /dev/null and b/images/macOS-10.15.jpg differ
diff --git a/images/macOS.png b/images/macOS.png
deleted file mode 100644
index 64c1a1a5..00000000
Binary files a/images/macOS.png and /dev/null differ
diff --git a/images/rEFInd.jpg b/images/rEFInd.jpg
new file mode 100644
index 00000000..ce3055b8
Binary files /dev/null and b/images/rEFInd.jpg differ
diff --git a/images/rEFInd.png b/images/rEFInd.png
deleted file mode 100644
index cea6912e..00000000
Binary files a/images/rEFInd.png and /dev/null differ
diff --git a/setup/build_linux b/setup/build_linux
index 3576f265..c9ec25da 100755
--- a/setup/build_linux
+++ b/setup/build_linux
@@ -132,7 +132,7 @@ function update_live_env() {
   # Boot config (UEFI)
   mkdir -p "$PROFILE_DIR/EFI/boot"
   cp  "/usr/share/refind/refind_x64.efi" "$PROFILE_DIR/EFI/boot/bootx64.efi"
-  cp "$ROOT_DIR/images/rEFInd.png" "$PROFILE_DIR/EFI/boot/rEFInd.png"
+  cp "$ROOT_DIR/images/rEFInd.jpg" "$PROFILE_DIR/EFI/boot/rEFInd.jpg"
   rsync -aI "/usr/share/refind/drivers_x64/" "$PROFILE_DIR/EFI/boot/drivers_x64/"
   rsync -aI "/usr/share/refind/icons/" "$PROFILE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg"
   sed -i "s/%ARCHISO_LABEL%/${label}/" "$PROFILE_DIR/EFI/boot/refind.conf"
diff --git a/setup/linux/profile_base/EFI/boot/refind.conf b/setup/linux/profile_base/EFI/boot/refind.conf
index b2b1f04f..3dbc6a6b 100644
--- a/setup/linux/profile_base/EFI/boot/refind.conf
+++ b/setup/linux/profile_base/EFI/boot/refind.conf
@@ -8,7 +8,7 @@ csr_values 10,77
 #use_graphics_for osx,linux,windows
 
 # Theme
-banner rEFInd.png
+banner rEFInd.jpg
 banner_scale fillscreen
 selection_big selection_big.png
 selection_small selection_small.png
diff --git a/setup/macos/update-base-image b/setup/macos/update-base-image
index e6719b45..c06f69ec 100755
--- a/setup/macos/update-base-image
+++ b/setup/macos/update-base-image
@@ -105,10 +105,10 @@ ln -s /Volumes/RAM_Disk/Logs "${WK_PATH}/var/root/Logs"
 cp -a ../linux/profile_base/airootfs/etc/skel/.tmux.conf "${WK_PATH}/etc/tmux.conf"
 rsync -aS /usr/bin/{env,killall} "${WK_PATH}/usr/bin"/
 rsync -aS live-macos-startup ../../scripts/ "${WK_PATH}/usr/local/bin"/
-if [[ -f "../../images/macOS-${OS_VERSION:0:5}.png" ]]; then
-  cp -a "../../images/macOS-${OS_VERSION:0:5}.png" "${WK_PATH}/usr/local/wallpaper.png"
+if [[ -f "../../images/macOS-${OS_VERSION:0:5}.jpg" ]]; then
+  cp -a "../../images/macOS-${OS_VERSION:0:5}.jpg" "${WK_PATH}/usr/local/wallpaper.jpg"
 else
-  cp -a ../../images/macOS.png "${WK_PATH}/usr/local/wallpaper.png"
+  cp -a ../../images/macOS.jpg "${WK_PATH}/usr/local/wallpaper.jpg"
 fi
 
 # Unmount sparsebundle