diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index e23eb47..39da36c 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -1,4 +1,4 @@
-# Configuration for Alacritty, the GPU enhanced terminal emulator.
+# ericonr's configuration for Alacritty, the GPU enhanced terminal emulator.
 
 # Any items in the `env` entry below will be added as
 # environment variables. Some entries may override variables
diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim
index 5684e86..cf99703 100644
--- a/nvim/.config/nvim/init.vim
+++ b/nvim/.config/nvim/init.vim
@@ -27,9 +27,21 @@ set smartcase
 
 " APPEARANCE
 
+" Tab width
+set tabstop=3
+set shiftwidth=3
+
 " Show relative line numbers
 set number rnu
 
 " Pretty color scheme that works well with the one chosen for alacritty
 colorscheme slate
 
+
+" FUNCTIONS
+
+" Sets up the editor for spaces instead of tabs - WIP
+" https://stackoverflow.com/questions/1878974/redefine-tab-as-4-spaces
+fu! SpaceTabs()
+	:set tabstop=8 softtabstop=0 expandtab shiftwidth=2 smarttab
+endfunction
diff --git a/script/.local/bin/mktmpdir b/script/.local/bin/mktmpdir
new file mode 100755
index 0000000..17fa871
--- /dev/null
+++ b/script/.local/bin/mktmpdir
@@ -0,0 +1,9 @@
+#!/usr/bin/env bash
+
+NEW_DIR="/tmp/$(pwd)/$1"
+
+echo New dir created in $NEW_DIR
+
+mkdir -p $NEW_DIR
+ln -s $NEW_DIR $1
+
diff --git a/wm/.config/sway/config b/wm/.config/sway/config
index 593d666..343cc37 100644
--- a/wm/.config/sway/config
+++ b/wm/.config/sway/config
@@ -46,8 +46,7 @@ input * {
 }
 bindsym $mod+Space exec keyboard_layout_switcher
 # Touchpad
-set $touchpad "1739:31251:SYNA2393:00_06CB:7A13_Touchpad" 
-input $touchpad {
+input * {
 	tap enabled
 	natural_scroll disabled
 }
@@ -79,6 +78,8 @@ bindsym $mod+Return exec $term
 bindsym $mod+t exec $term -e start-tmux
 # Start a terminal with music tmux
 bindsym $mod+Mod1+m exec $term -e start-tmux-music
+# Start MPV with clipboard as arg
+bindsym $mod+Mod1+p exec bash -c "mpv `wl-paste`"
 # Launch editor
 bindsym $mod+Shift+w exec $editor
 # Start Dolphin file browser
@@ -152,21 +153,21 @@ bindsym $mod+Shift+a focus child
 
 ## Workspaces
 # Workspace name
-set $ws1 "1"
-set $ws2 "2"
-set $ws3 "3"
-set $ws4 "4"
-set $ws5 "5"
-set $ws6 "6"
-set $ws7 "7"
-set $ws8 "8"
-set $ws9 "9"
-set $ws10 "10"
-set $wsb "browser"
-set $wsn "nth"
-set $wsm "media"
-set $wso "oh"
-set $wsp "pdf"
+set $ws1 "💜"
+set $ws2 "👯"
+set $ws3 "🔱"
+set $ws4 "🍀"
+set $ws5 "🌟"
+set $ws6 "🌈"
+set $ws7 "🐞"
+set $ws8 "♾️"
+set $ws9 "👌"
+set $ws10 "🌀"
+set $wsb "🌎"
+set $wsn "⚡"
+set $wsm "🎺"
+set $wso "🧛"
+set $wsp "📜"
 # Switch to workspace
 bindsym $mod+1 workspace $ws1
 bindsym $mod+2 workspace $ws2
@@ -256,6 +257,7 @@ assign [app_id="Kicad"] $wsn
 assign [title="CubeMX"] $wsn
 # PDF
 assign [app_id="okular"] $wsp
+assign [app_id="zathura"] $wsp
 
 ## Application specific settings
 for_window [app_id="krunner"] floating enable
diff --git a/wm/.config/swaylock/config b/wm/.config/swaylock/config
index b0166bb..a9a9bab 100644
--- a/wm/.config/swaylock/config
+++ b/wm/.config/swaylock/config
@@ -2,4 +2,5 @@
 
 daemonize
 color=000000
+image=~/Pictures/wallpaper.png
 
diff --git a/wm/.config/wofi/config b/wm/.config/wofi/config
index f8c9a15..b6d31d1 100644
--- a/wm/.config/wofi/config
+++ b/wm/.config/wofi/config
@@ -4,3 +4,5 @@ prompt=Hello!
 normal_window=false
 allow_images=true
 
+cache=~/.cache/wofi
+