diff --git a/.config/awesome/autorun.sh b/.config/awesome/autorun.sh
index b004602..be66270 100755
--- a/.config/awesome/autorun.sh
+++ b/.config/awesome/autorun.sh
@@ -19,4 +19,5 @@ run /usr/lib/kdeconnectd
 run kdeconnect-indicator
 run snixembed
 run lxpolkit
+run joystickwake
 #run music_wake.sh
diff --git a/.config/sway/config b/.config/sway/config
index afc7849..52ff13f 100644
--- a/.config/sway/config
+++ b/.config/sway/config
@@ -78,6 +78,8 @@ bindsym $mod+c exec --no-startup-id rofi-pass-wl
 
 bindsym $mod+Shift+g exec --no-startup-id dmenu_script game.sh
 
+bindsym $mod+c exec --no-startup-id rofi-pass-wl
+
 bindsym $mod+m exec --no-startup-id mpc toggle
 
 # window border size
@@ -207,6 +209,12 @@ mode "resize" {
 
 bindsym $mod+r mode "resize"
 
+mode "passthrough" {
+    bindsym $mod+p mode "default"
+}
+
+bindsym $mod+p mode "passthrough"
+
 # Pulse Audio controls
 bindsym XF86AudioRaiseVolume exec --no-startup-id sh -c "pamixer -i 5"
 bindsym XF86AudioLowerVolume exec --no-startup-id sh -c "pamixer -d 5"
@@ -263,6 +271,7 @@ exec swayidle -w \
 	timeout 905 'swaymsg "output * dpms off"' \
 	resume 'swaymsg "output * dpms on"'
 
+
 #focus Pavucontrol or create it, if it did not already exist.
 #bindsym $mod+w exec swaymsg [app_id="scratchpad"] scratchpad show || exec alacritty --class scratchpad --title scratchpad , resize set 1800 1000
 #focus Vimpc or create it, if it did not already exist.
diff --git a/.config/sway/out.log b/.config/sway/out.log
index c42bba8..1c9d87f 100644
--- a/.config/sway/out.log
+++ b/.config/sway/out.log
@@ -1 +1 @@
-1632317702.899765291s> Handling message: Update(All)
+1633774722.283662375s> Handling message: Update(All)
diff --git a/.config/sway/remote.config b/.config/sway/remote.config
new file mode 100644
index 0000000..44f44b2
--- /dev/null
+++ b/.config/sway/remote.config
@@ -0,0 +1,278 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
+
+set $mod Mod4
+
+#set_from_resource $bright i3wm.color2 #ff0000
+#set_from_resource $bg i3wm.color7 #ff0000
+#set_from_resource $light i3wm.color4 #ff0000
+#set_from_resource $fg i3wm.color4 #ff0000
+#set_from_resource $bg i3wm.color3 #ff0000
+
+set $bg-color			#000000
+set $inactive-bg-color		#2f343f
+set $text-color			#FFFFFF
+set $inactive-text-color	#676E7D
+set $urgent-bg-color		#E53935
+set $bordercolor		#c5cbd6
+set $bg-highlight		#556177
+
+
+gaps inner 10
+gaps outer 7
+gaps top -5
+
+smart_gaps on
+
+set $mode_gaps Toggle gaps: (1) on (2) off
+bindsym $mod+g mode "$mode_gaps"
+mode "$mode_gaps" {
+    bindsym 1 mode "default", gaps inner all set 10, gaps outer all set 4, gaps top all set -5
+    bindsym 2 mode "default", gaps inner all set 0, gaps outer all set 0
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+
+
+# Brightness
+
+bindsym XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 5
+bindsym XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 5
+bindsym Ctrl+XF86MonBrightnessUp exec --no-startup-id xbacklight -inc 1
+bindsym Ctrl+XF86MonBrightnessDown exec --no-startup-id xbacklight -dec 1
+
+# Auto startup
+
+exec_always --no-startup-id xsetwacom set "Wacom HID 50DB Finger touch" Gesture off
+
+#exec_always --no-startup-id export QT_QPA_PLATFORMTHEME="qt5ct"
+exec_always --no-startup-id /usr/lib/kdeconnectd &
+exec_always --no-startup-id indicator-kdeconnect
+#exec_always --no-startup-id nm-applet --agent
+#exec_always --no-startup-id ~/.config/i3/auto-xrandr
+#
+#exec_always --no-startup-id ~/.config/picom/launch.sh
+exec_always --no-startup-id waybar
+#exec_always --no-startup-id /home/daan/.screenlayout/HDMI.sh
+exec_always --no-startup-id ~/Scripts/setbg_wl.sh &
+#exec_always --no-startup-id hsetroot -solid "#ffffff"
+exec_always --no-startup-id mako &
+#exec_always --no-startup-id ~/.config/i3/oneko.sh
+exec_always --no-startup-id sh -c "wayvnc -r 192.168.1.199 55555"
+
+#bindsym $mod+w exec --no-startup-id guake-toggle &
+
+
+# Application
+
+bindsym $mod+Shift+e exec --no-startup-id ~/.config/sway/exit.sh
+
+bindsym $mod+Shift+g exec --no-startup-id dmenu_script game.sh
+
+bindsym $mod+c exec --no-startup-id rofi-pass-wl
+
+bindsym $mod+m exec --no-startup-id mpc toggle
+
+# window border size
+default_border pixel 0
+default_floating_border pixel 0
+
+# default font
+font pango:Open Sans 10
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+bindsym $mod+Return exec alacritty
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# start rofi
+bindsym $mod+d exec rofi -show drun --no-startup-id
+
+# workspaces
+# change focus
+bindsym $mod+h focus left
+bindsym $mod+j focus down
+bindsym $mod+k focus up
+bindsym $mod+l focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+h move left
+bindsym $mod+Shift+j move down
+bindsym $mod+Shift+k move up
+bindsym $mod+Shift+l move right
+
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
+
+bindsym $mod+Control+Left workspace prev
+bindsym $mod+Control+Right workspace next
+
+# split in horizontal orientation
+bindsym $mod+b split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+q focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# switch to workspace
+bindsym $mod+1 workspace 1
+bindsym $mod+2 workspace 2
+bindsym $mod+3 workspace 3
+bindsym $mod+4 workspace 4
+bindsym $mod+5 workspace 5
+bindsym $mod+6 workspace 6
+bindsym $mod+7 workspace 7
+bindsym $mod+8 workspace 8
+bindsym $mod+9 workspace 9
+bindsym $mod+0 workspace 10
+
+# move focused container to workspace
+bindsym $mod+Shift+1 move container to workspace 1
+bindsym $mod+Shift+2 move container to workspace 2
+bindsym $mod+Shift+3 move container to workspace 3
+bindsym $mod+Shift+4 move container to workspace 4
+bindsym $mod+Shift+5 move container to workspace 5
+bindsym $mod+Shift+6 move container to workspace 6
+bindsym $mod+Shift+7 move container to workspace 7
+bindsym $mod+Shift+8 move container to workspace 8
+bindsym $mod+Shift+9 move container to workspace 9
+bindsym $mod+Shift+0 move container to workspace 10
+
+bindsym $mod+Shift+greater move workspace to output up
+bindsym $mod+Shift+less move workspace to output down
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r swaymsg restart
+# exit i3 (logs you out of your X session)
+#bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym m resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+mode "passthrough" {
+    bindsym $mod+p mode "default"
+}
+
+bindsym $mod+p mode "passthrough"
+
+# Pulse Audio controls
+bindsym XF86AudioRaiseVolume exec --no-startup-id sh -c "pamixer -i 5"
+bindsym XF86AudioLowerVolume exec --no-startup-id sh -c "pamixer -d 5"
+bindsym XF86AudioMute exec --no-startup-id sh -c "pamixer -m"
+
+input type:pointer {
+    accel_profile flat
+    pointer_accel 0
+}
+
+input type:touchpad {
+    tap enabled
+    natural_scroll enabled
+}
+
+# Workspace assignment
+
+assign [class="^code-oss$"] 3
+for_window [class="^code-oss$"] focus
+
+assign [window_role="browser"] 2
+for_window [window_role="browser"] focus
+
+## Plasma Integration
+# Try to kill the wallpaper set by Plasma (it takes up the entire workspace and hides everythiing)
+exec --no-startup-id wmctrl -c Plasma
+for_window [title="Desktop — Plasma"] kill; floating enable; border none
+
+## Avoid tiling popups, dropdown windows from plasma
+# for the first time, manually resize them, i3 will remember the setting for floating windows
+for_window [class="plasmashell"] floating enable;
+for_window [class="Plasma"] floating enable; border none
+for_window [title="plasma-desktop"] floating enable; border none
+for_window [title="win7"] floating enable; border none
+for_window [class="krunner"] floating enable; border none
+for_window [class="Kmix"] floating enable; border none
+for_window [class="Klipper"] floating enable; border none
+for_window [class="Plasmoidviewer"] floating enable; border none
+
+#for_window [class="mpc"] mark "mpc", move scratchpad
+#bindsym $mod+Shift+m [con_mark="mpc"] scratchpad show
+#exec --no-startup-id sh -c "alacritty --class mpc --title mpc --command mpc-rs"
+
+for_window [app_id="mpc"] move scratchpad
+bindsym $mod+Shift+m [app_id="mpc"] scratchpad show
+exec_always --no-startup-id alacritty --class mpc --title mpc --command mpc-rs
+
+for_window [app_id="scratch"] move scratchpad
+bindsym $mod+w [app_id="scratch"] scratchpad show
+exec_always --no-startup-id alacritty --class scratch --title scratchpad
+
+output HEADLESS-1 resolution 1920x1080
+
+exec swayidle -w \
+	timeout 900 'swaylock' \
+	timeout 905 'swaymsg "output * dpms off"' \
+	resume 'swaymsg "output * dpms on"'
+
+
+#focus Pavucontrol or create it, if it did not already exist.
+#bindsym $mod+w exec swaymsg [app_id="scratchpad"] scratchpad show || exec alacritty --class scratchpad --title scratchpad , resize set 1800 1000
+#focus Vimpc or create it, if it did not already exist.
+#bindsym $mod+Shift+m exec swaymsg [app_id="mpc"] scratchpad show || exec alacritty --class mpc --title mpc --command mpc-rs , resize set 1800 1000
diff --git a/.config/sway/run_headless.sh b/.config/sway/run_headless.sh
new file mode 100755
index 0000000..f517168
--- /dev/null
+++ b/.config/sway/run_headless.sh
@@ -0,0 +1,2 @@
+#!/bin/sh
+exec env WLR_BACKENDS=headless WLR_LIBINPUT_NO_DEVICES=1 sway --config ~/.config/sway/remote.config
diff --git a/.zshrc b/.zshrc
index fdea737..a90e141 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,6 +1,6 @@
 # If you come from bash you might have to change your $PATH.
 export PATH=$HOME/bin:/usr/local/bin:$PATH
-export PATH="$PATH:$HOME/go/bin:$HOME/.cargo/bin:$HOME/.gem/ruby/2.7.0/bin:$HOME/.ghcup/bin"
+export PATH="$PATH:$HOME/go/bin:$HOME/.cargo/bin:$HOME/.gem/ruby/2.7.0/bin:$HOME/.ghcup/bin:$HOME/.gem/ruby/3.0.0/bin"
 
 export ZSH=/usr/share/oh-my-zsh
 
@@ -70,16 +70,18 @@ alias nodeindex="node lib/index.js"
 plugins=(
   git
   archlinux
-  tig gitfast colorize command-not-found cp dirhistory sudo
+  tig gitfast colorize command-not-found cp dirhistory sudo zsh-autosuggestions
+  zsh-syntax-highlighting
 )
 
 ZSH_COMPDUMP=/tmp/zcompdump-$USER
 source $ZSH/oh-my-zsh.sh
 
+
 HYPHEN_INSENSITIVE="true"
 COMPLETION_WAITING_DOTS="true"
 
-ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern cursor)
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern)
 
 # User configuration
 
@@ -96,69 +98,17 @@ then
     export PATH="${PATH}:$HOME/.emacs.d/bin"
 fi
 
-# TP Stuff
-
-declare -A beacons=(
-    [doc]="${HOME}/Documents"
-    [dev]="${HOME}/Docmuments/Development"
-    [node]="${HOME}/Documents/Development/Node"
-    [java]="${HOME}/Documents/Development/Java"
-    [python]="${HOME}/Documents/Development/Python"
-    [school]="${HOME}/Documents/School"
-    [iw]="${HOME}/Documents/School/IW"
-    [bvp]="${HOME}/Documents/School/BvP"
-)
-
-# tp() {
-#    cd ${beacons[$1]}
-# }
-
-
 export FFF_CD_ON_EXIT=1
-alias f="fff"
+export FFF_HIDDEN=0
+export EDITOR="nvim"
+export FFF_OPENER="xdg-open"
+export FFF_STAT_CMD="stat"
 
-
-# NNN Stuff
-
-export NNN_USE_EDITOR=1
-export NNN_DE_FILE_MANAGER=dolphin
-
-export NNN_TMPFILE="/tmp/nnn"
-export NNN_PLUG="p:preview-tabbed"
-export NNN_FIFO=/tmp/nnn.fifo
-
-n () {
-    # Block nesting of nnn in subshells
-    if [ -n $NNNLVL ] && [ "${NNNLVL:-0}" -ge 1 ]; then
-        echo "nnn is already running"
-        return
-    fi
-
-    # The default behaviour is to cd on quit (nnn checks if NNN_TMPFILE is set)
-    # To cd on quit only on ^G, remove the "export" as in:
-    #     NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
-    # NOTE: NNN_TMPFILE is fixed, should not be modified
-    export NNN_TMPFILE="${XDG_CONFIG_HOME:-$HOME/.config}/nnn/.lastd"
-
-    # Unmask ^Q (, ^V etc.) (if required, see `stty -a`) to Quit nnn
-    # stty start undef
-    # stty stop undef
-    # stty lwrap undef
-    # stty lnext undef
-
-    nnn "$@"
-
-    if [ -f "$NNN_TMPFILE" ]; then
-            . "$NNN_TMPFILE"
-            rm -f "$NNN_TMPFILE" > /dev/null
-    fi
+f() {
+    fff "$@"
+    cd "$(cat "${XDG_CACHE_HOME:=${HOME}/.cache}/fff/.fff_d")"
 }
 
-nh() {
-    NNN_SHOW_HIDDEN=1 n "$@"
-}
-
-export NNN_COPIER="echo -n $1 | xsel --clipboard --input"
 
 # Python Virtualenv Stuff
 
@@ -167,7 +117,7 @@ export WORKON_HOME=~/Documents/Development/Python/virtualenvs
 
 py() {
     PY_PREV_DIR=$PWD
-# source "$1/bin/activate"  # commented out by conda initialize
+    source "$1/bin/activate"  # commented out by conda initialize
 }
 
 depy() {
@@ -177,7 +127,6 @@ depy() {
 
 alias mkpy="python -m venv"
 
-
 bindkey -v
 bindkey "^?" backward-delete-char
 #zle-line-init() { zle -K vicmd; }
@@ -192,10 +141,10 @@ COMPLETION_WAITING_DOTS="true"
 alias zshrc="vim ~/.zshrc"
 alias reload="source ~/.zshrc"
 
-# Yay
-alias syu="yay -Syu"
-alias s="yay -S $@"
-alias r="yay -R $@"
+# Paru
+alias syu="paru -Syu"
+alias s="paru -S $@"
+alias r="paru -R $@"
 
 # Git
 
@@ -227,12 +176,6 @@ alias sysu="systemctl --user"
 
 # Scripts
 
-alias rotate="~/.config/i3/rotate.sh"
-
-alias ant="JAVA_HOME=/usr/lib/jvm/java-11-openjdk ant"
-
-source "tp"
-
 alias ls=exa
 alias l="exa -l"
 
@@ -260,50 +203,18 @@ paste() {
     cp "$(xclip -o)" .
 }
 
-subfix() {
-    for file in *.srt; do
-        mv "$file" "$(basename "$file" .srt).srt.gz"
-    done
-    gzip -d *.srt.gz
-}
-
 wakezolder() {
     wol -p 8009 -i 192.168.1.200 d4:3d:7e:fc:0e:32
 }
 
-# /!\ do not use with zsh-autosuggestions
-
-# /!\ zsh-syntax-highlighting and then zsh-autosuggestions must be at the end
-
-
-
-#source /usr/share/nvm/init-nvm.sh
-#source /usr/share/nvm/init-nvm.sh
 # If you come from bash you might have to change your $PATH.
 export PATH=$HOME/bin:/usr/local/bin:$PATH
 
-#export ZSH=/usr/share/oh-my-zsh
-
-
 eval $(thefuck --alias)
 alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
 alias config='/usr/bin/git --git-dir=/home/daan/.cfg/ --work-tree=/home/daan'
-#source /home/daan/.local/bin/tp
 
 alias chadgit="GIT_SSH_COMMAND='ssh -i ~/.ssh/id_rsa_tor -o IdentitiesOnly=yes' git"
 
-# >>> conda initialize >>>
-# !! Contents within this block are managed by 'conda init' !!
-#__conda_setup="$('/usr/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)"
-#if [ $? -eq 0 ]; then
-    #eval "$__conda_setup"
-#else
-    #if [ -f "/usr/etc/profile.d/conda.sh" ]; then
-        #. "/usr/etc/profile.d/conda.sh"
-    #else
-        #export PATH="/usr/bin:$PATH"
-    #fi
-#fi
-#unset __conda_setup
-# <<< conda initialize <<<
-
+source /usr/share/skim/key-bindings.zsh
+source /usr/share/skim/completion.zsh