diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf
index 2cdbb2f..05674b0 100644
--- a/dot_config/kitty/current-theme.conf
+++ b/dot_config/kitty/current-theme.conf
@@ -1,32 +1,21 @@
-# One Dark by Giuseppe Cesarano, https://github.com/GiuseppeCesarano
-# This work is licensed under the terms of the GPL-2.0 license.
-# For a copy, see https://www.gnu.org/licenses/old-licenses/gpl-2.0.en.html.
-
-# Colors
-
-foreground #979eab
-background #282c34
-
-color0 #282c34
-color1 #e06c75
-color2 #98c379
-color3 #e5c07b
-color4 #61afef
-color5 #be5046
-color6 #56b6c2
-color7 #979eab
-color8 #393e48
-color9 #d19a66
-color10 #56b6c2
-color11 #e5c07b
-color12 #61afef
-color13 #be5046
-color14 #56b6c2
-color15 #abb2bf
-
-# Tab Bar
-
-active_tab_foreground   #282c34
-active_tab_background   #979eab
-inactive_tab_foreground #abb2bf
-inactive_tab_background #282c34
+background            #202745
+foreground            #969cb3
+cursor                #969cb3
+selection_background  #5e6686
+color0                #202745
+color8                #6a7394
+color1                #c84821
+color9                #c76a28
+color2                #ab9639
+color10               #283256
+color3                #c08a2f
+color11               #5e6686
+color4                #3d8ed0
+color12               #898ea3
+color5                #6678cc
+color13               #dee1f0
+color6                #21a1c8
+color14               #9c6279
+color7                #969cb3
+color15               #f4f7ff
+selection_foreground #202745
diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf
index 7b2cb36..a3fb779 100644
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -10,6 +10,6 @@ shell_integration enabled
 font_family FiraCode Nerd Font
 
 # BEGIN_KITTY_THEME
-# One Dark
+# Atelier Sulphurpool
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml
index a3c6841..2709249 100644
--- a/dot_config/sheldon/plugins.toml
+++ b/dot_config/sheldon/plugins.toml
@@ -1,13 +1,8 @@
 shell = "zsh"
 
 [templates]
-defer = """{% for file in files %}
-zsh-defer source "{{ file }}"
-{% endfor %}"""
-
-defer-more = """{% for file in files %}
-zsh-defer -t 0.5 source "{{ file }}"
-{% endfor %}"""
+defer = """{% for file in files %} zsh-defer source "{{ file }}" {% endfor %}"""
+defer-more = """{% for file in files %} zsh-defer -t 0.5 source "{{ file }}" {% endfor %}"""
 
 # own files
 [plugins.localenv]
@@ -18,9 +13,9 @@ use = ["env.zsh"]
 local = "~/.config/zsh/"
 use = [".p10k.zsh"]
 
-[plugins.ownfiles]
+[plugins.compinit]
 local = "~/.config/zsh/files/"
-use = ["{compinit,aliases,functions,distroicon}.zsh"]
+use = ["compinit.zsh"]
 
 # completions
 [plugins.completions]
@@ -34,12 +29,12 @@ github = "trapd00r/LS_COLORS"
 [plugins.zshdefer]
 github = "romkatv/zsh-defer"
 
-[plugins.ohmyzshlib]
+[plugins.omzlib]
 github = "ohmyzsh/ohmyzsh"
 dir = "lib"
 use = ["{completion,key-bindings,history,directories}.zsh"]
 
-[plugins.ohmyzshplugins]
+[plugins.omzplugins]
 github = "ohmyzsh/ohmyzsh"
 dir = "plugins"
 use = ["{systemd,fzf,command-not-found,transfer}/*.plugin.zsh"]
@@ -104,27 +99,14 @@ use = ["sshcomp.zsh"]
 #[plugins.powerlevel10k]
 #github = "romkatv/powerlevel10k"
 
-#[plugins.starship]
-#inline = "_evalcache starship init zsh --print-full-init"
-
-[plugins.ohmyposh]
-inline = "_evalcache oh-my-posh init zsh"
-
 # evals
-[plugins.zoxide]
-inline = "_evalcache zoxide init --cmd cd zsh"
+[plugins.evalstuff]
+local = "~/.config/zsh/files/"
+use = ["evalstuff.zsh"]
 
-[plugins.atuin]
-inline = "_evalcache atuin init zsh"
-
-[plugins.navi]
-inline = "_evalcache navi widget zsh"
-
-[plugins.direnv]
-inline = "_evalcache direnv hook zsh"
-
-[plugins.keychain]
-inline = 'eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)"'
+[plugins.ownfiles]
+local = "~/.config/zsh/files/"
+use = ["{aliases,functions,distroicon}.zsh"]
 
 [plugins.bashcomps]
 local = "~/.config/zsh/files/"
diff --git a/dot_config/zsh/env.zsh b/dot_config/zsh/env.zsh
index 8d71a50..4d7275f 100644
--- a/dot_config/zsh/env.zsh
+++ b/dot_config/zsh/env.zsh
@@ -1,16 +1,13 @@
 # path
 export PATH="$HOME"/.local/bin:"$PATH"
 
-# ibus specific
-export GTK_IM_MODULE=ibus
-export QT_IM_MODULE=ibus
-export XMODIFIERS=@im=ibus
-
 # xdg stuff
-export XDG_DATA_HOME="$HOME"/.local/share
-export XDG_CONFIG_HOME="$HOME"/.config
-export XDG_STATE_HOME="$HOME"/.local/state
 export XDG_CACHE_HOME="$HOME"/.cache
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_CONFIG_DIRS=/etc/xdg
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_DATA_DIRS=/usr/local/share:/usr/share
+export XDG_STATE_HOME="$HOME"/.local/state
 export XDG_DESKTOP_DIR=$HOME/Desktop
 export XDG_DOCUMENTS_DIR="$HOME"/Documents
 export XDG_DOWNLOAD_DIR="$HOME"/Downloads
@@ -19,10 +16,6 @@ export XDG_PICTURES_DIR="$HOME"/Pictures
 export XDG_VIDEOS_DIR="$HOME"/Videos
 export XDG_PROJECTS_DIR="$XDG_DOCUMENTS_DIR"/projects
 
-# system xdg stuff
-export XDG_DATA_DIRS=/usr/local/share:/usr/share
-export XDG_CONFIG_DIRS=/etc/xdg
-
 # cache files
 export NUGET_PACKAGES="$XDG_CACHE_HOME"/NuGetPackages
 export ZSH_EVALCACHE_DIR="$XDG_CACHE_HOME"/evalcache
@@ -43,24 +36,24 @@ export ASDF_DATA_DIR="$XDG_DATA_HOME"/asdf
 export NB_DIR="$XDG_DATA_HOME"/nb
 export DSTASK_GIT_REPO="$XDG_DATA_HOME"/dstask
 export WAKATIME_HOME="$XDG_DATA_HOME"/wakatime
-
-# gpg
+export WINEPREFIX="$XDG_DATA_HOME"/wine
 #export GNUPGHOME="$XDG_DATA_HOME"/gnupg
-export GPG_TTY="$TTY"
 
 # other programs
 export LESSHISTFILE="$XDG_STATE_HOME"/less/history
 export EDITOR=nvim
 export VISUAL="subl -w"
 export ZSH_WAKATIME_BIN=/usr/bin/wakatime
+export PYTHONSTARTUP="/etc/python/pythonrc"
 
 # stuff
 export ZELLIJ_AUTO_ATTACH=true
 export ZELLIJ_AUTO_EXIT=true
-export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep -i terminal: | awk '{print $2}')
+export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep Terminal: | awk '{print $2}')
 
 # zsh specific
-export SAVEHIST=$(( 1000 * 1000 ))
+export SAVEHIST=$(( 100 * 1000 ))
 export HISTSIZE=$(( 1.2 * SAVEHIST ))
 export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh
 export HISTFILE="$ZSH_CACHE_DIR"/history
+export GPG_TTY="$TTY"
diff --git a/dot_config/zsh/files/evalstuff.zsh b/dot_config/zsh/files/evalstuff.zsh
new file mode 100644
index 0000000..a8dc4fe
--- /dev/null
+++ b/dot_config/zsh/files/evalstuff.zsh
@@ -0,0 +1,14 @@
+# starship
+# _evalcache starship init zsh --print-full-init
+
+# ohmyposh
+potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json' 'pure.omp.json' 'uew.omp.json')
+export POSH_THEME="/usr/share/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
+eval "$(ohmyposh init zsh)"
+
+# evalstuff
+_evalcache zoxide init --cmd cd zsh
+_evalcache atuin init zsh
+_evalcache navi widget zsh
+_evalcache direnv hook zsh
+eval "$(keychain --dir "$XDG_CACHE_HOME"/keychain --eval --quiet id_rsa)"
diff --git a/dot_config/zsh/rc.zsh b/dot_config/zsh/rc.zsh
index 591b4c8..dd7732e 100644
--- a/dot_config/zsh/rc.zsh
+++ b/dot_config/zsh/rc.zsh
@@ -5,11 +5,6 @@ if test "x$TERMINALNAME" = "xalacritty"; then eval "$(zellij setup --generate-au
 potentialBanner=('bofh; echo " - BOFH"' 'fastfetch' 'hackerquotes' 'colorscript random')
 eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
 
-# ohmyposh theme
-potentialTheme=('emodipt-extend.omp.json' '1_shell.omp.json' 'kali.omp.json' 'lambda.omp.json' 'pure.omp.json')
-export POSH_TOOLTIP=false
-export POSH_TRANSIENT=true
-export POSH_THEME="/usr/share/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
-
 # and source plugins
 eval "$(sheldon source)"
+