diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index 8f134e1..c3eb747 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -3,8 +3,8 @@ if status is-interactive
 end
 
 export EDITOR="nvim"
-export TERMINAL="alacritty"
-export TERMINAL_PROG="alacritty"
+export TERMINAL="st"
+export TERMINAL_PROG="st"
 export BROWSER="firefox"
 export PAGER="bat"
 
diff --git a/.config/i3/config b/.config/i3/config
index b6d81be..28e0d32 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -230,7 +230,8 @@ assign [class="discord"] 5
 # startup programs
 exec --no-startup-id nextcloud
 exec --no-startup-id nitrogen --restore
-exec --no-startup-id i3-msg 'workspace 2; exec firefox; workspace 1; exec $terminal'
+exec --no-startup-id i3-msg 'workspace 2; exec $browser'
+exec --no-startup-id i3-msg 'workspace 1; exec $terminal'
 exec --no-startup-id openrgb -d 0 -m off -d 1 -m off
 # sets up monitors and picom
 exec_always --no-startup-id ~/.local/share/scripts/monitor.sh
diff --git a/.config/polybar/config.ini b/.config/polybar/config.ini
index 29ba548..53e4f36 100644
--- a/.config/polybar/config.ini
+++ b/.config/polybar/config.ini
@@ -17,7 +17,7 @@
 ;==========================================================
 
 include-file = modules.ini
-include-file = $HOME/.config/polybar/themes/macchiato.ini
+include-file = $HOME/.config/polybar/themes/xresources.ini
 
 [settings]
 screenchange-reload = true
@@ -43,8 +43,8 @@ modules-left = i3 sep title
 modules-center = date dot time
 modules-right = xkeyboard dot cpu dot amdgpu dot memory dot pulseaudio sep filesystem
 
-background = ${colors.base}
-foreground = ${colors.text}
+background = ${colors.background}
+foreground = ${colors.foreground}
 line-size = 3pt
 padding-right = 1
 
@@ -64,11 +64,11 @@ offset-y = 0.5%
 ;radius = 8
 
 modules-left = i3 sep title
-modules-center = date dot time 
+modules-center = date dot time
 modules-right = xkeyboard dot cpu dot gpu dot memory dot backlight dot pulseaudio sep filesystem sep battery
 
-background = ${colors.base}
-foreground = ${colors.text}
+background = ${colors.background}
+foreground = ${colors.foreground}
 line-size = 3pt
 padding-right = 1
 
@@ -90,8 +90,8 @@ modules-left = i3
 modules-center = date dot time
 modules-right = cpu dot gpu dot memory dot pulseaudio sep filesystem
 
-background = ${colors.base}
-foreground = ${colors.text}
+background = ${colors.background}
+foreground = ${colors.foreground}
 line-size = 3pt
 padding-right = 1
 
diff --git a/.config/polybar/modules.ini b/.config/polybar/modules.ini
index 308d34b..cb95adc 100644
--- a/.config/polybar/modules.ini
+++ b/.config/polybar/modules.ini
@@ -13,8 +13,8 @@ format = <label-state> <label-mode>
 label-mode = %mode%
 label-mode-padding = 1
 label-focused = %index%
-label-focused-foreground = ${colors.text}
-label-focused-underline = ${colors.lavender}
+label-focused-foreground = ${colors.foreground}
+label-focused-underline = ${colors.lightgrey}
 label-focused-padding = 1
 label-unfocused = %index%
 label-unfocused-padding = 1
@@ -28,8 +28,8 @@ label-urgent-padding = 1
 [module/xworkspaces]
 type = internal/xworkspaces
 label-active = %name%
-label-active-foreground = ${colors.sky}
-label-active-underline= ${colors.lavender}
+label-active-foreground = ${colors.lightblue}
+label-active-underline= ${colors.lightgrey}
 label-active-padding = 1
 label-occupied = %name%
 label-occupied-padding = 1
@@ -42,22 +42,22 @@ label-empty-padding = 1
 [module/xkeyboard]
 type = internal/xkeyboard
 
-format = <label-layout> 
+format = <label-layout>
 format-prefix = 󰌌
-format-prefix-foreground = ${colors.mauve}
+format-prefix-foreground = ${colors.magenta}
 format-prefix-padding-right = 1
 format-spacing = 0
 
 label-layout = %layout%
 label-layout-padding = 0
-label-layout-background = ${colors.base}
-label-layout-foreground = ${colors.text}
+label-layout-background = ${colors.background}
+label-layout-foreground = ${colors.foreground}
 
 
 [module/title]
 type = internal/xwindow
 format = <label>
-;format-foreground = ${colors.text}
+;format-foreground = ${colors.foreground}
 format-padding = 2
 
 label = %title%
@@ -78,7 +78,7 @@ interval = 1
 label = %output%
 
 format = <label>
-format-prefix = 󰍛 
+format-prefix = 󰍛
 format-prefix-foreground = ${colors.blue}
 format-prefix-padding-right = 1
 format-suffix = °C
@@ -117,7 +117,7 @@ interval = 1
 label = %used%
 format = <label>
 format-prefix = 󰘚
-format-prefix-foreground = ${colors.peach}
+format-prefix-foreground = ${colors.magenta}
 format-prefix-padding-right = 1
 
 [module/filesystem]
@@ -138,18 +138,18 @@ interval = 5
 format-volume = <ramp-volume><label-volume>
 label-volume = %percentage%%
 ramp-volume-0 = 󰕿
-ramp-volume-0-foreground = ${colors.teal}
+ramp-volume-0-foreground = ${colors.lightgreen}
 ramp-volume-0-padding-right = 1
 ramp-volume-1 = 󰖀
-ramp-volume-1-foreground = ${colors.teal}
+ramp-volume-1-foreground = ${colors.lightgreen}
 ramp-volume-1-padding-right = 1
 ramp-volume-2 = 󰕾
-ramp-volume-2-foreground = ${colors.teal}
+ramp-volume-2-foreground = ${colors.lightgreen}
 ramp-volume-2-padding-right = 1
 label-muted = MUTED
-label-muted-foreground = ${colors.subtext0}
+label-muted-foreground = ${colors.lightgrey}
 format-muted-prefix = 󰝟
-format-muted-prefix-foreground = ${colors.maroon}
+format-muted-prefix-foreground = ${colors.red}
 format-muted-prefix-padding-right = 1
 click-right = pavucontrol || pulseaudio-equalizer-ladspa || pulseeffects || easyeffects
 
@@ -268,7 +268,7 @@ animation-charging-9-foreground = ${colors.green}
 animation-charging-framerate = 750
 animation-low-0 = 󱃍
 animation-low-0-foreground = ${colors.red}
-animation-low-1 = 
+animation-low-1 =
 animation-low-framerate = 200
 
 [module/bluetooth]
@@ -282,11 +282,11 @@ format-prefix-foreground = ${colors.blue}
 [module/date]
 type = internal/date
 interval = 1
-date = %a, %B %d 
+date = %a, %B %d
 label = %date%
 format = <label>
 format-prefix = 󰃭
-format-prefix-foreground = ${colors.rosewater}
+format-prefix-foreground = ${colors.lightyellow}
 format-prefix-padding-right = 1
 
 [module/time]
@@ -296,25 +296,25 @@ time = %H:%M
 label = %time%
 format = <label>
 format-prefix = 󰥔
-format-prefix-foreground = ${colors.pink}
+format-prefix-foreground = ${colors.lightmagenta}
 format-prefix-padding-right = 1
 
 [module/space]
 type = custom/text
 content = _
-content-foreground = ${colors.crust}
+content-foreground = ${colors.background}
 content-padding = 0.5
 
 [module/dot]
 type = custom/text
 content = 󰧞
-content-foreground = ${colors.overlay0}
+content-foreground = ${colors.grey}
 content-padding = 1
 
 [module/sep]
 type = custom/text
 content = |
-content-foreground = ${colors.overlay0}
+content-foreground = ${colors.grey}
 content-padding = 1