diff --git a/shell/.config/shellconfig/aliases.sh b/shell/.config/shellconfig/aliases.sh
index 04d6c4f..19c2d14 100644
--- a/shell/.config/shellconfig/aliases.sh
+++ b/shell/.config/shellconfig/aliases.sh
@@ -3,6 +3,15 @@ alias ll='ls -l'
 alias tl='tmux list-sessions'
 alias rgh='rg -.'
 alias fdh='fd -H'
+alias lg=lazygit
+
+if alias st > /dev/null; then
+	alias gst='_vcs status'
+	unalias st
+fi
+if alias r > /dev/null; then
+	unalias r
+fi
 
 if which exa > /dev/null; then
     alias ls='exa --icons'
@@ -21,9 +30,10 @@ tn() {
 }
 
 tni() {
-	DIR=$(zoxide query -l | vis-menu -p 'Dir:' -l 10)
+	local Q="${@:-}"
+	local DIR=$(zoxide query -l | vis-menu -p 'Dir:' -l 10 "$Q")
 	if [ -n "$DIR" ]; then
-		NAME=$(echo | vis-menu -p 'Session name:' $(basename $DIR))
+		local NAME=$(echo | vis-menu -p 'Session name:' $(basename $DIR))
 		if [ -n "$DIR" ]; then
 			tmux new -A -s "$NAME" -c "$DIR"
 		fi
@@ -39,7 +49,8 @@ ta() {
 }
 
 tai() {
-	NAME=$(tmux ls | vis-menu -p 'Session:' -l 10 | cut -d: -f1)
+	local Q="${@:-}"
+	local NAME=$(tmux ls | vis-menu -p 'Session:' -l 10 "$Q" | cut -d: -f1)
 	if [ -n "$NAME" ]; then
 		tmux attach -t "$NAME"
 	fi
diff --git a/xsession/.Xresources b/xsession/.Xresources
index 400b5c6..f4ab83c 100644
--- a/xsession/.Xresources
+++ b/xsession/.Xresources
@@ -59,6 +59,7 @@ XTerm.vt100.color15:        #ECEFF4
 st.font: FiraCode Nerd Font:size=10
 
 #ifdef THEME_DARK
+st.lightmode: 0
 st.background: #1f212e
 st.foreground: #9da0af
 st.cursorColor: #bf8040
@@ -80,6 +81,7 @@ st.color13: #8f248f
 st.color14: #509595
 st.color15: #dbdff0
 #else
+st.lightmode: 1
 st.background: #f2f2f3
 st.foreground: #1f212e
 st.cursorColor: #bf8040