diff --git a/.install/fonts.sh b/.install/fonts.sh
deleted file mode 100644
index 4d39536..0000000
--- a/.install/fonts.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-# 
-# SCRIPT NAME:
-# fonts.sh
-#
-# AUTHOR:
-# Severin Kaderli <severin@kaderli.dev>
-#
-# DESCRIPTION:
-# Setups fonts
-
-output::section "Fonts"
-output::log "Prepare xorg fonts"
-sudo mkfontdir /usr/share/fonts/75dpi |& output::debug
-sudo mkfontdir /usr/share/fonts/100dpi |& output::debug
-output::success "Successfully prepared xorg fonts"
diff --git a/.install/prerequisites.sh b/.install/prerequisites.sh
index 61ad254..8443e4e 100644
--- a/.install/prerequisites.sh
+++ b/.install/prerequisites.sh
@@ -8,7 +8,6 @@
 #
 # DESCRIPTION:
 # Installs the prerequisites for the installation script.
-
 output::section "Prerequisites"
 
 output::log "Installing requirements for install script"
diff --git a/.install/rust.sh b/.install/rust.sh
index 24e10a2..0bfcea9 100644
--- a/.install/rust.sh
+++ b/.install/rust.sh
@@ -14,6 +14,7 @@ CONFIG_RUST_COMPONENTS=(
     "clippy"
     "rls"
     "rustfmt"
+    "rust-src"
 )
 
 output::section "Rust"
diff --git a/.install/shell.sh b/.install/shell.sh
index 1a40466..2ec21d9 100644
--- a/.install/shell.sh
+++ b/.install/shell.sh
@@ -11,5 +11,5 @@
 
 output::section "Shell"
 output::log "Setting default shell to zsh"
-chsh -s "/bin/zsh"
+sudo chsh -s "/bin/zsh" "${USER}"
 output::success "Successfully set default shell to zsh"
diff --git a/install b/install
index 6b88808..fe177f1 100755
--- a/install
+++ b/install
@@ -30,12 +30,13 @@ source "${INSTALL_DIR}/lib/lib.sh"
 # Configuration variables                                                     #
 ###############################################################################
 HOST="$(hostname)"
+USER="$(whoami)"
 
 ###############################################################################
 # Installtion information                                                     #
 ###############################################################################
 echo "${BOLD}Before you continue with this script make sure that:"
-echo " • The user severin is added to the sudoers file"
+echo " • The user ${USER} is added to the sudoers file"
 echo " • The multilib repository is uncommented in /etc/pacman.conf"
 echo -e " • Your SSH keys are located in ~/.ssh${RESET}\n"
 
@@ -45,8 +46,6 @@ fi
 
 source "${INSTALL_DIR}/prerequisites.sh"
 
-sudo printf ""
-
 source "${INSTALL_DIR}/arch.sh"
 source "${INSTALL_DIR}/rust.sh"
 source "${INSTALL_DIR}/aur.sh"
@@ -63,7 +62,6 @@ source "${INSTALL_DIR}/etc.sh"
 source "${INSTALL_DIR}/ntp.sh"
 source "${INSTALL_DIR}/lockscreen.sh"
 source "${INSTALL_DIR}/issue.sh"
-source "${INSTALL_DIR}/fonts.sh"
 source "${INSTALL_DIR}/shell.sh"
 
 output::section "Post installation information"