diff --git a/.chezmoiexternal.toml b/.chezmoiexternal.toml
deleted file mode 100644
index a29f79c..0000000
--- a/.chezmoiexternal.toml
+++ /dev/null
@@ -1,8 +0,0 @@
-[".local/share/zsh/config"]
-    type = "git-repo"
-    url = "git@git.eeleater.org:eeleater/dotfiles_private.git"
-    refreshPeriod = "24h"
-[".local/share/omp"]
-    type = "git-repo"
-    url = "https://github.com/JanDeDobbeleer/oh-my-posh.git"
-    refreshPeriod = "24h"
diff --git a/dot_config/kitty/current-theme.conf b/dot_config/kitty/current-theme.conf
new file mode 100644
index 0000000..627ba40
--- /dev/null
+++ b/dot_config/kitty/current-theme.conf
@@ -0,0 +1,35 @@
+# vim:ft=kitty
+## name: Dracula
+## author: Keegan Carruthers-Smith
+## license: MIT
+## upstream: https://raw.githubusercontent.com/dracula/kitty/master/dracula.conf
+
+foreground            #f8f8f2
+background            #282a36
+selection_foreground  #ffffff
+selection_background  #44475a
+url_color #8be9fd
+color0  #21222c
+color8  #6272a4
+color1  #ff5555
+color9  #ff6e6e
+color2  #50fa7b
+color10 #69ff94
+color3  #f1fa8c
+color11 #ffffa5
+color4  #bd93f9
+color12 #d6acff
+color5  #ff79c6
+color13 #ff92df
+color6  #8be9fd
+color14 #a4ffff
+color7  #f8f8f2
+color15 #ffffff
+cursor            #f8f8f2
+cursor_text_color background
+active_tab_foreground   #282a36
+active_tab_background   #f8f8f2
+inactive_tab_foreground #282a36
+inactive_tab_background #6272a4
+mark1_foreground #282a36
+mark1_background #ff5555
diff --git a/dot_config/kitty/kitty.conf b/dot_config/kitty/kitty.conf
index 62b78fe..d4c30d8 100644
--- a/dot_config/kitty/kitty.conf
+++ b/dot_config/kitty/kitty.conf
@@ -4,12 +4,12 @@ copy_on_select no
 strip_trailing_spaces smart
 window_padding_width 5
 enable_audio_bell no
-shell_integration enabled
+shell_integration disabled
 
 # Fonts
 font_family FiraCode Nerd Font
 
 # BEGIN_KITTY_THEME
-# Rosé Pine Moon
+# Dracula
 include current-theme.conf
 # END_KITTY_THEME
diff --git a/dot_config/sheldon/plugins.toml b/dot_config/sheldon/plugins.toml
index e2a3ba3..3e175c7 100644
--- a/dot_config/sheldon/plugins.toml
+++ b/dot_config/sheldon/plugins.toml
@@ -1,17 +1,10 @@
 shell = "zsh"
 
 # own files
-[plugins.disableflow]
-inline = 'stty -ixon'
-
 [plugins.localenv]
 local = "~/.local/share/zsh/config"
 use = ["env.zsh"]
 
-[plugins.p10kconfig]
-local = "~/.config/zsh/"
-use = [".p10k.zsh"]
-
 [plugins.compinit]
 local = "~/.config/zsh/files/"
 use = ["compinit.zsh"]
@@ -56,10 +49,7 @@ github = "amyreese/zsh-titles"
 [plugins.thefuck]
 github = "laggardkernel/zsh-thefuck"
 
-[plugins.oath]
-github = "alexdesousa/oath"
-
-[plugins.exa]
+[plugins.eza]
 github = "twopizza9621536/zsh-eza"
 
 [plugins.bat]
@@ -71,9 +61,6 @@ github = "MichaelAquilina/zsh-you-should-use"
 [plugins.autosuggestions]
 github = "zsh-users/zsh-autosuggestions"
 
-#[plugins.autocomplete]
-#github = "marlonrichert/zsh-autocomplete"
-
 [plugins.syntaxhighlighting]
 github = "zsh-users/zsh-syntax-highlighting"
 
@@ -84,23 +71,15 @@ github = "asdf-vm/asdf"
 github = "olets/zsh-abbr"
 use = ["zsh-abbr.zsh"]
 
-[plugins.sshcomp]
+[plugins.bashcomps]
 local = "~/.config/zsh/files/"
-use = ["sshcomp.zsh"]
+use = ["bashcomps.zsh"]
 
-# themes
-#[plugins.powerlevel10k]
-#github = "romkatv/powerlevel10k"
-
-# evals
 [plugins.evalstuff]
 local = "~/.config/zsh/files/"
 use = ["evalstuff.zsh"]
 
-[plugins.ownfiles]
+[plugins.ownconfigs]
 local = "~/.config/zsh/files/"
-use = ["{aliases,functions,distroicon}.zsh"]
+use = ["{options,sshcomp,aliases,functions,distroicon}.zsh"]
 
-[plugins.bashcomps]
-local = "~/.config/zsh/files/"
-use = ["bashcomps.zsh"]
diff --git a/dot_config/zsh/dot_zsh_plugins.txt b/dot_config/zsh/dot_zsh_plugins.txt
index 3744b84..6b96e3c 100644
--- a/dot_config/zsh/dot_zsh_plugins.txt
+++ b/dot_config/zsh/dot_zsh_plugins.txt
@@ -23,7 +23,6 @@ zpm-zsh/ssh
 sobolevn/wakatime-zsh-plugin
 amyreese/zsh-titles
 laggardkernel/zsh-thefuck
-alexdesousa/oath
 twopizza9621536/zsh-eza
 fdellwing/zsh-bat
 MichaelAquilina/zsh-you-should-use
diff --git a/dot_config/zsh/dot_zshenv b/dot_config/zsh/dot_zshenv
index 0ab98ed..9251fa2 100644
--- a/dot_config/zsh/dot_zshenv
+++ b/dot_config/zsh/dot_zshenv
@@ -1,13 +1,9 @@
-# deduplicate path  and add local bin to path
-typeset -U path PATH
-export PATH="$HOME"/.local/bin:"$PATH"
-
 # xdg stuff
 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_DATA_DIRS=/usr/local/share:/usr/share:/var/lib/flatpak/exports/share:"$XDG_DATA_HOME"/flatpak/exports/share
 export XDG_STATE_HOME="$HOME"/.local/state
 export XDG_DESKTOP_DIR=$HOME/Desktop
 export XDG_DOCUMENTS_DIR="$HOME"/Documents
@@ -39,7 +35,8 @@ export NB_DIR="$XDG_DATA_HOME"/nb
 export DSTASK_GIT_REPO="$XDG_DATA_HOME"/dstask
 export WAKATIME_HOME="$XDG_DATA_HOME"/wakatime
 export WINEPREFIX="$XDG_DATA_HOME"/wine
-#export GNUPGHOME="$XDG_DATA_HOME"/gnupg
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+export GNUPGHOME="$XDG_DATA_HOME"/gnupg
 export W3M_DIR="$XDG_DATA_HOME"/w3m
 export GIBO_BOILERPLATES="$XDG_DATA_HOME"/giboboilerplates
 
@@ -53,7 +50,8 @@ export PYTHONSTARTUP=/etc/python/pythonrc
 # stuff
 export ZELLIJ_AUTO_ATTACH=true
 export ZELLIJ_AUTO_EXIT=true
-export TERMINALNAME=$(fastfetch --pipe 2>/dev/null | grep Terminal: | awk '{print $2}')
+export TERMINALNAME=$(fastfetch --pipe -s Terminal 2>/dev/null | awk '{print $2}')
+export MANROFFOPT="-c"
 
 # zsh specific
 export SAVEHIST=$(( 100 * 1000 ))
@@ -61,7 +59,5 @@ export HISTSIZE=$(( 1.2 * SAVEHIST ))
 export ZSH_CACHE_DIR="$XDG_CACHE_HOME"/zsh
 export HISTFILE="$ZSH_CACHE_DIR"/history
 export GPG_TTY="$TTY"
-#export DIFFPROG='meld'
+export DIFFPROG='meld'
 export AUTO_NTFY_DONE_IGNORE="ntfy emacs htop info less mail man meld most mutt nano screen ssh tail tmux top vi vim watch bat cat kate topgrade"
-
-unsetopt global_rcs
diff --git a/dot_config/zsh/dot_zshrc b/dot_config/zsh/dot_zshrc
index 4bdc136..bc25929 100644
--- a/dot_config/zsh/dot_zshrc
+++ b/dot_config/zsh/dot_zshrc
@@ -1,6 +1,11 @@
 test -v DISTROBOX_HOST_HOME && { unset ZDOTDIR; exec zsh } # fix distrobox
 test "x$TERMINALNAME" = "xalacritty" && eval "$(zellij setup --generate-auto-start zsh)" # autostart zellij only in alacritty
 
+# deduplicate path
+typeset -U path PATH
+path+=("$XDG_DATA_HOME"/JetBrains/Toolbox/scripts) # jetbrains toolbox
+path+=("$HOME"/.local/bin) # local bin
+
 # startup banner
 potentialBanner=('joke bofh' 'joke dad' 'joke hq dijkstra' 'joke hq knuth' 'joke hq perlis' 'joke hq torvalds' 'joke hq misc' 'colorscript random' 'fastfetch')
 eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
@@ -8,9 +13,6 @@ eval "$potentialBanner[$RANDOM%$#potentialBanner+1]"
 # disable flowcontrol
 stty -ixon
 
-# local env exports
-source "$XDG_DATA_HOME"/zsh/config/env.zsh
-
 # initialize completion system
 source "$ZDOTDIR"/files/compinit.zsh
 
@@ -20,17 +22,20 @@ source "$XDG_DATA_HOME"/antidote/antidote.zsh
 zstyle ':antidote:bundle' use-friendly-names 'yes'
 antidote load
 
-# eval stuff
+# source files
 source "$ZDOTDIR"/files/evalstuff.zsh
 source "$ZDOTDIR"/files/aliases.zsh
 source "$ZDOTDIR"/files/functions.zsh
+source "$ZDOTDIR"/files/options.zsh
 source "$ZDOTDIR"/files/distroicon.zsh
 
-# completion stuff
+# completion files
 source "$ZDOTDIR"/files/bashcomps.zsh
 source "$ZDOTDIR"/files/sshcomp.zsh
 
+# local overrides
+for sourced in "$XDG_DATA_HOME"/zsh/files/*; do source $sourced; done
+
 # theme
 potentialTheme=('atomic.omp.json' 'emodipt-extend.omp.json' 'kali.omp.json' 'lambda.omp.json' 'nordtron.omp.json')
-export POSH_THEME="$XDG_DATA_HOME/omp/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]"
-eval "$(oh-my-posh init zsh)"
+eval "$(oh-my-posh init zsh --config="$XDG_CACHE_HOME/oh-my-posh/themes/$potentialTheme[$RANDOM%$#potentialTheme+1]")"
diff --git a/dot_config/zsh/files/options.zsh b/dot_config/zsh/files/options.zsh
new file mode 100644
index 0000000..a8477c6
--- /dev/null
+++ b/dot_config/zsh/files/options.zsh
@@ -0,0 +1,5 @@
+setopt NO_CLOBBER
+setopt INTERACTIVE_COMMENTS
+setopt HASH_EXECUTABLES_ONLY
+setopt NUMERIC_GLOB_SORT
+unsetopt FLOW_CONTROL
diff --git a/dot_config/zsh/files/sshcomp.zsh b/dot_config/zsh/files/sshcomp.zsh
index e392282..799786b 100644
--- a/dot_config/zsh/files/sshcomp.zsh
+++ b/dot_config/zsh/files/sshcomp.zsh
@@ -9,20 +9,16 @@ zstyle ':completion:*:(ssh|mosh):*' group-order users hosts-domain hosts-host us
 zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:users' ignored-patterns '*'
 zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-host' ignored-patterns '*(.|:)*' loopback localhost broadcasthost 'ip6-*' 'hbz*'
 zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-domain' ignored-patterns '<->.<->.<->.<->' '^[-[:alnum:]]##(.[-[:alnum:]]##)##' '*@*' '*.eeleater.org' '*.hbz-nrw.de'
-zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.0.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*'
+zstyle ':completion:*:(ssh|scp|sshfs|mosh|rsync):*:hosts-ipaddr' ignored-patterns '^(<->.<->.<->.<->|(|::)([[:xdigit:].]##:(#c,2))##(|%*))' '127.*' '255.255.255.255' '::1' 'fe80::*' 'ff02::*'
 
 [ -r ~/.ssh/config ] && _ssh_config=($(cat ~/.ssh/config | sed -ne 's/Host[=\t ]//p')) || _ssh_config=()
 [ -r /etc/ssh/ssh_known_hosts ] && _global_ssh_hosts=(${${${${(f)"$(</etc/ssh/ssh_known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _global_ssh_hosts=()
 [ -r ~/.ssh/known_hosts ] && _ssh_hosts=(${${${${(f)"$(<$HOME/.ssh/known_hosts)"}:#[\|]*}%%\ *}%%,*}) || _ssh_hosts=()
 [ -r /etc/hosts ] && : ${(A)_etc_hosts:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts=()
-[ -r /etc/hosts_network ] && : ${(A)_etc_hosts_network:=${(s: :)${(ps:\t:)${${(f)~~"$(</etc/hosts_network)"}%%\#*}##[:blank:]#[^[:blank:]]#}}} || _etc_hosts_network=()
 hosts=(
 #    "$_ssh_config[@]"
-#    "$_global_ssh_hosts[@]"
-#    "$_ssh_hosts[@]"
-#    "$_etc_hosts[@]"
+    "$_global_ssh_hosts[@]"
+    "$_ssh_hosts[@]"
+    "$_etc_hosts[@]"
 )
-
-[ -r /etc/hosts_network ] && hosts+=("$_etc_hosts_network[@]")
-
 zstyle ':completion:*:hosts' hosts $hosts
diff --git a/dot_local/bin/executable_installOhMyPosh.sh b/dot_local/bin/executable_installOhMyPosh.sh
new file mode 100755
index 0000000..42548c8
--- /dev/null
+++ b/dot_local/bin/executable_installOhMyPosh.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+newestVersion="$(curl -sL https://api.github.com/repos/JanDeDobbeleer/oh-my-posh/releases/latest | jq -r '.name' | cut -dv -f2)"
+localVersion="$(oh-my-posh --version)"
+tmpFile="$(mktemp -u)"
+
+test "$newestVersion" != "$localVersion" && {
+    curl -so "$tmpFile" https://ohmyposh.dev/install.sh
+    bash "$tmpFile" -d "$HOME"/.local/bin
+}
diff --git a/dot_local/bin/executable_updateOhMyPosh.sh b/dot_local/bin/executable_updateOhMyPosh.sh
new file mode 100755
index 0000000..e8366eb
--- /dev/null
+++ b/dot_local/bin/executable_updateOhMyPosh.sh
@@ -0,0 +1,9 @@
+#!/bin/bash
+newestVersion="$(curl -sL https://api.github.com/repos/JanDeDobbeleer/oh-my-posh/releases/latest | jq -r '.name' | cut -dv -f2)"
+localVersion="$(oh-my-posh --version)"
+tmpFile="$(mktemp -u)"
+
+test "$newestVersion" != "$localVersion" && {
+    curl -so "$tmpFile" https://ohmyposh.dev/install.sh
+    bash "$tmpFile"
+}