diff --git a/scripts/makeiso-wl.sh b/scripts/makeiso-wl.sh
index 3670f99f2..1ed247c59 100755
--- a/scripts/makeiso-wl.sh
+++ b/scripts/makeiso-wl.sh
@@ -23,8 +23,8 @@ ROOTFS="$PWD/rootfs"
 [ -f $SCRIPTDIR/config ] && . $SCRIPTDIR/config
 
 MUST_PKG="wpa_supplicant os-prober grub"
-WAYLAND_PKG="xcb-util-cursor xcb-util-keysyms libxfont2 libxcvt libtirpc"
-MAIN_PKG="sudo alsa-utils dosfstools mtools gvfs fastfetch ffmpeg firefox nnn irssi htop pipewire wireplumber"
+WAYLAND_PKG="xcb-util-cursor xcb-util-keysyms libxfont2 libxcvt libtirpc xwayland"
+MAIN_PKG="sudo alsa-utils dosfstools mtools gvfs fastfetch firefox nnn irssi htop wireplumber pipewire"
 SWAY_PKG="nwg-shell"
 THEME_PKG="ttf-awesome ttf-mononoki"
 
diff --git a/virootfs/etc/skel/.bash_profile b/virootfs/etc/skel/.bash_profile
index 6e18dad8e..2e4741753 100644
--- a/virootfs/etc/skel/.bash_profile
+++ b/virootfs/etc/skel/.bash_profile
@@ -6,7 +6,8 @@ unset XDG_RUNTIME_DIR
 export XDG_RUNTIME_DIR=$(mktemp -d /tmp/$(id -u)-runtime-dir.XXX)
 
 # Autorun X11/Wayland session in TTY1
- if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
-   scratch isinstalled seatd && exec seatd-launch dbus-run-session sway 
-   scratch isinstalled xinit && exec startx                                                                           
+if [ -z "$DISPLAY" ] && [ "$(tty)" = "/dev/tty1" ]; then
+scratch isinstalled seatd && exec seatd-launch dbus-run-session sway
+scratch isinstalled xinit && exec startx                                                                           
 fi
+
diff --git a/virootfs/etc/skel/.bashrc b/virootfs/etc/skel/.bashrc
index 3b7bb5734..119d4b1b5 100644
--- a/virootfs/etc/skel/.bashrc
+++ b/virootfs/etc/skel/.bashrc
@@ -8,6 +8,10 @@ export LESS_TERMCAP_us=$'\e[1;4;31m'
 
 PS1="\n\[$(tput setaf 6)\][ \[$(tput setaf 7)\]\u \[$(tput setaf 6)\]] \[$(tput setaf 6)\][ \[$(tput setaf 5)\]\w \[$(tput setaf 6)\]]\n\[$(tput setaf 3)\]>>> \[$(tput sgr0)\]"
 
+if [ $(command -v fastfetch) ]; then
+	fastfetch
+fi
+
 if [ $(command -v neofetch) ]; then
 	neofetch
 fi
diff --git a/virootfs/etc/skel/.config/gtk-3.0/settings.ini b/virootfs/etc/skel/.config/gtk-3.0/settings.ini
index b698ccb86..552b78f9e 100644
--- a/virootfs/etc/skel/.config/gtk-3.0/settings.ini
+++ b/virootfs/etc/skel/.config/gtk-3.0/settings.ini
@@ -1,6 +1,6 @@
 [Settings]
-gtk-theme-name=Adwaita-dark
-gtk-icon-theme-name=Papirus-Dark
+gtk-theme-name=Adwaita
+gtk-icon-theme-name=Adwaita
 gtk-font-name=Cantarell 11
 gtk-cursor-theme-name=Adwaita
 gtk-cursor-theme-size=24
@@ -14,4 +14,4 @@ gtk-xft-antialias=1
 gtk-xft-hinting=1
 gtk-xft-hintstyle=hintfull
 gtk-xft-rgba=rgb
-gtk-application-prefer-dark-theme=0
+gtk-application-prefer-dark-theme=1
diff --git a/virootfs/etc/skel/Pictures/wallpaper2.jpg b/virootfs/etc/skel/Pictures/wallpaper2.jpg
index 67f0a197a..aa74d1b5b 100644
Binary files a/virootfs/etc/skel/Pictures/wallpaper2.jpg and b/virootfs/etc/skel/Pictures/wallpaper2.jpg differ
diff --git a/virootfs/etc/skel/Pictures/wallpaper3.jpg b/virootfs/etc/skel/Pictures/wallpaper3.jpg
deleted file mode 100644
index 3767fec8e..000000000
Binary files a/virootfs/etc/skel/Pictures/wallpaper3.jpg and /dev/null differ