diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 40769b1..158bc89 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -25,7 +25,7 @@ Plug 'preservim/vim-markdown'
 Plug 'jeffkreeftmeijer/vim-dim'
 
 " complete
-Plug 'Shougo/deoplete.nvim'
+Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
 
 call plug#end()
 
diff --git a/sway/.config/i3status-rust/config.toml b/sway/.config/i3status-rust/config.toml
index 0a7e4e4..9056064 100644
--- a/sway/.config/i3status-rust/config.toml
+++ b/sway/.config/i3status-rust/config.toml
@@ -1,5 +1,5 @@
 [theme]
-name = "moonfly"
+name = "foot"
 
 [icons]
 name = "awesome6"
@@ -11,7 +11,7 @@ inboxes = ["/home/grue/mail/mail@oxapentane.com/INBOX", "/home/grue/mail/mail@ox
 threshold_warning = 1
 threshold_critical = 10
 display_type = "new"
-on_click = "foot zsh -c neomutt"
+on_click = "foot --app-id floating-foot --window-size-chars=150x50 -- zsh -c neomutt"
 
 [[block]]
 block = "backlight"
@@ -44,7 +44,7 @@ format = "{1m} {5m} {15m}"
 
 [[block]]
 block = "sound"
-on_click = "foot --app-id floating-foot zsh -c pulsemixer"
+on_click = "foot --app-id floating-foot -- zsh -c pulsemixer"
 headphones_indicator = true
 
 [[block]]
diff --git a/sway/.config/rofi/config.rasi b/sway/.config/rofi/config.rasi
index bf12254..72773b6 100644
--- a/sway/.config/rofi/config.rasi
+++ b/sway/.config/rofi/config.rasi
@@ -4,6 +4,5 @@ configuration {
     combi-modi: "drun,ssh";
     terminal: "foot";
 }
-//@theme "gruvbox-dark-soft"
-//@theme "/nix/store/m66hawy506lv8zpr9j6l9s46kgicvva9-rofi-1.7.5+wayland1/share/rofi/themes/Monokai.rasi"
-@theme "/nix/store/g2bj3ngb084x8mjxlix6bwzjy649wbbz-rofi-1.7.5+wayland1/share/rofi/themes/gruvbox-dark-soft.rasi"
+//@theme "DarkBlue"
+@theme "gruvbox-dark-hard"
diff --git a/sway/.config/sway/config b/sway/.config/sway/config
index a4a9a64..55f6518 100644
--- a/sway/.config/sway/config
+++ b/sway/.config/sway/config
@@ -16,6 +16,7 @@ set $right l
 # Your preferred terminal emulator
 set $term foot
 set $floatterm foot --app-id floating-foot
+set $lock $HOME/.config/sway/lock.sh
 
 # Your preferred application launcher
 # Note: pass the final command to swaymsg so that the resulting window can be opened
@@ -39,9 +40,9 @@ output * bg ./wall.jpg fill
 # Example configuration:
 #
 exec swayidle -w \
-         timeout 300 'swaylock -eFfk -i ~/.config/sway/wall.jpg -s fill' \
+         timeout 300 $lock \
          timeout 303 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
-         before-sleep 'swaylock -eFfk -i ~/.config/sway/wall.jpg -s fill'
+         before-sleep $lock
 #
 # This will lock your screen after 300 seconds of inactivity, then turn off
 # your displays after another 300 seconds, and turn your screens back on when
@@ -82,8 +83,8 @@ seat * hide_cursor 5000
     bindsym --to-code $mod+Shift+Return exec $floatterm
     for_window [app_id="floating-foot"] floating enable
 
-    # Start an editor
-    bindsym --to-code $mod+z exec emacsclient -a="" --create-frame
+    # Start a python shell
+    bindsym --to-code $mod+z exec $floatterm python
 
     # Kill focused window
     bindsym --to-code $mod+Shift+q kill
@@ -111,7 +112,8 @@ seat * hide_cursor 5000
     bindsym --to-code XF86AudioRaiseVolume exec 'pamixer -i 1'
     bindsym --to-code XF86AudioLowerVolume exec 'pamixer -d 1'
     bindsym --to-code XF86AudioMute exec 'pamixer -t'
-    bindsym --to-code $mod+Delete exec 'swaylock -eFfk -i ~/.config/sway/wall.jpg -s fill'
+    # bindsym --to-code $mod+Delete exec 'swaylock -eFfk -i ~/.config/sway/wall.jpg -s fill'
+    bindsym --to-code $mod+Delete exec $lock
     bindsym --to-code Print exec 'grim -g "$(slurp)" - | wl-copy'
     bindsym --to-code $mod+Print exec 'grim -g "$(slurp)" ~/Pictures/$(date +"%Y-%m-%d-%H-%M-%S").png'
     bindsym --to-code $mod+m exec 'makoctl dismiss -a'
@@ -238,7 +240,7 @@ mode "resize" {
 bindsym --to-code $mod+r mode "resize"
 
 ## Styling: colors
-include moonfly
+include colors
 
 ## Window styling
 #                       Border      BG          Text        Indicator   Child Border
@@ -273,7 +275,7 @@ font pango:JuliaMono 8
 exec nextcloud --background
 exec iwgtk -i
 exec blueman-applet
-exec wlsunset -l 51 -L 14
+#exec wlsunset -l 51 -L 14
 
 # window rules
 # floating
@@ -286,5 +288,12 @@ for_window [app_id="com.nextcloud.desktopclient.nextcloud"] floating enable; bor
 for_window [app_id="CubicSDR"] layout tabbed
 for_window [app_id="org.wireshark.Wireshark"] layout tabbed
 
+for_window [app_id="zoom" title="^zoom$"] border none, floating enable
+# For specific Zoom windows
+for_window [app_id="zoom" title="^(Zoom|About)$"] border pixel, floating enable
+for_window [app_id="zoom" title="Settings"] floating enable, floating_minimum_size 960 x 700
+# Open Zoom Meeting windows on a new workspace (a bit hacky)
+for_window [app_id="zoom" title="Zoom Meeting(.*)?"] workspace next_on_output --create, move container to workspace current, floating disable, inhibit_idle open
+
 include ./config.d/*
 include /etc/sway/config.d/*
diff --git a/sway/.config/sway/lock.sh b/sway/.config/sway/lock.sh
new file mode 100755
index 0000000..e588d8d
--- /dev/null
+++ b/sway/.config/sway/lock.sh
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+img="$HOME/.cache/swaylock.png"
+
+grim $img
+gm convert $img -scale 5% -scale 2000% $img
+swaylock -eFfk -i $img -s fill
+
+rm -f $img