diff --git a/bash/bashrc b/bash/bashrc
index 318c88860..41e647690 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -11,7 +11,7 @@ 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' ]; then
+if [ "$(tty)" == '/dev/tty1' ] && [ ! $SSH_TTY ]; then
     . ${HOME}/.dotfiles/bash/bash_login
     LAST_GUI=`cat ${HOME}/.spool/last_login_gui 2>/dev/null`
     if [ -f "${HOME}/.spool/last_login_gui" ]; then
@@ -20,7 +20,7 @@ if [ "$(tty)" == '/dev/tty1' ]; then
 fi
 
 # Setup editor
-export EDITOR="vim"
+export EDITOR="flatpak run io.neovim.nvim"
 
 # don't put duplicate lines or lines starting with space in the history.
 shopt -s histappend
diff --git a/nvim/init.vim b/nvim/init.vim
index 8c5455193..802f8179d 100644
--- a/nvim/init.vim
+++ b/nvim/init.vim
@@ -11,12 +11,17 @@ unlet autoload_plug_path
 call plug#begin('~/.dotfiles/nvim/plugins')
 " Plugins here
 
+" LSP - Language Server Protocol
+Plug 'neovim/nvim-lspconfig'
+Plug 'hrsh7th/cmp-nvim-lsp'
+Plug 'hrsh7th/cmp-buffer'
+Plug 'hrsh7th/cmp-path'
+Plug 'hrsh7th/cmp-cmdline'
+Plug 'hrsh7th/nvim-cmp'
 " TreeSitter - Syntax highlighting
 Plug 'nvim-treesitter/nvim-treesitter', {'do': ':TSUpdate'}
 " Fold-Cycle - Better management of foldable blocks
 Plug 'jghauser/fold-cycle.nvim'
-" LSP - Language Server Protocol
-Plug 'neovim/nvim-lspconfig'
 " Git Gutter - Git diff markers
 Plug 'airblade/vim-gitgutter'
 " Lightline - lightweight status/tabline beautification
diff --git a/sway/behaviours b/sway/behaviours
index 19db82feb..d56f4cae6 100644
--- a/sway/behaviours
+++ b/sway/behaviours
@@ -4,14 +4,13 @@
 # Default workspaces
 ################################################################################
 
-#assign [class="Xchat"] 1-chat   Replaced by irssi which will open on the first workspace at startup
-assign [class="XTerm"] 1
 assign [class="Mattermost"] 1
+assign [class="Rocket.Chat"] 1
 assign [class="UXTerm"] grave
-assign [class="Thunderbird"] 2
+assign [app_id="thunderbird"] 2
 assign [class="Chromium"] 3
 assign [class="Linphone"] 5
-assign [class="firefox"] 7
+assign [app_id="firefox"] 7
 assign [app_id="com.github.gittyup.Gittyup"] 9
 
 # Don't use VNC viewer anymore. I've defaulted to running virt-manager on this workspace because it's similar
@@ -35,3 +34,28 @@ for_window [class="Gvim"] floating enable
 for_window [class="Orage"] floating enable
 for_window [class="Claws-mail"] layout stacking
 for_window [class="Vncviewer"] fullscreen enable
+
+################################################################################
+# Window titles
+################################################################################
+
+# Mark legacy windows running in Xwayland
+for_window [shell="."] title_format "%title (%app_id)"
+for_window [shell="xwayland"] title_format "%title [XWayland]"
+
+################################################################################
+# Misc behaviour
+################################################################################
+
+# Maintain 'urgency' for 1 second
+force_display_urgency_hint 1000 ms
+
+# Move cursor to center of container when switching
+mouse_warping container
+
+# Restore display configuration on reload
+bindswitch --reload lid:on /home/jpm/scripts/sway/displays.pl detached
+
+# Rotate screen and toggle OSK on tablet mode change
+bindswitch --reload tablet:on busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b true; swaymsg output eDP-1 rotate 270
+bindswitch --reload tablet:off busctl call --user sm.puri.OSK0 /sm/puri/OSK0 sm.puri.OSK0 SetVisible b false; swaymsg output eDP-1 rotate 0
diff --git a/sway/config b/sway/config
index 7dd61e21a..7b4211dfe 100755
--- a/sway/config
+++ b/sway/config
@@ -34,11 +34,11 @@ seat * idle_wake keyboard switch
 ################################################################################
 
 # Gtk themes
-exec gsettings set org.gnome.desktop.interface gtk-theme 'Oled' &
-exec gsettings set org.gnome.desktop.interface icon-theme 'Papirus-Dark-Grey' &
+exec gsettings set org.gnome.desktop.interface gtk-theme 'Flat-Remix-GTK-Blue-Darkest-Solid-NoBorder' &
+exec gsettings set org.gnome.desktop.interface icon-theme 'Flat-Remix-Blue-Dark' &
 
 # X11 Cursor theme
-exec gsettings set org.gnome.desktop.interface cursor-theme 'FlatbedCursors-Blue' &
+exec gsettings set org.gnome.desktop.interface cursor-theme 'Vimix-cursors' &
 seat seat0 xcursor_theme FlatbedCursors-Blue
 
 # Minimize borders from all windows
diff --git a/waybar/config.template b/waybar/config.template
index 2f1368610..42f0203ab 100644
--- a/waybar/config.template
+++ b/waybar/config.template
@@ -187,26 +187,26 @@
         "on-click": "if [ $(sudo pgrep -xc rofi) -gt 0 ]; then pkill rofi; else ${HOME}/scripts/rofi/rofi-openvpn.sh; fi"
     },
     "cpu": {
-        "format": "{usage}%",
+        "format": "\u200a{usage}%",
         "tooltip": true,
         "on-click": "${HOME}/scripts/waybar/waybar-cpu.sh"
     },
     "memory": {
-        "format": "{}%",
+        "format": "\u200a{}%",
         "on-click": "${HOME}/scripts/waybar/waybar-mem.sh"
     },
     "custom/disk": {
-        "format": "\uf0a0{}",
+        "format": "\uf0a0\u200a{}",
         "exec": "df / | tail -n 1 | awk {'print $5'}",
         "on-click": "${HOME}/scripts/waybar/waybar-disk.sh"
     },
     "temperature": {
         "critical-threshold": 80,
-        "format": "{temperatureC}°C"
+        "format": "\u200a{temperatureC}°C"
     },
     "backlight": {
         // "device": "acpi_video1",
-        "format": "{icon}{percent}%",
+        "format": "{icon}\u200a{percent}%",
         "format-icons": [ "•", "☼", "o", "", ""],
 	"on-click": "${HOME}/scripts/thinkpad/blc.pl --notify %",
 	"on-scroll-up": "${HOME}/scripts/thinkpad/blc.pl --notify ++",
@@ -215,13 +215,13 @@
     "custom/battery": {
         "format": "{}",
 	"return-type": "json",
-        "exec": "${HOME}/scripts/thinkpad/pow.pl -b",
+        "exec": "${HOME}/scripts/thinkpad/pow.pl --bar",
         "interval": 5,
         "on-click": "notify-send Power \"`${HOME}/scripts/thinkpad/pow.pl -p`\""
     },
     "pulseaudio": {
         //"scroll-step": 1,
-        "format": "{icon}{volume}%",
+        "format": "{icon}\u200a{volume}%",
         "format-bluetooth": "{icon}{volume}%",
         "format-muted": "",
         "format-icons": {
diff --git a/waybar/style.css b/waybar/style.css
index 85a9d499c..6cc049274 100644
--- a/waybar/style.css
+++ b/waybar/style.css
@@ -66,7 +66,7 @@ window#waybar {
 
 /* Tray */
 
-#tray, #custom-todo, #custom-osk, #custom-apt, #custom-bar, #idle_inhibitor, #custom-clock, #custom-power {
+#tray, #custom-todo, #custom-osk, #custom-pkg, #custom-bar, #idle_inhibitor, #custom-clock, #custom-power {
     color: @bluehi;
 }
 
@@ -133,11 +133,12 @@ window#waybar {
 
 #network {
     color: @blue;
+    margin-right: -8px;
 }
 
 #network.wireguard {
     padding: 0px;
-    margin-left: -8px;
+    margin-right: 0px;
 }
 
 #network.disconnected {
@@ -229,15 +230,25 @@ window#waybar {
 /* Todo-txt */
 
 #custom-todo {
-    color: @fg;
-    color: @bluehi;
+    font-size: 40px;
+    margin-top: -13px;
+    margin-bottom: -10px;
+    margin-left: -8px;
+    margin-right: -8px;
+}
+
+/* Package upgrades */
+
+#custom-pkg {
+    margin-bottom: -3px;
 }
 
 /* On-Screen Keyboard */
 
 #custom-osk {
-    color: @fg;
-    color: @bluehi;
+    font-size: 50px;
+    margin-top: -13px;
+    margin-bottom: -15px;
 }
 
 /* Idle Inhibitor */
@@ -251,6 +262,7 @@ window#waybar {
 
 #custom-power {
     margin-right: 15px;
+    margin-top: 8px;
     color: @red;
 }