diff --git a/.bashrc.d/10_common_aliases.sh b/.bashrc.d/10_common_aliases.sh
index 00883f9..4f4ba4a 100644
--- a/.bashrc.d/10_common_aliases.sh
+++ b/.bashrc.d/10_common_aliases.sh
@@ -112,14 +112,8 @@ function b64dec() {
 alias digs='dig +short'
 alias digrr='dig +noall +answer'
 
-# Print all information in lsblk in JSON for better readability
-alias lsblkjson='lsblk -O --json'
-
 # Readline macro Ctrl-Alt-L: Append "| less" to current command
 bind '"\e\C-l": "\C-e | less"'
 
 # Readline macro Ctrl-Alt-B: Append ">/dev/null 2>&1 &" to current command
 bind '"\e\C-b": "\C-e >/dev/null 2>&1 &"'
-
-# Shortcut for shuriken build script (assumes it's in $PWD/tools/shuriken.py)
-alias shuriken=./tools/shuriken.py
diff --git a/_local/roxy/.config/i3/config b/_local/roxy/.config/i3/config
index c2cb98c..ace7b26 100644
--- a/_local/roxy/.config/i3/config
+++ b/_local/roxy/.config/i3/config
@@ -21,21 +21,18 @@ set $mod Mod4
 # Alternatively, use includes for this :)
 
 #set $OUTPUT1 eDP-1
-#set $OUTPUT1 DP-1-3
-#set $OUTPUT2 DP-1-1
-
 set $OUTPUT1 DP-1-3
-set $OUTPUT2 DP-1-1
-set $OUTPUT3 eDP-1
+set $OUTPUT2 DP-1-2
 
 # Office
 set $OUTPUT_LEFT   DP-1-3
-set $OUTPUT_CENTER DP-1-1
-set $OUTPUT_RIGHT  eDP-1
+set $OUTPUT_CENTER DP-1-3
+set $OUTPUT_RIGHT  DP-1-2
+#set $OUTPUT_RIGHT  eDP-1
 
 # Bedroom
 #set $OUTPUT_LEFT   eDP-1
-#set $OUTPUT_CENTER HDMI-1
+#set $OUTPUT_CENTER DP-1
 #set $OUTPUT_RIGHT  eDP-1
 
 
@@ -127,11 +124,11 @@ for_window [instance="sakura-floating"] floating enable
 bindsym $mod+Shift+Return exec sakura --name=sakura-floating
 
 # ~~ Start application launcher
+bindsym $mod+d exec rofi -show run
 bindsym $mod+Shift+d exec rofi -show drun
-bindsym $mod+d       exec rofi -show run
-bindsym $mod+w       exec rofi -show window
-bindsym $mod+c       exec rofi -show calc
-bindsym $mod+m       exec rofi -show emoji
+bindsym $mod+w exec rofi -show window
+bindsym $mod+c exec rofi -show calc
+bindsym $mod+m exec rofi -show emoji
 
 # ~~ Kill focused window
 bindsym $mod+Shift+q kill
@@ -323,20 +320,20 @@ workspace $WS11 output primary
 workspace $WS0  output primary
 
 # Special case: Chat workspace
-workspace $WS12 output $OUTPUT2
+workspace $WS12 output $OUTPUT_RIGHT
 
-workspace $WSf1  output $OUTPUT2
-workspace $WSf2  output $OUTPUT2
-workspace $WSf3  output $OUTPUT2
-workspace $WSf4  output $OUTPUT2
-workspace $WSf5  output $OUTPUT2
-workspace $WSf6  output $OUTPUT2
-workspace $WSf7  output $OUTPUT2
-workspace $WSf8  output $OUTPUT2
-workspace $WSf9  output $OUTPUT3
-workspace $WSf10 output $OUTPUT3
-workspace $WSf11 output $OUTPUT3
-workspace $WSf12 output $OUTPUT3
+workspace $WSf1  output $OUTPUT_RIGHT
+workspace $WSf2  output $OUTPUT_RIGHT
+workspace $WSf3  output $OUTPUT_RIGHT
+workspace $WSf4  output $OUTPUT_RIGHT
+workspace $WSf5  output $OUTPUT_RIGHT
+workspace $WSf6  output $OUTPUT_RIGHT
+workspace $WSf7  output $OUTPUT_RIGHT
+workspace $WSf8  output $OUTPUT_RIGHT
+workspace $WSf9  output $OUTPUT_RIGHT
+workspace $WSf10 output $OUTPUT_RIGHT
+workspace $WSf11 output $OUTPUT_RIGHT
+workspace $WSf12 output $OUTPUT_RIGHT
 
 # ~~ Keybindings to switch workspaces
 bindsym $mod+grave workspace number $WS0
@@ -395,17 +392,17 @@ bindsym $mod+Shift+F11 move container to workspace $WSf11; workspace $WSf11
 bindsym $mod+Shift+F12 move container to workspace $WSf12; workspace $WSf12
 
 # ~~ Keybindings for moving focus/containers/workspaces between monitors
-bindsym $mod+comma  focus output $OUTPUT1
-bindsym $mod+period focus output $OUTPUT2
-bindsym $mod+slash  focus output $OUTPUT3
+bindsym $mod+comma  focus output $OUTPUT_LEFT
+bindsym $mod+period focus output $OUTPUT_CENTER
+bindsym $mod+slash  focus output $OUTPUT_RIGHT
 
-bindsym $mod+Shift+comma  move container to output $OUTPUT1; focus output $OUTPUT1
-bindsym $mod+Shift+period move container to output $OUTPUT2; focus output $OUTPUT2
-bindsym $mod+Shift+slash  move container to output $OUTPUT3; focus output $OUTPUT3
+bindsym $mod+Shift+comma  move container to output $OUTPUT_LEFT;   focus output $OUTPUT_LEFT
+bindsym $mod+Shift+period move container to output $OUTPUT_CENTER; focus output $OUTPUT_CENTER
+bindsym $mod+Shift+slash  move container to output $OUTPUT_RIGHT;  focus output $OUTPUT_RIGHT
 
-bindsym Control+$mod+comma  move workspace to output $OUTPUT1
-bindsym Control+$mod+period move workspace to output $OUTPUT2
-bindsym Control+$mod+slash  move workspace to output $OUTPUT3
+bindsym Control+$mod+comma  move workspace to output $OUTPUT_LEFT
+bindsym Control+$mod+period move workspace to output $OUTPUT_CENTER
+bindsym Control+$mod+slash  move workspace to output $OUTPUT_RIGHT
 
 # ~~ Other workspace related keybindings
 bindsym $mod+Tab workspace back_and_forth
@@ -428,8 +425,14 @@ assign [class="^Thunderbird$"] number $WS_mail
 for_window [class="^Thunderbird$"] layout tabbed
 
 # ~~ Telegram
+#assign [class="^TelegramDesktop$"] output $OUTPUT2
 assign [class="^TelegramDesktop$"] number $WS_com
-#for_window [class="^TelegramDesktop$" title="^Telegram"] floating enable
+for_window [class="^TelegramDesktop$" title="^Telegram"] floating enable
+
+# ~~ Gajim
+#assign [class="^Gajim$"] output $OUTPUT2
+assign [class="^Gajim$"] number $WS_com
+for_window [class="^Gajim$"] floating enable
 
 # ~~ Zulip
 assign [class="^Zulip$"] number $WS_com
@@ -437,11 +440,7 @@ for_window [class="^Zulip$"] floating enable
 
 # ~~ Discord
 assign [class="^discord$"] number $WS_com
-#for_window [class="^discord$"] floating enable
-
-# ~~ Signal
-assign [class="^Signal$"] number $WS_com
-#for_window [class="^Signal$"] floating enable
+for_window [class="^discord$"] floating enable
 
 # ~~ VS Code
 for_window [class="^code-oss$"] layout tabbed
@@ -456,19 +455,13 @@ for_window [title="^Friends List"] floating disable
 # TODO: use no_focus to avoid focus grabbing by the update window
 
 # ~~ Misc other apps
-for_window [class="^pavucontrol$"] floating enable
+for_window [class="^Pavucontrol$"] floating enable
 
 # ~~ Flameshot
 for_window [class="^flameshot$"] floating enable
 
 # ~~ Game development
-# Enable floating mode for standalone game windows and for embedded games in "Floating game workspace" mode,
-# but not for the editor.
-for_window [instance="^Godot_Editor$" title="Godot Engine$"] floating disable
-#for_window [instance="^Godot_Editor$" title="\(DEBUG\)$"] floating enable
-for_window [instance="^Godot_Engine$" title="\(DEBUG\)$"] floating enable
-for_window [title="^TinyKnight$"] floating enable
-for_window [title="^Dragons Hoard$"] floating enable
+#for_window [title="\(DEBUG\)$" instance="^(?!MultiplayerSpaceThing).*$"] floating enable
 
 # ~~ Others
 # The Sims 4 Origin launcher
@@ -517,7 +510,5 @@ bindsym $mod+Print exec flameshot gui
 # ~~ Run background applications
 exec --no-startup-id redshift-gtk
 exec --no-startup-id nextcloud
-exec --no-startup-id udiskie --tray --no-automount
-exec --no-startup-id solaar -w hide
 
 # TODO: Use exec_always to set keyboard layout etc.?
diff --git a/bin/telegram-desktop b/bin/telegram-desktop
index 8c63784..16ab158 100755
--- a/bin/telegram-desktop
+++ b/bin/telegram-desktop
@@ -1,5 +1,5 @@
 #!/bin/sh
 
 export LC_ALL="de_DE.UTF-8"
-exec /usr/bin/Telegram
+exec /usr/bin/telegram-desktop