diff --git a/.config/lf/lfrc b/.config/lf/lfrc
index c06689d2..6c5b1ca6 100644
--- a/.config/lf/lfrc
+++ b/.config/lf/lfrc
@@ -73,7 +73,7 @@ cmd bulkrename $vidir
 
 cmd on-cd &{{
     prompt="$(zsh -lc 'print -P $PS1')\033[33m%f\033[0m"
-    printf "%b" "\033]0;$(echo $prompt | sed 's/\[[0-9;]*m//g;' | sed "s/%f/$(basename $f)/g")\007" > /dev/tty
+    printf "%b" "\033]0;$(echo $prompt | sed 's/\[[0-9;]*m//g;s/» %f//g')\007" > /dev/tty
     lf -remote "send $id set promptfmt \"$prompt\""
 }}
 
diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile
index 6570b9e6..4e963892 100644
--- a/.config/zsh/.zprofile
+++ b/.config/zsh/.zprofile
@@ -135,3 +135,13 @@ fi
 if [ -z "$DISPLAY" ] && [ "$XDG_VTNR" -eq 1 ]; then
     exec startx $XINITRC
 fi
+
+# zsh stuff
+export HISTSIZE=10000000
+export SAVEHIST=10000000
+export HISTFILE="$XDG_DATA_HOME/zsh/history"
+export KEYTIMEOUT=1
+export PROMPT='%B%F{blue}%n%F{cyan}@%F{blue}%m %F{magenta}[%F{white}%3~%F{magenta}] %(?.%F{green}.%F{red})»%f%b '
+export RPROMPT='%(?..%F{red}%?) $(venv_prompt)'
+
+source $ZDOTDIR/configs/hashes
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index 89729699..8fefd68c 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,5 +1,4 @@
 #!/bin/zsh
-source $ZDOTDIR/configs/vars
 source $ZDOTDIR/configs/widgets
 source $ZDOTDIR/configs/setup
 source $ZDOTDIR/configs/bindings
@@ -10,10 +9,6 @@ source $ZDOTDIR/plugins/fzf/bindings.zsh
 source $ZDOTDIR/plugins/fast-syntax-highlighting/fast-syntax-highlighting.plugin.zsh
 source $ZDOTDIR/plugins/virtualenvwrapper.plugin.zsh
 
-for f in $ZDOTDIR/configs/autogenerated/*; do
-    source $f
-done
-
 export GPG_TTY=$(tty)
 gpg-connect-agent updatestartuptty /bye >/dev/null 2>&1
 clear
diff --git a/.config/zsh/configs/autogenerated/hashes b/.config/zsh/configs/hashes
similarity index 100%
rename from .config/zsh/configs/autogenerated/hashes
rename to .config/zsh/configs/hashes
diff --git a/.config/zsh/configs/setup b/.config/zsh/configs/setup
index bcca6bfd..50d4cca8 100644
--- a/.config/zsh/configs/setup
+++ b/.config/zsh/configs/setup
@@ -15,9 +15,6 @@ _comp_options+=(globdots)
 
 zle_highlight+=(paste:none)
 
-PROMPT='%B%F{blue}%n%F{cyan}@%F{blue}%m %F{magenta}[%f%3~%F{magenta}] %(?.%F{green}.%F{red})»%f%b '
-RPROMPT='%(?..%F{red}%?) $(venv_prompt)'
-
 # Set the titlestring
 add-zsh-hook preexec write_title_cmd
 add-zsh-hook precmd write_title_wd
diff --git a/.config/zsh/configs/vars b/.config/zsh/configs/vars
deleted file mode 100644
index 80836dc0..00000000
--- a/.config/zsh/configs/vars
+++ /dev/null
@@ -1,4 +0,0 @@
-HISTSIZE=10000000
-SAVEHIST=10000000
-HISTFILE="$XDG_DATA_HOME/zsh/history"
-KEYTIMEOUT=1
diff --git a/.config/zsh/plugins/virtualenvwrapper.plugin.zsh b/.config/zsh/plugins/virtualenvwrapper.plugin.zsh
index a258fd14..9863bc04 100755
--- a/.config/zsh/plugins/virtualenvwrapper.plugin.zsh
+++ b/.config/zsh/plugins/virtualenvwrapper.plugin.zsh
@@ -14,8 +14,8 @@ workon_cwd() {
 
     if [ -r "$PROJECT_ROOT/.venv" ]; then
         ENV_NAME="$(cat $PROJECT_ROOT/.venv)"
-    else
-        ENV_NAME="$(basename "$PROJECT_ROOT")"
+    # else
+    #     ENV_NAME="$(basename "$PROJECT_ROOT")"
     fi
 
     [ -n "$CD_VIRTUAL_ENV" ] && [ "$ENV_NAME" != "$CD_VIRTUAL_ENV" ] && {
diff --git a/.local/bin/shortcuts b/.local/bin/shortcuts
index 6833daa2..2ccd2c16 100755
--- a/.local/bin/shortcuts
+++ b/.local/bin/shortcuts
@@ -5,7 +5,7 @@ bmdirs="$XDG_CONFIG_HOME/bookmarks/directories"
 bmfiles="$XDG_CONFIG_HOME/bookmarks/files"
 
 # Outputs
-zsh_named_dirs="$ZDOTDIR/configs/autogenerated/hashes"
+zsh_named_dirs="$ZDOTDIR/configs/hashes"
 lf_files="$XDG_DATA_HOME/lf/shortcut-files"
 lf_dirs="$XDG_DATA_HOME/lf/shortcut-dirs"
 lf_shortcuts="$XDG_CONFIG_HOME/lf/shortcutrc"