diff --git a/.config/fish/config.fish b/.config/fish/config.fish
index b064a50..2ca4e9a 100644
--- a/.config/fish/config.fish
+++ b/.config/fish/config.fish
@@ -17,7 +17,11 @@ set -Ux DESKTOP_SESSION bspwm
 set -Ux EDITOR vim
 set -Ux JDK_JAVA_OPTIONS "-Dswing.defaultlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Dswing.crossplatformlaf=com.sun.java.swing.plaf.gtk.GTKLookAndFeel -Djdk.gtk.version=3 -Dawt.useSystemAAFontSettings=on -Dswing.aatext=true"
 set -Ux SYSTEMD_EDITOR vim
-set -gx fish_user_paths $fish_user_paths (ruby -e 'print Gem.user_dir')/bin /home/agatha/.cargo/bin /home/agatha/.cabal/bin
+set -gx fish_user_paths $fish_user_paths (ruby -e 'print Gem.user_dir')/bin /home/agatha/.cargo/bin /home/agatha/.cabal/bin /home/agatha/.espressif/tools/xtensa-esp32-elf-clang/esp-13.0.0-20211203-x86_64-unknown-linux-gnu/bin/
+
+set -Ux LIBCLANG_PATH "/home/agatha/.espressif/tools/xtensa-esp32-elf-clang/esp-13.0.0-20211203-x86_64-unknown-linux-gnu/lib"
+set -Ux PIP_USER no
+
 
 alias cat bat
 alias code codium
diff --git a/.config/flameshot/flameshot.ini b/.config/flameshot/flameshot.ini
deleted file mode 100644
index 5837b96..0000000
--- a/.config/flameshot/flameshot.ini
+++ /dev/null
@@ -1,50 +0,0 @@
-[General]
-buttons=@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\x13\0\0\0\0\0\0\0\x1\0\0\0\x2\0\0\0\x3\0\0\0\x4\0\0\0\x5\0\0\0\x6\0\0\0\x12\0\0\0\xf\0\0\0\a\0\0\0\b\0\0\0\t\0\0\0\x10\0\0\0\n\0\0\0\v\0\0\0\r\0\0\0\xe\0\0\0\f\0\0\0\x11)
-contrastOpacity=188
-contrastUiColor=#70477c
-disabledTrayIcon=false
-drawColor=#9c84a5
-drawThickness=7
-filenamePattern=Screenshot-%F_%H-%M
-ignoreUpdateToVersion=11.0.0
-saveAsFileExtension=png
-savePath=/home/agatha/Pictures/screenshots
-savePathFixed=false
-showHelp=false
-showSidePanelButton=false
-showStartupLaunchMessage=true
-startupLaunch=true
-uiColor=#564d6e
-
-[Shortcuts]
-TYPE_ARROW=A
-TYPE_CIRCLE=C
-TYPE_CIRCLECOUNT=
-TYPE_COMMIT_CURRENT_TOOL=Ctrl+Return
-TYPE_COPY=Ctrl+C
-TYPE_DELETE_CURRENT_TOOL=Del
-TYPE_DRAWER=D
-TYPE_EXIT=Ctrl+Q
-TYPE_MARKER=M
-TYPE_MOVESELECTION=Ctrl+M
-TYPE_MOVE_DOWN=Down
-TYPE_MOVE_LEFT=Left
-TYPE_MOVE_RIGHT=Right
-TYPE_MOVE_UP=Up
-TYPE_OPEN_APP=Ctrl+O
-TYPE_PENCIL=P
-TYPE_PIN=
-TYPE_PIXELATE=B
-TYPE_RECTANGLE=R
-TYPE_REDO=Ctrl+Shift+Z
-TYPE_RESIZE_DOWN=Shift+Down
-TYPE_RESIZE_LEFT=Shift+Left
-TYPE_RESIZE_RIGHT=Shift+Right
-TYPE_RESIZE_UP=Shift+Up
-TYPE_SAVE=Ctrl+S
-TYPE_SELECTION=S
-TYPE_SELECTIONINDICATOR=
-TYPE_SELECT_ALL=Ctrl+A
-TYPE_TEXT=T
-TYPE_TOGGLE_PANEL=Space
-TYPE_UNDO=Ctrl+Z
diff --git a/.config/kitty/kitty.conf b/.config/kitty/kitty.conf
index 3f154bf..c05ad2c 100644
--- a/.config/kitty/kitty.conf
+++ b/.config/kitty/kitty.conf
@@ -8,15 +8,12 @@
 #                          (      
 #                           -_-   
 
+font_family	 Sarasa Term Slab SC
+bold_font	 Sarasa Term Slab SC Bold
+italic_font	 Sarasa Term Slab SC Italic
+bold_italic_font Sarasa Term Slab SC Bold Italic
 
-font_family	 Iosevka Term Medium Nerd Font Complete Mono
-bold_font        Iosevka Term Heavy Nerd Font Complete Mono
-italic_font      Iosevka Term Medium Italic Nerd Font Complete Mono
-bold_italic_font Iosevka Term Bold Italic Nerd Font Complete Mono
-# font_family	 Fira Code Light Nerd Font Complete
-# font_family	 CozetteVector
-
-font_features IosevkaNerdFontCompleteM-Medium +ss05 +cv25=26 +cv26=9 +cv50=26 +cv71=2 +cv74=1 +cv82=2 +cv87=3
+# font_features IosevkaNerdFontCompleteM-Medium +ss05 +cv25=26 +cv26=9 +cv50=26 +cv71=2 +cv74=1 +cv82=2 +cv87=3
 
 font_size 11.5
 disable_ligatures never
diff --git a/.config/neofetch/config.conf b/.config/neofetch/config.conf
index 408ef47..3fa6222 100644
--- a/.config/neofetch/config.conf
+++ b/.config/neofetch/config.conf
@@ -17,8 +17,8 @@ print_info() {
     info "Terminal" term
     info "Terminal Font" term_font
     info "CPU" cpu
-    # info "GPU" gpu
-    prin "GPU" "AMD Radeon RX 570"
+    info "GPU" gpu
+    # prin "GPU" "AMD Radeon RX 570"
     info "Memory" memory
     prin "Agatha" "awoo"
 
diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf
index 97e1b5c..2c877f3 100644
--- a/.config/picom/picom.conf
+++ b/.config/picom/picom.conf
@@ -156,6 +156,12 @@ focus-exclude = [
 #    opacity-rule = [ "80:class_g = 'URxvt'" ];
 #
 opacity-rule = [
+    "100:_NET_WM_STATE@[0]:32a = '_NET_WM_STATE_FULLSCREEN'",
+    "100:_NET_WM_STATE@[1]:32a = '_NET_WM_STATE_FULLSCREEN'",
+    "100:_NET_WM_STATE@[2]:32a = '_NET_WM_STATE_FULLSCREEN'",
+    "100:_NET_WM_STATE@[3]:32a = '_NET_WM_STATE_FULLSCREEN'",
+    "100:_NET_WM_STATE@[4]:32a = '_NET_WM_STATE_FULLSCREEN'",  
+    "0:_COMPTON_MONOCLE@:32c = 0",
     "70:class_g  = 'kitty'",
     "80:class_g ?= 'discord'",
     "80:class_g  = 'Dunst'",
diff --git a/.config/polybar/config b/.config/polybar/config
index 3c76493..6483ec9 100644
--- a/.config/polybar/config
+++ b/.config/polybar/config
@@ -25,7 +25,7 @@ secondary = ${xrdb:color2:#222}
 alert = ${xrdb:color3:#222}
 
 [bar/right]
-monitor = ${env:MONITOR:DVI-D-2}
+monitor = ${env:MONITOR:eDP-1}
 width = 100%:-30
 height = 30
 offset-x = 15
@@ -55,7 +55,7 @@ font-3 = Symbols Nerd Font:pixelsize=10;2
 
 modules-left = bspwm
 modules-center = date
-modules-right = filesystem pulseaudio xkeyboard memory cpu powermenu
+modules-right = filesystem battery pulseaudio xkeyboard memory cpu powermenu
 
 wm-restack = bspwm
 
@@ -195,7 +195,7 @@ time-alt = %H:%M:%S
 format-prefix = 
 format-prefix-foreground = ${colors.foreground-alt}
 
-label = %{A3:dunstify ' Calendar' "$(cal --color=always | sed "s#\x1b\[7m#<b>#;s#\x1b\[27m#</b>#g")​":}%date%%{A} %time%
+label = %{A3:dunstify ' Calendar' "$(cal --color=always | sed "s#\\x1b\\[7m#<b>#;s#\\x1b\\[27m#</b>#g")​":}%date%%{A} %time%
 
 [module/pulseaudio]
 type = internal/pulseaudio
@@ -287,6 +287,68 @@ screenchange-reload = true
 ; scroll-up = ~/.config/polybar/scripts/pipewire.sh up &
 ; scroll-down = ~/.config/polybar/scripts/pipewire.sh down &
 
+[module/battery]
+type = internal/battery
+
+; This is useful in case the battery never reports 100% charge
+; Default: 100
+full-at = 99
+
+; format-low once this charge percentage is reached
+; Default: 10
+; New in version 3.6.0
+low-at = 10
+
+; Use the following command to list batteries and adapters:
+; $ ls -1 /sys/class/power_supply/
+battery = BAT0
+adapter = AC
+
+format-charging = <animation-charging> <label-charging>
+format-discharging = <ramp-capacity> <label-discharging>
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+;   %time%
+;   %consumption% (shows current charge rate in watts)
+label-charging = %percentage_raw%%
+
+; Available tokens:
+;   %percentage% (default) - is set to 100 if full-at is reached
+;   %percentage_raw%
+;   %time%
+;   %consumption% (shows current discharge rate in watts)
+label-discharging = %percentage_raw%%
+
+label-full = ""
+
+ramp-capacity-0 = 
+ramp-capacity-1 = 
+ramp-capacity-2 = 
+ramp-capacity-3 = 
+ramp-capacity-4 = 
+
+; Only applies if <animation-charging> is used
+animation-charging-0 = 
+animation-charging-1 = 
+animation-charging-2 = 
+animation-charging-3 = 
+animation-charging-4 = 
+; Framerate in milliseconds
+animation-charging-framerate = 750
+
+; If an inotify event haven't been reported in this many
+; seconds, manually poll for new values.
+;
+; Needed as a fallback for systems that don't report events
+; on sysfs/procfs.
+;
+; Disable polling by setting the interval to 0.
+;
+; Default: 5
+poll-interval = 3
+
 [module/spotify]
 type = custom/script
 interval = 1
@@ -308,4 +370,11 @@ exec = ~/.config/polybar/scripts/notification-status.sh
 interval = 2
 format-prefix = " "
 
+[module/player-mpris-simple]
+type = custom/script
+exec = ~/.config/polybar/scripts/player-mpris-simple.sh
+format-prefix = " "
+interval = 2
+click-left = playerctl play-pause &
+
 ; vim:ft=dosini
diff --git a/.config/qalculate/qalc.cfg b/.config/qalculate/qalc.cfg
index 3270c95..343608c 100644
--- a/.config/qalculate/qalc.cfg
+++ b/.config/qalculate/qalc.cfg
@@ -1,6 +1,6 @@
 
 [General]
-version=3.22.0
+version=4.1.1
 save_mode_on_exit=1
 save_definitions_on_exit=1
 ignore_locale=0
@@ -24,6 +24,7 @@ dot_as_separator=-1
 comma_as_separator=0
 multiplication_sign=2
 division_sign=0
+implicit_question_asked=1
 
 [Mode]
 min_deci=0
@@ -69,7 +70,7 @@ allow_complex=1
 allow_infinite=1
 indicate_infinite_series=0
 show_ending_zeroes=1
-round_halfway_to_even=0
+rounding_mode=0
 approximation=-1
 interval_calculation=1
 in_rpn_mode=0
diff --git a/.config/starship.toml b/.config/starship.toml
index 7de57cb..a45e057 100644
--- a/.config/starship.toml
+++ b/.config/starship.toml
@@ -1,7 +1,7 @@
 add_newline = false
 
 format = "$character$directory"
-# right_format = "$cmd_duration"
+right_format = "$git_branch $cmd_duration"
 
 [character]
 success_symbol = "[awoo](bold red)"
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
index c81c60c..297e21e 100644
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@@ -14,11 +14,11 @@
 # wm independent hotkeys
 #
 
-# terminal emulator
+# open a terminal emulator
 super + Return
 	kitty
 
-# nautilus
+# open nautilus
 super + e
 	nautilus
 
@@ -26,41 +26,49 @@ super + e
 super + @space
 	rofi -show drun
 
+# open emoji picker
 super + shift + e
 	rofimoji --action clipboard
 
+# open reference
 super + slash
 	bash ~/.config/sxhkd/rofi-keys.sh
 
-# Show clipmenu
+# open clipboard
 alt + v
     CM_LAUNCHER=rofi clipmenu \
         -theme-str 'listview \{ spacing: 0; \}' \
         -theme-str 'window \{ width: 30em; \}'
 
+# open calculator
 alt + c
     rofi -show calc -modi calc -calc-command 'xdotool type --clearmodifiers "\{result\}"'
 
+# open a terminal emulator
 Caps_Lock
 	kitty
 
-# media keys
+# raise/lower volume
 XF86Audio{Raise,Lower}Volume
 	pamixer {-i,-d} 5
 
+# mute audio
 XF86AudioMute
 	pamixer -t
 
+# previous/next track
 XF86Audio{Prev,Next}
 	playerctl {previous,next}	
 
+# toggle playing
 XF86AudioPlay
 	playerctl play-pause
 
-# screenshots
+# take screenshot
 Print
 	flameshot gui
 
+# take a delayed screenshot
 shift + Print
 	flameshot gui -d 3000
 
@@ -146,10 +154,11 @@ super + {_,shift + }{1-9,0}
 	bspc {desktop -f,node -d} '^{1-9,10}'
 
 # focus precious window
-alt + Tab
-	bspc node --focus prev
+# alt + Tab
+# 	bspc node --focus prev
 
-alt + ctrl + Tab
+# window switcher
+alt + Tab
 	rofi -show window
 
 #
diff --git a/.config/wal/templates/colors.fish b/.config/wal/templates/colors.fish
index 0273cf1..674ad43 100644
--- a/.config/wal/templates/colors.fish
+++ b/.config/wal/templates/colors.fish
@@ -31,4 +31,5 @@ set fish_pager_color_completion
 # set fish_pager_color_description B3A06D yellow
 set fish_pager_color_description $fish_color_quote yellow
 set fish_pager_color_progress brwhite --background=cyan
+set fish_pager_color_selected_background --background=brblack
 set fish_color_history_current --bold
diff --git a/.vimrc b/.vimrc
index f8043e5..5d36646 100644
--- a/.vimrc
+++ b/.vimrc
@@ -15,6 +15,7 @@ Plug 'dhruvasagar/vim-table-mode'
 Plug 'fadein/vim-FIGlet'
 Plug 'gkeep/iceberg-dark'
 Plug 'itchyny/lightline.vim'
+Plug 'karolbelina/uxntal.vim'
 Plug 'lambdalisue/fern-renderer-nerdfont.vim'
 Plug 'lambdalisue/fern.vim'
 Plug 'lambdalisue/nerdfont.vim'