diff --git a/etc/gfx/amd b/etc/gfx/amd
index 84c1079..e3154ff 100644
--- a/etc/gfx/amd
+++ b/etc/gfx/amd
@@ -1,3 +1,3 @@
 packages() {
-	addpkg "xf86-video-amdgpu"
+	X11_MODULE="xf86-video-amdgpu"
 }
\ No newline at end of file
diff --git a/etc/gfx/intel b/etc/gfx/intel
index 95d7285..9c8bfff 100644
--- a/etc/gfx/intel
+++ b/etc/gfx/intel
@@ -1,3 +1,3 @@
 packages() {
-	addpkg "xf86-video-intel"
+	X11_MODULE="xf86-video-intel"
 }
\ No newline at end of file
diff --git a/etc/gfx/nvidia b/etc/gfx/nvidia
index 79aa1fd..3d1fe11 100644
--- a/etc/gfx/nvidia
+++ b/etc/gfx/nvidia
@@ -1,3 +1,3 @@
 packages() {
-	addpkg "nvidia"
+	X11_MODULE="nvidia"
 }
\ No newline at end of file
diff --git a/etc/profile/plasma b/etc/profile/plasma
index e76becd..c45de5b 100644
--- a/etc/profile/plasma
+++ b/etc/profile/plasma
@@ -1,5 +1,5 @@
 packages() {
-	addpkg "sddm" "kde5" "konsole"
+	addpkg sddm kde5 konsole dolphin kdeconnect okular spectacle kcalc kleopatra gwenview ark filelight 
 	need_xserver=1
 }
 
diff --git a/etc/soundsystem/pipewire b/etc/soundsystem/pipewire
index 14c48ab..388ccd9 100644
--- a/etc/soundsystem/pipewire
+++ b/etc/soundsystem/pipewire
@@ -4,4 +4,35 @@ packages() {
 
 config() {
 	enable_service alsa
+
+	echo "[Desktop Entry]" > /etc/xdg/autostart/pipewire-session.desktop
+	echo "Version=1.0" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Name=PipeWire Pulse" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Comment=Start the PipeWire Pulse" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Exec=/sbin/dbus-launch --exit-with-session /usr/bin/pipewire-pulse" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Terminal=false" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Type=Application" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "X-GNOME-Autostart-Phase=Initialization" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "X-KDE-autostart-phase=1" >> /etc/xdg/autostart/pipewire-session.desktop
+
+	echo "[Desktop Entry]" > /etc/xdg/autostart/pipewire-session.desktop
+	echo "Version=1.0" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Name=PipeWire Media Session" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Comment=Start the PipeWire Media Session" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Exec=/sbin/dbus-launch --exit-with-session /usr/bin/pipewire-media-session" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Terminal=false" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "Type=Application" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "X-GNOME-Autostart-Phase=Initialization" >> /etc/xdg/autostart/pipewire-session.desktop
+	echo "X-KDE-autostart-phase=1" >> /etc/xdg/autostart/pipewire-session.desktop
+
+	echo "[Desktop Entry]" > /etc/xdg/autostart/pipewire.desktop
+	echo "Version=1.0" >> /etc/xdg/autostart/pipewire.desktop
+	echo "Name=PipeWire Media System" >> /etc/xdg/autostart/pipewire.desktop
+	echo "Comment=Start the PipeWire Media System" >> /etc/xdg/autostart/pipewire.desktop
+	echo "Exec=/sbin/dbus-launch --exit-with-session /usr/bin/pipewire" >> /etc/xdg/autostart/pipewire.desktop
+	echo "Terminal=false" >> /etc/xdg/autostart/pipewire.desktop
+	echo "Type=Application" >> /etc/xdg/autostart/pipewire.desktop
+	echo "X-GNOME-Autostart-Phase=Initialization" >> /etc/xdg/autostart/pipewire.desktop
+	echo "X-KDE-autostart-phase=1" >> /etc/xdg/autostart/pipewire.desktop
+
 }
\ No newline at end of file
diff --git a/etc/xserver/x11 b/etc/xserver/x11
index 6445ab1..0220bef 100644
--- a/etc/xserver/x11
+++ b/etc/xserver/x11
@@ -1,14 +1,15 @@
 packages() {
-	addpkg xorg-minimal xorg-apps dbus
+	addpkg xorg-minimal xorg-apps xorg-fonts dbus "${X11_MODULE}"
 	addpkg "firefox-i18n-${LANGUAGE}"
 	addpkg libreoffice-writer libreoffice-calc "libreoffice-i18n-${LANGUAGE}"
     addpkg "thunderbird-i18n-${LANGUAGE}"
     addpkg element-desktop
+    addpkg vlc yt-dlp
 }
 
 config() {
 	enable_service dbus
-	ln -s /usr/share/fontconfig/conf.avail/70-no-bitmaps.conf "${dest}"/etc/fonts/conf.d/
+	ln -s /usr/share/fontconfig/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d/
 
 	if [ "$LANGUAGE" == "de" ]; then
         mkdir -p /etc/X11/xorg.conf.d
@@ -20,4 +21,5 @@ config() {
         echo "  #Option \"XkbOptions\" \"grp:alt_shift_toggle\"";
         echo "EndSection"; } > /etc/X11/xorg.conf.d/10-keyboard.conf
     fi
+    ln -s /usr/bin/yt-dlp /usr/local/bin/youtube-dl
 }
\ No newline at end of file
diff --git a/main.sh b/main.sh
index 1fa4caf..0c99794 100644
--- a/main.sh
+++ b/main.sh
@@ -198,12 +198,12 @@ profile() {
 		packages
 		reset packages
 		cp "./etc/profile/${PROFILE}" "${tmp_target}"
-		if [ "${need_xserver}" == "1" ]; then
-			readin xserver
-		fi
 		if [ "${need_gfx}" == "1" ]; then
 			readin gfx
 		fi
+		if [ "${need_xserver}" == "1" ]; then
+			readin xserver
+		fi
 		if [ "${need_sound}" == "1" ]; then
 			readin soundsystem
 		fi