diff --git a/copy/gitconfig b/copy/gitconfig
deleted file mode 100644
index b0d906d..0000000
--- a/copy/gitconfig
+++ /dev/null
@@ -1,39 +0,0 @@
-[user]
-email = nikolasweger@googlemail.com
-name = Nikolas Weger
-
-[color]
-ui = auto
-
-[pretty]
-line = "%C(auto)%h%d %s %C(yellow)by %C(blue)%an %C(green)%ar"
-compact = "%C(auto)%h %s %C(green)%ar%n %C(auto)%d%n"
-detail = "%C(auto)%h %s%n  %C(yellow)by %C(blue)%an %C(magenta)<%ae> [%G?] %C(green)%ar%n %C(auto)%d%n"
-
-[diff]
-tool = meld
-
-[difftool]
-prompt = false
-
-[difftool "meld"]
-cmd = meld "$REMOTE" "$LOCAL"
-
-[merge]
-tool = meld
-
-[mergetool "meld"]
-cmd = meld "$LOCAL" "$MERGED" "$REMOTE" --output "$MERGED"
-
-[push]
-default = upstream
-
-[credential]
-helper = cache --timeout=3600
-
-[advice]
-detachedHead = false
-
-[core]
-excludesfile = /etc/gitignore
-editor = vim
diff --git a/copy/gitignore b/copy/gitignore
deleted file mode 100644
index b9c0cc3..0000000
--- a/copy/gitignore
+++ /dev/null
@@ -1,31 +0,0 @@
-# Compiled source #
-###################
-*.com
-*.class
-*.dll
-*.exe
-*.o
-*.so
-*.pyc
-
-# Editing tools and IDEs #
-##########################
-*.swp
-*~
-
-# Logs and databases #
-######################
-*.log
-*.sql
-*.sqlite
-
-# OS generated files #
-######################
-.DS_Store
-.DS_Store?
-._*
-.Spotlight-V100
-.Trashes
-Icon?
-ehthumbs.db
-Thumbs.db
diff --git a/install b/install
index 6dca597..47997d2 100755
--- a/install
+++ b/install
@@ -1,9 +1,5 @@
 #!/bin/bash
 [[ $1 == "copy" ]] && {
-  echo ">>> Copying .gitconfig - Please Wait! <<<"
-  sudo cp ${HOME}/.config/dotfiles/copy/gitconfig /etc/gitconfig
-  echo ">>> Copying .gitignore - Please Wait! <<<"
-  sudo cp ${HOME}/.config/dotfiles/copy/gitignore /etc/gitignore
   echo ">>> Copying .zshenv    - Please Wait! <<<"
   cp ${HOME}/.config/dotfiles/copy/zshenv ${HOME}/.zshenv
 }
diff --git a/zsh/files/aliases.zsh b/zsh/files/aliases.zsh
index 476c36b..19cf210 100644
--- a/zsh/files/aliases.zsh
+++ b/zsh/files/aliases.zsh
@@ -1,12 +1,9 @@
 alias ls='exa -al --color=always --group-directories-first'
 alias cat='bat'
-
 alias rm='rm -i'
 alias cp='cp -i'
 alias mv='mv -i'
 
-alias grep="grep --exclude-dir={.bzr,CVS,.git,.hg,.svn} --color=auto"
-
 alias sc-status="sudo systemctl status"
 alias sc-start="sudo systemctl start"
 alias sc-stop="sudo systemctl stop"
@@ -16,8 +13,7 @@ alias sc-enable="sudo systemctl enable"
 alias sc-disable="sudo systemctl disable"
 alias sc-daemon-reload="sudo systemctl daemon-reload"
 
-alias duplHostKeys='cat ~/.ssh/known_hosts | egrep -v "mesh.eu|inetbone.net" | cut -d" " -f3 | sort | uniq -d'
-alias tb="nc termbin.com 9999"
+alias termbin="nc termbin.com 9999"
 
 dotupdate () {
     pushd ~/.config/dotfiles &>/dev/null
@@ -27,10 +23,6 @@ dotupdate () {
     popd &>/dev/null
 }
 
-themeupdate () {
-    curl -fsSL https://starship.rs/install.sh | bash
-}
+themeupdate () { curl -fsSL https://starship.rs/install.sh | bash }
 
-sheldonup () {
-    curl --proto '=https' -fLsS https://rossmacarthur.github.io/install/crate.sh | sudo bash -s -- --force --repo rossmacarthur/sheldon --to /usr/local/bin
-}
+sheldonup () { curl --proto '=https' -fLsS https://rossmacarthur.github.io/install/crate.sh | sudo bash -s -- --force --repo rossmacarthur/sheldon --to /usr/local/bin }
diff --git a/zsh/rc.zsh b/zsh/rc.zsh
index 640cf2b..017b9e1 100644
--- a/zsh/rc.zsh
+++ b/zsh/rc.zsh
@@ -1,40 +1,50 @@
 export path=($path $HOME/.config/dotfiles/bin)
-export fpath=($fpath $ZDOTDIR/plugins/completions/src $ZDOTDIR/local/fpath)
+export fpath=($fpath $ZDOTDIR/local/fpath)
+export FZF_MARKS_FILE=$HOME/.config/fzfmarks
+
+mkdir -p $HOME/.cache/zsh
+
+declare -A ZINIT
+ZINIT[BIN_DIR]="$HOME/.config/zinit/bin"
+ZINIT[HOME_DIR]="$HOME/.config/zinit"
+ZINIT[ZCOMPDUMP_PATH]="$HOME/.cache/zsh/compdump"
+
+source $HOME/.config/zinit/bin/zinit.zsh
 
 # Theme
 export STARSHIP_CONFIG=$ZDOTDIR/starship.toml
 eval "$(starship init zsh)"
 
-# Completions
-mkdir -p $HOME/.cache/zsh
-autoload -Uz compinit
-compinit -d $HOME/.cache/zsh/compdump
+zinit silent wait'1' blockf for zsh-users/zsh-completions
+zinit silent wait'1' atload"_zsh_autosuggest_start" for zsh-users/zsh-autosuggestions
 
-# Own Files
+# Needed
 source $ZDOTDIR/files/dircolor.zsh
 source $ZDOTDIR/files/aliases.zsh
 source $ZDOTDIR/files/completion.zsh
 source $ZDOTDIR/files/history.zsh
-source $ZDOTDIR/files/keybindings.zsh
-source $ZDOTDIR/files/termsupport.zsh
-source $ZDOTDIR/files/clipboard.zsh
-source $ZDOTDIR/files/sudo.zsh
-source $ZDOTDIR/files/cnf.zsh
-source $ZDOTDIR/files/fzf.zsh
 source $ZDOTDIR/files/direnv.zsh
-source $ZDOTDIR/files/asdf.zsh
-source $ZDOTDIR/files/lando.zsh
+zinit snippet OMZL::functions.zsh
+zinit snippet OMZL::directories.zsh
+zinit snippet OMZL::key-bindings.zsh
+zinit snippet OMZL::termsupport.zsh
+zinit snippet OMZL::clipboard.zsh
+zinit snippet OMZL::grep.zsh
+zinit snippet OMZP::sudo
+zinit snippet OMZP::command-not-found
+zinit snippet OMZP::fzf
+zinit snippet OMZP::lando
 
-# Plugins and Configs
 eval "$(fasd --init auto)"
-source $ZDOTDIR/plugins/fzfasd/fzf-fasd.plugin.zsh
-export FZF_MARKS_FILE=$HOME/.config/fzfmarks
-source $ZDOTDIR/plugins/fzfmarks/fzf-marks.plugin.zsh
-source $ZDOTDIR/plugins/gitignore/gitignore.plugin.zsh
-source $ZDOTDIR/plugins/jq/jq.plugin.zsh
-source $ZDOTDIR/plugins/fzftab/fzf-tab.zsh
-source $ZDOTDIR/plugins/suggestions/zsh-autosuggestions.zsh
-source $ZDOTDIR/plugins/syntax/zsh-syntax-highlighting.zsh
+zinit silent wait'1' light-mode for wookayin/fzf-fasd
+zinit silent wait'1' light-mode for urbainvaes/fzf-marks
+zinit silent wait'1' light-mode for voronkovich/gitignore.plugin.zsh
+zinit silent wait'1' light-mode for reegnz/jq-zsh-plugin
+zinit silent wait'1' light-mode for @asdf-vm/asdf
+zinit silent wait'1' light-mode for Aloxaf/fzf-tab
+
+# syntax highlighting
+zinit silent wait'1' atinit"zpcompinit; zpcdreplay -q" for zsh-users/zsh-syntax-highlighting
 
 # Local RC
 [[ -f "$ZDOTDIR/local/rc.zsh" ]] && source "$ZDOTDIR/local/rc.zsh"