diff --git a/airootfs/etc/group b/airootfs/etc/group
index 2f50b54..521d3cf 100644
--- a/airootfs/etc/group
+++ b/airootfs/etc/group
@@ -1,16 +1,29 @@
-root:x:0:root
+root:x:0:brltty,root
+bin:x:1:daemon
+daemon:x:2:bin
 sys:x:3:bin,liveuser
+tty:x:5:brltty,liveuser
+log:x:19:liveuser
 network:x:90:liveuser
+floppy:x:94:liveuser
+scanner:x:96:liveuser
 power:x:98:liveuser
-adm:x:999:liveuser
-wheel:x:998:liveuser
-uucp:x:987:liveuser
-optical:x:990:liveuser
-rfkill:x:983:liveuser
-video:x:986:liveuser
-storage:x:988:liveuser
-audio:x:995:liveuser
-users:x:985:liveuser
+cups:x:209:liveuser
+brltty:x:946:
+brlapi:x:947:brltty
+realtime:x:951:liveuser
+sambashare:x:952:liveuser
 nopasswdlogin:x:966:liveuser
 autologin:x:967:liveuser
-liveuser:x:1000:
\ No newline at end of file
+rfkill:x:982:liveuser
+users:x:984:liveuser
+video:x:985:liveuser
+uucp:x:986:brltty,liveuser
+storage:x:987:liveuser
+optical:x:990:liveuser
+lp:x:991:cups,liveuser
+input:x:994:brltty,liveuser
+audio:x:996:brltty,liveuser
+wheel:x:998:liveuser
+adm:x:999:liveuser
+liveuser:x:1000:
diff --git a/airootfs/etc/gshadow b/airootfs/etc/gshadow
index 8bf2275..3cea4f6 100644
--- a/airootfs/etc/gshadow
+++ b/airootfs/etc/gshadow
@@ -1,16 +1,29 @@
-root:::root
-sys:!!::liveuser
-network:!!::liveuser
-power:!!::liveuser
-adm:!!::liveuser
-wheel:!!::liveuser
-uucp:!!::liveuser
-optical:!!::liveuser
-rfkill:!!::liveuser
-video:!!::liveuser
-storage:!!::liveuser
-audio:!!::liveuser
-users:!!::liveuser
+root:::brltty,root
+bin:!*::daemon
+daemon:!*::bin
+sys:!*::bin,liveuser
+tty:!*::brltty,liveuser
+log:!*::liveuser
+network:!*::liveuser
+floppy:!*::liveuser
+scanner:!*::liveuser
+power:!*::liveuser
+cups:!*::liveuser
+brltty:!*::
+brlapi:!*::brltty
+realtime:!::liveuser
+sambashare:!::liveuser
 nopasswdlogin:!::liveuser
 autologin:!::liveuser
+rfkill:!*::liveuser
+users:!*::liveuser
+video:!*::liveuser
+uucp:!*::brltty,liveuser
+storage:!*::liveuser
+optical:!*::liveuser
+lp:!*::cups,liveuser
+input:!*::brltty,liveuser
+audio:!*::brltty,liveuser
+wheel:!*::liveuser
+adm:!*::daemon,liveuser
 liveuser:!::
diff --git a/airootfs/etc/passwd b/airootfs/etc/passwd
index da8dd66..0917446 100644
--- a/airootfs/etc/passwd
+++ b/airootfs/etc/passwd
@@ -1,2 +1,2 @@
-root:x:0:0:root:/root:/usr/bin/zsh
+root:x:0:0:root:/root:/bin/bash
 liveuser:x:1000:1000::/home/liveuser:/bin/bash
diff --git a/airootfs/etc/shadow b/airootfs/etc/shadow
index 3692488..d69c5f3 100644
--- a/airootfs/etc/shadow
+++ b/airootfs/etc/shadow
@@ -1,2 +1,2 @@
-root::14871::::::
-liveuser::14871::::::
\ No newline at end of file
+root:$6$7gqsew91gUDlOEWj$iVmOO5AR.Gi/N0.BdiUo8Y67IhOrFGtc5p.Szt/auRVMw01o8XnXQBkYIccDN/55waWariMpInCimGzIPWMZr.:14871::::::
+liveuser:$6$.zmgFi7SDA/i/xFX$lwClItWge6UwQ3rW9B4GwXGjzI6J/gLibgabNEfj5v1MfkxYHYlt.bhnfm0CbZbnp8BVc.8vBF0glkJaRBRvf.:14871::::::
diff --git a/airootfs/root/customize_airootfs.sh b/airootfs/root/customize_airootfs.sh
index 1ee1abc..1349f01 100755
--- a/airootfs/root/customize_airootfs.sh
+++ b/airootfs/root/customize_airootfs.sh
@@ -2,30 +2,4 @@
 
 locale-gen
 
-usermod -p '$y$j9T$DCmooGCtnp3i6gg0IuIhG/$n9NDMoszCJzqEPuJvZppPqjDMttYJlNZVDpxQikzHH1' -s /bin/bash root
-cp -aT /etc/skel/ /root/
-
-usermod -p '$y$j9T$TNQr0I6vYHoPyYW..UMVS.$REa5y1aHgxjCdYbEeGviSn2oxSSD6AuoyP1ktQptkL6' liveuser
-usermod -g 'users' liveuser
-
-groups="adm audio autologin floppy log network nopasswdlogin optical power rfkill scanner storage sys tty users uucp video wheel"
-for i in $groups
-do
-    usermod -a -G $i liveuser
-done
-
-# tar -xJvf /root/archives/skel.tar.xz -C /etc/skel --strip=1 --overwrite
-# chown -R 0:0 /etc/skel
-
-# tar -xJvf /root/archives/liveuser.tar.xz -C /home/liveuser --strip=1 --overwrite
-# chown -R 1000:1000 /home/liveuser
-
-# tar -xJvf /root/archives/skel.tar.xz -C /root --strip=1 --overwrite
-# chown -R 0:0 /root
-
-# echo -e "[Daemon]\nTheme=melawy-lera-sugar\nDeviceScale=1\nDeviceTimeout=8\nShowDelay=0" > "/usr/share/plymouth/plymouthd.defaults"
-
-# cp -rT --no-preserve=ownership "/etc/skel/" "/root/"
-
-
 true
diff --git a/generate_packages.x86_64_from_netinstall.py b/generate_packages.x86_64_from_netinstall.py
index a576128..fe7bc8e 100755
--- a/generate_packages.x86_64_from_netinstall.py
+++ b/generate_packages.x86_64_from_netinstall.py
@@ -179,6 +179,7 @@ ddrescue
 gpart
 grsync
 melawy-calamares-qt5
+melawy-skel-liveuser
 memtest86+
 mkinitcpio-archiso
 mkinitcpio-nfs-utils
diff --git a/packages.x86_64 b/packages.x86_64
index 1279e3e..404704f 100644
--- a/packages.x86_64
+++ b/packages.x86_64
@@ -606,6 +606,7 @@ ddrescue
 gpart
 grsync
 melawy-calamares-qt5
+melawy-skel-liveuser
 memtest86+
 mkinitcpio-archiso
 mkinitcpio-nfs-utils