diff --git a/fish/.config/fish/functions/fzf_key_bindings.fish b/fish/.config/fish/functions/fzf_key_bindings.fish
index 65f85a5..ff68d89 120000
--- a/fish/.config/fish/functions/fzf_key_bindings.fish
+++ b/fish/.config/fish/functions/fzf_key_bindings.fish
@@ -1 +1 @@
-/Users/colinpowell/.fzf/shell/key-bindings.fish
\ No newline at end of file
+/home/powellc/.fzf/shell/key-bindings.fish
\ No newline at end of file
diff --git a/i3/.config/i3/config b/i3/.config/i3/config
index 0cc1887..bee7a39 100644
--- a/i3/.config/i3/config
+++ b/i3/.config/i3/config
@@ -32,11 +32,11 @@ font pango:DejaVu Sans Mono 8
 floating_modifier $mod
 exec feh --bg-scale /usr/share/backgrounds/Cuttlefish Wallpaper Grey 4096x2304.png
 
-exec --no-startup-id betterlockscreen -w
-exec --no-startup-id fish /home/aria/tmuxify.sh
-bindsym $mod+shift+x exec --no-startup-id betterlockscreen -l dimblur
+#exec --no-startup-id betterlockscreen -w
+#exec --no-startup-id fish /home/aria/tmuxify.sh
+#bindsym $mod+shift+x exec --no-startup-id betterlockscreen -l dimblur
 # binds
-bindsym $mod+Return exec --no-startup-id kitty
+bindsym $mod+Return exec --no-startup-id alacritty
 bindsym $mod+a exec --no-startup-id fish -c emacs
 bindsym $mod+e exec --no-startup-id fish -c rofimoji
 bindsym $mod+p exec --no-startup-id fish -c "i3-quickterm shell"
@@ -149,6 +149,9 @@ bindsym $mod+Shift+r restart
 # exit i3 (logs you out of your X session)
 bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
 
+bar {
+    status_command i3status
+}
 # resize window (you can also use the mouse for that)
 mode "resize" {
         # These bindings trigger as soon as you enter the resize mode
@@ -175,8 +178,8 @@ mode "resize" {
 }
 
 bindsym $mod+r mode "resize"
-smart_borders on
-exec_always --no-startup-id ~/.config/i3/polybar.sh
+#smart_borders on
+#exec_always --no-startup-id ~/.config/i3/polybar.sh
 exec --no-startup-id compton &
 
 gaps inner 5
diff --git a/i3/.config/i3/polybar.sh b/i3/.config/i3/polybar.sh
index 9b31fb8..dba7870 100755
--- a/i3/.config/i3/polybar.sh
+++ b/i3/.config/i3/polybar.sh
@@ -7,4 +7,4 @@ killall -q polybar
 while pgrep -x polybar >/dev/null; do sleep 1; done
 
 # Launch polybar
-polybar top &
+polybar main &
diff --git a/polybar/.config/polybar/config b/polybar/.config/polybar/config
index 2239862..a848099 100644
--- a/polybar/.config/polybar/config
+++ b/polybar/.config/polybar/config
@@ -1,145 +1,327 @@
-[bar/base]
-width = 100%
-height = 28
+# vim: ft=dosini
+[colors]
+	accent = #EDD080
+	bckgrd = #121212
+	select = #161A1B
 
-font-0 = -misc-fixed-medium-r-s*-13-*-iso10646-1
-font-1 = Font Awesome:size=8:antialias=false
-font-2 = DejaVu Sans:size=9:antialias=false
+	background =            ${xrdb:color0:self.bckgrd}
+	background-alt = 		${self.select}
+	foreground =            ${xrdb:color6:#A5ffffff}
+	foreground-alt =        ${xrdb:color7:#222}
+    primary =               ${xrdb:color1:self.accent}
+	secondary =             ${xrdb:color2:#222}
+	alert =                 ${xrdb:color3:#bd2c40}
+	white = 			    #FFFFFF
+    grey =                  #AAAAAA
+	transparent = 			#00000000
 
-background = ${xrdb:bga:#dd222228}
-foreground = ${xrdb:fg:#d8dade}
 
-module-margin-left = 1
-module-margin-right = 1
+[global/wm]
+	margin-top = 0
+	margin-bottom = 0
 
-modules-left = i3 xwindow
-modules-right = mail lan_i lan wlan volume_i volume xkeyboard date
 
-tray-padding = 4
-tray-position = right
-tray-background = ${xrdb:bg:#222228}
+[settings]
+	throttle-output = 5
+	throttle-output-for = 10
+	throttle-input-for = 30
+	screenchange-reload = true
+	bargapp= 10
+	barwidth = 100%
+	barheigh = 48
 
-[bar/top]
-inherit = bar/base
 
-# font-0 = Ubuntu:size=9:antialias=false
-# font-1 = Font Awesome:size=8:antialias=false
-# font-2 = monospace:size=9:antialias=false
+[bar/main]
+	monitor-strict = true
+	fixed-center = true
+	dpi = 96
+	bottom = false
+	width = ${settings.barwidth}
+	height = ${settings.barheigh}
+	offset-x = 0
+	offset-y = 0
+	background = ${colors.background}
+	foreground = ${colors.foreground}
+	overline-size = 0
+	overline-color = #f00
+	underline-size = 2
+	underline-color = #00f
+	border-top-size = ${settings.bargapp}
+	border-left-size = ${settings.bargapp}
+	border-right-size = ${settings.bargapp}
+	border-bottom-size = 0
+	border-color = ${colors.transparent}
+	radius-top = 10
+	radius-bottom = 10
+	spacing = 2
+	padding-left = 2
+	padding-right = 2
+	module-margin-left = 2
+	module-margin-right = 2
+	font-0 = Monoid:size=12;4
+    font-1 = unifont:size=12;1
+    font-2 = FontAwesome:size=12;3
+    font-3 = NotoSans-Regular:size=12;-1
+    font-4 = MaterialIcons:size=16;5
+	tray-position = right
+	tray-padding = 4
+	modules-left = cast wlan
+    modules-center = mpd
+	modules-right = filesystem battery volume light date
 
-[bar/bottom]
-inherit = bar/base
-bottom = true
 
-# Workspaces {{{
+[bar/workspaces]
+	monitor-strict = true
+	dpi = 96
+	bottom = true
+    width = ${settings.barwidth}
+    height = 3
+	background = ${colors.transparent}
+	foreground = ${colors.foreground}
+	border-top-size = 0
+	border-bottom-size = 0
+	border-color = ${colors.transparent}
+	font-0 = Monoisome:size=10;4
+	font-1 = FontAwesome:pixelsize=10;3
+	font-5 = unifont:size=14;1
+	modules-center = i3 BSP
+
 
 [module/i3]
-type = internal/i3
+	type = internal/i3
+	format = <label-state> <label-mode>
+	pin-workspaces = true
+	label-focused = %name%
+	label-focused-foreground= ${colors.background}
+	label-focused-background = ${colors.foreground}
+	label-focused-underline = ${colors.foreground}
+	label-focused-padding = 3
+	label-unfocused = %name%
+	label-unfocused-padding = 2
+	label-unfocused-background = ${colors.background}
+	label-urgent = %name%
+	label-urgent-foreground= ${colors.alert}
+	label-urgent-background = ${colors.background-alt}
+	label-urgent-padding = 2
+	label-empty = %name%
+	label-empty-background = ${colors.background-alt}
+	label-empty-padding = ${self.label-focused-padding}
 
-label-focused = %index%
-label-focused-padding = 2
-label-focused-background = ${bar/base.foreground}
-label-focused-foreground = ${bar/base.background}
 
-label-unfocused = ${self.label-focused}
-label-unfocused-padding = ${self.label-focused-padding}
+[module/mouseloc]
+	type = custom/script
+	exec = echo "X:" $(xdotool getmouselocation | awk '{print substr($2,3,4)}') "  Y:" $(xdotool getmouselocation | awk '{print substr($1,3,4)}')
+	interval = 0.1
+	label = %output%
+	format = <label>
+	format-foreground = ${colors.foreground}
 
-label-urgent = ${self.label-focused}
-label-urgent-padding = ${self.label-focused-padding}
-label-urgent-background = ${xrdb:color4:#d7af87}
-label-urgent-foreground = ${self.label-focused-foreground}
+[module/mpd]
+    type = internal/mpd
+    host = 127.0.0.1
+    port = 6600
+    interval = 1
+    format-online = <icon-prev> <icon-stop> <toggle> <icon-next>  <icon-repeat> <icon-random>  <bar-progress> <label-time>  <label-song>
+    icon-play = 
+    icon-pause = 
+    icon-stop = 
+    icon-prev = 
+    icon-next = 
+    icon-random = 
+    icon-repeat = 
+    toggle-on-foreground =
+    toggle-off-foreground = #55
+    bar-progress-width = 30
+    bar-progress-format = %{A4:mpdseek+2: A5:mpdseek-2:}%fill%%indicator%%empty%%{A A}
+    bar-progress-indicator = |
+    bar-progress-indicator-foreground = #ff
+    bar-progress-indicator-font = 3
+    bar-progress-fill = —
+    bar-progress-fill-foreground = #bb
+    bar-progress-fill-font = 3
+    bar-progress-empty = —
+    bar-progress-empty-font = 3
+    bar-progress-empty-foreground = #44
 
-# }}}
-# Windows {{{
+[module/title]
+	type = internal/xwindow
+	format = <label>
+	;format-foreground = ${colors.foreground}
 
-[module/xwindow]
-type = internal/xwindow
-label-maxlen = 100
 
-# }}}
-# Mail {{{
+[module/search]
+	type = custom/script
+	exec = echo "   search:    "
+	interval = 60
+	label = %output%
+	format = <label>
+	format-foreground = ${colors.background}
+	format-background = ${colors.foreground}
 
-[module/mail]
-type = custom/script
-exec = ~/.config/polybar/status.sh mail
-interval = 2
 
-click-left = ~/.config/polybar/start.sh mail &
-click-right = ~/.mutt/fetch.sh &
+[module/cpu]
+	format-label = internal/cpu
+	format = <label>
+	type = internal/cpu
+	interval = 2
+	label = " %percentage%%"
+	format-foreground = ${colors.foreground}
 
-# }}}
-# Weather {{{
 
-[module/weather]
-type = custom/script
-exec = ~/.config/polybar/status.sh weather
-interval = 3600
+[module/memory]
+	type = internal/memory
+	interval = 2
+	label = " %percentage_used%%"
+	format-foreground = ${colors.foreground}
 
-click-left = notify-send Погода "$(< ~/.config/polybar/status.weather)"
-click-right = ~/.config/polybar/status.sh weather &
 
-# }}}
-# Internet {{{
+[module/temperature]
+	type = internal/temperature
+	warn-temperature = 65
 
-[module/lan]
-type = internal/network
-interface = enp0s3
+	format = <label> 
+	format-warn = <label-warn>
+
+	label = %temperature%
+	label-warn = %temperature%!!!
+
+
+[module/cputemp]
+	type = custom/script
+	exec = sensors | grep --max-count=1 "CPU Temperature:" | awk '{print substr($0,22,2)}'
+	interval = 10
+	label = " %output%°C"
+	format-foreground = ${colors.foreground}
+
+
+[module/gputemp]
+	type = custom/script
+	exec = nvidia-smi --query-gpu=temperature.gpu --format=csv,noheader,nounits
+	interval = 10
+	label = "GPU %output%°C"
+	format-foreground = ${colors.foreground}
 
-label-connected = %downspeed% %upspeed%
 
 [module/wlan]
-inherit = module/lan
-interface = wlx784476bf0f9a
+	type = internal/network
+	interface = wlp2s0
+	interval = 3.0
+	format-connected = <label-connected>
+	label-connected =  %essid%     %signal%     %upspeed%     %downspeed%
+	label-disconnected = "%{A1:connman-gtk &:}%{A}"
+	label-disconnected-foreground = #5b
+	ramp-signal-0 = 
+	ramp-signal-1 = 
+	ramp-signal-2 = 
+	ramp-signal-3 = 
+	ramp-signal-4 = 
+	ramp-signal-foreground = ${colors.foreground}
+	format-connected-foreground = ${colors.foreground}
 
-[module/lan_i]
-type = custom/script
-exec = ~/.config/polybar/status.sh wifi
-interval = 5
-
-click-left = ~/.config/polybar/start.sh network &
-
-# }}}
-# Volume {{{
-
-[module/volume]
-type = internal/volume
-
-format-volume = <bar-volume>
-format-muted = ${self.format-volume}
-format-muted-foreground = #888
-
-bar-volume-width = 20
-bar-volume-indicator = |
-bar-volume-fill = -
-bar-volume-empty = -
-bar-volume-empty-foreground = ${self.format-muted-foreground}
-
-[module/volume_i]
-type = custom/text
-content = 
-
-click-left = ~/.config/polybar/start.sh mixer &
-
-# }}}
-# Keyboard {{{
-
-[module/xkeyboard]
-type = internal/xkeyboard
-
-label-layout = %name:0:2%
-label-layout-padding = 2
-
-label-indicator = %name:0:4%
-label-indicator-padding = 1
-
-# }}}
-# Date {{{
 
 [module/date]
-type = internal/date
+	type = internal/date
+	interval = 1.0
+	date = %a %b %d, 
+	time = %H:%M
+	date-alt = %A, %d %B %Y
+	time-alt = %H:%M:%S
+	label = %date% %time%
+	format = <label>
+	format-foreground = ${colors.foreground}
 
-date = "%H:%M  "
-date-alt = "%a, %d %b %H:%M:%S  "
 
-# }}}
+[module/volume]
+	type = internal/volume
+	format-volume = <ramp-volume><label-volume>
+	format-muted = <label-muted>
+	format-volume-foreground = ${colors.foreground}
+	label-volume = %percentage%
+	label-muted =   M
+	label-muted-foreground = #aaa
+	ramp-volume-0 = 
+	ramp-volume-1 = 
+	ramp-volume-2 = 
+	ramp-headphones-0 = 
+
+
+[module/pomo]
+	type = custom/script
+	interval = 1
+	exec = pomo status | awk '{print substr($3,1,6)}' | grep -o '[0-9]\+' | sed 'N;s/\n/ : /'
+	label = "  %output%"
+	format-foreground = ${colors.foreground}
+
+
+[module/bresilla]
+	type = custom/script
+	interval = 1
+	exec = echo "BRESILLA"
+	label = "%output%"
+	click-left = firefox --new-tab "www.bresilla.com"
+	format-foreground = ${colors.foreground}
+
+
+[module/light]
+	type = internal/backlight
+	card = intel_backlight
+	enable-scroll = true
+	format = <label>
+	label =  %percentage%%
+	label-foreground = ${colors.foreground}
+
+
+[module/battery]
+	type = internal/battery
+	battery = BAT0
+	adapter = AC
+	full-at = 98
+	time-format = %H:%M
+	label-charging = %percentage%%
+	label-discharging = %percentage%%
+	format-charging = <animation-charging> <label-charging>
+	format-discharging = <animation-discharging> <label-discharging>
+	format-charging-foreground = ${colors.foreground}
+	label-charging-foreground = ${colors.foreground}
+	format-discharging-foreground = ${colors.foreground}
+	label-discharging-foreground = ${colors.foreground}
+	format-full-prefix = " "
+	format-full-prefix-foreground = ${colors.foreground}
+	label-full-foreground = ${colors.foreground}
+	animation-charging-0 = 
+	animation-charging-1 = 
+	animation-charging-2 = 
+	animation-charging-3 = 
+	animation-charging-4 = 
+	animation-charging-foreground = ${colors.foreground}
+	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.foreground}
+	click-left = bash ~/.startup -r
+
+
+[module/jgmenu]
+    type = custom/text
+    content-padding = 2
+    content = menu
+    click-left = "jgmenu_run >/dev/null 2>&1 &"
+
+[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-unmounted = %mountpoint%: not mounted
+    label-unmounted-foreground = ${colors.foreground}
+
 
-# vim: ft=dosini