diff --git a/config/.bashrc b/config/.bashrc
index 751d496..820837f 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -15,6 +15,7 @@ PATH=$PATH:~/go/bin/
 PATH=$PATH:~/.nimble/bin/
 PATH=$PATH:~/Documents/suckless/dylan/opendylan-2024.1/bin
 PATH=$PATH:~/.config/emacs/bin/
+PATH=$PATH:~/.mint/bin/
 # don't put duplicate lines or lines starting with space in the history.
 # See bash(1) for more options
 HISTCONTROL=ignoreboth
diff --git a/config/.config/bspwm/bspwmrc b/config/.config/bspwm/bspwmrc
index 8617db0..1344e63 100755
--- a/config/.config/bspwm/bspwmrc
+++ b/config/.config/bspwm/bspwmrc
@@ -12,6 +12,7 @@ if [ $(pgrep polybar) ]; then
 else
 	sleep .5 && polybar mainbar &
 fi
+pipewire-launch || pipewire-launch restart &
 #MONITOR=DP-5 polybar example &
 ~/.fehbg
 picom &
diff --git a/config/.config/dconf/user.txt b/config/.config/dconf/user.txt
index 0e52053..90d6fd7 100644
--- a/config/.config/dconf/user.txt
+++ b/config/.config/dconf/user.txt
@@ -895,15 +895,15 @@ xkb-options=['lv3:ralt_switch']
 clock-format='12h'
 color-scheme='default'
 cursor-size=24
-cursor-theme='Chicago95_Animated_Hourglass_Cursors'
+cursor-theme='Adwaita'
 document-font-name='Cantarell 11'
 enable-animations=true
 enable-hot-corners=true
 font-antialiasing='rgba'
 font-hinting='slight'
 font-name='Ubuntu 10'
-gtk-theme='rose-pine-gtk'
-icon-theme='rose-pine-icons'
+gtk-theme='Adwaita-dark'
+icon-theme='Adwaita'
 monospace-font-name='BigBlueTermPlus Nerd Font 12'
 show-battery-percentage=true
 toolbar-style='text'
diff --git a/config/.config/kak-tree-sitter/config.toml b/config/.config/kak-tree-sitter/config.toml
index 24a5b6f..9ecbe69 100644
--- a/config/.config/kak-tree-sitter/config.toml
+++ b/config/.config/kak-tree-sitter/config.toml
@@ -42,3 +42,27 @@ pin = "46cf4ded12ee974a70bf8457263b67ad7ee0379d"
 
 [language.typst.queries]
 path = "queries/typst"
+
+# swift
+[language.swift.grammar.source.git]
+url = "https://github.com/alex-pinkus/tree-sitter-swift"
+pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704"
+
+[language.swift.grammar]
+path = "src"
+compile = "cc"
+compile_args = ["-c", "-fpic", "../scanner.c", "-I", ".."]
+compile_flags = ["-O3"]
+link = "cc"
+link_args = ["-shared", "-fpic", "scanner.o", "-o", "swift.so"]
+link_flags = ["-O3"]
+
+[language.swift.queries.source.git]
+url = "https://github.com/helix-editor/helix"
+pin = "6bedca80646ce7350fb73029adf802ce7d9e241d"
+
+# url = "https://github.com/alex-pinkus/tree-sitter-swift"
+# pin = "57c1c6d6ffa1c44b330182d41717e6fe37430704"
+
+[language.swift.queries]
+path = "runtime/queries/swift"
diff --git a/config/.config/kak/kakrc b/config/.config/kak/kakrc
index 08a57ff..ae5dddd 100644
--- a/config/.config/kak/kakrc
+++ b/config/.config/kak/kakrc
@@ -51,7 +51,7 @@ set-option global luar_interpreter luajit
 # eval %sh{ kak-tree-sitter -dksvvv --with-highlighting --with-text-objects --init $kak_session }
 #eval %sh{ kak-tree-sitter -dks --with-text-objects --session $kak_session }
 #eval %sh{ kak-tree-sitter -dks  --with-highlighting --session $kak_session }
-eval %sh{ kak-tree-sitter -dksvvv --init $kak_session }
+eval %sh{ kak-tree-sitter -dksvvvv --init $kak_session }
 # evaluate-commands %sh{
 #     echo "colorscheme base16-$BASE16_THEME"
 # }
@@ -226,6 +226,12 @@ face global InfoDiagnosticHint        Information
 face global InfoDiagnosticInformation Information
 face global InfoDiagnosticWarning     Information
 
+hook -group lsp-filetype-swift global BufSetOption filetype=swift %{
+    set-option buffer lsp_servers %{
+        [sourcekit-lsp]
+        root_globs = [".git", ".hg"]
+    }
+}
 set-option global lsp_config %{
 }
 
diff --git a/config/.config/nvim/after/plugin/lsp.lua b/config/.config/nvim/after/plugin/lsp.lua
index ebeb313..c39922b 100755
--- a/config/.config/nvim/after/plugin/lsp.lua
+++ b/config/.config/nvim/after/plugin/lsp.lua
@@ -31,6 +31,8 @@ lsp_config.hls.setup{}
 
 lsp_config.clojure_lsp.setup{}
 
+lsp_config.sourcekit.setup{}
+
 local cmp = require("cmp")
 local cmp_select = {behavior = cmp.SelectBehavior.Select}
 local cmp_mappings = lsp.defaults.cmp_mappings({
diff --git a/config/.config/river/init b/config/.config/river/init
index be98452..60f3c16 100755
--- a/config/.config/river/init
+++ b/config/.config/river/init
@@ -174,9 +174,5 @@ swaybg -m fill -i $HOME/Pictures/wallpapers/wallpaper &
 # pgrep creek || ( while $HOME/.config/river/bar.sh; do sleep 1; done ) | creek -fn 'Ubuntu:size=14' -nf 0xb8b8b8 -nb 0x282828 -ff 0x181818 -fb 0x7cafc2
 pipewire-launch &
 waybar &
-<<<<<<< Updated upstream
 wlr-randr --output DP-1 --adaptive-sync enabled --mode 2560x1440@165Hz
-=======
-wlr-randr --output eDP-1 --scale 1.5
 dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP='river'
->>>>>>> Stashed changes
diff --git a/config/.icons/default/index.theme b/config/.icons/default/index.theme
index 21a3dbe..eb495ee 100644
--- a/config/.icons/default/index.theme
+++ b/config/.icons/default/index.theme
@@ -2,8 +2,4 @@
 [Icon Theme]
 Name=Default
 Comment=Default Cursor Theme
-<<<<<<< Updated upstream
-Inherits=Chicago95_Animated_Hourglass_Cursors
-=======
-Inherits=BreezeX-RosePineDawn-Linux
->>>>>>> Stashed changes
+Inherits=Adwaita
diff --git a/config/.xinitrc b/config/.xinitrc
index 1e66ec4..aa682bd 100755
--- a/config/.xinitrc
+++ b/config/.xinitrc
@@ -2,5 +2,5 @@ xrdb -merge ~/.Xresources
 # /home/mikec/.scripts/startup.sh
 # exec awesome
 # exec dwm
-# exec bspwm
-exec icewm
+exec bspwm
+# exec icewm