diff --git a/gentoo-kde.sh b/gentoo-kde.sh
index 009bf82..c49aa62 100644
--- a/gentoo-kde.sh
+++ b/gentoo-kde.sh
@@ -354,12 +354,22 @@ services() {
 	for i in "${SERVICES[@]}"; do
 		systemctl enable --now $i
 	done
+}
+
+desktop() {
+	services
+}
+
+pipewire() {
+	echo
+	echo
+	echo "[Configuring PipeWire for $USER]"
 	#Required for Audio to work
 	systemctl --user enable --now pipewire.socket pipewire-pulse.socket wireplumber.service
 	systemctl --user enable --now pipewire.service
-}
-desktop() {
-	services
+	echo "Done"
+	echo
+	echo
 }
 
 hibernate() {
@@ -462,9 +472,11 @@ initialize-disk() {
 	echo "Initialize Complete. Please reboot your machine to avoid any issues"
 	echo
 }
+
 wifi() {
 	iwctl --passphrase $WIRELESS_PASSWORD station $WIRELESS_INTERFACE connect $SSID
 }
+
 show-help() {
 	clear
 	echo
@@ -477,6 +489,7 @@ show-help() {
 	echo "./gentoo-kde.sh btrfs-tweaks"
 	echo
 }
+
 tweaks() {
 	clear
 	echo
@@ -487,10 +500,10 @@ tweaks() {
 	echo "[3] Compile the Kernel"
 	echo "[4] Upgrade gentoo-kde.sh"
 	echo "[5] Upgrade OS and take Snapshot"
-	echo "[6] Initialize Disk"
-	echo "[7] Remove old Snapshots"
-	echo "[8] Install Steam"
-	echo "[9] Configure Hibernation"
+	echo "[6] Remove old Snapshots"
+	echo "[7] Install Steam"
+	echo "[8] Configure Hibernation"
+	echo "[9] Enable Pipewire for $USER"
 	echo
 	echo "Press enter to turn to the Main Menu"
 	echo
@@ -517,21 +530,15 @@ tweaks() {
 		wget $BASE_URL/$(cat latest-stage3-amd64-desktop-systemd-mergedusr.txt | grep tar.xz | tail -1 | cut -d '.' -f1-3 | cut -d '"' -f2 | cut -d ' ' -f1) -O /tmp/stage3.tar.xz
 	elif [[ $choice = 5 ]]; then
 		upgrade-system
+
 	elif [[ $choice = 6 ]]; then
-		clear
-		echo "[Initialize Disk]"
-		echo
-		echo
-		set-devices
-		initialize-disk
-		read -p "Press enter key to Continue"
-		menu
-	elif [[ $choice = 7 ]]; then
 		remove-snapshots
-	elif [[ $choice = 8 ]]; then
+	elif [[ $choice = 7 ]]; then
 		installSteam
-	elif [[ $choice = 9 ]]; then
+	elif [[ $choice = 8 ]]; then
 		hibernate
+	elif [[ $choice = 9 ]]; then
+		pipewire
 	else
 		menu
 	fi
@@ -573,35 +580,41 @@ menu() {
 	echo
 	echo "[Welcome to the Poster.place Gentoo Installer System]"
 	echo
-	echo "[1] Setup Disk"
-	echo "[2] Download Gentoo Installation Files"
-	echo "[3] Install System"
-	echo "[4] Automatic Install"
-	echo "[5] Backup"
-	echo "[6] Restore"
+	echo "[0] Initialize Disk"
+	echo "[1] Download Gentoo Stage3 and Mount Partitions"
+	echo "[2] Install System"
+	echo "[3] Automatic Install"
+	echo "[4] Backup"
+	echo "[5] Restore"
 	echo
 	echo "Press Enter for Tools and Tweaks"
 	echo
 	read -p 'Your Choice: ' choice
-	if [[ $choice = 1 ]]; then
+	if [[ $choice = 0 ]]; then
+		clear
+		echo
+		echo "[Initialize Disk]"
+		echo
+		echo
 		set-devices
+		initialize-disk
+		read -p "Press enter key to Continue"
+		menu
+	elif [[ $choice = 1 ]]; then
+		download-setup
 		read -p "Press enter key to Continue"
 		menu
 	elif [[ $choice = 2 ]]; then
-		download-setup
+		set-devices
+		buildGentoo
 		read -p "Press enter key to Continue"
 		menu
 	elif [[ $choice = 3 ]]; then
-		set-devices
-		buildGentoo
-		read -p "Press enter key to Continue"
-		menu
-	elif [[ $choice = 4 ]]; then
 		set-devices
 		download-setup
 		buildGentoo
 		exit 1
-	elif [[ $choice = 5 ]]; then
+	elif [[ $choice = 4 ]]; then
 		clear
 		echo "[Backup OS]"
 		echo
@@ -612,7 +625,7 @@ menu() {
 		else
 			os-backup "home" "$backup_directory" "$ROOT_NAME"
 		fi
-	elif [[ $choice = 6 ]]; then
+	elif [[ $choice = 5 ]]; then
 		clear
 		echo "[Restore from Backup]"
 		echo
@@ -633,6 +646,7 @@ menu() {
 		tweaks
 	fi
 }
+
 set-devices() {
 	if [ -f "/tmp/disk" ]; then
 		HARD_DISK=$(cat /tmp/disk | head -1)