diff --git a/.stignore b/.stignore
new file mode 100644
index 0000000..115cc74
--- /dev/null
+++ b/.stignore
@@ -0,0 +1 @@
+config/bspwmrc
\ No newline at end of file
diff --git a/applications.conf.yaml b/applications.conf.yaml
index 112870e..30111ea 100644
--- a/applications.conf.yaml
+++ b/applications.conf.yaml
@@ -3,8 +3,9 @@
     - docker
     - docker-compose
 
-    # Chromium
-    - ungoogled-chromium
+    # Browser
+    # - ungoogled-chromium
+    - librewolf
 
     - buildnotify
 
diff --git a/config/.zshrc b/config/.zshrc
index 4005c7c..1c448ab 100644
--- a/config/.zshrc
+++ b/config/.zshrc
@@ -1,3 +1,10 @@
+# Enable Powerlevel10k instant prompt. Should stay close to the top of ~/.zshrc.
+# Initialization code that may require console input (password prompts, [y/n]
+# confirmations, etc.) must go above this block; everything else may go below.
+if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
+  source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
+fi
+
 # Instant prompt
 # source "${XDG_CACHE_HOME:-~/.cache}/p10k-instant-prompt-${(%):-%n}.zsh"
 
@@ -13,6 +20,9 @@ export PNPM_HOME="/home/guus/.local/share/pnpm"
 export PYTHON_HOME="/home/guus/.local/bin"
 export PATH="$PNPM_HOME:$PYTHON_HOME:$PATH"
 
+# Aliases
+source ~/.aliases
+
 # Plugins
 plugins=(git colorize docker yarn debian vscode sudo alias-finder archlinux zsh-histdb zsh-autosuggestions wakeonlan vi-mode)
 
@@ -31,8 +41,7 @@ bindkey "^y" redo
 bindkey "^H" backward-kill-word
 bindkey "^ " autosuggest-accept
 
-# Aliases
-source ~/.aliases
+eval "$(zoxide init zsh)"
 
 # Powerlevel10k
 source ~/.p10k.zsh
diff --git a/config/bspwmrc b/config/bspwmrc
index 1090d57..9b82746 100755
--- a/config/bspwmrc
+++ b/config/bspwmrc
@@ -18,8 +18,7 @@ feh --bg-center ~/dotfiles/wallpaper.jpg
 pgrep -x sxhkd > /dev/null || sxhkd &
 
 # Define workspaces
-bspc monitor HDMI-A-0 -d I II
-bspc monitor DisplayPort-0 -d III IV V VI VII VIII IX X
+bspc monitor -d I II III IV V VI VII VIII IX X
 
 bspc config border_width	1
 bspc config window_gap		6
@@ -28,6 +27,8 @@ bspc config split_ratio          0.52
 bspc config borderless_monocle   true
 bspc config gapless_monocle      true
 
+bspc rule -a android-studio state=floating border=off follow=on
+bspc rule -a librewolf desktop=^3
 bspc rule -a Chromium desktop=^3
 bspc rule -a Spotify desktop=^2
 bspc rule -a discord desktop=^1
diff --git a/config/dunstrc b/config/dunstrc
index 72754d4..e07dc8d 100644
--- a/config/dunstrc
+++ b/config/dunstrc
@@ -316,6 +316,9 @@
 [chvolume]
     ignore_history = yes
 
+[chlight]
+    ignore_history = yes
+
 # Every section that isn't one of the above is interpreted as a rules to
 # override settings for certain messages.
 #
diff --git a/config/environment b/config/environment
new file mode 100644
index 0000000..c82c53b
--- /dev/null
+++ b/config/environment
@@ -0,0 +1 @@
+_JAVA_AWT_WM_NONREPARENTING=1
\ No newline at end of file
diff --git a/config/flameshot.ini b/config/flameshot.ini
index e22ee7d..a36ea30 100644
--- a/config/flameshot.ini
+++ b/config/flameshot.ini
@@ -1,4 +1,6 @@
 [General]
 buttons=@Variant(\0\0\0\x7f\0\0\0\vQList<int>\0\0\0\0\v\0\0\0\0\0\0\0\x12\0\0\0\a\0\0\0\b\0\0\0\t\0\0\0\x10\0\0\0\n\0\0\0\v\0\0\0\r\0\0\0\x17\0\0\0\f)
 contrastOpacity=188
-uiColor=#0081a8
\ No newline at end of file
+drawColor=#000000
+savePath=/home/guus/Pictures/Screenshots
+uiColor=#0081a8
diff --git a/config/pacman.conf b/config/pacman.conf
index b98e3c3..365ee57 100644
--- a/config/pacman.conf
+++ b/config/pacman.conf
@@ -8,6 +8,7 @@
 #
 [options]
 Architecture = auto
+ParallelDownloads = 1
 
 Color
 ILoveCandy
diff --git a/config/polybar/modules/status b/config/polybar/modules/status
index 1b90224..b2b705c 100644
--- a/config/polybar/modules/status
+++ b/config/polybar/modules/status
@@ -30,12 +30,12 @@ label = %temperature-c%
 
 [module/wlan]
 type = internal/network
-interface = wlo1
+interface = wlp1s0
 interval = 3.0
 
 format-connected = <label-connected>
 
-label-connected = %essid%
+label-connected =  %essid%
 
 format-disconnected = <label-disconnected>
 
diff --git a/config/ssh b/config/ssh
index bdda54f..93bdbd2 100644
--- a/config/ssh
+++ b/config/ssh
@@ -32,7 +32,7 @@ Host sunflower
 Host azalea
     User ubuntu
     HostName 158.101.195.59
-	IdentityFile ~/.ssh/azalea
+    IdentityFile ~/.ssh/azalea
 
 Host crocus
     User ubuntu
diff --git a/config/sway b/config/sway
new file mode 100644
index 0000000..5799cde
--- /dev/null
+++ b/config/sway
@@ -0,0 +1,220 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+# Your preferred terminal emulator
+set $term kitty
+# Your preferred application launcher
+# Note: pass the final command to swaymsg so that the resulting window can be opened
+# on the original workspace that the command was run on.
+set $menu dmenu_path | bemenu | xargs swaymsg exec --
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /usr/share/backgrounds/sway/)
+output * bg /usr/share/backgrounds/wallpaper.jpg fill
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+exec swayidle -w \
+         timeout 300 'swaylock -f -c 000000' \
+         timeout 600 'swaymsg "output * dpms off"' resume 'swaymsg "output * dpms on"' \
+         before-sleep 'swaylock -f -c 000000'
+#
+# 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
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+#   input "2:14:SynPS/2_Synaptics_TouchPad" {
+#       dwt enabled
+#       tap enabled
+#       natural_scroll enabled
+#       middle_emulation enabled
+#   }
+#
+# You can get the names of your inputs by running: swaymsg -t get_inputs
+# Read `man 5 sway-input` for more information about this section.
+
+
+output <name> scale <facto>
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+w kill
+
+    # Start your launcher
+    bindsym $mod+space exec $menu
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+r reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -B 'Yes, exit sway' 'swaymsg exit'
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow keys
+    bindsym $mod+Shift+Left move left
+    bindsym $mod+Shift+Down move down
+    bindsym $mod+Shift+Up move up
+    bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+v splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+s layout stacking
+    bindsym $mod+t layout tabbed
+    bindsym $mod+e layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+f fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+g floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+g focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+
+#
+# Status Bar:
+#
+# Read `man 5 sway-bar` for more information about this section.
+bar {
+    position top
+
+    # When the status_command prints a new line to stdout, swaybar updates.
+    # The default just shows the current date and time.
+    status_command while date +'%Y-%m-%d %I:%M:%S %p'; do sleep 1; done
+
+    colors {
+        statusline #ffffff
+        background #323232
+        inactive_workspace #32323200 #32323200 #5c5c5c
+    }
+}
+
+include /etc/sway/config.d/*
diff --git a/config/sxhkdrc b/config/sxhkdrc
index 209e613..7723d00 100644
--- a/config/sxhkdrc
+++ b/config/sxhkdrc
@@ -10,10 +10,22 @@ super + Return
 super + @space
 	rofi -show combi
 
+super + l
+    kill -9 -1
+
+super + i
+    kitty 
+
 #
 # media
 #
 
+XF86Calculator
+    gnome-calculator
+
+XF86AudioMicMute
+    pactl set-source-mute @DEFAULT_SOURCE@ toggle
+
 XF86AudioStop
     playerctl pause
 
diff --git a/install-root.conf.yaml b/install-root.conf.yaml
index c0abc8a..ead6f85 100644
--- a/install-root.conf.yaml
+++ b/install-root.conf.yaml
@@ -7,6 +7,9 @@
 - link:
     # System
     /etc/pacman.conf: config/pacman.conf
+    /etc/environment: config/environment
+
+    /usr/share/backgrounds/wallpaper.jpg: wallpaper.jpg
 
     /bin/dotfiles: dotfiles
 
diff --git a/install.conf.yaml b/install.conf.yaml
index db0abcb..c0836fc 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -10,6 +10,7 @@
     # WM
     ~/.config/bspwm/bspwmrc: config/bspwmrc
     ~/.config/sxhkd/sxhkdrc: config/sxhkdrc
+    ~/.config/sway/config: config/sway
     ~/.config/polybar: config/polybar
     ~/.config/picom/picom.conf: config/picom.conf
 
diff --git a/scripts/open-captive b/scripts/open-captive
new file mode 100755
index 0000000..1dd9577
--- /dev/null
+++ b/scripts/open-captive
@@ -0,0 +1,5 @@
+#!/bin/bash
+
+url="$(curl -I http://captive.apple.com | grep -Fi "Location" | awk '{print $2}')"
+
+xdg-open "${url}" &