diff --git a/Xdefaults b/Xdefaults
index 627514076..97b3ca8e4 100644
--- a/Xdefaults
+++ b/Xdefaults
@@ -12,7 +12,7 @@ XTerm*saveLines:                50000
 ! soft XTerm*background:          #32302f
 ! medium XTerm*background:        #282828
 ! hard
-XTerm*background:               #010101
+XTerm*background:               #1d2021
 XTerm*foreground:               #ebdbb2
 XTerm*color0:                   #282828
 XTerm*color1:                   #cc241d
@@ -44,7 +44,7 @@ UXTerm*saveLines:               50000
 ! soft UXTerm*background:         #32302f
 ! medium UXTerm*background:       #282828
 ! hard
-UXTerm*background:              #010101
+UXTerm*background:              #1d2021
 UXTerm*foreground:              #ebdbb2
 UXTerm*color0:                  #282828
 UXTerm*color1:                  #cc241d
@@ -74,7 +74,7 @@ URxvt.saveLines:                50000
 ! soft URxvt.background:          #32302f
 ! medium URxvt.background:        #282828
 ! hard
-URxvt.background:               #010101
+URxvt.background:               #1d2021
 URxvt.foreground:               #ebdbb2
 URxvt.color0:                   #282828
 URxvt.color1:                   #cc241d
diff --git a/bash/bash_aliases b/bash/bash_aliases
index 7ca010248..38230f662 100644
--- a/bash/bash_aliases
+++ b/bash/bash_aliases
@@ -48,5 +48,10 @@ alias blc="${HOME}/scripts/thinkpad/blc.pl --notify"
 # Flatpaks
 alias mpv="flatpak run io.mpv.Mpv"
 
+<<<<<<< Updated upstream
 # Detect if I'm in a toolbox
 alias istoolbox='[ -f "/run/.toolboxenv" ] && grep -oP "(?<=name=\")[^\";]+" /run/.containerenv'
+=======
+# Script to restore toolbox after it was replaced with distrobox and removed the default 'toolbox' name
+alias toolbox="$HOME/scripts/toolbox.sh"
+>>>>>>> Stashed changes
diff --git a/bash/bash_login b/bash/bash_login
index 574174877..8579373c2 100644
--- a/bash/bash_login
+++ b/bash/bash_login
@@ -25,10 +25,11 @@ export LC_ALL="en_US.UTF-8"
 export XDG_DATA_HOME="${HOME}/.config"
 
 # GUI themes
-export GTK_THEME="Flat-Remix-GTK-Blue-Darkest-Solid-NoBorder"
+export GTK_THEME="Gruvbox-Dark-BL"
 export PROFILE_NAME="Oled"
 export QT_QPA_PLATFORMTHEME="qt5ct"
 export QT_QPA_PLATFORM="wayland-egl;wayland;xcb"
+export GDK_BACKEND="wayland"
 export DCONF=".config/dconf/user"
 
 # Suggest session start command if last session is not known
diff --git a/bash/bash_logout b/bash/bash_logout
index 0436eeb60..b01fb7784 100644
--- a/bash/bash_logout
+++ b/bash/bash_logout
@@ -1,6 +1,6 @@
 # vim: ft=sh
 
-if [ $SSH_TTY ]; then
+if [ ! $SSH_TTY ]; then
 	# Remove socket files
 	rm SSH_AUTH_SOCK
 	rm SWAYSOCK
diff --git a/bash/bashrc b/bash/bashrc
index 41e647690..f3b62feeb 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -6,9 +6,6 @@ case $- in
       *) return;;
 esac
 
-# Use static SSH Agent from profile
-export SSH_AUTH_SOCK=~/.ssh/ssh-agent.sock
-
 # agetty is set to automatically log me in on tty1
 # Automatically launch GUI on tty1 after login
 if [ "$(tty)" == '/dev/tty1' ] && [ ! $SSH_TTY ]; then
@@ -77,6 +74,10 @@ PERL_LOCAL_LIB_ROOT="${HOME}/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}
 PERL_MB_OPT="--install_base \"${HOME}/perl5\""; export PERL_MB_OPT;
 PERL_MM_OPT="INSTALL_BASE=${HOME}/perl5"; export PERL_MM_OPT;
 
+# Android configs
+JDK_HOME=/etc/java
+STUDIO_JDK=/usr/lib/jvm/jre-openjdk
+
 # Configure PATH
 source "$HOME/.dotfiles/bash/path"
 
@@ -89,21 +90,7 @@ export LC_CTYPE="en_US.UTF-8"
 # terminal type
 export TERM="xterm"
 
-# GUI options. Mostly to optimize Wayland
-export QT_QPA_PLATFORM="wayland-egl;wayland;xcb"
-export SDL_VIDEODRIVER="wayland"
-export QML_IMPORT_PATH="/usr/lib/qt/qml"
-export QT_PLUGIN_PATH="/usr/lib/qt/plugins"
-export QML2_IMPORT_PATH="/usr/lib/qt/qml"
-export MOZ_ENABLE_WAYLAND="1"
-export MOZ_WEBRENDER="1"
-export XDG_SESSION_TYPE="wayland"
-export XDG_CURRENT_DESKTOP="sway"
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_DATA_DIRS="$XDG_DATA_DIRS:${HOME}/.config/flatpak/exports/share"
-export SWAYSOCK=`sway --get-socketpath`
-export CHROME_EXECUTABLE="/usr/bin/chromium"
-export FLATPAK_IDE_LOG_LEVEL="0"
-
 # Set initial title
 echo -e -n "\033]2;Welcome to Bash\007"
+
+SSH_AUTH_SOCK="$HOME/.ssh/ssh-agent.sock"
diff --git a/nvim/init.vim b/nvim/init.vim
index 802f8179d..64009c6eb 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -28,9 +28,15 @@ Plug 'airblade/vim-gitgutter'
 Plug 'itchyny/lightline.vim'
 " Nerdtree - Tree explorer
 Plug 'preservim/nerdtree'
+" Conqueror of Completion
+Plug 'neoclide/coc.nvim', {'branch': 'release'}
+Plug 'bmeneg/coc-perl', {'do': 'yarn install && yarn build'}
+" Dart lsp
+Plug 'dart-lang/dart-vim-plugin'
 
 call plug#end()
 
+let g:coc_global_extensions = ['coc-json', 'coc-html', 'coc-python', 'coc-php', 'coc-perl', 'coc-flutter', 'coc-git']
 if plug_install
     PlugInstall --sync
 endif
diff --git a/sway/autostart b/sway/autostart
index 90c7f73a0..2bd133972 100644
--- a/sway/autostart
+++ b/sway/autostart
@@ -61,3 +61,6 @@ exec flatpak run org.mozilla.firefox &
 
 # 9:Git (gittyup)
 exec flatpak run com.github.Murmele.Gittyup &
+
+# 0:Hud
+exec flatpak run com.github.Eloston.UngoogledChromium --app="https://papillon.john.me.tz/hud.php?theme=dark&refresh=3600"
diff --git a/sway/behaviours b/sway/behaviours
index e02ede256..511fc66d2 100644
--- a/sway/behaviours
+++ b/sway/behaviours
@@ -14,6 +14,7 @@ assign [class="Linphone"] 5
 assign [class="firefox"] 7
 assign [app_id="firefox"] 7
 assign [app_id="com.github.gittyup.Gittyup"] 9
+assign [app_id="chrome-papillon.john.me.tz__-Default"] 0 # Dedicated Chromium window for HUD
 
 # Don't use VNC viewer anymore. I've defaulted to running virt-manager on this workspace because it's similar
 #assign [class="Vncviewer"] 9
@@ -22,6 +23,7 @@ assign [app_id="com.github.gittyup.Gittyup"] 9
 # Floating windows
 ################################################################################
 
+#for_window [name="SSH Passphrase"] floating enable # SSH auth dialog
 for_window [title="Picture-in-Picture"] floating enable # Picture-in-picture firefox
 # Also make Picture-in-picture windows stick to active workspace
 for_window [title="Picture-in-Picture"] sticky enable
diff --git a/sway/bindings b/sway/bindings
index 6f126d633..95feb279f 100644
--- a/sway/bindings
+++ b/sway/bindings
@@ -326,7 +326,7 @@ bindsym $mod+Shift+End exec $HOME/scripts/thinkpad/blc.pl --notify -= 10
 # Miscellaneous
 
 # Tab: Quick change. Shows all windows on all pages by name in wofi
-bindsym $mod+Tab exec "~/scripts/wofi/wofi-alt-tab.sh"
+bindsym $mod+tab exec $HOME/scripts/wofi/alt-tab.py
 
 # Resize Mode (you can also use the mouse for that): Entered with $mod+i
 mode "resize" {
diff --git a/sway/config b/sway/config
index 61744eb36..16094c22c 100755
--- a/sway/config
+++ b/sway/config
@@ -34,7 +34,7 @@ seat seat0 hide_cursor 5000
 ################################################################################
 
 # Gtk themes
-exec gsettings set org.gnome.desktop.interface gtk-theme 'Flat-Remix-GTK-Blue-Darkest-Solid-NoBorder' &
+exec gsettings set org.gnome.desktop.interface gtk-theme 'Gruvbox-Dark-BL' &
 exec gsettings set org.gnome.desktop.interface icon-theme 'Flat-Remix-Blue-Dark' &
 
 # X11 Cursor theme
diff --git a/vim/generic b/vim/generic
index 37855aac0..187ae2aa2 100644
--- a/vim/generic
+++ b/vim/generic
@@ -17,11 +17,9 @@ let g:gruvbox_underline=1
 let g:gruvbox_undercurl=1
 let g:gruvbox_termcolors=256
 set background=dark
-colorscheme gruvbox-oled
-" autocmd vimenter * colorscheme gruvbox
-"autocmd vimenter * colorscheme gruvbox-oled
-"theme autoload/airline/themes/gruvbox-oled.vim
-" colorscheme autoload/lightline/colorscheme/gruvbox-oled.vim
+colorscheme gruvbox
+autocmd vimenter * colorscheme gruvbox
+" colorscheme autoload/lightline/colorscheme/gruvbox.vim
 " colorscheme base16-gruvbox-dark-hard
 
 set ttyfast
diff --git a/vim/vimrc b/vim/vimrc
index dd99d76c8..f9150bb51 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -27,11 +27,11 @@ let g:gruvbox_underline=1
 let g:gruvbox_undercurl=1
 let g:gruvbox_termcolors=256
 set background=dark
-colorscheme gruvbox-oled
+colorscheme gruvbox
 " autocmd vimenter * colorscheme gruvbox
-"autocmd vimenter * colorscheme gruvbox-oled
-"theme autoload/airline/themes/gruvbox-oled.vim
-" colorscheme autoload/lightline/colorscheme/gruvbox-oled.vim
+"autocmd vimenter * colorscheme gruvbox
+"theme autoload/airline/themes/gruvbox.vim
+" colorscheme autoload/lightline/colorscheme/gruvbox.vim
 " colorscheme base16-gruvbox-dark-hard
 
 set ttyfast
@@ -99,7 +99,7 @@ if has("autocmd")
 endif
 
 " 80 characters line
-set colorcolumn=81
+set colorcolumn=101
 "execute "set colorcolumn=" . join(range(81,335), ',')
 highlight ColorColumn ctermbg=Black ctermfg=DarkRed
 
diff --git a/waybar/style.css b/waybar/style.css
index 94ce2ca27..620d7d17e 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -1,4 +1,4 @@
-@import "gruvbox-oled.css";
+@import "gruvbox.css";
 /*
  * Available colours
  * black
diff --git a/wofi/style.css b/wofi/style.css
index 814c4a139..ad843677e 100644
--- a/wofi/style.css
+++ b/wofi/style.css
@@ -1,26 +1,28 @@
 window {
         margin: 0px;
-        border: 1px solid #458588;
-        background-color: #010101;
+	border-left: 2px solid #458588;
+        background-color: #1d2021;
 }
 
 #input {
         margin: 5px;
         border: none;
-        color: #010101;
+        color: #1d2021;
         background-color: #EBDBB2;
 }
 
 #inner-box {
         margin: 5px;
+	margin-left: 0px;
         border: none;
-        background-color: #010101;
+        background-color: #1d2021;
 }
 
 #outer-box {
         margin: 5px;
+	margin-left: 0px;
         border: none;
-        background-color: #010101;
+        background-color: #1d2021;
 }
 
 #scroll {
@@ -36,7 +38,7 @@ window {
 }
 
 #text:selected {
-        color: #010101;
+        color: #1d2021;
 }
 
 #img {