diff --git a/install.uefi b/install.uefi
index 2309ccd..f5f17df 100644
--- a/install.uefi
+++ b/install.uefi
@@ -31,20 +31,16 @@ DRIVE="/dev/vda"
 
 #Discoverable Partitions Specification
 sgdisk -og "${DRIVE}"
-sgdisk -n 0:0:+512M -t 0:c12a7328-f81f-11d2-ba4b-00a0c93ec93b -c 0:"EFI System Partition" "${DRIVE}"
+sgdisk -n 0:0:+512M -t 0:C12A7328-F81F-11D2-BA4B-00A0C93EC93B -c 0:efi "${DRIVE}"
 #sgdisk -n 0:0:+512M -t 0:ef00 -c 0:ESP "${DRIVE}"
-sgdisk -n 0:0:+15G -t 0:8484680c-9521-48c6-9c11-b0720656f69e -c 0:"Usr-Partition" "${DRIVE}"
-sgdisk -n 0:0:0 -t 0:4f68bce3-e8cd-4db1-96e7-fbcaf984b709 -c 0:"System Root" "${DRIVE}"
-
+sgdisk -n 0:0:0 -t 0:4F68BCE3-E8CD-4DB1-96E7-FBCAF984B709 -c 0:root "${DRIVE}"
 
 mkfs.vfat -n EFI -F 32 /dev/vda1
-mkfs.ext4 -L usr /dev/vda2
-mkfs.ext4 -L root /dev/vda3
+mkfs.ext4 -L root /dev/vda2
 
-mount /dev/vda3 /mnt
-mkdir -p /mnt/{boot,usr}
+mount /dev/vda2 /mnt
+mkdir -p /mnt/boot
 mount /dev/vda1 /mnt/boot
-mount /dev/vda2 /mnt/usr
 
 #ln -sf /run/systemd/resolve/stub-resolv.conf /mnt/etc/resolv.conf # tmpfiles.d macht das
 
@@ -92,28 +88,13 @@ elif [[ "${GRAPHICS_CARD}" == "nvidia" ]]; then
 fi
 
 # GNOME installieren
-#pacstrap -i /mnt gnome
-pacstrap -i /mnt gdm gnome-backgrounds gnome-color-manager gnome-console gnome-control-center gnome-disk-utility gnome-keyring gnome-menus gnome-remote-desktop gnome-session gnome-settings-daemon gnome-shell gnome-system-monitor gnome-tour gnome-user-docs gnome-user-share grilo-plugins gvfs gvfs-afc gvfs-goa gvfs-google gvfs-gphoto2 gvfs-mtp gvfs-nfs gvfs-smb malcontent nautilus orca rygel sushi xdg-desktop-portal-gnome xdg-user-dirs-gtk yelp
+pacstrap -i /mnt gnome gnome-extra gdm avahi bluez bluez-utils pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome networkmanager modemmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon plymouth libreoffice-fresh-de
 
-#pacstrap -i /mnt gnome-extra
-pacstrap -i /mnt seahorse
-
-
-# Sonstiges
-pacstrap -i /mnt avahi bluez bluez-utils pipewire pipewire-audio pipewire-alsa pipewire-pulse pipewire-jack pipewire-zeroconf pipewire-v4l2 pipewire-docs pipewire-roc helvum wireplumber gstreamer gst-plugin-pipewire gst-libav gst-plugins-good gst-plugins-base xdg-desktop-portal-gnome networkmanager modemmanager networkmanager-openconnect networkmanager-openvpn networkmanager-pptp networkmanager-vpnc power-profiles-daemon plymouth libreoffice-fresh-de htop
-#iwd
-#cat > /etc/NetworkManager/conf.d/wifi_backend.conf << EOF
-#[device]
-#wifi.backend=iwd
-#EOF
 #################################################################
 
 sed -i 's/#\(CHARACTER_SET:\).*/\1utf-8/' /mnt/etc/lynx.cfg
 sleep 2
 
-# Tastatur layout auf Deutsch stellen
-arch-chroot /mnt gsettings set org.gnome.desktop.input-sources source "[('xkb', 'de')]"
-
 cat > /mnt/etc/xdg/reflector/reflector.conf << EOF
 --save /etc/pacman.d/mirrorlist
 --country Germany