diff --git a/.config/i3/config b/.config/i3/config
index 209effb..c280f64 100644
--- a/.config/i3/config
+++ b/.config/i3/config
@@ -54,11 +54,11 @@ bindsym $mod+Shift+c sticky toggle
 
 ######### COLORS ##########
 #                       BORDER		    BACKGROUND	  TEXT		  INDICATOR     CHILD_BORDER
-client.focused		      #fb4934	    #83a598	    #282828	#fb4934    	#fabd2f
-client.unfocused	      #fabd2f    	#fb4934	    #d5c4a1	#fabd2f		  #282828
-client.focused_inactive	#282828    	#665c54	    #d5c4a1	#fabd2f	    #282828
-client.urgent		        #b8bb26	    #b8bb26	    #282828	#b8bb26		  #b8bb26
-client.background       #665c54
+client.focused		      #cc241d	    #b58900	    #282828	#cc241d    	#d79921
+client.unfocused	      #d79921    	#cc241d	    #a89984	#d79921		  #282828
+client.focused_inactive	#282828    	#414141	    #a89984	#d79921	    #282828
+client.urgent		        #689d6a	    #689d6a	    #282828	#689d6a		  #689d6a
+client.background       #414141
 
 ###---Starting External Scripts---###
 
@@ -192,7 +192,7 @@ bindsym $mod+s			gaps inner current plus 5
 bindsym $mod+Shift+s		gaps inner current minus 5
 
 #bindsym $mod+d			exec rofi -config ~/.config/rofi/config -show drun
-bindsym $mod+d          exec dmenu_run -fn 'UbuntuMono Nerd Font Mono-18' -h '35' -nb '#d3869b' -sf '#282828' -sb '#b8bb26' -nf '#fbf1c7' 
+bindsym $mod+d          exec dmenu_run -fn 'UbuntuMono Nerd Font Mono-18' -h '35' -nb '#b16286' -sf '#282828' -sb '#76dd7a' -nf '#ebd6b8' 
 bindsym Mod1+d          exec ~/.config/Scripts/rofi-bangs.sh
 
 bindsym $mod+Shift+d		gaps inner current set 0; gaps outer current set 0
diff --git a/.config/polybar/colors b/.config/polybar/colors
new file mode 100644
index 0000000..3cecf38
--- /dev/null
+++ b/.config/polybar/colors
@@ -0,0 +1,17 @@
+[colors]
+background = #00000000
+background-alt = #cc241d
+foreground = #d79921
+foreground-alt = #458588
+highlight = #a89984
+error = #76dd7a
+red = #689d6a
+yellow = #b58900
+green = #b16286
+darkblue = #d79921
+alert = #FF0000
+lightblue = #ebd6b8
+orange = #458588
+blue = #ff2016
+black = #282828
+grey = #414141
diff --git a/.config/polybar/config b/.config/polybar/config
index d133951..9749cca 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -4,22 +4,7 @@
 ; |  \_/|_| |_)/--\| \
 ;
 [colors]
-background = #00000000
-background-alt = #fb4934
-foreground = #fabd2f
-foreground-alt = #8ec07c
-highlight = #d5c4a1
-error = #b8bb26
-red = #b8bb26
-yellow = #83a598
-green = #d3869b
-darkblue = #fabd2f
-alert = #FF0000
-lightblue = #fbf1c7
-orange = #8ec07c
-blue = #fb4934
-black = #282828
-grey = #665c54
+include-file = ~/.config/polybar/colors
 
 [bar/top]
 monitor = ${env:MONITOR:eDP-1}
diff --git a/.config/wpg/templates/config_polybar_config b/.config/wpg/templates/config_polybar_config
deleted file mode 120000
index 57c0176..0000000
--- a/.config/wpg/templates/config_polybar_config
+++ /dev/null
@@ -1 +0,0 @@
-/home/hate/.config/polybar/config
\ No newline at end of file
diff --git a/.config/wpg/templates/config_polybar_config.base b/.config/wpg/templates/config_polybar_config.base
deleted file mode 100644
index ec6f662..0000000
--- a/.config/wpg/templates/config_polybar_config.base
+++ /dev/null
@@ -1,581 +0,0 @@
-; vim:ft=dosini
-;  _  _      _      _
-; |_)/ \|\_/|_) /\ |_)
-; |  \_/|_| |_)/--\| \
-;
-[colors]
-background = #00000000
-background-alt = {color1}
-foreground = {color3}
-foreground-alt = {color6}
-highlight = {color7}
-error = {color10}
-red = {color2}
-yellow = {color4}
-green = {color5}
-darkblue = {color3}
-alert = #FF0000
-lightblue = {color15}
-orange = {color6}
-blue = {color9}
-black = {color0}
-grey = {color8}
-
-[bar/top]
-monitor = ${{env:MONITOR:eDP-1}}
-include-file = ~/.config/polybar/top-bar
-modules-left = i3 arrow01 xwindow arrow0
-modules-center = term chrome editor fm music vpn
-modules-right = arrow9 expressvpn-status arrow7 wlan arrow6 pkg arrow5 pavolume arrow4 battery arrow3 backlight arrow2 networkmanager arrow1 popup-calendar
-
-;tray-position = right
-;tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-
-[bar/bottom]
-monitor = ${{env:MONITOR:eDP-1}}
-include-file = ~/.config/polybar/bottom-bar
-modules-left = hostname  arrowb01
-modules-center = cpu memory temperature filesystem
-modules-right = arrowb1 openweather
-
-[module/arrowb01]
-type = custom/text
-content = ""
-content-foreground = ${{colors.blue}}
-content-background = #00000000
-
-[module/arrowb1]
-type = custom/text
-content = ""
-content-foreground = ${{colors.green}}
-content-background = #00000000
-
-[module/arrowb2]
-type = custom/text
-content = ""
-content-foreground = ${{colors.orange}}
-content-background = #00000000
-
-[module/arrow01]
-type = custom/text
-content = ""
-content-foreground = ${{colors.grey}}
-content-background = ${{colors.yellow}}
-
-
-[module/arrow0]
-type = custom/text
-content = ""
-content-foreground = ${{colors.yellow}}
-content-background = #00000000
-
-[module/arrow1]
-type = custom/text
-content = ""
-content-foreground = ${{colors.lightblue}}
-content-background = ${{colors.yellow}}
-
-[module/arrow2]
-type = custom/text
-content = ""
-content-foreground = ${{colors.yellow}}
-content-background = ${{colors.darkblue}}
-
-[module/arrow3]
-type = custom/text
-content = ""
-content-foreground = ${{colors.darkblue}}
-content-background = ${{colors.red}}
-
-[module/arrow4]
-type = custom/text
-content = ""
-content-foreground = ${{colors.red}}
-content-background = ${{colors.orange}}
-
-[module/arrow5]
-type = custom/text
-content = ""
-content-foreground = ${{colors.orange}}
-content-background = ${{colors.blue}}
-
-[module/arrow6]
-type = custom/text
-content = ""
-content-foreground = ${{colors.blue}}
-content-background = ${{colors.green}}
-
-[module/arrow7]
-type = custom/text
-content = ""
-content-foreground = ${{colors.green}}
-content-background = ${{colors.darkblue}}
-
-[module/arrow8]
-type = custom/text
-content = ""
-content-foreground = ${{colors.red}}
-content-background = ${{colors.darkblue}}
-
-[module/arrow9]
-type = custom/text
-content = ""
-content-foreground = ${{colors.darkblue}}
-content-background = #00000000
-
-[module/bluetoothctl]
-type = custom/script
-exec = ~/.config/Scripts/bluetoothctl.sh
-tail = true
-click-left = ~/.config/Scripts/bluetoothctl.sh --toggle
-label = " %output% "
-label-foreground = ${{colors.black}}
-label-background = ${{colors.orange}}
-
-[module/expressvpn-status]
-type = custom/script
-exec = ~/.config/Scripts/expressvpn-status.sh
-interval = 5
-;format-foreground = #E5E9F0
-;format-backgound = #5E81AC
-label = " %output%"
-label-foreground = ${{colors.black}} 
-label-background = ${{colors.darkblue}}
-
-[module/pavolume]
-type = custom/script
-tail = true
-label = " %output% "
-exec = ~/.config/Scripts/pavolume.sh --listen
-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}}
-
-[module/filesystem]
-type = internal/fs
-mount-0 = /
-interval = 10
-fixed-values = true
-spacing = 4
-format-mounted = <label-mounted>
-format-unmounted = <label-unmounted>
-label-mounted = "  %percentage_used%%"
-label-mounted-foreground = ${{colors.foreground}}
-label-mounted-background = ${{colors.background}}
-label-unmounted = %mountpoint%: not mounted
-label-unmounted-foreground = ${{colors.foreground-alt}}
-
-[module/backlight]
-type = custom/script
-interval = 0.2
-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}}
-label = "%output%% "
-label-foreground = ${{colors.black}}
-label-background = ${{colors.darkblue}}
-
-[module/popup-calendar]
-type = custom/script
-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}}
-label = "%output% "
-format-foreground = ${{colors.black}}
-format-background = ${{colors.lightblue}}
-
-[module/vpncheck]
-type = custom/script
-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}}
-
-[module/hostname]
-type = custom/script
-interval = 256
-format = "<label>"
-format-prefix = "  "
-;format-prefix = ""
-exec = echo "$(uname -nr)"
-format-prefix-foreground = ${{colors.black}}
-format-prefix-background = ${{colors.blue}}
-label = "%output% "
-label-foreground = ${{colors.black}}
-label-background = ${{colors.blue}}
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 1
-hwmon-path = /sys/devices/platform/coretemp.0/hwmon/hwmon5/temp1_input
-warn-temperature = 65
-format = <ramp> <label>
-format-underline = ${{colors.foreground}}
-format-warn = <ramp> <label-warn>
-format-warn-underline = ${{self.format-underline}}
-label = "%temperature-c% "
-label-warn = " %temperature-c% "
-label-warn-foreground = ${{colors.alert}}
-ramp-0 = " "
-ramp-1 = " "
-ramp-2 = " "
-ramp-3 = " "
-ramp-4 = " "
-ramp-foreground = ${{colors.foreground}}
-
-[module/pkg]
-type = custom/script
-exec = "~/.config/Scripts/arch-updates.sh -s"
-tail = true
-format = "<label> "
-;format-prefix = " "
-format-prefix = "  "
-format-prefix-foreground = ${{colors.black}}
-format-foreground = ${{colors.black}}
-format-background = ${{colors.blue}}
-click-left = st -e yay --noconfirm -Syu
-click-right = "~/.config/Scripts/arch-updates.sh -c&"
-click-middle = "~/.config/Scripts/arch-updates.sh -n"
-
-[module/openweather]
-type = custom/script
-exec = ~/.config/Scripts/openweather.sh
-tail = true
-interval = 600
-click-left = ~/.config/Scripts/wttr.sh
-format = <label>
-format-foreground = ${{colors.black}}
-format-background = ${{colors.green}}
-
-[module/i3]
-type = internal/i3
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-; Only show workspaces on the same output as the bar
-pin-workspaces = true
-ws-icon-0 = 1:;
-ws-icon-1 = 2:;
-ws-icon-2 = 3:;
-ws-icon-3 = 4:;
-ws-icon-4 = 5:;
-ws-icon-5 = 6:;
-ws-icon-6 = 7:;
-ws-icon-7 = 8:;
-ws-icon-8 = 9:;
-ws-icon-9 = 10:;
-label-mode-padding = 1
-label-mode-foreground = ${{colors.foreground}}
-label-mode-background = ${{colors.grey}}
-; focused = Active workspace on focused monitor
-label-focused = %icon%
-label-focused-foreground = ${{colors.foreground-alt}}
-label-focused-background = ${{colors.grey}}
-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-padding = 1
-; urgent = Workspace with urgency hint set
-label-urgent = %icon%
-label-urgent-background = ${{colors.alert}}
-label-urgent-padding = 1
-
-[module/fm]
-type = custom/text
-content = " "
-content-foreground = ${{colors.foreground}}
-click-left = st -e ranger &
-click-right = pcmanfm &
-
-[module/term]
-type = custom/text
-content = " "
-content-foreground = ${{colors.foreground}}
-click-left = st &
-click-right = st -e tmux new -s tmux1 &
-
-[module/vpn]
-type = custom/text
-content = " "
-content-foreground = ${{colors.foreground}}
-click-left = "exec expressvpn connect"
-click-right = "exec expressvpn disconnect"
-
-[module/editor]
-type = custom/text
-content = " "
-content-foreground = ${{colors.foreground}}
-click-left = st -e nvim &
-click-right = leafpad &
-
-[module/chrome]
-type = custom/text
-content = " "
-content-foreground = ${{colors.foreground}}
-click-left = google-chrome-stable &
-
-[module/music]
-type = custom/text
-content = " "
-content-foreground = ${{colors.foreground}}
-click-left = st -e ncmpcpp &
-click-right = gpmdp &
-
-[module/workspace]
-type = custom/script
-interval = 1
-label = %{{A4:wmctrl -s "$(($(xprop -root _NET_CURRENT_DESKTOP | cut -d '=' -f 2 | cut -d ' ' -f 2)+1))":}}%{{A5:wmctrl -s "$(($(xprop -root _NET_CURRENT_DESKTOP | cut -d '=' -f 2 | cut -d ' ' -f 2)-1))":}}%output%  %{{A}}%{{A}}
-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}}
-
-[module/window_count]
-type = custom/script
-interval = 1
-label = %{{A1:rofi -width 30 -location 1 -xoffset 3 -show window:}}%output% %{{A}}
-exec = echo "$(($(lsw | wc -l)-1))"
-format = <label>
-format-prefix = " "
-format-prefix-foreground = ${{colors.foreground-alt}}
-
-[module/xtitle]
-type = custom/script
-interval = 1
-label = %output%
-label-maxlen = 40
-exec = echo "$(xtitle)"
-format = <label>
-format-background = ${{colors.background-alt}}
-format-prefix = " "
-format-prefix-foreground = ${{colors.foreground}}
-format-padding = 1
-
-
-[module/xwindow]
-type = internal/xwindow
-;format-padding = ${{spacing.padding}}
-;label = "    %title%"
-;label = "%title%"
-label = " %title:0:30:...%"
-label-maxlen = 150
-label-foreground = ${{colors.black}}
-label-background = ${{colors.yellow}}
-
-[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}}
-format-online-background = ${{colors.background-alt}}
-format-online-padding = 1
-icon-play = 
-icon-pause = 
-icon-stop = 
-icon-prev = 
-icon-next = 
-icon-random = 
-label-song = %title%
-label-song-maxlen = 25
-label-song-ellipsis = true
-toggle-on-foreground = ${{colors.foreground}}
-toggle-off-foreground = ${{colors.foreground-alt}}
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-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-background = ${{colors.background}}
-
-[module/cpu]
-format-label = internal/cpu
-format = <label>
-type = internal/cpu
-interval = 2
-label = " %percentage%% "
-format-foreground = ${{colors.foreground}}
-
-[module/memory]
-type = internal/memory
-interval = 2
-label = " %percentage_used%%"
-format-foreground = ${{colors.foreground}}
-
-[module/cputemp]
-type = custom/script
-exec = sensors | grep --max-count=1 "temp1" | awk '{{print substr($0,16,2)}}'
-interval = 10
-label = " %output%°C"
-format-foreground = ${{colors.foreground-alt}}
-
-[module/clock]
-type = custom/script
-interval = 5
-exec = echo "$(date +%R)"
-format = <label>
-;format-prefix = " "
-format-foreground = ${{colors.foreground-alt}}
-label = %{{A1:gsimplecal &:}}%output%%{{A}}
-
-[module/alsa]
-type = internal/alsa
-master-soundcard = default
-speaker-soundcard = default
-headphone-soundcard = default
-master-mixer = Master
-speaker-mixer = Speaker
-headphone-mixer = Headphone
-headphone-id = 19
-mapped = true
-interval = 5
-format-volume = <ramp-volume> <label-volume>
-label-volume = %percentage%%
-label-volume-foreground = ${{colors.foreground}}
-format-muted = <label-muted>
-format-muted-foreground = ${{colors.alert}}
-label-muted =  muted
-ramp-volume-0 = 
-ramp-volume-1 = 
-ramp-volume-foreground = ${{colors.foreground}}
-ramp-headphones-0 = 
-ramp-headphones-1 = 
-
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = AC
-full-at = 98
-time-format = %H:%M
-label-full = "%percentage%% "
-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-full-prefix = "  "
-format-full-prefix-foreground = ${{colors.black}}
-format-full-prefix-background = ${{colors.red}}
-label-full-foreground = ${{colors.black}}
-label-full-background = ${{colors.red}}
-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-framerate = 500
-animation-discharging-0 = " "
-animation-discharging-1 = " "
-animation-discharging-2 = " "
-animation-discharging-3 = " "
-animation-discharging-4 = " "
-animation-discharging-framerate = 1000
-animation-discharging-foreground = ${{colors.black}}
-animation-discharging-background = ${{colors.red}}
-
-[module/networkmanager]
-type = custom/text
-content = " net  " 
-content-foreground = ${{colors.black}}
-content-background = ${{colors.yellow}}
-click-left = networkmanager_dmenu
-
-[module/eth]
-type = internal/network
-interface = enp0s25
-interval = 3.0
-format-connected = <label-connected>
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${{colors.foreground-alt}}
-format-disconnected = <label-disconnected>
-label-connected = %{{A1:networkmanager_dmenu:}}%downspeed%%{{A}}
-label-connected-foreground = ${{colors.foreground}}
-label-disconnected =
-
-[module/wlan]
-type = internal/network
-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-disconnected = <label-disconnected>
-label-disconnected = "%{{A1:connman-gtk &:}}%{{A}}"
-format-disconnected-foreground = ${{colors.black}}
-format-disconnected-background = ${{colors.red}}
-ramp-signal-0 = 
-ramp-signal-1 = 
-ramp-signal-2 = 
-ramp-signal-3 = 
-ramp-signal-4 = 
-ramp-signal-foreground = ${{colors.black}}
-
-[module/powermenu]
-type = custom/menu
-format-spacing = 1
-label-open = 
-label-open-font = 2
-label-open-foreground = ${{colors.red}}
-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-exec = menu-open-1
-menu-0-1 = 
-menu-0-1-foreground = ${{colors.red}}
-menu-0-1-exec = menu-open-2
-menu-1-0 = reboot?
-menu-1-0-exec = /sbin/reboot
-menu-1-1 = 
-menu-1-1-exec = menu-open-0
-menu-2-0 = 
-menu-2-0-exec = menu-open-0
-menu-2-1 = shutdown?
-menu-2-1-exec = /sbin/poweroff
-
-[settings]
-screenchange-reload = true
-;compositing-background = xor
-;compositing-background = screen
-;compositing-foreground = source
-;compositing-border = over
-
-;[global/wm]
-;margin-top = 0
-;margin-bottom = 0