diff --git a/.bin/ConEmu/ConEmu.xml b/.bin/ConEmu/ConEmu.xml index 3a00062b..871995cc 100644 --- a/.bin/ConEmu/ConEmu.xml +++ b/.bin/ConEmu/ConEmu.xml @@ -139,7 +139,7 @@ - + diff --git a/.linux_items/include/EFI/boot/refind.conf b/.linux_items/include/EFI/boot/refind.conf index 34a638c1..5c25c306 100644 --- a/.linux_items/include/EFI/boot/refind.conf +++ b/.linux_items/include/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/.linux_items/include/syslinux/wk_head.cfg b/.linux_items/include/syslinux/wk_head.cfg index d2f1ee9f..2d57c98b 100644 --- a/.linux_items/include/syslinux/wk_head.cfg +++ b/.linux_items/include/syslinux/wk_head.cfg @@ -1,7 +1,7 @@ SERIAL 0 38400 UI boot/syslinux/vesamenu.c32 MENU TITLE _______ -MENU BACKGROUND syslinux.png +MENU BACKGROUND syslinux.jpg MENU WIDTH 80 MENU MARGIN 10 diff --git a/.linux_items/include/syslinux/wk_pxe.cfg b/.linux_items/include/syslinux/wk_pxe.cfg index 10112666..20bdf3dd 100644 --- a/.linux_items/include/syslinux/wk_pxe.cfg +++ b/.linux_items/include/syslinux/wk_pxe.cfg @@ -1,5 +1,5 @@ INCLUDE boot/syslinux/wk_head.cfg -MENU BACKGROUND pxelinux.png +MENU BACKGROUND pxelinux.jpg INCLUDE boot/syslinux/wk_pxe_linux.cfg #UFD-WINPE#INCLUDE boot/syslinux/wk_pxe_winpe.cfg diff --git a/.linux_items/include_x/airootfs/etc/skel/.Xresources b/.linux_items/include_x/airootfs/etc/skel/.Xresources index 7c20626f..d659b735 100755 --- a/.linux_items/include_x/airootfs/etc/skel/.Xresources +++ b/.linux_items/include_x/airootfs/etc/skel/.Xresources @@ -23,7 +23,7 @@ URxvt*externalBorder: 0 !URxvt.colorUL: #87afd7 URxvt.geometry: 92x16 URxvt.internalBorder: 8 -URxvt.shading: 12 +URxvt.shading: 10 URxvt.transparent: true ! Base16 Isotope diff --git a/Build Kit.cmd b/Build Kit.cmd index 58272a45..982c90c8 100644 --- a/Build Kit.cmd +++ b/Build Kit.cmd @@ -14,7 +14,7 @@ robocopy /e .bin OUT_KIT\.bin robocopy /e .cbin OUT_KIT\.cbin copy LICENSE.txt OUT_KIT\LICENSE.txt copy README.md OUT_KIT\README.md -copy Images\ConEmu.png OUT_KIT\.bin\ConEmu\ +copy Images\ConEmu.jpg OUT_KIT\.bin\ConEmu\ mkdir OUT_KIT\.cbin >nul 2>&1 attrib +h OUT_KIT\.bin >nul 2>&1 attrib +h OUT_KIT\.cbin >nul 2>&1 diff --git a/Build Linux b/Build Linux index 980c2e77..f4e9a380 100755 --- a/Build Linux +++ b/Build Linux @@ -115,7 +115,7 @@ function copy_live_env() { rmdir "$LIVE_DIR/airootfs/etc/udev/rules.d" --ignore-fail-on-non-empty rmdir "$LIVE_DIR/airootfs/etc/udev" --ignore-fail-on-non-empty rm "$LIVE_DIR/isolinux"/*.cfg - rm "$LIVE_DIR/syslinux"/*.cfg "$LIVE_DIR/syslinux"/*.png + rm "$LIVE_DIR/syslinux"/*.cfg "$LIVE_DIR/syslinux"/*.jpg "$LIVE_DIR/syslinux"/*.png # Add items rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/" @@ -155,8 +155,8 @@ function update_live_env() { # Boot config (legacy) mkdir -p "$LIVE_DIR/arch" - cp "$ROOT_DIR/Images/Pxelinux.png" "$LIVE_DIR/arch/pxelinux.png" - cp "$ROOT_DIR/Images/Syslinux.png" "$LIVE_DIR/arch/syslinux.png" + cp "$ROOT_DIR/Images/Pxelinux.jpg" "$LIVE_DIR/arch/pxelinux.jpg" + cp "$ROOT_DIR/Images/Syslinux.jpg" "$LIVE_DIR/arch/syslinux.jpg" sed -i -r "s/_+/$KIT_NAME_FULL/" "$LIVE_DIR/syslinux/wk_head.cfg" mkdir -p "$TEMP_DIR" 2>/dev/null curl -Lo "$TEMP_DIR/wimboot.zip" "http://git.ipxe.org/releases/wimboot/wimboot-latest.zip" @@ -165,7 +165,7 @@ function update_live_env() { # Boot config (UEFI) mkdir -p "$LIVE_DIR/EFI/boot" cp "/usr/share/refind/refind_x64.efi" "$LIVE_DIR/EFI/boot/bootx64.efi" - cp "$ROOT_DIR/Images/rEFInd.png" "$LIVE_DIR/EFI/boot/rEFInd.png" + cp "$ROOT_DIR/Images/rEFInd.jpg" "$LIVE_DIR/EFI/boot/rEFInd.jpg" rsync -aI "/usr/share/refind/drivers_x64/" "$LIVE_DIR/EFI/boot/drivers_x64/" rsync -aI "/usr/share/refind/icons/" "$LIVE_DIR/EFI/boot/icons/" --exclude "/usr/share/refind/icons/svg" sed -i "s/%ARCHISO_LABEL%/${label}/" "$LIVE_DIR/EFI/boot/refind.conf" @@ -279,7 +279,7 @@ function update_live_env() { # Wallpaper mkdir -p "$LIVE_DIR/airootfs/usr/share/wallpaper" - cp "$ROOT_DIR/Images/Linux.png" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in" + cp "$ROOT_DIR/Images/Linux.jpg" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in" fi # WiFi diff --git a/Images/ConEmu.jpg b/Images/ConEmu.jpg new file mode 100644 index 00000000..14f9a7a9 Binary files /dev/null and b/Images/ConEmu.jpg differ diff --git a/Images/ConEmu.png b/Images/ConEmu.png deleted file mode 100644 index c5bdb72e..00000000 Binary files a/Images/ConEmu.png and /dev/null differ diff --git a/Images/Linux.jpg b/Images/Linux.jpg new file mode 100644 index 00000000..92d2778d Binary files /dev/null and b/Images/Linux.jpg differ diff --git a/Images/Linux.png b/Images/Linux.png deleted file mode 100644 index 7fcf0056..00000000 Binary files a/Images/Linux.png and /dev/null differ diff --git a/Images/Pxelinux.jpg b/Images/Pxelinux.jpg new file mode 100644 index 00000000..1247bff9 Binary files /dev/null and b/Images/Pxelinux.jpg differ diff --git a/Images/Pxelinux.png b/Images/Pxelinux.png deleted file mode 100644 index f3a6a6d9..00000000 Binary files a/Images/Pxelinux.png and /dev/null differ diff --git a/Images/Syslinux.jpg b/Images/Syslinux.jpg new file mode 100644 index 00000000..1247bff9 Binary files /dev/null and b/Images/Syslinux.jpg differ diff --git a/Images/Syslinux.png b/Images/Syslinux.png deleted file mode 100644 index de82aa33..00000000 Binary files a/Images/Syslinux.png and /dev/null differ diff --git a/Images/WinPE.jpg b/Images/WinPE.jpg index 5bc27ca2..5ad51d84 100644 Binary files a/Images/WinPE.jpg and b/Images/WinPE.jpg differ diff --git a/Images/rEFInd.jpg b/Images/rEFInd.jpg new file mode 100644 index 00000000..740e24d6 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 7e8e2fe5..00000000 Binary files a/Images/rEFInd.png and /dev/null differ