diff --git a/.bin/swaylock.sh b/.bin/swaylock.sh
new file mode 100755
index 0000000..486ec6a
--- /dev/null
+++ b/.bin/swaylock.sh
@@ -0,0 +1,17 @@
+#!/bin/bash
+# Uses forked swaylock https://github.com/mortie/swaylock-effects
+bg=$1
+exec swaylock \
+	--clock \
+	--datestr "%Y-%m-%d" \
+	--indicator \
+	--tiling \
+	--hide-keyboard-layout \
+	--font "Terminus" \
+	--font-size 28 \
+	--text-color ffffff \
+	--inside-color 435366 \
+	--separator-color 435366 \
+	--ring-color 435366 \
+	--line-uses-ring \
+	--image $bg
diff --git a/.bin/switch_window.py b/.bin/switch_window.py
index b71e76f..bf5b3c1 100755
--- a/.bin/switch_window.py
+++ b/.bin/switch_window.py
@@ -42,6 +42,6 @@ for output in tree['nodes']:
 windows_string = '\n'.join([f"<{app_id}> {app_name} --- {app_title}" for app_id, app_name, app_title in windows])
 
 # Call rofi and move focus to the selected window
-selection = subprocess.check_output(['rofi', '-dmenu', '-i', '-p', 'window', '-normal-window', '-font', 'Terminus (TTF) Medium 12'], input=windows_string, universal_newlines=True)
+selection = subprocess.check_output(['rofi', '-dmenu', '-i', '-p', 'window', '-normal-window'], input=windows_string, universal_newlines=True)
 window_id = selection.split(' ')[0][1:-1]
 subprocess.call(['swaymsg', f"[con_id=\"{window_id}\"]", 'focus'])
diff --git a/.config/rofi/config b/.config/rofi/config
index 0545a1a..b3334e3 100644
--- a/.config/rofi/config
+++ b/.config/rofi/config
@@ -1 +1,2 @@
 rofi.theme: /usr/share/rofi/themes/android_notification.rasi
+rofi.font: Terminus 12
diff --git a/.config/sway/config b/.config/sway/config
index 16b5975..4f7732f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -16,19 +16,18 @@ set $right l
 
 # Default font
 # terminus-font-otb
-set $font "Terminus 12"
 font pango:Terminus 12
 # Background image
 set $bg "~/Pildid/background.png"
 
-# Uses forked swaylock https://github.com/mortie/swaylock-effects
-set $lockcmd swaylock --clock --datestr "%Y-%m-%d" --indicator --image $bg --tiling --hide-keyboard-layout --font "Terminus" --font-size 28 --text-color ffffff --inside-color 435366 --separator-color 435366 --ring-color 435366 --line-uses-ring
+# Lock screen
+set $lockcmd ~/.bin/swaylock.sh
 
 # Your preferred terminal emulator
 set $term gnome-terminal
 # Your preferred application launcher
 # None: it's recommended that you pass the final command to sway
-set $menu rofi -modi drun -show drun -show-icons -normal-window -font $font
+set $menu rofi -modi drun -show drun -show-icons -normal-window
 
 
 ### Output configuration