diff --git a/zsh/.p10k.zsh b/zsh/.p10k.zsh
index 265568c..76950e2 100644
--- a/zsh/.p10k.zsh
+++ b/zsh/.p10k.zsh
@@ -148,8 +148,8 @@
 
   #################################[ os_icon: os identifier ]##################################
   # OS identifier color.
-  typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=232
-  typeset -g POWERLEVEL9K_OS_ICON_BACKGROUND=7
+  typeset -g POWERLEVEL9K_OS_ICON_FOREGROUND=17 
+  typeset -g POWERLEVEL9K_OS_ICON_BACKGROUND=2
   # Custom icon.
   # typeset -g POWERLEVEL9K_OS_ICON_CONTENT_EXPANSION='⭐'
 
@@ -157,9 +157,9 @@
   # Transparent background.
   typeset -g POWERLEVEL9K_PROMPT_CHAR_BACKGROUND=
   # Green prompt symbol if the last command succeeded.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=76
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=10
   # Red prompt symbol if the last command failed.
-  typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=196
+  typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS,VIOWR}_FOREGROUND=1
   # Default prompt symbol.
   typeset -g POWERLEVEL9K_PROMPT_CHAR_{OK,ERROR}_VIINS_CONTENT_EXPANSION='❯'
   # Prompt symbol in command vi mode.
@@ -178,7 +178,7 @@
 
   ##################################[ dir: current directory ]##################################
   # Current directory background color.
-  typeset -g POWERLEVEL9K_DIR_BACKGROUND=4
+  typeset -g POWERLEVEL9K_DIR_BACKGROUND=63
   # Default current directory foreground color.
   typeset -g POWERLEVEL9K_DIR_FOREGROUND=254
   # If directory is too long, shorten some of its segments to the shortest possible unique
diff --git a/zsh/.zcompdump b/zsh/.zcompdump
index 66aa6ff..7b27667 100644
--- a/zsh/.zcompdump
+++ b/zsh/.zcompdump
@@ -1,4 +1,4 @@
-#files: 790	version: 5.8
+#files: 935	version: 5.8
 
 _comps=(
 '-' '_precommand'
@@ -24,10 +24,12 @@ _comps=(
 'add-zle-hook-widget' '_add-zle-hook-widget'
 'add-zsh-hook' '_add-zsh-hook'
 'admin' '_sccs'
+'afew' '_afew'
 'ali' '_mh'
 'alias' '_alias'
 'amaya' '_webbrowser'
 'analyseplugin' '_analyseplugin'
+'android' '_android'
 'animate' '_imagemagick'
 'anno' '_mh'
 'ansible' '_ansible'
@@ -50,16 +52,19 @@ _comps=(
 'appletviewer' '_java'
 'apropos' '_man'
 'apvlv' '_pdf'
+'archlinux-java' '_archlinux-java'
 'arecord' '_alsa-utils'
 'arena' '_webbrowser'
 'arp' '_arp'
 'arping' '_arping'
 '-array-value-' '_value'
+'artisan' '_artisan'
 'asciidoctor' '_asciidoctor'
 'asciinema' '_asciinema'
 'ash' '_sh'
 '-assign-parameter-' '_assign'
 'at' '_at'
+'atach' '_atach'
 'atq' '_at'
 'atrm' '_at'
 'attr' '_attr'
@@ -84,11 +89,13 @@ _comps=(
 'bibtex' '_bibtex'
 'bindkey' '_bindkey'
 'bison' '_bison'
+'bitcoin-cli' '_bitcoin-cli'
 'bmake' '_make'
 'bogofilter' '_bogofilter'
 'bogotune' '_bogofilter'
 'bogoutil' '_bogofilter'
 'bootctl' '_bootctl'
+'bower' '_bower'
 'bpython' '_bpython'
 'bpython2' '_bpython'
 'bpython2-gtk' '_bpython'
@@ -115,6 +122,7 @@ _comps=(
 'bttrack' '_bittorrent'
 'buildhash' '_ispell'
 'builtin' '_builtin'
+'bundle' '_bundle'
 'bunzip2' '_bzip2'
 'burst' '_mh'
 'busctl' '_busctl'
@@ -128,12 +136,16 @@ _comps=(
 'bzr' '_bzr'
 'c++' '_gcc'
 'cabal' '_cabal'
+'caffeinate' '_caffeinate'
 'cal' '_cal'
 'calendar' '_calendar'
+'cap' '_cap'
 'cargo' '_cargo'
+'cask' '_cask'
 'cat' '_cat'
 'catchsegv' '_precommand'
 'cc' '_gcc'
+'ccache' '_ccache'
 'ccal' '_ccal'
 'cd' '_cd'
 'cdc' '_sccs'
@@ -143,6 +155,7 @@ _comps=(
 'cdrecord' '_cdrecord'
 'ceilometer' '_openstack'
 'certtool' '_gnutls'
+'cf' '_cf'
 'cftp' '_twisted'
 'chage' '_users'
 'chattr' '_chattr'
@@ -156,8 +169,10 @@ _comps=(
 'chkconfig' '_chkconfig'
 'chkstow' '_stow'
 'chmod' '_chmod'
+'choc' '_choc'
 'chown' '_chown'
 'chpass' '_chsh'
+'chromium' '_chromium'
 'chroot' '_chroot'
 'chrt' '_chrt'
 'chsh' '_chsh'
@@ -172,10 +187,12 @@ _comps=(
 'clear' '_nothing'
 'cloudkitty' '_openstack'
 'clusterdb' '_postgresql'
+'cmake' '_cmake'
 'cmp' '_cmp'
 'co' '_rcs'
 'code' '_code'
 'code-oss' '_code-oss'
+'coffee' '_coffee'
 'column' '_column'
 'comb' '_sccs'
 'combine' '_imagemagick'
@@ -191,10 +208,13 @@ _comps=(
 'composer.phar' '_composer'
 'composite' '_imagemagick'
 'compress' '_compress'
+'conan' '_conan'
 'conch' '_twisted'
+'concourse' '_concourse'
 '-condition-' '_condition'
 'config.status' '_configure'
 'configure' '_configure'
+'console' '_console'
 'convert' '_imagemagick'
 'coredumpctl' '_coredumpctl'
 'cowsay' '_cowsay'
@@ -202,6 +222,7 @@ _comps=(
 'cp' '_cp'
 'cpio' '_cpio'
 'cplay' '_cplay'
+'cppcheck' '_cppcheck'
 'cpupower' '_cpupower'
 'createdb' '_postgresql'
 'createuser' '_postgresql'
@@ -214,6 +235,7 @@ _comps=(
 'curl' '_curl'
 'cut' '_cut'
 'cvs' '_cvs'
+'dad' '_dad'
 'darcs' '_darcs'
 'dash' '_sh'
 'date' '_date'
@@ -228,14 +250,18 @@ _comps=(
 'dcopref' '_dcop'
 'dcopstart' '_dcop'
 'dd' '_dd'
+'debuild' '_debuild'
 'declare' '_typeset'
 '-default-' '_default'
 'delta' '_sccs'
 'designate' '_openstack'
 'devtodo' '_devtodo'
 'df' '_df'
+'dget' '_dget'
 'dhclient' '_dhclient'
 'dhclient3' '_dhclient'
+'dhcpcd' '_dhcpcd'
+'diana' '_diana'
 'dict' '_dict'
 'diff' '_diff'
 'diff3' '_diff3'
@@ -257,11 +283,13 @@ _comps=(
 'doas' '_doas'
 'docker' '_docker'
 'dockerd' '_docker'
+'docpad' '_docpad'
 'domainname' '_yp'
 'dos2unix' '_dos2unix'
 'drill' '_drill'
 'dropdb' '_postgresql'
 'dropuser' '_postgresql'
+'drush' '_drush'
 'dsh' '_dsh'
 'dtruss' '_dtruss'
 'du' '_du'
@@ -278,6 +306,7 @@ _comps=(
 'e2label' '_e2label'
 'eatmydata' '_precommand'
 'ecasound' '_ecasound'
+'ecdsautil' '_ecdsautil'
 'echotc' '_echotc'
 'echoti' '_echoti'
 'ed' '_ed'
@@ -285,10 +314,12 @@ _comps=(
 'elfdump' '_elfdump'
 'elinks' '_elinks'
 'emulate' '_emulate'
+'emulator' '_emulator'
 'enable' '_enable'
 'enscript' '_enscript'
 'entr' '_entr'
 'env' '_env'
+'envdir' '_envdir'
 'eog' '_eog'
 'epdfview' '_pdf'
 'epsffit' '_psutils'
@@ -309,9 +340,12 @@ _comps=(
 'exec' '_exec'
 'expand' '_unexpand'
 'export' '_typeset'
+'exportfs' '_exportfs'
 'express' '_webbrowser'
 'extcheck' '_java'
 'extractres' '_psutils'
+'fab' '_fab'
+'fail2ban-client' '_fail2ban-client'
 'fakeroot' '_fakeroot'
 'false' '_nothing'
 'fc' '_fc'
@@ -320,6 +354,7 @@ _comps=(
 'fd' '_fd'
 'feh' '_feh'
 'fetchmail' '_fetchmail'
+'ffind' '_ffind'
 'ffmpeg' '_ffmpeg'
 'fg' '_jobs_fg'
 'fgrep' '_grep'
@@ -343,12 +378,15 @@ _comps=(
 'fixwwps' '_psutils'
 'flac' '_flac'
 'flatpak' '_flatpak'
+'fleetctl' '_fleetctl'
 'flex' '_flex'
 'flex++' '_flex'
 'flipdiff' '_patchutils'
 'flist' '_mh'
 'flists' '_mh'
 'float' '_typeset'
+'flutter' '_flutter'
+'fly' '_concourse'
 'fmt' '_fmt'
 'fmttest' '_mh'
 'fned' '_zed'
@@ -356,6 +394,7 @@ _comps=(
 'fold' '_fold'
 'folder' '_mh'
 'folders' '_mh'
+'force' '_force'
 'fortune' '_fortune'
 'forw' '_mh'
 'fprev' '_mh'
@@ -368,8 +407,10 @@ _comps=(
 'fuser' '_fuser'
 'fusermount' '_fusermount'
 'fwhois' '_whois'
+'fwupdmgr' '_fwupdmgr'
 'g++' '_gcc'
 'galeon' '_webbrowser'
+'gas' '_gas'
 'gawk' '_awk'
 'gb2sum' '_md5sum'
 'gbase32' '_base64'
@@ -420,20 +461,30 @@ _comps=(
 'ggv' '_gnome-gv'
 '_gh' '_gh'
 'gh' '_gh'
+'ghc' '_ghc'
+'ghci' '_ghc'
+'ghc-pkg' '_ghc'
 'ghead' '_head'
 'ghostscript' '_ghostscript'
 'ghostview' '_pspdf'
 'gid' '_id'
 'ginstall' '_install'
+'gist' '_gist'
 'git' '_git'
 'git-cvsserver' '_git'
+'git-flow' '_git-flow'
+'git-journal' '_git-journal'
 'gitk' '_git'
+'git-pulls' '_git-pulls'
 'git-receive-pack' '_git'
+'git-revise' '_git-revise'
 'git-shell' '_git'
 'git-upload-archive' '_git'
 'git-upload-pack' '_git'
+'git-wtf' '_git-wtf'
 'gjoin' '_join'
 'glance' '_openstack'
+'glances' '_glances'
 'gln' '_ln'
 'global' '_global'
 'glocate' '_locate'
@@ -462,13 +513,16 @@ _comps=(
 'gnutls-cli' '_gnutls'
 'gnutls-cli-debug' '_gnutls'
 'gnutls-serv' '_gnutls'
+'go' '_golang'
 'god' '_od'
 'gofmt' '_go'
+'google' '_google'
 'gpasswd' '_gpasswd'
 'gpaste' '_paste'
 'gpatch' '_patch'
 'gpg' '_gpg'
 'gpg2' '_gpg'
+'gpgconf' '_gpgconf'
 'gpgv' '_gpg'
 'gpg-zip' '_gpg'
 'gphoto2' '_gphoto2'
@@ -518,6 +572,7 @@ _comps=(
 'gtar' '_tar'
 'gtee' '_tee'
 'gtimeout' '_timeout'
+'gtk-launch' '_gtk-launch'
 'gtouch' '_touch'
 'gtr' '_tr'
 'gtty' '_tty'
@@ -572,11 +627,15 @@ _comps=(
 'hexdump' '_hexdump'
 'hilite' '_precommand'
 'history' '_fc'
+'hledger' '_hledger'
+'homestead' '_homestead'
 'host' '_host'
 'hostname' '_hostname'
 'hostnamectl' '_hostnamectl'
 'hotjava' '_webbrowser'
 'htop' '_htop'
+'http' '_httpie'
+'ibus' '_ibus'
 'iceweasel' '_mozilla'
 'icombine' '_ispell'
 'iconv' '_iconv'
@@ -591,6 +650,7 @@ _comps=(
 'import' '_imagemagick'
 'inc' '_mh'
 'includeres' '_psutils'
+'include-what-you-use' '_include-what-you-use'
 'info' '_texinfo'
 'infocmp' '_terminals'
 'initctl' '_initctl'
@@ -600,6 +660,7 @@ _comps=(
 'install-info' '_texinfo'
 'integer' '_typeset'
 'interdiff' '_patchutils'
+'inxi' '_inxi'
 'ionice' '_ionice'
 'iostat' '_iostat'
 'ip' '_ip'
@@ -627,11 +688,16 @@ _comps=(
 'javah' '_java'
 'javap' '_java'
 'jdb' '_java'
+'jmeter' '_jmeter'
+'jmeter-plugins' '_jmeter-plugins'
 'jobs' '_jobs_builtin'
 'joe' '_joe'
 'join' '_join'
+'jonas' '_jonas'
 'journalctl' '_journalctl'
 'jq' '_jq'
+'jrnl' '_jrnl'
+'kak' '_kak'
 'kdeconnect-cli' '_kdeconnect'
 'kernel-install' '_kernel-install'
 'keystone' '_openstack'
@@ -641,6 +707,8 @@ _comps=(
 'killall' '_killall'
 'killall5' '_killall'
 'kioclient' '_kfmclient'
+'kitchen' '_kitchen'
+'knife' '_knife'
 'knock' '_knock'
 'konqueror' '_webbrowser'
 'kpartx' '_kpartx'
@@ -662,6 +730,7 @@ _comps=(
 'lha' '_lha'
 'libinput' '_libinput'
 'light' '_webbrowser'
+'lilypond' '_lilypond'
 'limit' '_limit'
 'links' '_links'
 'links2' '_links'
@@ -702,6 +771,7 @@ _comps=(
 'ltrace' '_ltrace'
 'lua' '_lua'
 'luarocks' '_luarocks'
+'lunchy' '_lunchy'
 'lynx' '_lynx'
 'lz4' '_lz4'
 'lz4c' '_lz4'
@@ -726,6 +796,7 @@ _comps=(
 '-math-' '_math'
 'matlab' '_matlab'
 'mattrib' '_mtools'
+'mc' '_mc'
 'mcd' '_mtools'
 'mcopy' '_mtools'
 'md2' '_cksum'
@@ -751,8 +822,11 @@ _comps=(
 'mhpath' '_mh'
 'mhshow' '_mh'
 'mhstore' '_mh'
+'middleman' '_middleman'
 'mii-tool' '_mii-tool'
+'mina' '_mina'
 'mistral' '_openstack'
+'mix' '_mix'
 'mkdir' '_mkdir'
 'mkfifo' '_mkfifo'
 'mkinitcpio' '_mkinitcpio'
@@ -790,6 +864,7 @@ _comps=(
 'mread' '_mtools'
 'mren' '_mtools'
 'msgchk' '_mh'
+'mssh' '_mssh'
 'mt' '_mt'
 'mtn' '_monotone'
 'mtoolstest' '_mtools'
@@ -799,9 +874,13 @@ _comps=(
 'mupdf' '_mupdf'
 'murano' '_openstack'
 'mush' '_mail'
+'mussh' '_mussh'
 'mutt' '_mutt'
+'mux' '_tmuxinator'
 'mv' '_mv'
 'mvim' '_vim'
+'mvn' '_mvn'
+'mvnDebug' '_mvn'
 'mx' '_hosts'
 'mysql' '_mysql_utils'
 'mysqladmin' '_mysql_utils'
@@ -810,6 +889,8 @@ _comps=(
 'mysqlimport' '_mysql_utils'
 'mysqlshow' '_mysql_utils'
 'nail' '_mail'
+'nano' '_nano'
+'nanoc' '_nanoc'
 'native2ascii' '_java'
 'nautilus' '_nautilus'
 'nawk' '_awk'
@@ -830,6 +911,7 @@ _comps=(
 'new' '_mh'
 'newgrp' '_groups'
 'next' '_mh'
+'nft' '_nftables'
 'nginx' '_nginx'
 'ngrep' '_ngrep'
 'nice' '_nice'
@@ -840,6 +922,7 @@ _comps=(
 'nmblookup' '_samba'
 'nmcli' '_networkmanager'
 'nocorrect' '_precommand'
+'node' '_node'
 'noglob' '_precommand'
 'nohup' '_precommand'
 'nova' '_openstack'
@@ -849,6 +932,7 @@ _comps=(
 'ntalk' '_other_accounts'
 'numfmt' '_numfmt'
 'nvim' '_vim'
+'nvm' '_nvm'
 'objdump' '_objdump'
 'od' '_od'
 'ogg123' '_vorbis'
@@ -857,10 +941,16 @@ _comps=(
 'ogginfo' '_vorbis'
 'oksh' '_sh'
 'okular' '_okular'
+'openssl' '_openssl'
 'openstack' '_openstack'
+'openvpn3' '_openvpn3'
 'opera' '_webbrowser'
 'opera-next' '_webbrowser'
 'opkg' '_opkg'
+'optirun' '_optirun'
+'opusdec' '_opustools'
+'opusenc' '_opustools'
+'opusinfo' '_opustools'
 'p4' '_perforce'
 'p4d' '_perforce'
 'pacat' '_pulseaudio'
@@ -883,6 +973,7 @@ _comps=(
 'paste' '_paste'
 'pasuspender' '_pulseaudio'
 'patch' '_patch'
+'patool' '_patool'
 'pax' '_pax'
 'pcat' '_pack'
 'pcred' '_pids'
@@ -901,6 +992,8 @@ _comps=(
 'pdftops' '_pdf'
 'pdftotext' '_pdf'
 'pdksh' '_sh'
+'perf' '_perf'
+'periscope' '_periscope'
 'perl' '_perl'
 'perldoc' '_perldoc'
 'pfiles' '_pids'
@@ -913,6 +1006,7 @@ _comps=(
 'pgrep' '_pgrep'
 'pg_restore' '_postgresql'
 'pg_upgrade' '_postgresql'
+'phing' '_phing'
 'php' '_php'
 'pick' '_mh'
 'picocom' '_picocom'
@@ -924,12 +1018,16 @@ _comps=(
 'pinfo' '_texinfo'
 'ping' '_ping'
 'ping6' '_ping'
+'pixz' '_pixz'
+'pkcon' '_pkcon'
 'pkgadd' '_pkgadd'
 'pkg-config' '_pkg-config'
 'pkginfo' '_pkginfo'
 'pkgrm' '_pkgrm'
 'pkill' '_pgrep'
+'play' '_play'
 'pldd' '_pids'
+'pm2' '_pm2'
 'pmake' '_make'
 'pman' '_perl_modules'
 'pmap' '_pmap'
@@ -949,6 +1047,7 @@ _comps=(
 'policytool' '_java'
 'pon' '_pon'
 'popd' '_directory_stack'
+'port' '_port'
 'postconf' '_postfix'
 'postgres' '_postgresql'
 'postmaster' '_postgresql'
@@ -959,6 +1058,7 @@ _comps=(
 'printenv' '_printenv'
 'printf' '_print'
 'prompt' '_prompt'
+'protoc' '_protoc'
 'prove' '_prove'
 'prs' '_sccs'
 'prt' '_sccs'
@@ -995,13 +1095,17 @@ _comps=(
 'pwait' '_pids'
 'pwdx' '_pids'
 'pwgen' '_pwgen'
+'pygmentize' '_pygmentize'
 'pyhtmlizer' '_twisted'
 'qdbus' '_qdbus'
 'qiv' '_qiv'
+'qmk' '_qmk'
 'qpdf' '_qpdf'
 'quilt' '_quilt'
 'r' '_fc'
+'rails' '_rails'
 'rake' '_rake'
+'ralio' '_ralio'
 'ranlib' '_ranlib'
 'rar' '_rar'
 'rc' '_sh'
@@ -1014,6 +1118,7 @@ _comps=(
 'readelf' '_readelf'
 'readlink' '_readlink'
 'readonly' '_typeset'
+'rec' '_redis-cli'
 '-redirect-' '_redirect'
 '-redirect-,<,bunzip2' '_bzip2'
 '-redirect-,<,bzip2' '_bzip2'
@@ -1028,6 +1133,7 @@ _comps=(
 '-redirect-,<,unxz' '_xz'
 '-redirect-,<,xz' '_xz'
 '-redirect-,>,xz' '_xz'
+'redis-cli' '_redis-cli'
 'refile' '_mh'
 'rehash' '_hash'
 'reindexdb' '_postgresql'
@@ -1038,10 +1144,12 @@ _comps=(
 'resolvectl' '_resolvectl'
 'restart' '_initctl'
 'retawq' '_webbrowser'
+'rfkill' '_rfkill'
 'rg' '_rg'
 'rgview' '_vim'
 'rgvim' '_vim'
 'ri' '_ri'
+'rkt' '_rkt'
 'rlogin' '_rlogin'
 'rm' '_rm'
 'rmd160' '_cksum'
@@ -1051,16 +1159,22 @@ _comps=(
 'rmic' '_java'
 'rmid' '_java'
 'rmiregistry' '_java'
+'rmlint' '_rmlint'
+'rmlint.sh' '_rmlint'
 'rmm' '_mh'
 'rmmod' '_modutils'
 'route' '_route'
 'rrdtool' '_rrdtool'
 'rsh' '_rlogin'
+'rslsync' '_rslsync'
+'rspec' '_rspec'
+'rsvm' '_rsvm'
 'rsync' '_rsync'
 'rtin' '_tin'
 'rubber' '_rubber'
 'rubber-info' '_rubber'
 'rubber-pipe' '_rubber'
+'rubocop' '_rubocop'
 'ruby' '_ruby'
 'ruby-mri' '_ruby'
 'run-help' '_run-help'
@@ -1075,6 +1189,9 @@ _comps=(
 'sadf' '_sysstat'
 'sahara' '_openstack'
 'sar' '_sysstat'
+'sbt' '_sbt'
+'scala' '_scala'
+'scalac' '_scala'
 'scan' '_mh'
 'sccs' '_sccs'
 'sccsdiff' '_sccs'
@@ -1085,6 +1202,8 @@ _comps=(
 'screen' '_screen'
 'script' '_script'
 'scriptreplay' '_script'
+'scrub' '_scrub'
+'sdd' '_sdd'
 'seaf-cli' '_seafile'
 'sed' '_sed'
 'senlin' '_openstack'
@@ -1092,12 +1211,15 @@ _comps=(
 'serialver' '_java'
 'service' '_service'
 'set' '_set'
+'setcap' '_setcap'
 'setfacl' '_setfacl'
 'setfacl.exe' '_setfacl'
 'setfattr' '_attr'
 'setopt' '_setopt'
 'setsid' '_setsid'
+'setup.py' '_setup.py'
 'setxkbmap' '_setxkbmap'
+'sfdx' '_sfdx'
 'sftp' '_ssh'
 'sh' '_sh'
 'sha1' '_cksum'
@@ -1111,10 +1233,12 @@ _comps=(
 'sha512sum' '_md5sum'
 'sha512t256' '_cksum'
 'shasum' '_shasum'
+'shellcheck' '_shellcheck'
 'shift' '_arrays'
 'show' '_mh'
 'showchar' '_psutils'
 'showmount' '_showmount'
+'showoff' '_showoff'
 'shred' '_shred'
 'shuf' '_shuf'
 'shutdown' '_shutdown'
@@ -1145,6 +1269,7 @@ _comps=(
 'sqlite3' '_sqlite'
 'sqsh' '_sqsh'
 'sr' '_surfraw'
+'srm' '_srm'
 'srptool' '_gnutls'
 'ss' '_ss'
 'ssh' '_ssh'
@@ -1154,6 +1279,7 @@ _comps=(
 'sshfs' '_sshfs'
 'ssh-keygen' '_ssh'
 'ssh-keyscan' '_ssh'
+'stack' '_stack'
 'star' '_tar'
 'start' '_initctl'
 'stat' '_stat'
@@ -1171,12 +1297,15 @@ _comps=(
 'stty' '_stty'
 'su' '_su'
 'subl' '_sublimetext'
+'subliminal' '_subliminal'
 '-subscript-' '_subscript'
 'sudo' '_sudo'
 'sudoedit' '_sudo'
 'sum' '_cksum'
+'supervisorctl' '_supervisorctl'
 'surfraw' '_surfraw'
 'sv' '_runit'
+'svm' '_svm'
 'svn' '_subversion'
 'svnadmin' '_subversion'
 'svnadmin-static' '_subversion'
@@ -1210,6 +1339,7 @@ _comps=(
 'talk' '_other_accounts'
 'tar' '_tar'
 'tardy' '_tardy'
+'tarsnap' '_tarsnap'
 'tcpdump' '_tcpdump'
 'tcp_open' '_tcpsys'
 'tcptraceroute' '_tcptraceroute'
@@ -1218,6 +1348,7 @@ _comps=(
 'tdd' '_devtodo'
 'tde' '_devtodo'
 'tdr' '_devtodo'
+'teamocil' '_teamocil'
 'tee' '_tee'
 'telnet' '_telnet'
 'tex' '_tex'
@@ -1226,6 +1357,7 @@ _comps=(
 'texi2pdf' '_texinfo'
 'texindex' '_texinfo'
 'tg' '_topgit'
+'thor' '_thor'
 'tidy' '_tidy'
 'tig' '_git'
 '-tilde-' '_tilde'
@@ -1239,12 +1371,15 @@ _comps=(
 'tla' '_tla'
 'tload' '_tload'
 'tmux' '_tmux'
+'tmuxinator' '_tmuxinator'
+'tmuxp' '_tmuxp'
 'todo' '_devtodo'
 'todo.sh' '_todo.sh'
 'toilet' '_toilet'
 'top' '_top'
 'totdconfig' '_totd'
 'touch' '_touch'
+'tox' '_tox'
 'tpb' '_tpb'
 'tput' '_tput'
 'tr' '_tr'
@@ -1253,6 +1388,11 @@ _comps=(
 'traceroute' '_hosts'
 'transmission-remote' '_transmission'
 'trap' '_trap'
+'trash' '_trash-put'
+'trash-empty' '_trash-empty'
+'trash-list' '_trash-list'
+'trash-put' '_trash-put'
+'trash-restore' '_trash-restore'
 'tree' '_tree'
 'trial' '_twisted'
 'trove' '_openstack'
@@ -1272,6 +1412,8 @@ _comps=(
 'type' '_which'
 'typeset' '_typeset'
 'udevadm' '_udevadm'
+'udisksctl' '_udisksctl'
+'ufw' '_ufw'
 'ulimit' '_ulimit'
 'uml_mconsole' '_uml'
 'uml_moo' '_uml'
@@ -1312,6 +1454,7 @@ _comps=(
 'userdel' '_users'
 'usermod' '_user_admin'
 'vacuumdb' '_postgresql'
+'vagrant' '_vagrant'
 'val' '_sccs'
 'valgrind' '_valgrind'
 '-value-' '_value'
@@ -1321,6 +1464,7 @@ _comps=(
 '-value-,ANSIBLE_STDOUT_CALLBACK,-default-' '_ansible'
 '-value-,ANT_ARGS,-default-' '_ant'
 '-value-,CFLAGS,-default-' '_gcc'
+'-value-,CMAKE_GENERATOR,-default-' '_cmake'
 '-value-,CPPFLAGS,-default-' '_gcc'
 '-value-,CXXFLAGS,-default-' '_gcc'
 '-value-,-default-,-command-' '_zargs'
@@ -1366,6 +1510,9 @@ _comps=(
 '-value-,XZ_OPT,-default-' '_xz'
 '-vared-' '_in_vared'
 'vared' '_vared'
+'VBoxHeadless' '_virtualbox'
+'vboxmanage' '_virtualbox'
+'VBoxManage' '_virtualbox'
 'vcsh' '_vcsh'
 'vim' '_vim'
 'vimdiff' '_vim'
@@ -1379,6 +1526,7 @@ _comps=(
 'vmstat' '_vmstat'
 'vncserver' '_vnc'
 'vncviewer' '_vnc'
+'vnstat' '_vnstat'
 'vorbiscomment' '_vorbis'
 'vpnc' '_vpnc'
 'vpnc-connect' '_vpnc'
@@ -1389,7 +1537,9 @@ _comps=(
 'watch' '_watch'
 'watcher' '_openstack'
 'wc' '_wc'
+'wemux' '_wemux'
 'wget' '_wget'
+'wg-quick' '_wg-quick'
 'what' '_sccs'
 'whatis' '_man'
 'whence' '_which'
@@ -1422,6 +1572,7 @@ _comps=(
 'xfontsel' '_x_utils'
 'xfreerdp' '_rdesktop'
 'xhost' '_x_utils'
+'xinput' '_xinput'
 'xkill' '_x_utils'
 'xli' '_xloadimage'
 'xloadimage' '_xloadimage'
@@ -1441,6 +1592,7 @@ _comps=(
 'xrandr' '_xrandr'
 'xrdb' '_x_utils'
 'xscreensaver-command' '_xscreensaver'
+'xsel' '_xsel'
 'xset' '_xset'
 'xsetbg' '_xloadimage'
 'xsetroot' '_x_utils'
@@ -1460,6 +1612,9 @@ _comps=(
 'xz' '_xz'
 'xzcat' '_xz'
 'yafc' '_yafc'
+'yaourt' '_yaourt'
+'yaourt.static' '_yaourt'
+'yarn' '_yarn'
 'yash' '_sh'
 'yay' '_yay'
 'ypbind' '_yp'
@@ -1476,6 +1631,7 @@ _comps=(
 'zargs' '_zargs'
 'zcalc' '_zcalc'
 '-zcalc-line-' '_zcalc_line'
+'zcash-cli' '_zcash-cli'
 'zcat' '_zcat'
 'zcompile' '_zcompile'
 'zcp' '_zmv'
@@ -1559,9 +1715,13 @@ _services=(
 'svnlite' 'svn'
 'tunes2pod.pl' 'tunes2pod'
 'unlzma' 'unxz'
+'VBoxHeadless' 'vboxheadless'
+'vboxmanage' 'vboxmanage'
+'VBoxManage' 'vboxmanage'
 'xelatex' 'latex'
 'xetex' 'tex'
 'xzcat' 'unxz'
+'yaourt.static' 'yaourt'
 'zf_chgrp' 'chgrp'
 'zf_chown' 'chown'
 )
@@ -1581,11 +1741,15 @@ _postpatcomps=(
 'pydoc[0-9.]#' '_pydoc'
 'python[0-9.]#' '_python'
 'qemu(|-system-*)' '_qemu'
+'rmlint.*.sh' '_rmlint'
 '(ruby|[ei]rb)[0-9.]#' '_ruby'
 'shasum(|5).*' '_shasum'
 '(texi(2*|ndex))' '_texi'
 '(tiff*|*2tiff|pal2rgb)' '_tiff'
+'-value-,CCACHE_*,-default-' '_ccache'
+'-value-,CGO*,-default-' '_golang'
 '-value-,(ftp|http(|s))_proxy,-default-' '_urls'
+'-value-,GO*,-default-' '_golang'
 '-value-,LC_*,-default-' '_locales'
 '-value-,*path,-default-' '_directories'
 '-value-,*PATH,-default-' '_dir_list'
@@ -1787,7 +1951,36 @@ autoload -Uz _bootctl _busctl _bwrap _cargo _chezmoi \
             _wait _which _widgets _zargs _zattr \
             _zcalc _zcalc_line _zcompile _zed _zftp \
             _zle _zmodload _zmv _zparseopts _zpty \
-            _zsh-mime-handler _zsocket _zstyle _ztodo
+            _zsh-mime-handler _zsocket _zstyle _ztodo _afew \
+            _android _archlinux-java _artisan _atach _bitcoin-cli \
+            _bower _bundle _caffeinate _cap _cask \
+            _ccache _cf _choc _chromium _cmake \
+            _coffee _composer _conan _concourse _console \
+            _cppcheck _dad _debuild _dget _dhcpcd \
+            _diana _docpad _drush _ecdsautil _emulator \
+            _envdir _exportfs _fab _fail2ban-client _ffind \
+            _fleetctl _flutter _force _fwupdmgr _gas \
+            _ghc _gist _git-flow _git-journal _git-pulls \
+            _git-revise _git-wtf _glances _golang _google \
+            _gpgconf _gtk-launch _hledger _homestead _httpie \
+            _ibus _include-what-you-use _inxi _jmeter _jmeter-plugins \
+            _jonas _jrnl _kak _kitchen _knife \
+            _language_codes _lilypond _lunchy _mc _middleman \
+            _mina _mix _mssh _mussh _mvn \
+            _nano _nanoc _nftables _node _nvm \
+            _openssl _openvpn3 _optirun _opustools _patool \
+            _perf _periscope _pgsql_utils _phing _pixz \
+            _pkcon _play _pm2 _port _protoc \
+            _pygmentize _qmk _rails _ralio _redis-cli \
+            _rfkill _rkt _rmlint _rslsync _rspec \
+            _rsvm _rubocop _sbt _scala _scrub \
+            _sdd _setcap _setup.py _sfdx _shellcheck \
+            _showoff _srm _stack _subl _subliminal \
+            _supervisorctl _svm _tarsnap _teamocil _thor \
+            _tmuxinator _tmuxp _tox _trash-empty _trash-list \
+            _trash-put _trash-restore _udisksctl _ufw _vagrant \
+            _virtualbox _vnstat _wemux _wg-quick _xinput \
+            _xsel _yaourt _yarn _zcash-cli
 autoload -Uz +X _call_program
 
 typeset -gUa _comp_assocs
diff --git a/zsh/.zcompdump.zwc b/zsh/.zcompdump.zwc
index 7c31f42..7bbdb2d 100644
Binary files a/zsh/.zcompdump.zwc and b/zsh/.zcompdump.zwc differ
diff --git a/zsh/.zshrc b/zsh/.zshrc
index fe73251..80d1941 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -5,15 +5,6 @@ zsh_dir=${${ZDOTDIR}:-$HOME/.config/zsh}
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-# Import ZSH settings file
-source ${zsh_dir}/zsh-config.zsh
-
-# Configure ZSH stuff
-source ${zsh_dir}/lib/history.zsh
-source ${zsh_dir}/lib/colors.zsh
-source ${zsh_dir}/lib/completion.zsh
-source ${zsh_dir}/lib/term-title.zsh
-
 # Import alias files
 source ${zsh_dir}/aliases/git.zsh
 source ${zsh_dir}/aliases/general.zsh
@@ -24,5 +15,15 @@ source ${zsh_dir}/helpers/setup-antigen.zsh
 # Then import Antigen plugins
 source ${zsh_dir}/helpers/import-plugins.zsh
 
+# Configure ZSH stuff
+source ${zsh_dir}/lib/history.zsh
+source ${zsh_dir}/lib/colors.zsh
+source ${zsh_dir}/lib/completion.zsh
+source ${zsh_dir}/lib/term-title.zsh
+source ${zsh_dir}/lib/key-bindings.zsh
+
+# Left over tasks
+source ${zsh_dir}/helpers/misc-stuff.zsh
+
 # Import P10k config for command prompt, run `p10k configure` or edit
 [[ ! -f ${zsh_dir}/.p10k.zsh ]] || source ${zsh_dir}/.p10k.zsh
diff --git a/zsh/helpers/import-plugins.zsh b/zsh/helpers/import-plugins.zsh
index 5f1c0c4..9753d2d 100644
--- a/zsh/helpers/import-plugins.zsh
+++ b/zsh/helpers/import-plugins.zsh
@@ -1,3 +1,4 @@
+#!/usr/bin/env zsh
 
 # Syntax highlighting for commands
 antigen bundle zsh-users/zsh-syntax-highlighting
@@ -5,6 +6,9 @@ antigen bundle zsh-users/zsh-syntax-highlighting
 # Make and cd into nested directories
 antigen bundle caarlos0/zsh-mkc
 
+# Quickly jump into frequently used directories
+antigen bundle agkozak/zsh-z
+
 # Extra zsh completions
 antigen bundle zsh-users/zsh-completions
 
diff --git a/zsh/helpers/misc-stuff.zsh b/zsh/helpers/misc-stuff.zsh
new file mode 100644
index 0000000..6c0eb23
--- /dev/null
+++ b/zsh/helpers/misc-stuff.zsh
@@ -0,0 +1,4 @@
+
+if hash thefuck 2> /dev/null; then;
+  eval $(thefuck --alias)
+fi
\ No newline at end of file
diff --git a/zsh/lib/colors.zsh b/zsh/lib/colors.zsh
index aca02aa..92b38bb 100644
--- a/zsh/lib/colors.zsh
+++ b/zsh/lib/colors.zsh
@@ -1,5 +1,8 @@
 #!/usr/bin/env zsh
 
+# Use wider color range
+export TERM=xterm-256color
+
 # Enable dircolors.
 if type -p dircolors &>/dev/null; then
     #  Enable custom colors if it exists.
diff --git a/zsh/lib/completion.zsh b/zsh/lib/completion.zsh
index 4a8e75e..b2149e4 100644
--- a/zsh/lib/completion.zsh
+++ b/zsh/lib/completion.zsh
@@ -36,30 +36,11 @@ zstyle ':completion:*:man:*'                menu                yes select
 zstyle ':completion:*:manuals'              separate-sections   yes
 zstyle ':completion:*:manuals.*'            insert-sections     yes
 
-################################################################################
-#  INITIALIZE & OPTIMIZE COMPLETION SYSTEM
-################################################################################
-#
-# Performance tweaking of compinit based on information from the following
-# sources.
-#   - https://carlosbecker.com/posts/speeding-up-zsh
-#   - https://gist.github.com/ctechols/ca1035271ad134841284
-#
-# On slow systems, checking the cached .zcompdump file to see if it must be
-# regenerated adds a noticable delay to Zsh startup. The solution below
-# restricts it to once a day.
-#
-# See below for infromation on the globbing used.
-#   '#q' : Explicit glob qualifier that makes globbing work within Zsh's [[ ]]
-#          construct.
-#   'N'  : Makes the glob pattern evaluate to nothing when it does not match,
-#          rather than throwing a globbing error.
-#   '.'  : Match "regular files".
-#   'm1' : Match files (or directories or whatever) that are older than 1 day.
+# Make zsh know about hosts already accessed by SSH
+zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' \
+    hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'
 
-# Autoload completion functions.
-#   -U : Mark the fucntion for autoloading and suppress alias expansion.
-#   -z : Use Zsh instead of Korn shell style functions.
+# Initialize and optimize completion
 autoload -Uz compinit
 
 # Enable extended globbing.
diff --git a/zsh/lib/key-bindings.zsh b/zsh/lib/key-bindings.zsh
new file mode 100644
index 0000000..1db5b25
--- /dev/null
+++ b/zsh/lib/key-bindings.zsh
@@ -0,0 +1,141 @@
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins
+# http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Standard-Widgets
+
+# Make sure that the terminal is in application mode when zle is active, since
+# only then values from $terminfo are valid
+if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
+  function zle-line-init() {
+    echoti smkx
+  }
+  function zle-line-finish() {
+    echoti rmkx
+  }
+  zle -N zle-line-init
+  zle -N zle-line-finish
+fi
+
+# Use emacs key bindings
+bindkey -e
+
+# [PageUp] - Up a line of history
+if [[ -n "${terminfo[kpp]}" ]]; then
+  bindkey -M emacs "${terminfo[kpp]}" up-line-or-history
+  bindkey -M viins "${terminfo[kpp]}" up-line-or-history
+  bindkey -M vicmd "${terminfo[kpp]}" up-line-or-history
+fi
+# [PageDown] - Down a line of history
+if [[ -n "${terminfo[knp]}" ]]; then
+  bindkey -M emacs "${terminfo[knp]}" down-line-or-history
+  bindkey -M viins "${terminfo[knp]}" down-line-or-history
+  bindkey -M vicmd "${terminfo[knp]}" down-line-or-history
+fi
+
+# Start typing + [Up-Arrow] - fuzzy find history forward
+if [[ -n "${terminfo[kcuu1]}" ]]; then
+  autoload -U up-line-or-beginning-search
+  zle -N up-line-or-beginning-search
+
+  bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search
+  bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search
+  bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search
+fi
+# Start typing + [Down-Arrow] - fuzzy find history backward
+if [[ -n "${terminfo[kcud1]}" ]]; then
+  autoload -U down-line-or-beginning-search
+  zle -N down-line-or-beginning-search
+
+  bindkey -M emacs "${terminfo[kcud1]}" down-line-or-beginning-search
+  bindkey -M viins "${terminfo[kcud1]}" down-line-or-beginning-search
+  bindkey -M vicmd "${terminfo[kcud1]}" down-line-or-beginning-search
+fi
+
+# [Home] - Go to beginning of line
+if [[ -n "${terminfo[khome]}" ]]; then
+  bindkey -M emacs "${terminfo[khome]}" beginning-of-line
+  bindkey -M viins "${terminfo[khome]}" beginning-of-line
+  bindkey -M vicmd "${terminfo[khome]}" beginning-of-line
+fi
+# [End] - Go to end of line
+if [[ -n "${terminfo[kend]}" ]]; then
+  bindkey -M emacs "${terminfo[kend]}"  end-of-line
+  bindkey -M viins "${terminfo[kend]}"  end-of-line
+  bindkey -M vicmd "${terminfo[kend]}"  end-of-line
+fi
+
+# [Shift-Tab] - move through the completion menu backwards
+if [[ -n "${terminfo[kcbt]}" ]]; then
+  bindkey -M emacs "${terminfo[kcbt]}" reverse-menu-complete
+  bindkey -M viins "${terminfo[kcbt]}" reverse-menu-complete
+  bindkey -M vicmd "${terminfo[kcbt]}" reverse-menu-complete
+fi
+
+# [Backspace] - delete backward
+bindkey -M emacs '^?' backward-delete-char
+bindkey -M viins '^?' backward-delete-char
+bindkey -M vicmd '^?' backward-delete-char
+# [Delete] - delete forward
+if [[ -n "${terminfo[kdch1]}" ]]; then
+  bindkey -M emacs "${terminfo[kdch1]}" delete-char
+  bindkey -M viins "${terminfo[kdch1]}" delete-char
+  bindkey -M vicmd "${terminfo[kdch1]}" delete-char
+else
+  bindkey -M emacs "^[[3~" delete-char
+  bindkey -M viins "^[[3~" delete-char
+  bindkey -M vicmd "^[[3~" delete-char
+
+  bindkey -M emacs "^[3;5~" delete-char
+  bindkey -M viins "^[3;5~" delete-char
+  bindkey -M vicmd "^[3;5~" delete-char
+fi
+
+# [Ctrl-Delete] - delete whole forward-word
+bindkey -M emacs '^[[3;5~' kill-word
+bindkey -M viins '^[[3;5~' kill-word
+bindkey -M vicmd '^[[3;5~' kill-word
+
+# [Ctrl-RightArrow] - move forward one word
+bindkey -M emacs '^[[1;5C' forward-word
+bindkey -M viins '^[[1;5C' forward-word
+bindkey -M vicmd '^[[1;5C' forward-word
+# [Ctrl-LeftArrow] - move backward one word
+bindkey -M emacs '^[[1;5D' backward-word
+bindkey -M viins '^[[1;5D' backward-word
+bindkey -M vicmd '^[[1;5D' backward-word
+
+
+bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
+bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
+bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
+bindkey ' ' magic-space                               # [Space] - don't do history expansion
+
+# Edit the current command line in $EDITOR
+autoload -U edit-command-line
+zle -N edit-command-line
+bindkey '\C-x\C-e' edit-command-line
+
+# file rename magick
+bindkey "^[m" copy-prev-shell-word
+
+# ZSH auto-suggestions
+bindkey '[[C' autosuggest-accept
+bindkey '^ ' autosuggest-execute
+
+# consider emacs keybindings:
+
+#bindkey -e  ## emacs key bindings
+#
+#bindkey '^[[A' up-line-or-search
+#bindkey '^[[B' down-line-or-search
+#bindkey '^[^[[C' emacs-forward-word
+#bindkey '^[^[[D' emacs-backward-word
+#
+#bindkey -s '^X^Z' '%-^M'
+#bindkey '^[e' expand-cmd-path
+#bindkey '^[^I' reverse-menu-complete
+#bindkey '^X^N' accept-and-infer-next-history
+#bindkey '^W' kill-region
+#bindkey '^I' complete-word
+## Fix weird sequence that rxvt produces
+#bindkey -s '^[[Z' '\t'
+#
\ No newline at end of file
diff --git a/zsh/zsh-config.zsh b/zsh/zsh-config.zsh
deleted file mode 100644
index c56d23a..0000000
--- a/zsh/zsh-config.zsh
+++ /dev/null
@@ -1,14 +0,0 @@
-
-
-# Enable auto-completion
-autoload -Uz compinit
-typeset -i updated_at=$(date +'%j' -r ~/.zcompdump 2>/dev/null || stat -f '%Sm' -t '%j' ~/.zcompdump 2>/dev/null)
-if [ $(date +'%j') != $updated_at ]; then
-  compinit -i
-else
-  compinit -C -i
-fi
-
-# Make zsh know about hosts already accessed by SSH
-zstyle -e ':completion:*:(ssh|scp|sftp|rsh|rsync):hosts' \
-    hosts 'reply=(${=${${(f)"$(cat {/etc/ssh_,~/.ssh/known_}hosts(|2)(N) /dev/null)"}%%[# ]*}//,/ })'