diff --git a/config/zsh/.zlogin b/config/zsh/.zlogin
new file mode 100644
index 0000000..5541075
--- /dev/null
+++ b/config/zsh/.zlogin
@@ -0,0 +1,3 @@
+#!/bin/zsh
+
+[ "$(TTY)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
diff --git a/.zshenv b/config/zsh/.zshenv
similarity index 94%
rename from .zshenv
rename to config/zsh/.zshenv
index 0d6ee59..58d7111 100644
--- a/.zshenv
+++ b/config/zsh/.zshenv
@@ -40,6 +40,11 @@ export XINITRC="${XDG_CONFIG_HOME}/x11/xinitrc"
 # export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" # it might break some dm
 
 
+# Move it to independent GTK config
+export GTK_THEME="Adwaita:dark"
+# GNUCASH Finance::Quote
+export ALPHAVANTAGE_API_KEY=UWSYHNQ9BNFU4ZFA
+
 # This is the list for lf icons:
 export LF_ICONS="di=📁:\
 fi=📃:\
diff --git a/config/zsh/.zshrc b/config/zsh/.zshrc
index 599efba..d64dfd4 100644
--- a/config/zsh/.zshrc
+++ b/config/zsh/.zshrc
@@ -18,6 +18,8 @@ zmodload zsh/complist
 compinit -Cu
 _comp_options+=(globdots) # Include hidden files
 
+unsetopt extendedglob
+
 bindkey -M menuselect 'h' vi-backward-char
 bindkey -M menuselect 'k' vi-up-line-or-history
 bindkey -M menuselect 'l' vi-forward-char
diff --git a/install.sh b/install.sh
index 8956ee5..4da673a 100755
--- a/install.sh
+++ b/install.sh
@@ -2,14 +2,14 @@
 
 BASEDIR=$(pwd)
 
-source .zshenv
+source config/zsh/.zshenv
 
 ln --force --symbolic $BASEDIR/.zshenv $HOME/.zshenv
 
 mkdir -p "${XDG_CONFIG_HOME}"
 mkdir -p "${XDG_DATA_HOME}"
 
-INSTALL_CONFIGS=(dunst i3 i3blocks lf mpd picom redshift rofi tmux x11 zsh)
+INSTALL_CONFIGS=(dunst git i3 i3blocks lf mpd picom redshift rofi tmux x11 zsh)
 for f in $INSTALL_CONFIGS ; do
     echo "Installing config for ${f}..."
     rm -rf ${XDG_CONFIG_HOME}/${f} > /dev/null 2>&1