diff --git a/1-initial/config_changes.sh b/1-initial/config_changes.sh
index 351ce5c..7739ade 100755
--- a/1-initial/config_changes.sh
+++ b/1-initial/config_changes.sh
@@ -10,9 +10,10 @@ pacman_vars() {
 init() {
     pacman -Syu --noconfirm
     echo 'Installing reflector'
-    sudo pacman -S reflector --noconfirm
+    pacman -S reflector --noconfirm
     echo 'Generating mirrorlist...'
-    reflector -c pt,es,fr,uk --sort rate | tee /etc/pacman.d/mirrorlist
+    printf "--save /etc/pacman.d/mirrorlist\n--protocol https\n--country Portugal,Spain,France,Unite\ Kigdom,Germany,Netherlands\n--latest 50\n--score 10\n--sort rate" | tee /etc/xdg/reflector/reflector.conf
+    systemctl enable --now reflector.service
     pacman -S sed
     echo "Performing config changes to pacman"
     pacman_vars
diff --git a/2-install-packages/pacman.sh b/2-install-packages/pacman.sh
index c5b0aa2..1ab3c1e 100644
--- a/2-install-packages/pacman.sh
+++ b/2-install-packages/pacman.sh
@@ -7,7 +7,7 @@ tools_and_apps=( "alacritty" "fish" "arandr" "rofi" "trayer" "firefox"
  "discord" "fzf" "nodejs" "npm" "ntfs-3g" "nvidia" "nvidia-utils"
   "amd-ucode" "intel-ucode" "sbctl" "refind" "pasystray" "network-manager-applet"
   "xdg-desktop-portal" "pavucontrol" "docker" "pcmanfm" "tmux" "tree"
-  "unzip" "flameshot" "playerctl" "xscreensaver" "htop" "lxappearance"
+  "unzip" "flameshot" "playerctl" "slock" "htop" "lxappearance"
   "texlive-core" "texlive-bibtexextra" "texlive-most" "zathura"
   "zathura-pdf-mupdf" "xclip" "ripgrep" "qbittorrent" "sshpass" "lazygit"
   "x11-ssh-askpass" "zip" "xdotool" "bluez" "bluez-utils" "vlc" "eog"
diff --git a/config_changes.sh b/config_changes.sh
deleted file mode 100755
index fc77cdf..0000000
--- a/config_changes.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-pacman_vars() {
-    #Activate and change number of parallel downloads to 200
-    sed -i "s/^#ParallelDownloads =.*/ParallelDownloads = 200/" /etc/pacman.conf
-    #Enable color
-    sed -i "s/^#Color/Color/" /etc/pacman.conf
-    #Enable multilib repo
-    sed -i "/\[multilib\]/,/Include/"'s/^#//' /etc/pacman.conf
-}
-
-init() {
-    pacman_vars
-}
-init
diff --git a/create_user.sh b/create_user.sh
deleted file mode 100755
index 038f5a5..0000000
--- a/create_user.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-create_user(){
-    useradd -m afonso
-    echo 'Insert password for user afonso'
-    passwd afonso
-}
-
-enable_wheel_group(){
-    sed -i 's/^# %wheel ALL=(ALL:ALL) ALL/%wheel ALL=(ALL:ALL) ALL/' /etc/sudoers
-}
-
-add_user_to_wheel() {
-    usermod -aG wheel afonso
-}
-
-init(){
-    create_user
-    enable_wheel_group
-    add_user_to_wheel
-}
-
-init
diff --git a/entrypoint.sh b/entrypoint.sh
deleted file mode 100755
index 71eeeba..0000000
--- a/entrypoint.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-init(){
-    source create_user.sh
-    source config_changes.sh
-    source packages/init.sh
-    source xmonad_xmobar.sh
-}
diff --git a/packages/aur/init.sh b/packages/aur/init.sh
deleted file mode 100755
index e69de29..0000000
diff --git a/packages/init.sh b/packages/init.sh
deleted file mode 100755
index 114c48d..0000000
--- a/packages/init.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-source pacman/init.sh
-source aur/init.sh
diff --git a/packages/pacman/fonts.sh b/packages/pacman/fonts.sh
deleted file mode 100755
index 11caed6..0000000
--- a/packages/pacman/fonts.sh
+++ /dev/null
@@ -1 +0,0 @@
-sudo pacman -S noto-fonts noto-fonts-cjk noto-fonts-emoji noto-fonts-extra
diff --git a/packages/pacman/init.sh b/packages/pacman/init.sh
deleted file mode 100755
index 3cbf177..0000000
--- a/packages/pacman/init.sh
+++ /dev/null
@@ -1 +0,0 @@
-source fonts.sh