diff --git a/applications/.local/share/applications/custom/DBeaver.desktop b/applications/.local/share/applications/custom/DBeaver.desktop
index 535f312..4d7acce 100755
--- a/applications/.local/share/applications/custom/DBeaver.desktop
+++ b/applications/.local/share/applications/custom/DBeaver.desktop
@@ -5,7 +5,7 @@ Terminal=false
 Name=DBeaver
 GenericName=SQL Database Client
 Comment=Universal Database Manager and SQL Client.
-Exec=bash -c "GDK_BACKEND=x11 GTK_THEME=Raleigh /usr/bin/dbeaver"
+Exec=bash -c "JAVA_HOME=/usr/lib/jvm/default GDK_BACKEND=x11 GTK_THEME=Raleigh /usr/bin/dbeaver"
 Categories=IDE;Development
 WM_CLASS=DBeaver
 StartupWMClass=DBeaver
diff --git a/git/.config/git/config b/git/.config/git/config
index 64e5393..96690a9 100644
--- a/git/.config/git/config
+++ b/git/.config/git/config
@@ -11,7 +11,7 @@
 	preloadindex = true
 
 [include]
-	path = ~/.config/git/gitalias.txt
+	path = ~/.config/git/gitalias.ini
 
 [includeIf "gitdir:~/Sync/"]
 	path = ~/Sync/Obsidian/.gitconfig
diff --git a/git/.config/git/gitalias.txt b/git/.config/git/gitalias.ini
similarity index 96%
rename from git/.config/git/gitalias.txt
rename to git/.config/git/gitalias.ini
index 12f24ec..eea2b3e 100644
--- a/git/.config/git/gitalias.txt
+++ b/git/.config/git/gitalias.ini
@@ -10,7 +10,7 @@
   o = checkout
   p = pull
   r = restore
-  cleanout = restore
+  cleanout = "!git restore --staged . && git restore ."
   rs = restore --staged
   s = status
   ush = push
diff --git a/mise/.config/mise/config.toml b/mise/.config/mise/config.toml
index 348e3a3..0b2bf94 100644
--- a/mise/.config/mise/config.toml
+++ b/mise/.config/mise/config.toml
@@ -4,7 +4,7 @@ nodejs = "16.14.0"
 golang = "1.23.0"
 flyctl = "0.1.64"
 sops = "3.6.1"
-java = "openjdk-17"
+java = "21"
 node = "20"
 dotnet-core = "8.0.401"
 bun = "1.2.4"
diff --git a/zsh/.config/zsh/.zshenv b/zsh/.config/zsh/.zshenv
deleted file mode 100644
index 0c33138..0000000
--- a/zsh/.config/zsh/.zshenv
+++ /dev/null
@@ -1,4 +0,0 @@
-source ~/.config/env
-
-# If running from tty1 start sway
-[ "$(tty)" = "/dev/tty1" ] && exec dbus-run-session sway
diff --git a/zsh/.config/zsh/zsh_history_main b/zsh/.config/zsh/zsh_history_main
index 544013e..cd0deb3 100644
Binary files a/zsh/.config/zsh/zsh_history_main and b/zsh/.config/zsh/zsh_history_main differ