diff --git a/.config/polybar/config b/.config/polybar/config
index 0d46e0f..8de4974 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -28,96 +28,96 @@ modules-right = arrowb1 openweather
 [module/arrowb01]
 type = custom/text
 content = ""
-content-foreground = ${colors.blue}
+content-foreground = ${colors.color9}
 content-background = #00000000
 
 [module/arrowb1]
 type = custom/text
 content = ""
-content-foreground = ${colors.green}
+content-foreground = ${colors.color5}
 content-background = #00000000
 
 [module/arrowb2]
 type = custom/text
 content = ""
-content-foreground = ${colors.orange}
+content-foreground = ${colors.color6}
 content-background = #00000000
 
 [module/arrow01]
 type = custom/text
 content = ""
-content-foreground = ${colors.grey}
-content-background = ${colors.yellow}
+content-foreground = ${colors.color8}
+content-background = ${colors.color4}
 
 
 [module/arrow0]
 type = custom/text
 content = ""
-content-foreground = ${colors.yellow}
+content-foreground = ${colors.color4}
 content-background = #00000000
 
 [module/arrow1]
 type = custom/text
 content = ""
-content-foreground = ${colors.lightblue}
-content-background = ${colors.yellow}
+content-foreground = ${colors.color15}
+content-background = ${colors.color4}
 
 [module/arrow2]
 type = custom/text
 content = ""
-content-foreground = ${colors.yellow}
-content-background = ${colors.darkblue}
+content-foreground = ${colors.color4}
+content-background = ${colors.color3}
 
 [module/arrow3]
 type = custom/text
 content = ""
-content-foreground = ${colors.darkblue}
-content-background = ${colors.red}
+content-foreground = ${colors.color3}
+content-background = ${colors.color2}
 
 [module/arrow4]
 type = custom/text
 content = ""
-content-foreground = ${colors.red}
-content-background = ${colors.orange}
+content-foreground = ${colors.color2}
+content-background = ${colors.color6}
 
 [module/arrow5]
 type = custom/text
 content = ""
-content-foreground = ${colors.orange}
-content-background = ${colors.blue}
+content-foreground = ${colors.color6}
+content-background = ${colors.color9}
 
 [module/arrow6]
 type = custom/text
 content = ""
-content-foreground = ${colors.blue}
-content-background = ${colors.green}
+content-foreground = ${colors.color9}
+content-background = ${colors.color5}
 
 [module/arrow7]
 type = custom/text
 content = ""
-content-foreground = ${colors.green}
-content-background = ${colors.darkblue}
+content-foreground = ${colors.color5}
+content-background = ${colors.color3}
 
 [module/arrow8]
 type = custom/text
 content = ""
-content-foreground = ${colors.red}
-content-background = ${colors.darkblue}
+content-foreground = ${colors.color2}
+content-background = ${colors.color3}
 
 [module/arrow9]
 type = custom/text
 content = ""
-content-foreground = ${colors.darkblue}
+content-foreground = ${colors.color3}
 content-background = #00000000
 
-[module/bluetoothctl]
+[module/color9toothctl]
 type = custom/script
-exec = ~/.config/Scripts/bluetoothctl.sh
+exec = ~/.config/Scripts/color9toothctl.sh
 tail = true
-click-left = ~/.config/Scripts/bluetoothctl.sh --toggle
+click-left = ~/.config/Scripts/color9toothctl.sh --toggle
 label = " %output% "
-label-foreground = ${colors.black}
-label-background = ${colors.orange}
+label-foreground = ${colors.color0}
+label-background = ${colors.color6}
 
 [module/expressvpn-status]
 type = custom/script
@@ -126,8 +126,8 @@ interval = 5
 ;format-foreground = #E5E9F0
 ;format-backgound = #5E81AC
 label = " %output%"
-label-foreground = ${colors.black} 
-label-background = ${colors.darkblue}
+label-foreground = ${colors.color0} 
+label-background = ${colors.color3}
 
 [module/pavolume]
 type = custom/script
@@ -138,8 +138,8 @@ click-right = exec pavucontrol
 click-left = ~/.config/Scripts/pavolume.sh --togmute
 scroll-up = ~/.config/Scripts/pavolume.sh --up
 scroll-down = ~/.config/Scripts/pavolume.sh --down
-format-foreground = ${colors.black}
-format-background = ${colors.orange}
+format-foreground = ${colors.color0}
+format-background = ${colors.color6}
 
 [module/filesystem]
 type = internal/fs
@@ -162,11 +162,11 @@ exec = ~/.config/Scripts/backlight.sh
 scroll-up = exec light -A 5
 scroll-down = exec light -U 5
 format-prefix = "  "
-format-prefix-foreground = ${colors.black}
-format-prefix-background = ${colors.darkblue}
+format-prefix-foreground = ${colors.color0}
+format-prefix-background = ${colors.color3}
 label = "%output%% "
-label-foreground = ${colors.black}
-label-background = ${colors.darkblue}
+label-foreground = ${colors.color0}
+label-background = ${colors.color3}
 
 [module/popup-calendar]
 type = custom/script
@@ -174,11 +174,11 @@ exec = ~/.config/Scripts/popup-calendar.sh
 interval = 5
 click-left = ~/.config/Scripts/popup-calendar.sh --popup
 format-prefix = "  "
-format-prefix-foreground = ${colors.black}
-format-prefix-background = ${colors.lightblue}
+format-prefix-foreground = ${colors.color0}
+format-prefix-background = ${colors.color15}
 label = "%output% "
-format-foreground = ${colors.black}
-format-background = ${colors.lightblue}
+format-foreground = ${colors.color0}
+format-background = ${colors.color15}
 
 [module/vpncheck]
 type = custom/script
@@ -186,10 +186,10 @@ exec = pgrep openvpn
 interval = 5
 label = "VPN "
 format-prefix = "   "
-format-prefix-foreground = ${colors.black}
-format-prefix-background = ${colors.orange}
-label-foreground = ${colors.black}
-label-background = ${colors.orange}
+format-prefix-foreground = ${colors.color0}
+format-prefix-background = ${colors.color6}
+label-foreground = ${colors.color0}
+label-background = ${colors.color6}
 
 [module/hostname]
 type = custom/script
@@ -198,11 +198,11 @@ format = "<label>"
 format-prefix = "  "
 ;format-prefix = ""
 exec = echo "$(uname -nr)"
-format-prefix-foreground = ${colors.black}
-format-prefix-background = ${colors.blue}
+format-prefix-foreground = ${colors.color0}
+format-prefix-background = ${colors.color9}
 label = "%output% "
-label-foreground = ${colors.black}
-label-background = ${colors.blue}
+label-foreground = ${colors.color0}
+label-background = ${colors.color9}
 
 [module/temperature]
 type = internal/temperature
@@ -229,9 +229,9 @@ exec = "~/.config/Scripts/arch-updates.sh -s"
 tail = true
 format = "<label> "
 format-prefix = "  "
-format-prefix-foreground = ${colors.black}
-format-foreground = ${colors.black}
-format-background = ${colors.blue}
+format-prefix-foreground = ${colors.color0}
+format-foreground = ${colors.color0}
+format-background = ${colors.color9}
 click-left = st -e yay --noconfirm -Syu
 click-right = "~/.config/Scripts/arch-updates.sh -c&"
 click-middle = "~/.config/Scripts/arch-updates.sh -n"
@@ -243,8 +243,8 @@ tail = true
 interval = 600
 click-left = ~/.config/Scripts/wttr.sh
 format = <label>
-format-foreground = ${colors.black}
-format-background = ${colors.green}
+format-foreground = ${colors.color0}
+format-background = ${colors.color5}
 
 [module/i3]
 type = internal/i3
@@ -265,16 +265,16 @@ ws-icon-8 = 9:;
 ws-icon-9 = 10:;
 label-mode-padding = 1
 label-mode-foreground = ${colors.foreground}
-label-mode-background = ${colors.grey}
+label-mode-background = ${colors.color8}
 ; focused = Active workspace on focused monitor
 label-focused = %icon%
 label-focused-foreground = ${colors.foreground-alt}
-label-focused-background = ${colors.grey}
+label-focused-background = ${colors.color8}
 label-focused-padding = 1
 ; unfocused = Inactive workspace on any monitor
 label-unfocused = %icon%
 label-unfocused-foreground = ${colors.foreground}
-label-unfocused-background = ${colors.grey}
+label-unfocused-background = ${colors.color8}
 label-unfocused-padding = 1
 ; urgent = Workspace with urgency hint set
 label-urgent = %icon%
@@ -329,9 +329,9 @@ label = %{A4:wmctrl -s "$(($(xprop -root _NET_CURRENT_DESKTOP | cut -d '=' -f 2
 exec = echo "$(($(xprop -root _NET_CURRENT_DESKTOP | cut -d '=' -f 2 | cut -d ' ' -f 2)+1))"
 format = <label>
 format-prefix = "  "
-format-prefix-foreground = ${colors.black}
-format-prefix-background = ${colors.red}
-format-background = ${colors.red}
+format-prefix-foreground = ${colors.color0}
+format-prefix-background = ${colors.color2}
+format-background = ${colors.color2}
 
 [module/window_count]
 type = custom/script
@@ -362,15 +362,15 @@ type = internal/xwindow
 ;label = "%title%"
 label = " %title:0:30:...%"
 label-maxlen = 150
-label-foreground = ${colors.black}
-label-background = ${colors.yellow}
+label-foreground = ${colors.color0}
+label-background = ${colors.color4}
 
 [module/mpd]
 type = internal/mpd
 format-online = <icon-prev> <icon-stop> <toggle> <icon-next> <label-song>
 format-online-prefix = " "
 format-online-prefix-foreground = ${colors.foreground-alt}
-fomat-online-foreground = ${colors.blue}
+fomat-online-foreground = ${colors.color9}
 format-online-background = ${colors.background-alt}
 format-online-padding = 1
 icon-play = 
@@ -387,13 +387,13 @@ toggle-off-foreground = ${colors.foreground-alt}
 
 [module/xkeyboard]
 type = internal/xkeyboard
-blacklist-0 = num lock
+color0list-0 = num lock
 format-prefix = " "
 format-prefix-foreground = ${colors.foreground-alt}
 label-layout = %layout%
 label-indicator-padding = 1
 label-indicator-margin = 1
-label-indicator-foreground = ${colors.red}
+label-indicator-foreground = ${colors.color2}
 label-indicator-background = ${colors.background}
 
 [module/cpu]
@@ -460,26 +460,26 @@ label-charging = " %percentage%% "
 label-discharging = " %percentage%% "
 format-charging = <animation-charging><label-charging>
 format-discharging = <animation-discharging><label-discharging>
-format-charging-foreground = ${colors.black}
-format-charging-background = ${colors.red}
-label-charging-foreground = ${colors.black}
-label-charging-background = ${colors.red}
-format-discharging-foreground = ${colors.black}
-format-discharging-background = ${colors.red} 
-label-discharging-foreground = ${colors.black}
-label-discharging-background = ${colors.red}
+format-charging-foreground = ${colors.color0}
+format-charging-background = ${colors.color2}
+label-charging-foreground = ${colors.color0}
+label-charging-background = ${colors.color2}
+format-discharging-foreground = ${colors.color0}
+format-discharging-background = ${colors.color2} 
+label-discharging-foreground = ${colors.color0}
+label-discharging-background = ${colors.color2}
 format-full-prefix = "  "
-format-full-prefix-foreground = ${colors.black}
-format-full-prefix-background = ${colors.red}
-label-full-foreground = ${colors.black}
-label-full-background = ${colors.red}
+format-full-prefix-foreground = ${colors.color0}
+format-full-prefix-background = ${colors.color2}
+label-full-foreground = ${colors.color0}
+label-full-background = ${colors.color2}
 animation-charging-0 = " "
 animation-charging-1 = " "
 animation-charging-2 = " "
 animation-charging-3 = " "
 animation-charging-4 = " "
-animation-charging-foreground = ${colors.black}
-animation-charging-background = ${colors.red}
+animation-charging-foreground = ${colors.color0}
+animation-charging-background = ${colors.color2}
 animation-charging-framerate = 500
 animation-discharging-0 = " "
 animation-discharging-1 = " "
@@ -487,14 +487,14 @@ animation-discharging-2 = " "
 animation-discharging-3 = " "
 animation-discharging-4 = " "
 animation-discharging-framerate = 1000
-animation-discharging-foreground = ${colors.black}
-animation-discharging-background = ${colors.red}
+animation-discharging-foreground = ${colors.color0}
+animation-discharging-background = ${colors.color2}
 
 [module/networkmanager]
 type = custom/text
 content = " net  " 
-content-foreground = ${colors.black}
-content-background = ${colors.yellow}
+content-foreground = ${colors.color0}
+content-background = ${colors.color4}
 click-left = networkmanager_dmenu
 
 [module/eth]
@@ -515,34 +515,34 @@ interface = wlan0
 interval = 3.0
 format-connected = <label-connected>
 label-connected = "  %essid%   %signal%  %upspeed:7%  %downspeed:7% "
-format-connected-foreground = ${colors.black}
-format-connected-background = ${colors.green}
+format-connected-foreground = ${colors.color0}
+format-connected-background = ${colors.color5}
 format-disconnected = <label-disconnected>
 label-disconnected = "%{A1:connman-gtk &:}%{A}"
-format-disconnected-foreground = ${colors.black}
-format-disconnected-background = ${colors.red}
+format-disconnected-foreground = ${colors.color0}
+format-disconnected-background = ${colors.color2}
 ramp-signal-0 = 
 ramp-signal-1 = 
 ramp-signal-2 = 
 ramp-signal-3 = 
 ramp-signal-4 = 
-ramp-signal-foreground = ${colors.black}
+ramp-signal-foreground = ${colors.color0}
 
 [module/powermenu]
 type = custom/menu
 format-spacing = 1
 label-open = 
 label-open-font = 2
-label-open-foreground = ${colors.red}
+label-open-foreground = ${colors.color2}
 label-close = 
 label-close-foreground = ${colors.foreground}
 label-separator = |
 label-separator-foreground = ${colors.foreground-alt}
 menu-0-0 = 
-menu-0-0-foreground = ${colors.blue}
+menu-0-0-foreground = ${colors.color9}
 menu-0-0-exec = menu-open-1
 menu-0-1 = 
-menu-0-1-foreground = ${colors.red}
+menu-0-1-foreground = ${colors.color2}
 menu-0-1-exec = menu-open-2
 menu-1-0 = reboot?
 menu-1-0-exec = /sbin/reboot
diff --git a/.config/wpg/templates/config_polybar_colors.base b/.config/wpg/templates/config_polybar_colors.base
new file mode 100644
index 0000000..ef9ebd3
--- /dev/null
+++ b/.config/wpg/templates/config_polybar_colors.base
@@ -0,0 +1,22 @@
+[colors]
+background = #00000000
+background-alt = {color1}
+foreground = {color6}
+foreground-alt = {color3}
+highlight = {color7}
+error = {color9}
+alert = {color1}
+color0 = {color0}
+color2 = {color2}
+color3 = {color3}
+color4 = {color4}
+color5 = {color5}
+color6 = {color6}
+color8 = {color8}
+color9 = {color9}
+color10 = {color10}
+color11 = {color11}
+color12 = {color12}
+color13 = {color13}
+color14 = {color14}
+color15 = {color15}
diff --git a/.p10k.zsh b/.p10k.zsh
index 60d0c59..5be73c5 100644
--- a/.p10k.zsh
+++ b/.p10k.zsh
@@ -1048,9 +1048,9 @@
   ################################[ battery: internal battery ]#################################
   # Show battery in red when it's below this level and not connected to power supply.
   typeset -g POWERLEVEL9K_BATTERY_LOW_THRESHOLD=20
-  typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=160
+  typeset -g POWERLEVEL9K_BATTERY_LOW_FOREGROUND=001
   # Show battery in green when it's charging or fully charged.
-  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=155
+  typeset -g POWERLEVEL9K_BATTERY_{CHARGING,CHARGED}_FOREGROUND=002
   # Show battery in yellow when it's discharging.
   typeset -g POWERLEVEL9K_BATTERY_DISCONNECTED_FOREGROUND=178
   # Battery pictograms going from low to high level of charge.
@@ -1104,10 +1104,10 @@
   
   # User with skull
     user_with_skull() {
-        echo -n " $(whoami)"
+        echo -n "💀 $(whoami)"
   }
   typeset -g POWERLEVEL9K_CUSTOM_USER="user_with_skull"
-  typeset -g POWERLEVEL9K_CUSTOM_USER_BACKGROUND="white"
+  typeset -g POWERLEVEL9K_CUSTOM_USER_BACKGROUND="006"
   # User-defined prompt segments can be customized the same way as built-in segments.
   # typeset -g POWERLEVEL9K_EXAMPLE_FOREGROUND=208
   # typeset -g POWERLEVEL9K_EXAMPLE_VISUAL_IDENTIFIER_EXPANSION='⭐'
diff --git a/addons/pacman-packages b/addons/pacman-packages
index 2b38f32..7973491 100644
--- a/addons/pacman-packages
+++ b/addons/pacman-packages
@@ -116,7 +116,6 @@ psmisc
 pulseaudio-bluetooth
 python-cairo
 python-mpd2
-python-mutagen
 python-pip
 python-pyqt5
 python-pywal