diff --git a/install.uefi b/install.uefi
index c46c19d..47c32eb 100644
--- a/install.uefi
+++ b/install.uefi
@@ -77,21 +77,31 @@ USR="15G"
 ###############################
 
 #Discoverable Partitions Specification
+# /boot      /dev/vda1
+# /usr       /dev/vda2
+# (usr-hash) /dev/vda3
+# /(root)    /dev/vda4
+# Reset Partition Table
 sgdisk -og "${DRIVE}"
+# Create EFI System Partition
 sgdisk -n 0:0:+"${ESP}" -t 0:c12a7328-f81f-11d2-ba4b-00a0c93ec93b -c 0:"EFI System Partition" "${DRIVE}"
 #sgdisk -n 0:0:+512M -t 0:ef00 -c 0:ESP "${DRIVE}"
+# Create usr-Partition
 sgdisk -n 0:0:+"${USR}" -t 0:8484680c-9521-48c6-9c11-b0720656f69e -c 0:"Usr-Partition" "${DRIVE}"
+# Create usrhash-Partition
+sgdisk -n 0:0:+64M -t 0: -c 0:"usrhash-Partition" "${DRIVE}"
+# Create Root-Partition
 sgdisk -n 0:0:0 -t 0:4f68bce3-e8cd-4db1-96e7-fbcaf984b709 -c 0:"System 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/vda4
 
-mount /dev/vda3 /mnt
+mount /dev/disk/by-label/root /mnt
 mkdir -p /mnt/{boot,usr}
-mount /dev/vda1 /mnt/boot
-mount /dev/vda2 /mnt/usr
+mount /dev/disk/by-label/EFI /mnt/boot
+mount /dev/disk/by-label/usr /mnt/usr
 
 #--------------------------#
 
@@ -133,7 +143,6 @@ echo "${HOSTNAME_NEW}" > /mnt/etc/hostname
 cat > /mnt/etc/hosts << EOF
 127.0.0.1	localhost
 ::1	      localhost
-127.0.1.1 ${HOSTNAME_NEW}.localedomain	${HOSTNAME_NEW}
 EOF
 #echo "127.0.0.1	localhost" > /etc/hosts
 #echo "::1	localhost" >> /etc/hosts