diff --git a/install b/install
index 79ef324..ece98fc 100755
--- a/install
+++ b/install
@@ -107,6 +107,7 @@ ADD_GROUPS=(
 
 # Array of systemd services which should be enabled
 SYSTEMD_SERVICES=(
+    "acpid"
     "cronie"
     "NetworkManager"
     "org.cups.cupsd"
@@ -334,6 +335,9 @@ sudo install -m 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/et
 print_log "Copying 20-displaylink.conf to ${YELLOW}/etc/X11/nvidia-xorg.conf.d${RESET}"
 sudo install -m 644 "${SYSTEM_DIR}/etc/X11/xorg.conf.d/20-displaylink.conf" "/etc/X11/nvidia-xorg.conf.d"
 
+print_log "Copying vconsole.conf to ${YELLOW}/etc/vconsole.conf${RESET}"
+sudo install -m 644 "${SYSTEM_DIR}/etc/vconsole.conf" "/etc/vconsole.conf"
+
 ###############################################################################
 # Setting lockscreen image                                                    #
 ###############################################################################
@@ -354,6 +358,14 @@ print_section "Creating issue file"
 sudo install "/tmp/issue" "/etc/issue"
 print_log "Issue file created"
 
+###############################################################################
+# Fonts                                                                       #
+###############################################################################
+print_section "Fonts"
+sudo mkfontdir /usr/share/fonts/75dpi
+sudo mkfontdir /usr/share/fonts/100dpi
+print_log "Prepare xorg fonts"
+
 ###############################################################################
 # Set default shell                                                           #
 ###############################################################################
diff --git a/system/.config/X11/xresources b/system/.config/X11/xresources
index 1c91bcf..38c0b15 100644
--- a/system/.config/X11/xresources
+++ b/system/.config/X11/xresources
@@ -1,5 +1,5 @@
 ! SCRIPT NAME:
-! .Xresources
+! .xresources
 !
 ! AUTHOR:
 ! Severin Kaderli <severin@kaderli.dev>
@@ -24,4 +24,32 @@ rofi.location: 2
 rofi.yoffset: 35
 rofi.fixed-num-lines: false
 
-Sxiv.background: #000000
\ No newline at end of file
+Sxiv.background: #000000
+
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+! Terminal colors
+!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+*.color0: #252525
+*.color8: #252525
+
+*.color1: #ff5252
+*.color9: #ff5252
+
+*.color2: #c3d82c
+*.color10: #c3d82c
+
+*.color3: #ffd740
+*.color11: #ffd740
+
+*.color4: #40c4ff
+*.color12: #40c4ff
+
+*.color5: #ff4081
+*.color13: #ff4081
+
+*.color6: #70c0ba
+*.color14: #70c0ba
+
+*.color7: #eaeaea
+*.color15: #eaeaea
\ No newline at end of file
diff --git a/system/.config/polybar/launch b/system/.config/polybar/launch
index 54ec7d9..681bdde 100755
--- a/system/.config/polybar/launch
+++ b/system/.config/polybar/launch
@@ -13,7 +13,7 @@
 # ./launch
 
 # Terminate already running bar instances
-killall -q polybar
+pkill polybar
 
 # Wait until the processes have been shut down
 while pgrep -x polybar >/dev/null; do sleep 1; done
diff --git a/system/.config/zsh/.zshrc b/system/.config/zsh/.zshrc
index 2065c60..9dcecbd 100644
--- a/system/.config/zsh/.zshrc
+++ b/system/.config/zsh/.zshrc
@@ -16,7 +16,6 @@
 setopt prompt_subst
 unsetopt correct
 
-
 # Zsh keybindings
 bindkey "\e[H" beginning-of-line
 bindkey "\e[F" end-of-line
@@ -40,6 +39,15 @@ zstyle ':completion:*' menu select
 # Persistent rehash
 zstyle ':completion:*' rehash true
 
+# Use colors from xresources for linux console
+if [ "$TERM" = "linux" ]; then
+    _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p'
+    for i in $(sed -n "$_SEDCMD" "${XDG_CONFIG_HOME}/X11/xresources" | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do
+        echo -en "$i"
+    done
+    clear
+fi
+
 # Sourcing environment variables
 if [ -f "${HOME}/.config/custom/env" ]; then
     . "${HOME}/.config/custom/env"
diff --git a/system/etc/vconsole.conf b/system/etc/vconsole.conf
new file mode 100644
index 0000000..58ffa89
--- /dev/null
+++ b/system/etc/vconsole.conf
@@ -0,0 +1,2 @@
+FONT=ter-132n
+KEYMAP=de_CH-latin1
\ No newline at end of file