diff --git a/gentoo/dotfiles/.aliases b/gentoo/dotfiles/.aliases
new file mode 100644
index 00000000..9cab6ccb
--- /dev/null
+++ b/gentoo/dotfiles/.aliases
@@ -0,0 +1,418 @@
+# Custom Aliases
+alias cdls="source mycd"
+#alias {les,less,more}="moar -wrap -no-statusbar -style friendly" # -no-linenumbers"
+alias {rg,grep}="rg -i --colors 'match:fg:blue' --colors 'line:fg:blue'" # -N
+alias {drag,rdrag}="ripdrag"
+alias dusty="dust -i -v 'node_modules'"
+#alias lf="ranger"
+alias cp="cp -i"
+alias df='df -h'
+alias free='free -mh'
+alias dmesg="doas dmesg -H"
+alias kernel="uname -r"
+alias mkcd='{ IFS= read -r d && mkdir "$d" && cd "$d"; } <<<'
+alias cpwd='pwd | xclip -sel clip'
+alias docs="cd ~/Documents && ls"
+alias desk="cd ~/Desktop && ls"
+alias down="cd ~/Downloads && ls"
+alias pics="cd ~/Pictures && ls"
+alias pods="cd ~/Podcasts && ls"
+alias music="cd ~/Music && ls"
+alias vids="cd ~/Videos && ls"
+alias mov="cd ~/Videos/mov/ && ls"
+alias {sand,sandbox}="cd ~/sandbox && ls"
+alias games="cd ~/.local/share/Steam/steamapps/common && ls"
+alias notes="cd ~/Documents/notes && ls"
+alias scripts="cd ~/scripts && ls"
+alias books="cd ~/Documents/books && ls"
+alias config="cd ~/.config && ls"
+alias cache="cd ~/.cache && ls"
+#alias svs="cd /etc/runit/sv && ls"
+alias offline="cd ~/Documents/offline_notes && ls"
+# alias vpnup="doas sv up wireguard"
+# alias vpndown="doas sv down wireguard"
+alias pihole="docker exec -it pihole-unbound pihole"
+alias obs="gobble flatpak run com.obsproject.Studio"
+alias Code="cd ~/Documents/Code && ls"
+alias graphics="cd ~/Documents/Graphic_Design && ls"
+alias Math="cd ~/Documents/Math && ls"
+alias cplus="cd ~/Documents/Code/cpp && ls"
+alias js="cd ~/Documents/Code/javascript && ls"
+alias py="cd ~/Documents/Code/python && ls"
+#alias {pysh,py-sh}="ipython"
+#alias phpd="cd ~/Documents/Code/php && ls"
+alias golang="cd ~/Documents/Code/golang && ls"
+alias {rust,rustlang}="cd ~/Documents/Code/rust && ls"
+alias {leet,leetcode}="cd ~/Documents/Code/leetcode/ && ls"
+alias {neet,neetcode}="cd ~/Documents/Code/leetcode/neetcode_roadmap/ && ls"
+alias neetvids="cd ~/Videos/yt/educational/dsa/leetcode_explanations/neetcode_roadmap/ && ls"
+# alias zsaves="cd ~/Zomboid/Saves/Sandbox/ && ls"
+# alias zsaves="cd ~/Games/umu/umu-default/drive_c/users/steamuser/Zomboid/Saves/Sandbox && ls"
+# alias zmods="cd ~/Games/umu/umu-default/drive_c/users/steamuser/Zomboid/mods && ls"
+alias zsaves="cd ~/.wine/drive_c/users/brian/Zomboid/Saves/Sandbox/ && ls"
+alias zmods="cd ~/.wine/drive_c/users/brian/Zomboid/mods/ && ls"
+alias logs="cd /var/log && ls"
+alias llama="cd ~/.local/share/llama.cpp && ./llama.sh ; cd"
+alias wtuts="cd ~/Documents/Code/web_tutorials && ls"
+alias btuts="cd ~/Documents/Code/book_tutorials && ls"
+alias fonts="fc-list"
+alias locate="locate -i"
+alias bat="bat --theme Nord"
+alias ls="eza --icons"
+alias li="eza -1 --icons"
+alias ll="eza -lih --icons"
+alias {lsdir,lsd}="ls -t -1" # list only the directories
+alias lshw="doas lshw -short | less" # list hardware
+alias {hw,hwinfo}="hwinfo | less" # extensive info on hardware devices
+alias dmid="doas dmidecode | less"
+alias of="onefetch -o yaml | yq -C"
+alias mkdir='mkdir -pv'
+alias dict='def'
+alias {:q,ex,esc}="exit"
+alias :w="touch"
+alias digg="doggo"
+alias dff="/usr/bin/df -h && duf"
+alias {his,hist}="history"
+alias mnt="doas mount /dev/sda1 /mnt/media/usb-drive && cd /mnt/media/usb-drive && ls"
+alias umnt="doas umount /mnt/media/usb-drive"
+alias {imnt,iphone}="ifuse /home/brian/iphone && cd /home/brian/iphone && ls"
+alias iumnt="doas umount /home/brian/iphone"
+alias kmnt="doas mount /dev/sda /mnt/media/kobo/ && cd /mnt/media/kobo/.kobo && ls"
+alias kumnt="doas umount /dev/sda /mnt/media/kobo"
+# alias pixel="cd /run/user/1000/gvfs/mtp:host=Google_Pixel_7a_34211JEHN03088/Internal\ shared\ storage && ls"
+alias pixel="cd /mnt/media/pixel/Internal\ shared\ storage && ls"
+alias pmnt="aft-mtp-mount /mnt/media/pixel && cd /mnt/media/pixel/Internal\ shared\ storage && ls"
+alias pumnt="fusermount3 -uz /mnt/media/pixel"
+alias pikoshi="cd ~/Documents/Code/group_projects/pikoshi/ && ls"
+alias rm="newrm -vi"
+alias calendar="calcurse"
+alias cal="newcal"
+# simple tool for math, see https://github.com/metadelta/mdlt
+# alias math="mdlt simplify"
+alias mv="mv -v"
+alias ln="ln -i"
+alias {doasedit,sudoedit}="doas rnano"
+alias clean_cache="doas paccache -r && doas rm -r /home/brian/.cache/*"
+alias shred="doas shred -uzv" # shreds the file and overwrites it with 1s and 0s, shows progress
+alias indelible="doas chattr +i" # makes a file impossible to delete (except with sudo)
+alias diff=difft
+alias cdiff="colordiff"
+# alias kfonts="kitty +list-fonts"
+# alias {kdiff,kitten,kd}="kitty +kitten diff"
+alias fzfi="rg --files --hidden --follow --no-ignore-vcs -g '!{node_modules,.git}' | fzf"
+alias bluepill="neo-matrix --bold=2 -D --color=cyan --density=0.75 --charset=katakana --speed=12 --fullwidth --screensaver"
+alias moo="cowsay moo"
+# alias btop="kitty -o font_size=12 -o background_opacity=0.50 -e btop; fullscreen enable"
+alias tshift='doas timeshift --delete && notify-send "  Previous Backup Deleted!" && doas timeshift --create && notify-send "  New Backup Created!" && doas timeshift --list'
+alias btop="bst -e btop"
+# alias gimp="gimp --no-splash"
+alias krita="gobble flatpak run org.kde.krita --nosplash"
+#alias onlyoffice="onlyoffice-desktopeditors"
+# alias toonz="opentoonz"
+alias {sqlite,sql}="sqlite3"
+alias {sqcipher,sqc}="sqlcipher"
+alias sqlite-cli="litecli"
+alias sq-cli="litecli" # doesn't work with sqlcipher
+# alias view="kitty +kitten icat"
+alias view="gobble sxiv"
+alias view-w="img2sixel"
+# alias csview="csvlook"
+alias viewer="feh -F -Z -x"
+alias mupdf='gobble mupdf -r 204'
+alias dkpdf='gobble mupdf -I -r 204'
+alias sign='gobble xournalpp'
+alias keys="gobble keepassxc $KDBX"
+alias {jscrl,jsoncurl,jcrl}="jscurl"
+alias kevents="xev -event keyboard"
+alias sk="screenkey"
+# alias word="wordgrinder"
+alias spreadsheet="sc-im"
+alias pvctrl="pavucontrol"
+alias open="xdg-open"
+alias nc="nc -v"
+alias dump="doas tcpdump"
+alias {wireshark-cli,wshark}="tshark"
+alias wireshark="gobble wireshark -k -i wlp6s0"
+alias route="traceroute"
+alias listen="ss -a -t -p"
+alias {lh,lighthouse}="lighthouse --view"
+alias {pdf2,pdf2txt}="pdftotext"
+alias {pdfg,greppdf}="pdfgrep"
+alias tree="tree -ad -L 3 --prune -C -I 'node_modules|.git'"
+alias {vi,vim,nv,nvi}="nvim"
+alias {vfz,nvfz,nvim-fzf,fzf-nvim}='nvim "$(fzf)"'
+alias {cproj,mproj,myproj}="cd '$cproj' && ls"
+alias blog="cd ~/Documents/Code/blog/ && ls"
+# alias rsm="doas rsm"
+alias updatedb="doas updatedb"
+alias iftop-w="doas iftop -i wlan0 -P"
+alias wmon="wavemon"
+# usage p0f -i wlan0
+alias p0f="doas p0f"
+alias vnstat-w="vnstat -i wlan0 --json | jq"
+alias {bluetooth,bt}="bluetoothctl"
+alias {wi,ssid}="doas iw wlan0 scan | grep SSID"
+
+# NOTE: Find wpa_supplicant and dhcpcd ways to do these NetworkManager commands:
+# alias wifi-list="connmanctl services"
+#alias wifi-list="nmcli device wifi list"
+# alias wifi-scan="connmanctl scan wifi"
+# alias wifi-connect="connmanctl connect wifi_34cff6c9b922_44495a5a_managed_psk"
+#alias wifi-connect='nmcli device wifi connect "${SSID}" password "${PASSWD}"'
+# alias wifi-disconnect="connmanctl disconnect wifi_34cff6c9b922_44495a5a_managed_psk"
+#alias wifi-disconnect="nmcli device disconnect wlan0"
+#alias wifi-up="doas ifconfig wlan0 up"
+#alias wifi-down="doas ifconfig wlan0 down"
+
+alias lxapp="lxappearance"
+alias hd="ncdu"
+# one of our most usful aliases (useful in conjunction with yank, awk, etc.):
+alias {xsel,catx}="xclip -sel clip" # useful with < or | redirection operators
+# wayland has an equivalent as well:
+alias {wsel,catw}="wl-copy" # useful with | redirection, i.e. echo "hi there" | catw
+alias catp="xclip -out -selection clipboard; echo"
+alias mouse="mousepad"
+alias xclear="echo '' | xclip && xclip -selection clipboard /dev/null"
+# alias diff="diff -wy"
+alias exifread="exiftool"
+alias exifrm="exiftool -all="
+alias {html,html_pp}="hxnormalize -e"
+alias {ltrans,trans,translate}="ltranslate"
+alias skey='screenkey --position fixed --geometry $(slop)'
+alias birth="stat / | grep 'Birth' | sed 's/Birth: //g' | cut -b 2-11"
+# interfaces with asciinema.org for creating simple video tutorials on cli programs
+alias ascii="asciinema"
+
+alias mpv="gobble mpv --sub-font-size=40"
+alias mpvl="gobble mpv --sub-font-size=40 --loop-file=inf"
+alias mpva='/usr/bin/mpv "${1}" --no-video'
+alias mpval='/usr/bin/mpv "${1}" --no-video --loop-file=inf'
+alias mmpv='gobble mpv --fs --panscan=1.0'
+# alias {qvid,qv4}="gobble qv4l2" # better amount of controls for webcam
+# alias {gvid,gv4}="gobble guvcview" # set to 50hz
+# bare bones, just views webcam:
+alias {wcam,webcam}="gobble mpv --demuxer-lavf-o=video_size=1920x1080,input_format=mjpeg av://v4l2:/dev/video0 --profile=low-latency"
+# use: record /path/to/file.mp3
+
+# NOTE: instead of arecord (ALSA), find a way to use pw-record (via pipewire)
+# alias record="arecord -vv --format=cd --file-type raw | lame -r - "
+
+#alias {hp,headphones}="pactl set-default-sink alsa_output.usb-FIIO_FiiO_USB_DAC-E10-01.analog-stereo"
+#alias {sp,speakers}="pactl set-default-sink alsa_output.pci-0000_0a_00.4.analog-stereo"
+#alias dspeakers="pactl set-default-sink alsa_output.pci-0000_08_00.1.hdmi-stereo-extra1"
+# laptop only
+#alias lapspeakers="pactl set-default-sink alsa_output.pci-0000_00_1f.3.analog-stereo"
+alias pulse="pamixer --set-volume"
+alias {mu,mt,mute}="pamixer -t"
+# laptop only currently, records video/audio, simply name filename .mp4 after command:
+alias r_vid="ffmpeg -f v4l2 -framerate 24 -video_size 640x480 -i /dev/video0 -itsoffset 00:00:01.0 -f alsa -i default -c:v libx264 -preset ultrafast -c:a aac"
+# for smaller downloads
+alias ytdl='yt-dlp --sponsorblock-remove all --write-auto-sub -t mp4'
+alias ytdl-w='yt-dlp "best*" --sponsorblock-remove all --write-auto-sub'
+# for better resolutions
+# alias ytdl-w='yt-dlp -f webm "bestvideo\*+bestaudio" --sponsorblock-remove all --write-auto-sub'
+# for audio only
+alias ytdl-a="yt-dlp --sponsorblock-remove all -x --audio-format mp3"
+# alias thinkorswim="cd /home/brian/thinkorswim && java -jar launcher.jar && cd"
+alias {cl,cls}="clear"
+alias shutdown="shutdown.sh"
+alias reboot="reboot.sh"
+alias curltime="curl -w \"@$HOME/Documents/notes/curl-format.txt\" -o /dev/null -s"
+#source ~/.zip_code
+alias inxi-w="inxi --weather "${ZIPCODE}""
+alias inxi-i="doas inxi -Fxzm"
+alias pf="pfetch"
+alias ff="fastfetch"
+alias has="dependencycheck"
+# alias ipaddr="curl ifconfig.me/all.json | jq"
+alias hwclock="doas hwclock"
+alias kill9="killall -9" # kills process by name, e.g. kill9 cmus
+alias ports="netstat -tunlp"
+# alias npm_upgrade="doas npm install --location=global npm@latest"
+alias npm-l="npm list --global"
+alias npm-s="npm start"
+alias npm-t="npm test"
+alias npm-o="npm outdated"
+alias npm-u="npm update"
+alias cargo-l="cargo install --list"
+alias cargo-u="cargo install-update -a" # requires cargo-update crate
+# alias {pacquery,pacq}="pacman -Q"
+# alias {pacsearch,pacs}="pacman -Ss"
+alias find-empty='find . -depth -empty'
+alias rmdir-a='find . -depth -empty -delete'
+alias paclogs="bat /var/log/pacman.log"
+alias npm_list="find /usr/lib/node_modules -maxdepth 1 | sed -r 's/^\/usr\/lib\/node_modules\///g'"
+# useful alias for recursively testing .test.js files on save
+# alias jester="jest --watchAll"
+# generate uuids using native bash
+alias uuid="uuidgen"
+alias kuuid="cat /proc/sys/kernel/random/uuid"
+alias duuid="dbus-uuidgen"
+# generate unique ids from cli, example for no special characters:
+# alias manoid="nanoid --alphabet 'abcdefghijklmnopqrstuvwxyz' --size 40"
+alias nanoid="npx nanoid"
+# alias uglifyhtml="html-minifier --collapse-whitespace --remove-comments --remove-optional-tags --remove-redundant-attributes --remove-script-type-attributes --remove-tag-whitespace --use-short-doctype --minify-css true --minify-js true"
+# autoprefixes css files
+# requires installation:
+# npm install -g postcss postcss-cli autoprefixer
+alias {prefix,autoprefixer}="npx postcss *.css --use autoprefixer -d build/"
+# informs on dependency updates
+alias taze="npx taze"
+# alias pip_upgrade="python -m pip install --upgrade pip"
+alias rust_upgrade="rustup update"
+alias nb="newsboat"
+alias profane="profanity"
+alias {gmail,email,mail,mutt,nmut,nmutt}="neomutt"
+alias {mnb,nb-m}="cd ~/.config/newsboat && /usr/bin/cp $HOME/.config/newsboat/my_urls $HOME/.config/newsboat/urls && newsboat"
+alias {ynb,nb-y}="/usr/bin/cp $HOME/.config/newsboat/yt_urls $HOME/.config/newsboat/urls && newsboat"
+alias {rnb,nb-r}="cd ~/.config/newsboat && /usr/bin/cp $HOME/.config/newsboat/reddit_urls $HOME/.config/newsboat/urls && newsboat"
+alias {tootnb,mastnb}="cd ~/.config/newsboat && /usr/bin/cp $HOME/.config/newsboat/mastodon_urls $HOME/.config/newsboat/urls && newsboat"
+alias rt-rs="doas rm -r watch session && mkdir watch session && rm ~/Downloads/*.meta"
+alias slink="streamlink"
+#alias {epub,fbreader}="gobble FBReader"
+alias scrot="scrot --count --delay"
+alias grip="grip 6969"
+alias sudoku="sku"
+# alias rbd="checkrebuild -v"
+# pip list and pip freeze command list pip packages
+# poetry virtual env
+alias venv='source ".venv/bin/activate"'
+alias {uvenv,dvenv}="deactivate"
+
+#Particularly useful commands more to remember than to use as aliases:
+# alias optimalbufsize= 'stat -c "%o"' # followed by filename will give you the optimal read/write BUFSIZE for a file
+alias {rcrm,rrm}="doas xargs -d\\n rm -r -v" # when piped after locate or find command, recursively removes outputted files
+alias {rlast,dlast}="sed -i '$ d'" # removes last line of file
+alias shchk="shellcheck"
+# get top process eating memory
+alias psmem="ps auxf | sort -nr -k 4 | head -5"
+# get top process eating cpu
+alias pscpu="ps auxf | sort -nr -k 3 | head -5"
+# alias {say,speak,espeak}="espeak -v female5"
+alias {say,speak,espeak}="speak-ng"
+
+# useful bash commands
+# grep, sed, awk, tr, sort, seq, paste, uniq
+
+# git aliases
+alias git-a="git add"
+alias git-c="git commit -m"
+alias git-p="git push"
+alias {git-\#,git\#}="git rev-list --count --all"
+# taken from Luke Smith, pushes to all remotes
+alias git-pa="git remote | xargs -L1 git push --all"
+# undo local file changes and keep your last commit
+alias git-r="git reset --hard"
+# undo local file changes and remove your last commit
+alias git-rrh="git reset --hard HEAD^"
+# keep local file changes and remove your last commit
+alias git-rrs="git reset --soft HEAD^"
+alias git-s="git status"
+alias git-ss="git status short"
+alias git-d="git diff"
+alias {git-b,git-br}="git branch"
+alias git-bl="git blame"
+# for use with notes directory only
+alias git-lo="git log --oneline --follow"
+# alias {git-l,git-log}="git log --graph --format='format:%C(yellow)%h%C(reset) %s %C(magenta)%cr%C(reset)%C(auto)%d%C(reset)'"
+alias {git-l,git-log}="git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all"
+# more to just remember than to be used
+alias git-stsh="git stash"
+alias git-stsh-a="git stash apply"
+alias git-stsh-d="git stash drop"
+alias gitmojis="bat $HOME/Documents/notes/gitmoji.txt"
+alias {vimhelp,helpvim,vimtips}="bat $HOME/Documents/notes/nvim_custom_keys.txt"
+alias {nvim-c,cleanvim}="nvim --clean"
+
+# tmux multiplexer session aliases
+alias tmux-ls="tmux list--sessions"
+alias {tmux-attach,tmux-a}="tmux a -t"
+alias {tmux-kill,tmux-k}="tmux kill-ses -t"
+
+# zellij multiplexer sesssion
+# alias zj="zellij"
+
+# programming specific aliases
+alias rc="rustc"
+alias cc="cc -Wall -Werror -Wextra -Wpedantic"
+alias cprogrammingtags="ctags"
+alias vgrind="valgrind --leak-check=full --show-leak-kinds=all --track-origins=yes -s"
+
+# game shortcuts
+# alias gback="cp -r ~/.wine/drive_c/users/brian/AppData/Local/CD\ Projekt\ Red/ ~/game_save_backups/"
+# alias {cbpunk,cyberpunk}="steam steam://rungameid/1091500 &"
+# alias {twd,thewalkingdead}="steam steam://rungameid/1449690 &"
+# alias {cbmods,cybermods}="cd ~/.local/share/Steam/steamapps/common/Cyberpunk\ 2077/archive/pc/mod && ls"
+
+# docker specific Aliases
+alias docker-ls="docker container ls -a && docker images"
+alias docker-rm-c="docker container rm"
+alias docker-rm-i="docker image rm"
+alias {docker-k,docker-kill}="docker kill"
+alias docker-exec="docker exec -it" # use with container ID and bash
+
+# bookmarks
+alias apnews='f(){ links https://apnews.com/"$1" ;}; f' # call using 'us' or 'world' as second arg
+alias npr="links https://text.npr.org"
+alias pbs="links https://lite.pbs.org"
+# brings up oregon public broadcasting
+alias radio='/usr/bin/mpv --no-video "https://ais-sa3.cdnstream1.com/2440_128.aac/playlist.m3u8?listeningSessionID=64c429fd0062f502_803653_uuxYz9V9_NjYuODUuODkuMzA6ODA\!_0000000vz1k\&downloadSessionID=0\&listenerId=esTrackblock0801483\&aw_0_1st.playerid=esPlayer&aw_0_1st.skey=1691381053"'
+alias {gp,gopherpedia}="lynx gopher://gopherpedia.com:70"
+alias gopher="lynx https://gopher.floodgap.com/gopher/gw.lite"
+alias {ddg,duckduckgo}="links https://duckduckgo.com/lite"
+alias bangs="links ~/Documents/notes/ddg_bangs.html"
+# alias bangs="links https://duckduckgo.com/bang_lite.html"
+alias wikipedia="links https://wikipedia.org"
+alias hackernews="links https://news.ycombinator.com/"
+# sustainable clothing brands (shoes and underwear)
+# alias nothingnew="librewolf https://nothingnew.com &"
+# alias wamaundies="librewolf https://wamaunderwear.com &"
+
+# Kiwix (offline wikis)
+alias kiwixdl="links download.kiwix.org"
+
+# Anarchism
+alias itsgoingdown="links https://itsgoingdown.org/"
+alias puget="links https://pugetsoundanarchists.org/"
+alias {theanarchistlibrary,anarchlib}="links https://theanarchistlibrary.org/"
+
+# Programming Resources
+# CS Basics
+
+# Blogs
+# Unix Sheikh, very good info regarding Unix and Linux
+alias unixsheikh="links https://unixsheikh.com"
+# A reddit like forum similar also to hackernews
+alias lobsters="links https://lobste.rs"
+
+# Check Tor
+alias checktor="links https://check.torproject.org"
+
+# display related aliases
+alias brighten="xrandr --output HDMI-0 --brightness"
+alias unred="redshift -x"
+
+# run the following two aliases every time you update the kernels and nvidiadkms
+# alias {grub_update,update_grub}="doas grub-mkconfig -o /boot/grub/grub.cfg"
+# alias regen_initramfs="doas mkinitcpio -P"
+
+# alias mpl="mplayer -fs"
+# alias {mloop,mploop}="mplayer -fs -loop 0"
+alias sd="sdir"
+alias unu="upnup"
+
+source $HOME/.linodes/.ips
+source $HOME/.k_hidden
+
+source $HOME/.n_hidden
+alias "${scomm}"='cd "${secdir}" && mmpv * && home'
+alias "${scomm2}"='mmpv ${secvid} && home'
+alias "${scomm3}"='cd "${secdir2}" && mmpv * && home'
+
+# GENTOO
+alias wlop="doas watch -cn 10 genlop -ci"
+alias portage="cd /etc/portage && ls"
+alias portq="qlist -I"
+alias depends="equery g"
+alias {usedit,useedit}="doas nvim /etc/portage/package.use/package.use"
+alias unmask="doas nvim /etc/portage/package.accept_keywords/package.unmask"
diff --git a/gentoo/dotfiles/.bash_login b/gentoo/dotfiles/.bash_login
new file mode 100644
index 00000000..18acb96e
--- /dev/null
+++ b/gentoo/dotfiles/.bash_login
@@ -0,0 +1,4 @@
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_STATE_HOME="${HOME}/.local/state"
diff --git a/gentoo/dotfiles/.bash_profile b/gentoo/dotfiles/.bash_profile
new file mode 100644
index 00000000..a60b5328
--- /dev/null
+++ b/gentoo/dotfiles/.bash_profile
@@ -0,0 +1,30 @@
+# /etc/skel/.bash_profile
+
+# This file is sourced by bash for login shells.  The following line
+# runs your .bashrc and is recommended by the bash info pages.
+if [[ -f ~/.bashrc ]] ; then
+	. ~/.bashrc
+fi
+
+# if test -z "${XDG_RUNTIME_DIR}"; then
+#	export XDG_RUNTIME_DIR=/tmp/xdg/"${UID}" -xdg-runtime-dir
+#	if ! test -d "${XDG_RUNTIME_DIR}"; then
+#		mkdir -p "${XDG_RUNTIME_DIR}"
+#		chmod 0700 "${XDG_RUNTIME_DIR}"
+#	fi
+# fi
+
+if test -z "${XDG_RUNTIME_DIR}"; then
+        export XDG_RUNTIME_DIR=/run/user/${UID}
+fi
+
+if test -d "${XDG_RUNTIME_DIR}"; then
+        perms="$(stat -c '%a %u' "${XDG_RUNTIME_DIR}")"
+        if [[ "${perms}" != "700 ${UID}" ]]; then
+                export -n XDG_RUNTIME_DIR
+                echo "WARNING! XDG_RUNTIME_DIR has incorrect permissions"
+        fi
+else
+        mkdir -p "${XDG_RUNTIME_DIR}"
+        chmod 0700 "${XDG_RUNTIME_DIR}"
+fi
diff --git a/gentoo/dotfiles/.bashrc b/gentoo/dotfiles/.bashrc
new file mode 100644
index 00000000..aab119f1
--- /dev/null
+++ b/gentoo/dotfiles/.bashrc
@@ -0,0 +1,235 @@
+#!/bin/bash
+
+# Changing over to ZSH for now, bashrc is kept here as emergency shell/posterity
+#
+# to change default shell, use chsh -s $(which bash)
+# ~/.bashrc
+#
+# history -c && history -w && hash -r
+# create custom env variables:
+# export cproj="$HOME/Documents/Code/web_tutorials/advanced_programming_in_the_UNIX_environment"
+export cproj="$HOME/Documents/Code/bash/bgit"
+# custom BROWSER env for ddgr:
+export BROWSER=links
+export EDITOR=nvim # enable vi keybindings in terminal and terminal applications
+
+set -o vi
+# set -o noclobber
+
+export PF_INFO="ascii os kernel pkgs shell wm editor"
+
+# but keep ctrl l as the clear screen command bind -m vi-command 'Control-l: clear-screen'
+bind -m vi-insert 'Control-l: clear-screen'
+
+# Colorizes man pages
+export GROFF_NO_SGR=1
+export LESS_TERMCAP_mb=$'\e[1;34m'
+export LESS_TERMCAP_md=$'\e[1;34m'
+export LESS_TERMCAP_me=$'\e[0m'
+export LESS_TERMCAP_se=$'\e[0m'
+export LESS_TERMCAP_so=$'\e[01;33m'
+export LESS_TERMCAP_ue=$'\e[0m'
+export LESS_TERMCAP_us=$'\e[1;4;33m'
+
+# clears the history completely upon loading bash
+cat /dev/null >~/.bash_history && history -c && hash -r
+
+[[ $- != *i* ]] && return
+colors() {
+    local fgc bgc vals seq0
+
+    printf "Color escapes are %s\n" '\e[${value};...;${value}m'
+    printf "Values 30..37 are \e[33mforeground colors\e[m\n"
+    printf "Values 40..47 are \e[43mbackground colors\e[m\n"
+    printf "Value  1 gives a  \e[1mbold-faced look\e[m\n\n"
+
+    # foreground colors
+    for fgc in {30..37}; do
+        # background colors
+        for bgc in {40..47}; do
+            fgc=${fgc#37} # white
+            bgc=${bgc#40} # black
+
+            vals="${fgc:+$fgc;}${bgc}"
+            vals=${vals%%;}
+
+            seq0="${vals:+\e[${vals}m}"
+            printf "  %-9s" "${seq0:-(default)}"
+            printf " ${seq0}TEXT\e[m"
+            printf " \e[${vals:+${vals+$vals;}}1mBOLD\e[m"
+        done
+        echo
+        echo
+    done
+}
+
+[ -r /usr/share/bash-completion/bash_completion ] && . /usr/share/bash-completion/bash_completion
+
+# Change the window title of X terminals
+case ${TERM} in
+    xterm* | rxvt* | Eterm* | aterm | kterm | gnome* | interix | konsole*)
+        PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\007" '
+
+        ;;
+    screen*)
+        PROMPT_COMMAND='echo -ne "\033_${USER}@${HOSTNAME%%.*}:${PWD/#$HOME/\~}\033\\" '
+        ;;
+esac
+
+use_color=true
+
+# Set colorful PS1 only on colorful terminals.
+# dircolors --print-database uses its own built-in database
+# instead of using /etc/DIR_COLORS.  Try to use the external file
+# first to take advantage of user additions.  Use internal bash
+# globbing instead of external grep binary.
+safe_term=${TERM//[^[:alnum:]]/?} # sanitize TERM
+match_lhs=""
+[[ -f ~/.dir_colors ]] && match_lhs="${match_lhs}$(<~/.dir_colors)"
+[[ -f /etc/DIR_COLORS ]] && match_lhs="${match_lhs}$(</etc/DIR_COLORS)"
+[[ -z ${match_lhs} ]] &&
+    type -P dircolors >/dev/null &&
+    match_lhs=$(dircolors --print-database)
+[[ $'\n'${match_lhs} == *$'\n'"TERM "${safe_term}* ]] && use_color=true
+
+if ${use_color}; then
+    # Enable colors for ls, etc.  Prefer ~/.dir_colors #64489
+    if type -P dircolors >/dev/null; then
+        if [[ -f ~/.dir_colors ]]; then
+            eval $(dircolors -b ~/.dir_colors)
+        elif [[ -f /etc/DIR_COLORS ]]; then
+            eval $(dircolors -b /etc/DIR_COLORS)
+        fi
+    fi
+
+    if [[ ${EUID} == 0 ]]; then
+        PS2='\[\033[01;31m\][\h\[\033[01;36m\] \W\[\033[01;31m\]]\$\[\033[00m\] '
+    else
+        PS1='\[\033[01;32m\][\u@\h\[\033[01;37m\] \W\[\033[01;32m\]]\$\[\033[00m\] '
+    fi
+
+    alias ls='ls --color=auto'
+    alias grep='grep --colour=auto'
+    alias egrep='egrep --colour=auto'
+    alias fgrep='fgrep --colour=auto'
+else
+    if [[ ${EUID} == 0 ]]; then
+        # show root@ when we don't have colors
+        PS1='\u@\h \W \$ '
+    else
+        PS1='\u@\h \w \$ '
+    fi
+fi
+
+unset use_color safe_term match_lhs sh
+
+alias cp="cp -i"     # confirm before overwriting something
+alias df='df -h'     # human-readable sizes
+alias free='free -m' # show sizes in MB
+alias np='nano -w PKGBUILD'
+alias more=less
+
+xhost +local:root >/dev/null 2>&1
+
+complete -cf sudo
+
+# Bash won't get SIGWINCH if another process is in the foreground.
+# Enable checkwinsize so that bash will check the terminal size when
+# it regains control.  #65623
+# http://cnswww.cns.cwru.edu/~chet/bash/FAQ (E11)
+shopt -s checkwinsize
+
+# No need to type cd when changing directories.
+shopt -s autocd
+# No need to have capitalization correct
+shopt -s cdspell
+
+shopt -s expand_aliases
+
+# export QT_SELECT=4
+
+# Enable history appending instead of overwriting.  #139609
+shopt -s histappend
+
+#
+# # ex - archive extractor
+# # usage: ex <file>
+ex() {
+    if [ -f $1 ]; then
+        case $1 in
+            *.tar.bz2) tar xjf $1 ;;
+            *.tar.gz) tar xzf $1 ;;
+            *.bz2) bunzip2 $1 ;;
+            *.rar) unrar x $1 ;; *.gz) gunzip $1 ;;
+            *.tar) tar xf $1 ;;
+            *.tbz2) tar xjf $1 ;;
+            *.tgz) tar xzf $1 ;;
+            *.zip) unzip $1 ;;
+            *.Z) uncompress $1 ;;
+            *.7z) 7z x $1 ;;
+            *) echo "'$1' cannot be extracted via ex()" ;;
+        esac
+    else
+        echo "'$1' is not a valid file"
+    fi
+}
+
+# Formats history command with dates/times
+HISTTIMEFORMAT="%d/%m/%y %T "
+
+# Displays current git branch if there is any and also styles bash prompt
+# export PS1='\[\033[01;34m\][\u@\h\[\033[01;37m\] \W\[\033[01;34m\]]\$\033[01;34m\] $(git branch 2>/dev/null | grep '^*' | colrm 1 2)\n\033[01;34m└─>\033[37m '
+export PS1='\[\033[01;34m\][\[\033[01;37m\] \W\[\033[01;34m\]]\$\033[01;34m\] $(git branch 2>/dev/null | grep '^*' | colrm 1 2)\n\033[01;34m└─>\033[37m '
+# Configure thefuck
+eval "$(thefuck --alias)"
+export PATH="$PATH:/home/brian/scripts:/home/brian/.local/bin:/home/brian/.local/share/nvim/lsp_servers:/home/brian/.cargo/bin:/home/brian/go/bin"
+export GREP_COLORS='ms=01;34'
+
+# icons-in-terminal
+# source ~/.local/share/icons-in-terminal/icons_bash.sh
+
+# BEGIN_KITTY_SHELL_INTEGRATION
+if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
+# END_KITTY_SHELL_INTEGRATION
+
+alias home="xclear && cd /home/brian && clear && history -c && hash -r"
+
+# Various source files (do not place at end of zshrc/bashrc)
+source ~/.aliases
+source ~/.gh_pat
+source ~/.ssid_passwd
+source /home/brian/.bash_completions/typer.sh
+# Use bash-completion, if available
+[[ $PS1 && -f /usr/share/bash-completion/bash_completion ]] &&
+    source /usr/share/bash-completion/bash_completion
+
+export NVM_DIR="$HOME/.nvm"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"                   # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion" # This loads nvm bash_completion
+
+# Sets Up Node Version Manager
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
+# Set up TTY colors
+# pulled form https://github.com/lewisacidic/nord-tty
+if [ "$TERM" = "linux" ]; then
+    echo -en \\e]P02E3440
+    echo -en \\e]P1BF616A
+    echo -en \\e]P2A3BE8C
+    echo -en \\e]P3EBCB8B
+    echo -en \\e]P481A1C1
+    echo -en \\e]P5B48EAD
+    echo -en \\e]P688C0D0
+    echo -en \\e]P7E5E9F0
+    echo -en \\e]P84C566A
+    echo -en \\e]P9BF616A
+    echo -en \\e]PAA3BE8C
+    echo -en \\e]PBEBCB8B
+    echo -en \\e]PCB48EAD
+    echo -en \\e]PD8FBCBB
+    echo -en \\e]PEECEFF4
+    clear
+fi
+[ -f /opt/miniconda3/etc/profile.d/conda.sh ] && source /opt/miniconda3/etc/profile.d/conda.sh
+export CUDA_HOME=/opt/miniconda3/condabin/conda
diff --git a/gentoo/dotfiles/.xinitrc b/gentoo/dotfiles/.xinitrc
new file mode 100644
index 00000000..89775da6
--- /dev/null
+++ b/gentoo/dotfiles/.xinitrc
@@ -0,0 +1,92 @@
+#!/bin/sh
+
+# This is an ~/.xinitrc example file
+
+userresources=$HOME/.Xresources
+usermodmap=$HOME/.Xmodmap
+sysresources=/etc/X11/xinit/.Xresources
+sysmodmap=/etc/X11/xinit/.Xmodmap
+
+# merge in defaults and keymaps
+if [ -f $sysresources ]; then
+    xrdb -merge $sysresources
+fi
+
+if [ -f $sysmodmap ]; then
+    xmodmap $sysmodmap
+fi
+
+if [ -f "$userresources" ]; then
+    xrdb -merge "$userresources"
+fi
+
+if [ -f "$usermodmap" ]; then
+    xmodmap "$usermodmap"
+fi
+
+# start some nice programs
+if [ -d /etc/X11/xinit/xinitrc.d ]; then
+    for f in /etc/X11/xinit/xinitrc.d/?*.sh; do
+        [ -x "$f" ] && . "$f"
+    done
+    unset f
+fi
+
+# force XDG_SESSION_TYPE to be x11
+export XDG_SESSION_TYPE=x11
+export QT_QPA_PLATFORMTHEME=qt5ct
+
+# export XDG_DATA_DIRS=
+# Start compositor
+# picom blah blah ...
+
+#Desktop
+xrandr --output HDMI-0 --brightness 1.1 & #--set TearFree on &
+#Laptop
+# brillo -S 70
+
+# start redshift
+# redshift -O 5000 &
+
+picom --config /home/brian/.config/picom/picom.conf & # --experimental-backends &
+
+# GTK relies on this for icon themes
+# export GTK_ICON_THEME=Papirus-Dark
+
+# Start applets, daemons, etc.
+# diskie
+# nm-applet
+dunst &
+xbanish &
+xsetroot -cursor_name left_ptr &
+# espanso start --unmanaged &
+# pulseaudio --start &
+
+# enables AppArmor's aa-notify by default (supposed to be a runit script...)
+# aa-notify --user $USER -p -s 1 -w 60 -f /var/log/audit/audit.log
+
+# Notification for Laptop Battery
+# echo 'export DBUS_SESSION_BUS_ADDRESS='$DBUS_SESSION_BUS_ADDRESS > /tmp/dsba &
+# chmod +x /tmp/dsba &
+# /tmp/dsba &
+# /home/brian/scripts/batnotify &
+#
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    eval "$(dbus-launch --sh-syntax --exit-with-session)"
+fi
+
+# Start pipewire
+# /usr/bin/pipewire &
+# /usr/bin/pipewire-pulse &
+# /usr/bin/wireplumber &
+
+# Start i3wm
+# exec i3
+
+# redshift -O 5000 &
+#feh --bg-fill /home/brian/Pictures/leaves.jpg &
+
+# Start bspwm
+pgrep -x sxhkd >/dev/null || sxhkd -c /home/brian/.config/sxhkd/sxhkdrc &
+# exec bspwm -c /home/brian/.config/bspwm/bspwmrc
+exec dbus-launch --sh-syntax --exit-with-session bspwm -c /home/brian/.config/bspwm/bspwmrc
diff --git a/gentoo/dotfiles/.zprofile b/gentoo/dotfiles/.zprofile
new file mode 100644
index 00000000..415f785c
--- /dev/null
+++ b/gentoo/dotfiles/.zprofile
@@ -0,0 +1,14 @@
+# Ensure XDG_RUNTIME_DIR points to the correct location
+if [ -z "$XDG_RUNTIME_DIR" ]; then
+    export XDG_RUNTIME_DIR="/run/user/$(id -u)"
+    # create if it doesn't exist
+    [ ! -d "$XDG_RUNTIME_DIR" ] && mkdir -p "$XDG_RUNTIME_DIR" && chmod 0700 "$XDG_RUNTIME_DIR"
+fi
+
+# Start dbus session if it's not already running
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
+    eval "$(dbus-launch --sh-syntax --exit-with-session)"
+fi
+
+
+[[ -z $DISPLAY && $(tty) = /dev/tty1 ]] && exec startx
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/bug-report.md b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..5c646468
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,48 @@
+---
+name: Bug report
+about: Always include a minimal, reproducible test case. If I cannot reproduce it, then I cannot fix it!
+title: ''
+labels: type::bug report
+assignees: ''
+
+---
+
+
+## Environment
+<!-- Run the code below and share the output. -->
+```zsh
+% typeset -p1 VENDOR OSTYPE ZSH_PATCHLEVEL _autocomplete__funcfiletrace
+<output>
+% git -C ~autocomplete log --oneline -n1
+<output>
+```
+
+* Operating system: <!-- for example, 'macOS Ventura 13.4' or 'Ubuntu 22.04.2 LTS' -->
+* Terminal emulator: <!-- for example, 'Terminal.app' or 'Konsole' -->
+
+
+## Steps to reproduce
+<!-- Update the code below to create a test case that demonstrates the problem
+in an isolated environment. -->
+```zsh
+% cd $(mktemp -d)
+% git clone --depth 1 -- https://github.com/marlonrichert/zsh-autocomplete.git
+<output>
+% > .zshrc <<EOF
+setopt interactivecomments transientrprompt
+PS1='%# '
+PS2=
+RPS2='%^'
+source $PWD/zsh-autocomplete/zsh-autocomplete.plugin.zsh
+EOF
+% env -i HOME=$PWD PATH=$PATH TERM=$TERM ${TERMINFO:+TERMINFO=$TERMINFO} zsh -d
+% <inputs>
+<output>
+```
+
+<details>
+<summary>Contents of <code>~autocomplete-log/YYYY-MM-DD.log</code> (click to expand)</summary>
+<pre>
+<!-- Replace this line with the contents of the above log file. -->
+</pre>
+</details>
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/config.yml b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/config.yml
new file mode 100644
index 00000000..3ba13e0c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/config.yml
@@ -0,0 +1 @@
+blank_issues_enabled: false
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/feature_request.md b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..edeaf1eb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,32 @@
+---
+name: Feature request
+about: If this template doesn't suit your needs, then please open a Discussion instead.
+title: ''
+labels: type::feature request
+assignees: ''
+
+---
+
+## What do you want?
+<!-- Give a brief summary of the feature. -->
+
+## Why do you want this?
+<!-- Explain what you would use this for or how this would enhance your experience. -->
+
+## Who else would benefit from this?
+<!-- Describe what kind of users would enjoy this feature. -->
+
+## How should it work?
+<!-- Fill out the steps below. -->
+
+Given the following situation:
+* <!-- State the circumstances under which this feature would apply. -->
+*
+
+When I perform the following steps:
+1. <!-- List what actions you would take in the situation described above. -->
+1. <!-- Numbering is automatic. -->
+
+Then I expect the following to happen:
+* <!-- Describe how you would expect the system to behave in response to your actions above. -->
+*
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/workflows/lock.yml b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/workflows/lock.yml
new file mode 100644
index 00000000..73acd9bf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/workflows/lock.yml
@@ -0,0 +1,20 @@
+name: 'Lock Threads'
+
+on:
+  schedule:
+    - cron: '30 5,17 * * *'
+
+permissions:
+  issues: write
+  pull-requests: write
+
+concurrency:
+  group: lock
+
+jobs:
+  action:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: dessant/lock-threads@v2
+        with:
+          issue-lock-inactive-days: '90'
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/workflows/test.yml b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/workflows/test.yml
new file mode 100644
index 00000000..1262befa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/.github/workflows/test.yml
@@ -0,0 +1,25 @@
+name: test
+
+on:
+  push:
+  pull_request:
+  workflow_dispatch:
+
+jobs:
+  test-macos:
+    runs-on: macos-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+      - run: ./run-tests.zsh
+        shell: zsh {0}
+  test-ubuntu:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+        with:
+          submodules: 'true'
+      - run: sudo apt install zsh
+      - run: ./run-tests.zsh
+        shell: zsh {0}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.gitmodules b/gentoo/dotfiles/.zsh/zsh-autocomplete/.gitmodules
new file mode 100644
index 00000000..c08245d9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "clitest"]
+	path = clitest
+	url = https://github.com/aureliojargas/clitest.git
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/alias-expansion.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/alias-expansion.png
new file mode 100644
index 00000000..368c44ee
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/alias-expansion.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/file-search.gif b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/file-search.gif
new file mode 100644
index 00000000..fb4b8441
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/file-search.gif differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-lines.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-lines.png
new file mode 100644
index 00000000..d9e8572d
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-lines.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-menu.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-menu.png
new file mode 100644
index 00000000..5b9eb220
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-menu.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-search.gif b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-search.gif
new file mode 100644
index 00000000..c240303e
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/history-search.gif differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/multi-select.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/multi-select.png
new file mode 100644
index 00000000..b5775af6
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/multi-select.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/recent-dirs.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/recent-dirs.png
new file mode 100644
index 00000000..5769108e
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/recent-dirs.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/requoted.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/requoted.png
new file mode 100644
index 00000000..364f5c71
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/requoted.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/unambiguous.png b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/unambiguous.png
new file mode 100644
index 00000000..b02921f6
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-autocomplete/.img/unambiguous.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__command b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__command
new file mode 100644
index 00000000..14a84afa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__command
@@ -0,0 +1,6 @@
+#compdef -command-
+
+local -P ret=1
+_autocd "$@" &&
+    ret=0
+return ret
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__compadd_opts_len b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__compadd_opts_len
new file mode 100644
index 00000000..a29c6508
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__compadd_opts_len
@@ -0,0 +1,10 @@
+#autoload
+
+local -Pi len=$(( ${@[(i)(-|--)]} - 1 ))
+(( len < $# )) &&
+    return len
+
+len=${@[(I)-*]}
+[[ $@[len] == -*[PSpsiIdJVXxrRWFMOAD] ]] &&
+    (( len++ ))
+return len
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__history_lines b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__history_lines
new file mode 100644
index 00000000..c0378829
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__history_lines
@@ -0,0 +1,156 @@
+#autoload
+
+_autocomplete__history_lines() {
+  # Don't run more than once.
+  (( _matcher_num > 1 )) &&
+      return 1
+
+  local -P lbuffer='' rbuffer=''
+
+  (( CURRENT > 1 )) &&
+      lbuffer="${(j.[[:blank:]]##.)${(@b)words[1,CURRENT-1]}}[[:blank:]]##"
+  (( CURRENT < $#words[@] )) &&
+      rbuffer="[[:blank:]]##${(j.[[:blank:]]##.)${(@b)words[CURRENT+1,-1]}}"
+  lbuffer="$lbuffer${(b)QIPREFIX}"
+  rbuffer="${(b)QISUFFIX}$rbuffer"
+
+  local -P query=''
+  if [[ -n $words[CURRENT] ]]; then
+    local -Pa includes=( "${(@s..b)^words[CURRENT]}" )
+    local -Pa excludes=( "(|[^${(@s..b)^words[CURRENT]}\n;]#)" )
+    local -Pa tokens=( ${(@)excludes:^includes} )
+    query="((#l)$tokens[2]${(j..)tokens[3,-1]})"
+
+    local -P no_delim='[^\n;]#' pre='' post=''
+    if [[ -z $lbuffer ]]; then
+      pre='*'
+    else
+      pre=$no_delim
+    fi
+    if [[ -z $rbuffer ]]; then
+      post='*'
+    else
+      post=$no_delim
+    fi
+    query="(|$pre)$query$post"
+  else
+    query='()*'
+  fi
+
+  [[ $curcontext == *-incremental-* ]]
+  local -Pi is_incremental=$(( ! ? ))
+
+  # Non-incremental search potentially adds a lot of completions, which can be quite slow.
+  (( is_incremental )) ||
+      zle -R 'Loading...'
+
+  # Using fc is way faster than using $history.
+  local -P output="$( fc -lrm "$lbuffer$query$rbuffer" -1 1 2> /dev/null )"
+
+  # No results
+  [[ -z $output ]] &&
+      return 1
+
+  local -aU displays=( "${(f)output}" )
+  local -P numpat='[[:blank:]]#(<->)[*[:blank:]][[:blank:]]'
+
+  local -P groups="${(l:$(( 2 * $#words[CURRENT] ))::=0:):-}"
+  _comp_colors=(
+      "=(#b)${numpat}${lbuffer}(${query})${rbuffer}${rbuffer:+[[:blank:]]#}=2=2=0=0=30;103$groups"
+      "=(#b)${numpat}${lbuffer}(${query})*=2=2=0=30;103$groups"
+      "=(#b)${numpat}${lbuffer}(*)=2=2=0"
+      "=(#b)${numpat}*=0=2"
+      ${(M)_comp_colors:#ma=*}
+  )
+
+  local -Pi excess= index= max= list_lines=
+  if (( is_incremental )); then
+    .autocomplete:async:list-choices:max-lines
+    (( list_lines = _autocomplete__max_lines ))
+    (( max = 16 * list_lines ))  # Buffer for bubbling up more relevant results.
+  else
+    zstyle -s ":autocomplete:${curcontext}:" list-lines list_lines ||
+        (( list_lines = $LINES / 2 ))
+    (( max = $list_lines ))
+  fi
+
+
+  if [[ -o histfindnodups ]]; then
+    local -PaU uniques=()
+    local -Pa lines=()
+    local -Pi size=0
+    for index in {$#displays[@]..1}; do
+      uniques+=( ${displays[index]##$~numpat} )
+      (( $#uniques[@] > size )) &&
+          lines+=( "$displays[index]" )
+      (( size = $#uniques ))
+      (( size < max )) ||
+          break
+    done
+    displays=( "${(aO)lines[@]}" )
+  else
+    (( excess = $#displays[@] - max ))
+    (( excess > 0 )) &&
+        shift $excess displays
+  fi
+
+  local -P pop=
+  if (( is_incremental )); then
+    pop=-p
+
+    if [[ -z $words[CURRENT] ]]; then
+      displays=( ${(@aO)displays} )
+
+    else
+      local -a match=() mbegin=() mend=()
+      local -Pi num=0
+
+      # Fuzzy sort
+      for index in {1..$#displays[@]}; do
+        num=${(SM)${(M)displays[index]##$~numpat}##<->}
+        displays[index]=${history[$num]:/(#b)$~lbuffer($~query)$~rbuffer/$((
+            HISTNO - num + 64 * $#match[3] + 16 * mbegin[3] + 4 * $#match[1]
+        ))}$'\0'$displays[index]
+      done
+      displays=( ${${(@n)displays}[@]##<->$'\0'} )
+    fi
+  fi
+
+  (( excess = $#displays[@] - list_lines ))
+  (( excess > 0 )) &&
+      shift $pop $excess displays
+
+  # To avoid wrapping, each completion should be one char less than terminal width.
+  displays=( ${(@r:COLUMNS-1:)displays} )
+
+  local -Pa matches=()
+  for index in "${(MS)displays[@]##<->}"; do
+    matches+=( "${${history[$index]##$~lbuffer}%%$~rbuffer}" )
+  done
+
+  if [[ -z $matches ]]; then
+    return 1
+  fi
+
+  local -Pa suf=( -S '' )
+  if [[ $WIDGETSTYLE == *-select* && $#matches[@] > 1 ]]; then
+    # Enable multi-select.
+    suf=( -S ';' -R _autocomplete__history_lines_suffix )
+  fi
+
+  local tag=history-lines
+  _comp_tags=" $tag"
+  local _comp_no_ignore=1
+  local -a expl=()
+  _description -2V $tag expl ''
+  builtin compadd "$suf[@]" -QU -ld displays "$expl[@]" -a matches
+}
+
+_autocomplete__history_lines_suffix() {
+  if [[ SUFFIX_ACTIVE -ne 0 && $WIDGET != history-search-backward ]]; then
+    LBUFFER="$LBUFFER[1,SUFFIX_START]"
+    RBUFFER="$RBUFFER[SUFFIX_END,-1]"
+  fi
+}
+
+_autocomplete__history_lines "$@"
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__recent_paths b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__recent_paths
new file mode 100644
index 00000000..ea5b7c9e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__recent_paths
@@ -0,0 +1,35 @@
+#autoload
+zmodload -Fa zsh/parameter p:functions
+
+# Don't run more than once.
+(( _matcher_num > 1 )) &&
+    return 1
+
+local -aU files
+local -a expl displ
+local -iP ret i
+local -P singular plural tag
+
+ret=1
+
+.autocomplete:async:list-choices:max-lines
+
+for singular plural in directory directories file files; do
+  if [[ -v functions[+autocomplete:recent-$plural] ]] &&
+      +autocomplete:recent-$plural "$PREFIX$SUFFIX"; then
+    files=( "$reply[@]" )
+
+    tag=recent-$plural
+    _comp_tags+=" $tag"
+    _description -V "$tag" expl "recent $singular"
+
+    for (( i = 1 ; i <= $#files && compstate[list_lines] < _autocomplete__max_lines ; i++ )); do
+      displ=( "$files[i]" )
+      compadd -U "$expl[@]" -d displ -P "${${displ[1]:h}%/}/" -fW "${${files[i]:h}%/}/" \
+          -- "$files[i]:t" &&
+          ret=0
+    done
+  fi
+done
+
+return ret
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__should_insert_unambiguous b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__should_insert_unambiguous
new file mode 100644
index 00000000..cd3c4478
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__should_insert_unambiguous
@@ -0,0 +1,9 @@
+#autoload
+
+local -a match=() mbegin=() mend=()  # `zstyle` for some reason assigns these.
+
+[[ -n $_autocomplete__unambiguous ]] &&
+    {
+      builtin zstyle -t ":autocomplete:$curcontext" insert-unambiguous ||
+          [[ $WIDGET == *insert-unambiguous* ]]
+    }
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__unambiguous b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__unambiguous
new file mode 100644
index 00000000..a1491661
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Completions/_autocomplete__unambiguous
@@ -0,0 +1,45 @@
+#autoload
+
+[[ $_comp_tags == *\ (history-lines|recent-)* ]] &&
+    return 1
+
+# Is not going to be correct.
+[[ -v _autocomplete__partial_list ]] &&
+    return 1
+
+# No need to update.
+[[ $compstate[old_list] == keep ]] &&
+    return 1
+
+# Doesn't make sense to show.
+(( compstate[nmatches] < 2 )) &&
+    return 1
+
+# Nothing to insert.
+[[ -z $compstate[unambiguous] ]] &&
+    return 1
+
+# Substring is already present.
+local -P word=$IPREFIX$PREFIX$SUFFIX$ISUFFIX
+[[ -n $word && $word == *$compstate[unambiguous]* ]] &&
+    return 1
+
+local -P tag=unambiguous
+_tags $tag
+_tags ||
+    return
+_requested $tag ||
+    return
+
+typeset -g _autocomplete__unambiguous="$compstate[unambiguous]"
+
+# Retrieve highlight value.
+local format
+zstyle -s ":completion:${curcontext}:unambiguous" format format ||
+    format=$'%{\e[0;2m%}%Bcommon substring:%b %0F%11K%d%f%k'
+
+zformat -F format "$format" "d:$compstate[unambiguous]"
+
+builtin compadd -J "$tag" -x "$format"
+
+false
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__async b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__async
new file mode 100644
index 00000000..0bf560af
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__async
@@ -0,0 +1,679 @@
+#!/bin/zsh
+zmodload -F zsh/zpty b:zpty
+zmodload -F zsh/parameter p:funcstack p:functions p:parameters
+zmodload -F zsh/system b:sysopen p:sysparams
+zmodload -F zsh/zselect b:zselect
+zmodload -F zsh/terminfo b:echoti p:terminfo
+zmodload -F zsh/zutil b:zparseopts
+builtin autoload -RUz \
+    add-zle-hook-widget \
+    is-at-least
+
+typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=yes
+typeset -g _autocomplete__overhead=0
+
+${0}:precmd() {
+  [[ -v ZSH_AUTOSUGGEST_IGNORE_WIDGETS ]] &&
+      ZSH_AUTOSUGGEST_IGNORE_WIDGETS+=(
+          history-incremental-search-backward
+          recent-paths
+          .autocomplete:async:complete:fd-widget
+      )
+
+  # Start names with `.` to avoid getting wrapped by syntax highlighting.
+  builtin zle -N .autocomplete:async:pty:zle-widget
+  builtin zle -C .autocomplete:async:pty:completion-widget list-choices .autocomplete:async:pty:completion-widget
+
+  builtin zle -N .autocomplete:async:complete:fd-widget
+  builtin zle -N .autocomplete:async:wait:fd-widget
+
+  builtin zle -C ._list_choices list-choices .autocomplete:async:list-choices:completion-widget
+
+  builtin zle -N history-incremental-search-backward .autocomplete:async:toggle-context
+  builtin zle -N recent-paths .autocomplete:async:toggle-context
+
+  add-zle-hook-widget line-init .autocomplete:async:reset-context
+  add-zle-hook-widget line-pre-redraw .autocomplete:async:complete
+  add-zle-hook-widget line-finish .autocomplete:async:clear
+
+  add-zle-hook-widget isearch-update .autocomplete:async:isearch-update
+  add-zle-hook-widget isearch-exit .autocomplete:async:isearch-exit
+}
+
+.autocomplete:async:toggle-context() {
+  if [[ $curcontext == $WIDGET* ]]; then
+    unset curcontext
+  else
+    typeset -g curcontext=${WIDGET}:::
+  fi
+  zle .autocomplete:async:complete -w
+}
+
+.autocomplete:async:reset-context() {
+  .autocomplete:async:reset-state
+
+  typeset -g curcontext=
+  builtin zstyle -s :autocomplete: default-context curcontext
+
+  .autocomplete:async:complete
+  return 0
+}
+
+.autocomplete:async:isearch-update() {
+  typeset -gi _autocomplete__isearch=1
+}
+
+.autocomplete:async:isearch-exit() {
+  unset _autocomplete__isearch
+}
+
+.autocomplete:async:save-state() {
+  typeset -g \
+      _autocomplete__curcontext=$curcontext \
+      _autocomplete__lbuffer="$LBUFFER" \
+      _autocomplete__rbuffer="$RBUFFER"
+}
+
+.autocomplete:async:same-state() {
+  [[ -v _autocomplete__curcontext && $_autocomplete__curcontext == $curcontext &&
+     -v _autocomplete__lbuffer && $_autocomplete__lbuffer == $LBUFFER &&
+     -v _autocomplete__rbuffer && $_autocomplete__rbuffer == $RBUFFER ]]
+}
+
+.autocomplete:async:reset-state() {
+  unset \
+      _autocomplete__curcontext \
+      _autocomplete__lbuffer \
+      _autocomplete__rbuffer
+}
+
+# function -T
+.autocomplete:async:complete() {
+  if [[ -v _autocomplete__inserted ]]; then
+    unset _autocomplete__inserted
+    typeset -g curcontext=
+    builtin zstyle -s :autocomplete: default-context curcontext
+  fi
+  .autocomplete:async:save-state
+
+  .autocomplete__zle-flags ||
+      return 0
+
+  (( KEYS_QUEUED_COUNT || PENDING )) &&
+      return
+
+  [[ -v ZSH_AUTOSUGGEST_IGNORE_WIDGETS ]] && (( ZSH_AUTOSUGGEST_IGNORE_WIDGETS[(I)$LASTWIDGET] )) &&
+      unset POSTDISPLAY
+
+  # Don't get activated by asynchronous widgets.
+  [[ $LASTWIDGET == (autosuggest-suggest|.autocomplete:async:*:fd-widget) ]] &&
+      return 0
+
+  {
+    if (( REGION_ACTIVE )) ||
+        [[ -v _autocomplete__isearch && $LASTWIDGET == *(incremental|isearch)* ]]; then
+      builtin zle -Rc
+      return 0
+    fi
+
+    builtin zstyle -t ":autocomplete:${LASTWIDGET}:" ignore &&
+        return 0
+
+    local -Pa ignored=(
+      '_complete_help'
+      '(copy|insert)-*-word'
+      'describe-key-briefly'
+      '(|reverse-)menu-complete'
+      'what-cursor-position'
+      'where-is'
+    )
+    [[ ${LASTWIDGET##.} == (${(~j:|:)~ignored}) ]] &&
+        return 0
+
+    [[ $KEYS == ([\ -+*]|$'\e\t') ]] &&
+        builtin zle -Rc
+
+    # WORKAROUND: #549 Bug in zdharma/fast-syntax-highlighting.
+    [[ -v _FAST_MAIN_CACHE ]] &&
+        _zsh_highlight
+
+    typeset -ga _autocomplete__region_highlight=( "$region_highlight[@]" )
+
+    if  [[ -v ZSH_AUTOSUGGEST_IGNORE_WIDGETS ]] &&
+        (( ZSH_AUTOSUGGEST_IGNORE_WIDGETS[(I)$LASTWIDGET] )); then
+      unset POSTDISPLAY
+    fi
+
+    .autocomplete:async:wait
+  }
+
+  return 0
+}
+
+.autocomplete:async:clear() {
+  unset curcontext _autocomplete__isearch
+  .autocomplete:async:reset-context
+  builtin zle -Rc
+  return 0
+}
+
+# function -t
+.autocomplete:async:wait() {
+  local fd=
+
+  sysopen -r -o cloexec -u fd <(
+    local -F seconds=
+    builtin zstyle -s :autocomplete: delay seconds ||
+        builtin zstyle -s :autocomplete: min-delay seconds ||
+        (( seconds = 0.05 ))
+
+    (( seconds_delay = max( 0, seconds_delay - _autocomplete__overhead ) ))
+
+    # Convert to 100ths of a second for `zselect -t`.
+    # WORKAROUND: #441 Directly using $(( [#10] … max( … ) )) leads to 0 in Zsh 5.9, as the result
+    # of max() gets converted to an integer _before_ being multiplied.
+    local -i timeout=$(( 100 * seconds ))
+
+    zselect -t $timeout
+
+    print
+  )
+  builtin zle -Fw "$fd" .autocomplete:async:wait:fd-widget
+
+  return 0
+}
+
+# function -T
+.autocomplete:async:wait:fd-widget() {
+  {
+    local -i fd=$1
+    builtin zle -F $fd # Unhook ourselves immediately, so we don't get called more than once.
+    exec {fd}<&-
+
+    if [[ -n $_autocomplete__zle_flags ]]; then
+      builtin zle -f $_autocomplete__zle_flags
+
+      [[ $_autocomplete__zle_flags == yank* ]] &&
+          return 0
+    fi
+
+    (( KEYS_QUEUED_COUNT || PENDING )) &&
+        return
+
+    {
+      .autocomplete:async:same-state &&
+          .autocomplete:async:start
+    }
+  }
+  return 0
+}
+
+# function -T
+.autocomplete:async:start() {
+  local fd=
+  sysopen -r -o cloexec -u fd <(
+    local +h PS4=$_autocomplete__ps4
+    .autocomplete:async:start:inner 2>>| $_autocomplete__log
+  )
+  builtin zle -Fw "$fd" .autocomplete:async:complete:fd-widget
+
+  # WORKAROUND: https://github.com/zsh-users/zsh-autosuggestions/issues/364
+  # There's a weird bug in Zsh < 5.8, where ^C stops working unless we force a fork.
+  command true
+}
+
+# function -T
+.autocomplete:async:start:inner() {
+  {
+    typeset -F SECONDS=0
+
+    local -P hooks=( chpwd periodic precmd preexec zshaddhistory zshexit )
+    builtin unset ${^hooks}_functions &> /dev/null
+    $hooks[@] () { : }
+
+    local -P hook=
+    for hook in \
+        zle-{isearch-{exit,update},line-{pre-redraw,init,finish},history-line-set,keymap-select}
+    do
+      builtin zle -N $hook .autocomplete:async:pty:no-op
+    done
+    {
+      local REPLY=
+      zpty AUTOCOMPLETE .autocomplete:async:pty
+      local -Pi fd=$REPLY
+
+      zpty -w AUTOCOMPLETE $'\C-@'
+
+      local header=
+      zpty -r AUTOCOMPLETE header $'*\C-A'
+
+      local -a reply=()
+      local text=
+
+      local -F seconds=0.0
+      builtin zstyle -s ":autocomplete:${curcontext}" timeout seconds ||
+          (( seconds = 1.0 ))
+
+      (( seconds = max( 0, seconds - SECONDS ) ))
+
+      # Convert to 100ths of a second for `zselect -t`.
+      # WORKAROUND: #441 Directly using $(( [#10] … max( … ) )) leads to 0 in Zsh 5.9, as the result
+      # of max() gets converted to an integer _before_ being multiplied.
+      local -i timeout=$(( 100 * seconds ))
+
+      if zselect -rt $timeout "$fd"; then
+        zpty -r AUTOCOMPLETE text $'*\C-B'
+      else
+        # Press ^C twice: Once to abort completion, then once to abort the command line.
+        # Then exit the shell with ^D.
+        zpty -wn AUTOCOMPLETE $'\C-C\C-C\C-D'
+      fi
+    } always {
+      zpty -d AUTOCOMPLETE
+    }
+  } always {
+    # Always produce output, so we always reach the callback, so we can close
+    # the fd.
+    print -rNC1 -- "${text%$'\C-B'}"
+  }
+}
+
+# function -T
+.autocomplete:async:pty() {
+  local +h PS4=$_autocomplete__ps4
+
+  # Make sure this shell dies after it times out.
+  local -F seconds=
+  builtin zstyle -s ":autocomplete:${curcontext}" timeout seconds ||
+      seconds=0.5
+  TMOUT=$(( [#10] 1 + seconds ))
+
+  # WORKAROUND: #654 Inside the PTY, formatting can lead to incorrect list trimming.
+  eval ${${${"$( zstyle -L '*' format )"}//zstyle /zstyle -d }// -e / }
+
+  builtin bindkey $'\C-@' .autocomplete:async:pty:zle-widget
+  local __tmp__=
+  builtin vared __tmp__
+} 2>>| $_autocomplete__log
+
+.autocomplete:async:pty:no-op() {
+  :
+}
+
+# function -T
+.autocomplete:async:pty:zle-widget() {
+  local +h PS4=$_autocomplete__ps4
+
+  setopt localoptions NO_banghist
+
+  local -a _autocomplete__comp_mesg=()
+  local -i _autocomplete__list_lines=0
+  local _autocomplete__mesg=
+  {
+    # The completion widget sometimes returns without calling its function. So, we need to print all
+    # our control characters here, to ensure we don't end up waiting endlessly to read them.
+    print -n -- '\C-A'
+    LBUFFER=$_autocomplete__lbuffer
+    RBUFFER=$_autocomplete__rbuffer
+
+    [[ -n $curcontext ]] &&
+        setopt $_autocomplete__ctxt_opts[@]
+
+    local +h PS4=$_autocomplete__ps4
+    builtin zle .autocomplete:async:pty:completion-widget -w 2>>| $_autocomplete__log
+  } always {
+    print -rNC1 -- ${_autocomplete__list_lines:-0}$'\C-B'
+    builtin exit
+  }
+} 2>>| $_autocomplete__log
+
+# function -T
+.autocomplete:async:pty:completion-widget() {
+  local +h PS4=$_autocomplete__ps4
+
+  setopt localoptions banghist
+  {
+    if ! .autocomplete:async:sufficient-input; then
+      return
+    fi
+    {
+      unfunction compadd 2> /dev/null
+      unset 'compstate[vared]'
+      .autocomplete:async:list-choices:main-complete
+    } always {
+      _autocomplete__list_lines=$compstate[list_lines]
+    }
+  } 2>>| $_autocomplete__log
+}
+
+# function -T
+.autocomplete:async:complete:fd-widget() {
+  setopt localoptions NO_banghist
+
+  {
+    local +h -F SECONDS=0.0
+    local -i fd=$1
+    {
+      builtin zle -F $fd # Unhook ourselves immediately, so we don't get called more than once.
+
+      if [[ -n $_autocomplete__zle_flags ]]; then
+        builtin zle -f $_autocomplete__zle_flags
+
+        [[ $_autocomplete__zle_flags == yank* ]] &&
+            return 0
+      fi
+
+      (( KEYS_QUEUED_COUNT || PENDING )) &&
+          return
+
+      .autocomplete:async:same-state ||
+          return 0
+
+      local -a reply=()
+      IFS=$'\0' read -rAu $fd
+      shift -p reply
+      (( SECONDS += reply[2] ))
+
+    } always {
+      exec {fd}<&-
+    }
+
+    [[ -n $curcontext ]] &&
+        setopt $_autocomplete__ctxt_opts[@]
+
+    # If a widget can't be called, zle always returns true.
+    # Thus, we return false on purpose, so we can check if our widget got called.
+    local +h PS4=$_autocomplete__ps4
+    if ! builtin zle ._list_choices -w "$reply[1]" 2>>| $_autocomplete__log; then
+
+      typeset -g _autocomplete__overhead=$SECONDS
+
+      typeset -g region_highlight=( "$_autocomplete__region_highlight[@]" )
+
+      # Need to call this here, because on line-pre-redraw, $POSTDISPLAY is empty.
+      [[ -v functions[_zsh_autosuggest_highlight_apply] ]] &&
+          _zsh_autosuggest_highlight_apply
+
+      # Refresh if and only if our widget got called. Otherwise, Zsh will crash (eventually).
+      builtin zle -R
+    fi
+    .autocomplete:async:reset-state
+
+    return 0
+  }
+}
+
+.autocomplete:async:sufficient-input() {
+  local min_input=
+  if ! builtin zstyle -s ":autocomplete:${curcontext}:" min-input min_input; then
+    if [[ -n $curcontext ]]; then
+      min_input=0
+    else
+      min_input=1
+    fi
+  fi
+
+  local ignored=
+  builtin zstyle -s ":autocomplete:${curcontext}:" ignored-input ignored
+
+  if (( ${#words[@]} == 1 && ${#words[CURRENT]} < min_input )) ||
+      [[ -n $ignored && $words[CURRENT] == $~ignored ]]; then
+    compstate[list]=
+    false
+  else
+    true
+  fi
+}
+
+.autocomplete:async:list-choices:completion-widget() {
+  local +h PS4=$_autocomplete__ps4
+
+  setopt localoptions banghist
+
+  if [[ $1 != <1-> ]]; then
+    compstate[list]=
+    return
+  fi
+
+  .autocomplete:async:sufficient-input ||
+      return 2
+
+  compstate[insert]=
+  compstate[old_list]=
+  compstate[pattern_insert]=
+  .autocomplete:async:list-choices:main-complete
+
+  # Workaround: In Zsh <= 5.9.0, comppostfuncs don't get called after completing subscripts.
+  unset MENUSELECT MENUMODE
+  compstate[insert]=
+  _lastcomp[insert]=
+  compstate[pattern_insert]=
+  _lastcomp[pattern_insert]=
+  if [[ -v _autocomplete__partial_list ]]; then
+    builtin compadd -J -last- -x '%F{0}%K{12}(MORE)%f%k'
+    _lastcomp[list_lines]=$compstate[list_lines]
+  fi
+
+  return 2  # Don't return 1, to prevent beeping.
+}
+
+.autocomplete:async:list-choices:max-lines() {
+  local -Pi max_lines
+  builtin zstyle -s ":autocomplete:${curcontext}:" list-lines max_lines ||
+      max_lines=16
+  _autocomplete__max_lines=$(( min( max_lines, LINES - BUFFERLINES - 1 ) ))
+}
+
+.autocomplete:async:list-choices:main-complete() {
+  local -i _autocomplete__max_lines
+
+  case $curcontext in
+  *history-* )
+    setopt $_autocomplete__func_opts[@]
+    autocomplete:_main_complete:new - history-lines _autocomplete__history_lines
+  ;;
+  recent-paths:* )
+    setopt $_autocomplete__func_opts[@]
+    autocomplete:_main_complete:new - recent-paths _autocomplete__recent_paths
+  ;;
+  * )
+    {
+      () {
+        emulate -L zsh
+        setopt $_autocomplete__func_opts[@]
+
+        local curcontext=list-choices:::
+
+        .autocomplete:async:shadow compadd
+
+        autoload -Uz +X _describe
+        .autocomplete:async:shadow _describe
+
+        # functions -T compadd _describe _description
+      } "$@"
+
+      .autocomplete:async:list-choices:max-lines
+      autocomplete:_main_complete:new "$@"
+    } always {
+      unfunction compadd comptags 2> /dev/null
+      .autocomplete:async:unshadow compadd
+      .autocomplete:async:unshadow _describe
+    }
+  ;;
+  esac
+}
+
+.autocomplete:async:shadow() {
+  [[ -v functions[$1] ]] &&
+      functions[autocomplete:async:${1}:old]="$functions[$1]"
+  functions[$1]="$functions[.autocomplete:async:$1]"
+}
+
+.autocomplete:async:unshadow() {
+  if [[ -v functions[autocomplete:async:${1}:old] ]]; then
+    functions[$1]="$functions[autocomplete:async:${1}:old]"
+    unfunction autocomplete:async:${1}:old
+  fi
+}
+
+.autocomplete:async:_describe() {
+  local -i _autocomplete__described_lines=1  # Assume we'll add a title.
+  autocomplete:async:_describe:old "$@"
+}
+
+.autocomplete:async:compadd() {
+  local -A _opts_=()
+  local -a _xopts_=() _displ_=() _matches_=()
+  local -P _displ_name_= _matches_name_=
+
+  zparseopts -A _opts_ -E -- D: E: O: X:=_xopts_ x:=_xopts_
+
+  local -Pi _unused_lines_=$(( _autocomplete__max_lines - compstate[list_lines] ))
+
+  # If $_grp is not set, then _describe is adding completions in a normal way and we don't need to
+  # do all this.
+  if [[ -v _autocomplete__described_lines && -n $_grp ]]; then
+
+    # We cannot interfere when _describe is actually adding the completions or we risk breaking the
+    # layout.
+    if [[ -z $_opts_[-D] ]]; then
+      builtin compadd "$@"
+      return
+    fi
+
+    _displ_name_=$_opts_[-D]
+    _matches_name_=$_opts_[-O]
+
+    # We already ran out of space.
+    if [[ -v _autocomplete__partial_list ]]; then
+      set -A $_displ_name_
+      [[ -n $_matches_name_ ]] &&
+          set -A $_matches_name_
+    fi
+
+    builtin compadd "$@"
+    local -Pi _ret_=$?
+
+    local -i _ndisplay_=${(PA)#_displ_name_}
+    local -i _lines_left_for_describe_=$(( _unused_lines_ - _autocomplete__described_lines ))
+
+    # The number of lines that would be added is equal to the number of unique display strings.
+    if (( ${#${(u)${(PA)_displ_name_}[@]#*:}} > _lines_left_for_describe_ )); then
+      local -Pi _matches_to_remove=$(( _ndisplay_ - max( 0, _lines_left_for_describe_ ) ))
+      if (( _matches_to_remove < _ndisplay_ )); then
+        shift -p $_matches_to_remove $_displ_name_ $_matches_name_
+      else
+        set -A $_displ_name_
+        [[ -n $_matches_name_ ]] &&
+            set -A $_matches_name_
+      fi
+      _ndisplay_=${(PA)#_displ_name_}
+      .autocomplete:async:compadd:disable
+    fi
+    (( _autocomplete__described_lines += _ndisplay_ ))
+
+    return _ret_
+  fi
+
+  # We already ran out of space.
+  if [[ -v _autocomplete__partial_list ]]; then
+    [[ -n $_opts_[-D] ]] &&
+        set -A $_opts_[-D]
+    [[ -n $_opts_[-O] ]] &&
+        set -A $_opts_[-O]
+    return 1
+  fi
+
+  # If
+  if [[ -n $_opts_[-D]$_opts_[-O] ]]; then
+    builtin compadd "$@"
+    return
+  fi
+
+  local -i _old_total_lines=$compstate[list_lines]
+
+  # Need to remove prompt escape codes or compadd might crash.
+  local -Pi _total_new_lines_="$(
+      zparseopts -a _xopts_ -D -E -- X: x:
+      builtin compadd "$@"
+      print -nr -- $(( $compstate[list_lines] - _old_total_lines ))
+  )"
+
+  local -Pi _new_completion_lines_="$(
+      zparseopts -a _xopts_ -D -E -- X: x:
+      builtin compadd "$@"
+      print -nr -- $(( $compstate[list_lines] - _old_total_lines ))
+  )"
+
+  local -Pi _new_heading_lines_=$(( _total_new_lines_ - _new_completion_lines_ ))
+
+  # Everything fits.
+  if (( _total_new_lines_ + $compstate[list_lines] <= _autocomplete__max_lines )); then
+    builtin compadd "$@"
+    return
+  fi
+
+  # We're apparently trying to add a message that spans more than one line, but not any completions.
+  if (( _new_heading_lines_ > 1 && _new_completion_lines_ < 1 )); then
+    .autocomplete:async:compadd:disable
+    return 1
+  fi
+
+  local -a _dopt_=()
+  zparseopts -a _dopt_ -D -E -- d: ld:
+
+  _displ_name_=$_dopt_[2]
+
+  # Collect all matching completions and their display strings (if any).
+  local -a _Dopt_=()
+  [[ -n $_displ_name_ ]] &&
+      _Dopt_=( -D $_displ_name_ )
+  builtin compadd -O _matches_ $_Dopt_ "$@"
+
+  # If we don't have an array with display strings, then create one.
+  if [[ -z $_displ_name_ ]]; then
+    _displ_name_=_displ_
+    _displ_=( "$_matches_[@]" )
+    _dopt_=( -d $_displ_name_ )
+  fi
+
+  local -Pi _nmatches_per_line_=$(( 1.0 * $#_matches_ / _new_completion_lines_ ))
+
+  # If we need more than one line per match, then make each match fit exactly one line.
+  if (( _nmatches_per_line_ < 1 )); then
+    # WORKAROUND: Zsh mistakenly treats display strings that are exactly $COLUMNS wide as not
+    # fitting on one line.
+    set -A $_displ_name_ ${(@r:COLUMNS-1:)${(PA)_displ_name_}[@]//$'\n'/\n}
+
+    _dopt_=( -ld $_displ_name_ )
+    (( _nmatches_per_line_ = 1 ))
+  fi
+
+  # Need to round this down _before_ subtracting it or it will effectively be rounded up.
+  local -Pi _nmatches_that_fit_=$((
+      ( _unused_lines_ - _new_heading_lines_ ) * _nmatches_per_line_
+  ))
+
+  local -Pi _nmatches_to_remove_=$(( $#_matches_ - max( 0, _nmatches_that_fit_ ) ))
+
+  if (( _nmatches_to_remove_ > 0 )); then
+    # If we're going to remove anything, then we need to make room for the `(MORE)` prompt.
+    (( _nmatches_to_remove_++ ))
+
+    if (( _nmatches_to_remove_ < $#_matches_ )); then
+      shift -p $_nmatches_to_remove_ _matches_ $_displ_name_
+    else
+      set -A _matches_
+      set -A $_displ_name_
+    fi
+    .autocomplete:async:compadd:disable
+  fi
+
+  _autocomplete__compadd_opts_len "$@"
+  builtin compadd "$_dopt_[@]" -a "$@[1,?]" _matches_
+}
+
+.autocomplete:async:compadd:disable() {
+  typeset -g _autocomplete__partial_list=$curtag
+  comptags() { false }  # Stop completion from trying more tags.
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__compinit b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__compinit
new file mode 100644
index 00000000..359e3dd2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__compinit
@@ -0,0 +1,181 @@
+#!/bin/zsh
+zmodload -Fa zsh/files b:zf_rm
+zmodload -F zsh/parameter p:funcstack p:functions
+builtin autoload -Uz is-at-least
+
+typeset -ga _autocomplete__compdef=()
+compdef() {
+  typeset -ga _autocomplete__compdef=( $_autocomplete__compdef[@] "${(j: :)${(@q+)@}}" )
+}
+
+[[ -v functions[_bash_complete] ]] ||
+    _bash_complete compgen complete () {
+      unfunction _bash_complete compgen complete
+      builtin autoload +X -Uz bashcompinit
+      bashcompinit
+      bashcompinit() { : }
+      ${(%):-%N} "$@"
+    }
+
+${0}:precmd() {
+  emulate -L zsh
+  setopt $_autocomplete__func_opts[@]
+
+  [[ -v CDPATH && -z $CDPATH ]] &&
+      unset CDPATH cdpath
+
+  # Decrease Oh My Zsh start-up time. See below.
+  local -Pa omzdump=()
+  [[ -v ZSH_COMPDUMP && -r $ZSH_COMPDUMP ]] &&
+      omzdump=( ${(f)"$( < $ZSH_COMPDUMP )"} )
+
+  typeset -g \
+      _comp_dumpfile=${_comp_dumpfile:-${ZSH_COMPDUMP:-${XDG_CACHE_HOME:-$HOME/.cache}/zsh/compdump}}
+
+  if [[ -v _comps[-command-] && $_comps[-command-] != _autocomplete__command ]]; then
+    zf_rm -f $_comp_dumpfile
+  else
+
+    # Check if our most recently modified completion function is newer than the comp dump file.
+    local -Pa newest=( ~autocomplete/Completions/_*~*.zwc(N-.omY1) )
+    if [[ $newest[1] -nt $_comp_dumpfile ]]; then
+      zf_rm -f $_comp_dumpfile
+    fi
+  fi
+
+  if [[ ! -v _comp_setup ]] || [[ ! -r $_comp_dumpfile ]]; then
+    unfunction compdef compinit 2> /dev/null
+    bindkey() { : }
+    {
+      builtin autoload +X -Uz compinit
+      local -a compargs=()
+      zstyle -a ':autocomplete::compinit' arguments compargs
+      compinit -d "$_comp_dumpfile" "$compargs[@]"
+    } always {
+      unfunction bindkey
+    }
+    bindkey '^Xh' _complete_help
+
+    # Prevent Oh My Zsh from deleting comp dump file.
+    (( ${#omzdump[@]} > 0 )) &&
+      tee -a "$ZSH_COMPDUMP" &> /dev/null <<EOF
+$omzdump[-2]
+$omzdump[-1]
+EOF
+  fi
+
+  compinit() { : }
+
+  local -P args=
+  for args in "$_autocomplete__compdef[@]"; do
+    eval "compdef $args"
+  done
+  unset _autocomplete__compdef
+
+  (
+    local -a reply=()
+    local cache_dir=
+    if builtin zstyle -s ':completion:*' cache-path cache_dir; then
+      local -P src= bin=
+      for src in $cache_dir/*~**.zwc~**/.*(N-.); do
+        bin=$src.zwc
+        if [[ ! -e $bin || $bin -ot $src ]]; then
+          zcompile -Uz $src
+        fi
+      done
+    fi
+  ) &|
+
+  # Workaround: Some other plugins rely on patching _main_complete, which can interfere with our completion.
+  .autocomplete__patch _main_complete
+  autocomplete:_main_complete:new() {
+    local -i _autocomplete__reserved_lines=0
+    local -Pi ret=1
+    unset _autocomplete__partial_list _autocomplete__unambiguous
+
+    compstate[insert]=automenu-unambiguous  # To get `all-expansions` from _expand.
+    compstate[last_prompt]=yes  # Completion doesn't stay on the same command line without this.
+    compstate[list]='list force packed rows' # `_setup` doesn't work well for this.
+    unset 'compstate[vared]'
+
+    local +h -a  compprefuncs=( autocomplete:_main_complete:new:pre  "$compprefuncs[@]" )
+    local +h -a comppostfuncs=( autocomplete:_main_complete:new:post "$comppostfuncs[@]" )
+    autocomplete:_main_complete:old "$@"
+  }
+
+  autocomplete:_main_complete:new:pre() {
+    unsetopt localtraps
+    trap -
+    TRAPINT() {  # ^C
+      zle -M "${(F)funcfiletrace}"
+      zle -R
+      return 130
+    }
+    TRAPQUIT() { # ^\
+      zle -M "${(F)funcfiletrace}"
+      zle -R
+      return 131
+    }
+  }
+
+  autocomplete:_main_complete:new:post() {
+    [[ $WIDGET != _complete_help ]] &&
+        unfunction compadd 2> /dev/null
+    _autocomplete__unambiguous
+    compstate[list_max]=0
+    MENUSCROLL=0
+  }
+
+  .autocomplete__patch _complete
+  _complete() {
+    local -i nmatches=$compstate[nmatches]
+
+    PREFIX=$PREFIX$SUFFIX
+    SUFFIX=
+    autocomplete:_complete:old "$@"
+
+    # WORKAROUND: Some completion functions mistakenly don't return 0 when they have succeeded.
+    (( compstate[nmatches] > nmatches ))
+  }
+
+
+  ##
+  # WORKAROUND: _approximate won't do corrections if there already is a function called 'compadd'.
+  #
+
+  .autocomplete__patch _approximate
+  _approximate() {
+    {
+      [[ -v functions[compadd] ]] &&
+          functions[autocomplete:compadd:old]="$functions[compadd]"
+      functions[compadd]="$functions[autocomplete:approximate:compadd]"
+
+      autocomplete:_approximate:old
+    } always {
+      unfunction compadd 2> /dev/null
+      if [[ -v functions[autocomplete:compadd:old] ]]; then
+        functions[compadd]="$functions[autocomplete:compadd:old]"
+        unfunction autocomplete:compadd:old
+      fi
+    }
+  }
+
+  autocomplete:approximate:compadd() {
+    local ppre="$argv[(I)-p]"
+
+    [[ ${argv[(I)-[a-zA-Z]#U[a-zA-Z]#]} -eq 0 &&
+       "${#:-$PREFIX$SUFFIX}" -le _comp_correct ]] && return
+
+    if [[ "$PREFIX" = \~* && ( ppre -eq 0 || "$argv[ppre+1]" != \~* ) ]]; then
+      PREFIX="~(#a${_comp_correct})${PREFIX[2,-1]}"
+    else
+      PREFIX="(#a${_comp_correct})$PREFIX"
+    fi
+
+    if [[ -v functions[autocomplete:compadd:old] ]]; then
+      autocomplete:compadd:old "$@"
+    else
+      builtin compadd "$@"
+    fi
+  }
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__config b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__config
new file mode 100644
index 00000000..d1d53b97
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__config
@@ -0,0 +1,159 @@
+#!/bin/zsh
+zmodload -Fa zsh/zutil b:zstyle
+
+typeset -g ZLE_REMOVE_SUFFIX_CHARS=$' /;\n\r\t'
+typeset -g ZLE_SPACE_SUFFIX_CHARS='|&<>-+'
+
+builtin zstyle ':completion:*' use-cache yes
+builtin zstyle -e ':completion:*' cache-path autocomplete:config:cache-path
+autocomplete:config:cache-path() {
+  typeset -ga reply=( "${XDG_CACHE_HOME:-$HOME/.cache}/zsh/compcache" )
+}
+
+builtin zstyle ':completion:*' completer \
+    _expand _complete _complete:-fuzzy _correct _approximate _ignored
+
+builtin zstyle -e ':completion:*' max-errors autocomplete:config:max-errors
+autocomplete:config:max-errors() {
+  typeset -ga reply=( $(( min( 2, ( $#PREFIX + $#SUFFIX ) / 3 ) )) )
+}
+
+# Order of matchers matters: m should come before r, which should come before l.
+# Otherwise, the results are not as expected.
+local lower_to_upper='m:{[:lower:]-}={[:upper:]_}'
+local any_before_dot='r:|[.]=**'
+local any_before_any='r:|?=**'
+local nonseparators_after_any_before_separator='r:?||[-_ \]=*'
+local any_before_word='l:|=*'
+local separator_after_any='l:?|=[-_ \]'
+builtin zstyle ':completion:*' matcher-list \
+    "$lower_to_upper $any_before_dot"
+builtin zstyle ':completion:*-fuzzy:*' matcher-list \
+    "$lower_to_upper $any_before_dot $any_before_word" \
+    "+$nonseparators_after_any_before_separator $separator_after_any" \
+    "$lower_to_upper $any_before_any"
+
+local minus_at_beginning_to_plus='b:-=+'
+builtin zstyle ':completion:*:options' matcher $minus_at_beginning_to_plus
+
+builtin zstyle ':completion:*' prefix-needed yes
+builtin zstyle ':completion:*:functions'  ignored-patterns '*.*' '*:*' '+*'
+builtin zstyle ':completion:*:users'      ignored-patterns '_*'
+builtin zstyle ':completion:*:widgets'    ignored-patterns '*.*' '*:*'
+builtin zstyle ':completion:*' single-ignored ''
+
+builtin zstyle ':completion:*:expand-alias:*' complete yes
+
+builtin zstyle ':completion:*:expand:*' tag-order 'expansions all-expansions' -
+builtin zstyle ':completion:*:expand:*' accept-exact continue
+builtin zstyle ':completion:*:expand:*' add-space no
+builtin zstyle ':completion:*:expand:*' glob yes
+builtin zstyle ':completion:*:expand:*' keep-prefix no  # Needed for file type highlighting
+builtin zstyle ':completion:*:expand:*' substitute yes
+builtin zstyle ':completion:*:expand:*' subst-globs-only yes
+
+builtin zstyle -e ':completion:*:-command-:*' tag-order autocomplete:config:tag-order:command
+autocomplete:config:tag-order:command() {
+  if [[ $PREFIX == (|.|*/*) ]]; then
+    typeset -ga reply=( 'suffix-aliases (|*-)directories executables (|*-)files' - )
+  else
+    typeset -ga reply=( 'aliases suffix-aliases functions reserved-words builtins' )
+    if (( path[(I).] )); then
+      reply[1]+=' (|*-)directories executables (|*-)files commands'
+    else
+      reply[1]+=' commands (|*-)directories executables (|*-)files'
+    fi
+  fi
+}
+builtin zstyle ':completion:*:-tilde-:*' tag-order directory-stack named-directories
+
+builtin zstyle ':completion:*:(approximate|correct):*' tag-order '! original' -
+
+# Complete options rather than directory stack. You can get directory stack by typing `~-` (tilde plus dash).
+builtin zstyle ':completion:*:cd:*' complete-options yes
+builtin zstyle ':completion:*:cd:*' tag-order '! directory-stack' -
+
+# Don't show the giant list of history lines.
+builtin zstyle ':completion:*:fc:*' tag-order options -
+
+builtin zstyle -e ':completion:*:git-*:*' tag-order 'autocomplete:config:tag-order:git "$@"'
+autocomplete:config:tag-order:git() {
+  reply=()
+  (( compstate[nmatches] )) &&
+      reply=(
+          '! heads(|-*) *-remote remote-* blob-*'
+          -
+      )
+}
+
+# Complete only the tail of a path.
+builtin zstyle ':completion:*' ignore-parents 'parent pwd directory'
+builtin zstyle ':completion:*:paths' expand suffix
+builtin zstyle ':completion:*:paths' list-suffixes yes
+builtin zstyle ':completion:*:paths' special-dirs no
+
+builtin zstyle ':completion:*'             group-name ''
+builtin zstyle ':completion:*:-command-:*' group-name commands
+builtin zstyle ':completion:*:all-expansions' group-name 'expansion'
+
+builtin zstyle ':completion:*' group-order \
+    expansions all-expansions options \
+    aliases suffix-aliases functions reserved-words builtins commands \
+    remotes hosts recent-branches commits \
+    local-directories directories executables
+
+builtin zstyle    ':completion:*'               file-patterns '*(-/):directories:directory %p(#q^-/):globbed-files'
+builtin zstyle -e ':completion:*:-command-:*'   file-patterns autocomplete:config:file-patterns:command
+autocomplete:config:file-patterns:command() {
+  [[ $PREFIX$SUFFIX != */* ]] &&
+      typeset -ga reply=( '*(-/):directories:directory ./*(-*^/):executables:"executable file"' )
+}
+builtin zstyle    ':completion:*:(.|source):*'  file-patterns \
+    '%p(#q-/):directories:directory %p~*.zwc(-.^*):globbed-files' '%p~*.zwc(-^/):globbed-files'
+
+# Don't combine parameters with same values.
+builtin zstyle ':completion:*:parameters' list-grouped no
+
+builtin zstyle -e ':completion:*:-command-:*'    format autocomplete:config:format command
+builtin zstyle -e ':completion:*:descriptions'   format autocomplete:config:format %d
+builtin zstyle -e ':completion:*:all-expansions' format autocomplete:config:format expansion
+autocomplete:config:format() {
+  reply=( $'%{\e[0;1;2m%}'$1$'%{\e[0m%}' )
+}
+builtin zstyle -e ':completion:*:all-expansions' format autocomplete:config:format expansion
+builtin zstyle -e ':completion:*:expansions'     format autocomplete:config:format '"globbed files"'
+
+builtin zstyle -e ':completion:*:warnings'    format autocomplete:config:format:warnings
+autocomplete:config:format:warnings() {
+  [[ $CURRENT == 1 && -z $PREFIX$SUFFIX ]] ||
+      autocomplete:config:format 'no matching %d completions'
+}
+
+builtin zstyle ':completion:*:messages'       format '%F{9}%d%f'
+builtin zstyle ':completion:*:history-lines'  format ''
+
+builtin zstyle ':completion:*' auto-description '%d'
+builtin zstyle ':completion:*:parameters' extra-verbose yes
+builtin zstyle ':completion:*:default' select-prompt '%F{black}%K{12}line %l %p%f%k'
+
+builtin zstyle ':completion:*' insert-sections yes
+builtin zstyle ':completion:*' separate-sections yes
+
+# Needed for _gnu_generic to prevent descriptions from getting cropped.
+is-at-least 5.9 ||
+    builtin zstyle ':completion:*' command '- COLUMNS=999'
+
+${0}:precmd() {
+  typeset -g _comp_setup="$_comp_setup"';
+      [[ $_comp_caller_options[globdots] == yes ]] && setopt globdots'
+
+  # Remove incompatible settings.
+  local -P key= setting=
+  for key in menu list-prompt; do
+    for setting in ${(f)"$( zstyle -L '*' $key )"}; do
+      eval "${setting/zstyle(| -e)/zstyle -d}"
+    done
+  done
+  builtin zstyle ':completion:*:*:*:*:default' menu no no-select
+  unset LISTPROMPT
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__key-bindings b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__key-bindings
new file mode 100644
index 00000000..117801a3
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__key-bindings
@@ -0,0 +1,64 @@
+#!/bin/zsh
+zmodload zsh/complist
+zmodload -F zsh/terminfo p:terminfo
+
+local -Pa prefix=( '\e'{\[,O} )
+local -Pa key_up=(   ${^prefix}A )
+local -Pa key_down=( ${^prefix}B )
+local -Pa key_alt_up=(   '\e'$^key_up   '\e[1;3A' )
+local -Pa key_alt_down=( '\e'$^key_down '\e[1;3B' )
+
+local -A main=() emacs=() vicmd=() menukeys=()
+
+${0}:bind() {
+  local -P key= widget=$1 menuwidget=$2
+
+     emacs[$3]=$widget
+  menukeys[$3]=$menuwidget
+
+  vicmd[$4]=$widget
+  key="^[$4"
+  menukeys[$key]=$menuwidget
+
+  shift 4
+  for key; do
+        main[$key]=$widget
+    menukeys[$key]=$menuwidget
+  done
+}
+
+${0}:bind   up-line-or-search   up-history '^P' 'k' $key_up[@]
+${0}:bind down-line-or-select down-history '^N' 'j' $key_down[@]
+
+${0}:bind history-search-backward vi-backward-blank-word '\ep' '^P' $key_alt_up[@]
+${0}:bind menu-select             vi-forward-blank-word  '\en' '^N' $key_alt_down[@]
+
+${0}:bind history-incremental-search-backward history-incremental-search-backward '^R' '/'
+${0}:bind                         menu-search history-incremental-search-forward  '^S' '?'
+
+#local backtab=$terminfo[kcbt]
+
+menukeys+=(
+                '\t' menu-complete
+#          "$backtab" reverse-menu-complete
+                '^@' accept-and-hold
+               '^[v' accept-and-hold
+                '^_' undo
+               '^[u' undo
+    "$terminfo[kpp]" backward-word
+    "$terminfo[knp]"  forward-word
+)
+main+=(
+          '\t' complete-word
+#    "$backtab" expand-word
+)
+emacs+=(
+    '^X/' recent-paths
+)
+
+bindkey -M       main "${(kv@)main}"
+bindkey -M      emacs "${(kv@)emacs}"
+bindkey -M      vicmd "${(kv@)vicmd}"
+bindkey -M menuselect "${(kv@)menukeys}"
+
+unfunction ${0}:bind
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__main b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__main
new file mode 100644
index 00000000..3a97a4d6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__main
@@ -0,0 +1,94 @@
+#!/bin/zsh
+zmodload -Fa zsh/files b:zf_mkdir b:zf_rm
+zmodload -F zsh/parameter p:functions
+zmodload -F zsh/system p:sysparams
+zmodload -F zsh/zleparameter p:widgets
+zmodload -Fa zsh/zutil b:zstyle
+builtin autoload +X -Uz add-zsh-hook zmathfunc
+zmathfunc
+
+typeset -ga _autocomplete__ctxt_opts=( completealiases completeinword )
+
+typeset -ga _autocomplete__mods=( compinit config widgets key-bindings recent-dirs async )
+
+typeset -gU FPATH fpath=( ~autocomplete/Completions $fpath[@] )
+
+local -P xdg_data_home=${XDG_DATA_HOME:-$HOME/.local/share}
+
+local -P zsh_data_dir=$xdg_data_home/zsh
+[[ -d $zsh_data_dir ]] ||
+    zf_mkdir -pm 0700 $zsh_data_dir
+
+local -P old_logdir=$xdg_data_home/zsh-autocomplete/log
+[[ -d $old_logdir ]] &&
+    zf_rm -fr -- $old_logdir
+
+local -P logdir=${XDG_STATE_HOME:-$HOME/.local/state}/zsh-autocomplete/log
+
+local -P bug=
+for bug in ${logdir} ${logdir:h}; do
+  [[ -d $bug ]] ||
+      zf_rm -f $bug
+done
+
+zf_mkdir -p -- $logdir
+hash -d autocomplete-log=$logdir
+
+local -Pa older_than_a_week=( $logdir/*(Nmd+7) )
+(( $#older_than_a_week[@] )) &&
+    zf_rm -f -- $older_than_a_week[@]
+
+typeset -g _autocomplete__log=${logdir}/${(%):-%D{%F}}.log
+typeset -g _autocomplete__ps4=$'%D{%T.%.} %e:%N:%I\t%? %(1_,%_ ,)'
+
+local -P zsh_cache_dir=${XDG_CACHE_HOME:-$HOME/.cache}/zsh
+[[ -d $zsh_cache_dir ]] ||
+    zf_mkdir -pm 0700 $zsh_cache_dir
+
+local -P mod=
+for mod in $_autocomplete__mods; do
+  builtin zstyle -T ":autocomplete:$mod" enabled &&
+      .autocomplete__$mod "$@"
+  unfunction .autocomplete__$mod
+done
+
+add-zsh-hook precmd ${0}:precmd
+
+# Make sure we always run before Autosuggest, so we don't overwrite its default ignore list.
+typeset -gaU precmd_functions=( ${0}:precmd $precmd_functions )
+
+${0}:precmd() {
+  # WORKAROUND: For hook functions in Zsh 5.8, $0 can be something else than the function name.
+  0=${(%):-%N}
+
+  add-zsh-hook -d precmd $0
+  unfunction $0
+
+  () {
+    emulate -L zsh
+    setopt $_autocomplete__func_opts[@]
+
+    # Workaround for https://www.zsh.org/mla/workers/2021/msg01310.html
+    if builtin zstyle -L zle-hook types > /dev/null; then
+      local -P hook=
+      for hook in \
+          zle-{isearch-{exit,update},line-{pre-redraw,init,finish},history-line-set,keymap-select}
+      do
+        [[ -v widgets[$hook] &&
+              $widgets[$hook] == user:_zsh_highlight_widget_orig-s*-r<->-$hook ]] &&
+            builtin zle -N $hook azhw:$hook
+      done
+    fi
+  }
+
+  local -P mod=
+  for mod in $_autocomplete__mods; do
+    mod=.autocomplete__${mod}:precmd
+    if [[ -v functions[$mod] ]]; then
+      $mod
+      unfunction $mod
+    fi
+  done
+
+  true
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__recent-dirs b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__recent-dirs
new file mode 100644
index 00000000..07b12324
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__recent-dirs
@@ -0,0 +1,40 @@
+#!/bin/zsh
+zmodload -Fa zsh/files b:zf_mv b:zf_mkdir
+zmodload -F zsh/parameter p:commands p:dirstack p:functions
+
+${0}:precmd() {
+  [[ -v functions[+autocomplete:recent-directories] ]] &&
+      return
+
+  setopt autopushd pushdignoredups  # Set *global* shell options.
+  builtin autoload -RUz chpwd_recent_filehandler
+
+  local __=''
+  builtin zstyle -s :chpwd: recent-dirs-file __ ||
+      builtin zstyle ':chpwd:*' recent-dirs-file ${XDG_DATA_HOME:-$HOME/.local/share}/zsh/chpwd-recent-dirs
+  builtin zstyle -s :chpwd: recent-dirs-max __ ||
+      builtin zstyle ':chpwd:*' recent-dirs-max 0
+
+  if ! (( $#dirstack[@] )); then
+    local -aU reply=()
+    chpwd_recent_filehandler
+    dirstack=( ${^reply[@]:#$PWD}(N-/) )
+  fi
+
+  +autocomplete:recent-directories:save() {
+    chpwd_recent_filehandler $PWD $dirstack[@]
+  }
+  add-zsh-hook chpwd +autocomplete:recent-directories:save
+
+  +autocomplete:recent-directories() {
+    typeset -ga reply
+
+    # Don't complete /, ~, $PWD or its children, or nonexistent dirs.
+    reply=( ${^dirstack[@]:#([/~]|$PWD(|/[^/]#))}(N) )
+
+    [[ -n $1 ]] &&
+        reply=( ${(M)reply:#(#l)*${(~j:*:)${(s::)1}}*} )
+
+    (( $#reply[@] ))
+  }
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__widgets b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__widgets
new file mode 100644
index 00000000..dd75b253
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Init/.autocomplete__widgets
@@ -0,0 +1,46 @@
+#!/bin/zsh
+zmodload zsh/complist
+typeset -ga _autocomplete__suggest_ignore_widgets=()
+typeset -g ZSH_AUTOSUGGEST_MANUAL_REBIND=1
+typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=.autosuggest-orig-
+
+${0}:c() {
+  _autocomplete__suggest_ignore_widgets+=( $1 )
+  builtin zle -C "$1" "$2" .autocomplete__${3}__completion-widget
+}
+
+${0}:z() {
+  builtin zle -N "$1" .autocomplete__${2}__zle-widget
+}
+
+${0}:z   up-line-or-search{,}
+${0}:z down-line-or-select{,}
+${0}:z history-search{-backward,}
+
+${0}:precmd() {
+  emulate -L zsh
+  setopt $_autocomplete__func_opts[@]
+
+  0=${0%:*}
+
+  # Create all completion widgets here, to avoid getting them wrapped by
+  # Autosuggest or Syntax Highlighting.
+
+  local -P tab_style=
+  for tab_style in complete-word menu-complete menu-select; do
+    ${0}:c "$tab_style" "$tab_style" complete-word
+  done
+  ${0}:c {,}reverse-menu-complete            complete-word
+  ${0}:c insert-unambiguous-or-complete   {,}complete-word
+  ${0}:c menu-search             menu-select complete-word
+  ${0}:c history-search-backward menu-select history-search
+
+  # Autosuggestions otherwise makes $WIDGETSTYLE disappear
+  [[ -v ZSH_AUTOSUGGEST_IGNORE_WIDGETS ]] &&
+      ZSH_AUTOSUGGEST_IGNORE_WIDGETS+=(
+          $_autocomplete__suggest_ignore_widgets
+      )
+
+  unset _autocomplete__suggest_ignore_widgets
+  unfunction ${0}:{c,z}
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Util/.autocomplete__patch b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Util/.autocomplete__patch
new file mode 100644
index 00000000..e5874bac
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Util/.autocomplete__patch
@@ -0,0 +1,8 @@
+#!/bin/zsh
+zmodload -F zsh/parameter p:functions
+
+functions[autocomplete:${1}:old]="$(
+    unfunction $1 2> /dev/null
+    builtin autoload +X -Uz $1
+    print -r -- "$functions[$1]"
+)"
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Util/.autocomplete__zle-flags b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Util/.autocomplete__zle-flags
new file mode 100644
index 00000000..41ef2f4d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Util/.autocomplete__zle-flags
@@ -0,0 +1,27 @@
+#!/bin/zsh
+emulate -L zsh
+setopt $_autocomplete__func_opts[@]
+
+typeset -g _autocomplete__last_cutbuffer
+typeset -g _autocomplete__zle_flags=
+{
+  if (( YANK_ACTIVE )); then
+    _autocomplete__zle_flags=yank
+    (( YANK_END <= CURSOR )) &&
+        _autocomplete__zle_flags+=before
+
+    return 1  # Tell caller to abort.
+  fi
+
+  [[ $_autocomplete__last_cutbuffer != $CUTBUFFER ]] &&
+      _autocomplete__zle_flags=kill
+
+  return 0
+
+} always {
+  [[ -n $_autocomplete__zle_flags ]] &&
+      builtin zle -f $_autocomplete__zle_flags
+  typeset -g _autocomplete__last_cutbuffer=$CUTBUFFER
+}
+
+return 0
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__complete-word__completion-widget b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__complete-word__completion-widget
new file mode 100644
index 00000000..a81c3bc4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__complete-word__completion-widget
@@ -0,0 +1,25 @@
+#!/bin/zsh
+setopt localoptions banghist
+zmodload -F zsh/terminfo p:terminfo
+
+local context=${curcontext:-${WIDGET}:::}
+unset curcontext
+local +h curcontext=$context
+
+local +h -a comppostfuncs=( .autocomplete__complete-word__post "$comppostfuncs[@]" )
+
+if [[ -z $compstate[old_list] && $curcontext == history-incremental-search* ]]; then
+  autocomplete:_main_complete:new - history-lines _autocomplete__history_lines
+elif [[ -z $compstate[old_list] && $curcontext == recent-paths:* ]]; then
+  autocomplete:_main_complete:new - recent-paths _autocomplete__recent_paths
+elif [[ -z $compstate[old_list] ]] ||
+    [[ -v _autocomplete__partial_list && $WIDGETSTYLE == (|*-)(list|menu)(|-*) ]] ||
+    _autocomplete__should_insert_unambiguous; then
+  compstate[old_list]=
+  autocomplete:_main_complete:new
+else
+  compstate[old_list]=keep
+  autocomplete:_main_complete:new -
+fi
+
+[[ $_lastcomp[nmatches] -gt 0 && -n $compstate[insert] ]]
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__complete-word__post b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__complete-word__post
new file mode 100644
index 00000000..1557c97f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__complete-word__post
@@ -0,0 +1,65 @@
+#autoload
+
+local -a match=() mbegin=() mend=()  # `zstyle` for some reason assigns these.
+
+unset MENUMODE MENUSELECT
+
+if [[ $WIDGETSTYLE != (|*-)menu(|-*) ]]; then
+  compstate[list]=
+  zle -Rc
+fi
+
+if [[ $_completer == _prefix ]]; then
+  compstate[to_end]=
+else
+  compstate[to_end]='always'
+fi
+
+{
+  compstate[insert]=
+
+  if _autocomplete__should_insert_unambiguous; then
+    if [[ $WIDGETSTYLE == (|*-)menu(|-*) ]]; then
+      compstate[insert]='automenu-'
+    fi
+    compstate[insert]+='unambiguous'
+    unset _autocomplete__unambiguous
+
+    return
+  fi
+
+  if [[ $WIDGETSTYLE == (|*-)menu(|-*) ]]; then
+    if [[ $WIDGETSTYLE == (|*-)select(|-*) ]]; then
+      typeset -gi MENUSELECT=0
+      if [[ $WIDGET == (|*-)search(|-*) ]]; then
+          typeset -g MENUMODE=search-forward
+      fi
+    fi
+    compstate[insert]='menu:'
+  fi
+  if [[ $WIDGET == (|.)reverse-* || $WIDGETSTYLE == (|.)reverse-menu-complete ]]; then
+    compstate[insert]+='0'
+  else
+    compstate[insert]+='1'
+  fi
+
+  local -Pa comptags=()
+  if [[ $compstate[old_list] == keep ]]; then
+    comptags=( $=_lastcomp[tags] )
+  else
+    comptags=( $=_comp_tags )
+  fi
+
+  local -a spacetags=()
+  builtin zstyle -a ":autocomplete:$WIDGET:" add-space spacetags ||
+    spacetags=( executables aliases functions builtins reserved-words commands )
+
+  [[ -n ${comptags:*spacetags} ]] &&
+      compstate[insert]+=' '
+
+} always {
+  unset _autocomplete__inserted
+  [[ -n $compstate[insert] ]] &&
+      typeset -g _autocomplete__inserted
+
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__down-line-or-select__zle-widget b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__down-line-or-select__zle-widget
new file mode 100644
index 00000000..a0c603b3
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__down-line-or-select__zle-widget
@@ -0,0 +1,7 @@
+#!/bin/zsh
+
+if [[ $RBUFFER == *$'\n'* ]]; then
+  builtin zle down-line
+else
+  builtin zle menu-select -w
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__history-search__completion-widget b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__history-search__completion-widget
new file mode 100644
index 00000000..6924a0d4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__history-search__completion-widget
@@ -0,0 +1,22 @@
+#!/bin/zsh
+local 0=${(%):-%N}
+
+${0}() {
+  typeset -g curcontext=${WIDGET}:::
+  local +h -a comppostfuncs=( ${(%):-%N}:post "$comppostfuncs[@]" )
+  compstate[old_list]=
+  autocomplete:_main_complete:new - history-lines _autocomplete__history_lines
+
+  unset curcontext
+  (( _lastcomp[nmatches] ))
+}
+
+${0}:post() {
+  typeset -gi MENUSELECT=0
+  compstate[insert]='menu:0'
+  if (( compstate[nmatches] < 2 )); then
+    compstate[list]=
+  fi
+}
+
+${0} "$@"
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__up-line-or-search__zle-widget b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__up-line-or-search__zle-widget
new file mode 100644
index 00000000..a2b003b5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Functions/Widgets/.autocomplete__up-line-or-search__zle-widget
@@ -0,0 +1,7 @@
+#!/bin/zsh
+
+if [[ $LBUFFER == *$'\n'* ]]; then
+  builtin zle up-line
+else
+  builtin zle history-search-backward -w
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/LICENSE b/gentoo/dotfiles/.zsh/zsh-autocomplete/LICENSE
new file mode 100644
index 00000000..ac572f36
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/LICENSE
@@ -0,0 +1,19 @@
+Copyright (c) 2020-2025 Marlon Richert
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/README.md b/gentoo/dotfiles/.zsh/zsh-autocomplete/README.md
new file mode 100644
index 00000000..91d38f55
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/README.md
@@ -0,0 +1,347 @@
+# Autocomplete for Zsh
+This plugin for Zsh adds real-time type-ahead autocompletion to your command line, similar to what
+you find in desktop apps. While you type on the command line, available completions are listed
+automatically; no need to press any keyboard shortcuts. Press <kbd>Tab</kbd> to insert the top
+completion or <kbd>↓</kbd> to select a different one.
+
+Additional features:
+* Out-of-the-box configuration of Zsh's completion system
+* Multi-line history search
+* Completion of recent directories
+* Useful [keyboard shortcuts](#keyboard-shortcuts)
+* Easy to [configure](#configuration)
+
+> Enjoy using this software? [Become a sponsor!](https://github.com/sponsors/marlonrichert) 💝
+
+## Requirements
+Recommended:
+* Tested to work with [Zsh](http://zsh.sourceforge.net) 5.8 and newer.
+
+Minimum:
+* Should theoretically work with Zsh 5.4, but I'm unable to test that.
+
+## Installation & setup
+> Note: In this manual, `%` represents the command line prompt. If you see it in front of a command,
+> it means you should run it on the command line, not put it in a script.
+
+First, install Autocomplete itself. Here are some way to do so:
+  * To use only releases (instead of the `main` branch), install `zsh-autocomplete` with a package
+    manager. As of this writing, this package is available through Homebrew, Nix, `pacman`, Plumage,
+    and (as `app-shells/zsh-autocomplete`) Portage.
+  * To always use the latest commit on the `main` branch, do one of the following:
+    * Use `pacman` to install `zsh-autocomplete-git`.
+    * Use a Zsh plugin manager to install `marlonrichert/zsh-autocomplete`. (If you don't have a
+      plugin manager yet, I recommend using [Znap](https://github.com/marlonrichert/zsh-snap).)
+    * Clone the repo directly:
+      ```sh
+      % git clone --depth 1 -- https://github.com/marlonrichert/zsh-autocomplete.git
+      ```
+
+After installing, make the following modifications to your shell config:
+* In your `.zshrc` file:
+  * Remove any calls to `compinit`.
+  * Add near the top, _before_ any calls to `compdef`:
+     ```sh
+     source /path/to/zsh-autocomplete/zsh-autocomplete.plugin.zsh
+     ```
+* When using **Ubuntu,** add to your `.zshenv` file:
+  ```sh
+  skip_global_compinit=1
+  ```
+* When using **Nix,** add to your `home.nix` file:
+  ```
+  programs.zsh.enableCompletion = false;
+  ```
+
+Finally, restart your shell. Here's two ways to do so:
+* Open a new tab or window in your terminal.
+* Replace the current shell with a new one:
+  ```sh
+  % exec zsh
+  ```
+
+### Updating
+If you installed manually, run:
+```sh
+% git -C ~autocomplete pull
+```
+Otherwise, simply use your package manager or plugin manager's update mechanisms.
+
+### Uninstalling
+ 1. Revert the actions you took to [install](#installation).
+ 1. Restart your shell.
+
+## Keyboard shortcuts
+| `main` | `emacs` | `vicmd` | On the command line | In the menus
+| ---: | ---: | ---: | :--- | :---
+| <kbd>Enter</kbd><br><kbd>Return</kbd> | | | | Exit menu text search or exit  menu
+| <kbd>Tab</kbd> | | | Insert first listed menu item | Next completion
+| <kbd>Shift</kbd><kbd>Tab</kbd> | | | Expand the current word | Previous completion
+| <kbd>↓</kbd> | <kbd>Ctrl</kbd><kbd>N</kbd> | <kbd>J</kbd> | Cursor down or enter completion menu | Change selection
+| <kbd>↑</kbd> | <kbd>Ctrl</kbd><kbd>P</kbd> | <kbd>K</kbd> | Cursor up or enter [history menu](#history-menu) | Change selection
+| <kbd>Alt</kbd><kbd>↓</kbd> | <kbd>Alt</kbd><kbd>N</kbd> | <kbd>Ctrl</kbd><kbd>N</kbd> | Enter completion menu | Next section
+| <kbd>Alt</kbd><kbd>↑</kbd> | <kbd>Alt</kbd><kbd>P</kbd> | <kbd>Ctrl</kbd><kbd>P</kbd> | Enter history menu | Previous section
+| <kbd>PgDn</kbd> | | | | Page down
+| <kbd>PgUp</kbd> | | | | Page up
+| | <kbd>Ctrl</kbd><kbd>X</kbd> <kbd>/</kbd> | | Toggle recent path search |
+| | <kbd>Ctrl</kbd><kbd>R</kbd> | <kbd>/</kbd> | Toggle history search | Start menu text search or go to previous match
+| | <kbd>Ctrl</kbd><kbd>S</kbd> | <kbd>?</kbd> | Start menu text search | Start menu text search or go to next match
+| | <kbd>Ctrl</kbd><kbd>Space</kbd> | <kbd>V</kbd> | Toggle selection mode | Add another item
+| | <kbd>Ctrl</kbd><kbd>-</kbd><br><kbd>Ctrl</kbd><kbd>/</kbd> | <kbd>U</kbd> | | Undo last item
+| | <kbd>Ctrl</kbd><kbd>G</kbd> | | | Undo all added items
+
+### Caveats
+* `main` is whichever keymap was aliased to `main` when Autocomplete was sourced.
+  * By default, this is `emacs`.
+  * If you run `bindkey -v` _before_ sourcing Autocomplete, then `main` will be `viins` when
+     Autocomplete installs keybindings.
+* Plugins or other scripts that you load _after_ loading Autocomplete may override these bindings.
+  If you find that some shortcuts don't work as expected, then you can fix them by
+  * changing the order in which you source your plugins or by
+  * running [`bindkey` commands](#reassign-keys) in your dotfiles _after_ you source your plugins.
+* Depending on your terminal, not all keybindings might be available to you.
+* Instead of <kbd>Alt</kbd>, your terminal might require you to press <kbd>Escape</kbd>,
+  <kbd>Option</kbd> or <kbd>Meta</kbd>.
+* In the menus, the bindings listed under `vicmd` require you to press <kbd>Alt</kbd> for each,
+  instead of just once.
+* The bindings listed under `emacs` and `vicmd` are always both active in the menus, no matter which
+  keymap you actually use. This is a limitation of Zsh.
+* What any other keys do while you're in a menu depends on the keymap from which you opened the
+  menu. See the Zsh manual section on [menu
+  selection](https://zsh.sourceforge.io/Doc/Release/Zsh-Modules.html#Menu-selection) for more info.
+
+## Configuration
+The following are the most commonly requested ways to configure Autocomplete's behavior. To use any
+of these, add the code shown to your `.zshrc` file and modify it there, then restart you shell.
+
+### Reassign keys
+You can use [Zsh's `bindkey`
+command](https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Zle-Builtins), _after_ loading
+Autocomplete, to customize your keybindings. Below are some examples of what you can do with this.
+
+#### Make <kbd>Tab</kbd> and <kbd>Shift</kbd><kbd>Tab</kbd> cycle completions on the command line
+This makes <kbd>Tab</kbd> and <kbd>Shift</kbd><kbd>Tab</kbd>, when pressed on the command line,
+cycle through listed completions, without changing what's listed in the menu:
+```sh
+bindkey              '^I'         menu-complete
+bindkey "$terminfo[kcbt]" reverse-menu-complete
+```
+
+#### Make <kbd>Tab</kbd> and <kbd>Shift</kbd><kbd>Tab</kbd> go to the menu
+This makes <kbd>Tab</kbd> and <kbd>Shift</kbd><kbd>Tab</kbd>, when pressed on the command line,
+enter the menu instead of inserting a completion:
+```sh
+bindkey              '^I' menu-select
+bindkey "$terminfo[kcbt]" menu-select
+```
+
+#### Make <kbd>Tab</kbd> and <kbd>Shift</kbd><kbd>Tab</kbd> change the selection in the menu
+This makes <kbd>Tab</kbd> and <kbd>Shift</kbd><kbd>Tab</kbd> move the selection in the menu right
+and left, respectively, instead of exiting the menu:
+```sh
+bindkey -M menuselect              '^I'         menu-complete
+bindkey -M menuselect "$terminfo[kcbt]" reverse-menu-complete
+```
+
+#### Make <kbd>←</kbd> and <kbd>→</kbd> always move the cursor on the command line
+This makes <kbd>←</kbd> and <kbd>→</kbd> always move the cursor on the command line, even when you
+are in the menu:
+```sh
+bindkey -M menuselect  '^[[D' .backward-char  '^[OD' .backward-char
+bindkey -M menuselect  '^[[C'  .forward-char  '^[OC'  .forward-char
+```
+
+#### Make <kbd>Enter</kbd> always submit the command line
+This makes <kbd>Enter</kbd> always submit the command line, even when you are in the menu:
+```sh
+bindkey -M menuselect '^M' .accept-line
+```
+
+#### Restore Zsh-default history shortcuts
+This restores the default Zsh keybindings for history control:
+```sh
+bindkey -M emacs \
+    "^[p"   .history-search-backward \
+    "^[n"   .history-search-forward \
+    "^P"    .up-line-or-history \
+    "^[OA"  .up-line-or-history \
+    "^[[A"  .up-line-or-history \
+    "^N"    .down-line-or-history \
+    "^[OB"  .down-line-or-history \
+    "^[[B"  .down-line-or-history \
+    "^R"    .history-incremental-search-backward \
+    "^S"    .history-incremental-search-forward \
+    #
+bindkey -a \
+    "^P"    .up-history \
+    "^N"    .down-history \
+    "k"     .up-line-or-history \
+    "^[OA"  .up-line-or-history \
+    "^[[A"  .up-line-or-history \
+    "j"     .down-line-or-history \
+    "^[OB"  .down-line-or-history \
+    "^[[B"  .down-line-or-history \
+    "/"     .vi-history-search-backward \
+    "?"     .vi-history-search-forward \
+    #
+```
+
+### Pass arguments to `compinit`
+If necessary, you can let Autocomplete pass arguments to `compinit` as follows:
+```sh
+zstyle '*:compinit' arguments -D -i -u -C -w
+```
+
+### First insert the common substring
+You can make any completion widget first insert the longest sequence of characters
+that will complete to all completions shown, if any, before inserting actual completions:
+```zsh
+# all Tab widgets
+zstyle ':autocomplete:*complete*:*' insert-unambiguous yes
+
+# all history widgets
+zstyle ':autocomplete:*history*:*' insert-unambiguous yes
+
+# ^S
+zstyle ':autocomplete:menu-search:*' insert-unambiguous yes
+```
+
+#### Insert prefix instead of substring
+When using the above, if you want each widget to first try to insert only the longest _prefix_ that
+will complete to all completions shown, if any, then add the following:
+```zsh
+zstyle ':completion:*:*' matcher-list 'm:{[:lower:]-}={[:upper:]_}' '+r:|[.]=**'
+```
+Note, though, that this will also slightly change what completions are listed initially. This is a
+limitation of the underlying implementation in Zsh.
+
+### Customize common substring message
+You can customize the way the common substring is presented. The following sets the presentation to
+the default:
+```zsh
+builtin zstyle ':autocomplete:*:unambiguous' format \
+    $'%{\e[0;2m%}%Bcommon substring:%b %0F%11K%d%f%k'
+```
+`%d` will be replaced with the common substring. Additionally, the following [Zsh prompt escape
+sequences](https://zsh.sourceforge.io/Doc/Release/Prompt-Expansion.html#Visual-effects) are
+supported for adding visual effects:
+* `%B`: bold
+* `%F`: foreground color
+* `%K`: background color
+* `%S`: `terminfo` "standout"
+* `%U`: underline
+* `%{...%}`: arbitrary [ANSI escape
+   sequence](https://en.wikipedia.org/wiki/ANSI_escape_code#Select_Graphic_Rendition_parameters)
+
+### Make <kbd>Enter</kbd> submit the command line straight from the menu
+By default, pressing <kbd>Enter</kbd> in the menu search exits the search and
+pressing it otherwise in the menu exits the menu.  If you instead want to make
+<kbd>Enter</kbd> _always_ submit the command line, use the following:
+```zsh
+bindkey -M menuselect '\r' .accept-line
+```
+
+### Add or don't add a space after certain completions
+When inserting a completion, a space is added after certain types of
+completions.  The default list is as follows:
+```zsh
+zstyle ':autocomplete:*' add-space \
+    executables aliases functions builtins reserved-words commands
+```
+Modifying this list will change when a space is inserted.  If you change the
+list to `'*'`, a space is always inserted.  If you put no elements in the list,
+then a space is never inserted.
+
+### Start each command line in history search mode
+This will make Autocomplete behave as if you pressed <kbd>Ctrl</kbd><kbd>R</kbd> at the start of
+each new command line:
+```zsh
+zstyle ':autocomplete:*' default-context history-incremental-search-backward
+```
+
+### Wait with autocompletion until typing stops for a certain amount of seconds
+Normally, Autocomplete fetches completions after you stop typing for about 0.05 seconds. You can
+change this as follows:
+```zsh
+zstyle ':autocomplete:*' delay 0.1  # seconds (float)
+```
+
+### Wait longer before timing out autocompletion
+Slow autocompletion can make the command line hang. Therefore, by default, Autocomplete waits at
+most 1 second for completion to finish. You can change this value as follows:
+```zsh
+zstyle ':autocomplete:*' timeout 2.0  # seconds (float)
+```
+Note, though, that increasing this value can make your command line feel less responsive.
+
+### Wait for a minimum amount of input
+To suppress autocompletion until a minimum number of characters have been typed:
+```zsh
+zstyle ':autocomplete:*' min-input 3
+```
+
+### Don't show completions if the current word matches a pattern
+For example, this will stop completions from showing whenever the current word consists of two or
+more dots:
+```zsh
+zstyle ':autocomplete:*' ignored-input '..##'
+```
+
+## Change the max number of lines shown
+By default, Autocomplete lets the history menu fill half of the screen, and limits all real-time
+listings to a maximum of 16 lines. You can change these limits as follows:
+
+```zsh
+# Note: -e lets you specify a dynamically generated value.
+
+# Override default for all listings
+# $LINES is the number of lines that fit on screen.
+zstyle -e ':autocomplete:*:*' list-lines 'reply=( $(( LINES / 3 )) )'
+
+# Override for recent path search only
+zstyle ':autocomplete:recent-paths:*' list-lines 10
+
+# Override for history search only
+zstyle ':autocomplete:history-incremental-search-backward:*' list-lines 8
+
+# Override for history menu only
+zstyle ':autocomplete:history-search-backward:*' list-lines 2000
+```
+
+Note that for all real-time listings, the maximum number of lines is additionally capped to the
+number of lines that fit on screen. However, there is no such limit for the history menu. If that
+generates more lines than fit on screen, you can simply use <kbd>PgUp</kbd> and <kbd>PgDn</kbd> to
+scroll through the excess lines. (Note: On some terminals, you have to additionally hold
+<kbd>Shift</kbd> or, otherwise, it will scroll the terminal buffer instead.)
+
+### Use a custom backend for recent directories
+Autocomplete comes with its own backend for keeping track of and listing recent directories (which
+uses part of
+[`cdr`](https://zsh.sourceforge.io/Doc/Release/User-Contributions.html#Recent-Directories) under the
+hood). However, you can override this and supply Autocomplete with recent directories from any
+source that you like. To do so, define a function like this:
+
+```sh
++autocomplete:recent-directories() {
+  <code>
+  typeset -ga reply=( <any number of absolute paths> )
+}
+```
+
+#### Add a backend for recent files
+Out of the box, Autocomplete doesn't track or offer recent files. However, it will do so if you add
+a backend for it:
+
+```sh
++autocomplete:recent-files() {
+  <code>
+  typeset -ga reply=( <any number of absolute paths> )
+}
+```
+
+## Troubleshooting
+Try the steps in the
+[bug report template](.github/ISSUE_TEMPLATE/bug-report.md).
+
+## Author & License
+See the [LICENSE](LICENSE) file for details.
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Tests/__init__.zsh b/gentoo/dotfiles/.zsh/zsh-autocomplete/Tests/__init__.zsh
new file mode 100644
index 00000000..50c73b00
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Tests/__init__.zsh
@@ -0,0 +1,4 @@
+setopt localoptions extendedglob clobber NO_aliases localloops pipefail NO_shortloops NO_unset
+zmodload zsh/param/private
+autoload -Uz zmathfunc && zmathfunc
+builtin autoload -UWz $PWD/{Completions,Functions}/**/[_.]autocomplete(__|:)*~*.zwc(DN-.:P)
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/Tests/complete-word.post.md b/gentoo/dotfiles/.zsh/zsh-autocomplete/Tests/complete-word.post.md
new file mode 100644
index 00000000..ead426e4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/Tests/complete-word.post.md
@@ -0,0 +1,106 @@
+Setup:
+```zsh
+% source Tests/__init__.zsh
+% typeset -gA compstate=() _lastcomp=()
+% typeset -ga comptags=()
+% typeset -g curcontext=
+% zstyle ':autocomplete:*' add-space 'FOO' 'BAR'
+% zstyle ':autocomplete:*' insert-unambiguous yes
+%
+```
+
+If there is a common substring, insert it (if enabled).
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]=
+% compstate[nmatches]=0 _lastcomp[nmatches]=1
+% WIDGETSTYLE= WIDGET=
+% _autocomplete__unambiguous=FOO
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]} $+MENUSELECT $MENUMODE
+unambiguous 0
+%
+```
+
+When using a menu widget, add automenu.
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]=
+% compstate[nmatches]=0 _lastcomp[nmatches]=1
+% WIDGETSTYLE=menu-select WIDGET=
+% _autocomplete__unambiguous=FOO
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]} $+MENUSELECT $MENUMODE
+automenu-unambiguous 0
+%
+```
+
+Default inserts first match.
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]=
+% compstate[nmatches]=0 _lastcomp[nmatches]=2
+% WIDGETSTYLE= WIDGET=
+% _autocomplete__unambiguous=
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]}
+1
+%
+```
+
+Add a space for certain tags.
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]='BAR BAZ'
+% compstate[nmatches]=0 _lastcomp[nmatches]=1
+% WIDGETSTYLE= WIDGET=
+% _autocomplete__unambiguous=
+% comptags=( BAR ) .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]}
+'1 '
+%
+```
+
+`menu-` widgets insert `menu:`.
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]='BAR BAZ'
+% compstate[nmatches]=0 _lastcomp[nmatches]=2
+% WIDGETSTYLE=menu-complete WIDGET=
+% _autocomplete__unambiguous=
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]} $+MENUSELECT $MENUMODE
+'menu:1 ' 0
+%
+```
+
+`menu-select` widgets add `MENUSELECT`
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]='BAR BAZ'
+% compstate[nmatches]=0 _lastcomp[nmatches]=2
+% WIDGETSTYLE=menu-select WIDGET=
+% _autocomplete__unambiguous=
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]} $+MENUSELECT $MENUMODE
+'menu:1 ' 1
+%
+```
+
+`menu-select` widgets with `search` in name add `MENUMODE=search-forward`.
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]='BAR BAZ'
+% compstate[nmatches]=0 _lastcomp[nmatches]=2
+% WIDGETSTYLE=menu-select WIDGET=incremental-history-search-forward
+% _autocomplete__unambiguous=
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]} $+MENUSELECT $MENUMODE
+'menu:1 ' 1 search-forward
+%
+```
+
+Reverse inserts the last match.
+```zsh
+% compstate[old_list]=keep _lastcomp[tags]='BAR BAZ'
+% compstate[nmatches]=0 _lastcomp[nmatches]=2
+% WIDGETSTYLE=reverse-menu-complete WIDGET=
+% _autocomplete__unambiguous=
+% .autocomplete__complete-word__post
+% print -r -- ${(q+)compstate[insert]}
+'menu:0 '
+%
+```
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/run-tests.zsh b/gentoo/dotfiles/.zsh/zsh-autocomplete/run-tests.zsh
new file mode 100755
index 00000000..d0eea537
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/run-tests.zsh
@@ -0,0 +1,10 @@
+#!/bin/zsh -f
+cd $( git rev-parse --show-toplevel )
+
+git --version
+print =zsh
+typeset -p1 VENDOR OSTYPE ZSH_VERSION ZSH_PATCHLEVEL
+
+env -i HOME=$( mktemp -d ) PATH=$PATH FPATH=$FPATH zsh -f -- \
+    clitest/clitest --list-run --progress dot --prompt '%' --color always \
+        -- $PWD/Tests/*.md
diff --git a/gentoo/dotfiles/.zsh/zsh-autocomplete/zsh-autocomplete.plugin.zsh b/gentoo/dotfiles/.zsh/zsh-autocomplete/zsh-autocomplete.plugin.zsh
new file mode 100644
index 00000000..e185aae5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autocomplete/zsh-autocomplete.plugin.zsh
@@ -0,0 +1,21 @@
+#!/bin/zsh
+unsetopt listbeep
+
+() {
+  zmodload -F zsh/parameter p:funcfiletrace
+  zmodload zsh/param/private
+
+  typeset -ga _autocomplete__func_opts=(
+    localoptions extendedglob clobber
+    NO_aliases localloops pipefail NO_shortloops NO_unset warncreateglobal
+  )
+  setopt $_autocomplete__func_opts[@]
+
+  typeset -ga _autocomplete__funcfiletrace=( $funcfiletrace )
+
+  local basedir=${${(%):-%x}:P:h}
+  hash -d autocomplete=$basedir zsh-autocomplete=$basedir
+
+  builtin autoload +X -Uz ~autocomplete/Functions/**/.autocomplete__*~*.zwc(D-:)
+  .autocomplete__main "$@"
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.editorconfig b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.editorconfig
new file mode 100644
index 00000000..ddabb17b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.editorconfig
@@ -0,0 +1,18 @@
+[*]
+charset = utf-8
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_style = tab
+indent_size = 4
+
+[*.md]
+indent_style = space
+
+[*.rb]
+indent_style = space
+indent_size = 2
+
+[*.yml]
+indent_style = space
+indent_size = 2
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/ISSUE_TEMPLATE/bug-report.md b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/ISSUE_TEMPLATE/bug-report.md
new file mode 100644
index 00000000..7663df69
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/ISSUE_TEMPLATE/bug-report.md
@@ -0,0 +1,36 @@
+---
+name: Bug report
+about: Create a report to help us improve
+title: ''
+labels: bug
+assignees: ''
+
+---
+
+### Describe the bug
+<!-- A clear and concise description of what the bug is. -->
+
+### To Reproduce
+Steps to reproduce the behavior:
+
+<!-- If you are not able to reproduce it by running `zsh -df` and sourcing the plugin manually, it means there that the issue is caused by something in your local config file(s). Temporarily comment out or remove sections of your config and restart `zsh` until you narrow down exactly what is causing the issue. -->
+
+```sh
+% zsh -df
+% source path/to/zsh-autosuggestions.zsh
+% ... # what do you do to reproduce?
+```
+
+### Expected behavior
+<!-- A clear and concise description of what you expected to happen. -->
+
+### Screenshots
+<!-- If applicable, add screenshots to help explain your problem. -->
+
+### Desktop
+ - OS + distribution: <!-- e.g. Arch Linux 2019.07.01 -->
+ - Zsh version: <!-- `echo $ZSH_VERSION` -->
+ - Plugin version: <!-- or git commit hash if installed via git -->
+
+### Additional context
+<!-- Add any other context about the problem here. -->
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/ISSUE_TEMPLATE/feature_request.md b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/ISSUE_TEMPLATE/feature_request.md
new file mode 100644
index 00000000..58746253
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/ISSUE_TEMPLATE/feature_request.md
@@ -0,0 +1,20 @@
+---
+name: Feature request
+about: Suggest an idea for this project
+title: ''
+labels: enhancement
+assignees: ''
+
+---
+
+### Is your feature request related to a problem? Please describe.
+<!-- A clear and concise description of what the problem is. Ex. I'm always frustrated when [...] -->
+
+### Describe the solution you'd like
+<!-- A clear and concise description of what you want to happen. -->
+
+### Describe alternatives you've considered
+<!-- A clear and concise description of any alternative solutions or features you've considered. -->
+
+### Additional context
+<!-- Add any other context or screenshots about the feature request here. -->
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/workflows/integration.yml b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/workflows/integration.yml
new file mode 100644
index 00000000..ec7bc750
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.github/workflows/integration.yml
@@ -0,0 +1,51 @@
+on: [push, pull_request]
+concurrency:
+  group: ${{ github.workflow }}-${{ github.ref }}
+  cancel-in-progress: true
+env:
+  IMAGE_CACHE_PATH: /tmp/.image-cache
+  IMAGE_CACHE_NAME: zsh-autosuggestions-test
+jobs:
+  determine-versions:
+    runs-on: ubuntu-22.04
+    outputs:
+      versions: ${{ steps.set-versions.outputs.versions }}
+    steps:
+    - uses: actions/checkout@v3
+    - id: set-versions
+      run: |
+        echo "versions=$(
+          grep "^[^#]" ZSH_VERSIONS \
+          | sed -E 's/(^|$)/"/g' \
+          | paste -sd ',' - \
+          | sed -e 's/^/[/' -e 's/$/]/'
+        )" >> $GITHUB_OUTPUT
+  test:
+    needs: determine-versions
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        version: ${{ fromJson(needs.determine-versions.outputs.versions) }}
+    steps:
+    - uses: actions/checkout@v3
+    - name: Docker image cache
+      id: image-cache
+      uses: actions/cache@v3
+      with:
+        path: ${{ env.IMAGE_CACHE_PATH }}
+        key: image-cache-${{ matrix.version }}-${{ hashFiles('Dockerfile', 'install_test_zsh.sh', 'Gemfile.lock') }}
+    - name: Load cached docker image if available
+      if: ${{ steps.image-cache.outputs.cache-hit }}
+      run: gunzip < $IMAGE_CACHE_PATH/$IMAGE_CACHE_NAME.tar.gz | docker load
+    - name: Build the docker image if necessary
+      if: ${{ !steps.image-cache.outputs.cache-hit }}
+      run: |
+        docker build --build-arg TEST_ZSH_VERSION=${{ matrix.version }} -t $IMAGE_CACHE_NAME .
+        mkdir -p $IMAGE_CACHE_PATH
+        docker save $IMAGE_CACHE_NAME | gzip > $IMAGE_CACHE_PATH/$IMAGE_CACHE_NAME.tar.gz
+    - name: Run the tests
+      run: |
+        docker run --rm \
+          -v $PWD:/zsh-autosuggestions \
+          $IMAGE_CACHE_NAME \
+          make test
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.rspec b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.rspec
new file mode 100644
index 00000000..43ae2036
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.rspec
@@ -0,0 +1,3 @@
+--color
+--require spec_helper
+--format documentation
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.rubocop.yml b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.rubocop.yml
new file mode 100644
index 00000000..97facac8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.rubocop.yml
@@ -0,0 +1,30 @@
+# Rails:
+#   Enabled: true
+
+AllCops:
+  TargetRubyVersion: 2.3
+  Include:
+    - '**/Rakefile'
+    - '**/config.ru'
+    - '**/Gemfile'
+
+Metrics/LineLength:
+  Max: 120
+
+Style/Documentation:
+  Enabled: false
+
+Style/DotPosition:
+  EnforcedStyle: trailing
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
+Style/Lambda:
+  Enabled: false
+
+Style/MultilineMethodCallIndentation:
+  EnforcedStyle: indented
+
+Style/TrailingUnderscoreVariable:
+  Enabled: false
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/.ruby-version b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.ruby-version
new file mode 100644
index 00000000..aedc15bb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/.ruby-version
@@ -0,0 +1 @@
+2.5.3
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/CHANGELOG.md b/gentoo/dotfiles/.zsh/zsh-autosuggestions/CHANGELOG.md
new file mode 100644
index 00000000..30c77356
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/CHANGELOG.md
@@ -0,0 +1,124 @@
+# Changelog
+
+## v0.7.1
+- Clear POSTDISPLAY instead of unsetting (#634)
+- Always reset async file descriptor after consuming it (#630)
+- Always use builtin `exec` (#628)
+- Add `history-beginning-search-*-end` widgets to clear widget list (#619)
+- Switch CI from Circle CI to GitHub Actions
+
+## v0.7.0
+- Enable asynchronous mode by default (#498)
+- No longer wrap user widgets starting with `autosuggest-` prefix (#496)
+- Fix a bug wrapping widgets that modify the buffer (#541)
+
+
+## v0.6.4
+- Fix `vi-forward-char` triggering a bell when using it to accept a suggestion (#488)
+- New configuration option to skip completion suggestions when buffer matches a pattern (#487)
+- New configuration option to ignore history entries matching a pattern (#456)
+
+## v0.6.3
+- Fixed bug moving cursor to end of buffer after accepting suggestion (#453)
+
+## v0.6.2
+- Fixed bug deleting the last character in the buffer in vi mode (#450)
+- Degrade gracefully when user doesn't have `zsh/system` module installed (#447)
+
+## v0.6.1
+- Fixed bug occurring when `_complete` had been aliased (#443)
+
+## v0.6.0
+- Added `completion` suggestion strategy powered by completion system (#111)
+- Allow setting `ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE` to an empty string (#422)
+- Don't fetch suggestions after copy-earlier-word (#439)
+- Allow users to unignore zle-\* widgets (e.g. zle-line-init) (#432)
+
+
+## v0.5.2
+- Allow disabling automatic widget re-binding for better performance (#418)
+- Fix async suggestions when `SH_WORD_SPLIT` is set
+- Refactor async mode to use process substitution instead of zpty (#417)
+
+## v0.5.1
+- Speed up widget rebinding (#413)
+- Clean up global variable creations (#403)
+- Respect user's set options when running original widget (#402)
+
+## v0.5.0
+- Don't overwrite config with default values (#335)
+- Support fallback strategies by supplying array to suggestion config var
+- Rename "default" suggestion strategy to "history" to name it based on what it actually does
+- Reset opts in some functions affected by `GLOB_SUBST` (#334)
+- Support widgets starting with dashes (ex: `-a-widget`) (#337)
+- Skip async tests in zsh versions less than 5.0.8 because of reliability issues
+- Fix handling of newline + carriage return in async pty (#333)
+
+
+## v0.4.3
+- Avoid bell when accepting suggestions with `autosuggest-accept` (#228)
+- Don't fetch suggestions after [up,down]-line-or-beginning-search (#227, #241)
+- We are now running CI against new 5.5.1 version
+- Fix partial-accept in vi mode (#188)
+- Fix suggestion disappearing on fast movement after switching to `vicmd` mode (#290)
+- Fix issue rotating through kill ring with `yank-pop` (#301)
+- Fix issue creating new pty for async mode when previous pty is not properly cleaned up (#249)
+
+## v0.4.2
+- Fix bug in zsh versions older than 5.0.8 (#296)
+- Officially support back to zsh v4.3.11
+
+## v0.4.1
+- Switch to [[ and (( conditionals instead of [ (#257)
+- Avoid warnnestedvar warnings with `typeset -g` (#275)
+- Replace tabs with spaces in yaml (#268)
+- Clean up and fix escaping of special characters (#267)
+- Add `emacs-forward-word` to default list of partial accept widgets (#246)
+
+## v0.4.0
+- High-level integration tests using RSpec and tmux
+- Add continuous integration with Circle CI
+- Experimental support for asynchronous suggestions (#170)
+- Fix problems with multi-line suggestions (#225)
+- Optimize case where manually typing in suggestion
+- Avoid wrapping any zle-\* widgets (#206)
+- Remove support for deprecated options from v0.0.x
+- Handle history entries that begin with dashes
+- Gracefully handle being sourced multiple times (#126)
+- Add enable/disable/toggle widgets to disable/enable suggestions (#219)
+
+
+## v0.3.3
+- Switch from $history array to fc builtin for better performance with large HISTFILEs (#164)
+- Fix tilde handling when extended_glob is set (#168)
+- Add config option for maximum buffer length to fetch suggestions for (#178)
+- Add config option for list of widgets to ignore (#184)
+- Don't fetch a new suggestion unless a modification widget actually modifies the buffer (#183)
+
+## v0.3.2
+- Test runner now supports running specific tests and choosing zsh binary
+- Return code from original widget is now correctly passed through (#135)
+- Add `vi-add-eol` to list of accept widgets (#143)
+- Escapes widget names within evals to fix problems with irregular widget names (#152)
+- Plugin now clears suggestion while within a completion menu (#149)
+- .plugin file no longer relies on symbolic link support, fixing issues on Windows (#156)
+
+## v0.3.1
+
+- Fixes issue with `vi-next-char` not accepting suggestion (#137).
+- Fixes global variable warning when WARN_CREATE_GLOBAL option enabled (#133).
+- Split out a separate test file for each widget.
+
+## v0.3.0
+
+- Adds `autosuggest-execute` widget (PR #124).
+- Adds concept of suggestion "strategies" for different ways of fetching suggestions.
+- Adds "match_prev_cmd" strategy (PR #131).
+- Uses git submodules for testing dependencies.
+- Lots of test cleanup.
+- Various bug fixes for zsh 5.0.x and `sh_word_split` option.
+
+
+## v0.2.17
+
+Start of changelog.
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/DESCRIPTION b/gentoo/dotfiles/.zsh/zsh-autosuggestions/DESCRIPTION
new file mode 100644
index 00000000..b69200fc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/DESCRIPTION
@@ -0,0 +1 @@
+Fish-like fast/unobtrusive autosuggestions for zsh.
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/Dockerfile b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Dockerfile
new file mode 100644
index 00000000..f5dd3c48
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Dockerfile
@@ -0,0 +1,21 @@
+FROM ruby:2.5.3-alpine
+
+ARG TEST_ZSH_VERSION
+RUN : "${TEST_ZSH_VERSION:?}"
+
+RUN apk add --no-cache autoconf
+RUN apk add --no-cache libtool
+RUN apk add --no-cache libcap-dev
+RUN apk add --no-cache pcre-dev
+RUN apk add --no-cache curl
+RUN apk add --no-cache build-base
+RUN apk add --no-cache ncurses-dev
+RUN apk add --no-cache tmux
+
+WORKDIR /zsh-autosuggestions
+
+ADD install_test_zsh.sh ./
+RUN ./install_test_zsh.sh
+
+ADD Gemfile Gemfile.lock ./
+RUN bundle install
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/Gemfile b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Gemfile
new file mode 100644
index 00000000..8b5deecf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Gemfile
@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rspec'
+gem 'rspec-wait'
+gem 'pry-byebug'
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/Gemfile.lock b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Gemfile.lock
new file mode 100644
index 00000000..63ee778a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Gemfile.lock
@@ -0,0 +1,41 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    byebug (9.0.5)
+    coderay (1.1.1)
+    diff-lcs (1.3)
+    method_source (0.8.2)
+    pry (0.10.4)
+      coderay (~> 1.1.0)
+      method_source (~> 0.8.1)
+      slop (~> 3.4)
+    pry-byebug (3.4.0)
+      byebug (~> 9.0)
+      pry (~> 0.10)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rspec-wait (0.0.9)
+      rspec (>= 3, < 4)
+    slop (3.6.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  pry-byebug
+  rspec
+  rspec-wait
+
+BUNDLED WITH
+   1.13.6
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/INSTALL.md b/gentoo/dotfiles/.zsh/zsh-autosuggestions/INSTALL.md
new file mode 100644
index 00000000..7f0a3958
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/INSTALL.md
@@ -0,0 +1,82 @@
+# Installation
+
+* [Packages](#packages)
+* [Antigen](#antigen)
+* [Oh My Zsh](#oh-my-zsh)
+* [HomeBrew](#homebrew)
+* [Manual](#manual-git-clone)
+
+## Packages
+
+| System  | Package |
+| ------------- | ------------- |
+| Alpine Linux | [zsh-autosuggestions](https://pkgs.alpinelinux.org/packages?name=zsh-autosuggestions) |
+| Debian / Ubuntu | [zsh-autosuggestions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-autosuggestions&package=zsh-autosuggestions) |
+| Fedora / CentOS / RHEL / Scientific Linux | [zsh-autosuggestions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-autosuggestions&package=zsh-autosuggestions) |
+| OpenSUSE / SLE | [zsh-autosuggestions OBS repository](https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-autosuggestions&package=zsh-autosuggestions) |
+| Arch Linux / Manjaro / Antergos / Hyperbola | [zsh-autosuggestions](https://www.archlinux.org/packages/zsh-autosuggestions), [zsh-autosuggestions-git](https://aur.archlinux.org/packages/zsh-autosuggestions-git) |
+| NixOS | [zsh-autosuggestions](https://github.com/NixOS/nixpkgs/blob/master/pkgs/by-name/zs/zsh-autosuggestions/package.nix) |
+| Void Linux | [zsh-autosuggestions](https://github.com/void-linux/void-packages/blob/master/srcpkgs/zsh-autosuggestions/template) |
+| Mac OS | [homebrew](https://formulae.brew.sh/formula/zsh-autosuggestions)  |
+| NetBSD | [pkgsrc](http://ftp.netbsd.org/pub/pkgsrc/current/pkgsrc/shells/zsh-autosuggestions/README.html)  |
+| FreeBSD | [pkg](https://cgit.freebsd.org/ports/tree/shells/zsh-autosuggestions) |
+
+## Antigen
+
+1. Add the following to your `.zshrc`:
+
+    ```sh
+    antigen bundle zsh-users/zsh-autosuggestions
+    ```
+
+2. Start a new terminal session.
+
+## Oh My Zsh
+
+1. Clone this repository into `$ZSH_CUSTOM/plugins` (by default `~/.oh-my-zsh/custom/plugins`)
+
+    ```sh
+    git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
+    ```
+
+2. Add the plugin to the list of plugins for Oh My Zsh to load (inside `~/.zshrc`):
+
+    ```sh
+    plugins=( 
+        # other plugins...
+        zsh-autosuggestions
+    )
+    ```
+
+3. Start a new terminal session.
+
+## Homebrew
+
+1. Install command: 
+    ```sh
+    brew install zsh-autosuggestions
+    ```
+
+2. To activate the autosuggestions, add the following at the end of your .zshrc: 
+    
+    ```sh
+    source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh
+    ```
+
+3. Start a new terminal session.
+
+## Manual (Git Clone)
+
+1. Clone this repository somewhere on your machine. This guide will assume `~/.zsh/zsh-autosuggestions`.
+
+    ```sh
+    git clone https://github.com/zsh-users/zsh-autosuggestions ~/.zsh/zsh-autosuggestions
+    ```
+
+2. Add the following to your `.zshrc`:
+
+    ```sh
+    source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+    ```
+
+3. Start a new terminal session.
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/LICENSE b/gentoo/dotfiles/.zsh/zsh-autosuggestions/LICENSE
new file mode 100644
index 00000000..7ea78cc6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/LICENSE
@@ -0,0 +1,23 @@
+Copyright (c) 2013 Thiago de Arruda
+Copyright (c) 2016-2021 Eric Freese
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the "Software"), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/Makefile b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Makefile
new file mode 100644
index 00000000..6f5431e7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/Makefile
@@ -0,0 +1,35 @@
+SRC_DIR := ./src
+
+SRC_FILES := \
+	$(SRC_DIR)/config.zsh \
+	$(SRC_DIR)/util.zsh \
+	$(SRC_DIR)/bind.zsh \
+	$(SRC_DIR)/highlight.zsh \
+	$(SRC_DIR)/widgets.zsh \
+	$(SRC_DIR)/strategies/*.zsh \
+	$(SRC_DIR)/fetch.zsh \
+	$(SRC_DIR)/async.zsh \
+	$(SRC_DIR)/start.zsh
+
+HEADER_FILES := \
+	DESCRIPTION \
+	URL \
+	VERSION \
+	LICENSE
+
+PLUGIN_TARGET := zsh-autosuggestions.zsh
+
+all: $(PLUGIN_TARGET)
+
+$(PLUGIN_TARGET): $(HEADER_FILES) $(SRC_FILES)
+	cat $(HEADER_FILES) | sed -e 's/^/# /g' > $@
+	cat $(SRC_FILES) >> $@
+
+.PHONY: clean
+clean:
+	rm $(PLUGIN_TARGET)
+
+.PHONY: test
+test: all
+	@test -n "$$TEST_ZSH_BIN" && echo "Testing zsh binary: $(TEST_ZSH_BIN)" || true
+	bundle exec rspec $(TESTS)
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/README.md b/gentoo/dotfiles/.zsh/zsh-autosuggestions/README.md
new file mode 100644
index 00000000..a8c1b6cc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/README.md
@@ -0,0 +1,188 @@
+# zsh-autosuggestions
+
+_[Fish](http://fishshell.com/)-like fast/unobtrusive autosuggestions for zsh._
+
+It suggests commands as you type based on history and completions.
+
+Requirements: Zsh v4.3.11 or later
+
+[![Chat on Gitter](https://img.shields.io/gitter/room/zsh-users/zsh-autosuggestions.svg)](https://gitter.im/zsh-users/zsh-autosuggestions)
+
+<a href="https://asciinema.org/a/37390" target="_blank"><img src="https://asciinema.org/a/37390.png" width="400" /></a>
+
+
+## Installation
+
+See [INSTALL.md](INSTALL.md).
+
+
+## Usage
+
+As you type commands, you will see a completion offered after the cursor in a muted gray color. This color can be changed by setting the `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` variable. See [configuration](#configuration).
+
+If you press the <kbd>→</kbd> key (`forward-char` widget) or <kbd>End</kbd> (`end-of-line` widget) with the cursor at the end of the buffer, it will accept the suggestion, replacing the contents of the command line buffer with the suggestion.
+
+If you invoke the `forward-word` widget, it will partially accept the suggestion up to the point that the cursor moves to.
+
+
+## Configuration
+
+You may want to override the default global config variables. Default values of these variables can be found [here](src/config.zsh).
+
+**Note:** If you are using Oh My Zsh, you can put this configuration in a file in the `$ZSH_CUSTOM` directory. See their comments on [overriding internals](https://github.com/robbyrussell/oh-my-zsh/wiki/Customization#overriding-internals).
+
+
+### Suggestion Highlight Style
+
+Set `ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE` to configure the style that the suggestion is shown with. The default is `fg=8`, which will set the foreground color to color 8 from the [256-color palette](https://upload.wikimedia.org/wikipedia/commons/1/15/Xterm_256color_chart.svg). If your terminal only supports 8 colors, you will need to use a number between 0 and 7.
+
+Background color can also be set, and the suggestion can be styled bold, underlined, or standout. For example, this would show suggestions with bold, underlined, pink text on a cyan background:
+
+```sh
+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#ff00ff,bg=cyan,bold,underline"
+```
+
+For more info, read the Character Highlighting section of the zsh manual: `man zshzle` or [online](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting).
+
+**Note:** Some iTerm2 users have reported [not being able to see the suggestions](https://github.com/zsh-users/zsh-autosuggestions/issues/416#issuecomment-486516333). If this affects you, the problem is likely caused by incorrect color settings. In order to correct this, go into iTerm2's setting, navigate to profile > colors and make sure that the colors for Basic Colors > Background and ANSI Colors > Bright Black are **different**.
+
+
+### Suggestion Strategy
+
+`ZSH_AUTOSUGGEST_STRATEGY` is an array that specifies how suggestions should be generated. The strategies in the array are tried successively until a suggestion is found. There are currently three built-in strategies to choose from:
+
+- `history`: Chooses the most recent match from history.
+- `completion`: Chooses a suggestion based on what tab-completion would suggest. (requires `zpty` module, which is included with zsh since 4.0.1)
+- `match_prev_cmd`: Like `history`, but chooses the most recent match whose preceding history item matches the most recently executed command ([more info](src/strategies/match_prev_cmd.zsh)). Note that this strategy won't work as expected with ZSH options that don't preserve the history order such as `HIST_IGNORE_ALL_DUPS` or `HIST_EXPIRE_DUPS_FIRST`.
+
+For example, setting `ZSH_AUTOSUGGEST_STRATEGY=(history completion)` will first try to find a suggestion from your history, but, if it can't find a match, will find a suggestion from the completion engine.
+
+
+### Widget Mapping
+
+This plugin works by triggering custom behavior when certain [zle widgets](http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets) are invoked. You can add and remove widgets from these arrays to change the behavior of this plugin:
+
+- `ZSH_AUTOSUGGEST_CLEAR_WIDGETS`: Widgets in this array will clear the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_ACCEPT_WIDGETS`: Widgets in this array will accept the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_EXECUTE_WIDGETS`: Widgets in this array will execute the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS`: Widgets in this array will partially accept the suggestion when invoked.
+- `ZSH_AUTOSUGGEST_IGNORE_WIDGETS`: Widgets in this array will not trigger any custom behavior.
+
+Widgets that modify the buffer and are not found in any of these arrays will fetch a new suggestion after they are invoked.
+
+**Note:** A widget shouldn't belong to more than one of the above arrays.
+
+
+### Disabling suggestion for large buffers
+
+Set `ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE` to an integer value to disable autosuggestion for large buffers. The default is unset, which means that autosuggestion will be tried for any buffer size. Recommended value is 20.
+This can be useful when pasting large amount of text in the terminal, to avoid triggering autosuggestion for strings that are too long.
+
+### Asynchronous Mode
+
+Suggestions are fetched asynchronously by default in zsh versions 5.0.8 and greater. To disable asynchronous suggestions and fetch them synchronously instead, `unset ZSH_AUTOSUGGEST_USE_ASYNC` after sourcing the plugin.
+
+Alternatively, if you are using a version of zsh older than 5.0.8 and want to enable asynchronous mode, set the `ZSH_AUTOSUGGEST_USE_ASYNC` variable after sourcing the plugin (it can be set to anything). Note that there is [a bug](https://github.com/zsh-users/zsh-autosuggestions/issues/364#issuecomment-481423232) in versions of zsh older than 5.0.8 where <kbd>ctrl</kbd> + <kbd>c</kbd> will fail to reset the prompt immediately after fetching a suggestion asynchronously.
+
+### Disabling automatic widget re-binding
+
+Set `ZSH_AUTOSUGGEST_MANUAL_REBIND` (it can be set to anything) to disable automatic widget re-binding on each precmd. This can be a big boost to performance, but you'll need to handle re-binding yourself if any of the widget lists change or if you or another plugin wrap any of the autosuggest widgets. To re-bind widgets, run `_zsh_autosuggest_bind_widgets`.
+
+### Ignoring history suggestions that match a pattern
+
+Set `ZSH_AUTOSUGGEST_HISTORY_IGNORE` to a [glob pattern](http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Operators) to prevent offering suggestions for history entries that match the pattern. For example, set it to `"cd *"` to never suggest any `cd` commands from history. Or set to `"?(#c50,)"` to never suggest anything 50 characters or longer.
+
+**Note:** This only affects the `history` and `match_prev_cmd` suggestion strategies.
+
+### Skipping completion suggestions for certain cases
+
+Set `ZSH_AUTOSUGGEST_COMPLETION_IGNORE` to a [glob pattern](http://zsh.sourceforge.net/Doc/Release/Expansion.html#Glob-Operators) to prevent offering completion suggestions when the buffer matches that pattern. For example, set it to `"git *"` to disable completion suggestions for git subcommands.
+
+**Note:** This only affects the `completion` suggestion strategy.
+
+
+### Key Bindings
+
+This plugin provides a few widgets that you can use with `bindkey`:
+
+1. `autosuggest-accept`: Accepts the current suggestion.
+2. `autosuggest-execute`: Accepts and executes the current suggestion.
+3. `autosuggest-clear`: Clears the current suggestion.
+4. `autosuggest-fetch`: Fetches a suggestion (works even when suggestions are disabled).
+5. `autosuggest-disable`: Disables suggestions.
+6. `autosuggest-enable`: Re-enables suggestions.
+7. `autosuggest-toggle`: Toggles between enabled/disabled suggestions.
+
+For example, this would bind <kbd>ctrl</kbd> + <kbd>space</kbd> to accept the current suggestion.
+
+```sh
+bindkey '^ ' autosuggest-accept
+```
+
+
+## Troubleshooting
+
+If you have a problem, please search through [the list of issues on GitHub](https://github.com/zsh-users/zsh-autosuggestions/issues?q=) to see if someone else has already reported it.
+
+### Reporting an Issue
+
+Before reporting an issue, please try temporarily disabling sections of your configuration and other plugins that may be conflicting with this plugin to isolate the problem.
+
+When reporting an issue, please include:
+
+- The smallest, simplest `.zshrc` configuration that will reproduce the problem. See [this comment](https://github.com/zsh-users/zsh-autosuggestions/issues/102#issuecomment-180944764) for a good example of what this means.
+- The version of zsh you're using (`zsh --version`)
+- Which operating system you're running
+
+
+## Uninstallation
+
+1. Remove the code referencing this plugin from `~/.zshrc`.
+
+2. Remove the git repository from your hard drive
+
+    ```sh
+    rm -rf ~/.zsh/zsh-autosuggestions # Or wherever you installed
+    ```
+
+
+## Development
+
+### Build Process
+
+Edit the source files in `src/`. Run `make` to build `zsh-autosuggestions.zsh` from those source files.
+
+
+### Pull Requests
+
+Pull requests are welcome! If you send a pull request, please:
+
+- Request to merge into the `develop` branch (*NOT* `master`)
+- Match the existing coding conventions.
+- Include helpful comments to keep the barrier-to-entry low for people new to the project.
+- Write tests that cover your code as much as possible.
+
+
+### Testing
+
+Tests are written in ruby using the [`rspec`](http://rspec.info/) framework. They use [`tmux`](https://tmux.github.io/) to drive a pseudoterminal, sending simulated keystrokes and making assertions on the terminal content.
+
+Test files live in `spec/`. To run the tests, run `make test`. To run a specific test, run `TESTS=spec/some_spec.rb make test`. You can also specify a `zsh` binary to use by setting the `TEST_ZSH_BIN` environment variable (ex: `TEST_ZSH_BIN=/bin/zsh make test`).
+
+It's possible to run the tests for any supported version of zsh in a Docker image by building an image from the provided Dockerfile. To build the docker image for a specific version of zsh (where `<version>` below is substituted with the contents of a line from the [`ZSH_VERSIONS`](ZSH_VERSIONS) file), run:
+
+```sh
+docker build --build-arg TEST_ZSH_VERSION=<version> -t zsh-autosuggestions-test .
+```
+
+After building the image, run the tests via:
+
+```sh
+docker run -it -v $PWD:/zsh-autosuggestions zsh-autosuggestions-test make test
+```
+
+
+## License
+
+This project is licensed under [MIT license](http://opensource.org/licenses/MIT).
+For the full text of the license, see the [LICENSE](LICENSE) file.
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/URL b/gentoo/dotfiles/.zsh/zsh-autosuggestions/URL
new file mode 100644
index 00000000..4e2bd941
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/URL
@@ -0,0 +1 @@
+https://github.com/zsh-users/zsh-autosuggestions
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/VERSION b/gentoo/dotfiles/.zsh/zsh-autosuggestions/VERSION
new file mode 100644
index 00000000..63f2359f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/VERSION
@@ -0,0 +1 @@
+v0.7.1
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/ZSH_VERSIONS b/gentoo/dotfiles/.zsh/zsh-autosuggestions/ZSH_VERSIONS
new file mode 100644
index 00000000..23006db5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/ZSH_VERSIONS
@@ -0,0 +1,14 @@
+# Zsh releases to run tests against
+# See https://github.com/zsh-users/zsh/releases
+4.3.11
+5.0.2
+5.0.8
+5.1.1
+5.2
+5.3.1
+5.4.2
+5.5.1
+5.6.2
+5.7.1
+5.8.1
+5.9
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/install_test_zsh.sh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/install_test_zsh.sh
new file mode 100755
index 00000000..6cac9f5c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/install_test_zsh.sh
@@ -0,0 +1,23 @@
+#!/bin/sh
+
+set -ex
+
+mkdir zsh-build
+cd zsh-build
+
+curl -L https://api.github.com/repos/zsh-users/zsh/tarball/zsh-$TEST_ZSH_VERSION | tar xz --strip=1
+
+./Util/preconfig
+./configure --enable-pcre \
+            --enable-cap \
+            --enable-multibyte \
+            --with-term-lib='ncursesw tinfo' \
+            --with-tcsetpgrp
+
+make install.bin
+make install.modules
+make install.fns
+
+cd ..
+
+rm -rf zsh-build
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/async_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/async_spec.rb
new file mode 100644
index 00000000..0af72329
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/async_spec.rb
@@ -0,0 +1,70 @@
+context 'with asynchronous suggestions enabled' do
+  let(:options) { ["ZSH_AUTOSUGGEST_USE_ASYNC="] }
+
+  describe '`up-line-or-beginning-search`' do
+    let(:before_sourcing) do
+      -> do
+        session.
+          run_command('autoload -U up-line-or-beginning-search').
+          run_command('zle -N up-line-or-beginning-search').
+          send_string('bindkey "').
+          send_keys('C-v').send_keys('up').
+          send_string('" up-line-or-beginning-search').
+          send_keys('enter')
+      end
+    end
+
+    it 'should show previous history entries' do
+      with_history(
+        'echo foo',
+        'echo bar',
+        'echo baz'
+      ) do
+        session.clear_screen
+        3.times { session.send_keys('up') }
+        wait_for { session.content }.to eq("echo foo")
+      end
+    end
+  end
+
+  describe '`copy-earlier-word`' do
+    let(:before_sourcing) do
+      -> do
+        session.
+          run_command('autoload -Uz copy-earlier-word').
+          run_command('zle -N copy-earlier-word').
+          run_command('bindkey "^N" copy-earlier-word')
+      end
+    end
+
+    it 'should cycle through previous words in the buffer' do
+      session.clear_screen
+      session.send_string('foo bar baz')
+      sleep 0.5
+      session.send_keys('C-n')
+      wait_for { session.content }.to eq('foo bar bazbaz')
+      session.send_keys('C-n')
+      wait_for { session.content }.to eq('foo bar bazbar')
+      session.send_keys('C-n')
+      wait_for { session.content }.to eq('foo bar bazfoo')
+    end
+  end
+
+  describe 'pressing ^C after fetching a suggestion' do
+    before do
+      skip 'Workaround does not work below v5.0.8' if session.zsh_version < Gem::Version.new('5.0.8')
+    end
+
+    it 'terminates the prompt and begins a new one' do
+      session.send_keys('e')
+      sleep 0.5
+      session.send_keys('C-c')
+      sleep 0.5
+      session.send_keys('echo')
+
+      wait_for { session.content }.to eq("e\necho")
+    end
+  end
+end
+
+
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/auto_cd_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/auto_cd_spec.rb
new file mode 100644
index 00000000..94bd24b0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/auto_cd_spec.rb
@@ -0,0 +1,14 @@
+describe 'with `AUTO_CD` option set' do
+  let(:after_sourcing) do
+    -> {
+      session.run_command('setopt AUTO_CD')
+      session.run_command('autoload compinit && compinit')
+    }
+  end
+
+  it 'directory names are still completed' do
+    session.send_string('sr')
+    session.send_keys('C-i')
+    wait_for { session.content }.to eq('src/')
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/bracketed_paste_magic_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/bracketed_paste_magic_spec.rb
new file mode 100644
index 00000000..41ff2676
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/bracketed_paste_magic_spec.rb
@@ -0,0 +1,43 @@
+describe 'pasting using bracketed-paste-magic' do
+  let(:before_sourcing) do
+    -> do
+      session.
+        run_command('autoload -Uz bracketed-paste-magic').
+        run_command('zle -N bracketed-paste bracketed-paste-magic')
+    end
+  end
+
+  context 'with suggestions disabled while pasting' do
+    before do
+      session.
+        run_command('bpm_init() { zle autosuggest-disable }').
+        run_command('bpm_finish() { zle autosuggest-enable }').
+        run_command('zstyle :bracketed-paste-magic paste-init bpm_init').
+        run_command('zstyle :bracketed-paste-magic paste-finish bpm_finish')
+    end
+
+    it 'does not show an incorrect suggestion' do
+      with_history('echo hello') do
+        session.paste_string("echo #{'a' * 60}")
+        sleep 1
+        expect(session.content).to eq("echo #{'a' * 60}")
+      end
+    end
+  end
+
+  context 'with `bracketed-paste` added to the list of widgets that clear the suggestion' do
+    let(:options) { ['ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(bracketed-paste)'] }
+
+    it 'does not retain an old suggestion' do
+      with_history ('echo foo') do
+        session.send_string('echo ')
+        wait_for { session.content }.to eq('echo foo')
+        session.paste_string('bar')
+        wait_for { session.content }.to eq('echo bar')
+        session.send_keys('C-a') # Any cursor movement works
+        sleep 1
+        expect(session.content).to eq('echo bar')
+      end
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/client_zpty_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/client_zpty_spec.rb
new file mode 100644
index 00000000..b8abb375
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/client_zpty_spec.rb
@@ -0,0 +1,14 @@
+describe 'a running zpty command' do
+  let(:before_sourcing) { -> { session.run_command('zmodload zsh/zpty && zpty -b kitty cat') } }
+
+  context 'when using `completion` strategy' do
+    let(:options) { ["ZSH_AUTOSUGGEST_STRATEGY=completion"] }
+
+    it 'is not affected' do
+      session.send_keys('a').send_keys('C-h')
+      session.run_command('zpty -t kitty; echo $?')
+
+      wait_for { session.content }.to end_with("\n0")
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/glob_subst_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/glob_subst_spec.rb
new file mode 100644
index 00000000..c3dd671c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/glob_subst_spec.rb
@@ -0,0 +1,12 @@
+describe 'with `GLOB_SUBST` option set' do
+  let(:after_sourcing) do
+    -> {
+      session.run_command('setopt GLOB_SUBST')
+    }
+  end
+
+  it 'error messages are not printed' do
+    session.send_string('[[')
+    wait_for { session.content }.to eq('[[')
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/rebound_bracket_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/rebound_bracket_spec.rb
new file mode 100644
index 00000000..8b420f06
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/rebound_bracket_spec.rb
@@ -0,0 +1,13 @@
+describe 'rebinding [' do
+  context 'initialized before sourcing the plugin' do
+    before do
+      session.run_command("function [ { $commands[\\[] \"$@\" }")
+      session.clear_screen
+    end
+
+    it 'executes the custom behavior and the built-in behavior' do
+      session.send_string('asdf')
+      wait_for { session.content }.to eq('asdf')
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/vi_mode_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/vi_mode_spec.rb
new file mode 100644
index 00000000..0a295c23
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/vi_mode_spec.rb
@@ -0,0 +1,80 @@
+describe 'when using vi mode' do
+  let(:before_sourcing) do
+    -> do
+      session.run_command('bindkey -v')
+    end
+  end
+
+  describe 'moving the cursor after exiting insert mode' do
+    it 'should not clear the current suggestion' do
+      with_history('foobar foo') do
+        session.
+          send_string('foo').
+          send_keys('escape').
+          send_keys('h')
+
+        wait_for { session.content }.to eq('foobar foo')
+      end
+    end
+  end
+
+  describe '`vi-forward-word-end`' do
+    it 'should accept through the end of the current word' do
+      with_history('foobar foo') do
+        session.
+          send_string('foo').
+          send_keys('escape').
+          send_keys('e'). # vi-forward-word-end
+          send_keys('a'). # vi-add-next
+          send_string('baz')
+
+        wait_for { session.content }.to eq('foobarbaz')
+      end
+    end
+  end
+
+  describe '`vi-forward-word`' do
+    it 'should accept through the first character of the next word' do
+      with_history('foobar foo') do
+        session.
+          send_string('foo').
+          send_keys('escape').
+          send_keys('w'). # vi-forward-word
+          send_keys('a'). # vi-add-next
+          send_string('az')
+
+        wait_for { session.content }.to eq('foobar faz')
+      end
+    end
+  end
+
+  describe '`vi-find-next-char`' do
+    it 'should accept through the next occurrence of the character' do
+      with_history('foobar foo') do
+        session.
+          send_string('foo').
+          send_keys('escape').
+          send_keys('f'). # vi-find-next-char
+          send_keys('o').
+          send_keys('a'). # vi-add-next
+          send_string('b')
+
+        wait_for { session.content }.to eq('foobar fob')
+      end
+    end
+  end
+
+  describe '`vi-delete`' do
+    it 'should be able to remove the last character in the buffer' do
+      skip 'deleting last char did not work below zsh version 5.0.8' if session.zsh_version < Gem::Version.new('5.0.8')
+
+      session.
+        send_string('echo foo').
+        send_keys('escape').
+        send_keys('d').
+        send_keys('l')
+
+      wait_for { session.content }.to eq('echo fo')
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/wrapped_widget_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/wrapped_widget_spec.rb
new file mode 100644
index 00000000..61dfc2dc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/wrapped_widget_spec.rb
@@ -0,0 +1,39 @@
+describe 'a wrapped widget' do
+  let(:widget) { 'backward-delete-char' }
+
+  context 'initialized before sourcing the plugin' do
+    let(:before_sourcing) do
+      -> do
+        session.
+          run_command("_orig_#{widget}() { zle .#{widget} }").
+          run_command("zle -N orig-#{widget} _orig_#{widget}").
+          run_command("#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }").
+          run_command("zle -N #{widget} #{widget}-magic")
+      end
+    end
+
+    it 'executes the custom behavior and the built-in behavior' do
+      with_history('foobar', 'foodar') do
+        session.send_string('food').send_keys('C-h')
+        wait_for { session.content }.to eq('foobar')
+      end
+    end
+  end
+
+  context 'initialized after sourcing the plugin' do
+    before do
+      session.
+        run_command("zle -N orig-#{widget} ${widgets[#{widget}]#*:}").
+        run_command("#{widget}-magic() { zle orig-#{widget}; BUFFER+=b }").
+        run_command("zle -N #{widget} #{widget}-magic").
+        clear_screen
+    end
+
+    it 'executes the custom behavior and the built-in behavior' do
+      with_history('foobar', 'foodar') do
+        session.send_string('food').send_keys('C-h')
+        wait_for { session.content }.to eq('foobar')
+      end
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/zle_input_stack_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/zle_input_stack_spec.rb
new file mode 100644
index 00000000..12cfbc7b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/integrations/zle_input_stack_spec.rb
@@ -0,0 +1,24 @@
+describe 'using `zle -U`' do
+  let(:before_sourcing) do
+    -> do
+      session.
+        run_command('_zsh_autosuggest_strategy_test() { sleep 1; _zsh_autosuggest_strategy_history "$1" }').
+        run_command('foo() { zle -U - "echo hello" }; zle -N foo; bindkey ^B foo')
+    end
+  end
+
+  let(:options) { ['unset ZSH_AUTOSUGGEST_USE_ASYNC', 'ZSH_AUTOSUGGEST_STRATEGY=test'] }
+
+  # TODO: This is only possible with the $KEYS_QUEUED_COUNT widget parameter, coming soon...
+  xit 'does not fetch a suggestion for every inserted character' do
+    session.send_keys('C-b')
+    wait_for { session.content }.to eq('echo hello')
+  end
+
+  it 'shows a suggestion when the widget completes' do
+    with_history('echo hello world') do
+      session.send_keys('C-b')
+      wait_for { session.content(esc_seqs: true) }.to match(/\Aecho hello\e\[[0-9]+m world/)
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/kill_ring_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/kill_ring_spec.rb
new file mode 100644
index 00000000..4d0178f9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/kill_ring_spec.rb
@@ -0,0 +1,23 @@
+context 'with some items in the kill ring' do
+  before do
+    session.
+      send_string('echo foo').
+      send_keys('C-u').
+      send_string('echo bar').
+      send_keys('C-u')
+  end
+
+  describe '`yank-pop`' do
+    it 'should cycle through all items in the kill ring' do
+      session.send_keys('C-y')
+      wait_for { session.content }.to eq('echo bar')
+
+      session.send_keys('escape').send_keys('y')
+      wait_for { session.content }.to eq('echo foo')
+
+      session.send_keys('escape').send_keys('y')
+      wait_for { session.content }.to eq('echo bar')
+    end
+  end
+end
+
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/line_init_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/line_init_spec.rb
new file mode 100644
index 00000000..826277fc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/line_init_spec.rb
@@ -0,0 +1,17 @@
+context 'with zle-line-init unignored' do
+  let(:after_sourcing) do
+    -> do
+      session.
+        run_command('setopt extendedglob').
+        run_command('ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(${(@)ZSH_AUTOSUGGEST_IGNORE_WIDGETS:#zle-\*} zle-\^line-init)').
+        run_command('zle-line-init() { BUFFER="echo" }')
+    end
+  end
+
+  it 'should fetch a suggestion on each line initialization' do
+    with_history('echo foo') do
+      session.run_command('zle -N zle-line-init')
+      wait_for { session.content }.to end_with('echo foo')
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/multi_line_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/multi_line_spec.rb
new file mode 100644
index 00000000..364780a2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/multi_line_spec.rb
@@ -0,0 +1,8 @@
+describe 'a multi-line suggestion' do
+  it 'should be displayed on multiple lines' do
+    with_history("echo \"\n\"") do
+      session.send_keys('e')
+      wait_for { session.content }.to eq("echo \"\n\"")
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/buffer_max_size_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/buffer_max_size_spec.rb
new file mode 100644
index 00000000..29ca8bc4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/buffer_max_size_spec.rb
@@ -0,0 +1,30 @@
+describe 'a suggestion' do
+  let(:term_opts) { { width: 200 } }
+  let(:long_command) { "echo #{'a' * 100}" }
+
+  around do |example|
+    with_history(long_command) { example.run }
+  end
+
+  it 'is provided for any buffer length' do
+    session.send_string(long_command[0...-1])
+    wait_for { session.content }.to eq(long_command)
+  end
+
+  context 'when ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE is specified' do
+    let(:buffer_max_size) { 10 }
+    let(:options) { ["ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=#{buffer_max_size}"] }
+
+    it 'is provided when the buffer is shorter than the specified length' do
+      session.send_string(long_command[0...(buffer_max_size - 1)])
+      wait_for { session.content }.to eq(long_command)
+    end
+
+    it 'is provided when the buffer is equal to the specified length' do
+      session.send_string(long_command[0...(buffer_max_size)])
+      wait_for { session.content }.to eq(long_command)
+    end
+
+    it 'is not provided when the buffer is longer than the specified length'
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/highlight_style_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/highlight_style_spec.rb
new file mode 100644
index 00000000..a7e39b34
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/highlight_style_spec.rb
@@ -0,0 +1,7 @@
+describe 'a displayed suggestion' do
+  it 'is shown in the default style'
+
+  describe 'when ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE is set to a zle_highlight string' do
+    it 'is shown in the specified style'
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/original_widget_prefix_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/original_widget_prefix_spec.rb
new file mode 100644
index 00000000..a4b6e983
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/original_widget_prefix_spec.rb
@@ -0,0 +1,7 @@
+describe 'an original zle widget' do
+  context 'is accessible with the default prefix'
+
+  context 'when ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX is set' do
+    it 'is accessible with the specified prefix'
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/strategy_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/strategy_spec.rb
new file mode 100644
index 00000000..58562d0c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/strategy_spec.rb
@@ -0,0 +1,55 @@
+describe 'a suggestion for a given prefix' do
+  let(:history_strategy) { '_zsh_autosuggest_strategy_history() { suggestion="history" }' }
+  let(:foobar_strategy) { '_zsh_autosuggest_strategy_foobar() { [[ "foobar baz" = $1* ]] && suggestion="foobar baz" }' }
+  let(:foobaz_strategy) { '_zsh_autosuggest_strategy_foobaz() { [[ "foobaz bar" = $1* ]] && suggestion="foobaz bar" }' }
+
+  let(:after_sourcing) do
+    -> do
+      session.run_command(history_strategy)
+    end
+  end
+
+  it 'by default is determined by calling the `history` strategy function' do
+    session.send_string('h')
+    wait_for { session.content }.to eq('history')
+  end
+
+  context 'when ZSH_AUTOSUGGEST_STRATEGY is set to an array' do
+    let(:after_sourcing) do
+      -> do
+        session.
+          run_command(foobar_strategy).
+          run_command(foobaz_strategy).
+          run_command('ZSH_AUTOSUGGEST_STRATEGY=(foobar foobaz)')
+      end
+    end
+
+    it 'is determined by the first strategy function to return a suggestion' do
+      session.send_string('foo')
+      wait_for { session.content }.to eq('foobar baz')
+
+      session.send_string('baz')
+      wait_for { session.content }.to eq('foobaz bar')
+    end
+  end
+
+  context 'when ZSH_AUTOSUGGEST_STRATEGY is set to a string' do
+    let(:after_sourcing) do
+      -> do
+        session.
+          run_command(foobar_strategy).
+          run_command(foobaz_strategy).
+          run_command('ZSH_AUTOSUGGEST_STRATEGY="foobar foobaz"')
+      end
+    end
+
+    it 'is determined by the first strategy function to return a suggestion' do
+      session.send_string('foo')
+      wait_for { session.content }.to eq('foobar baz')
+
+      session.send_string('baz')
+      wait_for { session.content }.to eq('foobaz bar')
+    end
+  end
+end
+
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/widget_lists_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/widget_lists_spec.rb
new file mode 100644
index 00000000..421b84e4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/options/widget_lists_spec.rb
@@ -0,0 +1,121 @@
+describe 'a zle widget' do
+  let(:widget) { 'my-widget' }
+  let(:before_sourcing) { -> { session.run_command("#{widget}() {}; zle -N #{widget}; bindkey ^B #{widget}") } }
+
+  context 'when added to ZSH_AUTOSUGGEST_ACCEPT_WIDGETS' do
+    let(:options) { ["ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=(#{widget})"] }
+
+    it 'accepts the suggestion and moves the cursor to the end of the buffer when invoked' do
+      with_history('echo hello') do
+        session.send_string('e')
+        wait_for { session.content }.to eq('echo hello')
+        session.send_keys('C-b')
+        wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
+        wait_for { session.cursor }.to eq([10, 0])
+      end
+    end
+  end
+
+  context 'when added to ZSH_AUTOSUGGEST_CLEAR_WIDGETS' do
+    let(:options) { ["ZSH_AUTOSUGGEST_CLEAR_WIDGETS+=(#{widget})"] }
+
+    it 'clears the suggestion when invoked' do
+      with_history('echo hello') do
+        session.send_string('e')
+        wait_for { session.content }.to eq('echo hello')
+        session.send_keys('C-b')
+        wait_for { session.content }.to eq('e')
+      end
+    end
+  end
+
+  context 'when added to ZSH_AUTOSUGGEST_EXECUTE_WIDGETS' do
+    let(:options) { ["ZSH_AUTOSUGGEST_EXECUTE_WIDGETS+=(#{widget})"] }
+
+    it 'executes the suggestion when invoked' do
+      with_history('echo hello') do
+        session.send_string('e')
+        wait_for { session.content }.to eq('echo hello')
+        session.send_keys('C-b')
+        wait_for { session.content }.to end_with("\nhello")
+      end
+    end
+  end
+
+  context 'when added to ZSH_AUTOSUGGEST_IGNORE_WIDGETS' do
+    let(:options) { ["ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(#{widget})"] }
+
+    it 'should not be wrapped with an autosuggest widget' do
+      session.run_command("echo $widgets[#{widget}]")
+      wait_for { session.content }.to end_with("\nuser:#{widget}")
+    end
+  end
+
+  context 'that moves the cursor forward' do
+    before { session.run_command("#{widget}() { zle forward-char }") }
+
+    context 'when added to ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS' do
+      let(:options) { ["ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(#{widget})"] }
+
+      it 'accepts the suggestion as far as the cursor is moved when invoked' do
+        with_history('echo hello') do
+          session.send_string('e')
+          wait_for { session.content }.to start_with('echo hello')
+          session.send_keys('C-b')
+          wait_for { session.content(esc_seqs: true) }.to match(/\Aec\e\[[0-9]+mho hello/)
+        end
+      end
+    end
+  end
+
+  context 'that modifies the buffer' do
+    before { session.run_command("#{widget}() { BUFFER=\"foo\" }") }
+
+    context 'when not added to any of the widget lists' do
+      it 'modifies the buffer and fetches a new suggestion' do
+        with_history('foobar') do
+          session.send_keys('C-b')
+          wait_for { session.content }.to eq('foobar')
+        end
+      end
+    end
+  end
+end
+
+describe 'a modification to the widget lists' do
+  let(:widget) { 'my-widget' }
+  let(:before_sourcing) { -> { session.run_command("#{widget}() {}; zle -N #{widget}; bindkey ^B #{widget}") } }
+  before { session.run_command("ZSH_AUTOSUGGEST_ACCEPT_WIDGETS+=(#{widget})") }
+
+  it 'takes effect on the next cmd line' do
+    with_history('echo hello') do
+      session.send_string('e')
+      wait_for { session.content }.to eq('echo hello')
+      session.send_keys('C-b')
+      wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
+    end
+  end
+
+  context 'when manual rebind is enabled' do
+    let(:options) { ["ZSH_AUTOSUGGEST_MANUAL_REBIND=true"] }
+
+    it 'does not take effect until bind command is re-run' do
+      with_history('echo hello') do
+        session.send_string('e')
+        wait_for { session.content }.to eq('echo hello')
+        session.send_keys('C-b')
+        sleep 1
+        expect(session.content(esc_seqs: true)).not_to eq('echo hello')
+
+        session.send_keys('C-c')
+        session.run_command('_zsh_autosuggest_bind_widgets').clear_screen
+        wait_for { session.content }.to eq('')
+
+        session.send_string('e')
+        wait_for { session.content }.to eq('echo hello')
+        session.send_keys('C-b')
+        wait_for { session.content(esc_seqs: true) }.to eq('echo hello')
+      end
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/spec_helper.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/spec_helper.rb
new file mode 100644
index 00000000..dc1abb0a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/spec_helper.rb
@@ -0,0 +1,54 @@
+require 'pry'
+require 'rspec/wait'
+require 'terminal_session'
+require 'tempfile'
+
+RSpec.shared_context 'terminal session' do
+  let(:term_opts) { {} }
+  let(:session) { TerminalSession.new(term_opts) }
+  let(:before_sourcing) { -> {} }
+  let(:after_sourcing) { -> {} }
+  let(:options) { [] }
+
+  around do |example|
+    before_sourcing.call
+    session.run_command(['source zsh-autosuggestions.zsh', *options].join('; '))
+    after_sourcing.call
+    session.clear_screen
+
+    example.run
+
+    session.destroy
+  end
+
+  def with_history(*commands, &block)
+    Tempfile.create do |f|
+      f.write(commands.map{|c| c.gsub("\n", "\\\n")}.join("\n"))
+      f.flush
+
+      session.run_command('fc -p')
+      session.run_command("fc -R #{f.path}")
+
+      session.clear_screen
+
+      yield block
+
+      session.send_keys('C-c')
+      session.run_command('fc -P')
+    end
+  end
+end
+
+RSpec.configure do |config|
+  config.expect_with :rspec do |expectations|
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.wait_timeout = 2
+
+  config.include_context 'terminal session'
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/completion_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/completion_spec.rb
new file mode 100644
index 00000000..92794d6a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/completion_spec.rb
@@ -0,0 +1,72 @@
+describe 'the `completion` suggestion strategy' do
+  let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=completion'] }
+  let(:before_sourcing) do
+    -> do
+      session.
+        run_command('autoload compinit && compinit').
+        run_command('_foo() { compadd bar; compadd bat }').
+        run_command('_num() { compadd two; compadd three }').
+        run_command('compdef _foo baz').
+        run_command('compdef _num one')
+    end
+  end
+
+  it 'suggests the first completion result' do
+    session.send_string('baz ')
+    wait_for { session.content }.to eq('baz bar')
+  end
+
+  it 'does not add extra carriage returns when prefix has a line feed' do
+    skip '`stty` does not work inside zpty below zsh version 5.0.3' if session.zsh_version < Gem::Version.new('5.0.3')
+    session.send_string('baz \\').send_keys('C-v', 'C-j')
+    wait_for { session.content }.to eq("baz \\\nbar")
+  end
+
+  context 'when `_complete` is aliased' do
+    let(:before_sourcing) do
+      -> do
+        session.
+          run_command('autoload compinit && compinit').
+          run_command('_foo() { compadd bar; compadd bat }').
+          run_command('compdef _foo baz').
+          run_command('alias _complete=_complete')
+      end
+    end
+
+    it 'suggests the first completion result' do
+      session.send_string('baz ')
+      wait_for { session.content }.to eq('baz bar')
+    end
+  end
+
+  context 'when ZSH_AUTOSUGGEST_COMPLETION_IGNORE is set to a pattern' do
+    let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=completion', 'ZSH_AUTOSUGGEST_COMPLETION_IGNORE="one *"'] }
+
+    it 'makes suggestions when the buffer does not match the pattern' do
+      session.send_string('baz ')
+      wait_for { session.content }.to eq('baz bar')
+    end
+
+    it 'does not make suggestions when the buffer matches the pattern' do
+      session.send_string('one t')
+      sleep 1
+      expect(session.content).to eq('one t')
+    end
+  end
+
+  context 'when async mode is enabled' do
+    let(:options) { ['ZSH_AUTOSUGGEST_USE_ASYNC=true', 'ZSH_AUTOSUGGEST_STRATEGY=completion'] }
+
+    it 'suggests the first completion result' do
+      session.send_string('baz ')
+      wait_for { session.content }.to eq('baz bar')
+    end
+
+    it 'does not add extra carriage returns when prefix has a line feed' do
+      skip '`stty` does not work inside zpty below zsh version 5.0.3' if session.zsh_version < Gem::Version.new('5.0.3')
+      session.send_string('baz \\').send_keys('C-v', 'C-j')
+      wait_for { session.content }.to eq("baz \\\nbar")
+    end
+  end
+end
+
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/history_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/history_spec.rb
new file mode 100644
index 00000000..eee8efdf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/history_spec.rb
@@ -0,0 +1,23 @@
+require 'strategies/special_characters_helper'
+
+describe 'the `history` suggestion strategy' do
+  it 'suggests the last matching history entry' do
+    with_history('ls foo', 'ls bar', 'echo baz') do
+      session.send_string('ls')
+      wait_for { session.content }.to eq('ls bar')
+    end
+  end
+
+  context 'when ZSH_AUTOSUGGEST_HISTORY_IGNORE is set to a pattern' do
+    let(:options) { ['ZSH_AUTOSUGGEST_HISTORY_IGNORE="* bar"'] }
+
+    it 'does not make suggestions that match the pattern' do
+      with_history('ls foo', 'ls bar', 'echo baz') do
+        session.send_string('ls')
+        wait_for { session.content }.to eq('ls foo')
+      end
+    end
+  end
+
+  include_examples 'special characters'
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/match_prev_cmd_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/match_prev_cmd_spec.rb
new file mode 100644
index 00000000..c435f162
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/match_prev_cmd_spec.rb
@@ -0,0 +1,34 @@
+require 'strategies/special_characters_helper'
+
+describe 'the `match_prev_cmd` strategy' do
+  let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd'] }
+
+  let(:history) { [
+    'echo what',
+    'ls foo',
+    'echo what',
+    'ls bar',
+    'ls baz',
+    'echo what'
+  ] }
+
+  it 'suggests the last matching history entry after the previous command' do
+    with_history(*history) do
+      session.send_string('ls')
+      wait_for { session.content }.to eq('ls bar')
+    end
+  end
+
+  context 'when ZSH_AUTOSUGGEST_HISTORY_IGNORE is set to a pattern' do
+    let(:options) { ['ZSH_AUTOSUGGEST_STRATEGY=match_prev_cmd', 'ZSH_AUTOSUGGEST_HISTORY_IGNORE="* bar"'] }
+
+    it 'does not make suggestions that match the pattern' do
+      with_history(*history) do
+        session.send_string('ls')
+        wait_for { session.content }.to eq('ls foo')
+      end
+    end
+  end
+
+  include_examples 'special characters'
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/special_characters_helper.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/special_characters_helper.rb
new file mode 100644
index 00000000..eb1f0cdd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/strategies/special_characters_helper.rb
@@ -0,0 +1,75 @@
+shared_examples 'special characters' do
+  describe 'a special character in the buffer should be treated like any other character' do
+    it 'asterisk' do
+      with_history('echo "hello*"', 'echo "hello."') do
+        session.send_string('echo "hello*')
+        wait_for { session.content }.to eq('echo "hello*"')
+      end
+    end
+
+    it 'question mark' do
+      with_history('echo "hello?"', 'echo "hello."') do
+        session.send_string('echo "hello?')
+        wait_for { session.content }.to eq('echo "hello?"')
+      end
+    end
+
+    it 'backslash' do
+      with_history('echo "hello\nworld"') do
+        session.send_string('echo "hello\\')
+        wait_for { session.content }.to eq('echo "hello\nworld"')
+      end
+    end
+
+    it 'double backslash' do
+      with_history('echo "\\\\"') do
+        session.send_string('echo "\\\\')
+        wait_for { session.content }.to eq('echo "\\\\"')
+      end
+    end
+
+    it 'tilde' do
+      with_history('echo ~/foo') do
+        session.send_string('echo ~')
+        wait_for { session.content }.to eq('echo ~/foo')
+      end
+    end
+
+    it 'parentheses' do
+      with_history('echo "$(ls foo)"') do
+        session.send_string('echo "$(')
+        wait_for { session.content }.to eq('echo "$(ls foo)"')
+      end
+    end
+
+    it 'square bracket' do
+      with_history('echo "$history[123]"') do
+        session.send_string('echo "$history[')
+        wait_for { session.content }.to eq('echo "$history[123]"')
+        session.send_string('123]')
+        wait_for { session.content }.to eq('echo "$history[123]"')
+      end
+    end
+
+    it 'octothorpe' do
+      with_history('echo "#yolo"') do
+        session.send_string('echo "#')
+        wait_for { session.content }.to eq('echo "#yolo"')
+      end
+    end
+
+    it 'caret' do
+      with_history('echo "^A"', 'echo "^B"') do
+        session.send_string('echo "^A')
+        wait_for { session.content }.to eq('echo "^A"')
+      end
+    end
+
+    it 'dash' do
+      with_history('-foo() {}') do
+        session.send_string('-')
+        wait_for { session.content }.to eq('-foo() {}')
+      end
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/terminal_session.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/terminal_session.rb
new file mode 100644
index 00000000..f91ee6cd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/terminal_session.rb
@@ -0,0 +1,99 @@
+require 'securerandom'
+
+class TerminalSession
+  ZSH_BIN = ENV['TEST_ZSH_BIN'] || 'zsh'
+
+  def initialize(opts = {})
+    opts = {
+      width: 80,
+      height: 24,
+      prompt: '',
+      term: 'xterm-256color',
+      zsh_bin: ZSH_BIN
+    }.merge(opts)
+
+    @opts = opts
+
+    cmd="PS1=\"#{opts[:prompt]}\" TERM=#{opts[:term]} #{ZSH_BIN} -f"
+    tmux_command("new-session -d -x #{opts[:width]} -y #{opts[:height]} '#{cmd}'")
+  end
+
+  def zsh_version
+    @zsh_version ||= Gem::Version.new(`#{ZSH_BIN} -c 'echo -n $ZSH_VERSION'`)
+  end
+
+  def tmux_socket_name
+    @tmux_socket_name ||= SecureRandom.hex(6)
+  end
+
+  def run_command(command)
+    send_string(command)
+    send_keys('enter')
+
+    self
+  end
+
+  def send_string(str)
+    tmux_command("send-keys -t 0 -l -- '#{str.gsub("'", "\\'")}'")
+
+    self
+  end
+
+  def send_keys(*keys)
+    tmux_command("send-keys -t 0 #{keys.join(' ')}")
+
+    self
+  end
+
+  def paste_string(str)
+    tmux_command("set-buffer -- '#{str}'")
+    tmux_command("paste-buffer -dpr -t 0")
+
+    self
+  end
+
+  def content(esc_seqs: false)
+    cmd = 'capture-pane -p -t 0'
+    cmd += ' -e' if esc_seqs
+    tmux_command(cmd).strip
+  end
+
+  def clear_screen
+    send_keys('C-l')
+
+    i = 0
+    until content == opts[:prompt] || i > 20 do
+      sleep(0.1)
+      i = i + 1
+    end
+
+    self
+  end
+
+  def destroy
+    tmux_command('kill-session')
+  end
+
+  def cursor
+    tmux_command("display-message -t 0 -p '\#{cursor_x},\#{cursor_y}'").
+      strip.
+      split(',').
+      map(&:to_i)
+  end
+
+  def attach!
+    tmux_command('attach-session')
+  end
+
+  private
+
+  attr_reader :opts
+
+  def tmux_command(cmd)
+    out = `tmux -u -L #{tmux_socket_name} #{cmd}`
+
+    raise("tmux error running: '#{cmd}'") unless $?.success?
+
+    out
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/disable_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/disable_spec.rb
new file mode 100644
index 00000000..b387a590
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/disable_spec.rb
@@ -0,0 +1,19 @@
+describe 'the `autosuggest-disable` widget' do
+  before do
+    session.run_command('bindkey ^B autosuggest-disable')
+  end
+
+  it 'disables suggestions and clears the suggestion' do
+    with_history('echo hello') do
+      session.send_string('echo')
+      wait_for { session.content }.to eq('echo hello')
+
+      session.send_keys('C-b')
+      wait_for { session.content }.to eq('echo')
+
+      session.send_string(' h')
+      sleep 1
+      expect(session.content).to eq('echo h')
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/enable_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/enable_spec.rb
new file mode 100644
index 00000000..3ad35a8c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/enable_spec.rb
@@ -0,0 +1,42 @@
+describe 'the `autosuggest-enable` widget' do
+  before do
+    session.
+      run_command('typeset -g _ZSH_AUTOSUGGEST_DISABLED').
+      run_command('bindkey ^B autosuggest-enable')
+  end
+
+  it 'enables suggestions and fetches a suggestion' do
+    with_history('echo hello') do
+      session.send_string('e')
+      sleep 1
+      expect(session.content).to eq('e')
+
+      session.send_keys('C-b')
+      session.send_string('c')
+      wait_for { session.content }.to eq('echo hello')
+    end
+  end
+
+  context 'invoked on an empty buffer' do
+    it 'does not fetch a suggestion' do
+      with_history('echo hello') do
+        session.send_keys('C-b')
+        sleep 1
+        expect(session.content).to eq('')
+      end
+    end
+  end
+
+  context 'invoked on a non-empty buffer' do
+    it 'fetches a suggestion' do
+      with_history('echo hello') do
+        session.send_string('e')
+        sleep 1
+        expect(session.content).to eq('e')
+
+        session.send_keys('C-b')
+        wait_for { session.content }.to eq('echo hello')
+      end
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/fetch_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/fetch_spec.rb
new file mode 100644
index 00000000..eb8f2ba5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/fetch_spec.rb
@@ -0,0 +1,24 @@
+describe 'the `autosuggest-fetch` widget' do
+  context 'when suggestions are disabled' do
+    before do
+      session.
+        run_command('bindkey ^B autosuggest-disable').
+        run_command('bindkey ^F autosuggest-fetch').
+        send_keys('C-b')
+    end
+
+    it 'will fetch and display a suggestion' do
+      with_history('echo hello') do
+        session.send_string('echo h')
+        sleep 1
+        expect(session.content).to eq('echo h')
+
+        session.send_keys('C-f')
+        wait_for { session.content }.to eq('echo hello')
+
+        session.send_string('e')
+        wait_for { session.content }.to eq('echo hello')
+      end
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/toggle_spec.rb b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/toggle_spec.rb
new file mode 100644
index 00000000..8f9f3c3d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/spec/widgets/toggle_spec.rb
@@ -0,0 +1,26 @@
+describe 'the `autosuggest-toggle` widget' do
+  before do
+    session.run_command('bindkey ^B autosuggest-toggle')
+  end
+
+  it 'toggles suggestions' do
+    with_history('echo world', 'echo hello') do
+      session.send_string('echo')
+      wait_for { session.content }.to eq('echo hello')
+
+      session.send_keys('C-b')
+      wait_for { session.content }.to eq('echo')
+
+      session.send_string(' h')
+      sleep 1
+      expect(session.content).to eq('echo h')
+
+      session.send_keys('C-b')
+      wait_for { session.content }.to eq('echo hello')
+
+      session.send_keys('C-h')
+      session.send_string('w')
+      wait_for { session.content }.to eq('echo world')
+    end
+  end
+end
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/async.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/async.zsh
new file mode 100644
index 00000000..e1797345
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/async.zsh
@@ -0,0 +1,77 @@
+
+#--------------------------------------------------------------------#
+# Async                                                              #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_async_request() {
+	zmodload zsh/system 2>/dev/null # For `$sysparams`
+
+	typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
+
+	# If we've got a pending request, cancel it
+	if [[ -n "$_ZSH_AUTOSUGGEST_ASYNC_FD" ]] && { true <&$_ZSH_AUTOSUGGEST_ASYNC_FD } 2>/dev/null; then
+		# Close the file descriptor and remove the handler
+		builtin exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
+		zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
+
+		# We won't know the pid unless the user has zsh/system module installed
+		if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
+			# Zsh will make a new process group for the child process only if job
+			# control is enabled (MONITOR option)
+			if [[ -o MONITOR ]]; then
+				# Send the signal to the process group to kill any processes that may
+				# have been forked by the suggestion strategy
+				kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
+			else
+				# Kill just the child process since it wasn't placed in a new process
+				# group. If the suggestion strategy forked any child processes they may
+				# be orphaned and left behind.
+				kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
+			fi
+		fi
+	fi
+
+	# Fork a process to fetch a suggestion and open a pipe to read from it
+	builtin exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
+		# Tell parent process our pid
+		echo $sysparams[pid]
+
+		# Fetch and print the suggestion
+		local suggestion
+		_zsh_autosuggest_fetch_suggestion "$1"
+		echo -nE "$suggestion"
+	)
+
+	# There's a weird bug here where ^C stops working unless we force a fork
+	# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
+	autoload -Uz is-at-least
+	is-at-least 5.8 || command true
+
+	# Read the pid from the child process
+	read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
+
+	# When the fd is readable, call the response handler
+	zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
+}
+
+# Called when new data is ready to be read from the pipe
+# First arg will be fd ready for reading
+# Second arg will be passed in case of error
+_zsh_autosuggest_async_response() {
+	emulate -L zsh
+
+	local suggestion
+
+	if [[ -z "$2" || "$2" == "hup" ]]; then
+		# Read everything from the fd and give it as a suggestion
+		IFS='' read -rd '' -u $1 suggestion
+		zle autosuggest-suggest -- "$suggestion"
+
+		# Close the fd
+		builtin exec {1}<&-
+	fi
+
+	# Always remove the handler
+	zle -F "$1"
+	_ZSH_AUTOSUGGEST_ASYNC_FD=
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/bind.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/bind.zsh
new file mode 100644
index 00000000..1dde137c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/bind.zsh
@@ -0,0 +1,106 @@
+
+#--------------------------------------------------------------------#
+# Widget Helpers                                                     #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_incr_bind_count() {
+	typeset -gi bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]+1))
+	_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=$bind_count
+}
+
+# Bind a single widget to an autosuggest widget, saving a reference to the original widget
+_zsh_autosuggest_bind_widget() {
+	typeset -gA _ZSH_AUTOSUGGEST_BIND_COUNTS
+
+	local widget=$1
+	local autosuggest_action=$2
+	local prefix=$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX
+
+	local -i bind_count
+
+	# Save a reference to the original widget
+	case $widgets[$widget] in
+		# Already bound
+		user:_zsh_autosuggest_(bound|orig)_*)
+			bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$widget]))
+			;;
+
+		# User-defined widget
+		user:*)
+			_zsh_autosuggest_incr_bind_count $widget
+			zle -N $prefix$bind_count-$widget ${widgets[$widget]#*:}
+			;;
+
+		# Built-in widget
+		builtin)
+			_zsh_autosuggest_incr_bind_count $widget
+			eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
+			zle -N $prefix$bind_count-$widget _zsh_autosuggest_orig_$widget
+			;;
+
+		# Completion widget
+		completion:*)
+			_zsh_autosuggest_incr_bind_count $widget
+			eval "zle -C $prefix$bind_count-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
+			;;
+	esac
+
+	# Pass the original widget's name explicitly into the autosuggest
+	# function. Use this passed in widget name to call the original
+	# widget instead of relying on the $WIDGET variable being set
+	# correctly. $WIDGET cannot be trusted because other plugins call
+	# zle without the `-w` flag (e.g. `zle self-insert` instead of
+	# `zle self-insert -w`).
+	eval "_zsh_autosuggest_bound_${bind_count}_${(q)widget}() {
+		_zsh_autosuggest_widget_$autosuggest_action $prefix$bind_count-${(q)widget} \$@
+	}"
+
+	# Create the bound widget
+	zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
+}
+
+# Map all configured widgets to the right autosuggest widgets
+_zsh_autosuggest_bind_widgets() {
+	emulate -L zsh
+
+ 	local widget
+	local ignore_widgets
+
+	ignore_widgets=(
+		.\*
+		_\*
+		${_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS/#/autosuggest-}
+		$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
+		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	)
+
+	# Find every widget we might want to bind and bind it appropriately
+	for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
+		if [[ -n ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget clear
+		elif [[ -n ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget accept
+		elif [[ -n ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget execute
+		elif [[ -n ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget partial_accept
+		else
+			# Assume any unspecified widget might modify the buffer
+			_zsh_autosuggest_bind_widget $widget modify
+		fi
+	done
+}
+
+# Given the name of an original widget and args, invoke it, if it exists
+_zsh_autosuggest_invoke_original_widget() {
+	# Do nothing unless called with at least one arg
+	(( $# )) || return 0
+
+	local original_widget_name="$1"
+
+	shift
+
+	if (( ${+widgets[$original_widget_name]} )); then
+		zle $original_widget_name -- $@
+	fi
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/config.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/config.zsh
new file mode 100644
index 00000000..32d32b25
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/config.zsh
@@ -0,0 +1,95 @@
+
+#--------------------------------------------------------------------#
+# Global Configuration Variables                                     #
+#--------------------------------------------------------------------#
+
+# Color to use when highlighting suggestion
+# Uses format of `region_highlight`
+# More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets
+(( ! ${+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE} )) &&
+typeset -g ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
+
+# Prefix to use when saving original versions of bound widgets
+(( ! ${+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX} )) &&
+typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
+
+# Strategies to use to fetch a suggestion
+# Will try each strategy in order until a suggestion is returned
+(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_STRATEGY
+	ZSH_AUTOSUGGEST_STRATEGY=(history)
+}
+
+# Widgets that clear the suggestion
+(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+	ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
+		history-search-forward
+		history-search-backward
+		history-beginning-search-forward
+		history-beginning-search-backward
+		history-beginning-search-forward-end
+		history-beginning-search-backward-end
+		history-substring-search-up
+		history-substring-search-down
+		up-line-or-beginning-search
+		down-line-or-beginning-search
+		up-line-or-history
+		down-line-or-history
+		accept-line
+		copy-earlier-word
+	)
+}
+
+# Widgets that accept the entire suggestion
+(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
+		forward-char
+		end-of-line
+		vi-forward-char
+		vi-end-of-line
+		vi-add-eol
+	)
+}
+
+# Widgets that accept the entire suggestion and execute it
+(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
+	ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+	)
+}
+
+# Widgets that accept the suggestion as far as the cursor moves
+(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
+		forward-word
+		emacs-forward-word
+		vi-forward-word
+		vi-forward-word-end
+		vi-forward-blank-word
+		vi-forward-blank-word-end
+		vi-find-next-char
+		vi-find-next-char-skip
+	)
+}
+
+# Widgets that should be ignored (globbing supported but must be escaped)
+(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
+		orig-\*
+		beep
+		run-help
+		set-local-history
+		which-command
+		yank
+		yank-pop
+		zle-\*
+	)
+}
+
+# Pty name for capturing completions for completion suggestion strategy
+(( ! ${+ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME} )) &&
+typeset -g ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME=zsh_autosuggest_completion_pty
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/fetch.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/fetch.zsh
new file mode 100644
index 00000000..fef27152
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/fetch.zsh
@@ -0,0 +1,27 @@
+
+#--------------------------------------------------------------------#
+# Fetch Suggestion                                                   #
+#--------------------------------------------------------------------#
+# Loops through all specified strategies and returns a suggestion
+# from the first strategy to provide one.
+#
+
+_zsh_autosuggest_fetch_suggestion() {
+	typeset -g suggestion
+	local -a strategies
+	local strategy
+
+	# Ensure we are working with an array
+	strategies=(${=ZSH_AUTOSUGGEST_STRATEGY})
+
+	for strategy in $strategies; do
+		# Try to get a suggestion from this strategy
+		_zsh_autosuggest_strategy_$strategy "$1"
+
+		# Ensure the suggestion matches the prefix
+		[[ "$suggestion" != "$1"* ]] && unset suggestion
+
+		# Break once we've found a valid suggestion
+		[[ -n "$suggestion" ]] && break
+	done
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/highlight.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/highlight.zsh
new file mode 100644
index 00000000..273c03d5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/highlight.zsh
@@ -0,0 +1,26 @@
+
+#--------------------------------------------------------------------#
+# Highlighting                                                       #
+#--------------------------------------------------------------------#
+
+# If there was a highlight, remove it
+_zsh_autosuggest_highlight_reset() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if [[ -n "$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT" ]]; then
+		region_highlight=("${(@)region_highlight:#$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT}")
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
+
+# If there's a suggestion, highlight it
+_zsh_autosuggest_highlight_apply() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if (( $#POSTDISPLAY )); then
+		typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
+	else
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/start.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/start.zsh
new file mode 100644
index 00000000..5d4ee521
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/start.zsh
@@ -0,0 +1,33 @@
+
+#--------------------------------------------------------------------#
+# Start                                                              #
+#--------------------------------------------------------------------#
+
+# Start the autosuggestion widgets
+_zsh_autosuggest_start() {
+	# By default we re-bind widgets on every precmd to ensure we wrap other
+	# wrappers. Specifically, highlighting breaks if our widgets are wrapped by
+	# zsh-syntax-highlighting widgets. This also allows modifications to the
+	# widget list variables to take effect on the next precmd. However this has
+	# a decent performance hit, so users can set ZSH_AUTOSUGGEST_MANUAL_REBIND
+	# to disable the automatic re-binding.
+	if (( ${+ZSH_AUTOSUGGEST_MANUAL_REBIND} )); then
+		add-zsh-hook -d precmd _zsh_autosuggest_start
+	fi
+
+	_zsh_autosuggest_bind_widgets
+}
+
+# Mark for auto-loading the functions that we use
+autoload -Uz add-zsh-hook is-at-least
+
+# Automatically enable asynchronous mode in newer versions of zsh. Disable for
+# older versions because there is a bug when using async mode where ^C does not
+# work immediately after fetching a suggestion.
+# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
+if is-at-least 5.0.8; then
+	typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=
+fi
+
+# Start the autosuggestion widgets on the next precmd
+add-zsh-hook precmd _zsh_autosuggest_start
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/completion.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/completion.zsh
new file mode 100644
index 00000000..e2d114c8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/completion.zsh
@@ -0,0 +1,137 @@
+
+#--------------------------------------------------------------------#
+# Completion Suggestion Strategy                                     #
+#--------------------------------------------------------------------#
+# Fetches a suggestion from the completion engine
+#
+
+_zsh_autosuggest_capture_postcompletion() {
+	# Always insert the first completion into the buffer
+	compstate[insert]=1
+
+	# Don't list completions
+	unset 'compstate[list]'
+}
+
+_zsh_autosuggest_capture_completion_widget() {
+	# Add a post-completion hook to be called after all completions have been
+	# gathered. The hook can modify compstate to affect what is done with the
+	# gathered completions.
+	local -a +h comppostfuncs
+	comppostfuncs=(_zsh_autosuggest_capture_postcompletion)
+
+	# Only capture completions at the end of the buffer
+	CURSOR=$#BUFFER
+
+	# Run the original widget wrapping `.complete-word` so we don't
+	# recursively try to fetch suggestions, since our pty is forked
+	# after autosuggestions is initialized.
+	zle -- ${(k)widgets[(r)completion:.complete-word:_main_complete]}
+
+	if is-at-least 5.0.3; then
+		# Don't do any cr/lf transformations. We need to do this immediately before
+		# output because if we do it in setup, onlcr will be re-enabled when we enter
+		# vared in the async code path. There is a bug in zpty module in older versions
+		# where the tty is not properly attached to the pty slave, resulting in stty
+		# getting stopped with a SIGTTOU. See zsh-workers thread 31660 and upstream
+		# commit f75904a38
+		stty -onlcr -ocrnl -F /dev/tty
+	fi
+
+	# The completion has been added, print the buffer as the suggestion
+	echo -nE - $'\0'$BUFFER$'\0'
+}
+
+zle -N autosuggest-capture-completion _zsh_autosuggest_capture_completion_widget
+
+_zsh_autosuggest_capture_setup() {
+	# There is a bug in zpty module in older zsh versions by which a
+	# zpty that exits will kill all zpty processes that were forked
+	# before it. Here we set up a zsh exit hook to SIGKILL the zpty
+	# process immediately, before it has a chance to kill any other
+	# zpty processes.
+	if ! is-at-least 5.4; then
+		zshexit() {
+			# The zsh builtin `kill` fails sometimes in older versions
+			# https://unix.stackexchange.com/a/477647/156673
+			kill -KILL $$ 2>&- || command kill -KILL $$
+
+			# Block for long enough for the signal to come through
+			sleep 1
+		}
+	fi
+
+	# Try to avoid any suggestions that wouldn't match the prefix
+	zstyle ':completion:*' matcher-list ''
+	zstyle ':completion:*' path-completion false
+	zstyle ':completion:*' max-errors 0 not-numeric
+
+	bindkey '^I' autosuggest-capture-completion
+}
+
+_zsh_autosuggest_capture_completion_sync() {
+	_zsh_autosuggest_capture_setup
+
+	zle autosuggest-capture-completion
+}
+
+_zsh_autosuggest_capture_completion_async() {
+	_zsh_autosuggest_capture_setup
+
+	zmodload zsh/parameter 2>/dev/null || return # For `$functions`
+
+	# Make vared completion work as if for a normal command line
+	# https://stackoverflow.com/a/7057118/154703
+	autoload +X _complete
+	functions[_original_complete]=$functions[_complete]
+	function _complete() {
+		unset 'compstate[vared]'
+		_original_complete "$@"
+	}
+
+	# Open zle with buffer set so we can capture completions for it
+	vared 1
+}
+
+_zsh_autosuggest_strategy_completion() {
+	# Reset options to defaults and enable LOCAL_OPTIONS
+	emulate -L zsh
+
+	# Enable extended glob for completion ignore pattern
+	setopt EXTENDED_GLOB
+
+	typeset -g suggestion
+	local line REPLY
+
+	# Exit if we don't have completions
+	whence compdef >/dev/null || return
+
+	# Exit if we don't have zpty
+	zmodload zsh/zpty 2>/dev/null || return
+
+	# Exit if our search string matches the ignore pattern
+	[[ -n "$ZSH_AUTOSUGGEST_COMPLETION_IGNORE" ]] && [[ "$1" == $~ZSH_AUTOSUGGEST_COMPLETION_IGNORE ]] && return
+
+	# Zle will be inactive if we are in async mode
+	if zle; then
+		zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_sync
+	else
+		zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_async "\$1"
+		zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t'
+	fi
+
+	{
+		# The completion result is surrounded by null bytes, so read the
+		# content between the first two null bytes.
+		zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
+
+		# Extract the suggestion from between the null bytes.  On older
+		# versions of zsh (older than 5.3), we sometimes get extra bytes after
+		# the second null byte, so trim those off the end.
+		# See http://www.zsh.org/mla/workers/2015/msg03290.html
+		suggestion="${${(@0)line}[2]}"
+	} always {
+		# Destroy the pty
+		zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
+	}
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/history.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/history.zsh
new file mode 100644
index 00000000..0672a136
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/history.zsh
@@ -0,0 +1,32 @@
+
+#--------------------------------------------------------------------#
+# History Suggestion Strategy                                        #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix.
+#
+
+_zsh_autosuggest_strategy_history() {
+	# Reset options to defaults and enable LOCAL_OPTIONS
+	emulate -L zsh
+
+	# Enable globbing flags so that we can use (#m) and (x~y) glob operator
+	setopt EXTENDED_GLOB
+
+	# Escape backslashes and all of the glob operators so we can use
+	# this string as a pattern to search the $history associative array.
+	# - (#m) globbing flag enables setting references for match data
+	# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
+	local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
+
+	# Get the history items that match the prefix, excluding those that match
+	# the ignore pattern
+	local pattern="$prefix*"
+	if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
+		pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
+	fi
+
+	# Give the first history item matching the pattern as the suggestion
+	# - (r) subscript flag makes the pattern match on values
+	typeset -g suggestion="${history[(r)$pattern]}"
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/match_prev_cmd.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/match_prev_cmd.zsh
new file mode 100644
index 00000000..b7097837
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/strategies/match_prev_cmd.zsh
@@ -0,0 +1,66 @@
+
+#--------------------------------------------------------------------#
+# Match Previous Command Suggestion Strategy                         #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix and whose preceding history item also matches the most
+# recently executed command.
+#
+# For example, suppose your history has the following entries:
+#   - pwd
+#   - ls foo
+#   - ls bar
+#   - pwd
+#
+# Given the history list above, when you type 'ls', the suggestion
+# will be 'ls foo' rather than 'ls bar' because your most recently
+# executed command (pwd) was previously followed by 'ls foo'.
+#
+# Note that this strategy won't work as expected with ZSH options that don't
+# preserve the history order such as `HIST_IGNORE_ALL_DUPS` or
+# `HIST_EXPIRE_DUPS_FIRST`.
+
+_zsh_autosuggest_strategy_match_prev_cmd() {
+	# Reset options to defaults and enable LOCAL_OPTIONS
+	emulate -L zsh
+
+	# Enable globbing flags so that we can use (#m) and (x~y) glob operator
+	setopt EXTENDED_GLOB
+
+	# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
+	local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
+
+	# Get the history items that match the prefix, excluding those that match
+	# the ignore pattern
+	local pattern="$prefix*"
+	if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
+		pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
+	fi
+
+	# Get all history event numbers that correspond to history
+	# entries that match the pattern
+	local history_match_keys
+	history_match_keys=(${(k)history[(R)$~pattern]})
+
+	# By default we use the first history number (most recent history entry)
+	local histkey="${history_match_keys[1]}"
+
+	# Get the previously executed command
+	local prev_cmd="$(_zsh_autosuggest_escape_command "${history[$((HISTCMD-1))]}")"
+
+	# Iterate up to the first 200 history event numbers that match $prefix
+	for key in "${(@)history_match_keys[1,200]}"; do
+		# Stop if we ran out of history
+		[[ $key -gt 1 ]] || break
+
+		# See if the history entry preceding the suggestion matches the
+		# previous command, and use it if it does
+		if [[ "${history[$((key - 1))]}" == "$prev_cmd" ]]; then
+			histkey="$key"
+			break
+		fi
+	done
+
+	# Give back the matched history entry
+	typeset -g suggestion="$history[$histkey]"
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/util.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/util.zsh
new file mode 100644
index 00000000..1f55d363
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/util.zsh
@@ -0,0 +1,11 @@
+
+#--------------------------------------------------------------------#
+# Utility Functions                                                  #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_escape_command() {
+	setopt localoptions EXTENDED_GLOB
+
+	# Escape special chars in the string (requires EXTENDED_GLOB)
+	echo -E "${1//(#m)[\"\'\\()\[\]|*?~]/\\$MATCH}"
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/widgets.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/widgets.zsh
new file mode 100644
index 00000000..7562897e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/src/widgets.zsh
@@ -0,0 +1,231 @@
+
+#--------------------------------------------------------------------#
+# Autosuggest Widget Implementations                                 #
+#--------------------------------------------------------------------#
+
+# Disable suggestions
+_zsh_autosuggest_disable() {
+	typeset -g _ZSH_AUTOSUGGEST_DISABLED
+	_zsh_autosuggest_clear
+}
+
+# Enable suggestions
+_zsh_autosuggest_enable() {
+	unset _ZSH_AUTOSUGGEST_DISABLED
+
+	if (( $#BUFFER )); then
+		_zsh_autosuggest_fetch
+	fi
+}
+
+# Toggle suggestions (enable/disable)
+_zsh_autosuggest_toggle() {
+	if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
+		_zsh_autosuggest_enable
+	else
+		_zsh_autosuggest_disable
+	fi
+}
+
+# Clear the suggestion
+_zsh_autosuggest_clear() {
+	# Remove the suggestion
+	POSTDISPLAY=
+
+	_zsh_autosuggest_invoke_original_widget $@
+}
+
+# Modify the buffer and get a new suggestion
+_zsh_autosuggest_modify() {
+	local -i retval
+
+	# Only available in zsh >= 5.4
+	local -i KEYS_QUEUED_COUNT
+
+	# Save the contents of the buffer/postdisplay
+	local orig_buffer="$BUFFER"
+	local orig_postdisplay="$POSTDISPLAY"
+
+	# Clear suggestion while waiting for next one
+	POSTDISPLAY=
+
+	# Original widget may modify the buffer
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	emulate -L zsh
+
+	# Don't fetch a new suggestion if there's more input to be read immediately
+	if (( $PENDING > 0 || $KEYS_QUEUED_COUNT > 0 )); then
+		POSTDISPLAY="$orig_postdisplay"
+		return $retval
+	fi
+
+	# Optimize if manually typing in the suggestion or if buffer hasn't changed
+	if [[ "$BUFFER" = "$orig_buffer"* && "$orig_postdisplay" = "${BUFFER:$#orig_buffer}"* ]]; then
+		POSTDISPLAY="${orig_postdisplay:$(($#BUFFER - $#orig_buffer))}"
+		return $retval
+	fi
+
+	# Bail out if suggestions are disabled
+	if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
+		return $?
+	fi
+
+	# Get a new suggestion if the buffer is not empty after modification
+	if (( $#BUFFER > 0 )); then
+		if [[ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] || (( $#BUFFER <= $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )); then
+			_zsh_autosuggest_fetch
+		fi
+	fi
+
+	return $retval
+}
+
+# Fetch a new suggestion based on what's currently in the buffer
+_zsh_autosuggest_fetch() {
+	if (( ${+ZSH_AUTOSUGGEST_USE_ASYNC} )); then
+		_zsh_autosuggest_async_request "$BUFFER"
+	else
+		local suggestion
+		_zsh_autosuggest_fetch_suggestion "$BUFFER"
+		_zsh_autosuggest_suggest "$suggestion"
+	fi
+}
+
+# Offer a suggestion
+_zsh_autosuggest_suggest() {
+	emulate -L zsh
+
+	local suggestion="$1"
+
+	if [[ -n "$suggestion" ]] && (( $#BUFFER )); then
+		POSTDISPLAY="${suggestion#$BUFFER}"
+	else
+		POSTDISPLAY=
+	fi
+}
+
+# Accept the entire suggestion
+_zsh_autosuggest_accept() {
+	local -i retval max_cursor_pos=$#BUFFER
+
+	# When vicmd keymap is active, the cursor can't move all the way
+	# to the end of the buffer
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		max_cursor_pos=$((max_cursor_pos - 1))
+	fi
+
+	# If we're not in a valid state to accept a suggestion, just run the
+	# original widget and bail out
+	if (( $CURSOR != $max_cursor_pos || !$#POSTDISPLAY )); then
+		_zsh_autosuggest_invoke_original_widget $@
+		return
+	fi
+
+	# Only accept if the cursor is at the end of the buffer
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Remove the suggestion
+	POSTDISPLAY=
+
+	# Run the original widget before manually moving the cursor so that the
+	# cursor movement doesn't make the widget do something unexpected
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# Move the cursor to the end of the buffer
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		CURSOR=$(($#BUFFER - 1))
+	else
+		CURSOR=$#BUFFER
+	fi
+
+	return $retval
+}
+
+# Accept the entire suggestion and execute it
+_zsh_autosuggest_execute() {
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Remove the suggestion
+	POSTDISPLAY=
+
+	# Call the original `accept-line` to handle syntax highlighting or
+	# other potential custom behavior
+	_zsh_autosuggest_invoke_original_widget "accept-line"
+}
+
+# Partially accept the suggestion
+_zsh_autosuggest_partial_accept() {
+	local -i retval cursor_loc
+
+	# Save the contents of the buffer so we can restore later if needed
+	local original_buffer="$BUFFER"
+
+	# Temporarily accept the suggestion.
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Original widget moves the cursor
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# Normalize cursor location across vi/emacs modes
+	cursor_loc=$CURSOR
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		cursor_loc=$((cursor_loc + 1))
+	fi
+
+	# If we've moved past the end of the original buffer
+	if (( $cursor_loc > $#original_buffer )); then
+		# Set POSTDISPLAY to text right of the cursor
+		POSTDISPLAY="${BUFFER[$(($cursor_loc + 1)),$#BUFFER]}"
+
+		# Clip the buffer at the cursor
+		BUFFER="${BUFFER[1,$cursor_loc]}"
+	else
+		# Restore the original buffer
+		BUFFER="$original_buffer"
+	fi
+
+	return $retval
+}
+
+() {
+	typeset -ga _ZSH_AUTOSUGGEST_BUILTIN_ACTIONS
+
+	_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS=(
+		clear
+		fetch
+		suggest
+		accept
+		execute
+		enable
+		disable
+		toggle
+	)
+
+	local action
+	for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS modify partial_accept; do
+		eval "_zsh_autosuggest_widget_$action() {
+			local -i retval
+
+			_zsh_autosuggest_highlight_reset
+
+			_zsh_autosuggest_$action \$@
+			retval=\$?
+
+			_zsh_autosuggest_highlight_apply
+
+			zle -R
+
+			return \$retval
+		}"
+	done
+
+	for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS; do
+		zle -N autosuggest-$action _zsh_autosuggest_widget_$action
+	done
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
new file mode 100644
index 00000000..16c22563
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
@@ -0,0 +1 @@
+source ${0:A:h}/zsh-autosuggestions.zsh
diff --git a/gentoo/dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh b/gentoo/dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
new file mode 100644
index 00000000..e7802251
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
@@ -0,0 +1,867 @@
+# Fish-like fast/unobtrusive autosuggestions for zsh.
+# https://github.com/zsh-users/zsh-autosuggestions
+# v0.7.1
+# Copyright (c) 2013 Thiago de Arruda
+# Copyright (c) 2016-2021 Eric Freese
+# 
+# Permission is hereby granted, free of charge, to any person
+# obtaining a copy of this software and associated documentation
+# files (the "Software"), to deal in the Software without
+# restriction, including without limitation the rights to use,
+# copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following
+# conditions:
+# 
+# The above copyright notice and this permission notice shall be
+# included in all copies or substantial portions of the Software.
+# 
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+# EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+# OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+# NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+# HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+# WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+# OTHER DEALINGS IN THE SOFTWARE.
+
+#--------------------------------------------------------------------#
+# Global Configuration Variables                                     #
+#--------------------------------------------------------------------#
+
+# Color to use when highlighting suggestion
+# Uses format of `region_highlight`
+# More info: http://zsh.sourceforge.net/Doc/Release/Zsh-Line-Editor.html#Zle-Widgets
+(( ! ${+ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE} )) &&
+typeset -g ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE='fg=8'
+
+# Prefix to use when saving original versions of bound widgets
+(( ! ${+ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX} )) &&
+typeset -g ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX=autosuggest-orig-
+
+# Strategies to use to fetch a suggestion
+# Will try each strategy in order until a suggestion is returned
+(( ! ${+ZSH_AUTOSUGGEST_STRATEGY} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_STRATEGY
+	ZSH_AUTOSUGGEST_STRATEGY=(history)
+}
+
+# Widgets that clear the suggestion
+(( ! ${+ZSH_AUTOSUGGEST_CLEAR_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_CLEAR_WIDGETS
+	ZSH_AUTOSUGGEST_CLEAR_WIDGETS=(
+		history-search-forward
+		history-search-backward
+		history-beginning-search-forward
+		history-beginning-search-backward
+		history-beginning-search-forward-end
+		history-beginning-search-backward-end
+		history-substring-search-up
+		history-substring-search-down
+		up-line-or-beginning-search
+		down-line-or-beginning-search
+		up-line-or-history
+		down-line-or-history
+		accept-line
+		copy-earlier-word
+	)
+}
+
+# Widgets that accept the entire suggestion
+(( ! ${+ZSH_AUTOSUGGEST_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_ACCEPT_WIDGETS=(
+		forward-char
+		end-of-line
+		vi-forward-char
+		vi-end-of-line
+		vi-add-eol
+	)
+}
+
+# Widgets that accept the entire suggestion and execute it
+(( ! ${+ZSH_AUTOSUGGEST_EXECUTE_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_EXECUTE_WIDGETS
+	ZSH_AUTOSUGGEST_EXECUTE_WIDGETS=(
+	)
+}
+
+# Widgets that accept the suggestion as far as the cursor moves
+(( ! ${+ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS
+	ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS=(
+		forward-word
+		emacs-forward-word
+		vi-forward-word
+		vi-forward-word-end
+		vi-forward-blank-word
+		vi-forward-blank-word-end
+		vi-find-next-char
+		vi-find-next-char-skip
+	)
+}
+
+# Widgets that should be ignored (globbing supported but must be escaped)
+(( ! ${+ZSH_AUTOSUGGEST_IGNORE_WIDGETS} )) && {
+	typeset -ga ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	ZSH_AUTOSUGGEST_IGNORE_WIDGETS=(
+		orig-\*
+		beep
+		run-help
+		set-local-history
+		which-command
+		yank
+		yank-pop
+		zle-\*
+	)
+}
+
+# Pty name for capturing completions for completion suggestion strategy
+(( ! ${+ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME} )) &&
+typeset -g ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME=zsh_autosuggest_completion_pty
+
+#--------------------------------------------------------------------#
+# Utility Functions                                                  #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_escape_command() {
+	setopt localoptions EXTENDED_GLOB
+
+	# Escape special chars in the string (requires EXTENDED_GLOB)
+	echo -E "${1//(#m)[\"\'\\()\[\]|*?~]/\\$MATCH}"
+}
+
+#--------------------------------------------------------------------#
+# Widget Helpers                                                     #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_incr_bind_count() {
+	typeset -gi bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]+1))
+	_ZSH_AUTOSUGGEST_BIND_COUNTS[$1]=$bind_count
+}
+
+# Bind a single widget to an autosuggest widget, saving a reference to the original widget
+_zsh_autosuggest_bind_widget() {
+	typeset -gA _ZSH_AUTOSUGGEST_BIND_COUNTS
+
+	local widget=$1
+	local autosuggest_action=$2
+	local prefix=$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX
+
+	local -i bind_count
+
+	# Save a reference to the original widget
+	case $widgets[$widget] in
+		# Already bound
+		user:_zsh_autosuggest_(bound|orig)_*)
+			bind_count=$((_ZSH_AUTOSUGGEST_BIND_COUNTS[$widget]))
+			;;
+
+		# User-defined widget
+		user:*)
+			_zsh_autosuggest_incr_bind_count $widget
+			zle -N $prefix$bind_count-$widget ${widgets[$widget]#*:}
+			;;
+
+		# Built-in widget
+		builtin)
+			_zsh_autosuggest_incr_bind_count $widget
+			eval "_zsh_autosuggest_orig_${(q)widget}() { zle .${(q)widget} }"
+			zle -N $prefix$bind_count-$widget _zsh_autosuggest_orig_$widget
+			;;
+
+		# Completion widget
+		completion:*)
+			_zsh_autosuggest_incr_bind_count $widget
+			eval "zle -C $prefix$bind_count-${(q)widget} ${${(s.:.)widgets[$widget]}[2,3]}"
+			;;
+	esac
+
+	# Pass the original widget's name explicitly into the autosuggest
+	# function. Use this passed in widget name to call the original
+	# widget instead of relying on the $WIDGET variable being set
+	# correctly. $WIDGET cannot be trusted because other plugins call
+	# zle without the `-w` flag (e.g. `zle self-insert` instead of
+	# `zle self-insert -w`).
+	eval "_zsh_autosuggest_bound_${bind_count}_${(q)widget}() {
+		_zsh_autosuggest_widget_$autosuggest_action $prefix$bind_count-${(q)widget} \$@
+	}"
+
+	# Create the bound widget
+	zle -N -- $widget _zsh_autosuggest_bound_${bind_count}_$widget
+}
+
+# Map all configured widgets to the right autosuggest widgets
+_zsh_autosuggest_bind_widgets() {
+	emulate -L zsh
+
+ 	local widget
+	local ignore_widgets
+
+	ignore_widgets=(
+		.\*
+		_\*
+		${_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS/#/autosuggest-}
+		$ZSH_AUTOSUGGEST_ORIGINAL_WIDGET_PREFIX\*
+		$ZSH_AUTOSUGGEST_IGNORE_WIDGETS
+	)
+
+	# Find every widget we might want to bind and bind it appropriately
+	for widget in ${${(f)"$(builtin zle -la)"}:#${(j:|:)~ignore_widgets}}; do
+		if [[ -n ${ZSH_AUTOSUGGEST_CLEAR_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget clear
+		elif [[ -n ${ZSH_AUTOSUGGEST_ACCEPT_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget accept
+		elif [[ -n ${ZSH_AUTOSUGGEST_EXECUTE_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget execute
+		elif [[ -n ${ZSH_AUTOSUGGEST_PARTIAL_ACCEPT_WIDGETS[(r)$widget]} ]]; then
+			_zsh_autosuggest_bind_widget $widget partial_accept
+		else
+			# Assume any unspecified widget might modify the buffer
+			_zsh_autosuggest_bind_widget $widget modify
+		fi
+	done
+}
+
+# Given the name of an original widget and args, invoke it, if it exists
+_zsh_autosuggest_invoke_original_widget() {
+	# Do nothing unless called with at least one arg
+	(( $# )) || return 0
+
+	local original_widget_name="$1"
+
+	shift
+
+	if (( ${+widgets[$original_widget_name]} )); then
+		zle $original_widget_name -- $@
+	fi
+}
+
+#--------------------------------------------------------------------#
+# Highlighting                                                       #
+#--------------------------------------------------------------------#
+
+# If there was a highlight, remove it
+_zsh_autosuggest_highlight_reset() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if [[ -n "$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT" ]]; then
+		region_highlight=("${(@)region_highlight:#$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT}")
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
+
+# If there's a suggestion, highlight it
+_zsh_autosuggest_highlight_apply() {
+	typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+
+	if (( $#POSTDISPLAY )); then
+		typeset -g _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT="$#BUFFER $(($#BUFFER + $#POSTDISPLAY)) $ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE"
+		region_highlight+=("$_ZSH_AUTOSUGGEST_LAST_HIGHLIGHT")
+	else
+		unset _ZSH_AUTOSUGGEST_LAST_HIGHLIGHT
+	fi
+}
+
+#--------------------------------------------------------------------#
+# Autosuggest Widget Implementations                                 #
+#--------------------------------------------------------------------#
+
+# Disable suggestions
+_zsh_autosuggest_disable() {
+	typeset -g _ZSH_AUTOSUGGEST_DISABLED
+	_zsh_autosuggest_clear
+}
+
+# Enable suggestions
+_zsh_autosuggest_enable() {
+	unset _ZSH_AUTOSUGGEST_DISABLED
+
+	if (( $#BUFFER )); then
+		_zsh_autosuggest_fetch
+	fi
+}
+
+# Toggle suggestions (enable/disable)
+_zsh_autosuggest_toggle() {
+	if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
+		_zsh_autosuggest_enable
+	else
+		_zsh_autosuggest_disable
+	fi
+}
+
+# Clear the suggestion
+_zsh_autosuggest_clear() {
+	# Remove the suggestion
+	POSTDISPLAY=
+
+	_zsh_autosuggest_invoke_original_widget $@
+}
+
+# Modify the buffer and get a new suggestion
+_zsh_autosuggest_modify() {
+	local -i retval
+
+	# Only available in zsh >= 5.4
+	local -i KEYS_QUEUED_COUNT
+
+	# Save the contents of the buffer/postdisplay
+	local orig_buffer="$BUFFER"
+	local orig_postdisplay="$POSTDISPLAY"
+
+	# Clear suggestion while waiting for next one
+	POSTDISPLAY=
+
+	# Original widget may modify the buffer
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	emulate -L zsh
+
+	# Don't fetch a new suggestion if there's more input to be read immediately
+	if (( $PENDING > 0 || $KEYS_QUEUED_COUNT > 0 )); then
+		POSTDISPLAY="$orig_postdisplay"
+		return $retval
+	fi
+
+	# Optimize if manually typing in the suggestion or if buffer hasn't changed
+	if [[ "$BUFFER" = "$orig_buffer"* && "$orig_postdisplay" = "${BUFFER:$#orig_buffer}"* ]]; then
+		POSTDISPLAY="${orig_postdisplay:$(($#BUFFER - $#orig_buffer))}"
+		return $retval
+	fi
+
+	# Bail out if suggestions are disabled
+	if (( ${+_ZSH_AUTOSUGGEST_DISABLED} )); then
+		return $?
+	fi
+
+	# Get a new suggestion if the buffer is not empty after modification
+	if (( $#BUFFER > 0 )); then
+		if [[ -z "$ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE" ]] || (( $#BUFFER <= $ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE )); then
+			_zsh_autosuggest_fetch
+		fi
+	fi
+
+	return $retval
+}
+
+# Fetch a new suggestion based on what's currently in the buffer
+_zsh_autosuggest_fetch() {
+	if (( ${+ZSH_AUTOSUGGEST_USE_ASYNC} )); then
+		_zsh_autosuggest_async_request "$BUFFER"
+	else
+		local suggestion
+		_zsh_autosuggest_fetch_suggestion "$BUFFER"
+		_zsh_autosuggest_suggest "$suggestion"
+	fi
+}
+
+# Offer a suggestion
+_zsh_autosuggest_suggest() {
+	emulate -L zsh
+
+	local suggestion="$1"
+
+	if [[ -n "$suggestion" ]] && (( $#BUFFER )); then
+		POSTDISPLAY="${suggestion#$BUFFER}"
+	else
+		POSTDISPLAY=
+	fi
+}
+
+# Accept the entire suggestion
+_zsh_autosuggest_accept() {
+	local -i retval max_cursor_pos=$#BUFFER
+
+	# When vicmd keymap is active, the cursor can't move all the way
+	# to the end of the buffer
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		max_cursor_pos=$((max_cursor_pos - 1))
+	fi
+
+	# If we're not in a valid state to accept a suggestion, just run the
+	# original widget and bail out
+	if (( $CURSOR != $max_cursor_pos || !$#POSTDISPLAY )); then
+		_zsh_autosuggest_invoke_original_widget $@
+		return
+	fi
+
+	# Only accept if the cursor is at the end of the buffer
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Remove the suggestion
+	POSTDISPLAY=
+
+	# Run the original widget before manually moving the cursor so that the
+	# cursor movement doesn't make the widget do something unexpected
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# Move the cursor to the end of the buffer
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		CURSOR=$(($#BUFFER - 1))
+	else
+		CURSOR=$#BUFFER
+	fi
+
+	return $retval
+}
+
+# Accept the entire suggestion and execute it
+_zsh_autosuggest_execute() {
+	# Add the suggestion to the buffer
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Remove the suggestion
+	POSTDISPLAY=
+
+	# Call the original `accept-line` to handle syntax highlighting or
+	# other potential custom behavior
+	_zsh_autosuggest_invoke_original_widget "accept-line"
+}
+
+# Partially accept the suggestion
+_zsh_autosuggest_partial_accept() {
+	local -i retval cursor_loc
+
+	# Save the contents of the buffer so we can restore later if needed
+	local original_buffer="$BUFFER"
+
+	# Temporarily accept the suggestion.
+	BUFFER="$BUFFER$POSTDISPLAY"
+
+	# Original widget moves the cursor
+	_zsh_autosuggest_invoke_original_widget $@
+	retval=$?
+
+	# Normalize cursor location across vi/emacs modes
+	cursor_loc=$CURSOR
+	if [[ "$KEYMAP" = "vicmd" ]]; then
+		cursor_loc=$((cursor_loc + 1))
+	fi
+
+	# If we've moved past the end of the original buffer
+	if (( $cursor_loc > $#original_buffer )); then
+		# Set POSTDISPLAY to text right of the cursor
+		POSTDISPLAY="${BUFFER[$(($cursor_loc + 1)),$#BUFFER]}"
+
+		# Clip the buffer at the cursor
+		BUFFER="${BUFFER[1,$cursor_loc]}"
+	else
+		# Restore the original buffer
+		BUFFER="$original_buffer"
+	fi
+
+	return $retval
+}
+
+() {
+	typeset -ga _ZSH_AUTOSUGGEST_BUILTIN_ACTIONS
+
+	_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS=(
+		clear
+		fetch
+		suggest
+		accept
+		execute
+		enable
+		disable
+		toggle
+	)
+
+	local action
+	for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS modify partial_accept; do
+		eval "_zsh_autosuggest_widget_$action() {
+			local -i retval
+
+			_zsh_autosuggest_highlight_reset
+
+			_zsh_autosuggest_$action \$@
+			retval=\$?
+
+			_zsh_autosuggest_highlight_apply
+
+			zle -R
+
+			return \$retval
+		}"
+	done
+
+	for action in $_ZSH_AUTOSUGGEST_BUILTIN_ACTIONS; do
+		zle -N autosuggest-$action _zsh_autosuggest_widget_$action
+	done
+}
+
+#--------------------------------------------------------------------#
+# Completion Suggestion Strategy                                     #
+#--------------------------------------------------------------------#
+# Fetches a suggestion from the completion engine
+#
+
+_zsh_autosuggest_capture_postcompletion() {
+	# Always insert the first completion into the buffer
+	compstate[insert]=1
+
+	# Don't list completions
+	unset 'compstate[list]'
+}
+
+_zsh_autosuggest_capture_completion_widget() {
+	# Add a post-completion hook to be called after all completions have been
+	# gathered. The hook can modify compstate to affect what is done with the
+	# gathered completions.
+	local -a +h comppostfuncs
+	comppostfuncs=(_zsh_autosuggest_capture_postcompletion)
+
+	# Only capture completions at the end of the buffer
+	CURSOR=$#BUFFER
+
+	# Run the original widget wrapping `.complete-word` so we don't
+	# recursively try to fetch suggestions, since our pty is forked
+	# after autosuggestions is initialized.
+	zle -- ${(k)widgets[(r)completion:.complete-word:_main_complete]}
+
+	if is-at-least 5.0.3; then
+		# Don't do any cr/lf transformations. We need to do this immediately before
+		# output because if we do it in setup, onlcr will be re-enabled when we enter
+		# vared in the async code path. There is a bug in zpty module in older versions
+		# where the tty is not properly attached to the pty slave, resulting in stty
+		# getting stopped with a SIGTTOU. See zsh-workers thread 31660 and upstream
+		# commit f75904a38
+		stty -onlcr -ocrnl -F /dev/tty
+	fi
+
+	# The completion has been added, print the buffer as the suggestion
+	echo -nE - $'\0'$BUFFER$'\0'
+}
+
+zle -N autosuggest-capture-completion _zsh_autosuggest_capture_completion_widget
+
+_zsh_autosuggest_capture_setup() {
+	# There is a bug in zpty module in older zsh versions by which a
+	# zpty that exits will kill all zpty processes that were forked
+	# before it. Here we set up a zsh exit hook to SIGKILL the zpty
+	# process immediately, before it has a chance to kill any other
+	# zpty processes.
+	if ! is-at-least 5.4; then
+		zshexit() {
+			# The zsh builtin `kill` fails sometimes in older versions
+			# https://unix.stackexchange.com/a/477647/156673
+			kill -KILL $$ 2>&- || command kill -KILL $$
+
+			# Block for long enough for the signal to come through
+			sleep 1
+		}
+	fi
+
+	# Try to avoid any suggestions that wouldn't match the prefix
+	zstyle ':completion:*' matcher-list ''
+	zstyle ':completion:*' path-completion false
+	zstyle ':completion:*' max-errors 0 not-numeric
+
+	bindkey '^I' autosuggest-capture-completion
+}
+
+_zsh_autosuggest_capture_completion_sync() {
+	_zsh_autosuggest_capture_setup
+
+	zle autosuggest-capture-completion
+}
+
+_zsh_autosuggest_capture_completion_async() {
+	_zsh_autosuggest_capture_setup
+
+	zmodload zsh/parameter 2>/dev/null || return # For `$functions`
+
+	# Make vared completion work as if for a normal command line
+	# https://stackoverflow.com/a/7057118/154703
+	autoload +X _complete
+	functions[_original_complete]=$functions[_complete]
+	function _complete() {
+		unset 'compstate[vared]'
+		_original_complete "$@"
+	}
+
+	# Open zle with buffer set so we can capture completions for it
+	vared 1
+}
+
+_zsh_autosuggest_strategy_completion() {
+	# Reset options to defaults and enable LOCAL_OPTIONS
+	emulate -L zsh
+
+	# Enable extended glob for completion ignore pattern
+	setopt EXTENDED_GLOB
+
+	typeset -g suggestion
+	local line REPLY
+
+	# Exit if we don't have completions
+	whence compdef >/dev/null || return
+
+	# Exit if we don't have zpty
+	zmodload zsh/zpty 2>/dev/null || return
+
+	# Exit if our search string matches the ignore pattern
+	[[ -n "$ZSH_AUTOSUGGEST_COMPLETION_IGNORE" ]] && [[ "$1" == $~ZSH_AUTOSUGGEST_COMPLETION_IGNORE ]] && return
+
+	# Zle will be inactive if we are in async mode
+	if zle; then
+		zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_sync
+	else
+		zpty $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME _zsh_autosuggest_capture_completion_async "\$1"
+		zpty -w $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME $'\t'
+	fi
+
+	{
+		# The completion result is surrounded by null bytes, so read the
+		# content between the first two null bytes.
+		zpty -r $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME line '*'$'\0''*'$'\0'
+
+		# Extract the suggestion from between the null bytes.  On older
+		# versions of zsh (older than 5.3), we sometimes get extra bytes after
+		# the second null byte, so trim those off the end.
+		# See http://www.zsh.org/mla/workers/2015/msg03290.html
+		suggestion="${${(@0)line}[2]}"
+	} always {
+		# Destroy the pty
+		zpty -d $ZSH_AUTOSUGGEST_COMPLETIONS_PTY_NAME
+	}
+}
+
+#--------------------------------------------------------------------#
+# History Suggestion Strategy                                        #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix.
+#
+
+_zsh_autosuggest_strategy_history() {
+	# Reset options to defaults and enable LOCAL_OPTIONS
+	emulate -L zsh
+
+	# Enable globbing flags so that we can use (#m) and (x~y) glob operator
+	setopt EXTENDED_GLOB
+
+	# Escape backslashes and all of the glob operators so we can use
+	# this string as a pattern to search the $history associative array.
+	# - (#m) globbing flag enables setting references for match data
+	# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
+	local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
+
+	# Get the history items that match the prefix, excluding those that match
+	# the ignore pattern
+	local pattern="$prefix*"
+	if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
+		pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
+	fi
+
+	# Give the first history item matching the pattern as the suggestion
+	# - (r) subscript flag makes the pattern match on values
+	typeset -g suggestion="${history[(r)$pattern]}"
+}
+
+#--------------------------------------------------------------------#
+# Match Previous Command Suggestion Strategy                         #
+#--------------------------------------------------------------------#
+# Suggests the most recent history item that matches the given
+# prefix and whose preceding history item also matches the most
+# recently executed command.
+#
+# For example, suppose your history has the following entries:
+#   - pwd
+#   - ls foo
+#   - ls bar
+#   - pwd
+#
+# Given the history list above, when you type 'ls', the suggestion
+# will be 'ls foo' rather than 'ls bar' because your most recently
+# executed command (pwd) was previously followed by 'ls foo'.
+#
+# Note that this strategy won't work as expected with ZSH options that don't
+# preserve the history order such as `HIST_IGNORE_ALL_DUPS` or
+# `HIST_EXPIRE_DUPS_FIRST`.
+
+_zsh_autosuggest_strategy_match_prev_cmd() {
+	# Reset options to defaults and enable LOCAL_OPTIONS
+	emulate -L zsh
+
+	# Enable globbing flags so that we can use (#m) and (x~y) glob operator
+	setopt EXTENDED_GLOB
+
+	# TODO: Use (b) flag when we can drop support for zsh older than v5.0.8
+	local prefix="${1//(#m)[\\*?[\]<>()|^~#]/\\$MATCH}"
+
+	# Get the history items that match the prefix, excluding those that match
+	# the ignore pattern
+	local pattern="$prefix*"
+	if [[ -n $ZSH_AUTOSUGGEST_HISTORY_IGNORE ]]; then
+		pattern="($pattern)~($ZSH_AUTOSUGGEST_HISTORY_IGNORE)"
+	fi
+
+	# Get all history event numbers that correspond to history
+	# entries that match the pattern
+	local history_match_keys
+	history_match_keys=(${(k)history[(R)$~pattern]})
+
+	# By default we use the first history number (most recent history entry)
+	local histkey="${history_match_keys[1]}"
+
+	# Get the previously executed command
+	local prev_cmd="$(_zsh_autosuggest_escape_command "${history[$((HISTCMD-1))]}")"
+
+	# Iterate up to the first 200 history event numbers that match $prefix
+	for key in "${(@)history_match_keys[1,200]}"; do
+		# Stop if we ran out of history
+		[[ $key -gt 1 ]] || break
+
+		# See if the history entry preceding the suggestion matches the
+		# previous command, and use it if it does
+		if [[ "${history[$((key - 1))]}" == "$prev_cmd" ]]; then
+			histkey="$key"
+			break
+		fi
+	done
+
+	# Give back the matched history entry
+	typeset -g suggestion="$history[$histkey]"
+}
+
+#--------------------------------------------------------------------#
+# Fetch Suggestion                                                   #
+#--------------------------------------------------------------------#
+# Loops through all specified strategies and returns a suggestion
+# from the first strategy to provide one.
+#
+
+_zsh_autosuggest_fetch_suggestion() {
+	typeset -g suggestion
+	local -a strategies
+	local strategy
+
+	# Ensure we are working with an array
+	strategies=(${=ZSH_AUTOSUGGEST_STRATEGY})
+
+	for strategy in $strategies; do
+		# Try to get a suggestion from this strategy
+		_zsh_autosuggest_strategy_$strategy "$1"
+
+		# Ensure the suggestion matches the prefix
+		[[ "$suggestion" != "$1"* ]] && unset suggestion
+
+		# Break once we've found a valid suggestion
+		[[ -n "$suggestion" ]] && break
+	done
+}
+
+#--------------------------------------------------------------------#
+# Async                                                              #
+#--------------------------------------------------------------------#
+
+_zsh_autosuggest_async_request() {
+	zmodload zsh/system 2>/dev/null # For `$sysparams`
+
+	typeset -g _ZSH_AUTOSUGGEST_ASYNC_FD _ZSH_AUTOSUGGEST_CHILD_PID
+
+	# If we've got a pending request, cancel it
+	if [[ -n "$_ZSH_AUTOSUGGEST_ASYNC_FD" ]] && { true <&$_ZSH_AUTOSUGGEST_ASYNC_FD } 2>/dev/null; then
+		# Close the file descriptor and remove the handler
+		builtin exec {_ZSH_AUTOSUGGEST_ASYNC_FD}<&-
+		zle -F $_ZSH_AUTOSUGGEST_ASYNC_FD
+
+		# We won't know the pid unless the user has zsh/system module installed
+		if [[ -n "$_ZSH_AUTOSUGGEST_CHILD_PID" ]]; then
+			# Zsh will make a new process group for the child process only if job
+			# control is enabled (MONITOR option)
+			if [[ -o MONITOR ]]; then
+				# Send the signal to the process group to kill any processes that may
+				# have been forked by the suggestion strategy
+				kill -TERM -$_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
+			else
+				# Kill just the child process since it wasn't placed in a new process
+				# group. If the suggestion strategy forked any child processes they may
+				# be orphaned and left behind.
+				kill -TERM $_ZSH_AUTOSUGGEST_CHILD_PID 2>/dev/null
+			fi
+		fi
+	fi
+
+	# Fork a process to fetch a suggestion and open a pipe to read from it
+	builtin exec {_ZSH_AUTOSUGGEST_ASYNC_FD}< <(
+		# Tell parent process our pid
+		echo $sysparams[pid]
+
+		# Fetch and print the suggestion
+		local suggestion
+		_zsh_autosuggest_fetch_suggestion "$1"
+		echo -nE "$suggestion"
+	)
+
+	# There's a weird bug here where ^C stops working unless we force a fork
+	# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
+	autoload -Uz is-at-least
+	is-at-least 5.8 || command true
+
+	# Read the pid from the child process
+	read _ZSH_AUTOSUGGEST_CHILD_PID <&$_ZSH_AUTOSUGGEST_ASYNC_FD
+
+	# When the fd is readable, call the response handler
+	zle -F "$_ZSH_AUTOSUGGEST_ASYNC_FD" _zsh_autosuggest_async_response
+}
+
+# Called when new data is ready to be read from the pipe
+# First arg will be fd ready for reading
+# Second arg will be passed in case of error
+_zsh_autosuggest_async_response() {
+	emulate -L zsh
+
+	local suggestion
+
+	if [[ -z "$2" || "$2" == "hup" ]]; then
+		# Read everything from the fd and give it as a suggestion
+		IFS='' read -rd '' -u $1 suggestion
+		zle autosuggest-suggest -- "$suggestion"
+
+		# Close the fd
+		builtin exec {1}<&-
+	fi
+
+	# Always remove the handler
+	zle -F "$1"
+	_ZSH_AUTOSUGGEST_ASYNC_FD=
+}
+
+#--------------------------------------------------------------------#
+# Start                                                              #
+#--------------------------------------------------------------------#
+
+# Start the autosuggestion widgets
+_zsh_autosuggest_start() {
+	# By default we re-bind widgets on every precmd to ensure we wrap other
+	# wrappers. Specifically, highlighting breaks if our widgets are wrapped by
+	# zsh-syntax-highlighting widgets. This also allows modifications to the
+	# widget list variables to take effect on the next precmd. However this has
+	# a decent performance hit, so users can set ZSH_AUTOSUGGEST_MANUAL_REBIND
+	# to disable the automatic re-binding.
+	if (( ${+ZSH_AUTOSUGGEST_MANUAL_REBIND} )); then
+		add-zsh-hook -d precmd _zsh_autosuggest_start
+	fi
+
+	_zsh_autosuggest_bind_widgets
+}
+
+# Mark for auto-loading the functions that we use
+autoload -Uz add-zsh-hook is-at-least
+
+# Automatically enable asynchronous mode in newer versions of zsh. Disable for
+# older versions because there is a bug when using async mode where ^C does not
+# work immediately after fetching a suggestion.
+# See https://github.com/zsh-users/zsh-autosuggestions/issues/364
+if is-at-least 5.0.8; then
+	typeset -g ZSH_AUTOSUGGEST_USE_ASYNC=
+fi
+
+# Start the autosuggestion widgets on the next precmd
+add-zsh-hook precmd _zsh_autosuggest_start
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.editorconfig b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.editorconfig
new file mode 100644
index 00000000..cda541d5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.editorconfig
@@ -0,0 +1,15 @@
+# Top-most editorconfig file
+
+root = true
+
+[*]
+end_of_line = lf
+tab_width   = 2
+indent_size = 2
+indent_style = space
+
+[Makefile]
+tab_width   = 8
+indent_size = 8
+indent_style = tab
+
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.gitattributes b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.gitattributes
new file mode 100644
index 00000000..715e624b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.gitattributes
@@ -0,0 +1 @@
+.revision-hash export-subst
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.github/workflows/test.yml b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.github/workflows/test.yml
new file mode 100644
index 00000000..cd50b8ac
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.github/workflows/test.yml
@@ -0,0 +1,75 @@
+---
+name: Tests
+on:
+  push:
+    paths-ignore:
+      - '**.md'
+      - '**.png'
+  pull_request:
+    paths-ignore:
+      - '**.md'
+      - '**.png'
+  schedule:
+    - cron: '29 7 * * 1'
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        version:
+          - master
+          - 5.9
+          - 5.8.1
+          - 5.8
+          - 5.7.1
+          - 5.7
+          - 5.6.2
+          - 5.6.1
+          - 5.6
+          - 5.5.1
+          - 5.5
+          - 5.4.2
+          - 5.4.1
+          - 5.4
+          - 5.3.1
+          - 5.3
+          - 5.2
+          - 5.1.1
+          - 5.1
+          - 5.0.8
+          - 5.0.7
+          - 5.0.6
+          - 5.0.5
+          - 5.0.4
+          - 5.0.3
+          - 5.0.2
+          - 5.0.1
+          - 5.0.0
+          - 4.3.17
+          - 4.3.16
+          - 4.3.15
+          - 4.3.14
+          - 4.3.13
+          - 4.3.12
+          - 4.3.11
+    container:
+      image: ghcr.io/zsh-users/zsh:${{ matrix.version }}
+    steps:
+      - uses: actions/checkout@v4
+      - run: install_packages bsdmainutils make procps
+      - run: make test
+
+  notify:
+    runs-on: ubuntu-latest
+    needs: test
+    if: failure() && (github.repository_owner == 'zsh-users')
+    steps:
+      -
+        name: Notify IRC
+        uses: Gottox/irc-message-action@v2
+        with:
+          channel: '#zsh-syntax-highlighting'
+          nickname: zsyh-gh-bot
+          message: '${{ github.ref }} failed tests: https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}'
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.revision-hash b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.revision-hash
new file mode 100644
index 00000000..6828f88d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.revision-hash
@@ -0,0 +1 @@
+$Format:%H$
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.version b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.version
new file mode 100644
index 00000000..d182dc91
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/.version
@@ -0,0 +1 @@
+0.8.1-dev
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/COPYING.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/COPYING.md
new file mode 100644
index 00000000..cacbcbee
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/COPYING.md
@@ -0,0 +1,23 @@
+Copyright (c) 2010-2020 zsh-syntax-highlighting contributors
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted
+provided that the following conditions are met:
+
+ * Redistributions of source code must retain the above copyright notice, this list of conditions
+   and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice, this list of
+   conditions and the following disclaimer in the documentation and/or other materials provided
+   with the distribution.
+ * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+   may be used to endorse or promote products derived from this software without specific prior
+   written permission.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/HACKING.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/HACKING.md
new file mode 100644
index 00000000..ddd39a4e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/HACKING.md
@@ -0,0 +1,99 @@
+Hacking on zsh-syntax-highlighting itself
+=========================================
+
+This document includes information for people working on z-sy-h itself: on the
+core driver (`zsh-syntax-highlighting.zsh`), on the highlighters in the
+distribution, and on the test suite.  It does not target third-party
+highlighter authors (although they may find it an interesting read).
+
+The `main` highlighter
+----------------------
+
+The following function `pz` is useful when working on the `main` highlighting:
+
+```zsh
+pq() {
+  (( $#argv )) || return 0
+  print -r -l -- ${(qqqq)argv}
+}
+pz() {
+  local arg
+  for arg; do
+    pq ${(z)arg}
+  done
+}
+```
+
+It prints, for each argument, its token breakdown, similar to how the main
+loop of the `main` highlighter sees it.
+
+Testing the `brackets` highlighter
+----------------------------------
+
+Since the test harness empties `ZSH_HIGHLIGHT_STYLES` and the `brackets`
+highlighter interrogates `ZSH_HIGHLIGHT_STYLES` to determine how to highlight,
+tests must set the `bracket-level-#` keys themselves.  For example:
+
+```zsh
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x})'
+
+expected_region_highlight=(
+  "6  6  bracket-level-1" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+  "10 10 bracket-level-1" # )
+)
+```
+
+Testing the `pattern` and `regexp` highlighters
+-----------------------------------------------
+
+Because the `pattern` and `regexp` highlighters modifies `region_highlight`
+directly instead of using `_zsh_highlight_add_highlight`, the test harness
+cannot get the `ZSH_HIGHLIGHT_STYLES` keys.  Therefore, when writing tests, use
+the style itself as third word (cf. the
+[documentation for `expected_region_highlight`](docs/highlighters.md)).  For example:
+
+```zsh
+ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+
+BUFFER='rm -rf /'
+
+expected_region_highlight=(
+  "1 8 fg=white,bold,bg=red" # rm -rf /
+)
+```
+
+Memos and commas
+----------------
+
+We append to `region_highlight` as follows:
+
+
+```zsh
+region_highlight+=("$start $end $spec, memo=zsh-syntax-highlighting")
+```
+
+That comma is required to cause zsh 5.8 and older to ignore the memo without
+ignoring the `$spec`.  It's a hack, but given that no further 5.8.x patch
+releases are planned, it's been deemed acceptable.  See issue #418 and the
+cross-referenced issues.
+
+
+Miscellany
+----------
+
+If you work on the driver (`zsh-syntax-highlighting.zsh`), you may find the following zstyle useful:
+
+```zsh
+zstyle ':completion:*:*:*:*:globbed-files' ignored-patterns {'*/',}zsh-syntax-highlighting.plugin.zsh
+```
+
+IRC channel
+-----------
+
+We're on #zsh-syntax-highlighting on Libera.Chat.
+
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/INSTALL.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/INSTALL.md
new file mode 100644
index 00000000..2e1286db
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/INSTALL.md
@@ -0,0 +1,169 @@
+How to install
+--------------
+
+### Using packages
+
+First, install the package:
+
+* Arch Linux: [community/zsh-syntax-highlighting][arch-package] / [AUR/zsh-syntax-highlighting-git][AUR-package]
+* Debian: `zsh-syntax-highlighting` package [in `stretch`][debian-package] (or in [OBS repository][obs-repository])
+* Fedora: [zsh-syntax-highlighting package][fedora-package-alt] in Fedora 24+ (or in [OBS repository][obs-repository])
+* FreeBSD: `pkg install zsh-syntax-highlighting` (port name: [`shells/zsh-syntax-highlighting`][freebsd-port])
+* Gentoo: [app-shells/zsh-syntax-highlighting][gentoo-repository]
+* Mac OS X / Homebrew: `brew install zsh-syntax-highlighting` ([formula][brew-package])
+* NetBSD: `pkg_add zsh-syntax-highlighting` (port name: [`shells/zsh-syntax-highlighting`][netbsd-port])
+* OpenBSD: `pkg_add zsh-syntax-highlighting` (port name: [`shells/zsh-syntax-highlighting`][openbsd-port])
+* openSUSE / SLE: `zsh-syntax-highlighting` package in [OBS repository][obs-repository]
+* RHEL / CentOS / Scientific Linux: `zsh-syntax-highlighting` package in [OBS repository][obs-repository]
+* Ubuntu: `zsh-syntax-highlighting` package [in Xenial][ubuntu-package] (or in [OBS repository][obs-repository])
+* Void Linux: `zsh-syntax-highlighting package` [in XBPS][void-package]
+
+[arch-package]: https://www.archlinux.org/packages/zsh-syntax-highlighting
+[AUR-package]: https://aur.archlinux.org/packages/zsh-syntax-highlighting-git
+[brew-package]: https://github.com/Homebrew/homebrew-core/blob/master/Formula/z/zsh-syntax-highlighting.rb
+[debian-package]: https://packages.debian.org/zsh-syntax-highlighting
+[fedora-package]: https://apps.fedoraproject.org/packages/zsh-syntax-highlighting
+[fedora-package-alt]: https://bodhi.fedoraproject.org/updates/?packages=zsh-syntax-highlighting
+[freebsd-port]: https://www.freshports.org/textproc/zsh-syntax-highlighting/
+[gentoo-repository]: https://packages.gentoo.org/packages/app-shells/zsh-syntax-highlighting
+[netbsd-port]: http://cvsweb.netbsd.org/bsdweb.cgi/pkgsrc/shells/zsh-syntax-highlighting/
+[obs-repository]: https://software.opensuse.org/download.html?project=shells%3Azsh-users%3Azsh-syntax-highlighting&package=zsh-syntax-highlighting
+[openbsd-port]: https://cvsweb.openbsd.org/ports/shells/zsh-syntax-highlighting/
+[ubuntu-package]: https://launchpad.net/ubuntu/+source/zsh-syntax-highlighting
+[void-package]: https://github.com/void-linux/void-packages/tree/master/srcpkgs/zsh-syntax-highlighting
+
+See also [repology's cross-distro index](https://repology.org/metapackage/zsh-syntax-highlighting/versions)
+
+Second, enable zsh-syntax-highlighting by sourcing the script. Running this command on the terminal will add the source line to the end of your .zshrc:
+
+* On most Linux distributions (except perhaps NixOS):
+
+    ```zsh
+    echo "source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
+    ```
+
+* NetBSD and OpenBSD:
+
+    ```zsh
+    echo "source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
+    ```
+
+* Mac OS X / Homebrew:
+
+    ```zsh
+    echo "source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
+    ```
+
+Then restart zsh (such as by opening a new instance of your terminal emulator).
+
+ Alternatively, add the `source` command manually **at the end** of your `.zshrc`:
+
+* On most Linux distributions (except perhaps NixOS):
+`source /usr/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh`
+* NetBSD and OpenBSD:
+`source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh`
+
+Then restart zsh.
+
+### In your ~/.zshrc
+
+Simply clone this repository and source the script:
+
+```zsh
+git clone https://github.com/zsh-users/zsh-syntax-highlighting.git
+echo "source ${(q-)PWD}/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" >> ${ZDOTDIR:-$HOME}/.zshrc
+```
+
+  Then, enable syntax highlighting in the current interactive shell:
+
+```zsh
+source ./zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+```
+
+  If `git` is not installed, download and extract a snapshot of the latest
+  development tree from:
+
+```
+https://github.com/zsh-users/zsh-syntax-highlighting/archive/master.tar.gz
+```
+
+  Note the `source` command must be **at the end** of `~/.zshrc`.
+
+
+### With a plugin manager
+
+Note that `zsh-syntax-highlighting` must be the last plugin sourced.
+
+The zsh-syntax-highlighting authors recommend manual installation over the use
+of a framework or plugin manager.
+
+This list is incomplete as there are too many
+[frameworks / plugin managers][framework-list] to list them all here.
+
+[framework-list]: https://github.com/unixorn/awesome-zsh-plugins#frameworks
+
+#### [Antigen](https://github.com/zsh-users/antigen)
+
+Add `antigen bundle zsh-users/zsh-syntax-highlighting` as the last bundle in
+your `.zshrc`.
+
+#### [Fig](https://fig.io)
+
+Click the `Install Plugin` button on the [Fig plugin page][fig-plugin].
+
+[fig-plugin]: https://fig.io/plugins/other/zsh-syntax-highlighting
+
+#### [Oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh)
+
+1. Clone this repository in oh-my-zsh's plugins directory:
+
+    ```zsh
+    git clone https://github.com/zsh-users/zsh-syntax-highlighting.git ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-syntax-highlighting
+    ```
+
+2. Activate the plugin in `~/.zshrc`:
+
+    ```zsh
+    plugins=( [plugins...] zsh-syntax-highlighting)
+    ```
+
+3. Restart zsh (such as by opening a new instance of your terminal emulator).
+
+#### [Prezto](https://github.com/sorin-ionescu/prezto)
+
+Zsh-syntax-highlighting is included with Prezto. See the
+[Prezto documentation][prezto-docs] to enable and configure highlighters.
+
+[prezto-docs]: https://github.com/sorin-ionescu/prezto/tree/master/modules/syntax-highlighting
+
+#### [zgen](https://github.com/tarjoilija/zgen)
+
+Add `zgen load zsh-users/zsh-syntax-highlighting` to the end of your `.zshrc`.
+
+#### [zinit](https://github.com/zdharma-continuum/zinit)
+
+Add `zinit light zsh-users/zsh-syntax-highlighting` to the end of your
+`.zshrc`.
+
+#### [zplug](https://github.com/zplug/zplug)
+
+Add `zplug "zsh-users/zsh-syntax-highlighting", defer:2` to your `.zshrc`.
+
+
+### System-wide installation
+
+Any of the above methods is suitable for a single-user installation,
+which requires no special privileges.  If, however, you desire to install
+zsh-syntax-highlighting system-wide, you may do so by running
+
+```zsh
+make install
+```
+
+and directing your users to add
+
+```zsh
+source /usr/local/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+```
+
+to their `.zshrc`s.
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/Makefile b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/Makefile
new file mode 100644
index 00000000..bbc1d439
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/Makefile
@@ -0,0 +1,64 @@
+NAME=zsh-syntax-highlighting
+
+INSTALL?=install -c
+PREFIX?=/usr/local
+SHARE_DIR?=$(DESTDIR)$(PREFIX)/share/$(NAME)
+DOC_DIR?=$(DESTDIR)$(PREFIX)/share/doc/$(NAME)
+ZSH?=zsh # zsh binary to run tests with
+
+all:
+	cd docs && \
+	cp highlighters.md all.md && \
+	printf '\n\nIndividual highlighters documentation\n=====================================' >> all.md && \
+	for doc in highlighters/*.md; do printf '\n\n'; cat "$$doc"; done >> all.md
+
+install: all
+	$(INSTALL) -d $(SHARE_DIR)
+	$(INSTALL) -d $(DOC_DIR)
+	cp .version zsh-syntax-highlighting.zsh $(SHARE_DIR)
+	cp COPYING.md README.md changelog.md $(DOC_DIR)
+	sed -e '1s/ .*//' -e '/^\[build-status-[a-z]*\]: /d' < README.md > $(DOC_DIR)/README.md
+	if [ x"true" = x"`git rev-parse --is-inside-work-tree 2>/dev/null`" ]; then \
+		git rev-parse HEAD; \
+	else \
+		cat .revision-hash; \
+	fi > $(SHARE_DIR)/.revision-hash
+	:
+# The [ -e ] check below is to because sh evaluates this with (the moral
+# equivalent of) NONOMATCH in effect, and highlighters/*.zsh has no matches.
+	for dirname in highlighters highlighters/*/ ; do \
+		$(INSTALL) -d $(SHARE_DIR)/"$$dirname"; \
+		for fname in "$$dirname"/*.zsh ; do [ -e "$$fname" ] && cp "$$fname" $(SHARE_DIR)"/$$dirname"; done; \
+	done
+	cp -R docs/* $(DOC_DIR)
+
+clean:
+	rm -f docs/all.md
+
+test:
+	@$(ZSH) -fc 'echo ZSH_PATCHLEVEL=$$ZSH_PATCHLEVEL'
+	@result=0; \
+	for test in highlighters/*; do \
+		if [ -d $$test/test-data ]; then \
+			echo "Running test $${test##*/}"; \
+			env -i QUIET=$$QUIET $${TERM:+"TERM=$$TERM"} $(ZSH) -f tests/test-highlighting.zsh "$${test##*/}"; \
+			: $$(( result |= $$? )); \
+		fi \
+	done; \
+	exit $$result
+
+quiet-test:
+	$(MAKE) test QUIET=y
+
+perf:
+	@result=0; \
+	for test in highlighters/*; do \
+		if [ -d $$test/test-data ]; then \
+			echo "Running test $${test##*/}"; \
+			$(ZSH) -f tests/test-perfs.zsh "$${test##*/}"; \
+			: $$(( result |= $$? )); \
+		fi \
+	done; \
+	exit $$result
+
+.PHONY: all install clean test perf
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/README.md
new file mode 100644
index 00000000..4768b3dd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/README.md
@@ -0,0 +1,97 @@
+zsh-syntax-highlighting [![Build Status][build-status-image]][build-status]
+=======================
+
+**[Fish shell][fish]-like syntax highlighting for [Zsh][zsh].**
+
+*Requirements: zsh 4.3.11+.*
+
+[fish]: https://fishshell.com/
+[zsh]: https://www.zsh.org/
+
+This package provides syntax highlighting for the shell zsh.  It enables
+highlighting of commands whilst they are typed at a zsh prompt into an
+interactive terminal.  This helps in reviewing commands before running
+them, particularly in catching syntax errors.
+
+Some examples:
+
+Before: [![Screenshot #1.1](images/before1-smaller.png)](images/before1.png)
+<br/>
+After:&nbsp; [![Screenshot #1.2](images/after1-smaller.png)](images/after1.png)
+
+Before: [![Screenshot #2.1](images/before2-smaller.png)](images/before2.png)
+<br/>
+After:&nbsp; [![Screenshot #2.2](images/after2-smaller.png)](images/after2.png)
+
+Before: [![Screenshot #3.1](images/before3-smaller.png)](images/before3.png)
+<br/>
+After:&nbsp; [![Screenshot #3.2](images/after3-smaller.png)](images/after3.png)
+
+Before: [![Screenshot #4.1](images/before4-smaller.png)](images/before4-smaller.png)
+<br/>
+After:&nbsp; [![Screenshot #4.2](images/after4-smaller.png)](images/after4-smaller.png)
+
+
+
+How to install
+--------------
+
+See [INSTALL.md](INSTALL.md).
+
+
+FAQ
+---
+
+### Why must `zsh-syntax-highlighting.zsh` be sourced at the end of the `.zshrc` file?
+
+zsh-syntax-highlighting works by hooking into the Zsh Line Editor (ZLE) and
+computing syntax highlighting for the command-line buffer as it stands at the
+time z-sy-h's hook is invoked.
+
+In zsh 5.2 and older,
+`zsh-syntax-highlighting.zsh` hooks into ZLE by wrapping ZLE widgets.  It must
+be sourced after all custom widgets have been created (i.e., after all `zle -N`
+calls and after running `compinit`) in order to be able to wrap all of them.
+Widgets created after z-sy-h is sourced will work, but will not update the
+syntax highlighting.
+
+In zsh newer than 5.8 (not including 5.8 itself),
+zsh-syntax-highlighting uses the `add-zle-hook-widget` facility to install
+a `zle-line-pre-redraw` hook.  Hooks are run in order of registration,
+therefore, z-sy-h must be sourced (and register its hook) after anything else
+that adds hooks that modify the command-line buffer.
+
+### Does syntax highlighting work during incremental history search?
+
+Highlighting the command line during an incremental history search (by default bound to
+to <kbd>Ctrl+R</kbd> in zsh's emacs keymap) requires zsh 5.4 or newer.
+
+Under zsh versions older than 5.4, the zsh-default [underlining][zshzle-Character-Highlighting]
+of the matched portion of the buffer remains available, but zsh-syntax-highlighting's
+additional highlighting is unavailable.  (Those versions of zsh do not provide
+enough information to allow computing the highlighting correctly.)
+
+See issues [#288][i288] and [#415][i415] for details.
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+[i288]: https://github.com/zsh-users/zsh-syntax-highlighting/pull/288
+[i415]: https://github.com/zsh-users/zsh-syntax-highlighting/pull/415
+
+### How are new releases announced?
+
+There is currently no "push" announcements channel.  However, the following
+alternatives exist:
+
+- GitHub's RSS feed of releases: https://github.com/zsh-users/zsh-syntax-highlighting/releases.atom
+- An anitya entry: https://release-monitoring.org/project/7552/
+
+
+How to tweak
+------------
+
+Syntax highlighting is done by pluggable highlighter scripts.  See the
+[documentation on highlighters](docs/highlighters.md) for details and
+configuration settings.
+
+[build-status]: https://github.com/zsh-users/zsh-syntax-highlighting/actions
+[build-status-image]: https://github.com/zsh-users/zsh-syntax-highlighting/workflows/Tests/badge.svg
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/changelog.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/changelog.md
new file mode 100644
index 00000000..8ee50889
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/changelog.md
@@ -0,0 +1,920 @@
+# Changes in HEAD
+
+
+- Highlight `&>` `>&|` `>&!` `&>|` and `&>!` as redirection.
+  [#942]
+
+
+# Changes in 0.8.0
+
+This is a stable bugfix and feature release.  Major new features and changes include:
+
+
+## Changes fixed as part of the switch to zle-line-pre-redraw
+
+The changes in this section were fixed by switching to a `zle-line-pre-redraw`-based
+implementation.
+
+Note: The new implementation will only be used on future zsh releases,
+numbered 5.8.1.1 and newer, due to interoperability issues with other plugins
+(issues #418 and #579).  The underlying zsh feature has been available since
+zsh 5.3.
+
+Whilst under development, the new implementation was known as the
+"feature/redrawhook" topic branch.
+
+- Fixed: Highlighting not triggered after popping a buffer from the buffer stack
+  (using the `push-line` widget, default binding: `M-q`)
+  [#40]
+
+- Fixed: Invoking completion when there were no matches removed highlighting
+  [#90, #470]
+
+- Fixed: Two successive deletes followed by a yank only yanked the latest
+  delete, rather than both of them
+  [#150, #151, #160; cf. #183]
+
+- Presumed fixed: Completing `$(xsel)` results in an error message from `xsel`,
+  with pre-2017 versions of `xsel`.  (For 2017 vintage and newer, see the issue
+  for details.)
+  [#154]
+
+- Fixed: When the standard `bracketed-paste-magic` widget is in use, pastes were slow
+  [#295]
+
+- Fixed: No way to prevent a widget from being wrapped
+  [#324]
+
+- Fixed: No highlighting while cycling menu completion
+  [#375]
+
+- Fixed: Does not coexist with the `IGNORE_EOF` option
+  [#377]
+
+- Fixed: The `undefined-key` widget was wrapped
+  [#421]
+
+- Fixed: Does not coexist with the standard `surround` family of widgets
+  [#520]
+
+- Fixed: First completed filename doesn't get `path` highlighting
+  [#632]
+
+
+## Other changes
+
+- Add issue #712 to the previous release's changelog (hereinafter).
+
+- Fix highlighting when using an alias twice inside another alias
+  [#769, #775]
+
+- Remove lint warning for `env` followed by a pipe
+  [#797]
+
+- Recognize `proxychains` as a precommand
+  [#814, #914]
+
+- Honor shwordsplit when expanding parameters
+  [#687, #818]
+
+- Skip highlighting when keys are still pending in more cases
+  [#835]
+
+- Recognize `grc` as a precommand
+
+- Recognize `torsocks` and `torift` as precommands
+  [#898]
+
+- Recognize `cpulimit` as a precommand
+  [#897]
+
+- Recognize `ktrace` as a precommand
+
+
+# Changes in 0.8.0-alpha1-pre-redrawhook
+
+## Notice about an improbable-but-not-impossible forward incompatibility
+
+Everyone can probably skip this section.
+
+The `master` branch of zsh-syntax-highlighting uses a zsh feature that has not
+yet appeared in a zsh release: the `memo=` feature, added to zsh in commit
+zsh-5.8-172-gdd6e702ee (after zsh 5.8, before zsh 5.9).  In the unlikely event
+that this zsh feature should change in an incompatible way before the next
+stable zsh release, set `zsh_highlight__memo_feature=0` in your .zshrc files to
+disable use of the new feature.
+
+z-sy-h dogfoods the new, unreleased zsh feature because that feature was
+added to zsh at z-sy-h's initiative.  The new feature is used in the fix
+to issue #418.
+
+
+## Incompatible changes:
+
+- An unsuccessful completion (a <kbd>⮀ Tab</kbd> press that doesn't change the
+  command line) no longer causes highlighting to be lost.  Visual feedback can
+  alternatively be achieved by setting the `format` zstyle under the `warnings`
+  tag, for example,
+
+        zstyle ':completion:*:warnings' format '%F{red}No matches%f'
+
+    Refer to the [description of the `format` style in `zshcompsys(1)`]
+    [zshcompsys-Standard-Styles-format].
+
+    (#90, part of #245 (feature/redrawhook))
+
+[zshcompsys-Standard-Styles]: https://zsh.sourceforge.io/Doc/Release/Completion-System.html#Standard-Styles
+[zshcompsys-Standard-Styles-format]: https://zsh.sourceforge.io/Doc/Release/Completion-System.html#index-format_002c-completion-style
+  
+
+
+## Other changes:
+
+- Document `$ZSH_HIGHLIGHT_MAXLENGTH`.
+  [#698]
+
+- Optimize highlighting unquoted words (words that are not in single quotes, double quotes, backticks, or dollar-single-quotes)
+  [#730]
+
+- Redirection operators (e.g., `<` and `>`) are now highlighted by default
+  [#646]
+
+- Propertly terminate `noglob` scope in try/always blocks
+  [#577]
+
+- Don't error out when `KSH_ARRAYS` is set in the calling scope
+  [#622, #689]
+
+- Literal semicolons in array assignments (`foo=( bar ; baz )`) are now
+  highlighted as errors.
+  [3ca93f864fb6]
+
+- Command separators in array assignments (`foo=( bar | baz )`) are now
+  highlighted as errors.
+  [#651, 81267ca3130c]
+
+- Support parameter elision in command position (e.g., `$foo ls` where `$foo` is unset or empty)
+  [#667]
+
+- Don't consider the filename in `sudo -e /path/to/file` to be a command position
+  [#678]
+
+- Don't look up absolute directory names in $cdpath
+  [2cc2583f8f12, part of #669]
+
+- Fix `exec 2>&1;` being highlighted as an error.
+  [#676]
+
+- Fix `: $(<*)` being highlighted as globbing.
+  [#582]
+
+- Fix `cat < *` being highlighting as globbing when the `MULTIOS` option is unset.
+  [#583]
+
+- Fix `echo >&2` highlighting the `2` as a filename if a file by that name happened to exist
+  [#694, part of #645]
+
+- Fix `echo >&-` highlighting the `-` as a filename if a file by that name happened to exist
+  [part of #645]
+
+- Fix `echo >&p` highlighting the `p` as a filename if a file by that name happened to exist
+  [part of #645]
+
+- Fix wrong highlighting of unquoted parameter expansions under zsh 5.2 and older
+  [e165f18c758e]
+
+- Highlight global aliases
+  [#700]
+
+- Highlight `: =nosuchcommand' as an error (when the `EQUALS` option hasn't been unset).
+  [#430]
+
+- Highlight reserved word after assignments as errors (e.g., `foo=bar (ls;)`)
+  [#461]
+
+- Correctly highlight `[[ foo && bar || baz ]]`.
+
+- Highlight non-executable files in command position correctly (e.g., `% /etc/passwd`)
+  [#202, #669]
+
+- Highlight directories in command position correctly, including `AUTO_CD` support
+  [#669]
+
+- Recognize `env` as a precommand (e.g., `env FOO=bar ls`)
+
+- Recognize `ionice` as a precommand
+
+- Recognize `strace` as a precommand
+
+- Fix an error message on stderr before every prompt when the `WARN_NESTED_VAR` zsh option is set:
+  `_zsh_highlight_main__precmd_hook:1: array parameter _zsh_highlight_main__command_type_cache set in enclosing scope in function _zsh_highlight_main__precmd_hook`
+  [#727, #731, #732, #733]
+
+- Fix highlighting of alias whose definitions use a simple command terminator
+  (such as `;`, `|`, `&&`) before a newline
+  [#677; had regressed in 0.7.0]
+
+- Highlight arithmetic expansions (e.g., `$(( 42 ))`)
+  [#607 #649 #704]
+
+- Highlight the parentheses of array assignments as reserved words (`foo=( bar )`).
+  The `assign` style remains supported and has precedence.
+  [#585]
+
+- Fix interoperability issue with other plugins that use highlighting.  The fix
+  requires zsh 5.8.0.3 or newer.  (zsh 5.8.0.2-dev from the `master` branch,
+  revision zsh-5.8-172-gdd6e702ee or newer is also fine.)
+  [#418, https://github.com/okapia/zsh-viexchange/issues/1]
+
+- Improve performance of the `brackets` highlighter.
+
+- Fix highlighting of pre-command redirections (e.g., the `$fn` in `<$fn cat`)
+  [#712]
+
+
+# Changes in version 0.7.1
+
+- Remove out-of-date information from the 0.7.0 changelog.
+
+
+# Changes in version 0.7.0
+
+This is a stable bugfix and feature release.  Major new features and changes include:
+
+- Add `ZSH_HIGHLIGHT_DIRS_BLACKLIST` to disable "path" and "path prefix"
+  highlighting for specific directories
+  [#379]
+
+- Add the "regexp" highlighter, modelled after the pattern highlighter
+  [4e6f60063f1c]
+
+- When a word uses globbing, only the globbing metacharacters will be highlighted as globbing:
+  in `: foo*bar`, only the `*` will be blue.
+  [e48af357532c]
+
+- Highlight pasted quotes (e.g., `: foo"bar"`)
+  [dc1b2f6fa4bb]
+
+- Highlight command substitutions (`` : `ls` ``, `: $(ls)`)
+  [c0e64fe13178 and parents, e86f75a840e7, et al]
+
+- Highlight process substitutions (`: >(nl)`, `: <(pwd)`, `: =(git diff)`)
+  [c0e64fe13178 and parents, e86f75a840e7, et al]
+
+- Highlight command substitutions inside double quotes (``: "`foo`"``)
+  [f16e858f0c83]
+
+- Highlight many precommands (e.g., `nice`, `stdbuf`, `eatmydata`;
+  see `$precommand_options` in the source)
+
+- Highlight numeric globs (e.g., `echo /lib<->`)
+
+- Assorted improvements to aliases highlighting
+  (e.g.,
+   `alias sudo_u='sudo -u'; sudo_u jrandom ls`,
+   `alias x=y y=z z=nosuchcommand; x`,
+   `alias ls='ls -l'; \ls`)
+  [f3410c5862fc, 57386f30aec8, #544, and many others]
+
+- Highlight some more syntax errors
+  [dea05e44e671, 298ef6a2fa30]
+
+- New styles: named file descriptors, `RC_QUOTES`, and unclosed quotes (e.g., `echo "foo<CURSOR>`)
+  [38c794a978cd, 25ae1c01216c, 967335dfc5fd]
+
+- The 'brackets' highlighting no longer treats quotes specially.
+  [ecdda36ef56f]
+
+
+Selected bugfixes include:
+
+- Highlight `sudo` correctly when it's not installed
+  [26a82113b08b]
+
+- Handle some non-default options being set in zshrc
+  [b07ada1255b7, a2a899b41b8, 972ad197c13d, b3f66fc8748f]
+
+- Fix off-by-one highlighting in vi "visual" mode (vicmd keymap)
+  [be3882aeb054]
+
+- The 'yank-pop' widget is not wrapped
+  [#183]
+
+
+Known issues include:
+
+- A multiline alias that uses a simple command terminator (such as `;`, `|`, `&&`)
+  before a newline will incorrectly be highlighted as an error.  See issue #677
+  for examples and workarounds.
+  [#677]
+  [UPDATE: Fixed in 0.8.0]
+
+
+# Changes in version 0.6.0
+
+This is a stable release, featuring bugfixes and minor improvements.
+
+
+## Performance improvements:
+
+(none)
+
+
+## Added highlighting of:
+
+- The `isearch` and `suffix` [`$zle_highlight` settings][zshzle-Character-Highlighting].
+  (79e4d3d12405, 15db71abd0cc, b56ee542d619; requires zsh 5.3 for `$ISEARCHMATCH_ACTIVE` / `$SUFFIX_ACTIVE` support)
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+
+- Possible history expansions in double-quoted strings.
+  (76ea9e1df316)
+
+- Mismatched `if`/`then`/`elif`/`else`/`fi`.
+  (73cb83270262)
+
+
+## Fixed highlighting of:
+
+- A comment line followed by a non-comment line.
+  (#385, 9396ad5c5f9c)
+
+- An unquoted `$*` (expands to the positional parameters).
+  (237f89ad629f)
+
+- history-incremental-pattern-search-backward under zsh 5.3.1.
+  (#407, #415, 462779629a0c)
+
+
+## API changes (for highlighter authors):
+
+(none)
+
+
+## Developer-visible changes:
+
+- tests: Set the `ALIAS_FUNC_DEF` option for zsh 5.4 compatibility.
+  (9523d6d49cb3)
+
+
+## Other changes:
+
+- docs: Added before/after screenshots.
+  (cd9ec14a65ec..b7e277106b49)
+
+- docs: Link Fedora package.
+  (3d74aa47e4a7, 5feed23962df)
+
+- docs: Link FreeBSD port.
+  (626c034c68d7)
+
+- docs: Link OpenSUSE Build Service packages
+  (#419, dea1fedc7358)
+
+- Prevent user-defined aliases from taking effect in z-sy-h's own code.
+  (#390, 2dce602727d7, 8d5afe47f774; and #392, #395, b8fa1b9dc954)
+
+- docs: Update zplug installation instructions.
+  (#399, 4f49c4a35f17)
+
+- Improve "unhandled ZLE widget 'foo'" error message.
+  (#409, be083d7f3710)
+
+- Fix printing of "failed loading highlighters" error message.
+  (#426, ad522a091429)
+
+
+# Changes in version 0.5.0
+
+
+## Performance improvements:
+
+We thank Sebastian Gniazdowski and "m0viefreak" for significant contributions
+in this area.
+
+- Optimize string operations in the `main` (default) highlighter.
+  (#372/3cb58fd7d7b9, 02229ebd6328, ef4bfe5bcc14, #372/c6b6513ac0d6, #374/15461e7d21c3)
+
+- Command word highlighting:  Use the `zsh/parameter` module to avoid forks.
+  Memoize (cache) the results.
+  (#298, 3ce01076b521, 2f18ba64e397, 12b879caf7a6; #320, 3b67e656bff5)
+
+- Avoid forks in the driver and in the `root` highlighter.
+  (b9112aec798a, 38c8fbea2dd2)
+
+
+## Added highlighting of:
+
+- `pkexec` (a precommand).
+  (#248, 4f3910cbbaa5)
+
+- Aliases that cannot be defined normally nor invoked normally (highlighted as an error).
+  (#263 (in part), 28932316cca6)
+
+- Path separators (`/`) — the default behaviour remains to highlight path separators
+  and path components the same way.
+  (#136, #260, 6cd39e7c70d3, 9a934d291e7c, f3d3aaa00cc4)
+
+- Assignments to individual positional arguments (`42=foo` to assign to `$42`).
+  (f4036a09cee3)
+
+- Linewise region (the `visual-line-mode` widget, bound to `V` in zsh's `vi` keymap).
+  (#267, a7a7f8b42280, ee07588cfd9b)
+
+- Command-lines recalled by `isearch` mode; requires zsh≥5.3.
+  (#261 (in part); #257; 4ad311ec0a68)
+
+- Command-lines whilst the `IGNORE_BRACES` or `IGNORE_CLOSE_BRACES` option is in effect.
+  (a8a6384356af, 02807f1826a5)
+
+- Mismatched parentheses and braces (in the `main` highlighter).
+  (51b9d79c3bb6, 2fabf7ca64b7, a4196eda5e6f, and others)
+
+- Mismatched `do`/`done` keywords.
+  (b2733a64da93)
+
+- Mismatched `foreach`/`end` keywords.
+  (#96, 2bb8f0703d8f)
+
+- In Bourne-style function definitions, when the `MULTI_FUNC_DEF` option is set
+  (which is the default), highlight the first word in the function body as
+  a command word: `f() { g "$@" }`.
+  (6f91850a01e1)
+
+- `always` blocks.
+  (#335, e5782e4ddfb6)
+
+- Command substitutions inside double quotes, `"$(echo foo)"`.
+  (#139 (in part), c3913e0d8ead)
+
+- Non-alphabetic parameters inside double quotes (`"$$"`, `"$#"`, `"$*"`, `"$@"`, `"$?"`, `"$-"`).
+  (4afe670f7a1b, 44ef6e38e5a7)
+
+- Command words from future versions of zsh (forward compatibly).
+  This also adds an `arg0` style that all other command word styles fall back to.
+  (b4537a972eed, bccc3dc26943)
+
+- Escaped history expansions inside double quotes: `: "\!"`
+  (28d7056a7a06, et seq)
+
+
+## Fixed highlighting of:
+
+- Command separator tokens in syntactically-invalid positions.
+  (09c4114eb980)
+
+- Redirections with a file descriptor number at command word.
+  (#238 (in part), 73ee7c1f6c4a)
+
+- The `select` prompt, `$PS3`.
+  (#268, 451665cb2a8b)
+
+- Values of variables in `vared`.
+  (e500ca246286)
+
+- `!` as an argument (neither a history expansion nor a reserved word).
+  (4c23a2fd1b90)
+
+- "division by zero" error under the `brackets` highlighter when `$ZSH_HIGHLIGHT_STYLES` is empty.
+  (f73f3d53d3a6)
+
+- Process substitutions, `<(pwd)` and `>(wc -l)`.
+  (#302, 6889ff6bd2ad, bfabffbf975c, fc9c892a3f15)
+
+- The non-`SHORT_LOOPS` form of `repeat` loops: `repeat 42; do true; done`.
+  (#290, 4832f18c50a5, ef68f50c048f, 6362c757b6f7)
+
+- Broken symlinks (are now highlighted as files).
+  (#342, 95f7206a9373, 53083da8215e)
+
+- Lines accepted from `isearch` mode.
+  (#284; #257, #259, #288; 5bae6219008b, a8fe22d42251)
+
+- Work around upstream bug that triggered when the command word was a relative
+  path, that when interpreted relative to a $PATH directory denoted a command;
+  the effect of that upstream bug was that the relative path was cached as
+  a "valid external command name".
+  (#354, #355, 51614ca2c994, fdaeec45146b, 7d38d07255e4;
+  upstream fix slated to be released in 5.3 (workers/39104))
+
+- After accepting a line with the cursor on a bracket, the matching bracket
+  of the bracket under the cursor no longer remains highlighted (with the
+  `brackets` highlighter).
+  (4c4baede519a)
+
+- The first word on a new line within an array assignment or initialization is no
+  longer considered a command position.
+  (8bf423d16d46)
+
+- Subshells that end at command position, `(A=42)`, `(true;)`.
+  (#231, 7fb6f9979121; #344, 4fc35362ee5a)
+
+- Command word after array assignment, `a=(lorem ipsum) pwd`.
+  (#330, 7fb6f9979121)
+
+
+## API changes (for highlighter authors):
+
+- New interface `_zsh_highlight_add_highlight`.
+  (341a3ae1f015, c346f6eb6fb6)
+
+- tests: Specify the style key, not its value, in test expectations.
+  (a830613467af, fd061b5730bf, eaa4335c3441, among others)
+
+- Module author documentation improvements.
+  (#306 (in part), 217669270418, 0ff354b44b6e, 80148f6c8402, 364f206a547f, and others)
+
+- The driver no longer defines a `_zsh_highlight_${highlighter}_highlighter_cache`
+  variable, which is in the highlighters' namespace.
+  (3e59ab41b6b8, 80148f6c8402, f91a7b885e7d)
+
+- Rename highlighter entry points.  The old names remain supported for
+  backwards compatibility.
+  (a3d5dfcbdae9, c793e0dceab1)
+
+- tests: Add the "NONE" expectation.
+  (4da9889d1545, 13018f3dd735, d37c55c788cd)
+
+- tests: consider a test that writes to stderr to have failed.
+  (#291, 1082067f9315)
+
+
+## Developer-visible changes:
+
+- Add `make quiet-test`.
+  (9b64ad750f35)
+
+- test harness: Better quote replaceables in error messages.
+  (30d8f92df225)
+
+- test harness: Fix exit code for XPASS.
+  (bb8d325c0cbd)
+
+- Create [HACKING.md](HACKING.md).
+  (cef49752fd0e)
+
+- tests: Emit a description for PASS test points.
+  (6aa57d60aa64, f0bae44b76dd)
+
+- tests: Create a script that generates a test file.
+  (8013dc3b8db6, et seq; `tests/generate.zsh`)
+
+
+## Other changes:
+
+- Under zsh≤5.2, widgets whose names start with a `_` are no longer excluded
+  from highlighting.
+  (ed33d2cb1388; reverts part of 186d80054a40 which was for #65)
+
+- Under zsh≤5.2, widgets implemented by a function named after the widget are
+  no longer excluded from highlighting.
+  (487b122c480d; reverts part of 776453cb5b69)
+
+- Under zsh≤5.2, shell-unsafe widget names can now be wrapped.
+  (#278, 6a634fac9fb9, et seq)
+
+- Correct some test expectations.
+  (78290e043bc5)
+
+- `zsh-syntax-highlighting.plugin.zsh`: Convert from symlink to plain file
+  for msys2 compatibility.
+  (#292, d4f8edc9f3ad)
+
+- Document installation under some plugin managers.
+  (e635f766bef9, 9cab566f539b)
+
+- Don't leak the `PATH_DIRS` option.
+  (7b82b88a7166)
+
+- Don't require the `FUNCTION_ARGZERO` option to be set.
+  (#338, 750aebc553f2)
+
+- Under zsh≤5.2, support binding incomplete/nonexistent widgets.
+  (9e569bb0fe04, part of #288)
+
+- Make the driver reentrant, fixing possibility of infinite recursion
+  under zsh≤5.2 under interaction with theoretical third-party code.
+  (#305, d711563fe1bf, 295d62ec888d, f3242cbd6aba)
+
+- Fix warnings when `WARN_CREATE_GLOBAL` is set prior to sourcing zsh-syntax-highlighting.
+  (z-sy-h already sets `WARN_CREATE_GLOBAL` internally.)
+  (da60234fb236)
+
+- Warn only once, rather than once per keypress, when a highlighter is unavailable.
+  (0a9b347483ae)
+
+
+# Changes in version 0.4.1
+
+## Fixes:
+
+- Arguments to widgets were not properly dash-escaped.  Only matters for widgets
+  that take arguments (i.e., that are invoked as `zle ${widget} -- ${args}`).
+  (282c7134e8ac, reverts c808d2187a73)
+
+
+# Changes in version 0.4.0
+
+
+## Added highlighting of:
+
+- incomplete sudo commands
+  (a3047a912100, 2f05620b19ae)
+
+    ```zsh
+    sudo;
+    sudo -u;
+    ```
+
+- command words following reserved words
+  (#207, #222, b397b12ac139 et seq, 6fbd2aa9579b et seq, 8b4adbd991b0)
+
+    ```zsh
+    if ls; then ls; else ls; fi
+    repeat 10 do ls; done
+    ```
+
+    (The `ls` are now highlighted as a command.)
+
+- comments (when `INTERACTIVE_COMMENTS` is set)
+  (#163, #167, 693de99a9030)
+
+    ```zsh
+    echo Hello # comment
+    ```
+
+- closing brackets of arithmetic expansion, subshells, and blocks
+  (#226, a59f442d2d34, et seq)
+
+    ```zsh
+    (( foo ))
+    ( foo )
+    { foo }
+    ```
+
+- command names enabled by the `PATH_DIRS` option
+  (#228, 96ee5116b182)
+
+    ```zsh
+    # When ~/bin/foo/bar exists, is executable, ~/bin is in $PATH,
+    # and 'setopt PATH_DIRS' is in effect
+    foo/bar
+    ```
+
+- parameter expansions with braces inside double quotes
+  (#186, 6e3720f39d84)
+
+    ```zsh
+    echo "${foo}"
+    ```
+
+- parameter expansions in command word
+  (#101, 4fcfb15913a2)
+
+    ```zsh
+    x=/bin/ls
+    $x -l
+    ```
+
+- the command separators '\|&', '&!', '&\|'
+
+    ```zsh
+    view file.pdf &!  ls
+    ```
+
+
+## Fixed highlighting of:
+
+- precommand modifiers at non-command-word position
+  (#209, 2c9f8c8c95fa)
+
+    ```zsh
+    ls command foo
+    ```
+
+- sudo commands with infix redirections
+  (#221, be006aded590, 86e924970911)
+
+    ```zsh
+    sudo -u >/tmp/foo.out user ls
+    ```
+
+- subshells; anonymous functions
+  (#166, #194, 0d1bfbcbfa67, 9e178f9f3948)
+
+    ```zsh
+    (true)
+    () { true }
+    ```
+
+- parameter assignment statements with no command
+  (#205, 01d7eeb3c713)
+
+    ```zsh
+    A=1;
+    ```
+
+    (The semicolon used to be highlighted as a mistake)
+
+- cursor highlighter: Remove the cursor highlighting when accepting a line.
+  (#109, 4f0c293fdef0)
+
+
+## Removed features:
+
+- Removed highlighting of approximate paths (`path_approx`).
+  (#187, 98aee7f8b9a3)
+
+
+## Other changes:
+
+- main highlighter refactored to use states rather than booleans.
+  (2080a441ac49, et seq)
+
+- Fix initialization when sourcing `zsh-syntax-highlighting.zsh` via a symlink
+  (083c47b00707)
+
+- docs: Add screenshot.
+  (57624bb9f64b)
+
+- widgets wrapping: Don't add '--' when invoking widgets.
+  (c808d2187a73) [_reverted in 0.4.1_]
+
+- Refresh highlighting upon `accept-*` widgets (`accept-line` et al).
+  (59fbdda64c21)
+
+- Stop leaking match/mbegin/mend to global scope (thanks to upstream
+  `WARN_CREATE_GLOBAL` improvements).
+  (d3deffbf46a4)
+
+- 'make install': Permit setting `$(SHARE_DIR)` from the environment.
+  (e1078a8b4cf1)
+
+- driver: Tolerate KSH_ARRAYS being set in the calling context.
+  (#162, 8f19af6b319d)
+
+- 'make install': Install documentation fully and properly.
+  (#219, b1619c001390, et seq)
+
+- docs: Improve 'main' highlighter's documentation.
+  (00de155063f5, 7d4252f5f596)
+
+- docs: Moved to a new docs/ tree; assorted minor updates
+  (c575f8f37567, 5b34c23cfad5, et seq)
+
+- docs: Split README.md into INSTALL.md
+  (0b3183f6cb9a)
+
+- driver: Report `$ZSH_HIGHLIGHT_REVISION` when running from git
+  (84734ba95026)
+
+
+## Developer-visible changes:
+
+- Test harness converted to [TAP](https://testanything.org/tap-specification.html) format
+  (d99aa58aaaef, et seq)
+
+- Run each test in a separate subprocess, isolating them from each other
+  (d99aa58aaaef, et seq)
+
+- Fix test failure with nonexisting $HOME
+  (#216, b2ac98b98150)
+
+- Test output is now colorized.
+  (4d3da30f8b72, 6fe07c096109)
+
+- Document `make install`
+  (a18a7427fd2c)
+
+- tests: Allow specifying the zsh binary to use.
+  (557bb7e0c6a0)
+
+- tests: Add 'make perf' target
+  (4513eaea71d7)
+
+- tests: Run each test in a sandbox directory
+  (c01533920245)
+
+
+# Changes in version 0.3.0
+
+
+## Added highlighting of:
+
+- suffix aliases (requires zsh 5.1.1 or newer):
+
+    ```zsh
+    alias -s png=display
+    foo.png
+    ```
+
+- prefix redirections:
+
+    ```zsh
+    <foo.txt cat
+    ```
+
+- redirection operators:
+
+    ```zsh
+    echo > foo.txt
+    ```
+
+- arithmetic evaluations:
+
+    ```zsh
+    (( 42 ))
+    ```
+
+- $'' strings, including \x/\octal/\u/\U escapes
+
+    ```zsh
+    : $'foo\u0040bar'
+    ```
+
+- multiline strings:
+
+    ```zsh
+    % echo "line 1
+    line 2"
+    ```
+
+- string literals that haven't been finished:
+
+    ```zsh
+    % echo "Hello, world
+    ```
+- command words that involve tilde expansion:
+
+    ```zsh
+    % ~/bin/foo
+    ```
+
+## Fixed highlighting of:
+
+- quoted command words:
+
+    ```zsh
+    % \ls
+    ```
+
+- backslash escapes in "" strings:
+
+    ```zsh
+    % echo "\x41"
+    ```
+
+- noglob after command separator:
+
+    ```zsh
+    % :; noglob echo *
+    ```
+
+- glob after command separator, when the first command starts with 'noglob':
+
+    ```zsh
+    % noglob true; echo *
+    ```
+
+- the region (vi visual mode / set-mark-command) (issue #165)
+
+- redirection and command separators that would be highlighted as `path_approx`
+
+    ```zsh
+    % echo foo;‸
+    % echo <‸
+    ```
+
+    (where `‸` represents the cursor location)
+
+- escaped globbing (outside quotes)
+
+    ```zsh
+    % echo \*
+    ```
+
+
+## Other changes:
+
+- implemented compatibility with zsh's paste highlighting (issue #175)
+
+- `$?` propagated correctly to wrapped widgets
+
+- don't leak $REPLY into global scope
+
+
+## Developer-visible changes:
+
+- added makefile with `install` and `test` targets
+
+- set `warn_create_global` internally
+
+- document release process
+
+
+
+
+# Version 0.2.1
+
+(Start of changelog.)
+
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters.md
new file mode 100644
index 00000000..fb64c3af
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters.md
@@ -0,0 +1,132 @@
+zsh-syntax-highlighting / highlighters
+======================================
+
+Syntax highlighting is done by pluggable highlighters:
+
+* `main` - the base highlighter, and the only one [active by default][main].
+* `brackets` - [matches brackets][brackets] and parenthesis.
+* `pattern` - matches [user-defined patterns][pattern].
+* `regexp` - matches [user-defined regular expressions][regexp].
+* `cursor` - matches [the cursor position][cursor].
+* `root` - highlights the whole command line [if the current user is root][root].
+* `line` - applied to [the whole command line][line].
+
+[main]: highlighters/main.md
+[brackets]: highlighters/brackets.md
+[pattern]: highlighters/pattern.md
+[regexp]: highlighters/regexp.md
+[cursor]: highlighters/cursor.md
+[root]: highlighters/root.md
+[line]: highlighters/line.md
+
+
+Highlighter-independent settings
+--------------------------------
+
+By default, all command lines are highlighted.  However, it is possible to
+prevent command lines longer than a fixed number of characters from being
+highlighted by setting the variable `${ZSH_HIGHLIGHT_MAXLENGTH}` to the maximum
+length (in characters) of command lines to be highlighter.  This is useful when
+editing very long command lines (for example, with the [`fned`][fned] utility
+function).  Example:
+
+[fned]: https://zsh.sourceforge.io/Doc/Release/User-Contributions.html#index-zed
+
+```zsh
+ZSH_HIGHLIGHT_MAXLENGTH=512
+```
+
+
+How to activate highlighters
+----------------------------
+
+To activate an highlighter, add it to the `ZSH_HIGHLIGHT_HIGHLIGHTERS` array.
+By default `ZSH_HIGHLIGHT_HIGHLIGHTERS` is `(main)`. For example to activate
+`brackets`, `pattern`, and `cursor` highlighters, in `~/.zshrc` do:
+
+```zsh
+ZSH_HIGHLIGHT_HIGHLIGHTERS+=(brackets pattern cursor)
+```
+
+
+How to tweak highlighters
+-------------------------
+
+Highlighters look up styles from the `ZSH_HIGHLIGHT_STYLES` associative array.
+Navigate into the [individual highlighters' documentation](highlighters/) to
+see what styles (keys) each highlighter defines; the syntax for values is the
+same as the syntax of "types of highlighting" of the zsh builtin
+`$zle_highlight` array, which is documented in [the `zshzle(1)` manual
+page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+
+Some highlighters support additional configuration parameters; see each
+highlighter's documentation for details and examples.
+
+
+How to implement a new highlighter
+----------------------------------
+
+To create your own `acme` highlighter:
+
+* Create your script at
+    `highlighters/acme/acme-highlighter.zsh`.
+
+* Implement the `_zsh_highlight_highlighter_acme_predicate` function.
+  This function must return 0 when the highlighter needs to be called and
+  non-zero otherwise, for example:
+
+    ```zsh
+    _zsh_highlight_highlighter_acme_predicate() {
+      # Call this highlighter in SVN working copies
+      [[ -d .svn ]]
+    }
+    ```
+
+* Implement the `_zsh_highlight_highlighter_acme_paint` function.
+  This function does the actual syntax highlighting, by calling
+  `_zsh_highlight_add_highlight` with the start and end of the region to
+  be highlighted and the `ZSH_HIGHLIGHT_STYLES` key to use. Define the default
+  style for that key in the highlighter script outside of any function with
+  `: ${ZSH_HIGHLIGHT_STYLES[key]:=value}`, being sure to prefix
+  the key with your highlighter name and a colon. For example:
+
+    ```zsh
+    : ${ZSH_HIGHLIGHT_STYLES[acme:aurora]:=fg=green}
+
+    _zsh_highlight_highlighter_acme_paint() {
+      # Colorize the whole buffer with the 'aurora' style
+      _zsh_highlight_add_highlight 0 $#BUFFER acme:aurora
+    }
+    ```
+
+  If you need to test which options the user has set, test `zsyh_user_options`
+  with a sensible default if the option is not present in supported zsh
+  versions. For example:
+
+    ```zsh
+    [[ ${zsyh_user_options[ignoreclosebraces]:-off} == on ]]
+    ```
+
+  The option name must be all lowercase with no underscores and not an alias.
+
+* Name your own functions and global variables `_zsh_highlight_acme_*`.
+
+    - In zsh-syntax-highlighting 0.4.0 and earlier, the entrypoints 
+        `_zsh_highlight_highlighter_acme_predicate` and
+        `_zsh_highlight_highlighter_acme_paint`
+        were named
+        `_zsh_highlight_acme_highlighter_predicate` and
+        `_zsh_highlight_highlighter_acme_paint` respectively.
+
+        These names are still supported for backwards compatibility;
+        however, support for them will be removed in a future major or minor release (v0.x.0 or v1.0.0).
+
+* Activate your highlighter in `~/.zshrc`:
+
+    ```zsh
+    ZSH_HIGHLIGHT_HIGHLIGHTERS+=(acme)
+    ```
+
+* [Write tests](../tests/README.md).
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/brackets.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/brackets.md
new file mode 100644
index 00000000..0101699e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/brackets.md
@@ -0,0 +1,31 @@
+zsh-syntax-highlighting / highlighters / brackets
+-------------------------------------------------
+
+This is the `brackets` highlighter, that highlights brackets and parentheses, and
+matches them.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `bracket-error` - unmatched brackets
+* `bracket-level-N` - brackets with nest level N
+* `cursor-matchingbracket` - the matching bracket, if cursor is on a bracket
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+```zsh
+# To define styles for nested brackets up to level 4
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]='fg=blue,bold'
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]='fg=red,bold'
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]='fg=yellow,bold'
+ZSH_HIGHLIGHT_STYLES[bracket-level-4]='fg=magenta,bold'
+```
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/cursor.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/cursor.md
new file mode 100644
index 00000000..3f87d422
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/cursor.md
@@ -0,0 +1,24 @@
+zsh-syntax-highlighting / highlighters / cursor
+-----------------------------------------------
+
+This is the `cursor` highlighter, that highlights the cursor.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `cursor` - the style for the current cursor position
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+```zsh
+ZSH_HIGHLIGHT_STYLES[cursor]='bg=blue'
+```
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/line.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/line.md
new file mode 100644
index 00000000..f76639ee
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/line.md
@@ -0,0 +1,24 @@
+zsh-syntax-highlighting / highlighters / line
+---------------------------------------------
+
+This is the `line` highlighter, that highlights the whole line.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `line` - the style for the whole line
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+```zsh
+ZSH_HIGHLIGHT_STYLES[line]='bold'
+```
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/main.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/main.md
new file mode 100644
index 00000000..4a27653f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/main.md
@@ -0,0 +1,121 @@
+zsh-syntax-highlighting / highlighters / main
+---------------------------------------------
+
+This is the `main` highlighter, that highlights:
+
+* Commands
+* Options
+* Arguments
+* Paths
+* Strings
+
+This highlighter is active by default.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `unknown-token` - unknown tokens / errors
+* `reserved-word` - shell reserved words (`if`, `for`)
+* `alias` - aliases
+* `suffix-alias` - suffix aliases (requires zsh 5.1.1 or newer)
+* `global-alias` - global aliases
+* `builtin` - shell builtin commands (`shift`, `pwd`, `zstyle`)
+* `function` - function names
+* `command` - command names
+* `precommand` - precommand modifiers (e.g., `noglob`, `builtin`)
+* `commandseparator` - command separation tokens (`;`, `&&`)
+* `hashed-command` - hashed commands
+* `autodirectory` - a directory name in command position when the `AUTO_CD` option is set
+* `path` - existing filenames
+* `path_pathseparator` - path separators in filenames (`/`); if unset, `path` is used (default)
+* `path_prefix` - prefixes of existing filenames
+* `path_prefix_pathseparator` - path separators in prefixes of existing filenames (`/`); if unset, `path_prefix` is used (default)
+* `globbing` - globbing expressions (`*.txt`)
+* `history-expansion` - history expansion expressions (`!foo` and `^foo^bar`)
+* `command-substitution` - command substitutions (`$(echo foo)`)
+* `command-substitution-unquoted` - an unquoted command substitution (`$(echo foo)`)
+* `command-substitution-quoted` - a quoted command substitution (`"$(echo foo)"`)
+* `command-substitution-delimiter` - command substitution delimiters (`$(` and `)`)
+* `command-substitution-delimiter-unquoted` - an unquoted command substitution delimiters (`$(` and `)`)
+* `command-substitution-delimiter-quoted` - a quoted command substitution delimiters (`"$(` and `)"`)
+* `process-substitution` - process substitutions (`<(echo foo)`)
+* `process-substitution-delimiter` - process substitution delimiters (`<(` and `)`)
+* `arithmetic-expansion` - arithmetic expansion `$(( 42 ))`)
+* `single-hyphen-option` - single-hyphen options (`-o`)
+* `double-hyphen-option` - double-hyphen options (`--option`)
+* `back-quoted-argument` - backtick command substitution (`` `foo` ``)
+* `back-quoted-argument-unclosed` - unclosed backtick command substitution (`` `foo ``)
+* `back-quoted-argument-delimiter` - backtick command substitution delimiters (`` ` ``)
+* `single-quoted-argument` - single-quoted arguments (`` 'foo' ``)
+* `single-quoted-argument-unclosed` - unclosed single-quoted arguments (`` 'foo ``)
+* `double-quoted-argument` - double-quoted arguments (`` "foo" ``)
+* `double-quoted-argument-unclosed` - unclosed double-quoted arguments (`` "foo ``)
+* `dollar-quoted-argument` - dollar-quoted arguments (`` $'foo' ``)
+* `dollar-quoted-argument-unclosed` - unclosed dollar-quoted arguments (`` $'foo ``)
+* `rc-quote` - two single quotes inside single quotes when the `RC_QUOTES` option is set (`` 'foo''bar' ``)
+* `dollar-double-quoted-argument` - parameter expansion inside double quotes (`$foo` inside `""`)
+* `back-double-quoted-argument` -  backslash escape sequences inside double-quoted arguments (`\"` in `"foo\"bar"`)
+* `back-dollar-quoted-argument` -  backslash escape sequences inside dollar-quoted arguments (`\x` in `$'\x48'`)
+* `assign` - parameter assignments (`x=foo` and `x=( )`)
+* `redirection` - redirection operators (`<`, `>`, etc)
+* `comment` - comments, when `setopt INTERACTIVE_COMMENTS` is in effect (`echo # foo`)
+* `comment` - elided parameters in command position (`$x ls` when `$x` is unset or empty)
+* `named-fd` - named file descriptor (the `fd` in `echo foo {fd}>&2`)
+* `numeric-fd` - numeric file descriptor (the `2` in `echo foo {fd}>&2`)
+* `arg0` - a command word other than one of those enumerated above (other than a command, precommand, alias, function, or shell builtin command).
+* `default` - everything else
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+```zsh
+# Declare the variable
+typeset -A ZSH_HIGHLIGHT_STYLES
+
+# To differentiate aliases from other command types
+ZSH_HIGHLIGHT_STYLES[alias]='fg=magenta,bold'
+
+# To have paths colored instead of underlined
+ZSH_HIGHLIGHT_STYLES[path]='fg=cyan'
+
+# To disable highlighting of globbing expressions
+ZSH_HIGHLIGHT_STYLES[globbing]='none'
+```
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+#### Parameters
+
+To avoid partial path lookups on a path, add the path to the `ZSH_HIGHLIGHT_DIRS_BLACKLIST` array.
+
+```zsh
+ZSH_HIGHLIGHT_DIRS_BLACKLIST+=(/mnt/slow_share)
+```
+
+### Useless trivia
+
+#### Forward compatibility.
+
+zsh-syntax-highlighting attempts to be forward-compatible with zsh.
+Specifically, we attempt to facilitate highlighting _command word_ types that
+had not yet been invented when this version of zsh-syntax-highlighting was
+released.
+
+A _command word_ is something like a function name, external command name, et
+cetera.  (See
+[Simple Commands & Pipelines in `zshmisc(1)`][zshmisc-Simple-Commands-And-Pipelines]
+for a formal definition.)
+
+If a new _kind_ of command word is ever added to zsh — something conceptually
+different than "function" and "alias" and "external command" — then command words
+of that (new) kind will be highlighted by the style `arg0_$kind`,
+where `$kind` is the output of `type -w` on the new kind of command word.  If that
+style is not defined, then the style `arg0` will be used instead.
+
+[zshmisc-Simple-Commands-And-Pipelines]: https://zsh.sourceforge.io/Doc/Release/Shell-Grammar.html#Simple-Commands-_0026-Pipelines
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/pattern.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/pattern.md
new file mode 100644
index 00000000..ecaa6a7f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/pattern.md
@@ -0,0 +1,24 @@
+zsh-syntax-highlighting / highlighters / pattern
+------------------------------------------------
+
+This is the `pattern` highlighter, that highlights user-defined patterns.
+
+
+### How to tweak it
+
+To use this highlighter, associate patterns with styles in the
+`ZSH_HIGHLIGHT_PATTERNS` associative array, for example in `~/.zshrc`:
+
+```zsh
+# Declare the variable
+typeset -A ZSH_HIGHLIGHT_PATTERNS
+
+# To have commands starting with `rm -rf` in red:
+ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+```
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/regexp.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/regexp.md
new file mode 100644
index 00000000..8c711a3c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/regexp.md
@@ -0,0 +1,65 @@
+zsh-syntax-highlighting / highlighters / regexp
+------------------------------------------------
+
+This is the `regexp` highlighter, that highlights user-defined regular
+expressions. It's similar to the `pattern` highlighter, but allows more complex
+patterns.
+
+### How to tweak it
+
+To use this highlighter, associate regular expressions with styles in the
+`ZSH_HIGHLIGHT_REGEXP` associative array, for example in `~/.zshrc`:
+
+```zsh
+typeset -A ZSH_HIGHLIGHT_REGEXP
+ZSH_HIGHLIGHT_REGEXP+=('^rm .*' fg=red,bold)
+```
+
+This will highlight lines that start with a call to the `rm` command.
+
+The regular expressions flavour used is [PCRE][pcresyntax] when the
+`RE_MATCH_PCRE` option is set and POSIX Extended Regular Expressions (ERE),
+as implemented by the platform's C library, otherwise.  For details on the
+latter, see [the `zsh/regex` module's documentation][MAN_ZSH_REGEX] and the
+`regcomp(3)` and `re_format(7)` manual pages on your system.
+
+For instance, to highlight `sudo` only as a complete word, i.e., `sudo cmd`,
+but not `sudoedit`, one might use:
+
+* When the `RE_MATCH_PCRE` is set:
+
+    ```zsh
+    typeset -A ZSH_HIGHLIGHT_REGEXP
+    ZSH_HIGHLIGHT_REGEXP+=('\bsudo\b' fg=123,bold)
+    ```
+
+* When the `RE_MATCH_PCRE` is unset, on platforms with GNU `libc` (e.g., many GNU/Linux distributions):
+
+    ```zsh
+    typeset -A ZSH_HIGHLIGHT_REGEXP
+    ZSH_HIGHLIGHT_REGEXP+=('\<sudo\>' fg=123,bold)
+    ```
+
+* When the `RE_MATCH_PCRE` is unset, on BSD-based platforms (e.g., macOS):
+
+    ```zsh
+    typeset -A ZSH_HIGHLIGHT_REGEXP
+    ZSH_HIGHLIGHT_REGEXP+=('[[:<:]]sudo[[:>:]]' fg=123,bold)
+    ```
+
+Note, however, that PCRE and POSIX ERE have a large common subset:
+for instance, the regular expressions `[abc]`, `a*`, and `(a|b)` have the same
+meaning in both flavours.
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+See also: [regular expressions tutorial][perlretut], zsh regexp operator `=~`
+in [the `zshmisc(1)` manual page][zshmisc-Conditional-Expressions]
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
+[perlretut]: https://perldoc.perl.org/perlretut
+[zshmisc-Conditional-Expressions]: https://zsh.sourceforge.io/Doc/Release/Conditional-Expressions.html#Conditional-Expressions
+[MAN_ZSH_REGEX]: https://zsh.sourceforge.io/Doc/Release/Zsh-Modules.html#The-zsh_002fregex-Module
+[pcresyntax]: https://www.pcre.org/original/doc/html/pcresyntax.html
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/root.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/root.md
new file mode 100644
index 00000000..8197e4bd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/docs/highlighters/root.md
@@ -0,0 +1,25 @@
+zsh-syntax-highlighting / highlighters / root
+---------------------------------------------
+
+This is the `root` highlighter, that highlights the whole line if the current
+user is root.
+
+
+### How to tweak it
+
+This highlighter defines the following styles:
+
+* `root` - the style for the whole line if the current user is root.
+
+To override one of those styles, change its entry in `ZSH_HIGHLIGHT_STYLES`,
+for example in `~/.zshrc`:
+
+```zsh
+ZSH_HIGHLIGHT_STYLES[root]='bg=red'
+```
+
+The syntax for values is the same as the syntax of "types of highlighting" of
+the zsh builtin `$zle_highlight` array, which is documented in [the `zshzle(1)`
+manual page][zshzle-Character-Highlighting].
+
+[zshzle-Character-Highlighting]: https://zsh.sourceforge.io/Doc/Release/Zsh-Line-Editor.html#Character-Highlighting
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/README.md
new file mode 100644
index 00000000..8490ddf4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/README.md
@@ -0,0 +1,8 @@
+zsh-syntax-highlighting / highlighters
+======================================
+
+Navigate into the individual highlighters' documentation to see
+what styles (`$ZSH_HIGHLIGHT_STYLES` keys) each highlighter defines.
+
+Refer to the [documentation on highlighters](../docs/highlighters.md) for further
+information.
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/README.md
new file mode 120000
index 00000000..6997bd60
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/brackets.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/brackets-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/brackets-highlighter.zsh
new file mode 100644
index 00000000..bc388fdb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/brackets-highlighter.zsh
@@ -0,0 +1,107 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[bracket-error]:=fg=red,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-1]:=fg=blue,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-2]:=fg=green,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-3]:=fg=magenta,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-4]:=fg=yellow,bold}
+: ${ZSH_HIGHLIGHT_STYLES[bracket-level-5]:=fg=cyan,bold}
+: ${ZSH_HIGHLIGHT_STYLES[cursor-matchingbracket]:=standout}
+
+# Whether the brackets highlighter should be called or not.
+_zsh_highlight_highlighter_brackets_predicate()
+{
+  [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved || _zsh_highlight_buffer_modified
+}
+
+# Brackets highlighting function.
+_zsh_highlight_highlighter_brackets_paint()
+{
+  local char style
+  local -i bracket_color_size=${#ZSH_HIGHLIGHT_STYLES[(I)bracket-level-*]} buflen=${#BUFFER} level=0 matchingpos pos
+  local -A levelpos lastoflevel matching
+
+  # Find all brackets and remember which one is matching
+  pos=0
+  for char in ${(s..)BUFFER} ; do
+    (( ++pos ))
+    case $char in
+      ["([{"])
+        levelpos[$pos]=$((++level))
+        lastoflevel[$level]=$pos
+        ;;
+      [")]}"])
+        if (( level > 0 )); then
+          matchingpos=$lastoflevel[$level]
+          levelpos[$pos]=$((level--))
+          if _zsh_highlight_brackets_match $matchingpos $pos; then
+            matching[$matchingpos]=$pos
+            matching[$pos]=$matchingpos
+          fi
+        else
+          levelpos[$pos]=-1
+        fi
+        ;;
+    esac
+  done
+
+  # Now highlight all found brackets
+  for pos in ${(k)levelpos}; do
+    if (( $+matching[$pos] )); then
+      if (( bracket_color_size )); then
+        _zsh_highlight_add_highlight $((pos - 1)) $pos bracket-level-$(( (levelpos[$pos] - 1) % bracket_color_size + 1 ))
+      fi
+    else
+      _zsh_highlight_add_highlight $((pos - 1)) $pos bracket-error
+    fi
+  done
+
+  # If cursor is on a bracket, then highlight corresponding bracket, if any.
+  if [[ $WIDGET != zle-line-finish ]]; then
+    pos=$((CURSOR + 1))
+    if (( $+levelpos[$pos] )) && (( $+matching[$pos] )); then
+      local -i otherpos=$matching[$pos]
+      _zsh_highlight_add_highlight $((otherpos - 1)) $otherpos cursor-matchingbracket
+    fi
+  fi
+}
+
+# Helper function to differentiate type 
+_zsh_highlight_brackets_match()
+{
+  case $BUFFER[$1] in
+    \() [[ $BUFFER[$2] == \) ]];;
+    \[) [[ $BUFFER[$2] == \] ]];;
+    \{) [[ $BUFFER[$2] == \} ]];;
+    *) false;;
+  esac
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/cursor-matchingbracket-line-finish.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/cursor-matchingbracket-line-finish.zsh
new file mode 100644
index 00000000..b2acd31d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/cursor-matchingbracket-line-finish.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+WIDGET=zle-line-finish
+
+BUFFER=': $foo[bar]'
+CURSOR=6 # cursor is zero-based
+
+expected_region_highlight=(
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/cursor-matchingbracket.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/cursor-matchingbracket.zsh
new file mode 100644
index 00000000..e05b4e90
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/cursor-matchingbracket.zsh
@@ -0,0 +1,47 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
+
+BUFFER=': ((( )))'
+CURSOR=2 # cursor is zero-based
+
+expected_region_highlight=(
+  "3 3 bracket-level-1"
+  "4 4 bracket-level-2"
+  "5 5 bracket-level-3"
+  "7 7 bracket-level-3"
+  "8 8 bracket-level-2"
+  "9 9 bracket-level-1"
+  "9 9 cursor-matchingbracket"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/empty-styles.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/empty-styles.zsh
new file mode 100644
index 00000000..e60657bc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/empty-styles.zsh
@@ -0,0 +1,33 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': (x)'
+
+expected_region_highlight=(
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/loop-styles.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/loop-styles.zsh
new file mode 100644
index 00000000..e5cfcdf0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/loop-styles.zsh
@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
+
+BUFFER=': ({[({[(x)]})]})'
+
+expected_region_highlight=(
+  "3  3  bracket-level-1"
+  "4  4  bracket-level-2"
+  "5  5  bracket-level-3"
+  "6  6  bracket-level-1"
+  "7  7  bracket-level-2"
+  "8  8  bracket-level-3"
+  "9  9  bracket-level-1"
+  "11 11 bracket-level-1"
+  "12 12 bracket-level-3"
+  "13 13 bracket-level-2"
+  "14 14 bracket-level-1"
+  "15 15 bracket-level-3"
+  "16 16 bracket-level-2"
+  "17 17 bracket-level-1"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/mismatch-patentheses.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/mismatch-patentheses.zsh
new file mode 100644
index 00000000..5cc588fa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/mismatch-patentheses.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x}]'
+
+expected_region_highlight=(
+  "6  6  bracket-error" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+  "10 10 bracket-error" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/near-quotes.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/near-quotes.zsh
new file mode 100644
index 00000000..49f002be
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/near-quotes.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER=': {"{x}"}'
+
+expected_region_highlight=(
+  "3 3 bracket-level-1"
+  "5 5 bracket-level-2"
+  "7 7 bracket-level-2"
+  "9 9 bracket-level-1"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/nested-parentheses.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/nested-parentheses.zsh
new file mode 100644
index 00000000..21a20fb3
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/nested-parentheses.zsh
@@ -0,0 +1,45 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-3]=
+
+BUFFER='echo $(echo ${(z)array})'
+
+expected_region_highlight=(
+  "7  7  bracket-level-1" # (
+  "14 14 bracket-level-2" # {
+  "15 15 bracket-level-3" # (
+  "17 17 bracket-level-3" # )
+  "23 23 bracket-level-2" # }
+  "24 24 bracket-level-1" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/only-error.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/only-error.zsh
new file mode 100644
index 00000000..00fe557c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/only-error.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': x)'
+
+expected_region_highlight=(
+  "4 4 bracket-error" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/quoted-patentheses.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/quoted-patentheses.zsh
new file mode 100644
index 00000000..81ee04f2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/quoted-patentheses.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo ( bar"'
+
+expected_region_highlight=(
+"11 11 bracket-error"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/simple-parentheses.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/simple-parentheses.zsh
new file mode 100644
index 00000000..2ccfbab0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/simple-parentheses.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x})'
+
+expected_region_highlight=(
+  "6  6  bracket-level-1" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+  "10 10 bracket-level-1" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/unclosed-patentheses.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/unclosed-patentheses.zsh
new file mode 100644
index 00000000..d3f6560d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/unclosed-patentheses.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+ZSH_HIGHLIGHT_STYLES[bracket-level-2]=
+
+BUFFER='echo ({x}'
+
+expected_region_highlight=(
+  "6  6  bracket-error" # (
+  "7  7  bracket-level-2" # {
+  "9  9  bracket-level-2" # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/unclosed-patentheses2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/unclosed-patentheses2.zsh
new file mode 100644
index 00000000..2c489c30
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/brackets/test-data/unclosed-patentheses2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsorted=1
+
+ZSH_HIGHLIGHT_STYLES[bracket-level-1]=
+
+BUFFER='echo {x})'
+
+expected_region_highlight=(
+  "6  6  bracket-level-1" # {
+  "8  8  bracket-level-1" # }
+  "9  9 bracket-error" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/cursor/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/cursor/README.md
new file mode 120000
index 00000000..70e0c8c4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/cursor/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/cursor.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/cursor/cursor-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/cursor/cursor-highlighter.zsh
new file mode 100644
index 00000000..81633a3c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/cursor/cursor-highlighter.zsh
@@ -0,0 +1,47 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[cursor]:=standout}
+
+# Whether the cursor highlighter should be called or not.
+_zsh_highlight_highlighter_cursor_predicate()
+{
+  # remove cursor highlighting when the line is finished
+  [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_cursor_moved
+}
+
+# Cursor highlighting function.
+_zsh_highlight_highlighter_cursor_paint()
+{
+  [[ $WIDGET == zle-line-finish ]] && return
+  
+  _zsh_highlight_add_highlight $CURSOR $(( $CURSOR + 1 )) cursor
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/line/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/line/README.md
new file mode 120000
index 00000000..052fe20b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/line/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/line.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/line/line-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/line/line-highlighter.zsh
new file mode 100644
index 00000000..f922dc9b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/line/line-highlighter.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[line]:=}
+
+# Whether the root highlighter should be called or not.
+_zsh_highlight_highlighter_line_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# root highlighting function.
+_zsh_highlight_highlighter_line_paint()
+{
+  _zsh_highlight_add_highlight 0 $#BUFFER line
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/README.md
new file mode 120000
index 00000000..03547318
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/main.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/main-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/main-highlighter.zsh
new file mode 100644
index 00000000..3ec96d98
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/main-highlighter.zsh
@@ -0,0 +1,1846 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[default]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[unknown-token]:=fg=red,bold}
+: ${ZSH_HIGHLIGHT_STYLES[reserved-word]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[suffix-alias]:=fg=green,underline}
+: ${ZSH_HIGHLIGHT_STYLES[global-alias]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[precommand]:=fg=green,underline}
+: ${ZSH_HIGHLIGHT_STYLES[commandseparator]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[autodirectory]:=fg=green,underline}
+: ${ZSH_HIGHLIGHT_STYLES[path]:=underline}
+: ${ZSH_HIGHLIGHT_STYLES[path_pathseparator]:=}
+: ${ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]:=}
+: ${ZSH_HIGHLIGHT_STYLES[globbing]:=fg=blue}
+: ${ZSH_HIGHLIGHT_STYLES[history-expansion]:=fg=blue}
+: ${ZSH_HIGHLIGHT_STYLES[command-substitution]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[command-substitution-delimiter]:=fg=magenta}
+: ${ZSH_HIGHLIGHT_STYLES[process-substitution]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[process-substitution-delimiter]:=fg=magenta}
+: ${ZSH_HIGHLIGHT_STYLES[single-hyphen-option]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[double-hyphen-option]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[back-quoted-argument]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[back-quoted-argument-delimiter]:=fg=magenta}
+: ${ZSH_HIGHLIGHT_STYLES[single-quoted-argument]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[double-quoted-argument]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[dollar-quoted-argument]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[rc-quote]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[dollar-double-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[back-double-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[back-dollar-quoted-argument]:=fg=cyan}
+: ${ZSH_HIGHLIGHT_STYLES[assign]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[redirection]:=fg=yellow}
+: ${ZSH_HIGHLIGHT_STYLES[comment]:=fg=black,bold}
+: ${ZSH_HIGHLIGHT_STYLES[named-fd]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[numeric-fd]:=none}
+: ${ZSH_HIGHLIGHT_STYLES[arg0]:=fg=green}
+
+# Whether the highlighter should be called or not.
+_zsh_highlight_highlighter_main_predicate()
+{
+  # may need to remove path_prefix highlighting when the line ends
+  [[ $WIDGET == zle-line-finish ]] || _zsh_highlight_buffer_modified
+}
+
+# Helper to deal with tokens crossing line boundaries.
+_zsh_highlight_main_add_region_highlight() {
+  integer start=$1 end=$2
+  shift 2
+
+  if (( $#in_alias )); then
+    [[ $1 == unknown-token ]] && alias_style=unknown-token
+    return
+  fi
+  if (( in_param )); then
+    if [[ $1 == unknown-token ]]; then
+      param_style=unknown-token
+    fi
+    if [[ -n $param_style ]]; then
+      return
+    fi
+    param_style=$1
+    return
+  fi
+
+  # The calculation was relative to $buf but region_highlight is relative to $BUFFER.
+  (( start += buf_offset ))
+  (( end += buf_offset ))
+
+  list_highlights+=($start $end $1)
+}
+
+_zsh_highlight_main_add_many_region_highlights() {
+  for 1 2 3; do
+    _zsh_highlight_main_add_region_highlight $1 $2 $3
+  done
+}
+
+_zsh_highlight_main_calculate_fallback() {
+  local -A fallback_of; fallback_of=(
+      alias arg0
+      suffix-alias arg0
+      global-alias dollar-double-quoted-argument
+      builtin arg0
+      function arg0
+      command arg0
+      precommand arg0
+      hashed-command arg0
+      autodirectory arg0
+      arg0_\* arg0
+
+      # TODO: Maybe these? —
+      #   named-fd file-descriptor
+      #   numeric-fd file-descriptor
+
+      path_prefix path
+      # The path separator fallback won't ever be used, due to the optimisation
+      # in _zsh_highlight_main_highlighter_highlight_path_separators().
+      path_pathseparator path
+      path_prefix_pathseparator path_prefix
+
+      single-quoted-argument{-unclosed,}
+      double-quoted-argument{-unclosed,}
+      dollar-quoted-argument{-unclosed,}
+      back-quoted-argument{-unclosed,}
+
+      command-substitution{-quoted,,-unquoted,}
+      command-substitution-delimiter{-quoted,,-unquoted,}
+
+      command-substitution{-delimiter,}
+      process-substitution{-delimiter,}
+      back-quoted-argument{-delimiter,}
+  )
+  local needle=$1 value
+  reply=($1)
+  while [[ -n ${value::=$fallback_of[(k)$needle]} ]]; do
+    unset "fallback_of[$needle]" # paranoia against infinite loops
+    reply+=($value)
+    needle=$value
+  done
+}
+
+# Get the type of a command.
+#
+# Uses the zsh/parameter module if available to avoid forks, and a
+# wrapper around 'type -w' as fallback.
+#
+# If $2 is 0, do not consider aliases.
+#
+# The result will be stored in REPLY.
+_zsh_highlight_main__type() {
+  integer -r aliases_allowed=${2-1}
+  # We won't cache replies of anything that exists as an alias at all, to
+  # ensure the cached value is correct regardless of $aliases_allowed.
+  #
+  # ### We probably _should_ cache them in a cache that's keyed on the value of
+  # ### $aliases_allowed, on the assumption that aliases are the common case.
+  integer may_cache=1
+
+  # Cache lookup
+  if (( $+_zsh_highlight_main__command_type_cache )); then
+    REPLY=$_zsh_highlight_main__command_type_cache[(e)$1]
+    if [[ -n "$REPLY" ]]; then
+      return
+    fi
+  fi
+
+  # Main logic
+  if (( $#options_to_set )); then
+    setopt localoptions $options_to_set;
+  fi
+  unset REPLY
+  if zmodload -e zsh/parameter; then
+    if (( $+aliases[(e)$1] )); then
+      may_cache=0
+    fi
+    if (( ${+galiases[(e)$1]} )) && (( aliases_allowed )); then
+      REPLY='global alias'
+    elif (( $+aliases[(e)$1] )) && (( aliases_allowed )); then
+      REPLY=alias
+    elif [[ $1 == *.* && -n ${1%.*} ]] && (( $+saliases[(e)${1##*.}] )); then
+      REPLY='suffix alias'
+    elif (( $reswords[(Ie)$1] )); then
+      REPLY=reserved
+    elif (( $+functions[(e)$1] )); then
+      REPLY=function
+    elif (( $+builtins[(e)$1] )); then
+      REPLY=builtin
+    elif (( $+commands[(e)$1] )); then
+      REPLY=command
+    # None of the special hashes had a match, so fall back to 'type -w', for
+    # forward compatibility with future versions of zsh that may add new command
+    # types.
+    #
+    # zsh 5.2 and older have a bug whereby running 'type -w ./sudo' implicitly
+    # runs 'hash ./sudo=/usr/local/bin/./sudo' (assuming /usr/local/bin/sudo
+    # exists and is in $PATH).  Avoid triggering the bug, at the expense of
+    # falling through to the $() below, incurring a fork.  (Issue #354.)
+    #
+    # The first disjunct mimics the isrelative() C call from the zsh bug.
+    elif {  [[ $1 != */* ]] || is-at-least 5.3 } &&
+         # Add a subshell to avoid a zsh upstream bug; see issue #606.
+         # ### Remove the subshell when we stop supporting zsh 5.7.1 (I assume 5.8 will have the bugfix).
+         ! (builtin type -w -- "$1") >/dev/null 2>&1; then
+      REPLY=none
+    fi
+  fi
+  if ! (( $+REPLY )); then
+    # zsh/parameter not available or had no matches.
+    #
+    # Note that 'type -w' will run 'rehash' implicitly.
+    #
+    # We 'unalias' in a subshell, so the parent shell is not affected.
+    #
+    # The colon command is there just to avoid a command substitution that
+    # starts with an arithmetic expression [«((…))» as the first thing inside
+    # «$(…)»], which is area that has had some parsing bugs before 5.6
+    # (approximately).
+    REPLY="${$(:; (( aliases_allowed )) || unalias -- "$1" 2>/dev/null; LC_ALL=C builtin type -w -- "$1" 2>/dev/null)##*: }"
+    if [[ $REPLY == 'alias' ]]; then
+      may_cache=0
+    fi
+  fi
+
+  # Cache population
+  if (( may_cache )) && (( $+_zsh_highlight_main__command_type_cache )); then
+    _zsh_highlight_main__command_type_cache[(e)$1]=$REPLY
+  fi
+  [[ -n $REPLY ]]
+  return $?
+}
+
+# Checks whether $1 is something that can be run.
+#
+# Return 0 if runnable, 1 if not runnable, 2 if trouble.
+_zsh_highlight_main__is_runnable() {
+  if _zsh_highlight_main__type "$1"; then
+    [[ $REPLY != none ]]
+  else
+    return 2
+  fi
+}
+
+# Check whether the first argument is a redirection operator token.
+# Report result via the exit code.
+_zsh_highlight_main__is_redirection() {
+  # A redirection operator token:
+  # - starts with an optional single-digit number;
+  # - is one of the tokens listed in zshmisc(1)
+  # - however (z) normalizes ! to |
+  [[ ${1#[0-9]} == (\<|\<\>|(\>|\>\>)(|\|)|\<\<(|-)|\<\<\<|\<\&|\&\<|(\>|\>\>)\&(|\|)|\&(\>|\>\>)(|\||\!)) ]]
+}
+
+# Resolve alias.
+#
+# Takes a single argument.
+#
+# The result will be stored in REPLY.
+_zsh_highlight_main__resolve_alias() {
+  if zmodload -e zsh/parameter; then
+    REPLY=${aliases[$arg]}
+  else
+    REPLY="${"$(alias -- $arg)"#*=}"
+  fi
+}
+
+# Return true iff $1 is a global alias
+_zsh_highlight_main__is_global_alias() {
+  if zmodload -e zsh/parameter; then
+    (( ${+galiases[$arg]} ))
+  elif [[ $arg == '='* ]]; then
+    # avoid running into «alias -L '=foo'» erroring out with 'bad assignment'
+    return 1
+  else
+    alias -L -g -- "$1" >/dev/null
+  fi
+}
+
+# Check that the top of $braces_stack has the expected value.  If it does, set
+# the style according to $2; otherwise, set style=unknown-token.
+#
+# $1: character expected to be at the top of $braces_stack
+# $2: optional assignment to style it if matches
+# return value is 0 if there is a match else 1
+_zsh_highlight_main__stack_pop() {
+  if [[ $braces_stack[1] == $1 ]]; then
+    braces_stack=${braces_stack:1}
+    if (( $+2 )); then
+      style=$2
+    fi
+    return 0
+  else
+    style=unknown-token
+    return 1
+  fi
+}
+
+# Main syntax highlighting function.
+_zsh_highlight_highlighter_main_paint()
+{
+  setopt localoptions extendedglob
+
+  # At the PS3 prompt and in vared, highlight nothing.
+  #
+  # (We can't check this in _zsh_highlight_highlighter_main_predicate because
+  # if the predicate returns false, the previous value of region_highlight
+  # would be reused.)
+  if [[ $CONTEXT == (select|vared) ]]; then
+    return
+  fi
+
+  typeset -a ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR
+  typeset -a ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW
+  local -a options_to_set reply # used in callees
+  local REPLY
+
+  # $flags_with_argument is a set of letters, corresponding to the option letters
+  # that would be followed by a colon in a getopts specification.
+  local flags_with_argument
+  # $flags_sans_argument is a set of letters, corresponding to the option letters
+  # that wouldn't be followed by a colon in a getopts specification.
+  local flags_sans_argument
+  # $flags_solo is a set of letters, corresponding to option letters that, if
+  # present, mean the precommand will not be acting as a precommand, i.e., will
+  # not be followed by a :start: word.
+  local flags_solo
+  # $precommand_options maps precommand name to values of $flags_with_argument,
+  # $flags_sans_argument, and flags_solo for that precommand, joined by a
+  # colon.  (The value is NOT a getopt(3) spec, although it resembles one.)
+  #
+  # Currently, setting $flags_sans_argument is only important for commands that
+  # have a non-empty $flags_with_argument; see test-data/precommand4.zsh.
+  local -A precommand_options
+  precommand_options=(
+    # Precommand modifiers as of zsh 5.6.2 cf. zshmisc(1).
+    '-' ''
+    'builtin' ''
+    'command' :pvV
+    'exec' a:cl
+    'noglob' ''
+    # 'time' and 'nocorrect' shouldn't be added here; they're reserved words, not precommands.
+
+    # miscellaneous commands
+    'doas' aCu:Lns # as of OpenBSD's doas(1) dated September 4, 2016
+    'nice' n: # as of current POSIX spec
+    'pkexec' '' # doesn't take short options; immune to #121 because it's usually not passed --option flags
+    # Not listed: -h, which has two different meanings.
+    'sudo' Cgprtu:AEHPSbilns:eKkVv # as of sudo 1.8.21p2
+    'stdbuf' ioe:
+    'eatmydata' ''
+    'catchsegv' ''
+    'nohup' ''
+    'setsid' :wc
+    'env' u:i
+    'ionice' cn:t:pPu # util-linux 2.33.1-0.1
+    'strace' IbeaosXPpEuOS:ACdfhikqrtTvVxyDc # strace 4.26-0.2
+    'proxychains' f:q # proxychains 4.4.0
+    'torsocks' idq:upaP # Torsocks 2.3.0
+    'torify' idq:upaP # Torsocks 2.3.0
+    'ssh-agent' aEPt:csDd:k # As of OpenSSH 8.1p1
+    'tabbed' gnprtTuU:cdfhs:v # suckless-tools v44
+    'chronic' :ev # moreutils 0.62-1
+    'ifne' :n # moreutils 0.62-1
+    'grc' :se # grc - a "generic colouriser" (that's their spelling, not mine)
+    'cpulimit' elp:ivz # cpulimit 0.2
+    'ktrace' fgpt:aBCcdiT
+  )
+  # Commands that would need to skip one positional argument:
+  #    flock
+  #    ssh
+  #    _wanted (skip two)
+
+  if [[ $zsyh_user_options[ignorebraces] == on || ${zsyh_user_options[ignoreclosebraces]:-off} == on ]]; then
+    local right_brace_is_recognised_everywhere=false
+  else
+    local right_brace_is_recognised_everywhere=true
+  fi
+
+  if [[ $zsyh_user_options[pathdirs] == on ]]; then
+    options_to_set+=( PATH_DIRS )
+  fi
+
+  ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR=(
+    '|' '||' ';' '&' '&&'
+    $'\n' # ${(z)} returns ';' but we convert it to $'\n'
+    '|&'
+    '&!' '&|'
+    # ### 'case' syntax, but followed by a pattern, not by a command
+    # ';;' ';&' ';|'
+  )
+
+  # Tokens that, at (naively-determined) "command position", are followed by
+  # a de jure command position.  All of these are reserved words.
+  ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW=(
+    $'\x7b' # block
+    $'\x28' # subshell
+    '()' # anonymous function
+    'while'
+    'until'
+    'if'
+    'then'
+    'elif'
+    'else'
+    'do'
+    'time'
+    'coproc'
+    '!' # reserved word; unrelated to $histchars[1]
+  )
+
+  if (( $+X_ZSH_HIGHLIGHT_DIRS_BLACKLIST )); then
+    print >&2 'zsh-syntax-highlighting: X_ZSH_HIGHLIGHT_DIRS_BLACKLIST is deprecated. Please use ZSH_HIGHLIGHT_DIRS_BLACKLIST.'
+    ZSH_HIGHLIGHT_DIRS_BLACKLIST=($X_ZSH_HIGHLIGHT_DIRS_BLACKLIST)
+    unset X_ZSH_HIGHLIGHT_DIRS_BLACKLIST
+  fi
+
+  _zsh_highlight_main_highlighter_highlight_list -$#PREBUFFER '' 1 "$PREBUFFER$BUFFER"
+
+  # end is a reserved word
+  local start end_ style
+  for start end_ style in $reply; do
+    (( start >= end_ )) && { print -r -- >&2 "zsh-syntax-highlighting: BUG: _zsh_highlight_highlighter_main_paint: start($start) >= end($end_)"; return }
+    (( end_ <= 0 )) && continue
+    (( start < 0 )) && start=0 # having start<0 is normal with e.g. multiline strings
+    _zsh_highlight_main_calculate_fallback $style
+    _zsh_highlight_add_highlight $start $end_ $reply
+  done
+}
+
+# Try to expand $1, if it's possible to do so safely.
+# 
+# Uses two parameters from the caller: $parameter_name_pattern and $res.
+#
+# If expansion was done, set $reply to the expansion and return true.
+# Otherwise, return false.
+_zsh_highlight_main_highlighter__try_expand_parameter()
+{
+  local arg="$1"
+  unset reply
+  {
+    # ### For now, expand just '$foo' or '${foo}', possibly with braces, but with
+    # ### no other features of the parameter expansion syntax.  (No ${(x)foo},
+    # ### no ${foo[x]}, no ${foo:-x}.)
+    {
+      local -a match mbegin mend
+      local MATCH; integer MBEGIN MEND
+      local parameter_name
+      local -a words
+      if [[ $arg[1] != '$' ]]; then
+        return 1
+      fi
+      if [[ ${arg[2]} == '{' ]] && [[ ${arg[-1]} == '}' ]]; then
+        parameter_name=${${arg:2}%?}
+      else
+        parameter_name=${arg:1}
+      fi
+      if [[ $res == none ]] && 
+         [[ ${parameter_name} =~ ^${~parameter_name_pattern}$ ]] &&
+         [[ ${(tP)MATCH} != *special* ]]
+      then
+        # Set $arg and update $res.
+        case ${(tP)MATCH} in
+          (*array*|*assoc*)
+            words=( ${(P)MATCH} )
+            ;;
+          ("")
+            # not set
+            words=( )
+            ;;
+          (*)
+            # scalar, presumably
+            if [[ $zsyh_user_options[shwordsplit] == on ]]; then
+              words=( ${(P)=MATCH} )
+            else
+              words=( ${(P)MATCH} )
+            fi
+            ;;
+        esac
+        reply=( "${words[@]}" )
+      else
+        return 1
+      fi
+    }
+  }
+}
+
+# $1 is the offset of $4 from the parent buffer. Added to the returned highlights.
+# $2 is the initial braces_stack (for a closing paren).
+# $3 is 1 if $4 contains the end of $BUFFER, else 0.
+# $4 is the buffer to highlight.
+# Returns:
+# $REPLY: $buf[REPLY] is the last character parsed.
+# $reply is an array of region_highlight additions.
+# exit code is 0 if the braces_stack is empty, 1 otherwise.
+_zsh_highlight_main_highlighter_highlight_list()
+{
+  integer start_pos end_pos=0 buf_offset=$1 has_end=$3
+  # alias_style is the style to apply to an alias once $#in_alias == 0
+  #     Usually 'alias' but set to 'unknown-token' if any word expanded from
+  #     the alias would be highlighted as unknown-token
+  # param_style is analogous for parameter expansions
+  local alias_style param_style last_arg arg buf=$4 highlight_glob=true saw_assignment=false style
+  local in_array_assignment=false # true between 'a=(' and the matching ')'
+  # in_alias is an array of integers with each element equal to the number
+  #     of shifts needed until arg=args[1] pops an arg from the next level up
+  #     alias or from BUFFER.
+  # in_param is analogous for parameter expansions
+  integer in_param=0 len=$#buf
+  local -a in_alias match mbegin mend list_highlights
+  # seen_alias is a map of aliases already seen to avoid loops like alias a=b b=a
+  local -A seen_alias
+  # Pattern for parameter names
+  readonly parameter_name_pattern='([A-Za-z_][A-Za-z0-9_]*|[0-9]+)'
+  list_highlights=()
+
+  # "R" for round
+  # "Q" for square
+  # "Y" for curly
+  # "T" for [[ ]]
+  # "S" for $( ), =( ), <( ), >( )
+  # "D" for do/done
+  # "$" for 'end' (matches 'foreach' always; also used with cshjunkiequotes in repeat/while)
+  # "?" for 'if'/'fi'; also checked by 'elif'/'else'
+  # ":" for 'then'
+  local braces_stack=$2
+
+  # State machine
+  #
+  # The states are:
+  # - :start:      Command word
+  # - :start_of_pipeline:      Start of a 'pipeline' as defined in zshmisc(1).
+  #                Only valid when :start: is present
+  # - :sudo_opt:   A leading-dash option to a precommand, whether it takes an
+  #                argument or not.  (Example: sudo's "-u" or "-i".)
+  # - :sudo_arg:   The argument to a precommand's leading-dash option,
+  #                when given as a separate word; i.e., "foo" in "-u foo" (two
+  #                words) but not in "-ufoo" (one word).
+  #    Note:       :sudo_opt: and :sudo_arg: are used for any precommand
+  #                declared in ${precommand_options}, not just for sudo(8).
+  #                The naming is historical.
+  # - :regular:    "Not a command word", and command delimiters are permitted.
+  #                Mainly used to detect premature termination of commands.
+  # - :always:     The word 'always' in the «{ foo } always { bar }» syntax.
+  #
+  # When the kind of a word is not yet known, $this_word / $next_word may contain
+  # multiple states.  For example, after "sudo -i", the next word may be either
+  # another --flag or a command name, hence the state would include both ':start:'
+  # and ':sudo_opt:'.
+  #
+  # The tokens are always added with both leading and trailing colons to serve as
+  # word delimiters (an improvised array); [[ $x == *':foo:'* ]] and x=${x//:foo:/}
+  # will DTRT regardless of how many elements or repetitions $x has.
+  #
+  # Handling of redirections: upon seeing a redirection token, we must stall
+  # the current state --- that is, the value of $this_word --- for two iterations
+  # (one for the redirection operator, one for the word following it representing
+  # the redirection target).  Therefore, we set $in_redirection to 2 upon seeing a
+  # redirection operator, decrement it each iteration, and stall the current state
+  # when it is non-zero.  Thus, upon reaching the next word (the one that follows
+  # the redirection operator and target), $this_word will still contain values
+  # appropriate for the word immediately following the word that preceded the
+  # redirection operator.
+  #
+  # The "the previous word was a redirection operator" state is not communicated
+  # to the next iteration via $next_word/$this_word as usual, but via
+  # $in_redirection.  The value of $next_word from the iteration that processed
+  # the operator is discarded.
+  #
+  # $in_redirection is currently used for:
+  # - comments
+  # - aliases
+  # - redirections
+  # - parameter elision in command position
+  # - 'repeat' loops
+  #
+  local this_word next_word=':start::start_of_pipeline:'
+  integer in_redirection
+  # Processing buffer
+  local proc_buf="$buf"
+  local -a args
+  if [[ $zsyh_user_options[interactivecomments] == on ]]; then
+    args=(${(zZ+c+)buf})
+  else
+    args=(${(z)buf})
+  fi
+
+  # Special case: $(<*) isn't globbing.
+  if [[ $braces_stack == 'S' ]] && (( $+args[3] && ! $+args[4] )) && [[ $args[3] == $'\x29' ]] &&
+     [[ $args[1] == *'<'* ]] && _zsh_highlight_main__is_redirection $args[1]; then
+    highlight_glob=false
+  fi
+
+  while (( $#args )); do
+    last_arg=$arg
+    arg=$args[1]
+    shift args
+    if (( $#in_alias )); then
+      (( in_alias[1]-- ))
+      # Remove leading 0 entries
+      in_alias=($in_alias[$in_alias[(i)<1->],-1])
+      if (( $#in_alias == 0 )); then
+        seen_alias=()
+        # start_pos and end_pos are of the alias (previous $arg) here
+        _zsh_highlight_main_add_region_highlight $start_pos $end_pos $alias_style
+      else
+        # We can't unset keys that contain special characters (] \ and some others).
+        # More details: https://www.zsh.org/workers/43269
+        (){
+          local alias_name
+          for alias_name in ${(k)seen_alias[(R)<$#in_alias->]}; do
+            seen_alias=("${(@kv)seen_alias[(I)^$alias_name]}")
+          done
+        }
+      fi
+    fi
+    if (( in_param )); then
+      (( in_param-- ))
+      if (( in_param == 0 )); then
+        # start_pos and end_pos are of the '$foo' word (previous $arg) here
+        _zsh_highlight_main_add_region_highlight $start_pos $end_pos $param_style
+        param_style=""
+      fi
+    fi
+
+    # Initialize this_word and next_word.
+    if (( in_redirection == 0 )); then
+      this_word=$next_word
+      next_word=':regular:'
+    elif (( !in_param )); then
+      # Stall $next_word.
+      (( --in_redirection ))
+    fi
+
+    # Initialize per-"simple command" [zshmisc(1)] variables:
+    #
+    #   $style               how to highlight $arg
+    #   $in_array_assignment boolean flag for "between '(' and ')' of array assignment"
+    #   $highlight_glob      boolean flag for "'noglob' is in effect"
+    #   $saw_assignment      boolean flag for "was preceded by an assignment"
+    #
+    style=unknown-token
+    if [[ $this_word == *':start:'* ]]; then
+      in_array_assignment=false
+      if [[ $arg == 'noglob' ]]; then
+        highlight_glob=false
+      fi
+    fi
+
+    if (( $#in_alias == 0 && in_param == 0 )); then
+      # Compute the new $start_pos and $end_pos, skipping over whitespace in $buf.
+      [[ "$proc_buf" = (#b)(#s)(''([ $'\t']|[\\]$'\n')#)(?|)* ]]
+      # The first, outer parenthesis
+      integer offset="${#match[1]}"
+      (( start_pos = end_pos + offset ))
+      (( end_pos = start_pos + $#arg ))
+
+      # The zsh lexer considers ';' and newline to be the same token, so
+      # ${(z)} converts all newlines to semicolons. Convert them back here to
+      # make later processing simpler.
+      [[ $arg == ';' && ${match[3]} == $'\n' ]] && arg=$'\n'
+
+      # Compute the new $proc_buf. We advance it
+      # (chop off characters from the beginning)
+      # beyond what end_pos points to, by skipping
+      # as many characters as end_pos was advanced.
+      #
+      # end_pos was advanced by $offset (via start_pos)
+      # and by $#arg. Note the `start_pos=$end_pos`
+      # below.
+      #
+      # As for the [,len]. We could use [,len-start_pos+offset]
+      # here, but to make it easier on eyes, we use len and
+      # rely on the fact that Zsh simply handles that. The
+      # length of proc_buf is len-start_pos+offset because
+      # we're chopping it to match current start_pos, so its
+      # length matches the previous value of start_pos.
+      #
+      # Why [,-1] is slower than [,length] isn't clear.
+      proc_buf="${proc_buf[offset + $#arg + 1,len]}"
+    fi
+
+    # Handle the INTERACTIVE_COMMENTS option.
+    #
+    # We use the (Z+c+) flag so the entire comment is presented as one token in $arg.
+    if [[ $zsyh_user_options[interactivecomments] == on && $arg[1] == $histchars[3] ]]; then
+      if [[ $this_word == *(':regular:'|':start:')* ]]; then
+        style=comment
+      else
+        style=unknown-token # prematurely terminated
+      fi
+      _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+      # Stall this arg
+      in_redirection=1
+      continue
+    fi
+
+    if [[ $this_word == *':start:'* ]] && ! (( in_redirection )); then
+      # Expand aliases.
+      # An alias is ineligible for expansion while it's being expanded (see #652/#653).
+      _zsh_highlight_main__type "$arg" "$(( ! ${+seen_alias[$arg]} ))"
+      local res="$REPLY"
+      if [[ $res == "alias" ]]; then
+        # Mark insane aliases as unknown-token (cf. #263).
+        if [[ $arg == ?*=* ]]; then
+          _zsh_highlight_main_add_region_highlight $start_pos $end_pos unknown-token
+          continue
+        fi
+        seen_alias[$arg]=$#in_alias
+        _zsh_highlight_main__resolve_alias $arg
+        local -a alias_args
+        # Elision is desired in case alias x=''
+        if [[ $zsyh_user_options[interactivecomments] == on ]]; then
+          alias_args=(${(zZ+c+)REPLY})
+        else
+          alias_args=(${(z)REPLY})
+        fi
+        args=( $alias_args $args )
+        if (( $#in_alias == 0 )); then
+          alias_style=alias
+        else
+          # Transfer the count of this arg to the new element about to be appended.
+          (( in_alias[1]-- ))
+        fi
+        # Add one because we will in_alias[1]-- on the next loop iteration so
+        # this iteration should be considered in in_alias as well
+        in_alias=( $(($#alias_args + 1)) $in_alias )
+        (( in_redirection++ )) # Stall this arg
+        continue
+      else
+        _zsh_highlight_main_highlighter_expand_path $arg
+        _zsh_highlight_main__type "$REPLY" 0
+        res="$REPLY"
+      fi
+    fi
+
+    # Analyse the current word.
+    if _zsh_highlight_main__is_redirection $arg ; then
+      if (( in_redirection == 1 )); then
+        # Two consecutive redirection operators is an error.
+        _zsh_highlight_main_add_region_highlight $start_pos $end_pos unknown-token
+      else
+        in_redirection=2
+        _zsh_highlight_main_add_region_highlight $start_pos $end_pos redirection
+      fi
+      continue
+    elif [[ $arg == '{'${~parameter_name_pattern}'}' ]] && _zsh_highlight_main__is_redirection $args[1]; then
+      # named file descriptor: {foo}>&2
+      in_redirection=3
+      _zsh_highlight_main_add_region_highlight $start_pos $end_pos named-fd
+      continue
+    fi
+
+    # Expand parameters.
+    if (( ! in_param )) && _zsh_highlight_main_highlighter__try_expand_parameter "$arg"; then
+      # That's not entirely correct --- if the parameter's value happens to be a reserved
+      # word, the parameter expansion will be highlighted as a reserved word --- but that
+      # incorrectness is outweighed by the usability improvement of permitting the use of
+      # parameters that refer to commands, functions, and builtins.
+      () {
+        local -a words; words=( "${reply[@]}" )
+        if (( $#words == 0 )) && (( ! in_redirection )); then
+          # Parameter elision is happening
+          (( ++in_redirection ))
+          _zsh_highlight_main_add_region_highlight $start_pos $end_pos comment
+          continue
+        else
+          (( in_param = 1 + $#words ))
+          args=( $words $args )
+          arg=$args[1]
+          _zsh_highlight_main__type "$arg" 0
+          res=$REPLY
+        fi
+      }
+    fi
+
+    # Parse the sudo command line
+    if (( ! in_redirection )); then
+      if [[ $this_word == *':sudo_opt:'* ]]; then
+        if [[ -n $flags_with_argument ]] &&
+           { 
+             # Trenary
+             if [[ -n $flags_sans_argument ]]
+             then [[ $arg == '-'[$flags_sans_argument]#[$flags_with_argument] ]]
+             else [[ $arg == '-'[$flags_with_argument] ]]
+             fi
+           } then
+          # Flag that requires an argument
+          this_word=${this_word//:start:/}
+          next_word=':sudo_arg:'
+        elif [[ -n $flags_with_argument ]] &&
+             {
+               # Trenary
+               if [[ -n $flags_sans_argument ]]
+               then [[ $arg == '-'[$flags_sans_argument]#[$flags_with_argument]* ]]
+               else [[ $arg == '-'[$flags_with_argument]* ]]
+               fi
+             } then
+          # Argument attached in the same word
+          this_word=${this_word//:start:/}
+          next_word+=':start:'
+          next_word+=':sudo_opt:'
+        elif [[ -n $flags_sans_argument ]] &&
+             [[ $arg == '-'[$flags_sans_argument]# ]]; then
+          # Flag that requires no argument
+          this_word=':sudo_opt:'
+          next_word+=':start:'
+          next_word+=':sudo_opt:'
+        elif [[ -n $flags_solo ]] && 
+             {
+               # Trenary
+               if [[ -n $flags_sans_argument ]]
+               then [[ $arg == '-'[$flags_sans_argument]#[$flags_solo]* ]]
+               else [[ $arg == '-'[$flags_solo]* ]]
+               fi
+             } then
+          # Solo flags
+          this_word=':sudo_opt:'
+          next_word=':regular:' # no :start:, nor :sudo_opt: since we don't know whether the solo flag takes an argument or not
+        elif [[ $arg == '-'* ]]; then
+          # Unknown flag.  We don't know whether it takes an argument or not,
+          # so modify $next_word as we do for flags that require no argument.
+          # With that behaviour, if the flag in fact takes no argument we'll
+          # highlight the inner command word correctly, and if it does take an
+          # argument we'll highlight the command word correctly if the argument
+          # was given in the same shell word as the flag (as in '-uphy1729' or
+          # '--user=phy1729' without spaces).
+          this_word=':sudo_opt:'
+          next_word+=':start:'
+          next_word+=':sudo_opt:'
+        else
+          # Not an option flag; nothing to do.  (If the command line is
+          # syntactically valid, ${this_word//:sudo_opt:/} should be
+          # non-empty now.)
+          this_word=${this_word//:sudo_opt:/}
+        fi
+      elif [[ $this_word == *':sudo_arg:'* ]]; then
+        next_word+=':sudo_opt:'
+        next_word+=':start:'
+      fi
+    fi
+
+    # The Great Fork: is this a command word?  Is this a non-command word?
+    if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_COMMANDSEPARATOR:#"$arg"} ]] &&
+       [[ $braces_stack != *T* || $arg != ('||'|'&&') ]]; then
+
+      # First, determine the style of the command separator itself.
+      if _zsh_highlight_main__stack_pop T || _zsh_highlight_main__stack_pop Q; then
+        # Missing closing square bracket(s)
+        style=unknown-token
+      elif $in_array_assignment; then
+        case $arg in
+          # Literal newlines are just fine.
+          ($'\n') style=commandseparator;;
+          # Semicolons are parsed the same way as literal newlines.  Nevertheless,
+          # highlight them as errors since they're probably unintended.  Compare
+          # issue #691.
+          (';') style=unknown-token;;
+          # Other command separators aren't allowed.
+          (*) style=unknown-token;;
+        esac
+      elif [[ $this_word == *':regular:'* ]]; then
+        style=commandseparator
+      elif [[ $this_word == *':start:'* ]] && [[ $arg == $'\n' ]]; then
+        style=commandseparator
+      elif [[ $this_word == *':start:'* ]] && [[ $arg == ';' ]] && (( $#in_alias )); then
+        style=commandseparator 
+      else
+        # Empty commands (semicolon follows nothing) are valid syntax.
+        # However, in interactive use they are likely to be erroneous;
+        # therefore, we highlight them as errors.
+        #
+        # Alias definitions are exempted from this check to allow multiline aliases
+        # with explicit (redundant) semicolons: «alias foo=$'bar;\nbaz'» (issue #677).
+        #
+        # See also #691 about possibly changing the style used here. 
+        style=unknown-token
+      fi
+
+      # Second, determine the style of next_word.
+      if [[ $arg == $'\n' ]] && $in_array_assignment; then
+        # literal newline inside an array assignment
+        next_word=':regular:'
+      elif [[ $arg == ';' ]] && $in_array_assignment; then
+        # literal semicolon inside an array assignment
+        next_word=':regular:'
+      else
+        next_word=':start:'
+        highlight_glob=true
+        saw_assignment=false
+        (){
+          local alias_name
+          for alias_name in ${(k)seen_alias[(R)<$#in_alias->]}; do
+            # We can't unset keys that contain special characters (] \ and some others).
+            # More details: https://www.zsh.org/workers/43269
+            seen_alias=("${(@kv)seen_alias[(I)^$alias_name]}")
+          done
+        }
+        if [[ $arg != '|' && $arg != '|&' ]]; then
+          next_word+=':start_of_pipeline:'
+        fi
+      fi
+
+    elif ! (( in_redirection)) && [[ $this_word == *':always:'* && $arg == 'always' ]]; then
+      # try-always construct
+      style=reserved-word # de facto a reserved word, although not de jure
+      highlight_glob=true
+      saw_assignment=false
+      next_word=':start::start_of_pipeline:' # only left brace is allowed, apparently
+    elif ! (( in_redirection)) && [[ $this_word == *':start:'* ]]; then # $arg is the command word
+      if (( ${+precommand_options[$arg]} )) && _zsh_highlight_main__is_runnable $arg; then
+        style=precommand
+        () {
+          set -- "${(@s.:.)precommand_options[$arg]}"
+          flags_with_argument=$1
+          flags_sans_argument=$2
+          flags_solo=$3
+        }
+        next_word=${next_word//:regular:/}
+        next_word+=':sudo_opt:'
+        next_word+=':start:'
+        if [[ $arg == 'exec' || $arg == 'env' ]]; then
+          # To allow "exec 2>&1;" and "env | grep" where there's no command word
+          next_word+=':regular:'
+        fi
+      else
+        case $res in
+          (reserved)    # reserved word
+                        style=reserved-word
+                        # Match braces and handle special cases.
+                        case $arg in
+                          (time|nocorrect)
+                            next_word=${next_word//:regular:/}
+                            next_word+=':start:'
+                            ;;
+                          ($'\x7b')
+                            braces_stack='Y'"$braces_stack"
+                            ;;
+                          ($'\x7d')
+                            # We're at command word, so no need to check $right_brace_is_recognised_everywhere
+                            _zsh_highlight_main__stack_pop 'Y' reserved-word
+                            if [[ $style == reserved-word ]]; then
+                              next_word+=':always:'
+                            fi
+                            ;;
+                          ($'\x5b\x5b')
+                            braces_stack='T'"$braces_stack"
+                            ;;
+                          ('do')
+                            braces_stack='D'"$braces_stack"
+                            ;;
+                          ('done')
+                            _zsh_highlight_main__stack_pop 'D' reserved-word
+                            ;;
+                          ('if')
+                            braces_stack=':?'"$braces_stack"
+                            ;;
+                          ('then')
+                            _zsh_highlight_main__stack_pop ':' reserved-word
+                            ;;
+                          ('elif')
+                            if [[ ${braces_stack[1]} == '?' ]]; then
+                              braces_stack=':'"$braces_stack"
+                            else
+                              style=unknown-token
+                            fi
+                            ;;
+                          ('else')
+                            if [[ ${braces_stack[1]} == '?' ]]; then
+                              :
+                            else
+                              style=unknown-token
+                            fi
+                            ;;
+                          ('fi')
+                            _zsh_highlight_main__stack_pop '?'
+                            ;;
+                          ('foreach')
+                            braces_stack='$'"$braces_stack"
+                            ;;
+                          ('end')
+                            _zsh_highlight_main__stack_pop '$' reserved-word
+                            ;;
+                          ('repeat')
+                            # skip the repeat-count word
+                            in_redirection=2
+                            # The redirection mechanism assumes $this_word describes the word
+                            # following the redirection.  Make it so.
+                            #
+                            # That word can be a command word with shortloops (`repeat 2 ls`)
+                            # or a command separator (`repeat 2; ls` or `repeat 2; do ls; done`).
+                            #
+                            # The repeat-count word will be handled like a redirection target.
+                            this_word=':start::regular:'
+                            ;;
+                          ('!')
+                            if [[ $this_word != *':start_of_pipeline:'* ]]; then
+                              style=unknown-token
+                            else
+                              # '!' reserved word at start of pipeline; style already set above
+                            fi
+                            ;;
+                        esac
+                        if $saw_assignment && [[ $style != unknown-token ]]; then
+                          style=unknown-token
+                        fi
+                        ;;
+          ('suffix alias')
+                        style=suffix-alias
+                        ;;
+          ('global alias')
+                        style=global-alias
+                        ;;
+          (alias)       :;;
+          (builtin)     style=builtin
+                        [[ $arg == $'\x5b' ]] && braces_stack='Q'"$braces_stack"
+                        ;;
+          (function)    style=function;;
+          (command)     style=command;;
+          (hashed)      style=hashed-command;;
+          (none)        if (( ! in_param )) && _zsh_highlight_main_highlighter_check_assign; then
+                          _zsh_highlight_main_add_region_highlight $start_pos $end_pos assign
+                          local i=$(( arg[(i)=] + 1 ))
+                          saw_assignment=true
+                          if [[ $arg[i] == '(' ]]; then
+                            in_array_assignment=true
+                            _zsh_highlight_main_add_region_highlight start_pos+i-1 start_pos+i reserved-word
+                          else
+                            # assignment to a scalar parameter.
+                            # (For array assignments, the command doesn't start until the ")" token.)
+                            # 
+                            # Discard  :start_of_pipeline:, if present, as '!' is not valid
+                            # after assignments.
+                            next_word+=':start:'
+                            if (( i <= $#arg )); then
+                              () {
+                                local highlight_glob=false
+                                [[ $zsyh_user_options[globassign] == on ]] && highlight_glob=true
+                                _zsh_highlight_main_highlighter_highlight_argument $i
+                              }
+                            fi
+                          fi
+                          continue
+                        elif (( ! in_param )) &&
+                             [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then
+                          style=history-expansion
+                        elif (( ! in_param )) &&
+                             [[ $arg[0,1] == $histchars[2,2] ]]; then
+                          style=history-expansion
+                        elif (( ! in_param )) &&
+                             ! $saw_assignment &&
+                             [[ $arg[1,2] == '((' ]]; then
+                          # Arithmetic evaluation.
+                          #
+                          # Note: prior to zsh-5.1.1-52-g4bed2cf (workers/36669), the ${(z)...}
+                          # splitter would only output the '((' token if the matching '))' had
+                          # been typed.  Therefore, under those versions of zsh, BUFFER="(( 42"
+                          # would be highlighted as an error until the matching "))" are typed.
+                          #
+                          # We highlight just the opening parentheses, as a reserved word; this
+                          # is how [[ ... ]] is highlighted, too.
+                          _zsh_highlight_main_add_region_highlight $start_pos $((start_pos + 2)) reserved-word
+                          if [[ $arg[-2,-1] == '))' ]]; then
+                            _zsh_highlight_main_add_region_highlight $((end_pos - 2)) $end_pos reserved-word
+                          fi
+                          continue
+                        elif (( ! in_param )) &&
+                             [[ $arg == '()' ]]; then
+                          # anonymous function
+                          style=reserved-word
+                        elif (( ! in_param )) &&
+                             ! $saw_assignment &&
+                             [[ $arg == $'\x28' ]]; then
+                          # subshell
+                          style=reserved-word
+                          braces_stack='R'"$braces_stack"
+                        elif (( ! in_param )) &&
+                             [[ $arg == $'\x29' ]]; then
+                          # end of subshell or command substitution
+                          if _zsh_highlight_main__stack_pop 'S'; then
+                            REPLY=$start_pos
+                            reply=($list_highlights)
+                            return 0
+                          fi
+                          _zsh_highlight_main__stack_pop 'R' reserved-word
+                        else
+                          if _zsh_highlight_main_highlighter_check_path $arg 1; then
+                            style=$REPLY
+                          else
+                            style=unknown-token
+                          fi
+                        fi
+                        ;;
+          (*)           _zsh_highlight_main_add_region_highlight $start_pos $end_pos arg0_$res
+                        continue
+                        ;;
+        esac
+      fi
+      if [[ -n ${(M)ZSH_HIGHLIGHT_TOKENS_CONTROL_FLOW:#"$arg"} ]]; then
+        next_word=':start::start_of_pipeline:'
+      fi
+    elif _zsh_highlight_main__is_global_alias "$arg"; then # $arg is a global alias that isn't in command position
+      style=global-alias
+    else # $arg is a non-command word
+      case $arg in
+        ($'\x29')
+                  # subshell or end of array assignment
+                  if $in_array_assignment; then
+                    _zsh_highlight_main_add_region_highlight $start_pos $end_pos assign
+                    _zsh_highlight_main_add_region_highlight $start_pos $end_pos reserved-word
+                    in_array_assignment=false
+                    next_word+=':start:'
+                    continue
+                  elif (( in_redirection )); then
+                    style=unknown-token
+                  else
+                    if _zsh_highlight_main__stack_pop 'S'; then
+                      REPLY=$start_pos
+                      reply=($list_highlights)
+                      return 0
+                    fi
+                    _zsh_highlight_main__stack_pop 'R' reserved-word
+                  fi
+                  ;;
+        ($'\x28\x29')
+                  # possibly a function definition
+                  if (( in_redirection )) || $in_array_assignment; then
+                    style=unknown-token
+                  else
+                    if [[ $zsyh_user_options[multifuncdef] == on ]] || false # TODO: or if the previous word was a command word
+                    then
+                      next_word+=':start::start_of_pipeline:'
+                    fi
+                    style=reserved-word
+                  fi
+                  ;;
+        (*)       if false; then
+                  elif [[ $arg = $'\x7d' ]] && $right_brace_is_recognised_everywhere; then
+                    # Parsing rule: {
+                    #
+                    #     Additionally, `tt(})' is recognized in any position if neither the
+                    #     tt(IGNORE_BRACES) option nor the tt(IGNORE_CLOSE_BRACES) option is set.
+                    if (( in_redirection )) || $in_array_assignment; then
+                      style=unknown-token
+                    else
+                      _zsh_highlight_main__stack_pop 'Y' reserved-word
+                      if [[ $style == reserved-word ]]; then
+                        next_word+=':always:'
+                      fi
+                    fi
+                  elif [[ $arg[0,1] = $histchars[0,1] ]] && (( $#arg[0,2] == 2 )); then
+                    style=history-expansion
+                  elif [[ $arg == $'\x5d\x5d' ]] && _zsh_highlight_main__stack_pop 'T' reserved-word; then
+                    :
+                  elif [[ $arg == $'\x5d' ]] && _zsh_highlight_main__stack_pop 'Q' builtin; then
+                    :
+                  else
+                    _zsh_highlight_main_highlighter_highlight_argument 1 $(( 1 != in_redirection ))
+                    continue
+                  fi
+                  ;;
+      esac
+    fi
+    _zsh_highlight_main_add_region_highlight $start_pos $end_pos $style
+  done
+  (( $#in_alias )) && in_alias=() _zsh_highlight_main_add_region_highlight $start_pos $end_pos $alias_style
+  (( in_param == 1 )) && in_param=0 _zsh_highlight_main_add_region_highlight $start_pos $end_pos $param_style
+  [[ "$proc_buf" = (#b)(#s)(([[:space:]]|\\$'\n')#) ]]
+  REPLY=$(( end_pos + ${#match[1]} - 1 ))
+  reply=($list_highlights)
+  return $(( $#braces_stack > 0 ))
+}
+
+# Check if $arg is variable assignment
+_zsh_highlight_main_highlighter_check_assign()
+{
+    setopt localoptions extended_glob
+    [[ $arg == [[:alpha:]_][[:alnum:]_]#(|\[*\])(|[+])=* ]] ||
+      [[ $arg == [0-9]##(|[+])=* ]]
+}
+
+_zsh_highlight_main_highlighter_highlight_path_separators()
+{
+  local pos style_pathsep
+  style_pathsep=$1_pathseparator
+  reply=()
+  [[ -z "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" || "$ZSH_HIGHLIGHT_STYLES[$1]" == "$ZSH_HIGHLIGHT_STYLES[$style_pathsep]" ]] && return 0
+  for (( pos = start_pos; $pos <= end_pos; pos++ )) ; do
+    if [[ $BUFFER[pos] == / ]]; then
+      reply+=($((pos - 1)) $pos $style_pathsep)
+    fi
+  done
+}
+
+# Check if $1 is a path.
+# If yes, return 0 and in $REPLY the style to use.
+# Else, return non-zero (and the contents of $REPLY is undefined).
+#
+# $2 should be non-zero iff we're in command position.
+_zsh_highlight_main_highlighter_check_path()
+{
+  _zsh_highlight_main_highlighter_expand_path "$1"
+  local expanded_path="$REPLY" tmp_path
+  integer in_command_position=$2
+
+  if [[ $zsyh_user_options[autocd] == on ]]; then
+    integer autocd=1
+  else
+    integer autocd=0
+  fi
+
+  if (( in_command_position )); then
+    # ### Currently, this value is never returned: either it's overwritten
+    # ### below, or the return code is non-zero
+    REPLY=arg0
+  else
+    REPLY=path
+  fi
+
+  if [[ ${1[1]} == '=' && $1 == ??* && ${1[2]} != $'\x28' && $zsyh_user_options[equals] == 'on' && $expanded_path[1] != '/' ]]; then
+    REPLY=unknown-token # will error out if executed
+    return 0
+  fi
+
+  [[ -z $expanded_path ]] && return 1
+
+  # Check if this is a blacklisted path
+  if [[ $expanded_path[1] == / ]]; then
+    tmp_path=$expanded_path
+  else
+    tmp_path=$PWD/$expanded_path
+  fi
+  tmp_path=$tmp_path:a
+
+  while [[ $tmp_path != / ]]; do
+    [[ -n ${(M)ZSH_HIGHLIGHT_DIRS_BLACKLIST:#$tmp_path} ]] && return 1
+    tmp_path=$tmp_path:h
+  done
+
+  if (( in_command_position )); then
+    if [[ -x $expanded_path ]]; then
+      if (( autocd )); then
+        if [[ -d $expanded_path ]]; then
+          REPLY=autodirectory
+        fi
+        return 0
+      elif [[ ! -d $expanded_path ]]; then
+        # ### This seems unreachable for the current callers
+        return 0
+      fi
+    fi
+  else
+    if [[ -L $expanded_path || -e $expanded_path ]]; then
+      return 0
+    fi
+  fi
+
+  # Search the path in CDPATH
+  if [[ $expanded_path != /* ]] && (( autocd || ! in_command_position )); then
+    # TODO: When we've dropped support for pre-5.0.6 zsh, use the *(Y1) glob qualifier here.
+    local cdpath_dir
+    for cdpath_dir in $cdpath ; do
+      if [[ -d "$cdpath_dir/$expanded_path" && -x "$cdpath_dir/$expanded_path" ]]; then
+        if (( in_command_position && autocd )); then
+          REPLY=autodirectory
+        fi
+        return 0
+      fi
+    done
+  fi
+
+  # If dirname($1) doesn't exist, neither does $1.
+  [[ ! -d ${expanded_path:h} ]] && return 1
+
+  # If this word ends the buffer, check if it's the prefix of a valid path.
+  if (( has_end && (len == end_pos) )) &&
+     (( ! $#in_alias )) &&
+     [[ $WIDGET != zle-line-finish ]]; then
+    # TODO: When we've dropped support for pre-5.0.6 zsh, use the *(Y1) glob qualifier here.
+    local -a tmp
+    if (( in_command_position )); then
+      # We include directories even when autocd is enabled, because those
+      # directories might contain executable files: e.g., BUFFER="/bi" en route
+      # to typing "/bin/sh".
+      tmp=( ${expanded_path}*(N-*,N-/) )
+    else
+      tmp=( ${expanded_path}*(N) )
+    fi
+    (( ${+tmp[1]} )) && REPLY=path_prefix && return 0
+  fi
+
+  # It's not a path.
+  return 1
+}
+
+# Highlight an argument and possibly special chars in quotes starting at $1 in $arg
+# This command will at least highlight $1 to end_pos with the default style
+# If $2 is set to 0, the argument cannot be highlighted as an option.
+#
+# This function currently assumes it's never called for the command word.
+_zsh_highlight_main_highlighter_highlight_argument()
+{
+  local base_style=default i=$1 option_eligible=${2:-1} path_eligible=1 ret start style
+  local -a highlights
+
+  local -a match mbegin mend
+  local MATCH; integer MBEGIN MEND
+
+  case "$arg[i]" in
+    '%')
+      if [[ $arg[i+1] == '?' ]]; then
+        (( i += 2 ))
+      fi
+      ;;
+    '-')
+      if (( option_eligible )); then
+        if [[ $arg[i+1] == - ]]; then
+          base_style=double-hyphen-option
+        else
+          base_style=single-hyphen-option
+        fi
+        path_eligible=0
+      fi
+      ;;
+    '=')
+      if [[ $arg[i+1] == $'\x28' ]]; then
+        (( i += 2 ))
+        _zsh_highlight_main_highlighter_highlight_list $(( start_pos + i - 1 )) S $has_end $arg[i,-1]
+        ret=$?
+        (( i += REPLY ))
+        highlights+=(
+          $(( start_pos + $1 - 1 )) $(( start_pos + i )) process-substitution
+          $(( start_pos + $1 - 1 )) $(( start_pos + $1 + 1 )) process-substitution-delimiter
+          $reply
+        )
+        if (( ret == 0 )); then
+          highlights+=($(( start_pos + i - 1 )) $(( start_pos + i )) process-substitution-delimiter)
+        fi
+      fi
+  esac
+
+  # This loop is a hot path.  Keep it fast!
+  (( --i ))
+  while (( ++i <= $#arg )); do
+    i=${arg[(ib.i.)[\\\'\"\`\$\<\>\*\?]]}
+    case "$arg[$i]" in
+      "") break;;
+      "\\") (( i += 1 )); continue;;
+      "'")
+        _zsh_highlight_main_highlighter_highlight_single_quote $i
+        (( i = REPLY ))
+        highlights+=($reply)
+        ;;
+      '"')
+        _zsh_highlight_main_highlighter_highlight_double_quote $i
+        (( i = REPLY ))
+        highlights+=($reply)
+        ;;
+      '`')
+        _zsh_highlight_main_highlighter_highlight_backtick $i
+        (( i = REPLY ))
+        highlights+=($reply)
+        ;;
+      '$')
+        if [[ $arg[i+1] != "'" ]]; then
+          path_eligible=0
+        fi
+        if [[ $arg[i+1] == "'" ]]; then
+          _zsh_highlight_main_highlighter_highlight_dollar_quote $i
+          (( i = REPLY ))
+          highlights+=($reply)
+          continue
+        elif [[ $arg[i+1] == $'\x28' ]]; then
+          if [[ $arg[i+2] == $'\x28' ]] && _zsh_highlight_main_highlighter_highlight_arithmetic $i; then
+            # Arithmetic expansion
+            (( i = REPLY ))
+            highlights+=($reply)
+            continue
+          fi
+          start=$i
+          (( i += 2 ))
+          _zsh_highlight_main_highlighter_highlight_list $(( start_pos + i - 1 )) S $has_end $arg[i,-1]
+          ret=$?
+          (( i += REPLY ))
+          highlights+=(
+            $(( start_pos + start - 1)) $(( start_pos + i )) command-substitution-unquoted
+            $(( start_pos + start - 1)) $(( start_pos + start + 1)) command-substitution-delimiter-unquoted
+            $reply
+          )
+          if (( ret == 0 )); then
+            highlights+=($(( start_pos + i - 1)) $(( start_pos + i )) command-substitution-delimiter-unquoted)
+          fi
+          continue
+        fi
+        while [[ $arg[i+1] == [=~#+'^'] ]]; do
+          (( i += 1 ))
+        done
+        if [[ $arg[i+1] == [*@#?$!-] ]]; then
+          (( i += 1 ))
+        fi;;
+      [\<\>])
+        if [[ $arg[i+1] == $'\x28' ]]; then # \x28 = open paren
+          start=$i
+          (( i += 2 ))
+          _zsh_highlight_main_highlighter_highlight_list $(( start_pos + i - 1 )) S $has_end $arg[i,-1]
+          ret=$?
+          (( i += REPLY ))
+          highlights+=(
+            $(( start_pos + start - 1)) $(( start_pos + i )) process-substitution
+            $(( start_pos + start - 1)) $(( start_pos + start + 1 )) process-substitution-delimiter
+            $reply
+          )
+          if (( ret == 0 )); then
+            highlights+=($(( start_pos + i - 1)) $(( start_pos + i )) process-substitution-delimiter)
+          fi
+          continue
+        fi
+        ;|
+      *)
+        if $highlight_glob &&
+           [[ $zsyh_user_options[multios] == on || $in_redirection -eq 0 ]] &&
+           [[ ${arg[$i]} =~ ^[*?] || ${arg:$i-1} =~ ^\<[0-9]*-[0-9]*\> ]]; then
+          highlights+=($(( start_pos + i - 1 )) $(( start_pos + i + $#MATCH - 1)) globbing)
+          (( i += $#MATCH - 1 ))
+          path_eligible=0
+        else
+          continue
+        fi
+        ;;
+    esac
+  done
+
+  if (( path_eligible )); then
+    if (( in_redirection )) && [[ $last_arg == *['<>']['&'] && $arg[$1,-1] == (<0->|p|-) ]]; then
+      if [[ $arg[$1,-1] == (p|-) ]]; then
+        base_style=redirection
+      else
+        base_style=numeric-fd
+      fi
+    # This function is currently never called for the command word, so $2 is hard-coded as 0.
+    elif _zsh_highlight_main_highlighter_check_path $arg[$1,-1] 0; then
+      base_style=$REPLY
+      _zsh_highlight_main_highlighter_highlight_path_separators $base_style
+      highlights+=($reply)
+    fi
+  fi
+
+  highlights=($(( start_pos + $1 - 1 )) $end_pos $base_style $highlights)
+  _zsh_highlight_main_add_many_region_highlights $highlights
+}
+
+# Quote Helper Functions
+#
+# $arg is expected to be set to the current argument
+# $start_pos is expected to be set to the start of $arg in $BUFFER
+# $1 is the index in $arg which starts the quote
+# $REPLY is returned as the end of quote index in $arg
+# $reply is returned as an array of region_highlight additions
+
+# Highlight single-quoted strings
+_zsh_highlight_main_highlighter_highlight_single_quote()
+{
+  local arg1=$1 i q=\' style
+  i=$arg[(ib:arg1+1:)$q]
+  reply=()
+
+  if [[ $zsyh_user_options[rcquotes] == on ]]; then
+    while [[ $arg[i+1] == "'" ]]; do
+      reply+=($(( start_pos + i - 1 )) $(( start_pos + i + 1 )) rc-quote)
+      (( i++ ))
+      i=$arg[(ib:i+1:)$q]
+    done
+  fi
+
+  if [[ $arg[i] == "'" ]]; then
+    style=single-quoted-argument
+  else
+    # If unclosed, i points past the end
+    (( i-- ))
+    style=single-quoted-argument-unclosed
+  fi
+  reply=($(( start_pos + arg1 - 1 )) $(( start_pos + i )) $style $reply)
+  REPLY=$i
+}
+
+# Highlight special chars inside double-quoted strings
+_zsh_highlight_main_highlighter_highlight_double_quote()
+{
+  local -a breaks match mbegin mend saved_reply
+  local MATCH; integer last_break=$(( start_pos + $1 - 1 )) MBEGIN MEND
+  local i j k ret style
+  reply=()
+
+  for (( i = $1 + 1 ; i <= $#arg ; i += 1 )) ; do
+    (( j = i + start_pos - 1 ))
+    (( k = j + 1 ))
+    case "$arg[$i]" in
+      ('"') break;;
+      ('`') saved_reply=($reply)
+            _zsh_highlight_main_highlighter_highlight_backtick $i
+            (( i = REPLY ))
+            reply=($saved_reply $reply)
+            continue
+            ;;
+      ('$') style=dollar-double-quoted-argument
+            # Look for an alphanumeric parameter name.
+            if [[ ${arg:$i} =~ ^([A-Za-z_][A-Za-z0-9_]*|[0-9]+) ]] ; then
+              (( k += $#MATCH )) # highlight the parameter name
+              (( i += $#MATCH )) # skip past it
+            elif [[ ${arg:$i} =~ ^[{]([A-Za-z_][A-Za-z0-9_]*|[0-9]+)[}] ]] ; then
+              (( k += $#MATCH )) # highlight the parameter name and braces
+              (( i += $#MATCH )) # skip past it
+            elif [[ $arg[i+1] == '$' ]]; then
+              # $$ - pid
+              (( k += 1 )) # highlight both dollar signs
+              (( i += 1 )) # don't consider the second one as introducing another parameter expansion
+            elif [[ $arg[i+1] == [-#*@?] ]]; then
+              # $#, $*, $@, $?, $- - like $$ above
+              (( k += 1 )) # highlight both dollar signs
+              (( i += 1 )) # don't consider the second one as introducing another parameter expansion
+            elif [[ $arg[i+1] == $'\x28' ]]; then
+              saved_reply=($reply)
+              if [[ $arg[i+2] == $'\x28' ]] && _zsh_highlight_main_highlighter_highlight_arithmetic $i; then
+                # Arithmetic expansion
+                (( i = REPLY ))
+                reply=($saved_reply $reply)
+                continue
+              fi
+
+              breaks+=( $last_break $(( start_pos + i - 1 )) )
+              (( i += 2 ))
+              _zsh_highlight_main_highlighter_highlight_list $(( start_pos + i - 1 )) S $has_end $arg[i,-1]
+              ret=$?
+              (( i += REPLY ))
+              last_break=$(( start_pos + i ))
+              reply=(
+                $saved_reply
+                $j $(( start_pos + i )) command-substitution-quoted
+                $j $(( j + 2 )) command-substitution-delimiter-quoted
+                $reply
+              )
+              if (( ret == 0 )); then
+                reply+=($(( start_pos + i - 1 )) $(( start_pos + i )) command-substitution-delimiter-quoted)
+              fi
+              continue
+            else
+              continue
+            fi
+            ;;
+      "\\") style=back-double-quoted-argument
+            if [[ \\\`\"\$${histchars[1]} == *$arg[$i+1]* ]]; then
+              (( k += 1 )) # Color following char too.
+              (( i += 1 )) # Skip parsing the escaped char.
+            else
+              continue
+            fi
+            ;;
+      ($histchars[1]) # ! - may be a history expansion
+            if [[ $arg[i+1] != ('='|$'\x28'|$'\x7b'|[[:blank:]]) ]]; then
+              style=history-expansion
+            else
+              continue
+            fi
+            ;;
+      *) continue ;;
+
+    esac
+    reply+=($j $k $style)
+  done
+
+  if [[ $arg[i] == '"' ]]; then
+    style=double-quoted-argument
+  else
+    # If unclosed, i points past the end
+    (( i-- ))
+    style=double-quoted-argument-unclosed
+  fi
+  (( last_break != start_pos + i )) && breaks+=( $last_break $(( start_pos + i )) )
+  saved_reply=($reply)
+  reply=()
+  for 1 2 in $breaks; do
+    (( $1 != $2 )) && reply+=($1 $2 $style)
+  done
+  reply+=($saved_reply)
+  REPLY=$i
+}
+
+# Highlight special chars inside dollar-quoted strings
+_zsh_highlight_main_highlighter_highlight_dollar_quote()
+{
+  local -a match mbegin mend
+  local MATCH; integer MBEGIN MEND
+  local i j k style
+  local AA
+  integer c
+  reply=()
+
+  for (( i = $1 + 2 ; i <= $#arg ; i += 1 )) ; do
+    (( j = i + start_pos - 1 ))
+    (( k = j + 1 ))
+    case "$arg[$i]" in
+      "'") break;;
+      "\\") style=back-dollar-quoted-argument
+            for (( c = i + 1 ; c <= $#arg ; c += 1 )); do
+              [[ "$arg[$c]" != ([0-9xXuUa-fA-F]) ]] && break
+            done
+            AA=$arg[$i+1,$c-1]
+            # Matching for HEX and OCT values like \0xA6, \xA6 or \012
+            if [[    "$AA" =~ "^(x|X)[0-9a-fA-F]{1,2}"
+                  || "$AA" =~ "^[0-7]{1,3}"
+                  || "$AA" =~ "^u[0-9a-fA-F]{1,4}"
+                  || "$AA" =~ "^U[0-9a-fA-F]{1,8}"
+               ]]; then
+              (( k += $#MATCH ))
+              (( i += $#MATCH ))
+            else
+              if (( $#arg > $i+1 )) && [[ $arg[$i+1] == [xXuU] ]]; then
+                # \x not followed by hex digits is probably an error
+                style=unknown-token
+              fi
+              (( k += 1 )) # Color following char too.
+              (( i += 1 )) # Skip parsing the escaped char.
+            fi
+            ;;
+      *) continue ;;
+
+    esac
+    reply+=($j $k $style)
+  done
+
+  if [[ $arg[i] == "'" ]]; then
+    style=dollar-quoted-argument
+  else
+    # If unclosed, i points past the end
+    (( i-- ))
+    style=dollar-quoted-argument-unclosed
+  fi
+  reply=($(( start_pos + $1 - 1 )) $(( start_pos + i )) $style $reply)
+  REPLY=$i
+}
+
+# Highlight backtick substitutions
+_zsh_highlight_main_highlighter_highlight_backtick()
+{
+  # buf is the contents of the backticks with a layer of backslashes removed.
+  # last is the index of arg for the start of the string to be copied into buf.
+  #     It is either one past the beginning backtick or one past the last backslash.
+  # offset is a count of consumed \ (the delta between buf and arg).
+  # offsets is an array indexed by buf offset of when the delta between buf and arg changes.
+  #     It is sparse, so search backwards to the last value
+  local buf highlight style=back-quoted-argument-unclosed style_end
+  local -i arg1=$1 end_ i=$1 last offset=0 start subshell_has_end=0
+  local -a highlight_zone highlights offsets
+  reply=()
+
+  last=$(( arg1 + 1 ))
+  # Remove one layer of backslashes and find the end
+  while i=$arg[(ib:i+1:)[\\\\\`]]; do # find the next \ or `
+    if (( i > $#arg )); then
+      buf=$buf$arg[last,i]
+      offsets[i-arg1-offset]='' # So we never index past the end
+      (( i-- ))
+      subshell_has_end=$(( has_end && (start_pos + i == len) ))
+      break
+    fi
+
+    if [[ $arg[i] == '\' ]]; then
+      (( i++ ))
+      # POSIX XCU 2.6.3
+      if [[ $arg[i] == ('$'|'`'|'\') ]]; then
+        buf=$buf$arg[last,i-2]
+        (( offset++ ))
+        # offsets is relative to buf, so adjust by -arg1
+        offsets[i-arg1-offset]=$offset
+      else
+        buf=$buf$arg[last,i-1]
+      fi
+    else # it's an unquoted ` and this is the end
+      style=back-quoted-argument
+      style_end=back-quoted-argument-delimiter
+      buf=$buf$arg[last,i-1]
+      offsets[i-arg1-offset]='' # So we never index past the end
+      break
+    fi
+    last=$i
+  done
+
+  _zsh_highlight_main_highlighter_highlight_list 0 '' $subshell_has_end $buf
+
+  # Munge the reply to account for removed backslashes
+  for start end_ highlight in $reply; do
+    start=$(( start_pos + arg1 + start + offsets[(Rb:start:)?*] ))
+    end_=$(( start_pos + arg1 + end_ + offsets[(Rb:end_:)?*] ))
+    highlights+=($start $end_ $highlight)
+    if [[ $highlight == back-quoted-argument-unclosed && $style == back-quoted-argument ]]; then
+      # An inner backtick command substitution is unclosed, but this level is closed
+      style_end=unknown-token
+    fi
+  done
+
+  reply=(
+    $(( start_pos + arg1 - 1 )) $(( start_pos + i )) $style
+    $(( start_pos + arg1 - 1 )) $(( start_pos + arg1 )) back-quoted-argument-delimiter
+    $highlights
+  )
+  if (( $#style_end )); then
+    reply+=($(( start_pos + i - 1)) $(( start_pos + i )) $style_end)
+  fi
+  REPLY=$i
+}
+
+# Highlight special chars inside arithmetic expansions
+_zsh_highlight_main_highlighter_highlight_arithmetic()
+{
+  local -a saved_reply
+  local style
+  integer i j k paren_depth ret
+  reply=()
+
+  for (( i = $1 + 3 ; i <= end_pos - start_pos ; i += 1 )) ; do
+    (( j = i + start_pos - 1 ))
+    (( k = j + 1 ))
+    case "$arg[$i]" in
+      [\'\"\\@{}])
+        style=unknown-token
+        ;;
+      '(')
+        (( paren_depth++ ))
+        continue
+        ;;
+      ')')
+        if (( paren_depth )); then
+          (( paren_depth-- ))
+          continue
+        fi
+        [[ $arg[i+1] == ')' ]] && { (( i++ )); break; }
+        # Special case ) at the end of the buffer to avoid flashing command substitution for a character
+        (( has_end && (len == k) )) && break
+        # This is a single paren and there are no open parens, so this isn't an arithmetic expansion
+        return 1
+        ;;
+      '`')
+        saved_reply=($reply)
+        _zsh_highlight_main_highlighter_highlight_backtick $i
+        (( i = REPLY ))
+        reply=($saved_reply $reply)
+        continue
+        ;;
+      '$' )
+        if [[ $arg[i+1] == $'\x28' ]]; then
+          saved_reply=($reply)
+          if [[ $arg[i+2] == $'\x28' ]] && _zsh_highlight_main_highlighter_highlight_arithmetic $i; then
+            # Arithmetic expansion
+            (( i = REPLY ))
+            reply=($saved_reply $reply)
+            continue
+          fi
+
+          (( i += 2 ))
+          _zsh_highlight_main_highlighter_highlight_list $(( start_pos + i - 1 )) S $has_end $arg[i,end_pos]
+          ret=$?
+          (( i += REPLY ))
+          reply=(
+            $saved_reply
+            $j $(( start_pos + i )) command-substitution-quoted
+            $j $(( j + 2 )) command-substitution-delimiter-quoted
+            $reply
+          )
+          if (( ret == 0 )); then
+            reply+=($(( start_pos + i - 1 )) $(( start_pos + i )) command-substitution-delimiter)
+          fi
+          continue
+        else
+          continue
+        fi
+        ;;
+      ($histchars[1]) # ! - may be a history expansion
+        if [[ $arg[i+1] != ('='|$'\x28'|$'\x7b'|[[:blank:]]) ]]; then
+          style=history-expansion
+        else
+          continue
+        fi
+        ;;
+      *)
+        continue
+        ;;
+
+    esac
+    reply+=($j $k $style)
+  done
+
+  if [[ $arg[i] != ')' ]]; then
+    # If unclosed, i points past the end
+    (( i-- ))
+  fi
+    style=arithmetic-expansion
+  reply=($(( start_pos + $1 - 1)) $(( start_pos + i )) arithmetic-expansion $reply)
+  REPLY=$i
+}
+
+
+# Called with a single positional argument.
+# Perform filename expansion (tilde expansion) on the argument and set $REPLY to the expanded value.
+#
+# Does not perform filename generation (globbing).
+_zsh_highlight_main_highlighter_expand_path()
+{
+  (( $# == 1 )) || print -r -- >&2 "zsh-syntax-highlighting: BUG: _zsh_highlight_main_highlighter_expand_path: called without argument"
+
+  # The $~1 syntax normally performs filename generation, but not when it's on the right-hand side of ${x:=y}.
+  setopt localoptions nonomatch
+  unset REPLY
+  : ${REPLY:=${(Q)${~1}}}
+}
+
+# -------------------------------------------------------------------------------------------------
+# Main highlighter initialization
+# -------------------------------------------------------------------------------------------------
+
+_zsh_highlight_main__precmd_hook() {
+  # Unset the WARN_NESTED_VAR option, taking care not to error if the option
+  # doesn't exist (zsh older than zsh-5.3.1-test-2).
+  setopt localoptions
+  if eval '[[ -o warnnestedvar ]]' 2>/dev/null; then
+    unsetopt warnnestedvar
+  fi
+
+  _zsh_highlight_main__command_type_cache=()
+}
+
+autoload -Uz add-zsh-hook
+if add-zsh-hook precmd _zsh_highlight_main__precmd_hook 2>/dev/null; then
+  # Initialize command type cache
+  typeset -gA _zsh_highlight_main__command_type_cache
+else
+  print -r -- >&2 'zsh-syntax-highlighting: Failed to load add-zsh-hook. Some speed optimizations will not be used.'
+  # Make sure the cache is unset
+  unset _zsh_highlight_main__command_type_cache
+fi
+typeset -ga ZSH_HIGHLIGHT_DIRS_BLACKLIST
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position1.zsh
new file mode 100644
index 00000000..cfc12a5f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position1.zsh
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'/'
+
+expected_region_highlight=(
+  '1 1 path_prefix' # /
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position1b.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position1b.zsh
new file mode 100644
index 00000000..88fe60c9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position1b.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt autocd
+BUFFER=$'/'
+
+expected_region_highlight=(
+  '1 1 autodirectory' # /
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position2.zsh
new file mode 100644
index 00000000..5033d2c4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position2.zsh
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'/bi'
+
+expected_region_highlight=(
+  '1 3 path_prefix' # /bi
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position3.zsh
new file mode 100644
index 00000000..415e3167
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position3.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'/bin; /bin'
+
+expected_region_highlight=(
+  '1 4 unknown-token' # /bin (in middle)
+  '5 5 commandseparator' # ;
+  '7 10 path_prefix' # /bin (at end)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position3b.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position3b.zsh
new file mode 100644
index 00000000..0e65c98a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position3b.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt autocd
+BUFFER=$'/bin; /bin'
+
+expected_region_highlight=(
+  '1 4 autodirectory' # /bin (in middle)
+  '5 5 commandseparator' # ;
+  '7 10 autodirectory' # /bin (at end)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position4.zsh
new file mode 100644
index 00000000..9e935bf1
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position4.zsh
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'/bin/s'
+
+expected_region_highlight=(
+  '1 6 path_prefix' # /bin/s
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position5.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position5.zsh
new file mode 100644
index 00000000..e428b1a0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/abspath-in-command-position5.zsh
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'/bin/sh'
+
+expected_region_highlight=(
+  '1 7 command' # /bin/sh
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-assignment1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-assignment1.zsh
new file mode 100644
index 00000000..0c101c8e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-assignment1.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Issue #263 (more-pathological case): aliases[x=y]=z works; the ${(z)} splitter considers
+# that a single word; but it's not looked up as an alias.  Hence, highlight it as an error.
+aliases[x=y]='lorem ipsum dolor sit amet'
+BUFFER='x=y ls'
+
+expected_region_highlight=(
+  "1 3 unknown-token" # x=y
+  "5 6 default" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-basic.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-basic.zsh
new file mode 100644
index 00000000..7af8b7cd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-basic.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias foo="echo hello world"
+BUFFER="foo"
+
+expected_region_highlight+=(
+  "1 3 alias" # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-brackets.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-brackets.zsh
new file mode 100644
index 00000000..ede6c9a9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-brackets.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2021 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Have to use cat here as it must be a command that exists.
+# Otherwise, the test would fail with the first token being recognized
+# as an "unknown-token".
+alias ]=cat
+
+BUFFER='] /'
+
+expected_region_highlight=(
+  '1 1 alias' # ]
+  '3 3 path' # /
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-command-substitution.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-command-substitution.zsh
new file mode 100644
index 00000000..a7b77dfa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-command-substitution.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Alias must be at least 4 characters to test the regression
+# cf. 139ea2b189819c43cc251825981c116959b15cc3
+alias foobar='echo "$(echo foobar)"'
+BUFFER='foobar'
+
+expected_region_highlight=(
+  "1 6 alias" # foobar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-comment1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-comment1.zsh
new file mode 100644
index 00000000..bae7ef6f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-comment1.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# see alias-comment2.zsh and comment-followed.zsh
+setopt interactivecomments
+alias x=$'# foo\npwd'
+BUFFER='x'
+
+expected_region_highlight=(
+  '1 1 alias' # x
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-comment2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-comment2.zsh
new file mode 100644
index 00000000..5a498229
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-comment2.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# see alias-comment1.zsh
+setopt NO_interactivecomments
+alias x=$'# foo\npwd'
+BUFFER='x'
+
+expected_region_highlight=(
+  '1 1 unknown-token' # x (#)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-complex.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-complex.zsh
new file mode 100644
index 00000000..5ad7c0a9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-complex.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias x='echo && ls; >'
+
+BUFFER='x file echo'
+
+expected_region_highlight=(
+  '1 1 alias' # x
+  '3 6 default' # file
+  '8 11 builtin' # echo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-empty.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-empty.zsh
new file mode 100644
index 00000000..535fccc9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-empty.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias x=''
+
+BUFFER='x echo foo'
+
+expected_region_highlight=(
+  '1 1 alias' # x
+  '3 6 builtin' # echo
+  '8 10 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-eponymous1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-eponymous1.zsh
new file mode 100644
index 00000000..2642e14f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-eponymous1.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias ls='command ls'
+
+BUFFER='ls'
+
+expected_region_highlight=(
+  "1 2 alias" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-eponymous2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-eponymous2.zsh
new file mode 100644
index 00000000..dcd85653
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-eponymous2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias ls=tmp tmp='command ls'
+
+BUFFER='ls'
+
+expected_region_highlight=(
+  "1 2 alias" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-in-cmdsubst.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-in-cmdsubst.zsh
new file mode 100644
index 00000000..b3cf777a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-in-cmdsubst.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias p='print -r --'
+
+BUFFER=$'s=$(p foo)'
+
+expected_region_highlight=(
+  '1 10 assign' # s=$(p foo)
+  '3 10 default' # $(p foo)
+  '3 10 command-substitution-unquoted' # $(p foo)
+  '3 4 command-substitution-delimiter-unquoted' # $(
+  '5 5 alias' # p
+  '7 9 default' # foo
+  '10 10 command-substitution-delimiter-unquoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-loop.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-loop.zsh
new file mode 100644
index 00000000..83992dbf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-loop.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+function b() {} # beware of ALIAS_FUNC_DEF
+alias a=b b=c c=b
+
+BUFFER='a foo; :'
+
+expected_region_highlight=(
+  # An alias is ineligible for expansion whilst it's being expanded.
+  # Therefore, the "b" in the expansion of the alias "c" is not considered
+  # as an alias.
+  '1 1 alias' # a
+  '3 5 default' # foo
+  '6 6 commandseparator' # ;
+  '8 8 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-loop2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-loop2.zsh
new file mode 100644
index 00000000..29e04ace
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-loop2.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias ls="ls"
+BUFFER="ls"
+
+expected_region_highlight+=(
+  "1 2 alias" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-nested-precommand.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-nested-precommand.zsh
new file mode 100644
index 00000000..6d4172bc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-nested-precommand.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=b b=sudo
+sudo(){}
+
+BUFFER='a -u phy1729 echo; :'
+
+expected_region_highlight=(
+  '1 1 alias' # a
+  '3 4 single-hyphen-option' # -u
+  '6 12 default' # phy1729
+  '14 17 builtin' # echo
+  '18 18 commandseparator' # ;
+  '20 20 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-nested.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-nested.zsh
new file mode 100644
index 00000000..b24b4967
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-nested.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=b b=:
+
+BUFFER='a foo; :'
+
+expected_region_highlight=(
+  '1 1 alias' # a
+  '3 5 default' # foo
+  '6 6 commandseparator' # ;
+  '8 8 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-parameter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-parameter.zsh
new file mode 100644
index 00000000..21bc6b32
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-parameter.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias '$foo'='echo alias'
+local foo; foo=(echo param)
+
+BUFFER='$foo'
+
+expected_region_highlight=(
+  '1 4 alias' # $foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument1.zsh
new file mode 100644
index 00000000..2d1f35c6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument1.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See also param-precommand-option-argument1.zsh
+alias sudo_u='sudo -u'
+sudo(){}
+
+BUFFER='sudo_u phy1729 echo foo'
+
+expected_region_highlight=(
+  '1 6 alias' # sudo_u
+  '8 14 default' # phy1729
+  '17 19 command "issue #540"' # echo (not builtin)
+  '21 23 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument2.zsh
new file mode 100644
index 00000000..fbc6eec7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument2.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias sudo_b='sudo -b'
+alias sudo_b_u='sudo_b -u'
+sudo(){}
+
+BUFFER='sudo_b_u phy1729 echo foo'
+
+expected_region_highlight=(
+  '1 8 alias' # sudo_b_u
+  '10 16 default' # phy1729
+  '18 21 command "issue #540"' # echo (not builtin)
+  '23 25 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument3.zsh
new file mode 100644
index 00000000..373f12b6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument3.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See also param-precommand-option-argument3.zsh
+alias sudo_u='sudo -u'
+sudo(){}
+
+BUFFER='sudo_u phy1729 ls foo'
+
+expected_region_highlight=(
+  '1 6 alias' # sudo_u
+  '8 14 default' # phy1729
+  '16 17 command' # ls
+  '19 21 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument4.zsh
new file mode 100644
index 00000000..d47dccb8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-precommand-option-argument4.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias sudo_b='sudo -b'
+alias sudo_b_u='sudo_b -u'
+sudo(){}
+
+BUFFER='sudo_b_u phy1729 ls foo'
+
+expected_region_highlight=(
+  '1 8 alias' # sudo_b_u
+  '10 16 default' # phy1729
+  '18 19 command' # ls
+  '21 23 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-quoted.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-quoted.zsh
new file mode 100644
index 00000000..e42e2f0a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-quoted.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) YYYY zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=: ls='ls -l'
+BUFFER='"a" foo; \ls'
+
+expected_region_highlight=(
+  '1 3 unknown-token' # "a"
+  '5 7 default' # foo
+  '8 8 commandseparator' # ;
+  '10 12 command' # \ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-redirect.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-redirect.zsh
new file mode 100644
index 00000000..acc3dcbe
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-redirect.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias x=\>
+BUFFER='x foo echo bar'
+
+expected_region_highlight=(
+  '1 1 alias' # x
+  '3 5 default' # foo
+  '7 10 builtin' # echo
+  '12 14 default' # bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse1.zsh
new file mode 100644
index 00000000..1fd61a0b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse1.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=: b='a | a'
+
+BUFFER='b | b'
+
+expected_region_highlight=(
+  '1 1 alias' # b
+  '3 3 commandseparator' # |
+  '5 5 alias' # b
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse2.zsh
new file mode 100644
index 00000000..37251fb9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse2.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=: b='a && a'
+
+BUFFER='b && b'
+
+expected_region_highlight=(
+  '1 1 alias' # b
+  '3 4 commandseparator' # &&
+  '6 6 alias' # b
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse3.zsh
new file mode 100644
index 00000000..5d7150a1
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse3.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=: b='a; a'
+
+BUFFER='b; b'
+
+expected_region_highlight=(
+  '1 1 alias' # b
+  '2 2 commandseparator' # ;
+  '4 4 alias' # b
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse4.zsh
new file mode 100644
index 00000000..7ad7038c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse4.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=: b='a $(a)'
+
+BUFFER='b $(b)'
+
+expected_region_highlight=(
+  '1 1 alias' # b
+  '3 6 default' # $(b)
+  '3 6 command-substitution-unquoted' # $(b)
+  '3 4 command-substitution-delimiter-unquoted' # $(
+  '5 5 alias' # b
+  '6 6 command-substitution-delimiter-unquoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse5.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse5.zsh
new file mode 100644
index 00000000..881401b2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-reuse5.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=: b='a < <(a)'
+
+BUFFER='b < <(b)'
+
+expected_region_highlight=(
+  '1 1 alias' # b
+  '3 3 redirection' # <
+  '5 8 default' # <(b)
+  '5 8 process-substitution' # <(b)
+  '5 6 process-substitution-delimiter' # <(
+  '7 7 alias' # b
+  '8 8 process-substitution-delimiter' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-self.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-self.zsh
new file mode 100644
index 00000000..c6f12b1a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-self.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias echo='echo foo'
+
+BUFFER='echo bar'
+
+expected_region_highlight=(
+  '1 4 alias' # echo
+  '6 8 default' # bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-self2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-self2.zsh
new file mode 100644
index 00000000..fd6ae03f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-self2.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias cat='cat | cat'
+
+BUFFER='cat'
+
+expected_region_highlight=(
+  '1 3 alias' # cat
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-to-dir.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-to-dir.zsh
new file mode 100644
index 00000000..30390d42
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-to-dir.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias x=/
+BUFFER=$'x'
+
+expected_region_highlight=(
+  '1 1 unknown-token' # x (/)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-to-dir1b.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-to-dir1b.zsh
new file mode 100644
index 00000000..62ec5213
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-to-dir1b.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt autocd
+alias x=/
+BUFFER=$'x'
+
+expected_region_highlight=(
+  '1 1 alias' # x
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-unknown-token1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-unknown-token1.zsh
new file mode 100644
index 00000000..9c996bfe
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-unknown-token1.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=b b=foo
+
+BUFFER='a '
+
+expected_region_highlight=(
+  '1 1 unknown-token' # a
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-unknown-token2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-unknown-token2.zsh
new file mode 100644
index 00000000..ab9facd6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias-unknown-token2.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a='() { ls "$@" ; foo }'
+
+BUFFER='a '
+
+expected_region_highlight=(
+  '1 1 unknown-token' # a
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias.zsh
new file mode 100644
index 00000000..4cafa804
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/alias.zsh
@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias alias1="ls"
+alias -s alias2="echo"
+function alias1() {} # to check that it's highlighted as an alias, not as a function
+
+BUFFER='x.alias2; alias1; alias2'
+
+# Set expected_region_highlight as a function of zsh version.
+#
+# Highlight of suffix alias requires zsh-5.1.1 or newer; see issue #126,
+# and commit 36403 to zsh itself.  Therefore, check if the requisite zsh
+# functionality is present, and skip verifying suffix-alias highlighting
+# if it isn't.
+expected_region_highlight=()
+if zmodload -e zsh/parameter || [[ "$(type -w x.alias2)" == *suffix* ]]; then
+  expected_region_highlight+=(
+    "1 8 suffix-alias" # x.alias2
+  )
+fi
+expected_region_highlight+=(
+  "9 9 commandseparator" # ;
+  "11 16 alias" # alias1
+  "17 17 commandseparator" # ;
+  "19 24 unknown-token" # alias2
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always1.zsh
new file mode 100644
index 00000000..ae40a72f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always1.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='{ ls } always { pwd }'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # {
+  '3 4 command' # ls
+  '6 6 reserved-word' # }
+  '8 13 reserved-word' # always
+  '15 15 reserved-word' # {
+  '17 19 builtin' # pwd
+  '21 21 reserved-word' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always2.zsh
new file mode 100644
index 00000000..991137c2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always2.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'{\nls\n} always { pwd }'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # {
+  '2 2 commandseparator' # \n
+  '3 4 command' # ls
+  '5 5 commandseparator' # \n
+  '6 6 reserved-word' # }
+  '8 13 reserved-word' # always
+  '15 15 reserved-word' # {
+  '17 19 builtin' # pwd
+  '21 21 reserved-word' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always3.zsh
new file mode 100644
index 00000000..d41beeb5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/always3.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt ignorebraces
+BUFFER='echo { foo } always { bar }'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 default' # {
+  '8 10 default' # foo
+  '12 12 default' # }
+  '14 19 default' # always
+  '21 21 default' # {
+  '23 25 default' # bar
+  '27 27 default' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/anonymous-function.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/anonymous-function.zsh
new file mode 100644
index 00000000..9d67fb1d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/anonymous-function.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() echo hello; () { echo world } "argument"'
+
+expected_region_highlight=(
+  "1 2 reserved-word" # ()
+  "4 7 builtin" # echo
+  "9 13 default" # hello
+  "14 14 commandseparator" # ;
+  "16 17 reserved-word" # ()
+  "19 19 reserved-word" # {
+  "21 24 builtin" # echo
+  "26 30 default" # world
+  "32 32 reserved-word" # }
+  "34 43 default" # "argument"
+  "34 43 double-quoted-argument" # "argument"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arg0-colon.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arg0-colon.zsh
new file mode 100644
index 00000000..8955bd28
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arg0-colon.zsh
@@ -0,0 +1,35 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=''\''x: /'
+
+expected_region_highlight=(
+  '1 5 unknown-token' # \'x: /
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith-cmdsubst-mess.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith-cmdsubst-mess.zsh
new file mode 100644
index 00000000..82268ac1
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith-cmdsubst-mess.zsh
@@ -0,0 +1,46 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $((ls); (ls))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 15 default' # $((ls); (ls))
+  '3 15 command-substitution-unquoted' # $((ls); (ls))
+  '3 4 command-substitution-delimiter-unquoted' # $(
+  '5 5 reserved-word' # (
+  '6 7 command' # ls
+  '8 8 reserved-word' # )
+  '9 9 commandseparator' # ;
+  '11 11 reserved-word' # (
+  '12 13 command' # ls
+  '14 14 reserved-word' # )
+  '15 15 command-substitution-delimiter-unquoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith1.zsh
new file mode 100644
index 00000000..0462f738
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith1.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( 6 * 9 ))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 14 default' # $(( 6 * 9 ))
+  '3 14 arithmetic-expansion' # $(( 6 * 9 ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith2.zsh
new file mode 100644
index 00000000..af981d7c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arith2.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': "$(( 6 * 9 ))"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 16 default' # "$(( 6 * 9 ))"
+  '3 16 double-quoted-argument' # "$(( 6 * 9 ))"
+  '4 15 arithmetic-expansion' # $(( 6 * 9 ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-command-substitution.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-command-substitution.zsh
new file mode 100644
index 00000000..07db0fb2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-command-substitution.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( $(echo 2) + 2 ))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 22 default' # $(( $(echo 2) + 2 ))
+  '3 22 arithmetic-expansion' # $(( $(echo 2) + 2 ))
+  '7 15 command-substitution-quoted' # $(echo 2)
+  '7 8 command-substitution-delimiter-quoted' # $(
+  '9 12 builtin' # echo
+  '14 14 default' # 2
+  '15 15 command-substitution-delimiter' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-doubled-parens.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-doubled-parens.zsh
new file mode 100644
index 00000000..d582d67c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-doubled-parens.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( ((42)) ))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 15 default' # $(( ((42)) ))
+  '3 15 arithmetic-expansion' # $(( ((42)) ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-empty.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-empty.zsh
new file mode 100644
index 00000000..bd759966
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-empty.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': "foo"$(())"bar"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 17 default' # "foo"$(())"bar"
+  '3 7 double-quoted-argument' # "foo"
+  '8 12 arithmetic-expansion' # $(())
+  '13 17 double-quoted-argument' # "bar"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-evaluation.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-evaluation.zsh
new file mode 100644
index 00000000..e0eb6e75
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-evaluation.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Must be at command word, since the word following 'if' isn't currently considered
+# a command word (issue #207).
+#
+# An opening '((' without matching '))' is highlighted correctly under zsh-5.1.1-52-g4bed2cf
+# or newer, only (issue #188).
+BUFFER='(( x == 42 ))'
+
+expected_region_highlight=(
+  "1 2 reserved-word" # ((
+  "12 13 reserved-word" # ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-hist-expn.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-hist-expn.zsh
new file mode 100644
index 00000000..79af7233
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-hist-expn.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( \!\! ))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 11 default' # $(( !! ))
+  '3 11 arithmetic-expansion' # $(( !! ))
+  '7 8 history-expansion "issue #713"' # !!
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-invalid-chars.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-invalid-chars.zsh
new file mode 100644
index 00000000..9ace4383
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-invalid-chars.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( 0 * 1\'\'000 ))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 19 default' # $(( 0 * 1\'\'000 ))
+  '3 19 arithmetic-expansion' # $(( 0 * 1\'\'000 ))
+  '12 12 unknown-token' # \'
+  '13 13 unknown-token' # \'
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-multiplication.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-multiplication.zsh
new file mode 100644
index 00000000..65df0c9f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-multiplication.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': foo*$(( 42 * 1729 ))*bar'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 26 default' # foo*$(( 42 * 1729 ))*bar
+  '6 6 globbing' # *
+  '7 22 arithmetic-expansion' # $(( 42 * 1729 ))
+  '23 23 globbing' # *
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-nested.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-nested.zsh
new file mode 100644
index 00000000..d734cd34
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-nested.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( $(( 1 + 2 )) * 3 ))'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 25 default' # $(( $(( 1 + 2 )) * 3 ))
+  '3 25 arithmetic-expansion' # $(( $(( 1 + 2 )) * 3 ))
+  '7 18 arithmetic-expansion' # $(( 1 + 2 ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-quoted.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-quoted.zsh
new file mode 100644
index 00000000..917ddf78
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-quoted.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': "$(( 1 + 1 ))"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 16 default' # "$(( 1 + 1 ))"
+  '3 16 double-quoted-argument' # "$(( 1 + 1 ))"
+  '4 15 arithmetic-expansion' # $(( 1 + 1 ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-unclosed.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-unclosed.zsh
new file mode 100644
index 00000000..aa4eac7a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-unclosed.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( 1'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 7 default' # $(( 1
+  '3 7 arithmetic-expansion' # $(( 1
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-unfinished.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-unfinished.zsh
new file mode 100644
index 00000000..916c3dad
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/arithmetic-unfinished.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(( 1729 )'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 12 default' # $(( 1729 )
+  '3 12 arithmetic-expansion' # $(( 1729 )
+)
+
+if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
+  expected_region_highlight[2]='3 13 default' # $(( 1729 )
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep1.zsh
new file mode 100644
index 00000000..2fd55c03
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep1.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'a=( foo | bar )'
+bar(){}
+
+expected_region_highlight=(
+  '1 3 assign' # a=(
+  '3 3 reserved-word' # (
+  '5 7 default' # foo
+  '9 9 unknown-token' # |
+  # zsh reports a parse error at this point.  Nevertheless, we test how we
+  # highlight the remainder of $BUFFER.  Currently we recover by treating the pipe
+  # as a command separator.  That's not the only reasonable behaviour, though; if
+  # we change the behaviour, we should adjust the following expectations accordingly.
+  '11 13 function' # bar
+  '15 15 unknown-token' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep2.zsh
new file mode 100644
index 00000000..0bda6761
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep2.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'a=( foo ; bar )'
+
+expected_region_highlight=(
+  '1 3 assign' # a=(
+  '3 3 reserved-word' # (
+  '5 7 default' # foo
+  '9 9 unknown-token' # ; (not commandseparator; see highlighter source code)
+  '11 13 default' # bar
+  '15 15 assign' # )
+  '15 15 reserved-word' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep3.zsh
new file mode 100644
index 00000000..b4b3687c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/array-cmdsep3.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'a=( foo \n bar )'
+
+expected_region_highlight=(
+  '1 3 assign' # a=(
+  '3 3 reserved-word' # (
+  '5 7 default' # foo
+  '9 9 commandseparator' # \n
+  '11 13 default' # bar
+  '15 15 assign' # )
+  '15 15 reserved-word' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-append.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-append.zsh
new file mode 100644
index 00000000..feb68e53
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-append.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='a+=(lorem ipsum)'
+
+expected_region_highlight=(
+  "1 4 assign" # a+=(
+  "4 4 reserved-word" # (
+  "5 9 default" # lorem
+  "11 15 default" # ipsum
+  "16 16 assign" # )
+  "16 16 reserved-word" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-argv.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-argv.zsh
new file mode 100644
index 00000000..ec5acc24
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-argv.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch foo
+BUFFER='42=foo 43+=bar'
+
+expected_region_highlight=(
+  "1 6 assign" # 42=foo
+  "4 6 path" # foo
+  "8 14 assign" # 43+=bar
+  "12 14 default" # bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array.zsh
new file mode 100644
index 00000000..ef0a6669
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(A=(hello world))'
+
+expected_region_highlight=(
+  "1 1 reserved-word" # (
+  "2 4 assign" # A=(
+  "4 4 reserved-word" # (
+  "5 9 default" # hello
+  "11 15 default" # world
+  "16 16 assign" # )
+  "16 16 reserved-word" # )
+  "17 17 reserved-word" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array2.zsh
new file mode 100644
index 00000000..2d487211
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=(hello world) ls'
+
+expected_region_highlight=(
+  "1 3 assign" # A=(
+  "3 3 reserved-word" # (
+  "4 8 default" # hello
+  "10 14 default" # world
+  "15 15 assign" # )
+  "15 15 reserved-word" # )
+  "17 18 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array3.zsh
new file mode 100644
index 00000000..5eb645e6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-array3.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=(hello world) b=42'
+
+expected_region_highlight=(
+  "1 3 assign" # A=(
+  "3 3 reserved-word" # (
+  "4 8 default" # hello
+  "10 14 default" # world
+  "15 15 assign" # )
+  "15 15 reserved-word" # )
+  "17 20 assign" # b=42
+  "19 20 default" # 42
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-invalid-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-invalid-command.zsh
new file mode 100644
index 00000000..557327e8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-invalid-command.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'x=y nosuchcommand'
+
+expected_region_highlight=(
+  '1 3 assign' # x=y
+  '3 3 default' # y
+  '5 17 unknown-token' # nosuchcommand
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-not-array.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-not-array.zsh
new file mode 100644
index 00000000..651ab80a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-not-array.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='a=foo( bar ) :'
+
+expected_region_highlight=(
+  '1 12 assign' # a=foo( bar )
+  '3 12 default' # foo( bar )
+  '14 14 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-not-array2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-not-array2.zsh
new file mode 100644
index 00000000..dfda106e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-not-array2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='a=foo\( :'
+
+expected_region_highlight=(
+  '1 7 assign' # a=foo\(
+  '3 7 default' # foo\(
+  '9 9 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-quoted-cmdsubst.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-quoted-cmdsubst.zsh
new file mode 100644
index 00000000..d4a62dfa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-quoted-cmdsubst.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'x="$(ls x y z)"'
+
+expected_region_highlight=(
+  '1 15 assign' # x="$(ls x y z)"
+  '3 15 default' # "$(ls x y z)"
+  '3 3 double-quoted-argument' # "
+  '15 15 double-quoted-argument' # "
+  '4 14 command-substitution-quoted' # $(ls x y z)
+  '4 5 command-substitution-delimiter-quoted' # $(
+  '6 7 command' # ls
+  '9 9 default' # x
+  '11 11 default' # y
+  '13 13 default' # z
+  '14 14 command-substitution-delimiter-quoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-semicolon.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-semicolon.zsh
new file mode 100644
index 00000000..f748c94e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-semicolon.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=1; echo hello world'
+
+expected_region_highlight=(
+  "1 3 assign" # A=1
+  "3 3 default" # 1
+  "4 4 commandseparator" # ;
+  "6 9 builtin" # echo
+  "11 15 default" # hello
+  "17 21 default" # world
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-subshell.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-subshell.zsh
new file mode 100644
index 00000000..20228893
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-subshell.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(A=1)'
+
+expected_region_highlight=(
+  "1 1 reserved-word" # (
+  "2 4 assign" # A=1
+  "4 4 default" # 1
+  "5 5 reserved-word" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-value-quote1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-value-quote1.zsh
new file mode 100644
index 00000000..b6d04fe0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-value-quote1.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'s="foo\'bar"'
+
+expected_region_highlight=(
+  '1 11 assign' # s="foo'bar"
+  '3 11 default' # "foo'bar"
+  '3 11 double-quoted-argument' # "foo'bar"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-value-quote2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-value-quote2.zsh
new file mode 100644
index 00000000..3c5f93b4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign-value-quote2.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'s="foo \'\' bar"'
+
+expected_region_highlight=(
+  '1 14 assign' # s="foo '' bar"
+  '3 14 default' # "foo '' bar"
+  '3 14 double-quoted-argument' # "foo '' bar"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign.zsh
new file mode 100644
index 00000000..c6e8532d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assign.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='A=1 b=("foo" bar)'
+
+expected_region_highlight=(
+  "1 3 assign" # A=1
+  "3 3 default" # 1
+  "5 7 assign" # b=(
+  "7 7 reserved-word" # (
+  "8 12 default" # "foo"
+  "8 12 double-quoted-argument" # "foo"
+  "14 16 default" # bar
+  "17 17 assign" # )
+  "17 17 reserved-word" # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword1.zsh
new file mode 100644
index 00000000..b271d4aa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword1.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=bar { :; }'
+
+expected_region_highlight=(
+  '1 7 assign' # foo=bar
+  '5 7 default' # bar
+  '9 9 unknown-token' # {
+  '11 11 builtin' # :
+  '12 12 commandseparator' # ;
+  '14 14 reserved-word' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword2.zsh
new file mode 100644
index 00000000..247e41eb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword2.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=bar ( :; )'
+
+expected_region_highlight=(
+  '1 7 assign' # foo=bar
+  '5 7 default' # bar
+  '9 9 unknown-token' # (
+  '11 11 builtin' # :
+  '12 12 commandseparator' # ;
+  '14 14 unknown-token' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword3.zsh
new file mode 100644
index 00000000..52041895
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword3.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=bar (( foo ))'
+
+expected_region_highlight=(
+  '1 7 assign' # foo=bar
+  '5 7 default' # bar
+  '9 17 unknown-token' # (( foo ))
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword4.zsh
new file mode 100644
index 00000000..cc3d5231
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword4.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=bar [[ -n foo ]]'
+
+expected_region_highlight=(
+  '1 7 assign' # foo=bar
+  '5 7 default' # bar
+  '9 10 unknown-token' # [[
+  '12 13 single-hyphen-option' # -n
+  '15 17 default' # foo
+  '19 20 reserved-word' # ]]
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword5.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword5.zsh
new file mode 100644
index 00000000..33f1ed14
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-before-resword5.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=bar \! :'
+
+expected_region_highlight=(
+  '1 7 assign' # foo=bar
+  '5 7 default' # bar
+  '9 9 unknown-token' # \!
+  '11 11 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-quoted.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-quoted.zsh
new file mode 100644
index 00000000..18638adb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/assignment-quoted.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'1="foo"'
+
+expected_region_highlight=(
+  '1 7 assign' # 1="foo"
+  '3 7 default' # "foo"
+  '3 7 double-quoted-argument' # "foo"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/back-quoted-argument.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/back-quoted-argument.zsh
new file mode 100644
index 00000000..d504a2c7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/back-quoted-argument.zsh
@@ -0,0 +1,58 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo `echo \`42\`` "is `echo equal` to" `echo 6 times 9'
+
+expected_region_highlight=(
+  "1 4 builtin" # echo
+  "6 18 default" # `echo \`42\``
+  "6 18 back-quoted-argument" # `echo \`42\``
+  "6 6 back-quoted-argument-delimiter" # `
+  "7 10 builtin" # echo
+  "12 17 default" # \`42\`
+  "12 17 back-quoted-argument" # \`42\`
+  "12 13 back-quoted-argument-delimiter" # \`
+  "14 15 unknown-token" # 42
+  "16 17 back-quoted-argument-delimiter" # \`
+  "18 18 back-quoted-argument-delimiter" # `
+  "20 39 default" # "is `echo equal` to"
+  "20 39 double-quoted-argument" # "is `echo equal` to"
+  "24 35 back-quoted-argument" # `echo equal`
+  "24 24 back-quoted-argument-delimiter" # `
+  "25 28 builtin" # echo
+  "30 34 default" # equal
+  "35 35 back-quoted-argument-delimiter" # `
+  "41 55 default" # `echo 6 times 9
+  "41 55 back-quoted-argument-unclosed" # `echo 6 times 9
+  "41 41 back-quoted-argument-delimiter" # `
+  "42 45 builtin" # echo
+  "47 47 default" # 6
+  "49 53 default" # times
+  "55 55 default" # 9
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/back-quoted-open.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/back-quoted-open.zsh
new file mode 100644
index 00000000..f188d811
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/back-quoted-open.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch foo
+BUFFER=$': `ls fo'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 8 default' # `ls fo
+  '3 8 back-quoted-argument-unclosed' # `ls fo
+  '3 3 back-quoted-argument-delimiter' # `
+  '4 5 command' # ls
+  '7 8 path_prefix' # fo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-continuation.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-continuation.zsh
new file mode 100644
index 00000000..ebcf2e17
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-continuation.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo \\\n'
+BUFFER='noglob'
+
+expected_region_highlight=(
+  "1 6 default" # 'noglob' highlighted as a string, not as a precomand
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-continuation2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-continuation2.zsh
new file mode 100644
index 00000000..9e2ca623
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-continuation2.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'echo foo\\\nbar"baz"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 18 default "issue #705"' # foo\\\nbar"baz"
+  '14 18 double-quoted-argument "issue #705"' # "baz"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-space.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-space.zsh
new file mode 100644
index 00000000..0d8a63c1
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash-space.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'echo \\ \'foo\' ; ls'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 12 default' # \ \'foo\'
+  '8 12 single-quoted-argument' # 'foo'
+  '14 14 commandseparator' # ;
+  '16 17 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash.zsh
new file mode 100644
index 00000000..ea0977f6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/backslash.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'\\'
+
+expected_region_highlight=(
+  '1 1 unknown-token' # \\
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-assign-array.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-assign-array.zsh
new file mode 100644
index 00000000..a54cf2d0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-assign-array.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=(bar abaz) \! ls'
+
+expected_region_highlight=(
+  '1 5 assign' # foo=(
+  '5 5 reserved-word' # (
+  '6 8 default' # bar
+  '10 13 default' # abaz
+  '14 14 assign' # )
+  '14 14 reserved-word' # )
+  '16 16 unknown-token' # \!
+  '18 19 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-assign-scalar.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-assign-scalar.zsh
new file mode 100644
index 00000000..e9190500
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-assign-scalar.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=bar \! ls'
+
+expected_region_highlight=(
+  '1 7 assign' # foo=bar
+  '5 7 default' # bar
+  '9 9 unknown-token' # \!
+  '11 12 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-pipeline.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-pipeline.zsh
new file mode 100644
index 00000000..fef25f10
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/bang-pipeline.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'\! ls | \! ls'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # \!
+  '3 4 command' # ls
+  '6 6 commandseparator' # |
+  '8 8 unknown-token' # \!
+  '10 11 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/block-assignment-no-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/block-assignment-no-command.zsh
new file mode 100644
index 00000000..ec52c987
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/block-assignment-no-command.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2022 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'{ a=42 }'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # {
+  '3 6 assign' # a=42
+  '5 6 default' # 42
+  '8 8 reserved word "issue #854"' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/braces1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/braces1.zsh
new file mode 100644
index 00000000..3c5b1f0f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/braces1.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'() { echo }\n}'
+# no special setopts
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # {
+  '6 9 builtin' # echo
+  '11 11 reserved-word' # }
+  '12 12 commandseparator' # \n
+  '13 13 unknown-token' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/braces2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/braces2.zsh
new file mode 100644
index 00000000..a3ea7c95
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/braces2.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'() { echo }\n}'
+setopt ignorebraces
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # {
+  '6 9 builtin' # echo
+  '11 11 default' # }
+  '12 12 commandseparator' # \n
+  '13 13 reserved-word' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-matching1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-matching1.zsh
new file mode 100644
index 00000000..7cc6de54
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-matching1.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='[[ -n foo ]]'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # [[
+  '4 5 single-hyphen-option' # -n
+  '7 9 default' # foo
+  '11 12 reserved-word' # ]]
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-matching2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-matching2.zsh
new file mode 100644
index 00000000..19c7f0d7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-matching2.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='[ -n foo ]'
+
+expected_region_highlight=(
+  '1 1 builtin' # [
+  '3 4 single-hyphen-option' # -n
+  '6 8 default' # foo
+  '10 10 builtin' # ]
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch1.zsh
new file mode 100644
index 00000000..5e6e80f2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch1.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() { echo foo )'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # {
+  '6 9 builtin' # echo
+  '11 13 default' # foo
+  '15 15 unknown-token' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch10-if-negative.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch10-if-negative.zsh
new file mode 100644
index 00000000..9d0b53c6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch10-if-negative.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='elif true; then echo two; fi'
+
+expected_region_highlight=(
+  '1 4 unknown-token' # elif
+  '6 9 builtin' # true
+  '10 10 commandseparator' # ;
+  '12 15 unknown-token' # then
+  '17 20 builtin' # echo
+  '22 24 default' # two
+  '25 25 commandseparator' # ;
+  '27 28 unknown-token' # fi
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch2.zsh
new file mode 100644
index 00000000..2d98ac21
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch2.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() ( echo foo }'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # ()
+  '4 4 reserved-word' # (
+  '6 9 builtin' # echo
+  '11 13 default' # foo
+  '15 15 unknown-token' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch3.zsh
new file mode 100644
index 00000000..e33040a8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch3.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo )'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 unknown-token' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch4.zsh
new file mode 100644
index 00000000..a9b15dcd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch4.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo }'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 unknown-token' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch5.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch5.zsh
new file mode 100644
index 00000000..21e8bb2b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch5.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo { }'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 6 default' # {
+  '8 8 unknown-token' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch6.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch6.zsh
new file mode 100644
index 00000000..9df83883
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch6.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(repeat 1; do)'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # (
+  '2 7 reserved-word' # repeat
+  '9 9 default' # 1
+  '10 10 commandseparator' # ;
+  '12 13 reserved-word' # do
+  '14 14 unknown-token' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch7.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch7.zsh
new file mode 100644
index 00000000..1caa936c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch7.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2012 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='for n in *; do echo $n; end'
+
+expected_region_highlight=(
+  '1 3 reserved-word' # for
+  '5 5 default' # n
+  '7 8 default' # in
+  '10 10 default' # *
+  '10 10 globbing' # *
+  '11 11 commandseparator' # ;
+  '13 14 reserved-word' # do
+  '16 19 builtin' # echo
+  '21 22 default' # $n
+  '23 23 commandseparator' # ;
+  '25 27 unknown-token' # end
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch8-if-positive.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch8-if-positive.zsh
new file mode 100644
index 00000000..d6838f00
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch8-if-positive.zsh
@@ -0,0 +1,53 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='if false; then echo one; elif true; then echo two; else echo three; fi'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # if
+  '4 8 builtin' # false
+  '9 9 commandseparator' # ;
+  '11 14 reserved-word' # then
+  '16 19 builtin' # echo
+  '21 23 default' # one
+  '24 24 commandseparator' # ;
+  '26 29 reserved-word' # elif
+  '31 34 builtin' # true
+  '35 35 commandseparator' # ;
+  '37 40 reserved-word' # then
+  '42 45 builtin' # echo
+  '47 49 default' # two
+  '50 50 commandseparator' # ;
+  '52 55 reserved-word' # else
+  '57 60 builtin' # echo
+  '62 66 default' # three
+  '67 67 commandseparator' # ;
+  '69 70 reserved-word' # fi
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch8.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch8.zsh
new file mode 100644
index 00000000..07a42e36
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch8.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='(ls&)'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # (
+  '2 3 command' # ls
+  '4 4 commandseparator' # &
+  '5 5 reserved-word' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch9-if-positive.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch9-if-positive.zsh
new file mode 100644
index 00000000..87c1ba79
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-mismatch9-if-positive.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='if false; then echo one; fi'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # if
+  '4 8 builtin' # false
+  '9 9 commandseparator' # ;
+  '11 14 reserved-word' # then
+  '16 19 builtin' # echo
+  '21 23 default' # one
+  '24 24 commandseparator' # ;
+  '26 27 reserved-word' # fi
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-premature-termination.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-premature-termination.zsh
new file mode 100644
index 00000000..fa813da9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/brackets-premature-termination.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='[[ -n foo; echo ]]'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # [[
+  '4 5 single-hyphen-option' # -n
+  '7 9 default' # foo
+  '10 10 unknown-token' # ;
+  '12 15 builtin' # echo
+  '17 18 default' # ]]
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cdpath-abspath.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cdpath-abspath.zsh
new file mode 100644
index 00000000..64707b2f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cdpath-abspath.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+cdpath=( $PWD )
+mkdir foo foo/bar
+
+BUFFER="/foo"
+
+expected_region_highlight=(
+  '1 4 unknown-token' # x (/)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cmdpos-elision-partial.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cmdpos-elision-partial.zsh
new file mode 100644
index 00000000..6eda0d74
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cmdpos-elision-partial.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Test elision of some, but not all of the words
+# See issue #667 for the case of eliding all words
+local -a x; x=(sudo "")
+
+sudo(){}
+BUFFER=$'$x -u phy1729 ls'
+
+expected_region_highlight=(
+  '1 2 precommand' # $x
+  # The "" is elided.  If it weren't elided, the «ls» would be highlighted as an ordinary argument.
+  '4 5 single-hyphen-option' # -u
+  '7 13 default' # phy1729
+  '15 16 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-adjacent.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-adjacent.zsh
new file mode 100644
index 00000000..3d5c0b9e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-adjacent.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "$(echo)$(echo)'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 20 default' # "$(echo)$(echo)
+  '6 6 double-quoted-argument-unclosed' # "
+  '7 13 command-substitution-quoted' # $(echo)
+  '7 8 command-substitution-delimiter-quoted' # $(
+  '9 12 builtin' # echo
+  '13 13 command-substitution-delimiter-quoted' # )
+  '14 20 command-substitution-quoted' # $(echo)
+  '14 15 command-substitution-delimiter-quoted' # $(
+  '16 19 builtin' # echo
+  '20 20 command-substitution-delimiter-quoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-in-assignment.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-in-assignment.zsh
new file mode 100644
index 00000000..fafda49c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-in-assignment.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=$(echo bar) :'
+
+expected_region_highlight=(
+  '1 15 assign' # foo=$(echo bar)
+  '5 15 default' # $(echo bar)
+  '5 15 command-substitution-unquoted' # $(echo bar)
+  '5 6 command-substitution-delimiter-unquoted' # $(
+  '7 10 builtin' # echo
+  '12 14 default' # bar
+  '15 15 command-substitution-delimiter-unquoted' # )
+  '17 17 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-unclosed.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-unclosed.zsh
new file mode 100644
index 00000000..3229dfcf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/command-substitution-unclosed.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': foo$(echo bar'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 15 default' # foo$(echo bar
+  '6 15 command-substitution-unquoted' # $(echo bar
+  '6 7 command-substitution-delimiter-unquoted' # $(
+  '8 11 builtin' # echo
+  '13 15 default' # bar
+)
+
+if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
+  expected_region_highlight[2]='3 16 default' # foo$(echo bar
+  expected_region_highlight[3]='6 16 command-substitution-unquoted' # $(echo bar
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/commandseparator.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/commandseparator.zsh
new file mode 100644
index 00000000..f504847c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/commandseparator.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=':; pwd &! ls'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "2 2 commandseparator" # ;
+  "4 6 builtin" # pwd
+  "8 9 commandseparator" # &!
+  "11 12 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-followed.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-followed.zsh
new file mode 100644
index 00000000..044f2830
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-followed.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# see alias-comment1.zsh
+setopt interactivecomments
+BUFFER=$'# foo\ntrue'
+
+expected_region_highlight=(
+  '1 5 comment' # # foo
+  '6 6 commandseparator' # \n
+  '7 10 builtin' # true
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-leading.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-leading.zsh
new file mode 100644
index 00000000..b4c99105
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-leading.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactive_comments
+
+BUFFER='# echo foo'
+
+expected_region_highlight=(
+  "1 10 comment" # # echo foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-off.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-off.zsh
new file mode 100644
index 00000000..0381bdb0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comment-off.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsetopt interactive_comments
+
+BUFFER='# echo foo'
+
+expected_region_highlight=(
+  "1 1 unknown-token" # #
+  "3 6 default" # " echo foo"
+  "8 10 default" # " echo foo"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comments.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comments.zsh
new file mode 100644
index 00000000..f3cc57e4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/comments.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactive_comments
+
+BUFFER='echo "foo #bar" #baz # quux'
+
+expected_region_highlight=(
+  "1 4 builtin" # echo
+  "6 15 default" # "foo #bar"
+  "6 15 double-quoted-argument" # "foo #bar"
+  "17 27 comment" # #baz # quux
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/commmand-parameter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/commmand-parameter.zsh
new file mode 100644
index 00000000..48d20ba8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/commmand-parameter.zsh
@@ -0,0 +1,45 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+local x=/usr/bin/env
+local y=sudo
+local -a z; z=(zsh -f)
+sudo(){}
+
+BUFFER='$x "argument"; $y; $z'
+
+expected_region_highlight=(
+  "1 2 command" # $x
+  "4 13 default" # "argument"
+  "4 13 double-quoted-argument" # "argument"
+  "14 14 commandseparator" # ;
+  "16 17 precommand" # $y (sudo)
+  "18 18 unknown-token" # ;
+  "20 21 command" # $z - 'zsh' being the command
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow.zsh
new file mode 100644
index 00000000..a610bdc3
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow.zsh
@@ -0,0 +1,57 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='while if echo Hello; then ls /; else ls; fi; do stat "x"; done; repeat 10 ls'
+
+expected_region_highlight+=(
+  "1 5 reserved-word" # while
+  "7 8 reserved-word" # if
+  "10 13 builtin" # echo
+  "15 19 default" # Hello
+  "20 20 commandseparator" # ;
+  "22 25 reserved-word" # then
+  "27 28 command" # ls
+  "30 30 path" # /
+  "31 31 commandseparator" # ;
+  "33 36 reserved-word" # else
+  "38 39 command" # ls
+  "40 40 commandseparator" # ;
+  "42 43 reserved-word" # fi
+  "44 44 commandseparator" # ;
+  "46 47 reserved-word" # do
+  "49 52 command" # stat
+  "54 56 default" # "x"
+  "54 56 double-quoted-argument" # "x"
+  "57 57 commandseparator" # ;
+  "59 62 reserved-word" # done
+  "63 63 commandseparator" # ;
+  "65 70 reserved-word" # repeat
+  "72 73 default" # 10
+  "75 76 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow2.zsh
new file mode 100644
index 00000000..acf99e1d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='repeat 42; do ls; done'
+
+expected_region_highlight+=(
+  "1 6 reserved-word" # repeat
+  "8 9 default" # 42
+  "10 10 commandseparator" # ;
+  "12 13 reserved-word" # do
+  "15 16 command" # ls
+  "17 17 commandseparator" # ;
+  "19 22 reserved-word" # done
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow3.zsh
new file mode 100644
index 00000000..58f507f9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/control-flow3.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='repeat 42; ls; pwd'
+
+expected_region_highlight+=(
+  "1 6 reserved-word" # repeat
+  "8 9 default" # 42
+  "10 10 commandseparator" # ;
+  "12 13 command" # ls
+  "14 14 commandseparator" # ;
+  "16 18 builtin" # pwd
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cthulhu.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cthulhu.zsh
new file mode 100644
index 00000000..c8119a84
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/cthulhu.zsh
@@ -0,0 +1,70 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+#        0000000 0 01111111111222222 222233333 3 333344 4 4 444444555555555 5 6 6666 6 6 6667777777777888 8 8 88888999 9 9999 9 9 00 00 0000001111
+#        1234567 8 90123456789012345 678901234 5 678901 2 3 456789012345678 9 0 1234 5 6 7890123456789012 3 4 56789012 3 4567 8 9 01 23 4567890123
+BUFFER=$'echo Ph\\\'ng`echo lui "mg"\\`echo lw\\\'nafh \\\\\\`echo Cthu"lhu\\\\\\` R\\\\\'ly$(echo eh wag\\\\\\`echo h\\\'nag\\\\\\`\'l\' fht)agn`'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 113 default' # Ph\'ng`echo lui "mg"\`echo lw\'nafh \\\`echo Cthu"lhu\\\` R\\'ly$(echo eh wag\\\`echo h\'nag\\\`'l' fht)agn`
+  '12 113 back-quoted-argument' # `echo lui "mg"\`echo lw\'nafh \\\`echo Cthu"lhu\\\` R\\'ly$(echo eh wag\\\`echo h\'nag\\\`'l' fht)agn`
+  '12 12 back-quoted-argument-delimiter' # `
+  '13 16 builtin' # echo
+  '18 20 default' # lui
+  '22 112 default' # "mg"\`echo lw\'nafh \\\`echo Cthu"lhu\\\` R\\'ly$(echo eh wag\\\`echo h\'nag\\\`'l' fht)agn
+  '22 25 double-quoted-argument' # "mg"
+  '26 112 back-quoted-argument-unclosed' # \`echo lw\'nafh \\\`echo Cthu"lhu\\\` R\\'ly$(echo eh wag\\\`echo h\'nag\\\`'l' fht)agn
+  '26 27 back-quoted-argument-delimiter' # \`
+  '28 31 builtin' # echo
+  '33 40 default' # lw\'nafh
+  '42 62 default' # \\\`echo Cthu"lhu\\\`
+  '42 62 back-quoted-argument' # \\\`echo Cthu"lhu\\\`
+  '42 45 back-quoted-argument-delimiter' # \\\`
+  '46 49 builtin' # echo
+  '51 58 default' # Cthu"lhu
+  '55 58 double-quoted-argument-unclosed' # "lhu
+  '59 62 back-quoted-argument-delimiter' # \\\`
+  '64 112 default' # R\\'ly$(echo eh wag\\\`echo h\'nag\\\`'l' fht)agn
+  '70 109 command-substitution-unquoted' # $(echo eh wag\\\`echo h\'nag\\\`'l' fht)
+  '70 71 command-substitution-delimiter-unquoted' # $(
+  '72 75 builtin' # echo
+  '77 78 default' # eh
+  '80 104 default' # wag\\\`echo h\'nag\\\`'l'
+  '83 101 back-quoted-argument' # \\\`echo h\'nag\\\`
+  '83 86 back-quoted-argument-delimiter' # \\\`
+  '87 90 builtin' # echo
+  '92 97 default' # h\'nag
+  '98 101 back-quoted-argument-delimiter' # \\\`
+  '102 104 single-quoted-argument' # 'l'
+  '106 108 default' # fht
+  '109 109 command-substitution-delimiter-unquoted' # )
+  '113 113 unknown-token' # `
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dinbrack1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dinbrack1.zsh
new file mode 100644
index 00000000..e2279d6b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dinbrack1.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'[[ foo && bar || baz ]]'
+
+expected_region_highlight=(
+  '1 2 reserved-word' # [[
+  '4 6 default' # foo
+  '8 9 default' # &&
+  '11 13 default' # bar
+  '15 16 default' # ||
+  '18 20 default' # baz
+  '22 23 reserved-word' # ]]
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dirs_blacklist.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dirs_blacklist.zsh
new file mode 100644
index 00000000..2d0222f0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dirs_blacklist.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir foo
+touch foo/bar
+BUFFER=": foo/bar $PWD/foo foo/b"
+ZSH_HIGHLIGHT_DIRS_BLACKLIST=($PWD/foo $PWD/bar)
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 9 default' # foo/bar
+  "11 $(( 14 + $#PWD )) default" # $PWD/foo
+  "$(( 16 + $#PWD )) $(( 20 + $#PWD )) default" # foo/b
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-dollar.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-dollar.zsh
new file mode 100644
index 00000000..e3f387ce
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-dollar.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$$ $$foo"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 12 default' # "$$ $$foo"
+  '3 12 double-quoted-argument' # "$$ $$foo"
+  '4 5 dollar-double-quoted-argument' # $$
+  '7 8 dollar-double-quoted-argument' # $$
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-noise.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-noise.zsh
new file mode 100644
index 00000000..9bb11bd8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-noise.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$- $# $* $@ $?"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 18 default' # "$- $# $* $@ $?"
+  '3 18 double-quoted-argument' # "$- $# $* $@ $?"
+  '4 5 dollar-double-quoted-argument' # $-
+  '7 8 dollar-double-quoted-argument' # $#
+  '10 11 dollar-double-quoted-argument' # $*
+  '13 14 dollar-double-quoted-argument' # $@
+  '16 17 dollar-double-quoted-argument' # $?
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-paren.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-paren.zsh
new file mode 100644
index 00000000..2bbcef18
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-paren.zsh
@@ -0,0 +1,49 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$(:)" "foo$(:)bar'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 8 default' # "$(:)"
+  '3 3 double-quoted-argument' # "$(:)"
+  '8 8 double-quoted-argument' # "$(:)"
+  '4 7 command-substitution-quoted' # $(:)
+  '4 5 command-substitution-delimiter-quoted' # $(
+  '6 6 builtin' # :
+  '7 7 command-substitution-delimiter-quoted' # )
+  '10 20 default' # "foo$(:)bar
+  '10 13 double-quoted-argument-unclosed' # "foo
+  '18 20 double-quoted-argument-unclosed' # bar
+  '14 17 command-substitution-quoted' # $(:)
+  '14 15 command-substitution-delimiter-quoted' # $(
+  '16 16 builtin' # :
+  '17 17 command-substitution-delimiter-quoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted.zsh
new file mode 100644
index 00000000..081a365b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=": \$'*' 'foo'"
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 6 default" # $'*'
+  "3 6 dollar-quoted-argument" # $'*' - not a glob
+  "8 12 default" # 'foo'
+  "8 12 single-quoted-argument" # 'foo'
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted2.zsh
new file mode 100644
index 00000000..ed7428bd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted2.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=": \$'foo\xbar\udeadbeef\uzzzz'"
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 29 default" # $'foo\xbar\udeadbeef\uzzzz'
+  "3 29 dollar-quoted-argument" # $'foo\xbar\udeadbeef\uzzzz'
+  "8 11 back-dollar-quoted-argument" # \xba
+  "13 18 back-dollar-quoted-argument" # \dead
+  "23 24 unknown-token" # \u
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted3.zsh
new file mode 100644
index 00000000..365f3519
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/dollar-quoted3.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Similar to double-quoted2.zsh
+# This test checks that the '1' gets highlighted correctly.  Do not append to the BUFFER.
+BUFFER=": \$'\xa1"
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 8 default" # $'\xa1
+  "3 8 dollar-quoted-argument-unclosed" # $'\xa1
+  "5 8 back-dollar-quoted-argument" # \xa1
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-hyphen-option.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-hyphen-option.zsh
new file mode 100644
index 00000000..e5cacd37
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-hyphen-option.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='hello --world'
+
+expected_region_highlight=(
+  "1 5 unknown-token" # hello
+  "7 13 double-hyphen-option" # --world
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted.zsh
new file mode 100644
index 00000000..0a4336ca
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "foo$bar:\`:\":\$:'
+BUFFER+=\\\\:\"
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 24 default" # "foo$bar:\`:\":\$:\\:"
+  "3 24 double-quoted-argument" # "foo$bar:\`:\":\$:\\:"
+  "7 10 dollar-double-quoted-argument" # $bar
+  "12 13 back-double-quoted-argument" # \`
+  "15 16 back-double-quoted-argument" # \$
+  "18 19 back-double-quoted-argument" # \"
+  "21 22 back-double-quoted-argument" # \\
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted2.zsh
new file mode 100644
index 00000000..c400e543
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted2.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Similar to dollar-quoted3.zsh
+# This test checks that the 'r' gets highlighted correctly.  Do not append to the BUFFER.
+BUFFER=': "foo$bar'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 10 default" # "foo$bar
+  "3 10 double-quoted-argument-unclosed" # "foo$bar
+  "7 10 dollar-double-quoted-argument" # $bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted3.zsh
new file mode 100644
index 00000000..86e3ced6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted3.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "$" "$42foo"'
+BUFFER+=\ \"\\\'\\x\"
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 5 default" # "$"
+  "3 5 double-quoted-argument" # "$"
+  "7 14 default" # "$42foo"
+  "7 14 double-quoted-argument" # "$42foo"
+  "8 10 dollar-double-quoted-argument" # $42
+  "16 21 default" # "\'\x"
+  "16 21 double-quoted-argument" # "\'\x" - \' and \x are not escape sequences
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted4.zsh
new file mode 100644
index 00000000..c59d5d8e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/double-quoted4.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': "${foo}bar"'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 13 default" # "${foo}bar"
+  "3 13 double-quoted-argument" # "${foo}bar"
+  "4 9 dollar-double-quoted-argument" # ${foo}
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command-newline.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command-newline.zsh
new file mode 100644
index 00000000..4b7b35c6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command-newline.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Newline after semicolon isn't unknown-token
+BUFFER=$':;\n:'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '2 2 commandseparator' # ;
+  '3 3 commandseparator' # \n
+  '4 4 builtin' # :
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command.zsh
new file mode 100644
index 00000000..5831464d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo; ;'
+
+expected_region_highlight=(
+  "1 4 builtin" # echo
+  "5 5 commandseparator" # ;
+  "7 7 unknown-token" # ;
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command2.zsh
new file mode 100644
index 00000000..dcb4e6f7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-command2.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Same test data and expectations as empty-command.zsh; the only difference is:
+touch ';'
+
+BUFFER='echo; ;'
+
+expected_region_highlight=(
+  "1 4 builtin" # echo
+  "5 5 commandseparator" # ;
+  "7 7 unknown-token" # ;
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-line.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-line.zsh
new file mode 100644
index 00000000..a4d6685b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/empty-line.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'\\\n; ls'
+
+expected_region_highlight=(
+  '3 3 unknown-token' # ;
+  '5 6 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals1.zsh
new file mode 100644
index 00000000..77f46e8d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals1.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': =ls'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 5 path' # =ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals2.zsh
new file mode 100644
index 00000000..bd59ff75
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals2.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsetopt equals
+
+BUFFER=$': =nosuchcommand'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 16 default' # =nosuchcommand
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals3.zsh
new file mode 100644
index 00000000..8c107890
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals3.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': =nosuchcommand'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 16 unknown-token' # =nosuchcommand
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals4.zsh
new file mode 100644
index 00000000..28bc2148
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/equals4.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': ='
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 default' # =
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/escaped-single-quote.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/escaped-single-quote.zsh
new file mode 100644
index 00000000..4b2fe4bc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/escaped-single-quote.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': \'foo\'\\\'\'bar\'' # <<<: 'foo'\''bar'>>>
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 14 default' # 'foo'\''bar'
+  '3 7 single-quoted-argument' # 'foo'
+  '10 14 single-quoted-argument' # 'bar'
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/exec-redirection1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/exec-redirection1.zsh
new file mode 100644
index 00000000..78a0c623
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/exec-redirection1.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='exec {foo}>&/tmp ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # exec
+  "6 10 named-fd" # {foo}
+  "11 12 redirection" # >&
+  "13 16 path" # /tmp
+  "18 19 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/fd-target-not-filename.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/fd-target-not-filename.zsh
new file mode 100644
index 00000000..5c3cd089
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/fd-target-not-filename.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch 2
+
+BUFFER=$'echo foo>&2'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 8 default' # foo
+  '9 10 redirection' # >&
+  '11 11 numeric-fd' # 2 (not path)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-altsyntax.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-altsyntax.zsh
new file mode 100644
index 00000000..0f9a8339
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-altsyntax.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Define named and anonymous function using the alternative syntax
+BUFFER=$'function f { pwd }; function { pwd }'
+
+expected_region_highlight=(
+  '1 8 reserved-word' # function
+  '10 10 default' # f
+  '12 12 reserved-word "issue #237"' # {
+  '14 16 command "issue #237"' # pwd
+  '18 18 reserved-word "issue #237"' # }
+  '19 19 commandseparator' # ;
+  '21 28 reserved-word' # function
+  '30 30 reserved-word "issue #237"' # {
+  '32 34 command "issue #237"' # pwd
+  '36 36 reserved-word "issue #237"' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-named1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-named1.zsh
new file mode 100644
index 00000000..c962ddbb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-named1.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='f() pwd; f() { balanced braces }'
+
+expected_region_highlight=(
+  '1 1 TBD "issue #223"' # f
+  '2 3 reserved-word' # ()
+  '5 7 builtin' # pwd
+  '8 8 commandseparator' # ;
+  '10 10 TBD "issue #223"' # f
+  '11 12 reserved-word' # ()
+  '14 14 reserved-word' # {
+  '16 23 unknown-token' # balanced
+  '25 30 default' # braces
+  '32 32 reserved-word' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-named2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-named2.zsh
new file mode 100644
index 00000000..e12fce6a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function-named2.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='f g h () pwd'
+
+expected_region_highlight=(
+  '1 1 TBD "issue #223"' # f
+  '3 3 TBD "issue #223"' # g
+  '5 5 TBD "issue #223"' # h
+  '7 8 reserved-word' # ()
+  '10 12 builtin' # pwd
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function.zsh
new file mode 100644
index 00000000..b1be8539
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/function.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+cd() {
+  builtin cd "$@"
+}
+ls() {
+  command ls "$@"
+}
+BUFFER='cd;ls'
+
+expected_region_highlight=(
+  "1 2 function" # cd
+  "3 3 commandseparator" # ;
+  "4 5 function" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/glob.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/glob.zsh
new file mode 100644
index 00000000..2ff1022e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/glob.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': foo* bar? *baz qux\?'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 6 default" # foo*
+  "6 6 globbing" # *
+  "8 11 default" # bar?
+  "11 11 globbing" # ?
+  "13 16 default" # *baz
+  "13 13 globbing" # *
+  "18 22 default" # qux\?
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/global-alias1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/global-alias1.zsh
new file mode 100644
index 00000000..0022de3c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/global-alias1.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias -g foo=bar
+
+BUFFER=$'foo foo'
+
+expected_region_highlight=(
+  '1 3 global-alias' # foo
+  '5 7 global-alias' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/globs-with-quoting.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/globs-with-quoting.zsh
new file mode 100644
index 00000000..d7d74bc4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/globs-with-quoting.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': "foo"*\'bar\'?"baz?"<17-29>"qu*ux"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 34 default' # "foo"*'bar'?"baz?"<17-29>"qu*ux"
+  '3 7 double-quoted-argument' # "foo"
+  '8 8 globbing' # *
+  '9 13 single-quoted-argument' # 'bar'
+  '14 14 globbing' # ?
+  '15 20 double-quoted-argument' # "baz?"
+  '21 27 globbing' # <17-29>
+  '28 34 double-quoted-argument' # "qu*ux"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/hashed-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/hashed-command.zsh
new file mode 100644
index 00000000..2983ef8d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/hashed-command.zsh
@@ -0,0 +1,35 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash zsh_syntax_highlighting_hash=/doesnotexist
+BUFFER='zsh_syntax_highlighting_hash'
+
+expected_region_highlight=(
+  "1 28 hashed-command 'zsh/parameter cannot distinguish between hashed and command'"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-escaped.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-escaped.zsh
new file mode 100644
index 00000000..7807cc06
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-escaped.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "Hello\!"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 14 default' # "Hello\!"
+  '6 14 double-quoted-argument' # "Hello\!"
+  '12 13 back-double-quoted-argument' # \!
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-followed.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-followed.zsh
new file mode 100644
index 00000000..6421ceda
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-followed.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': !!= "!!="'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 4 history-expansion "issue #713"' # !!
+  '7 11 default' # "!!="
+  '7 11 double-quoted-argument' # "!!="
+  '8 9 history-expansion "issue #713' # !!
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-no.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-no.zsh
new file mode 100644
index 00000000..e082dbcf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-no.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo != bar !{baz}"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 24 default' # "foo != bar !{baz}"
+  '6 24 double-quoted-argument' # "foo != bar !{baz}" - no history expansions
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-unescaped.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-unescaped.zsh
new file mode 100644
index 00000000..cfe6a11d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-unescaped.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "Hello!"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 13 default' # "Hello!"
+  '6 13 double-quoted-argument' # "Hello!"
+  '12 12 history-expansion' # !
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-yes.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-yes.zsh
new file mode 100644
index 00000000..e963c3b9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-double-quoted-yes.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo !bar"'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 15 default' # "foo !bar"
+  '6 15 double-quoted-argument' # "foo !bar"
+  '11 11 history-expansion' # !
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-expansion.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-expansion.zsh
new file mode 100644
index 00000000..05e20fc1
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-expansion.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='!foo bar !baz ! ; !'
+
+expected_region_highlight=(
+  "1 4 history-expansion" # !foo
+  "6 8 default" # bar
+  "10 13 history-expansion" # !baz
+  "15 15 default" # !
+  "17 17 commandseparator" # ;
+  "19 19 reserved-word" # !
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-expansion2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-expansion2.zsh
new file mode 100644
index 00000000..386d0df9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/history-expansion2.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='^foo^bar'
+
+expected_region_highlight=(
+  "1 8 history-expansion" # ^foo^bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/inheritance.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/inheritance.zsh
new file mode 100644
index 00000000..e851ca3e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/inheritance.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+_zsh_highlight_add_highlight()
+{
+  region_highlight+=("$1 $2 ${(j.,.)argv[3,-1]}")
+}
+
+BUFFER='type'
+
+expected_region_highlight=(
+  '1 4 builtin,arg0' # type
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/jobsubst-isnt-glob.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/jobsubst-isnt-glob.zsh
new file mode 100644
index 00000000..3a7e325a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/jobsubst-isnt-glob.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018.9958 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': %? %?foo'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 4 default' # %?
+  '6 10 default' # %?foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/jobsubst-isnt-glob2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/jobsubst-isnt-glob2.zsh
new file mode 100644
index 00000000..51930bfb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/jobsubst-isnt-glob2.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': foo%?bar'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 10 default' # foo%?bar
+  '7 7 globbing' # ?
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/loop-newline.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/loop-newline.zsh
new file mode 100644
index 00000000..d39ee112
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/loop-newline.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'for i in \\\n; do done'
+
+expected_region_highlight=(
+  '1 3 reserved-word' # for
+  '5 5 default' # i
+  '7 8 default' # in
+  '12 12 commandseparator' # ;
+  '14 15 reserved-word' # do
+  '17 20 reserved-word' # done
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/meta-no-eval1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/meta-no-eval1.zsh
new file mode 100644
index 00000000..bb040777
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/meta-no-eval1.zsh
@@ -0,0 +1,49 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(kill -9 $$) ${:-$(kill -9 $$)}'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 15 default' # $(kill -9 $$)
+  '3 15 command-substitution-unquoted' # $(kill -9 $$)
+  '3 4 command-substitution-delimiter-unquoted' # $(
+  '5 8 builtin' # kill
+  '10 11 single-hyphen-option' # -9
+  '13 14 default' # $$
+  '15 15 command-substitution-delimiter-unquoted' # )
+  '17 34 default' # ${:-$(kill -9 $$)}
+  '21 33 command-substitution-unquoted' # $(kill -9 $$)
+  '21 22 command-substitution-delimiter-unquoted' # $(
+  '23 26 builtin' # kill
+  '28 29 single-hyphen-option' # -9
+  '31 32 default' # $$
+  '33 33 command-substitution-delimiter-unquoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/meta-no-eval2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/meta-no-eval2.zsh
new file mode 100644
index 00000000..61ef0892
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/meta-no-eval2.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# We aren't testing how this is highlighted; we're testing that it's not
+# evaluated.  If it gets evaluated, the test suite will die.
+BUFFER=$': /(e*exit 42*)'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 15 default' # /(e*exit 42*)
+  '6 6 globbing' # *
+  '14 14 globbing' # *
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-array-assignment1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-array-assignment1.zsh
new file mode 100644
index 00000000..8906cfde
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-array-assignment1.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'foo=(\nbar) env'
+
+expected_region_highlight=(
+  '1 5 assign' # foo=(
+  '5 5 reserved-word' # (
+  '6 6 commandseparator' # \n
+  '7 9 default' # bar
+  '10 10 assign' # )
+  '10 10 reserved-word' # )
+  '12 14 precommand' # env
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-string.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-string.zsh
new file mode 100644
index 00000000..0127b4bf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-string.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo "foo1\n'
+BUFFER='foo2" ./'
+
+expected_region_highlight=(
+  "1 5 default" # 'foo2"'
+  "1 5 double-quoted-argument" # 'foo2"'
+  "7 8 path" # './'
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-string2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-string2.zsh
new file mode 100644
index 00000000..3a90dce8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiline-string2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'echo \'foo1\n'
+
+expected_region_highlight=(
+  "1 4 builtin" # echo
+  "6 11 default" # 'foo1\n
+  "6 11 single-quoted-argument-unclosed" # 'foo1\n
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multios-negates-globbing.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multios-negates-globbing.zsh
new file mode 100644
index 00000000..7ece6708
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multios-negates-globbing.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+unsetopt multios
+
+BUFFER=$'cat < *'
+
+expected_region_highlight=(
+  '1 3 command' # cat
+  '5 5 redirection' # <
+  '7 7 default' # * - not globbing
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multios-negates-globbing2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multios-negates-globbing2.zsh
new file mode 100644
index 00000000..b6db983d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multios-negates-globbing2.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'cat < *'
+
+expected_region_highlight=(
+  '1 3 command' # cat
+  '5 5 redirection' # <
+  '7 7 default' # *
+  '7 7 globbing' # *
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiple-quotes.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiple-quotes.zsh
new file mode 100644
index 00000000..dabf70c8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiple-quotes.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': \'foo\'bar"baz$quux/foo\\\\bar"baz$\'quux\\nfoo\\001bar\'baz'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 54 default" # 'foo'bar"baz$quux/foo\\bar"baz$'quux\nfoo\001'baz
+  "3 7 single-quoted-argument" # 'foo'
+  "11 29 double-quoted-argument" #"baz
+  "15 19 dollar-double-quoted-argument" # $quux
+  "24 25 back-double-quoted-argument" # \\
+  "33 51 dollar-quoted-argument" # $'quux\nfoo\001bar'
+  "39 40 back-dollar-quoted-argument" # \n
+  "44 47 back-dollar-quoted-argument" # \001
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiple-redirections.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiple-redirections.zsh
new file mode 100644
index 00000000..1545c1b6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/multiple-redirections.zsh
@@ -0,0 +1,46 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='id bob | grep java | sort | uniq | tail | head'
+
+expected_region_highlight=(
+  "1  2  command" # ps
+  "4  6  default" # aux
+  "8  8  commandseparator" # |
+  "10 13 command" # grep
+  "15 18 default" # java
+  "20 20 commandseparator" # |
+  "22 25 command" # sort
+  "27 27 commandseparator" # |
+  "29 32 command" # uniq
+  "34 34 commandseparator" # |
+  "36 39 command" # tail
+  "41 41 commandseparator" # |
+  "43 46 command" # head
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob-alias.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob-alias.zsh
new file mode 100644
index 00000000..2f96445e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob-alias.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias x=command
+BUFFER='x ls'
+
+expected_region_highlight=(
+  "1 1 alias" # x
+  "3 4 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob-always.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob-always.zsh
new file mode 100644
index 00000000..6d550489
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob-always.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'{ noglob echo * } always { echo * }'
+
+expected_region_highlight=(
+  '1 1 reserved-word' # {
+  '3 8 precommand' # noglob
+  '10 13 builtin' # echo
+  '15 15 default' # *
+  '17 17 reserved-word' # }
+  '19 24 reserved-word' # always
+  '26 26 reserved-word' # {
+  '28 31 builtin' # echo
+  '33 33 default' # *
+  '33 33 globbing' # *
+  '35 35 reserved-word' # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob1.zsh
new file mode 100644
index 00000000..1857db0c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob1.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=':; noglob echo *'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "2 2 commandseparator" # ;
+  "4 9 precommand" # noglob
+  "11 14 builtin" # echo
+  "16 16 default" # *
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob2.zsh
new file mode 100644
index 00000000..3b4fcd76
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='noglob echo *; echo *'
+
+expected_region_highlight=(
+  "1 6 precommand" # noglob
+  "8 11 builtin" # echo
+  "13 13 default" # *
+  "14 14 commandseparator" # ;
+  "16 19 builtin" # echo
+  "21 21 default" # *
+  "21 21 globbing" # *
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob3.zsh
new file mode 100644
index 00000000..c404aaac
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob3.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch \*
+
+BUFFER='noglob echo *'
+
+expected_region_highlight=(
+  "1 6 precommand" # noglob
+  "8 11 builtin" # echo
+  "13 13 path" # *
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob4.zsh
new file mode 100644
index 00000000..cc7065f5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/noglob4.zsh
@@ -0,0 +1,45 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'noglob cat <(print -r -- *)'
+
+expected_region_highlight=(
+  '1 6 precommand' # noglob
+  '8 10 command' # cat
+  '12 27 default' # <(print -r -- *)
+  '12 27 process-substitution' # <(print -r -- *)
+  '12 13 process-substitution-delimiter' # <(
+  '14 18 builtin' # print
+  '20 21 single-hyphen-option' # -r
+  '23 24 double-hyphen-option' # --
+  '26 26 default' # *
+  '26 26 globbing' # *
+  '27 27 process-substitution-delimiter' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/null-exec.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/null-exec.zsh
new file mode 100644
index 00000000..be1e3064
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/null-exec.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'exec >/dev/null;'
+
+expected_region_highlight=(
+  '1 4 precommand' # exec
+  '6 6 redirection' # >
+  '7 15 path' # /dev/null
+  '16 16 commandseparator' # ;
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/null-exec2-printenv.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/null-exec2-printenv.zsh
new file mode 100644
index 00000000..59a2cef7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/null-exec2-printenv.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2021 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'env | grep $needle'
+
+expected_region_highlight=(
+  '1 3 precommand' # env
+  '5 5 commandseparator' # |
+  '7 10 command' # grep
+  '12 18 default' # $needle
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/number_range-glob.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/number_range-glob.zsh
new file mode 100644
index 00000000..c8409510
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/number_range-glob.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='print <-> x<->y <foo2-3>'
+
+expected_region_highlight=(
+  '1 5 builtin' # print
+  '7 9 default' # <->
+  '7 9 globbing' # <->
+  '11 15 default' # x<->y
+  '12 14 globbing' # <->
+  '17 17 redirection' # <
+  '18 23 default' # foo2-3 (the filename)
+  '24 24 redirection' # >
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/off-by-one.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/off-by-one.zsh
new file mode 100644
index 00000000..872143af
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/off-by-one.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+alias a=:
+f() {}
+
+BUFFER='a;f;'
+
+expected_region_highlight=(
+  "1 1 alias" # a
+  "2 2 commandseparator" # ;
+  "3 3 function" # f
+  "4 4 commandseparator" # ;
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/opt-shwordsplit1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/opt-shwordsplit1.zsh
new file mode 100644
index 00000000..4a7689be
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/opt-shwordsplit1.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt shwordsplit
+local EDITOR='ed -s'
+
+ed() { command ed "$@" }
+
+BUFFER=$'$EDITOR'
+
+expected_region_highlight=(
+  '1 7 function' # $EDITOR
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/optimized-cmdsubst-input.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/optimized-cmdsubst-input.zsh
new file mode 100644
index 00000000..ca55ef83
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/optimized-cmdsubst-input.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See getoutput() and getoutputfile() in zsh's C source code.
+
+BUFFER=$': $(<*)'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 7 default' # $(<*)
+  '3 7 command-substitution-unquoted' # $(<*)
+  '3 4 command-substitution-delimiter-unquoted' # $(
+  '5 5 redirection' # <
+  '6 6 default' # * - not globbing!
+  '7 7 command-substitution-delimiter-unquoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-dollar-quote-isnt-filename.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-dollar-quote-isnt-filename.zsh
new file mode 100644
index 00000000..897a02e6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-dollar-quote-isnt-filename.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': -$\'n\''
+
+touch ./-n
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 7 single-hyphen-option' # -$'n'
+  '4 7 dollar-quoted-argument' # $'n'
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-path_dirs.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-path_dirs.zsh
new file mode 100644
index 00000000..0300c7e5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-path_dirs.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+if [[ $OSTYPE == msys ]]; then
+  skip_test='Cannot chmod +x in msys2'
+else
+  setopt PATH_DIRS
+  mkdir -p foo/bar
+  touch foo/bar/testing-issue-228
+  chmod  +x foo/bar/testing-issue-228
+  path+=( "$PWD"/foo )
+
+  BUFFER='bar/testing-issue-228'
+
+  expected_region_highlight=(
+    "1 21 command" # bar/testing-issue-228
+  )
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-with-quotes.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-with-quotes.zsh
new file mode 100644
index 00000000..6286f034
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/option-with-quotes.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': --user="phy1729"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 18 double-hyphen-option' # --user="phy1729"
+  '10 18 double-quoted-argument' # "phy1729"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/order-path-after-dollar.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/order-path-after-dollar.zsh
new file mode 100644
index 00000000..773c1838
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/order-path-after-dollar.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch '$foo'
+BUFFER=': $foo \$foo'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 6 default' # $foo - if we add a "unquoted parameter expansion" style then this expectation should change
+  '8 12 path' # \$foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/order-path-before-globbing.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/order-path-before-globbing.zsh
new file mode 100644
index 00000000..8456b181
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/order-path-before-globbing.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch '*'
+BUFFER=': * \*'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 default' # *
+  '3 3 globbing' # *
+  '5 6 path' # \*
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-positional-in-array-append.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-positional-in-array-append.zsh
new file mode 100644
index 00000000..bd39e021
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-positional-in-array-append.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# This used to be an infinite loop.
+
+BUFFER=$'l+=( $1'
+
+expected_region_highlight=(
+  '1 4 assign' # l+=(
+  '4 4 reserved-word' # (
+  '6 7 default' # $1
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-precommand-option-argument1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-precommand-option-argument1.zsh
new file mode 100644
index 00000000..84cf03ac
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-precommand-option-argument1.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See also alias-precommand-option-argument1.zsh
+local -a sudo_u; sudo_u=(sudo -u)
+sudo(){}
+
+BUFFER='$sudo_u phy1729 echo foo'
+
+expected_region_highlight=(
+  '1 7 precommand' # $sudo_u
+  '9 15 default' # phy1729
+  '18 20 command "issue #540"' # echo (not builtin)
+  '22 24 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-precommand-option-argument3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-precommand-option-argument3.zsh
new file mode 100644
index 00000000..9a8dde28
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/param-precommand-option-argument3.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See also alias-precommand-option-argument3.zsh
+local -a sudo_u; sudo_u=(sudo -u)
+sudo(){}
+
+BUFFER='$sudo_u phy1729 ls foo'
+
+expected_region_highlight=(
+  '1 7 precommand' # sudo_u
+  '9 15 default' # phy1729
+  '17 18 command' # ls
+  '20 22 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-elision-command-word.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-elision-command-word.zsh
new file mode 100644
index 00000000..25f649a2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-elision-command-word.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='$x ls'
+
+expected_region_highlight=(
+  '1 2 comment' # $x
+  '4 5 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-shwordsplit.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-shwordsplit.zsh
new file mode 100644
index 00000000..0bf6f4c0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-shwordsplit.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2021 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt sh_word_split
+local foo='echo foo'
+
+BUFFER='$foo'
+
+expected_region_highlight=(
+  '1 4 builtin' # $foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-untokenized1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-untokenized1.zsh
new file mode 100644
index 00000000..8b8b5e4c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-untokenized1.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+local x="()"
+
+BUFFER=$'$x ls'
+
+expected_region_highlight=(
+  '1 2 unknown-token' # $x
+  '4 5 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-untokenized2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-untokenized2.zsh
new file mode 100644
index 00000000..d23a1f21
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-expansion-untokenized2.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+local x="^foo^bar"
+
+BUFFER=$'$x ls'
+
+expected_region_highlight=(
+  '1 2 unknown-token' # $x
+  '4 5 default' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-star.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-star.zsh
new file mode 100644
index 00000000..2311be07
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-star.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='() { : $* }'
+
+# This tests that $* isn't highlighted as a glob.
+# If we ever add a "unquoted parameter" style, the expectation may change.
+expected_region_highlight=(
+  "1 2 reserved-word" # ()
+  "4 4 reserved-word" # {
+  "6 6 builtin" # :
+  "8 9 default" # $*
+  "11 11 reserved-word" # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-to-global-alias.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-to-global-alias.zsh
new file mode 100644
index 00000000..63f95da7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-to-global-alias.zsh
@@ -0,0 +1,42 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+if type global_alias >/dev/null; then
+  skip_test="Test is written on the assumption that 'global_alias' is not a valid command name, but that assumption does not hold"
+  return 0
+fi
+alias -g global_alias=y
+local s=global_alias
+
+BUFFER=$'$s'
+
+expected_region_highlight=(
+  '1 2 unknown-token' # $s
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-value-contains-command-position1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-value-contains-command-position1.zsh
new file mode 100644
index 00000000..05ea1bfa
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-value-contains-command-position1.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+local foobar='x=$(ls)'
+
+BUFFER=$'$foobar'
+
+expected_region_highlight=(
+  # Used to highlight the "ba" as 'command' because the 'ls' showed through; issues #670 and #674
+  '1 7 unknown-token' # $foobar (not an assignment)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-value-contains-command-position2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-value-contains-command-position2.zsh
new file mode 100644
index 00000000..5042e899
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/parameter-value-contains-command-position2.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+local y='x=$(ls)'
+
+BUFFER=$'$y'
+
+expected_region_highlight=(
+  # Used to trigger a "BUG" message on stderr - issues #670 and #674
+  '1 2 unknown-token' # $y (not an assignment)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/pasted-quotes.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/pasted-quotes.zsh
new file mode 100644
index 00000000..f37f21b3
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/pasted-quotes.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2013 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': \'foo\'bar"baz"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 15 default' # \'foo\'bar"baz"
+  '3 7 single-quoted-argument' # \'foo\'
+  '11 15 double-quoted-argument' # "baz"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-broken-symlink.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-broken-symlink.zsh
new file mode 100644
index 00000000..baebee36
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-broken-symlink.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+if [[ $OSTYPE == msys ]]; then
+  skip_test='Cannot create symlinks in msys2'
+else
+  ln -s /nonexistent broken-symlink
+  BUFFER=': broken-symlink'
+  CURSOR=5 # to make path_prefix ineligible
+
+  expected_region_highlight=(
+    "1 1 builtin" # :
+    "3 16 path" # broken-symlink
+  )
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word.zsh
new file mode 100644
index 00000000..99055da9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word.zsh
@@ -0,0 +1,45 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+if [[ $OSTYPE == msys ]]; then
+  skip_test='Cannot chmod +x in msys2' # cargo culted from option-path_dirs.zsh
+else
+  mkdir kappa
+  touch kappa.exe
+  chmod +x kappa.exe
+  cd kappa
+  
+  BUFFER='$PWD.exe; ${PWD}.exe'
+  
+  expected_region_highlight=(
+    "1 8 unknown-token" # $PWD.exe - not eval'd; issue #328
+    "9 9 commandseparator" # ;
+    "11 20 unknown-token" # ${PWD}.exe
+  )
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word2.zsh
new file mode 100644
index 00000000..f404d5d0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word2.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+local lambda="''"
+touch \$lambda
+BUFFER=': \$lambda'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 10 path" # \$lambda
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word3.zsh
new file mode 100644
index 00000000..ec981b1e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word3.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# «/usr» at this point would be highlighted as path_prefix; so should
+# a parameter that expands to an equivalent string be highlighted.
+#
+# More complicated parameter substitutions aren't eval'd; issue #328.
+BUFFER='$PWD; ${PWD}'
+
+expected_region_highlight=(
+  "1 4 unknown-token" # $PWD (without AUTO_CD)
+  "5 5 commandseparator" # ;
+  "7 12 path_prefix" # ${PWD}
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word3b.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word3b.zsh
new file mode 100644
index 00000000..72a2f7c4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word3b.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt autocd
+BUFFER=$'$PWD; ${PWD}'
+
+expected_region_highlight=(
+  '1 4 autodirectory' # $PWD
+  '5 5 commandseparator' # ;
+  '7 12 autodirectory' # ${PWD}
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word4.zsh
new file mode 100644
index 00000000..e29182cc
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-dollared-word4.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# This tests for a regression during development of issue #328: an interim version
+# of that branch failed that test with "Bail out! output on stderr".
+BUFFER='${'
+
+expected_region_highlight=(
+  "1 2 unknown-token" # ${
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-mixed-quoting.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-mixed-quoting.zsh
new file mode 100644
index 00000000..cbd0b38e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-mixed-quoting.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch foo
+
+BUFFER=$': \'f\'oo'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 7 path' # \'f\'oo
+  '3 5 single-quoted-argument' # \'f\'
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-separators.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-separators.zsh
new file mode 100644
index 00000000..52749b79
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-separators.zsh
@@ -0,0 +1,53 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# ZSH_HIGHLIGHT_STYLES is empty in tests. The path-separator code however compares its values.
+# Make sure the relevant ones are set to something.
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]=set
+ZSH_HIGHLIGHT_STYLES[path_prefix_pathseparator]=set
+
+mkdir A
+touch A/mu
+BUFFER='ls /bin/ / A/mu A/m'
+
+expected_region_highlight=(
+  "1 2 command"                      # ls
+  "4 8 path"                         # /bin/
+  "4 4 path_pathseparator"           # /
+  "8 8 path_pathseparator"           # /
+
+  "10 10 path"                       # /
+  "10 10 path_pathseparator"         # /
+
+  "12 15 path"                       # A/mu
+  "13 13 path_pathseparator"         # /
+
+  "17 19 path_prefix"                # A/m
+  "18 18 path_prefix_pathseparator"  # /
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-separators2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-separators2.zsh
new file mode 100644
index 00000000..bc885a06
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-separators2.zsh
@@ -0,0 +1,40 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# ZSH_HIGHLIGHT_STYLES is empty in tests. The path-separator code however compares its values.
+# For this test, make sure both these styles are set and identical:
+ZSH_HIGHLIGHT_STYLES[path]=value
+ZSH_HIGHLIGHT_STYLES[path_pathseparator]=value
+
+BUFFER='ls /bin/'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 8 path"    # /bin/
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-space.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-space.zsh
new file mode 100644
index 00000000..87cc22f9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-space.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir A
+touch "A/mu with spaces"
+BUFFER='ls A/mu\ with\ spaces'
+
+expected_region_highlight=(
+  "1 2  command" # ls
+  "4 21 path"    # A/mu\ with\ spaces
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home.zsh
new file mode 100644
index 00000000..8b1c6805
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+HOME="."
+BUFFER='ls ~'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 4 path"    # ~
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home2.zsh
new file mode 100644
index 00000000..3f7b8200
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home2.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+HOME="/nonexistent"
+BUFFER='ls ~'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 4 default"    # ~
+)
+
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home3.zsh
new file mode 100644
index 00000000..5c076e88
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-home3.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+HOME="."
+BUFFER='ls \~'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 5 default"    # \~
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-named.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-named.zsh
new file mode 100644
index 00000000..335b3fdf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path-tilde-named.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir mydir
+touch mydir/path-tilde-named.test
+hash -d D=mydir
+
+BUFFER='ls ~D/path-tilde-named.test'
+
+expected_region_highlight=(
+  "1 2  command" # ls
+  "4 27 path"    # ~D/path-tilde-named.test
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path.zsh
new file mode 100644
index 00000000..d387eff3
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+mkdir A
+touch A/mu
+BUFFER='ls A/mu'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 7 path"     # A/mu
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix.zsh
new file mode 100644
index 00000000..3303bfb4
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Assumes that '/bin/sh' exists and '/bin/s' does not exist.
+# Related to path_prefix2.zsh
+
+BUFFER='ls /bin/s'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 9 path_prefix" # /bin/s
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix2.zsh
new file mode 100644
index 00000000..4f40f7e9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix2.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Assumes that '/bin/sh' exists and '/bin/s' does not exist.
+# Related to path_prefix.zsh
+
+BUFFER='ls /bin/s'
+WIDGET=zle-line-finish
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 9 default" # /bin/s
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix3.zsh
new file mode 100644
index 00000000..9f34f943
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/path_prefix3.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Assumes that '/bin/sh' exists and '/bin/s' does not exist.
+# Related to path_prefix.zsh
+
+PREBUFFER=$'ls \\\n'
+BUFFER='/bin/s'
+
+expected_region_highlight=(
+  '1 6 path_prefix' # /bin/s
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/plain-file-in-command-position.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/plain-file-in-command-position.zsh
new file mode 100644
index 00000000..141fface
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/plain-file-in-command-position.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch foo
+chmod -x foo
+BUFFER=$'./foo; ./foo'
+
+expected_region_highlight=(
+  '1 5 unknown-token' # ./foo (in middle)
+  '6 6 commandseparator' # ;
+  '8 12 unknown-token' # ./foo (at end)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-killing1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-killing1.zsh
new file mode 100644
index 00000000..75983460
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-killing1.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash sudo=false
+touch foo
+
+BUFFER='sudo -e ./foo'
+
+expected_region_highlight=(
+  '1 4 precommand' # sudo
+  '6 7 single-hyphen-option' # -e
+  '9 13 path' # ./foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-killing2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-killing2.zsh
new file mode 100644
index 00000000..bc6fc866
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-killing2.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash sudo=false
+
+BUFFER='sudo -e /does/not/exist'
+
+expected_region_highlight=(
+  '1 4 precommand' # sudo
+  '6 7 single-hyphen-option' # -e
+  '9 23 default' # /does/not/exist
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-then-assignment.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-then-assignment.zsh
new file mode 100644
index 00000000..f0bb75ff
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-then-assignment.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'nice x=y ls'
+
+expected_region_highlight=(
+  '1 4 precommand' # nice
+  '6 8 unknown-token "issue #641.5"' # x=y
+  '10 11 default "issue #641.5 (fallout)"' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type1.zsh
new file mode 100644
index 00000000..4ce817c2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type1.zsh
@@ -0,0 +1,61 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Test the behaviour of a builtin that exists as a command as well.
+# The spaces in $BUFFER are to align precommand-type*.zsh test files.
+BUFFER=$'test  ; builtin test  ; builtin command test  ; nice test  '
+
+# Our expectations assumes that a 'test' external command exists (in addition
+# to the 'test' builtin).  Let's verify that, using the EQUALS option (which
+# is on by default).  If there's no 'test' command, the expansion will fail,
+# diagnose a message on stdout, and the harness will detect a failure.
+#
+# This seems to work on all platforms, insofar as no one ever reported a bug
+# about their system not having a 'test' binary in PATH.  That said, if someone
+# ever does see this test fail for this reason, we should explicitly create
+# a 'test' executable in cwd and 'rehash'.
+: =test
+
+expected_region_highlight=(
+  '1 4 builtin' # test
+  '7 7 commandseparator' # ;
+
+  '9 15 precommand' # builtin
+  '17 20 builtin' # test
+  '23 23 commandseparator' # ;
+
+  '25 31 precommand' # builtin
+  '33 39 precommand' # command
+  '41 44 command "issue #608"' # test
+  '47 47 commandseparator' # ;
+
+  '49 52 precommand' # nice
+  '54 57 command "issue #608"' # test
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type2.zsh
new file mode 100644
index 00000000..bf75f4b5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type2.zsh
@@ -0,0 +1,55 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Test the behaviour of a builtin that does not exist as a command.
+# The spaces in $BUFFER are to align precommand-type*.zsh test files.
+BUFFER=$'zstyle; builtin zstyle; builtin command zstyle; nice zstyle'
+
+# Verify that no $^path/zstyle(N) binary exists.
+if (disable zstyle; type zstyle >/dev/null); then
+  echo >&2 "precommand-type2: error: 'zstyle' exists not only as a builtin"
+fi
+
+expected_region_highlight=(
+  '1 6 builtin' # zstyle
+  '7 7 commandseparator' # ;
+
+  '9 15 precommand' # builtin
+  '17 22 builtin' # zstyle
+  '23 23 commandseparator' # ;
+
+  '25 31 precommand' # builtin
+  '33 39 precommand' # command
+  '41 46 unknown-token "issue #608"' # zstyle
+  '47 47 commandseparator' # ;
+
+  '49 52 precommand' # nice
+  '54 59 unknown-token "issue #608"' # zstyle
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type3.zsh
new file mode 100644
index 00000000..7fc7e4c5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-type3.zsh
@@ -0,0 +1,55 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Test an external command that does not exist as a builtin.
+# The spaces in $BUFFER are to align precommand-type*.zsh test files.
+BUFFER=$'ls    ; builtin ls    ; builtin command ls    ; nice ls    '
+
+# Verify that the 'ls' command isn't shadowed.
+if [[ $(type -w ls) != "ls: command" ]]; then
+  echo >&2 "precommand-type3: error: the 'ls' command is shadowed (or possibly missing altogether)"
+fi
+
+expected_region_highlight=(
+  '1 2 command' # ls
+  '7 7 commandseparator' # ;
+
+  '9 15 precommand' # builtin
+  '17 18 unknown-token "issue #608"' # ls
+  '23 23 commandseparator' # ;
+
+  '25 31 precommand' # builtin
+  '33 39 precommand' # command
+  '41 42 command' # ls
+  '47 47 commandseparator' # ;
+
+  '49 52 precommand' # nice
+  '54 55 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-uninstalled.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-uninstalled.zsh
new file mode 100644
index 00000000..03c8a75a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-uninstalled.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Simulate sudo not being installed.
+#
+# The 'hash' step is because, if sudo _really_ isn't installed, 'unhash sudo'
+# would error out and break the test.
+hash sudo=/usr/bin/env && unhash sudo
+
+local PATH
+
+BUFFER=$'sudo ls'
+
+expected_region_highlight=(
+  '1 4 unknown-token' # sudo
+  '6 7 default' # ls - not 'command', since sudo isn't installed
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-unknown-option.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-unknown-option.zsh
new file mode 100644
index 00000000..6baf9ff5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand-unknown-option.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+sudo(){}
+
+BUFFER='sudo -ux ls; sudo -x ls'
+
+expected_region_highlight=(
+  '1 4 precommand' # sudo
+  '6 8 single-hyphen-option' # -ux
+  '10 11 command' # ls
+  '12 12 commandseparator' # ;
+  '14 17 precommand' # sudo
+  '19 20 single-hyphen-option' # -x
+  '22 23 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand.zsh
new file mode 100644
index 00000000..a03b3317
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': command zzzzzz'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 9 default" # not precommand
+  "11 16 default" # not unknown-token (since 'zzzzzz' is not a command)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand2.zsh
new file mode 100644
index 00000000..75dceabe
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand2.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='command -v ls'
+
+expected_region_highlight=(
+  "1 7 precommand" # command
+  "9 10 single-hyphen-option" # -v
+  "12 13 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand3.zsh
new file mode 100644
index 00000000..f8b0c780
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand3.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='nice -n10 ls; nice -n 10 ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # nice
+  "6 9 single-hyphen-option" # -n10
+  "11 12 command" # ls
+  "13 13 commandseparator" # ;
+  "15 18 precommand" # nice
+  "20 21 single-hyphen-option" # -n
+  "23 24 default" # 10
+  "26 27 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand4.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand4.zsh
new file mode 100644
index 00000000..b9e6119d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/precommand4.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+doas(){}
+BUFFER=$'doas -nu phy1729 ls'
+
+expected_region_highlight=(
+  '1 4 precommand' # doas
+  '6 8 single-hyphen-option' # -nu
+  '10 16 default' # phy1729
+  '18 19 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/prefix-redirection.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/prefix-redirection.zsh
new file mode 100644
index 00000000..a0f0ed5a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/prefix-redirection.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='>/tmp >/tmp command echo >/tmp foo'
+
+expected_region_highlight=(
+  "1  1  redirection" # >
+  "2  5  path"       # /tmp
+  "7  7  redirection" # >
+  "8  11 path"       # /tmp
+  "13 19 precommand" # command
+  "21 24 builtin"    # echo
+  "26 26 redirection" # >
+  "27 30 path"       # /tmp
+  "32 34 default"    # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution-after-redirection.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution-after-redirection.zsh
new file mode 100644
index 00000000..2d58016f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution-after-redirection.zsh
@@ -0,0 +1,46 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017, 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'< <(pwd) > >(nl)'
+
+expected_region_highlight=(
+  '1 1 redirection' # <
+  '3 8 default' # <(pwd)
+  '3 8 process-substitution' # <(pwd)
+  '3 4 process-substitution-delimiter' # <(
+  '5 7 builtin' # pwd
+  '8 8 process-substitution-delimiter' # )
+  '10 10 redirection' # >
+  '12 16 default' # >(nl)
+  '12 16 process-substitution' # >(nl)
+  '12 13 process-substitution-delimiter' # >(
+  '14 15 command' # nl
+  '16 16 process-substitution-delimiter' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution-redirection-isnt-globbing.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution-redirection-isnt-globbing.zsh
new file mode 100644
index 00000000..f8dbd6ba
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution-redirection-isnt-globbing.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': =(<foo)'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 9 default' # =(<foo)
+  '3 9 process-substitution' # =(<foo)
+  '3 4 process-substitution-delimiter' # =(
+  '5 5 redirection' # <foo
+  '6 8 default' # foo
+  '9 9 process-substitution-delimiter' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution.zsh
new file mode 100644
index 00000000..26600347
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution.zsh
@@ -0,0 +1,43 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': --foo=<(echo bar) "<(:)"'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 19 double-hyphen-option' # --foo=<(echo bar)
+  '9 19 process-substitution' # <(echo bar)
+  '9 10 process-substitution-delimiter' # <(
+  '11 14 builtin' # echo
+  '16 18 default' # bar
+  '19 19 process-substitution-delimiter' # )
+  '21 26 default' # "<(:)"
+  '21 26 double-quoted-argument' # "<(:)"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution2.zsh
new file mode 100644
index 00000000..cc550902
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/process-substitution2.zsh
@@ -0,0 +1,51 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo =(:) a=(:) =(echo foo'
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 9 default' # =(:)
+  '6 9 process-substitution' # =(:)
+  '6 7 process-substitution-delimiter' # =(
+  '8 8 builtin' # :
+  '9 9 process-substitution-delimiter' # )
+  '11 15 default' # a=(:)
+  '17 26 default' # =(echo foo
+  '17 26 process-substitution' # =(echo foo
+  '17 18 process-substitution-delimiter' # =(
+  '19 22 builtin' # echo
+  '24 26 default' # foo
+)
+
+if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
+  expected_region_highlight[8]='17 27 default' # =(echo foo
+  expected_region_highlight[9]='17 27 process-substitution' # =(echo foo
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/quoted-command-substitution-empty.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/quoted-command-substitution-empty.zsh
new file mode 100644
index 00000000..daf3738b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/quoted-command-substitution-empty.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='echo "foo$( '
+
+expected_region_highlight=(
+  '1 4 builtin' # echo
+  '6 12 default' # "foo$(
+  '6 9 double-quoted-argument-unclosed' # "foo
+  '10 12 command-substitution-quoted' # $(
+  '10 11 command-substitution-delimiter-quoted' # $(
+)
+
+if [[ ${(z):-'$('} == '$( ' ]]; then # ignore zsh 5.0.8 bug
+  expected_region_highlight[2]='6 13 default' # "foo$(
+  expected_region_highlight[4]='10 13 command-substitution-quoted' # $(
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/quoted-redirection-in-command-word.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/quoted-redirection-in-command-word.zsh
new file mode 100644
index 00000000..b1a79e10
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/quoted-redirection-in-command-word.zsh
@@ -0,0 +1,37 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'">" foo ls'
+
+expected_region_highlight=(
+  '1 3 unknown-token' # ">" - not "redirection"
+  '5 7 default' # foo
+  '9 10 default' # ls - not "command"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/rc-quotes.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/rc-quotes.zsh
new file mode 100644
index 00000000..8cd427ae
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/rc-quotes.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt RC_QUOTES
+
+BUFFER=": 'foo''bar'baz"
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 15 default" # 'foo''bar'baz
+  "3 12 single-quoted-argument" # 'foo''bar'
+  "7 8 rc-quote" # ''
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-all.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-all.zsh
new file mode 100644
index 00000000..e8ffb5dd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-all.zsh
@@ -0,0 +1,95 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2024 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': <foo 9<foo <>foo 9<>foo >foo 9>foo >|foo >\!foo >>foo >>|foo >>\!foo <<<foo <&9 >&9 <&- >&- <&p >&p >&foo &>foo >&|foo >&\!foo &>|foo &>\!foo >>&foo &>>foo >>&|foo >>&\!foo &>>|foo &>>\!foo'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 redirection' # <
+  '4 6 default' # foo
+  '8 9 redirection' # 9<
+  '10 12 default' # foo
+  '14 15 redirection' # <>
+  '16 18 default' # foo
+  '20 22 redirection' # 9<>
+  '23 25 default' # foo
+  '27 27 redirection' # >
+  '28 30 default' # foo
+  '32 33 redirection' # 9>
+  '34 36 default' # foo
+  '38 39 redirection' # >|
+  '40 42 default' # foo
+  '44 45 redirection' # >\!
+  '46 48 default' # foo
+  '50 51 redirection' # >>
+  '52 54 default' # foo
+  '56 58 redirection' # >>|
+  '59 61 default' # foo
+  '63 65 redirection' # >>\!
+  '66 68 default' # foo
+  '70 72 redirection' # <<<
+  '73 75 default' # foo
+  '77 78 redirection' # <&
+  '79 79 numeric-fd' # 9
+  '81 82 redirection' # >&
+  '83 83 numeric-fd' # 9
+  '85 86 redirection' # <&
+  '87 87 redirection' # -
+  '89 90 redirection' # >&
+  '91 91 redirection' # -
+  '93 94 redirection' # <&
+  '95 95 redirection' # p
+  '97 98 redirection' # >&
+  '99 99 redirection' # p
+  '101 102 redirection' # >&
+  '103 105 default' # foo
+  '107 108 redirection' # &>
+  '109 111 default' # foo
+  '113 115 redirection' # >&|
+  '116 118 default' # foo
+  '120 122 redirection' # >&\!
+  '123 125 default' # foo
+  '127 129 redirection' # &>|
+  '130 132 default' # foo
+  '134 136 redirection' # &>\!
+  '137 139 default' # foo
+  '141 143 redirection' # >>&
+  '144 146 default' # foo
+  '148 150 redirection' # &>>
+  '151 153 default' # foo
+  '155 158 redirection' # >>&|
+  '159 161 default' # foo
+  '163 166 redirection' # >>&\!
+  '167 169 default' # foo
+  '171 174 redirection' # &>>|
+  '175 177 default' # foo
+  '179 182 redirection' # &>>\!
+  '183 185 default' # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-comment.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-comment.zsh
new file mode 100644
index 00000000..a019100c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-comment.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+setopt interactive_comments
+
+BUFFER=': <<#foo'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 4 redirection" # <<
+  "5 8 comment" # #foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-from-param.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-from-param.zsh
new file mode 100644
index 00000000..42ae6380
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-from-param.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+touch file
+local fn=$PWD/file
+
+BUFFER=$'<$fn cat'
+
+expected_region_highlight=(
+  '1 1 redirection' # <
+  '2 4 path' # $fn
+  '6 8 command' # cat
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-in-cmdsubst.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-in-cmdsubst.zsh
new file mode 100644
index 00000000..ed5eaef8
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-in-cmdsubst.zsh
@@ -0,0 +1,41 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': $(<foo)'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 9 default' # $(<foo)
+  '3 9 command-substitution-unquoted' # $(<foo)
+  '3 4 command-substitution-delimiter-unquoted' # $(
+  '5 5 redirection' # <
+  '6 8 default' # foo
+  '9 9 command-substitution-delimiter-unquoted' # )
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-inhibits-elision.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-inhibits-elision.zsh
new file mode 100644
index 00000000..c0ca2674
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-inhibits-elision.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'<$foo cat cat'
+
+expected_region_highlight=(
+  '1 1 redirection' # <
+  '2 5 default' # $foo
+  '7 9 command' # cat
+  '11 13 default' # cat
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-is-not-option.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-is-not-option.zsh
new file mode 100644
index 00000000..671f21e7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-is-not-option.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$': > -x >> --yy'
+
+expected_region_highlight=(
+  '1 1 builtin' # :
+  '3 3 redirection' # >
+  '5 6 default' # -x
+  '8 9 redirection' # >>
+  '11 14 default' # --yy
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-special-cases.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-special-cases.zsh
new file mode 100644
index 00000000..733cf6bd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection-special-cases.zsh
@@ -0,0 +1,44 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See xpandredir() in the zsh source.
+
+BUFFER=$'cat <&p; exec {myfd}>&-'
+
+expected_region_highlight=(
+  '1 3 command' # cat
+  '5 6 redirection' # <&
+  '7 7 redirection' # p
+  '8 8 commandseparator' # ;
+  '10 13 precommand' # exec
+  '15 20 named-fd' # {myfd}
+  '21 22 redirection' # >&
+  '23 23 redirection' # -
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection.zsh
new file mode 100644
index 00000000..6a25971a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Redirection before and after the command word are implemented differently; test both.
+BUFFER='<<<foo echo >>&!bar'
+
+expected_region_highlight=(
+  "1 3 redirection" # <<<
+  "4 6 default" # foo
+  "8 11 builtin" # echo
+  "13 16 redirection" # >>&!
+  "17 19 default" # bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection2.zsh
new file mode 100644
index 00000000..d44c8e7a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection2.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ls >(wc) | nl'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+  "4 8 default" # >(wc)
+  "4 8 process-substitution" # >(wc)
+  "4 5 process-substitution-delimiter" # >(
+  "6 7 command" # wc
+  "8 8 process-substitution-delimiter" # )
+  "10 10 commandseparator" # |
+  "12 13 command" # nl
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection3.zsh
new file mode 100644
index 00000000..bf062cfb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/redirection3.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=': >>>; : <>\<<<<EOF'
+
+expected_region_highlight=(
+  "1 1 builtin" # :
+  "3 4 redirection" # >>
+  "5 5 unknown-token" # >
+  "6 6 commandseparator" # ;
+  "8 8 builtin" # :
+  "10 11 redirection" # <>
+  "12 13 default" # \<
+  "14 16 redirection" # <<<
+  "17 19 default" # EOF
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/reserved-word.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/reserved-word.zsh
new file mode 100644
index 00000000..aca3796d
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/reserved-word.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='repeat "1" do done'
+
+expected_region_highlight=(
+  "1 6 reserved-word" # repeat
+  "8 10 default" # "1"
+  "8 10 double-quoted-argument" # "1"
+  "12 13 reserved-word" # do
+  "15 18 reserved-word" # done
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/simple-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/simple-command.zsh
new file mode 100644
index 00000000..8bb41fd0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/simple-command.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ls'
+
+expected_region_highlight=(
+  "1 2 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/simple-redirection.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/simple-redirection.zsh
new file mode 100644
index 00000000..fb06f19c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/simple-redirection.zsh
@@ -0,0 +1,38 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='id bob | grep java'
+
+expected_region_highlight=(
+  "1  2  command" # ps
+  "4  6  default" # aux
+  "8  8  commandseparator" # |
+  "10 13 command" # grep
+  "15 18 default" # java
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/subshell.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/subshell.zsh
new file mode 100644
index 00000000..c068013e
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/subshell.zsh
@@ -0,0 +1,51 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='tar cf - * | (cd /target; tar xfp -) | { cat }'
+
+expected_region_highlight=(
+  "1 3 command" # tar
+  "5 6 default" # cf
+  "8 8 single-hyphen-option" # -
+  "10 10 default" # *
+  "10 10 globbing" # *
+  "12 12 commandseparator" # |
+  "14 14 reserved-word" # (
+  "15 16 builtin" # cd
+  "18 24 default" # /target
+  "25 25 commandseparator" # ;
+  "27 29 command" # tar
+  "31 33 default" # xfp
+  "35 35 single-hyphen-option" # -
+  "36 36 reserved-word" # )
+  "38 38 commandseparator" # |
+  "40 40 reserved-word" # {
+  "42 44 command" # cat
+  "46 46 reserved-word" # }
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-command.zsh
new file mode 100644
index 00000000..941349a0
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-command.zsh
@@ -0,0 +1,54 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+sudo(){}
+
+# Tests three codepaths:
+# * -i  (no argument)
+# * -C3 (pasted argument)
+# * -u otheruser (non-pasted argument)
+BUFFER='sudo -C3 -u otheruser -i ls /; sudo ; sudo -u ; sudo notacommand'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 8 single-hyphen-option" # -C3
+  "10 11 single-hyphen-option" # -u
+  "13 21 default" # otheruser
+  "23 24 single-hyphen-option" # -i
+  "26 27 command" # ls
+  "29 29 path" # /
+  "30 30 commandseparator" # ;
+  "32 35 precommand" # sudo
+  "37 37 unknown-token" # ;, error because empty command
+  "39 42 precommand" # sudo
+  "44 45 single-hyphen-option" # -u
+  "47 47 unknown-token" # ;, error because incomplete command
+  "49 52 precommand" # sudo
+  "54 64 unknown-token" # notacommand - doesn't falls back to "not a command word" codepath
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-comment.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-comment.zsh
new file mode 100644
index 00000000..74cd905a
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-comment.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+sudo(){}
+
+setopt interactive_comments
+BUFFER='sudo -u # comment'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 7 single-hyphen-option" # -u
+  "9 17 unknown-token" # "# comment" - error because argument missed
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-longopt.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-longopt.zsh
new file mode 100644
index 00000000..ef768bfb
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-longopt.zsh
@@ -0,0 +1,38 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash sudo='false'
+BUFFER='sudo --askpass ls'
+
+expected_region_highlight=(
+  '1 4 precommand' # sudo
+  '6 14 double-hyphen-option' # --askpass
+  '16 17 command' # ls (we don't know whether --askpass takes an argument)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection.zsh
new file mode 100644
index 00000000..c675d7d2
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection.zsh
@@ -0,0 +1,48 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+sudo(){}
+
+BUFFER='sudo -u >/tmp otheruser ls; sudo ls; sudo -i ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 7 single-hyphen-option" # -u
+  "9 9 redirection" # >
+  "10 13 path" # /tmp
+  "15 23 default" # otheruser
+  "25 26 command" # ls
+  "27 27 commandseparator" # ;
+  "29 32 precommand" # sudo
+  "34 35 command" # ls
+  "36 36 commandseparator" # ;
+  "38 41 precommand" # sudo
+  "43 44 single-hyphen-option" # -i
+  "46 47 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection2.zsh
new file mode 100644
index 00000000..23ada53c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection2.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+sudo(){}
+
+BUFFER='sudo >/tmp -u otheruser ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 6 redirection" # >
+  "7 10 path" # /tmp
+  "12 13 single-hyphen-option" # -u
+  "15 23 default" # otheruser
+  "25 26 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection3.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection3.zsh
new file mode 100644
index 00000000..80e55b55
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/sudo-redirection3.zsh
@@ -0,0 +1,41 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+sudo(){}
+
+BUFFER='sudo 2>./. -u otheruser ls'
+
+expected_region_highlight=(
+  "1 4 precommand" # sudo
+  "6 7 redirection" # 2>
+  "8 10 path" # ./. # a 3-character path, for alignment with sudo-redirection2.zsh
+  "12 13 single-hyphen-option" # -u
+  "15 23 default" # otheruser
+  "25 26 command" # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/tilde-command-word.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/tilde-command-word.zsh
new file mode 100644
index 00000000..67c996c9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/tilde-command-word.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+hash -d D=/usr/bin
+
+BUFFER='~D/env foo'
+
+expected_region_highlight=(
+  "1 6  command" # ~D/env [= /usr/bin/env
+  "8 10 default" # foo
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/time-and-nocorrect1.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/time-and-nocorrect1.zsh
new file mode 100644
index 00000000..fb398edf
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/time-and-nocorrect1.zsh
@@ -0,0 +1,39 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'time ls; nocorrect ls'
+
+expected_region_highlight=(
+  '1 4 reserved-word' # time
+  '6 7 command' # ls
+  '8 8 commandseparator' # ;
+  '10 18 reserved-word' # nocorrect
+  '20 21 command' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/time-and-nocorrect2.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/time-and-nocorrect2.zsh
new file mode 100644
index 00000000..5549ee92
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/time-and-nocorrect2.zsh
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2019 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER=$'time ls; nocorrect ls'
+alias time=':' nocorrect=':'
+
+expected_region_highlight=(
+  '1 4 alias' # time
+  '6 7 default' # ls
+  '8 8 commandseparator' # ;
+  '10 18 alias' # nocorrect
+  '20 21 default' # ls
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/unbackslash.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/unbackslash.zsh
new file mode 100644
index 00000000..c8dfbd4c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/unbackslash.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='\sh'
+
+expected_region_highlight=(
+  "1 3 command" # \sh (runs 'sh', bypassing aliases)
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/unknown-command.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/unknown-command.zsh
new file mode 100644
index 00000000..e71faec5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/unknown-command.zsh
@@ -0,0 +1,34 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='azertyuiop'
+
+expected_region_highlight=(
+  "1  10  unknown-token" # azertyuiop
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/vanilla-newline.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/vanilla-newline.zsh
new file mode 100644
index 00000000..bd60ad4c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/vanilla-newline.zsh
@@ -0,0 +1,39 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+PREBUFFER=$'echo foo; echo bar\n\n\n'
+BUFFER=' echo baz; echo qux'
+
+expected_region_highlight=(
+  "2 5 builtin" # echo
+  "7 9 default" # baz
+  "10 10 commandseparator" # semicolon
+  "12 15 builtin" # echo
+  "17 19 default" # qux
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/vi-linewise-mode.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/vi-linewise-mode.zsh
new file mode 100644
index 00000000..7003c49c
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/main/test-data/vi-linewise-mode.zsh
@@ -0,0 +1,43 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# See issue #267 for the magic numbers
+BUFFER=$'foo foo\nbar bar'
+REGION_ACTIVE=2
+CURSOR=4
+MARK=12
+
+expected_region_highlight=(
+  "1 3 unknown-token" # foo
+  "5 7 default" # foo
+  "8 8 commandseparator" # \n
+  "9 11 unknown-token" # bar
+  "13 15 default" # bar
+  "1 15 standout" # foo foo\nbar bar
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/README.md
new file mode 120000
index 00000000..5ff00e64
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/pattern.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/pattern-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/pattern-highlighter.zsh
new file mode 100644
index 00000000..e0422d08
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/pattern-highlighter.zsh
@@ -0,0 +1,60 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# List of keyword and color pairs.
+typeset -gA ZSH_HIGHLIGHT_PATTERNS
+
+# Whether the pattern highlighter should be called or not.
+_zsh_highlight_highlighter_pattern_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# Pattern syntax highlighting function.
+_zsh_highlight_highlighter_pattern_paint()
+{
+  setopt localoptions extendedglob
+  local pattern
+  for pattern in ${(k)ZSH_HIGHLIGHT_PATTERNS}; do
+    _zsh_highlight_pattern_highlighter_loop "$BUFFER" "$pattern"
+  done
+}
+
+_zsh_highlight_pattern_highlighter_loop()
+{
+  # This does *not* do its job syntactically, sorry.
+  local buf="$1" pat="$2"
+  local -a match mbegin mend
+  local MATCH; integer MBEGIN MEND
+  if [[ "$buf" == (#b)(*)(${~pat})* ]]; then
+    region_highlight+=("$((mbegin[2] - 1)) $mend[2] $ZSH_HIGHLIGHT_PATTERNS[$pat], memo=zsh-syntax-highlighting")
+    "$0" "$match[1]" "$pat"; return $?
+  fi
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/test-data/rm-rf.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/test-data/rm-rf.zsh
new file mode 100644
index 00000000..2f769294
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/pattern/test-data/rm-rf.zsh
@@ -0,0 +1,36 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_PATTERNS+=('rm -rf *' 'fg=white,bold,bg=red')
+
+BUFFER='rm -rf /'
+
+expected_region_highlight=(
+  "1 8 fg=white,bold,bg=red" # rm -rf /
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/README.md
new file mode 120000
index 00000000..9f2522d5
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/regexp.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/regexp-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/regexp-highlighter.zsh
new file mode 100644
index 00000000..0d43aacd
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/regexp-highlighter.zsh
@@ -0,0 +1,62 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# List of keyword and color pairs.
+typeset -gA ZSH_HIGHLIGHT_REGEXP
+
+# Whether the pattern highlighter should be called or not.
+_zsh_highlight_highlighter_regexp_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# Pattern syntax highlighting function.
+_zsh_highlight_highlighter_regexp_paint()
+{
+  setopt localoptions extendedglob
+  local pattern
+  for pattern in ${(k)ZSH_HIGHLIGHT_REGEXP}; do
+    _zsh_highlight_regexp_highlighter_loop "$BUFFER" "$pattern"
+  done
+}
+
+_zsh_highlight_regexp_highlighter_loop()
+{
+  local buf="$1" pat="$2"
+  integer OFFSET=0
+  local MATCH; integer MBEGIN MEND
+  local -a match mbegin mend
+  while true; do
+    [[ "$buf" =~ "$pat" ]] || return;
+    region_highlight+=("$((MBEGIN - 1 + OFFSET)) $((MEND + OFFSET)) $ZSH_HIGHLIGHT_REGEXP[$pat], memo=zsh-syntax-highlighting")
+    buf="$buf[$(($MEND+1)),-1]"
+    OFFSET=$((MEND+OFFSET));
+  done
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/complex.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/complex.zsh
new file mode 100644
index 00000000..4e0089b9
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/complex.zsh
@@ -0,0 +1,37 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+ZSH_HIGHLIGHT_REGEXP+=('[0-9\+\-]+' 'fg=white,bold,bg=red')
+
+BUFFER='echo 1+9-3 7+2'
+
+expected_region_highlight=(
+  "6 10 fg=white,bold,bg=red"
+  "12 14 fg=white,bold,bg=red"
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/subexpression.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/subexpression.zsh
new file mode 100644
index 00000000..308cb413
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/subexpression.zsh
@@ -0,0 +1,36 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2018 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+BUFFER='ls foo'
+ZSH_HIGHLIGHT_REGEXP=('(^| )(ls|cd)($| )' 'fg=green')
+
+expected_region_highlight=(
+  '1 3 fg=green' # "ls "
+)
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/word-boundary.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/word-boundary.zsh
new file mode 100644
index 00000000..1f4f6665
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/regexp/test-data/word-boundary.zsh
@@ -0,0 +1,42 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+if zmodload zsh/pcre 2>/dev/null; then
+  setopt RE_MATCH_PCRE
+
+  ZSH_HIGHLIGHT_REGEXP+=('\bsudo\b' 'fg=white,bold,bg=red')
+
+  BUFFER='sudo ls'
+
+  expected_region_highlight=(
+    "1 4 fg=white,bold,bg=red"
+  )
+else
+  skip_test='Test requires zsh/pcre'
+fi
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/root/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/root/README.md
new file mode 120000
index 00000000..ca6799d6
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/root/README.md
@@ -0,0 +1 @@
+../../docs/highlighters/root.md
\ No newline at end of file
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/root/root-highlighter.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/root/root-highlighter.zsh
new file mode 100644
index 00000000..3718c449
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/highlighters/root/root-highlighter.zsh
@@ -0,0 +1,44 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Define default styles.
+: ${ZSH_HIGHLIGHT_STYLES[root]:=standout}
+
+# Whether the root highlighter should be called or not.
+_zsh_highlight_highlighter_root_predicate()
+{
+  _zsh_highlight_buffer_modified
+}
+
+# root highlighting function.
+_zsh_highlight_highlighter_root_paint()
+{
+  if (( EUID == 0 )) { _zsh_highlight_add_highlight 0 $#BUFFER root }
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after1-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after1-smaller.png
new file mode 100644
index 00000000..768294c3
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after1-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after1.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after1.png
new file mode 100644
index 00000000..ea378d3e
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after1.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after2-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after2-smaller.png
new file mode 100644
index 00000000..8b5b1f8f
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after2-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after2.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after2.png
new file mode 100644
index 00000000..ddcbfad7
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after2.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after3-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after3-smaller.png
new file mode 100644
index 00000000..d6aaa7bd
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after3-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after3.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after3.png
new file mode 100644
index 00000000..7a0af887
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after3.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after4-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after4-smaller.png
new file mode 100644
index 00000000..fc946cf0
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/after4-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before1-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before1-smaller.png
new file mode 100644
index 00000000..b29551ea
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before1-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before1.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before1.png
new file mode 100644
index 00000000..80c6f54f
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before1.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before2-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before2-smaller.png
new file mode 100644
index 00000000..991a716d
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before2-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before2.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before2.png
new file mode 100644
index 00000000..48cfc327
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before2.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before3-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before3-smaller.png
new file mode 100644
index 00000000..e525c6d4
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before3-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before3.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before3.png
new file mode 100644
index 00000000..40c36015
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before3.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before4-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before4-smaller.png
new file mode 100644
index 00000000..2dbd0588
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/before4-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/preview-smaller.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/preview-smaller.png
new file mode 100644
index 00000000..6fb84d18
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/preview-smaller.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/preview.png b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/preview.png
new file mode 100644
index 00000000..545cc511
Binary files /dev/null and b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/images/preview.png differ
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/release.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/release.md
new file mode 100644
index 00000000..f8565e81
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/release.md
@@ -0,0 +1,21 @@
+# Release procedure (for developers):
+
+- Ensure every `is-at-least` invocation passes a stable zsh release's version number as the first argument
+- For minor (A.B.0) releases:
+  - Check whether the release uses any not-yet-released zsh features
+- Check open issues and outstanding pull requests
+- Confirm `make test` passes
+  - check with multiple zsh versions
+    (easiest to check GitHub Actions: https://github.com/zsh-users/zsh-syntax-highlighting/actions)
+- Update changelog.md
+  `tig --abbrev=12  --abbrev-commit 0.4.1..upstream/master`
+- Make sure there are no local commits and that `git status` is clean;
+  Remove `-dev` suffix from `./.version`;
+  Commit that using `git commit -m "Tag version $(<.version)." .version`;
+  Tag it using `git tag -s -m "Tag version $(<.version)" $(<.version)`;
+  Increment `./.version` and restore the `-dev` suffix;
+  Commit that using `git commit -C b5c30ae52638e81a38fe5329081c5613d7bd6ca5 .version`.
+- Push with `git push && git push --tags`
+- Notify downstreams (OS packages)
+  - anitya should autodetect the tag
+- Update /topic on IRC
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/README.md b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/README.md
new file mode 100644
index 00000000..eefeb543
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/README.md
@@ -0,0 +1,124 @@
+zsh-syntax-highlighting / tests
+===============================
+
+Utility scripts for testing zsh-syntax-highlighting highlighters.
+
+The tests harness expects the highlighter directory to contain a `test-data`
+directory with test data files.
+See the [main highlighter](../highlighters/main/test-data) for examples.
+
+Tests should set the following variables:
+
+1.
+Each test should define the string `$BUFFER` that is to be highlighted and the
+array parameter `$expected_region_highlight`.
+The value of that parameter is a list of strings of the form  `"$i $j $style"`.
+or `"$i $j $style $todo"`.
+Each string specifies the highlighting that `$BUFFER[$i,$j]` should have;
+that is, `$i` and `$j` specify a range, 1-indexed, inclusive of both endpoints.
+`$style` is a key of `$ZSH_HIGHLIGHT_STYLES`.
+If `$todo` exists, the test point is marked as TODO (the failure of that test
+point will not fail the test), and `$todo` is used as the explanation.
+
+2. 
+If a test sets `$skip_test` to a non-empty string, the test will be skipped
+with the provided string as the reason.
+
+3. 
+If a test sets `$fail_test` to a non-empty string, the test will be skipped
+with the provided string as the reason.
+
+4.
+If a test sets `unsorted=1` the order of highlights in `$expected_region_highlight`
+need not match the order in `$region_highlight`.
+
+5.
+Normally, tests fail if `$expected_region_highlight` and `$region_highlight`
+have different numbers of elements.  To mark this check as expected to fail,
+tests may set `$expected_mismatch` to an explanation string (like `$todo`);
+this is useful when the only difference between actual and expected is that actual
+has some additional, superfluous elements.  This check is skipped if the
+`$todo` component is present in any regular test point.
+
+**Note**: `$region_highlight` uses the same `"$i $j $style"` syntax but
+interprets the indexes differently.
+
+**Note**: Tests are run with `setopt NOUNSET WARN_CREATE_GLOBAL`, so any
+variables the test creates must be declared local.
+
+**Isolation**: Each test is run in a separate subshell, so any variables,
+aliases, functions, etc., it defines will be visible to the tested code (that
+computes `$region_highlight`), but will not affect subsequent tests.  The
+current working directory of tests is set to a newly-created empty directory,
+which is automatically cleaned up after the test exits. For example:
+
+```zsh
+setopt PATH_DIRS
+mkdir -p foo/bar
+touch foo/bar/testing-issue-228
+chmod  +x foo/bar/testing-issue-228
+path+=( "$PWD"/foo )
+
+BUFFER='bar/testing-issue-228'
+
+expected_region_highlight=(
+  "1 21 command" # bar/testing-issue-228
+)
+```
+
+
+Writing new tests
+-----------------
+
+An experimental tool is available to generate test files:
+
+```zsh
+zsh -f tests/generate.zsh 'ls -x' acme newfile
+```
+
+This generates a `highlighters/acme/test-data/newfile.zsh` test file based on
+the current highlighting of the given `$BUFFER` (in this case, `ls -x`).
+
+_This tool is experimental._  Its interface may change.  In particular it may
+grow ways to set `$PREBUFFER` to inject free-form code into the generated file.
+
+
+Highlighting test
+-----------------
+
+[`test-highlighting.zsh`](tests/test-highlighting.zsh) tests the correctness of
+the highlighting. Usage:
+
+```zsh
+zsh test-highlighting.zsh <HIGHLIGHTER NAME>
+```
+
+All tests may be run with
+
+```zsh
+make test
+```
+
+which will run all highlighting tests and report results in [TAP format][TAP].
+By default, the results of all tests will be printed; to show only "interesting"
+results (tests that failed but were expected to succeed, or vice-versa), run
+`make quiet-test` (or `make test QUIET=y`).
+
+[TAP]: https://testanything.org/
+
+
+Performance test
+----------------
+
+[`test-perfs.zsh`](tests/test-perfs.zsh) measures the time spent doing the
+highlighting. Usage:
+
+```zsh
+zsh test-perfs.zsh <HIGHLIGHTER NAME>
+```
+
+All tests may be run with
+
+```zsh
+make perf
+```
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/edit-failed-tests b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/edit-failed-tests
new file mode 100755
index 00000000..e3a76685
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/edit-failed-tests
@@ -0,0 +1,40 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+type perl sponge >/dev/null || { print -ru2 -- "$0: This script requires perl(1) and sponge(1) [from moreutils]"; exit 1; }
+
+local editor=( "${(@Q)${(z)${VISUAL:-${EDITOR:-vi}}}}" )
+() { 
+  > "$2" perl -nE '$highlighter = $1 if /^Running test (\S*)/; say "highlighters/${highlighter}/test-data/$1.zsh" if /^## (\S*)/' "$1"
+  >>"$2" echo ""
+  >>"$2" cat <"$1"
+  "${editor[@]}" -- "$2"
+} =(${MAKE:-make} quiet-test) =(:)
+# TODO: tee(1) the quiet-test output to /dev/tty as it's happening, with colors.
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/generate.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/generate.zsh
new file mode 100755
index 00000000..56960202
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/generate.zsh
@@ -0,0 +1,117 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2016 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+emulate -LR zsh
+setopt localoptions extendedglob
+
+# Required for add-zle-hook-widget.
+zmodload zsh/zle
+
+# Argument parsing.
+if (( $# * $# - 7 * $# + 12 )) || [[ $1 == -* ]]; then
+  print -r -- >&2 "$0: usage: $0 BUFFER HIGHLIGHTER BASENAME [PREAMBLE]"
+  print -r -- >&2 ""
+  print -r -- >&2 "Generate highlighters/HIGHLIGHTER/test-data/BASENAME.zsh based on the"
+  print -r -- >&2 "current highlighting of BUFFER, using the setup code PREAMBLE."
+  exit 1
+fi
+buffer=$1
+ZSH_HIGHLIGHT_HIGHLIGHTERS=( $2 )
+fname=${0:A:h:h}/highlighters/$2/test-data/${3%.zsh}.zsh
+preamble=${4:-""}
+
+# Load the main script.
+. ${0:A:h:h}/zsh-syntax-highlighting.zsh
+
+# Overwrite _zsh_highlight_add_highlight so we get the key itself instead of the style
+_zsh_highlight_add_highlight()
+{
+  region_highlight+=("$1 $2 $3")
+}
+
+
+# Copyright block
+year="`LC_ALL=C date +%Y`"
+if ! { read -q "?Set copyright year to $year? " } always { echo "" }; then
+  year="YYYY"
+fi
+<$0 sed -n -e '1,/^$/p' | sed -e "s/2[0-9][0-9][0-9]/${year}/" > $fname
+# Assumes stdout is line-buffered
+git add -- $fname
+exec > >(tee -a $fname)
+
+# Preamble
+if [[ -n $preamble ]]; then
+  print -rl -- "$preamble" ""
+fi
+
+# Buffer
+print -n 'BUFFER='
+if [[ $buffer != (#s)[$'\t -~']#(#e) ]]; then
+  print -r -- ${(qqqq)buffer}
+else
+  print -r -- ${(qq)buffer}
+fi
+echo ""
+
+# Expectations
+print 'expected_region_highlight=('
+() {
+  local i
+  local PREBUFFER
+  local BUFFER
+  
+  PREBUFFER=""
+  BUFFER="$buffer"
+  region_highlight=()
+  eval $(
+    exec 3>&1 >/dev/null
+    typeset -r __tests_tmpdir="$(mktemp -d)"
+    {
+      # Use a subshell to ensure $__tests_tmpdir, which is to be rm -rf'd, won't be modified.
+      (cd -- "$__tests_tmpdir" && eval $preamble && _zsh_highlight && typeset -p region_highlight >&3)
+      : # workaround zsh bug workers/45305 with respect to the $(…) subshell we're in
+    } always {
+      rm -rf -- ${__tests_tmpdir}
+    }
+  )
+
+  for ((i=1; i<=${#region_highlight}; i++)); do
+    local -a highlight_zone; highlight_zone=( ${(z)region_highlight[$i]} )
+    integer start=$highlight_zone[1] end=$highlight_zone[2]
+    if (( start < end )) # region_highlight ranges are half-open
+    then
+      (( --end )) # convert to closed range, like expected_region_highlight
+      (( ++start, ++end )) # region_highlight is 0-indexed; expected_region_highlight is 1-indexed
+    fi
+    printf "  %s # %s\n" ${(qq):-"$start $end $highlight_zone[3]"} ${${(qqqq)BUFFER[start,end]}[3,-2]}
+  done
+}
+print ')'
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/tap-colorizer.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/tap-colorizer.zsh
new file mode 100755
index 00000000..f3dc84e7
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/tap-colorizer.zsh
@@ -0,0 +1,71 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015, 2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# This is a stdin-to-stdout filter that takes TAP output (such as 'make test')
+# on stdin and passes it, colorized, to stdout.
+
+emulate -LR zsh
+
+if [[ ! -t 1 ]] ; then
+  exec cat
+fi
+
+while read -r line;
+do
+  case $line in
+    # comment (filename header) or plan
+    (#* | <->..<->)
+      print -nP %F{blue}
+      ;;
+    # SKIP
+    (*# SKIP*)
+      print -nP %F{yellow}
+      ;;
+    # XPASS
+    (ok*# TODO*)
+      print -nP %F{red}
+      ;;
+    # XFAIL
+    (not ok*# TODO*)
+      print -nP %F{yellow}
+      ;;
+    # FAIL
+    (not ok*)
+      print -nP %F{red}
+      ;;
+    # PASS
+    (ok*)
+      print -nP %F{green}
+      ;;
+  esac
+  print -nr - "$line"
+  print -nP %f
+  echo "" # newline
+done
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/tap-filter b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/tap-filter
new file mode 100755
index 00000000..f9aa6041
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/tap-filter
@@ -0,0 +1,47 @@
+#!/usr/bin/env perl
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# vim: ft=perl sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# This is a stdin-to-stdout filter that takes TAP output (such as 'make test')
+# on stdin and deletes lines pertaining to expected results.
+#
+# More specifically, if any of the test points in a test file either failed but
+# was expected to pass, or passed but was expected to fail, then emit that test
+# file's output; else, elide that test file's output.
+
+use v5.10.0;
+use warnings;
+use strict;
+
+undef $/; # slurp mode
+print for
+  grep { /^ok.*# TODO/m or /^not ok(?!.*# TODO)/m or /^Bail out!/m }
+    # Split on plan lines and remove them from the output.  (To keep them,
+    # use the lookahead syntax, «(?=…)», to make the match zero-length.)
+    split /^\d+\.\.\d+$/m,
+      <STDIN>;
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-highlighting.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-highlighting.zsh
new file mode 100755
index 00000000..8b564a8b
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-highlighting.zsh
@@ -0,0 +1,291 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2017 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+setopt NO_UNSET WARN_CREATE_GLOBAL
+
+# Required for add-zle-hook-widget.
+zmodload zsh/zle
+
+local -r root=${0:h:h}
+local -a anon_argv; anon_argv=("$@")
+
+(){
+set -- "${(@)anon_argv}"
+# Check an highlighter was given as argument.
+[[ -n "$1" ]] || {
+  echo >&2 "Bail out! You must provide the name of a valid highlighter as argument."
+  exit 2
+}
+
+# Check the highlighter is valid.
+[[ -f $root/highlighters/$1/$1-highlighter.zsh ]] || {
+  echo >&2 "Bail out! Could not find highlighter ${(qq)1}."
+  exit 2
+}
+
+# Check the highlighter has test data.
+[[ -d $root/highlighters/$1/test-data ]] || {
+  echo >&2 "Bail out! Highlighter ${(qq)1} has no test data."
+  exit 2
+}
+
+# Set up results_filter
+local results_filter
+if [[ ${QUIET-} == y ]]; then
+  if type -w perl >/dev/null; then
+    results_filter=$root/tests/tap-filter
+  else
+    echo >&2 "Bail out! quiet mode not supported: perl not found"; exit 2
+  fi
+else
+  results_filter=cat
+fi
+[[ -n $results_filter ]] || { echo >&2 "Bail out! BUG setting \$results_filter"; exit 2 }
+
+# Load the main script.
+# While here, test that it doesn't eat aliases.
+print > >($results_filter | $root/tests/tap-colorizer.zsh) -r -- "# global (driver) tests"
+print > >($results_filter | $root/tests/tap-colorizer.zsh) -r -- "1..1"
+alias -- +plus=plus
+alias -- _other=other
+local original_alias_dash_L_output="$(alias -L)"
+. $root/zsh-syntax-highlighting.zsh
+if [[ $original_alias_dash_L_output == $(alias -L) ]]; then
+  print -r -- "ok 1 # 'alias -- +foo=bar' is preserved"
+else
+  print -r -- "not ok 1 # 'alias -- +foo=bar' is preserved"
+  exit 1
+fi > >($results_filter | $root/tests/tap-colorizer.zsh)
+
+# Overwrite _zsh_highlight_add_highlight so we get the key itself instead of the style
+_zsh_highlight_add_highlight()
+{
+  region_highlight+=("$1 $2 $3")
+}
+
+# Activate the highlighter.
+ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
+
+# In zsh<5.3, 'typeset -p arrayvar' emits two lines, so we use this wrapper instead.
+typeset_p() {
+  for 1 ; do
+    if [[ ${(tP)1} == *array* ]]; then
+      print -r -- "$1=( ${(@qqqqP)1} )"
+    else
+      print -r -- "$1=${(qqqqP)1}"
+    fi
+  done
+}
+
+# Escape # as ♯ and newline as ↵ they are illegal in the 'description' part of TAP output
+# The string to escape is «"$@"»; the result is returned in $REPLY.
+tap_escape() {
+  local s="${(j. .)@}"
+  REPLY="${${s//'#'/♯}//$'\n'/↵}"
+}
+
+# Runs a highlighting test
+# $1: data file
+run_test_internal() {
+
+  local tests_tempdir="$1"; shift
+  local srcdir="$PWD"
+  builtin cd -q -- "$tests_tempdir" || { echo >&2 "Bail out! On ${(qq)1}: cd failed: $?"; return 1 }
+
+  # Load the data and prepare checking it.
+  local BUFFER CURSOR MARK PENDING PREBUFFER REGION_ACTIVE WIDGET REPLY skip_test fail_test unsorted=0
+  local expected_mismatch
+  local skip_mismatch
+  local -a expected_region_highlight region_highlight
+
+  local ARG="$1"
+  local RETURN=""
+  () {
+    setopt localoptions
+
+    # WARNING: The remainder of this anonymous function will run with the test's options in effect
+    if { ! . "$srcdir"/"$ARG" } || (( $#fail_test )); then
+      print -r -- "1..1"
+      print -r -- "## ${ARG:t:r}"
+      tap_escape $fail_test; fail_test=$REPLY
+      print -r -- "not ok 1 - failed setup: $fail_test"
+      return ${RETURN:=0}
+    fi
+
+    (( $#skip_test )) && {
+      print -r -- "1..0 # SKIP $skip_test"
+      print -r -- "## ${ARG:t:r}"
+      return ${RETURN:=0}
+    }
+
+    # Check the data declares $PREBUFFER or $BUFFER.
+    [[ -z $PREBUFFER && -z $BUFFER ]] && { echo >&2 "Bail out! On ${(qq)ARG}: Either 'PREBUFFER' or 'BUFFER' must be declared and non-blank"; return ${RETURN:=1}; }
+    [[ $PREBUFFER == (''|*$'\n') ]] || { echo >&2 "Bail out! On ${(qq)ARG}: PREBUFFER=${(qqqq)PREBUFFER} doesn't end with a newline"; return ${RETURN:=1}; }
+
+    # Set sane defaults for ZLE variables
+    : ${CURSOR=$#BUFFER} ${PENDING=0} ${WIDGET=z-sy-h-test-harness-test-widget}
+
+    # Process the data.
+    _zsh_highlight
+  }; [[ -z $RETURN ]] || return $RETURN
+  unset ARG
+
+  integer print_expected_and_actual=0
+
+  if (( unsorted )); then
+    region_highlight=("${(@n)region_highlight}")
+    expected_region_highlight=("${(@n)expected_region_highlight}")
+  fi
+
+  # Print the plan line, and some comments for human readers
+  echo "1..$(( $#expected_region_highlight + 1))"
+  echo "## ${1:t:r}" # note: tests/edit-failed-tests looks for the "##" emitted by this line
+  [[ -n $PREBUFFER ]] && printf '# %s\n' "$(typeset_p PREBUFFER)"
+  [[ -n $BUFFER ]] && printf '# %s\n' "$(typeset_p BUFFER)"
+
+  local i
+  for ((i=1; i<=$#expected_region_highlight; i++)); do
+    local -a expected_highlight_zone; expected_highlight_zone=( ${(z)expected_region_highlight[i]} )
+    integer exp_start=$expected_highlight_zone[1] exp_end=$expected_highlight_zone[2]
+    local todo=
+    if (( $+expected_highlight_zone[4] )); then
+      todo="# TODO $expected_highlight_zone[4]"
+      skip_mismatch="cardinality check disabled whilst regular test points are expected to fail"
+    fi
+    if ! (( $+region_highlight[i] )); then
+      print -r -- "not ok $i - unmatched expectation ($exp_start $exp_end $expected_highlight_zone[3])" \
+         "${skip_mismatch:+"# TODO ${(qqq)skip_mismatch}"}"
+      if [[ -z $skip_mismatch ]]; then (( ++print_expected_and_actual )); fi
+      continue
+    fi
+    local -a highlight_zone; highlight_zone=( ${(z)region_highlight[i]} )
+    integer start=$(( highlight_zone[1] + 1 )) end=$highlight_zone[2]
+    local desc="[$start,$end] «${BUFFER[$start,$end]}»"
+    tap_escape $desc; desc=$REPLY
+    if
+      [[ $start != $exp_start ]] ||
+      [[ $end != $exp_end ]] ||
+      [[ ${highlight_zone[3]%,} != ${expected_highlight_zone[3]} ]] # remove the comma that's before the memo field
+    then
+      print -r -- "not ok $i - $desc - expected ($exp_start $exp_end ${(qqq)expected_highlight_zone[3]}), observed ($start $end ${(qqq)highlight_zone[3]}). $todo"
+      if [[ -z $todo ]]; then (( ++print_expected_and_actual )); fi
+    else
+      print -r -- "ok $i - $desc${todo:+ - }$todo"
+    fi
+    unset expected_highlight_zone
+    unset exp_start exp_end
+    unset todo
+    unset highlight_zone
+    unset start end
+    unset desc
+  done
+
+  # If both $skip_mismatch and $expected_mismatch are set, that means the test
+  # has some XFail test points, _and_ explicitly sets $expected_mismatch as
+  # well.  Explicit settings should have priority, so we ignore $skip_mismatch
+  # if $expected_mismatch is set.
+  if [[ -n $skip_mismatch && -z $expected_mismatch ]]; then
+    tap_escape $skip_mismatch; skip_mismatch=$REPLY
+    print "ok $i - cardinality check" "# SKIP $skip_mismatch"
+  else
+    local todo
+    if [[ -n $expected_mismatch ]]; then
+      tap_escape $expected_mismatch; expected_mismatch=$REPLY
+      todo="# TODO $expected_mismatch"
+    fi
+    if (( $#expected_region_highlight == $#region_highlight )); then
+      print -r -- "ok $i - cardinality check${todo:+ - }$todo"
+    else
+      local details
+      details+="have $#expected_region_highlight expectations and $#region_highlight region_highlight entries: "
+      details+="«$(typeset_p expected_region_highlight)» «$(typeset_p region_highlight)»"
+      tap_escape $details; details=$REPLY
+      print -r -- "not ok $i - cardinality check - $details${todo:+ - }$todo"
+      if [[ -z $todo ]]; then (( ++print_expected_and_actual )); fi
+    fi
+  fi
+  if (( print_expected_and_actual )); then
+      () {
+        local -a left_column right_column
+        left_column=( "expected_region_highlight" "${(qq)expected_region_highlight[@]}" )
+        right_column=( "region_highlight" "${(qq)region_highlight[@]}" )
+        integer difference=$(( $#right_column - $#left_column ))
+        repeat $difference do left_column+=(.); done
+        paste \
+          =(print -rC1 -- $left_column) \
+          =(print -rC1 -- $right_column) \
+          | if type column >/dev/null; then column -t -s $'\t'; else cat; fi \
+          | sed 's/^/# /'
+      }
+  fi
+}
+
+# Run a single test file.  The exit status is 1 if the test harness had
+# an error and 0 otherwise.  The exit status does not depend on whether
+# test points succeeded or failed.
+run_test() {
+  # Do not combine the declaration and initialization: «local x="$(false)"» does not set $?.
+  local __tests_tempdir
+  __tests_tempdir="$(mktemp -d)" && [[ -d $__tests_tempdir ]] || {
+    echo >&2 "Bail out! mktemp failed"; return 1
+  }
+  typeset -r __tests_tempdir # don't allow tests to override the variable that we will 'rm -rf' later on
+
+  {
+    # Use a subshell to isolate tests from each other.
+    # (So tests can alter global shell state using 'cd', 'hash', etc)
+    {
+      # These braces are so multios don't come into play.
+      { (run_test_internal "$__tests_tempdir" "$@") 3>&1 >&2 2>&3 } | grep \^
+      local ret=$pipestatus[1] stderr=$pipestatus[2]
+      if (( ! stderr )); then
+        # stdout will become stderr
+        echo "Bail out! On ${(qq)1}: output on stderr"; return 1
+      else
+        return $ret
+      fi
+    } 3>&1 >&2 2>&3
+  } always {
+    rm -rf -- "$__tests_tempdir"
+  }
+}
+
+# Process each test data file in test data directory.
+integer something_failed=0
+ZSH_HIGHLIGHT_STYLES=()
+local data_file
+for data_file in $root/highlighters/$1/test-data/*.zsh; do
+  run_test "$data_file" | tee >($results_filter | $root/tests/tap-colorizer.zsh) | grep -v '^not ok.*# TODO' | grep -Eq '^not ok|^ok.*# TODO' && (( something_failed=1 ))
+  (( $pipestatus[1] )) && exit 2
+done
+
+exit $something_failed
+}
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-perfs.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-perfs.zsh
new file mode 100755
index 00000000..aa139aad
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-perfs.zsh
@@ -0,0 +1,103 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+
+# Required for add-zle-hook-widget.
+zmodload zsh/zle
+
+# Check an highlighter was given as argument.
+[[ -n "$1" ]] || {
+  echo >&2 "Bail out! You must provide the name of a valid highlighter as argument."
+  exit 2
+}
+
+# Check the highlighter is valid.
+[[ -f ${0:h:h}/highlighters/$1/$1-highlighter.zsh ]] || {
+  echo >&2 "Bail out! Could not find highlighter ${(qq)1}."
+  exit 2
+}
+
+# Check the highlighter has test data.
+[[ -d ${0:h:h}/highlighters/$1/test-data ]] || {
+  echo >&2 "Bail out! Highlighter ${(qq)1} has no test data."
+  exit 2
+}
+
+# Load the main script.
+typeset -a region_highlight
+. ${0:h:h}/zsh-syntax-highlighting.zsh
+
+# Activate the highlighter.
+ZSH_HIGHLIGHT_HIGHLIGHTERS=($1)
+
+# Runs a highlighting test
+# $1: data file
+run_test_internal() {
+  local -a highlight_zone
+
+  local tests_tempdir="$1"; shift
+  local srcdir="$PWD"
+  builtin cd -q -- "$tests_tempdir" || { echo >&2 "Bail out! cd failed: $?"; return 1 }
+
+  # Load the data and prepare checking it.
+  PREBUFFER= BUFFER= ;
+  . "$srcdir"/"$1"
+
+  # Check the data declares $PREBUFFER or $BUFFER.
+  [[ -z $PREBUFFER && -z $BUFFER ]] && { echo >&2 "Bail out! Either 'PREBUFFER' or 'BUFFER' must be declared and non-blank"; return 1; }
+
+  # Set $? for _zsh_highlight
+  true && _zsh_highlight
+}
+
+run_test() {
+  # Do not combine the declaration and initialization: «local x="$(false)"» does not set $?.
+  local __tests_tempdir
+  __tests_tempdir="$(mktemp -d)" && [[ -d $__tests_tempdir ]] || {
+    echo >&2 "Bail out! mktemp failed"; return 1
+  }
+  typeset -r __tests_tempdir # don't allow tests to override the variable that we will 'rm -rf' later on
+
+  {
+    (run_test_internal "$__tests_tempdir" "$@")
+  } always {
+    rm -rf -- "$__tests_tempdir"
+  }
+}
+
+# Process each test data file in test data directory.
+local data_file
+TIMEFMT="%*Es"
+{ time (for data_file in ${0:h:h}/highlighters/$1/test-data/*.zsh; do
+  run_test "$data_file"
+  (( $pipestatus[1] )) && exit 2
+done) } 2>&1 || exit $?
+
+exit 0
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-zprof.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-zprof.zsh
new file mode 100755
index 00000000..ada16187
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/tests/test-zprof.zsh
@@ -0,0 +1,78 @@
+#!/usr/bin/env zsh
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2015 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# Load the main script.
+typeset -a region_highlight
+. ${0:h:h}/zsh-syntax-highlighting.zsh
+
+# Activate the highlighter.
+ZSH_HIGHLIGHT_HIGHLIGHTERS=(main)
+
+source_file=0.7.1:highlighters/$1/$1-highlighter.zsh
+
+# Runs a highlighting test
+# $1: data file
+run_test_internal() {
+  setopt interactivecomments
+
+  local -a highlight_zone
+
+  local tests_tempdir="$1"; shift
+  local srcdir="$PWD"
+  builtin cd -q -- "$tests_tempdir" || { echo >&2 "Bail out! cd failed: $?"; return 1 }
+
+  # Load the data and prepare checking it.
+  PREBUFFER=
+  BUFFER=$(cd -- "$srcdir" && git cat-file blob $source_file)
+  expected_region_highlight=()
+
+  zmodload zsh/zprof
+  zprof -c
+  # Set $? for _zsh_highlight
+  true && _zsh_highlight
+  zprof
+}
+
+run_test() {
+  # Do not combine the declaration and initialization: «local x="$(false)"» does not set $?.
+  local __tests_tempdir
+  __tests_tempdir="$(mktemp -d)" && [[ -d $__tests_tempdir ]] || {
+    echo >&2 "Bail out! mktemp failed"; return 1
+  }
+  typeset -r __tests_tempdir # don't allow tests to override the variable that we will 'rm -rf' later on
+
+  {
+    (run_test_internal "$__tests_tempdir" "$@")
+  } always {
+    rm -rf -- "$__tests_tempdir"
+  }
+}
+
+run_test
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
new file mode 100644
index 00000000..f2456aec
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
@@ -0,0 +1,2 @@
+0=${(%):-%N}
+source ${0:A:h}/zsh-syntax-highlighting.zsh
diff --git a/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
new file mode 100644
index 00000000..4295c93f
--- /dev/null
+++ b/gentoo/dotfiles/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
@@ -0,0 +1,587 @@
+# -------------------------------------------------------------------------------------------------
+# Copyright (c) 2010-2020 zsh-syntax-highlighting contributors
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without modification, are permitted
+# provided that the following conditions are met:
+#
+#  * Redistributions of source code must retain the above copyright notice, this list of conditions
+#    and the following disclaimer.
+#  * Redistributions in binary form must reproduce the above copyright notice, this list of
+#    conditions and the following disclaimer in the documentation and/or other materials provided
+#    with the distribution.
+#  * Neither the name of the zsh-syntax-highlighting contributors nor the names of its contributors
+#    may be used to endorse or promote products derived from this software without specific prior
+#    written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+# FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
+# CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER
+# IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
+# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# -------------------------------------------------------------------------------------------------
+# -*- mode: zsh; sh-indentation: 2; indent-tabs-mode: nil; sh-basic-offset: 2; -*-
+# vim: ft=zsh sw=2 ts=2 et
+# -------------------------------------------------------------------------------------------------
+
+# First of all, ensure predictable parsing.
+typeset zsh_highlight__aliases="$(builtin alias -Lm '[^+]*')"
+# In zsh <= 5.2, aliases that begin with a plus sign ('alias -- +foo=42')
+# are emitted by `alias -L` without a '--' guard, so they don't round trip.
+#
+# Hence, we exclude them from unaliasing:
+builtin unalias -m '[^+]*'
+
+# Set $0 to the expected value, regardless of functionargzero.
+0=${(%):-%N}
+if true; then
+  # $0 is reliable
+  typeset -g ZSH_HIGHLIGHT_VERSION=$(<"${0:A:h}"/.version)
+  typeset -g ZSH_HIGHLIGHT_REVISION=$(<"${0:A:h}"/.revision-hash)
+  if [[ $ZSH_HIGHLIGHT_REVISION == \$Format:* ]]; then
+    # When running from a source tree without 'make install', $ZSH_HIGHLIGHT_REVISION
+    # would be set to '$Format:%H$' literally.  That's an invalid value, and obtaining
+    # the valid value (via `git rev-parse HEAD`, as Makefile does) might be costly, so:
+    ZSH_HIGHLIGHT_REVISION=HEAD
+  fi
+fi
+
+# This function takes a single argument F and returns True iff F is an autoload stub.
+_zsh_highlight__function_is_autoload_stub_p() {
+  if zmodload -e zsh/parameter; then
+    #(( ${+functions[$1]} )) &&
+    [[ "$functions[$1]" == *"builtin autoload -X"* ]]
+  else
+    #[[ $(type -wa -- "$1") == *'function'* ]] &&
+    [[ "${${(@f)"$(which -- "$1")"}[2]}" == $'\t'$histchars[3]' undefined' ]]
+  fi
+  # Do nothing here: return the exit code of the if.
+}
+
+# Return True iff the argument denotes a function name.
+_zsh_highlight__is_function_p() {
+  if zmodload -e zsh/parameter; then
+    (( ${+functions[$1]} ))
+  else
+    [[ $(type -wa -- "$1") == *'function'* ]]
+  fi
+}
+
+# This function takes a single argument F and returns True iff F denotes the
+# name of a callable function.  A function is callable if it is fully defined
+# or if it is marked for autoloading and autoloading it at the first call to it
+# will succeed.  In particular, if F has been marked for autoloading
+# but is not available in $fpath, then calling this function on F will return False.
+#
+# See users/21671 https://www.zsh.org/cgi-bin/mla/redirect?USERNUMBER=21671
+_zsh_highlight__function_callable_p() {
+  if _zsh_highlight__is_function_p "$1" &&
+     ! _zsh_highlight__function_is_autoload_stub_p "$1"
+  then
+    # Already fully loaded.
+    return 0 # true
+  else
+    # "$1" is either an autoload stub, or not a function at all.
+    #
+    # Use a subshell to avoid affecting the calling shell.
+    #
+    # We expect 'autoload +X' to return non-zero if it fails to fully load
+    # the function.
+    ( autoload -U +X -- "$1" 2>/dev/null )
+    return $?
+  fi
+}
+
+# -------------------------------------------------------------------------------------------------
+# Core highlighting update system
+# -------------------------------------------------------------------------------------------------
+
+# Use workaround for bug in ZSH?
+# zsh-users/zsh@48cadf4 https://www.zsh.org/mla/workers/2017/msg00034.html
+autoload -Uz is-at-least
+if is-at-least 5.4; then
+  typeset -g zsh_highlight__pat_static_bug=false
+else
+  typeset -g zsh_highlight__pat_static_bug=true
+fi
+
+# Array declaring active highlighters names.
+typeset -ga ZSH_HIGHLIGHT_HIGHLIGHTERS
+
+# Update ZLE buffer syntax highlighting.
+#
+# Invokes each highlighter that needs updating.
+# This function is supposed to be called whenever the ZLE state changes.
+_zsh_highlight()
+{
+  # Store the previous command return code to restore it whatever happens.
+  local ret=$?
+  # Make it read-only.  Can't combine this with the previous line when POSIX_BUILTINS may be set.
+  typeset -r ret
+
+  # $region_highlight should be predefined, either by zle or by the test suite's mock (non-special) array.
+  (( ${+region_highlight[@]} )) || {
+    echo >&2 'zsh-syntax-highlighting: error: $region_highlight is not defined'
+    echo >&2 'zsh-syntax-highlighting: (Check whether zsh-syntax-highlighting was installed according to the instructions.)'
+    return $ret
+  }
+
+  # Probe the memo= feature, once.
+  (( ${+zsh_highlight__memo_feature} )) || {
+    region_highlight+=( " 0 0 fg=red, memo=zsh-syntax-highlighting" )
+    case ${region_highlight[-1]} in
+      ("0 0 fg=red")
+        # zsh 5.8 or earlier
+        integer -gr zsh_highlight__memo_feature=0
+        ;;
+      ("0 0 fg=red memo=zsh-syntax-highlighting")
+        # zsh 5.9 or later
+        integer -gr zsh_highlight__memo_feature=1
+        ;;
+      (" 0 0 fg=red, memo=zsh-syntax-highlighting") ;&
+      (*)
+        # We can get here in two ways:
+        #
+        # 1. When not running as a widget.  In that case, $region_highlight is
+        # not a special variable (= one with custom getter/setter functions
+        # written in C) but an ordinary one, so the third case pattern matches
+        # and we fall through to this block.  (The test suite uses this codepath.)
+        #
+        # 2. When running under a future version of zsh that will have changed
+        # the serialization of $region_highlight elements from their underlying
+        # C structs, so that none of the previous case patterns will match.
+        #
+        # In either case, fall back to a version check.
+        if is-at-least 5.9; then
+          integer -gr zsh_highlight__memo_feature=1
+        else
+          integer -gr zsh_highlight__memo_feature=0
+        fi
+        ;;
+    esac
+    region_highlight[-1]=()
+  }
+
+  # Reset region_highlight to build it from scratch
+  if (( zsh_highlight__memo_feature )); then
+    region_highlight=( "${(@)region_highlight:#*memo=zsh-syntax-highlighting*}" )
+  else
+    # Legacy codepath.  Not very interoperable with other plugins (issue #418).
+    region_highlight=()
+  fi
+
+  # Remove all highlighting in isearch, so that only the underlining done by zsh itself remains.
+  # For details see FAQ entry 'Why does syntax highlighting not work while searching history?'.
+  # This disables highlighting during isearch (for reasons explained in README.md) unless zsh is new enough
+  # and doesn't have the pattern matching bug
+  if [[ $WIDGET == zle-isearch-update ]] && { $zsh_highlight__pat_static_bug || ! (( $+ISEARCHMATCH_ACTIVE )) }; then
+    return $ret
+  fi
+
+  # Before we 'emulate -L', save the user's options
+  local -A zsyh_user_options
+  if zmodload -e zsh/parameter; then
+    zsyh_user_options=("${(kv)options[@]}")
+  else
+    local canonical_options onoff option raw_options
+    raw_options=(${(f)"$(emulate -R zsh; set -o)"})
+    canonical_options=(${${${(M)raw_options:#*off}%% *}#no} ${${(M)raw_options:#*on}%% *})
+    for option in "${canonical_options[@]}"; do
+      [[ -o $option ]]
+      case $? in
+        (0) zsyh_user_options+=($option on);;
+        (1) zsyh_user_options+=($option off);;
+        (*) # Can't happen, surely?
+            echo "zsh-syntax-highlighting: warning: '[[ -o $option ]]' returned $?"
+            ;;
+      esac
+    done
+  fi
+  typeset -r zsyh_user_options
+
+  emulate -L zsh
+  setopt localoptions warncreateglobal nobashrematch
+  local REPLY # don't leak $REPLY into global scope
+
+  # Do not highlight if there are more than 300 chars in the buffer. It's most
+  # likely a pasted command or a huge list of files in that case..
+  [[ -n ${ZSH_HIGHLIGHT_MAXLENGTH:-} ]] && [[ $#BUFFER -gt $ZSH_HIGHLIGHT_MAXLENGTH ]] && return $ret
+
+  # Do not highlight if there are pending inputs (copy/paste).
+  (( KEYS_QUEUED_COUNT > 0 )) && return $ret
+  (( PENDING > 0 )) && return $ret
+
+  {
+    local cache_place
+    local -a region_highlight_copy
+
+    # Select which highlighters in ZSH_HIGHLIGHT_HIGHLIGHTERS need to be invoked.
+    local highlighter; for highlighter in $ZSH_HIGHLIGHT_HIGHLIGHTERS; do
+
+      # eval cache place for current highlighter and prepare it
+      cache_place="_zsh_highlight__highlighter_${highlighter}_cache"
+      typeset -ga ${cache_place}
+
+      # If highlighter needs to be invoked
+      if ! type "_zsh_highlight_highlighter_${highlighter}_predicate" >&/dev/null; then
+        echo "zsh-syntax-highlighting: warning: disabling the ${(qq)highlighter} highlighter as it has not been loaded" >&2
+        # TODO: use ${(b)} rather than ${(q)} if supported
+        ZSH_HIGHLIGHT_HIGHLIGHTERS=( ${ZSH_HIGHLIGHT_HIGHLIGHTERS:#${highlighter}} )
+      elif "_zsh_highlight_highlighter_${highlighter}_predicate"; then
+
+        # save a copy, and cleanup region_highlight
+        region_highlight_copy=("${region_highlight[@]}")
+        region_highlight=()
+
+        # Execute highlighter and save result
+        {
+          "_zsh_highlight_highlighter_${highlighter}_paint"
+        } always {
+          : ${(AP)cache_place::="${region_highlight[@]}"}
+        }
+
+        # Restore saved region_highlight
+        region_highlight=("${region_highlight_copy[@]}")
+
+      fi
+
+      # Use value form cache if any cached
+      region_highlight+=("${(@P)cache_place}")
+
+    done
+
+    # Re-apply zle_highlight settings
+
+    # region
+    () {
+      (( REGION_ACTIVE )) || return
+      integer min max
+      if (( MARK > CURSOR )) ; then
+        min=$CURSOR max=$MARK
+      else
+        min=$MARK max=$CURSOR
+      fi
+      if (( REGION_ACTIVE == 1 )); then
+        [[ $KEYMAP = vicmd ]] && (( max++ ))
+      elif (( REGION_ACTIVE == 2 )); then
+        local needle=$'\n'
+        # CURSOR and MARK are 0 indexed between letters like region_highlight
+        # Do not include the newline in the highlight
+        (( min = ${BUFFER[(Ib:min:)$needle]} ))
+        (( max = ${BUFFER[(ib:max:)$needle]} - 1 ))
+      fi
+      _zsh_highlight_apply_zle_highlight region standout "$min" "$max"
+    }
+
+    # yank / paste (zsh-5.1.1 and newer)
+    (( $+YANK_ACTIVE )) && (( YANK_ACTIVE )) && _zsh_highlight_apply_zle_highlight paste standout "$YANK_START" "$YANK_END"
+
+    # isearch
+    (( $+ISEARCHMATCH_ACTIVE )) && (( ISEARCHMATCH_ACTIVE )) && _zsh_highlight_apply_zle_highlight isearch underline "$ISEARCHMATCH_START" "$ISEARCHMATCH_END"
+
+    # suffix
+    (( $+SUFFIX_ACTIVE )) && (( SUFFIX_ACTIVE )) && _zsh_highlight_apply_zle_highlight suffix bold "$SUFFIX_START" "$SUFFIX_END"
+
+
+    return $ret
+
+
+  } always {
+    typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER="$BUFFER"
+    typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=$CURSOR
+  }
+}
+
+# Apply highlighting based on entries in the zle_highlight array.
+# This function takes four arguments:
+# 1. The exact entry (no patterns) in the zle_highlight array:
+#    region, paste, isearch, or suffix
+# 2. The default highlighting that should be applied if the entry is unset
+# 3. and 4. Two integer values describing the beginning and end of the
+#    range. The order does not matter.
+_zsh_highlight_apply_zle_highlight() {
+  local entry="$1" default="$2"
+  integer first="$3" second="$4"
+
+  # read the relevant entry from zle_highlight
+  #
+  # ### In zsh≥5.0.8 we'd use ${(b)entry}, but we support older zsh's, so we don't
+  # ### add (b).  The only effect is on the failure mode for callers that violate
+  # ### the precondition.
+  local region="${zle_highlight[(r)${entry}:*]-}"
+
+  if [[ -z "$region" ]]; then
+    # entry not specified at all, use default value
+    region=$default
+  else
+    # strip prefix
+    region="${region#${entry}:}"
+
+    # no highlighting when set to the empty string or to 'none'
+    if [[ -z "$region" ]] || [[ "$region" == none ]]; then
+      return
+    fi
+  fi
+
+  integer start end
+  if (( first < second )); then
+    start=$first end=$second
+  else
+    start=$second end=$first
+  fi
+  region_highlight+=("$start $end $region, memo=zsh-syntax-highlighting")
+}
+
+
+# -------------------------------------------------------------------------------------------------
+# API/utility functions for highlighters
+# -------------------------------------------------------------------------------------------------
+
+# Array used by highlighters to declare user overridable styles.
+typeset -gA ZSH_HIGHLIGHT_STYLES
+
+# Whether the command line buffer has been modified or not.
+#
+# Returns 0 if the buffer has changed since _zsh_highlight was last called.
+_zsh_highlight_buffer_modified()
+{
+  [[ "${_ZSH_HIGHLIGHT_PRIOR_BUFFER:-}" != "$BUFFER" ]]
+}
+
+# Whether the cursor has moved or not.
+#
+# Returns 0 if the cursor has moved since _zsh_highlight was last called.
+_zsh_highlight_cursor_moved()
+{
+  [[ -n $CURSOR ]] && [[ -n ${_ZSH_HIGHLIGHT_PRIOR_CURSOR-} ]] && (($_ZSH_HIGHLIGHT_PRIOR_CURSOR != $CURSOR))
+}
+
+# Add a highlight defined by ZSH_HIGHLIGHT_STYLES.
+#
+# Should be used by all highlighters aside from 'pattern' (cf. ZSH_HIGHLIGHT_PATTERN).
+# Overwritten in tests/test-highlighting.zsh when testing.
+_zsh_highlight_add_highlight()
+{
+  local -i start end
+  local highlight
+  start=$1
+  end=$2
+  shift 2
+  for highlight; do
+    if (( $+ZSH_HIGHLIGHT_STYLES[$highlight] )); then
+      region_highlight+=("$start $end $ZSH_HIGHLIGHT_STYLES[$highlight], memo=zsh-syntax-highlighting")
+      break
+    fi
+  done
+}
+
+# -------------------------------------------------------------------------------------------------
+# Setup functions
+# -------------------------------------------------------------------------------------------------
+
+# Helper for _zsh_highlight_bind_widgets
+# $1 is name of widget to call
+_zsh_highlight_call_widget()
+{
+  builtin zle "$@" &&
+  _zsh_highlight
+}
+
+# Decide whether to use the zle-line-pre-redraw codepath (colloquially known as
+# "feature/redrawhook", after the topic branch's name) or the legacy "bind all
+# widgets" codepath.
+#
+# We use the new codepath under two conditions:
+#
+# 1. If it's available, which we check by testing for add-zle-hook-widget's availability.
+# 
+# 2. If zsh has the memo= feature, which is required for interoperability reasons.
+#    See issues #579 and #735, and the issues referenced from them.
+#
+#    We check this with a plain version number check, since a functional check,
+#    as done by _zsh_highlight, can only be done from inside a widget
+#    function — a catch-22.
+if is-at-least 5.9 && _zsh_highlight__function_callable_p add-zle-hook-widget
+then
+  autoload -U add-zle-hook-widget
+  _zsh_highlight__zle-line-finish() {
+    # Reset $WIDGET since the 'main' highlighter depends on it.
+    #
+    # Since $WIDGET is declared by zle as read-only in this function's scope,
+    # a nested function is required in order to shadow its built-in value;
+    # see "User-defined widgets" in zshall.
+    () {
+      local -h -r WIDGET=zle-line-finish
+      _zsh_highlight
+    }
+  }
+  _zsh_highlight__zle-line-pre-redraw() {
+    # Set $? to 0 for _zsh_highlight.  Without this, subsequent
+    # zle-line-pre-redraw hooks won't run, since add-zle-hook-widget happens to
+    # call us with $? == 1 in the common case.
+    true && _zsh_highlight "$@"
+  }
+  _zsh_highlight_bind_widgets(){}
+  if [[ -o zle ]]; then
+    add-zle-hook-widget zle-line-pre-redraw _zsh_highlight__zle-line-pre-redraw
+    add-zle-hook-widget zle-line-finish _zsh_highlight__zle-line-finish
+  fi
+else
+  # Rebind all ZLE widgets to make them invoke _zsh_highlights.
+  _zsh_highlight_bind_widgets()
+  {
+    setopt localoptions noksharrays
+    typeset -F SECONDS
+    local prefix=orig-s$SECONDS-r$RANDOM # unique each time, in case we're sourced more than once
+
+    # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
+    zmodload zsh/zleparameter 2>/dev/null || {
+      print -r -- >&2 'zsh-syntax-highlighting: failed loading zsh/zleparameter.'
+      return 1
+    }
+
+    # Override ZLE widgets to make them invoke _zsh_highlight.
+    local -U widgets_to_bind
+    widgets_to_bind=(${${(k)widgets}:#(.*|run-help|which-command|beep|set-local-history|yank|yank-pop)})
+
+    # Always wrap special zle-line-finish widget. This is needed to decide if the
+    # current line ends and special highlighting logic needs to be applied.
+    # E.g. remove cursor imprint, don't highlight partial paths, ...
+    widgets_to_bind+=(zle-line-finish)
+
+    # Always wrap special zle-isearch-update widget to be notified of updates in isearch.
+    # This is needed because we need to disable highlighting in that case.
+    widgets_to_bind+=(zle-isearch-update)
+
+    local cur_widget
+    for cur_widget in $widgets_to_bind; do
+      case ${widgets[$cur_widget]:-""} in
+
+        # Already rebound event: do nothing.
+        user:_zsh_highlight_widget_*);;
+
+        # The "eval"'s are required to make $cur_widget a closure: the value of the parameter at function
+        # definition time is used.
+        #
+        # We can't use ${0/_zsh_highlight_widget_} because these widgets are always invoked with
+        # NO_function_argzero, regardless of the option's setting here.
+
+        # User defined widget: override and rebind old one with prefix "orig-".
+        user:*) zle -N $prefix-$cur_widget ${widgets[$cur_widget]#*:}
+                eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
+                zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
+
+        # Completion widget: override and rebind old one with prefix "orig-".
+        completion:*) zle -C $prefix-$cur_widget ${${(s.:.)widgets[$cur_widget]}[2,3]}
+                      eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget ${(q)prefix}-${(q)cur_widget} -- \"\$@\" }"
+                      zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
+
+        # Builtin widget: override and make it call the builtin ".widget".
+        builtin) eval "_zsh_highlight_widget_${(q)prefix}-${(q)cur_widget}() { _zsh_highlight_call_widget .${(q)cur_widget} -- \"\$@\" }"
+                 zle -N $cur_widget _zsh_highlight_widget_$prefix-$cur_widget;;
+
+        # Incomplete or nonexistent widget: Bind to z-sy-h directly.
+        *)
+           if [[ $cur_widget == zle-* ]] && (( ! ${+widgets[$cur_widget]} )); then
+             _zsh_highlight_widget_${cur_widget}() { :; _zsh_highlight }
+             zle -N $cur_widget _zsh_highlight_widget_$cur_widget
+           else
+        # Default: unhandled case.
+             print -r -- >&2 "zsh-syntax-highlighting: unhandled ZLE widget ${(qq)cur_widget}"
+             print -r -- >&2 "zsh-syntax-highlighting: (This is sometimes caused by doing \`bindkey <keys> ${(q-)cur_widget}\` without creating the ${(qq)cur_widget} widget with \`zle -N\` or \`zle -C\`.)"
+           fi
+      esac
+    done
+  }
+fi
+
+# Load highlighters from directory.
+#
+# Arguments:
+#   1) Path to the highlighters directory.
+_zsh_highlight_load_highlighters()
+{
+  setopt localoptions noksharrays bareglobqual
+
+  # Check the directory exists.
+  [[ -d "$1" ]] || {
+    print -r -- >&2 "zsh-syntax-highlighting: highlighters directory ${(qq)1} not found."
+    return 1
+  }
+
+  # Load highlighters from highlighters directory and check they define required functions.
+  local highlighter highlighter_dir
+  for highlighter_dir ($1/*/(/)); do
+    highlighter="${highlighter_dir:t}"
+    [[ -f "$highlighter_dir${highlighter}-highlighter.zsh" ]] &&
+      . "$highlighter_dir${highlighter}-highlighter.zsh"
+    if type "_zsh_highlight_highlighter_${highlighter}_paint" &> /dev/null &&
+       type "_zsh_highlight_highlighter_${highlighter}_predicate" &> /dev/null;
+    then
+        # New (0.5.0) function names
+    elif type "_zsh_highlight_${highlighter}_highlighter" &> /dev/null &&
+         type "_zsh_highlight_${highlighter}_highlighter_predicate" &> /dev/null;
+    then
+        # Old (0.4.x) function names
+        if false; then
+            # TODO: only show this warning for plugin authors/maintainers, not for end users
+            print -r -- >&2 "zsh-syntax-highlighting: warning: ${(qq)highlighter} highlighter uses deprecated entry point names; please ask its maintainer to update it: https://github.com/zsh-users/zsh-syntax-highlighting/issues/329"
+        fi
+        # Make it work.
+        eval "_zsh_highlight_highlighter_${(q)highlighter}_paint() { _zsh_highlight_${(q)highlighter}_highlighter \"\$@\" }"
+        eval "_zsh_highlight_highlighter_${(q)highlighter}_predicate() { _zsh_highlight_${(q)highlighter}_highlighter_predicate \"\$@\" }"
+    else
+        print -r -- >&2 "zsh-syntax-highlighting: ${(qq)highlighter} highlighter should define both required functions '_zsh_highlight_highlighter_${highlighter}_paint' and '_zsh_highlight_highlighter_${highlighter}_predicate' in ${(qq):-"$highlighter_dir${highlighter}-highlighter.zsh"}."
+    fi
+  done
+}
+
+
+# -------------------------------------------------------------------------------------------------
+# Setup
+# -------------------------------------------------------------------------------------------------
+
+# Try binding widgets.
+_zsh_highlight_bind_widgets || {
+  print -r -- >&2 'zsh-syntax-highlighting: failed binding ZLE widgets, exiting.'
+  return 1
+}
+
+# Resolve highlighters directory location.
+_zsh_highlight_load_highlighters "${ZSH_HIGHLIGHT_HIGHLIGHTERS_DIR:-${${0:A}:h}/highlighters}" || {
+  print -r -- >&2 'zsh-syntax-highlighting: failed loading highlighters, exiting.'
+  return 1
+}
+
+# Reset scratch variables when commandline is done.
+_zsh_highlight_preexec_hook()
+{
+  typeset -g _ZSH_HIGHLIGHT_PRIOR_BUFFER=
+  typeset -gi _ZSH_HIGHLIGHT_PRIOR_CURSOR=
+}
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec _zsh_highlight_preexec_hook 2>/dev/null || {
+    print -r -- >&2 'zsh-syntax-highlighting: failed loading add-zsh-hook.'
+  }
+
+# Load zsh/parameter module if available
+zmodload zsh/parameter 2>/dev/null || true
+
+# Initialize the array of active highlighters if needed.
+[[ $#ZSH_HIGHLIGHT_HIGHLIGHTERS -eq 0 ]] && ZSH_HIGHLIGHT_HIGHLIGHTERS=(main)
+
+if (( $+X_ZSH_HIGHLIGHT_DIRS_BLACKLIST )); then
+  print >&2 'zsh-syntax-highlighting: X_ZSH_HIGHLIGHT_DIRS_BLACKLIST is deprecated. Please use ZSH_HIGHLIGHT_DIRS_BLACKLIST.'
+  ZSH_HIGHLIGHT_DIRS_BLACKLIST=($X_ZSH_HIGHLIGHT_DIRS_BLACKLIST)
+  unset X_ZSH_HIGHLIGHT_DIRS_BLACKLIST
+fi
+
+# Restore the aliases we unned
+eval "$zsh_highlight__aliases"
+builtin unset zsh_highlight__aliases
+
+# Set $?.
+true
diff --git a/gentoo/dotfiles/.zshenv b/gentoo/dotfiles/.zshenv
new file mode 100644
index 00000000..c5aff903
--- /dev/null
+++ b/gentoo/dotfiles/.zshenv
@@ -0,0 +1 @@
+[[ -f /etc/profile ]] && source /etc/profile
diff --git a/gentoo/dotfiles/.zshrc b/gentoo/dotfiles/.zshrc
new file mode 100644
index 00000000..4bb5ca1f
--- /dev/null
+++ b/gentoo/dotfiles/.zshrc
@@ -0,0 +1,220 @@
+# ~/.zshrc
+# to change default shell, use chsh -s $(which zsh)
+
+# prevent overwriting of existing files
+set -o noclobber
+# reverse with:
+# set +o noclobber
+
+# create custom env variables:
+export XDG_CONFIG_HOME="$HOME/.config"
+
+# set up python-virtualenvwrapper
+# https://wiki.archlinux.org/title/Python/Virtual_environment
+# export WORKON_HOME=~/.virtualenvs
+# source /usr/bin/virtualenvwrapper_lazy.sh
+
+# custom BROWSER env for ddgr:
+export BROWSER=librewolf
+export QT_STYLE_OVERRIDE=Adwaita-Dark
+# export BROWSER=links
+export EDITOR=nvim
+export PF_INFO="ascii os kernel pkgs shell wm editor"
+
+export GROFF_NO_SGR=1
+export LESS_TERMCAP_mb=$'\e[1;34m'
+export LESS_TERMCAP_md=$'\e[1;34m'
+export LESS_TERMCAP_me=$'\e[0m'
+export LESS_TERMCAP_se=$'\e[0m'
+export LESS_TERMCAP_so=$'\e[01;33m'
+export LESS_TERMCAP_ue=$'\e[0m'
+export LESS_TERMCAP_us=$'\e[1;4;33m'
+
+# Formats history command with dates/times
+export HISTTIMEFORMAT="%d/%m/%y %T "
+# Sets default for history command
+export HISTSIZE=10000000
+export HISTFILESIZE=100000
+export HISTFILE="$HOME/.zsh_history"
+SAVEHIST=10000000
+
+# setopt EXTENDED_HISTORY          # Write the history file in the ":start:elapsed;command" format.
+setopt INC_APPEND_HISTORY        # Write to the history file immediately, not when the shell exits.
+setopt SHARE_HISTORY             # Share history between all sessions.
+setopt HIST_EXPIRE_DUPS_FIRST    # Expire duplicate entries first when trimming history.
+setopt HIST_IGNORE_DUPS          # Don't record an entry that was just recorded again.
+setopt HIST_IGNORE_ALL_DUPS      # Delete old recorded entry if new entry is a duplicate.
+setopt HIST_FIND_NO_DUPS         # Do not display a line previously found.
+setopt HIST_IGNORE_SPACE         # Don't record an entry starting with a space.
+setopt HIST_SAVE_NO_DUPS         # Don't write duplicate entries in the history file.
+setopt HIST_REDUCE_BLANKS        # Remove superfluous blanks before recording entry. setopt HIST_VERIFY               # Don't execute immediately upon history expansion.
+# setopt HIST_BEEP                 # Beep when accessing nonexistent history.
+
+# creates a .zsh_history file on startup, and clears the history
+echo '' | xclip && xclip -selection clipboard /dev/null && history -p && hash -r && /usr/bin/rm $HOME/.zsh_history && touch $HOME/.zsh_history
+
+# Configure thefuck
+# eval "$(thefuck --alias)"
+# Change with care:
+export PATH="$PATH:/usr/local/cuda/bin:/home/brian/scripts:/home/brian/.local/bin:/home/brian/.local/share/nvim/lsp_servers:/home/brian/.cargo/bin:/home/brian/go/bin"
+export LD_LIBRARY_PATH="/usr/local/cuda/lib:$PATH"
+# Configure grep output colors
+export GREP_COLORS='ms=01;34'
+
+# Don't show completion until at least 1 character has been typed
+zstyle ':autocomplete:*' min-input 1
+
+#
+# Plugins
+source ~/.zsh/zsh-autocomplete/zsh-autocomplete.plugin.zsh
+source ~/.zsh/zsh-autosuggestions/zsh-autosuggestions.zsh
+fpath+=~/.zsh/poetry/
+autoload -Uz compinit; compinit
+
+
+# icons-in-terminal Integration
+# source ~/.local/share/icons-in-terminal/icons_bash.sh
+
+# Colors
+autoload -Uz colors && colors
+
+# Load version control information
+autoload -Uz vcs_info
+precmd() { vcs_info }
+
+# git info/styling for prompt
+zstyle ':vcs_info:*' check-for-changes true
+zstyle ':vcs_info:*' unstagedstr '%B%F{yellow} ➕'
+zstyle ':vcs_info:*' stagedstr '%B%F{green} ✔'
+zstyle ':vcs_info:git:*' formats       '%b%u%c'
+zstyle ':vcs_info:git:*' actionformats '%b|%a%u%c'
+
+# Set up the prompt (with git branch name)
+setopt PROMPT_SUBST
+
+# some useful options (man zshoptions)
+setopt autocd extendedglob nomatch menucomplete
+setopt interactive_comments
+stty stop undef         # Disable ctrl-s to freeze terminal
+zle_highlight=('paste:none') # pasting text using ctrl+shift+v doesn't highlight
+
+# beeping is annoying
+unsetopt BEEP
+
+# PROMPT='[%n@%m %1~]%F{green}(${vcs_info_msg_0_})%F{white}$ '
+# PROMPT='%B%F{blue}[%n@%M %B%F{white}'%1~'%B%F{blue}]$ %B%F{white}${vcs_info_msg_0_}%B%F{blue}
+# PROMPT='%B%F{blue}[ﴂ %B%F{white}'%1~'%B%F{blue}]$ %B%F{white}${vcs_info_msg_0_}%B%F{blue}
+# └─>%B%F{white} '
+# PROMPT='%B%F{blue}[ﴂ %B%F{white}$(tput sitm)'%1~'$(tput sgr0)$(tput bold)%B%F{blue}]$(tput sitm)$ %B%F{white}$(tput setaf 5)${vcs_info_msg_0_}%B%F$(tput sgr0)$(tput setaf 4)$(tput bold)
+# └─>%B%F{white} '
+PROMPT='%B%F{blue}[ %B%F{white}$(tput sitm)'%1~'$(tput sgr0)$(tput bold)%B%F{blue}]$(tput sitm)$ %B%F{white}$(tput setaf 5)${vcs_info_msg_0_}%B%F$(tput sgr0)$(tput setaf 4)$(tput bold)
+└─>%B%F{white} '
+
+# function erase_history { local HISTSIZE=0; }
+# erase_history && hash -r
+
+# create a zkbd compatible hash;
+# to add other keys to this hash, see: man 5 terminfo
+typeset -g -A key
+
+key[Home]="${terminfo[khome]}"
+key[End]="${terminfo[kend]}"
+key[Insert]="${terminfo[kich1]}"
+key[Backspace]="${terminfo[kbs]}"
+key[Delete]="${terminfo[kdch1]}"
+key[Up]="${terminfo[kcuu1]}"
+key[Down]="${terminfo[kcud1]}"
+key[Left]="${terminfo[kcub1]}"
+key[Right]="${terminfo[kcuf1]}"
+key[PageUp]="${terminfo[kpp]}"
+key[PageDown]="${terminfo[knp]}"
+key[Shift-Tab]="${terminfo[kcbt]}"
+
+# setup key accordingly
+[[ -n "${key[Home]}"      ]] && bindkey -- "${key[Home]}"       beginning-of-line
+[[ -n "${key[End]}"       ]] && bindkey -- "${key[End]}"        end-of-line
+[[ -n "${key[Insert]}"    ]] && bindkey -- "${key[Insert]}"     overwrite-mode
+[[ -n "${key[Backspace]}" ]] && bindkey -- "${key[Backspace]}"  backward-delete-char
+[[ -n "${key[Delete]}"    ]] && bindkey -- "${key[Delete]}"     delete-char
+[[ -n "${key[Up]}"        ]] && bindkey -- "${key[Up]}"         up-line-or-history
+[[ -n "${key[Down]}"      ]] && bindkey -- "${key[Down]}"       down-line-or-history
+[[ -n "${key[Left]}"      ]] && bindkey -- "${key[Left]}"       backward-char
+[[ -n "${key[Right]}"     ]] && bindkey -- "${key[Right]}"      forward-char
+[[ -n "${key[PageUp]}"    ]] && bindkey -- "${key[PageUp]}"     beginning-of-buffer-or-history
+[[ -n "${key[PageDown]}"  ]] && bindkey -- "${key[PageDown]}"   end-of-buffer-or-history
+[[ -n "${key[Shift-Tab]}" ]] && bindkey -- "${key[Shift-Tab]}"  reverse-menu-complete
+
+# Finally, make sure the terminal is in application mode, when zle is
+# active. Only then are the values from $terminfo valid.
+if (( ${+terminfo[smkx]} && ${+terminfo[rmkx]} )); then
+    autoload -Uz add-zle-hook-widget
+    function zle_application_mode_start { echoti smkx }
+    function zle_application_mode_stop { echoti rmkx }
+    add-zle-hook-widget -Uz zle-line-init zle_application_mode_start
+    add-zle-hook-widget -Uz zle-line-finish zle_application_mode_stop
+fi
+
+# Set up vim mode
+bindkey -v
+
+# alias home="xclear && cd /home/brian && clear && history -p && hash -r && /usr/bin/rm $HOME/.zsh_history && touch $HOME/.zsh_history"
+alias home="cd && history -p && clear && echo '' | xclip && xclip -selection clipboard /dev/null"
+
+# Various source files (do not place at end of zshrc/bashrc)
+source ~/.aliases
+# github personal access token
+#source ~/.gh_pat
+#SSID and passwd
+#source ~/.ssid_passwd
+# Plugins (that need to be at the end of the zshrc script)
+source ~/.zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
+
+# Sets Up Node Version Manager
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+
+# Set up TTY colors
+# pulled form https://github.com/lewisacidic/nord-tty
+if [ "$TERM" = "linux" ]; then
+echo -en \\e]P02E3440
+echo -en \\e]P1BF616A
+echo -en \\e]P2A3BE8C
+echo -en \\e]P3EBCB8B
+echo -en \\e]P481A1C1
+echo -en \\e]P5B48EAD
+echo -en \\e]P688C0D0
+echo -en \\e]P7E5E9F0
+echo -en \\e]P84C566A
+echo -en \\e]P9BF616A
+echo -en \\e]PAA3BE8C
+echo -en \\e]PBEBCB8B
+echo -en \\e]PCB48EAD
+echo -en \\e]PD8FBCBB
+echo -en \\e]PEECEFF4
+clear
+fi
+
+#if [[ -f "$HOME/.sdrc" ]] ; then
+#source "$HOME/.sdrc"
+#fi
+#[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
+
+[ -f ~/.zsh/zsh-fex/fex.zsh ] && source ~/.zsh/zsh-fex/fex.zsh
+bindkey '^f' fex-widget
+
+#bun completions
+[ -s "/home/brian/.bun/_bun" ] && source "/home/brian/.bun/_bun"
+
+## bun
+export BUN_INSTALL="$HOME/.bun"
+export PATH="$BUN_INSTALL/bin:$PATH"
+#export DEBUGINFOD_URLS="https://debuginfod.artixlinux.org"
+
+# npm will install global packages to:
+export NPM_CONFIG_PREFIX="$HOME/.local/"
+
+# rye
+source "$HOME/.rye/env"
+
+# current book being read (used in resume_read script)
+# export CURRENT_READ=""
diff --git a/gentoo/portage/env/emerge-default-opts-jobs-2.conf b/gentoo/portage/env/emerge-default-opts-jobs-2.conf
new file mode 100644
index 00000000..78d81162
--- /dev/null
+++ b/gentoo/portage/env/emerge-default-opts-jobs-2.conf
@@ -0,0 +1 @@
+EMERGE_DEFAULT_OPTS="${EMERGE_DEFAULT_OPTS} --jobs=2"
diff --git a/gentoo/portage/env/enable-ccache.conf b/gentoo/portage/env/enable-ccache.conf
new file mode 100644
index 00000000..7462261e
--- /dev/null
+++ b/gentoo/portage/env/enable-ccache.conf
@@ -0,0 +1,11 @@
+FEATURES="${FEATURES} ccache"
+
+# Portage defaults to ${PORTAGE_TMPDIR}/ccache unless CCACHE_DIR is
+# set in make.conf or in /etc/portage/env (or similar).
+#CCACHE_DIR="/var/cache/ccache"
+# If using a directory that Portage doesn't control, e.g. /var/cache/ccache,
+# this may be needed in some cases, but has some security implications.
+# See https://bugs.gentoo.org/492910.
+#CCACHE_UMASK="0002"
+# Note that you can clear the cache from the comand line using:
+# ccache-c
diff --git a/gentoo/portage/make.conf b/gentoo/portage/make.conf
index 5abfb4bd..6e6ec99b 100644
--- a/gentoo/portage/make.conf
+++ b/gentoo/portage/make.conf
@@ -2,31 +2,36 @@
 # built this stage.
 # Please consult /usr/share/portage/config/make.conf.example for a more
 # detailed example.
-#
-COMMON_FLAGS="-O2 -pipe"
+
+COMMON_FLAGS="-march=native -O2 -pipe"
 CFLAGS="${COMMON_FLAGS}"
 CXXFLAGS="${COMMON_FLAGS}"
 FCFLAGS="${COMMON_FLAGS}"
 FFLAGS="${COMMON_FLAGS}"
+RUSTFLAGS="${RUSTFLAGS} -C target-cpu=native"
+
+MAKEOPTS="-j6 -l7"
+EMERGE_DEFAULT_OPTS="-j6 --with-bdeps=y --quiet --keep-going=y"
+
+GRUB_PLATFORMS="efi-64"
+
+USE="X dist-kernel dbus policykit vdpau vaapi nvenc bluetooth man seatd -elogind -logind -systemd" 
+
+ACCEPT_LICENSE="*"
+
+PORTAGE_ELOG_CLASSES="log warn error info qa"
+PORTAGE_ELOG_SYSTEM="save"
+PORTAGE_LOGDIR="/var/log/portage"
+PORTAGE_LOGDIR_CLEAN="find \"\${PORTAGE_LOGDIR}\" -type f ! -name \"summary.log*\" -mtime +7 -delete"
+
+PORTAGE_TMPDIR="/var/tmp"
+DISTDIR="/var/cache/distfiles"
 
 # NOTE: This stage was built with the bindist USE flag enabled
 
 # This sets the language of build output to English.
 # Please keep this setting intact when reporting bugs.
 LC_MESSAGES=C.UTF-8
-MAKEOPTS="-j4"
-
-
-ACCEPT_LICENSE="*"
-
-USE="modules-sign xorg elogind X zsh-completion harfbuzz pulseaudio minizip text dbus bluetooth -qtwebengine egl"
-
-# Portage Logging
-PORTAGE_ELOG_CLASSES="log warn error"
-PORTAGE_ELOG_SYSTEM="save"
-PORTAGE_LOGDIR="/var/log/portage"
-
-# Temporary Files
-PORTAGE_TMPDIR="/var/tmp/portage"
-GENTOO_MIRRORS="http://tux.rainside.sk/gentoo/ \
-    ftp://tux.rainside.sk/gentoo/"
+GENTOO_MIRRORS="https://mirrors.kernel.org/gentoo/ \
+    http://mirrors.kernel.org/gentoo/ \
+    rsync://mirrors.kernel.org/mirrors/gentoo/"
diff --git a/gentoo/portage/make.conf.backup b/gentoo/portage/make.conf.backup
deleted file mode 100644
index e9dead99..00000000
--- a/gentoo/portage/make.conf.backup
+++ /dev/null
@@ -1,34 +0,0 @@
-# These settings were set by the catalyst build script that automatically
-# built this stage.
-# Please consult /usr/share/portage/config/make.conf.example for a more
-# detailed example.
-#
-COMMON_FLAGS="-O2 -pipe"
-CFLAGS="${COMMON_FLAGS}"
-CXXFLAGS="${COMMON_FLAGS}"
-FCFLAGS="${COMMON_FLAGS}"
-FFLAGS="${COMMON_FLAGS}"
-
-# NOTE: This stage was built with the bindist USE flag enabled
-
-# This sets the language of build output to English.
-# Please keep this setting intact when reporting bugs.
-LC_MESSAGES=C.UTF-8
-MAKEOPTS="-j4"
-
-GENTOO_MIRRORS="https://mirror.clarkson.edu/gentoo/ \
-    http://mirror.clarkson.edu/gentoo/ \
-    rsync://mirror.clarkson.edu/gentoo/ \
-    "
-
-ACCEPT_LICENSE="*"
-
-USE="modules-sign xorg elogind X zsh-completion harfbuzz pulseaudio minizip text dbus bluetooth"
-
-# Portage Logging
-PORTAGE_ELOG_CLASSES="log warn error"
-PORTAGE_ELOG_SYSTEM="save"
-PORTAGE_LOGDIR="/var/log/portage"
-
-# Temporary Files
-PORTAGE_TMPDIR="/var/tmp/portage"
diff --git a/gentoo/portage/package.accept_keywords/package.unmask b/gentoo/portage/package.accept_keywords/package.unmask
new file mode 100644
index 00000000..ecf65935
--- /dev/null
+++ b/gentoo/portage/package.accept_keywords/package.unmask
@@ -0,0 +1,17 @@
+>=x11-misc/pcmanfm-1.3.2
+>=x11-libs/libfm-1.3.2
+>=app-misc/tealdeer-1.8.1 ~amd64
+>=gui-apps/gcolor3-2.4.0 ~amd64
+>=sys-fs/duf-0.9.1 ~amd64
+>=media-sound/pamixer-1.6 ~amd64
+>=games-util/lutris-0.5.19 ~amd64
+>=dev-python/pypresence-4.6.1 ~amd64
+>=dev-python/moddb-0.13.0 ~amd64
+>=dev-util/difftastic-0.67.0 ~amd64
+>=games-util/mangohud-0.8.1 ~amd64
+>=media-libs/imgui-1.89.9 ~amd64
+>=media-libs/implot-0.16-r2 ~amd64
+>=dev-util/rustup-1.28.2-r2 ~amd64
+>=app-editors/micro-2.0.13-r1 ~amd64
+>=gui-wm/river-0.3.12 ~amd64
+>=app-emulation/wine-staging-10.20 ~amd64
diff --git a/gentoo/portage/package.accept_keywords/steam b/gentoo/portage/package.accept_keywords/steam
new file mode 100644
index 00000000..6f77faac
--- /dev/null
+++ b/gentoo/portage/package.accept_keywords/steam
@@ -0,0 +1,3 @@
+*/*::steam-overlay
+games-util/game-device-udev-rules
+sys-libs/libudev-compat
diff --git a/gentoo/portage/package.accept_keywords/zz-autounmask b/gentoo/portage/package.accept_keywords/zz-autounmask
deleted file mode 100644
index 25a09da0..00000000
--- a/gentoo/portage/package.accept_keywords/zz-autounmask
+++ /dev/null
@@ -1,1789 +0,0 @@
-# package.accept_keywords# required by app-misc/tealdeer (argument)
-=app-misc/tealdeer-1.8.1 ~amd64
-# required by x11-misc/xbanish (argument)
-=x11-misc/xbanish-1.8_p20230519 ~amd64
-# required by x11-misc/pcmanfm-1.3.2-r2::gentoo
-# required by x11-misc/pcmanfm (argument)
-=x11-libs/libfm-1.3.2-r1 ~amd64
-# required by x11-misc/pcmanfm (argument)
-=x11-misc/pcmanfm-1.3.2-r2 ~amd64
-# required by gcolor3 (argument)
-=gui-apps/gcolor3-2.4.0 ~amd64
-# required by difftastic (argument)
-=dev-util/difftastic-0.67.0 ~amd64
-# required by dev-haskell/hslua-2.3.0::gentoo
-# required by dev-haskell/hslua-module-doclayout-1.1.0::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-aeson-2.3.0.1 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/commonmark-0.2.3 ~amd64
-# required by dev-haskell/hslua-module-system-1.1.0.1::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/temporary-1.3-r1 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/sha-1.6.4.4 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/blaze-html-0.9.1.2-r2 ~amd64
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/tls-1.8.0 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-2.3.0 ~amd64
-# required by dev-haskell/zip-archive-0.4.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/digest-0.0.1.3 ~amd64
-# required by dev-haskell/http-media-0.8.0.0::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/utf8-string-1.0.2 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/yaml-0.11.11.2 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/singleton-bool-0.1.7 ~amd64
-# required by dev-haskell/optparse-applicative-0.18.1.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/prettyprinter-ansi-terminal-1.1.3 ~amd64
-# required by dev-haskell/xml-conduit-1.9.1.3::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/conduit-extra-1.3.6-r1 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-module-text-1.1.0.1 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/scientific-0.3.7.0-r2 ~amd64
-# required by dev-haskell/http-client-0.7.14::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/streaming-commons-0.2.2.5 ~amd64
-# required by dev-haskell/asn1-parse-0.9.5::gentoo
-# required by dev-haskell/crypton-x509-1.7.6::gentoo
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/asn1-encoding-0.9.6 ~amd64
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hunit-1.6.2.0-r1 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/lpeg-1.0.4 ~amd64
-# required by dev-haskell/hunit-1.6.2.0-r1::gentoo
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/call-stack-0.4.0 ~amd64
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/wai-cors-0.2.7 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/onetuple-0.4.1.1 ~amd64
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/toml-parser-1.3.0.0 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-module-system-1.1.0.1 ~amd64
-# required by dev-haskell/hslua-module-zip-1.1.0::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-typing-0.1.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/juicypixels-3.3.7 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/bsb-http-chunked-0.0.0.4-r1 ~amd64
-# required by dev-haskell/cassava-0.5.3.0::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/only-0.1 ~amd64
-# required by dev-haskell/attoparsec-iso8601-1.1.0.0-r1::gentoo
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base-compat-batteries-0.13.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/citeproc-0.8.1 ~amd64
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/iproute-1.7.12 ~amd64
-# required by dev-haskell/ansi-terminal-1.0::gentoo
-# required by dev-haskell/prettyprinter-ansi-terminal-1.1.3::gentoo
-# required by dev-haskell/optparse-applicative-0.18.1.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/colour-2.3.6 ~amd64
-# required by dev-haskell/comonad-5.0.8-r1::gentoo
-# required by dev-haskell/bifunctors-5.5.15::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/distributive-0.6.2.1 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/wai-app-static-3.1.7.2-r1 ~amd64
-# required by dev-haskell/singleton-bool-0.1.7::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/boring-0.2.1 ~amd64
-# required by dev-haskell/semigroupoids-5.3.7-r1::gentoo
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/comonad-5.0.8-r1 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/time-manager-0.0.0 ~amd64
-# required by dev-haskell/data-default-0.7.1.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-default-instances-old-locale-0.0.1 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pandoc-lua-marshal-0.2.2 ~amd64
-# required by dev-haskell/mono-traversable-1.0.15.3::gentoo
-# required by dev-haskell/conduit-1.3.4.3::gentoo
-# required by dev-haskell/libyaml-0.1.2::gentoo
-# required by dev-haskell/yaml-0.11.11.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/vector-algorithms-0.9.0.1-r1 ~amd64
-# required by dev-haskell/texmath-0.12.8.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/syb-0.7.2.4 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http-api-data-0.5.1 ~amd64
-# required by dev-haskell/tls-1.8.0::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/crypton-x509-validation-1.6.12 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/word8-0.1.3 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-repl-0.1.1 ~amd64
-# required by dev-haskell/tls-1.8.0::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cereal-0.5.8.3 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/xml-types-0.3.8 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-module-path-1.1.0 ~amd64
-# required by dev-haskell/skylighting-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/skylighting-format-latex-0.1 ~amd64
-# required by dev-haskell/crypton-x509-1.7.6::gentoo
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/crypton-0.32 ~amd64
-# required by dev-haskell/toml-parser-1.3.0.0::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/alex-3.2.7.2 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/monad-control-1.0.3.1 ~amd64
-# required by dev-haskell/memory-0.18.0::gentoo
-# required by dev-haskell/crypton-x509-validation-1.6.12::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/basement-0.0.16 ~amd64
-# required by dev-haskell/attoparsec-iso8601-1.1.0.0-r1::gentoo
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/time-compat-1.9.6.1-r1 ~amd64
-# required by dev-haskell/doclayout-0.4.0.1::gentoo
-# required by dev-haskell/gridtables-0.1.0.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/emojis-0.1.3 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/ipynb-0.2 ~amd64
-# required by dev-haskell/skylighting-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/skylighting-core-0.14 ~amd64
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-cli-1.4.1 ~amd64
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/typst-symbols-0.1.4 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/transformers-base-0.4.6 ~amd64
-# required by dev-haskell/data-default-0.7.1.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-default-instances-dlist-0.0.1 ~amd64
-# required by dev-haskell/conduit-1.3.4.3::gentoo
-# required by dev-haskell/libyaml-0.1.2::gentoo
-# required by dev-haskell/yaml-0.11.11.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/mono-traversable-1.0.15.3 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/zip-archive-0.4.3 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/tagsoup-0.14.8 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/commonmark-extensions-0.2.3.5 ~amd64
-# required by dev-haskell/statevar-1.2.2::gentoo
-# required by dev-haskell/contravariant-1.5.5::gentoo[statevar]
-# required by dev-haskell/semigroupoids-5.3.7-r1::gentoo
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/stm-2.5.0.2-r1 ~amd64
-# required by dev-haskell/skylighting-core-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/xml-conduit-1.9.1.3 ~amd64
-# required by dev-haskell/appar-0.1.8::gentoo
-# required by dev-haskell/iproute-1.7.12::gentoo
-# required by dev-haskell/http-client-0.7.14::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/fail-4.9.0.0 ~amd64
-# required by dev-haskell/hslua-packaging-2.3.0::gentoo
-# required by dev-haskell/hslua-2.3.0::gentoo
-# required by dev-haskell/hslua-module-doclayout-1.1.0::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-objectorientation-2.3.0 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base64-bytestring-1.2.1.0 ~amd64
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base64-0.4.2.4 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/jira-wiki-markup-1.5.1 ~amd64
-# required by dev-haskell/fast-logger-3.2.2::gentoo
-# required by dev-haskell/wai-logger-2.4.0::gentoo
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/easy-file-0.2.2 ~amd64
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cmdargs-0.10.22 ~amd64
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/digits-0.3.1 ~amd64
-# required by dev-haskell/toml-parser-1.3.0.0::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/happy-1.20.1.1 ~amd64
-# required by dev-haskell/time-compat-1.9.6.1-r1::gentoo
-# required by dev-haskell/attoparsec-iso8601-1.1.0.0-r1::gentoo
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base-orphans-0.9.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/glob-0.10.2 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/zlib-0.6.3.0 ~amd64
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/socks-0.6.1 ~amd64
-# required by dev-haskell/iproute-1.7.12::gentoo
-# required by dev-haskell/http-client-0.7.14::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/appar-0.1.8 ~amd64
-# required by dev-haskell/hslua-module-system-1.1.0.1::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-marshalling-2.3.0 ~amd64
-# required by dev-haskell/hslua-core-2.3.1::gentoo
-# required by dev-haskell/hslua-cli-1.4.1::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/lua-2.3.1 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/texmath-0.12.8.3 ~amd64
-# required by dev-haskell/scientific-0.3.7.0-r2::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hashable-1.4.2.0-r2 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pandoc-3.1.8-r2 ~amd64
-# required by dev-haskell/skylighting-format-ansi-0.1::gentoo
-# required by dev-haskell/skylighting-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/ansi-terminal-1.0 ~amd64
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cryptonite-0.30 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/aeson-pretty-0.8.10 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-module-version-1.1.0 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/network-uri-2.6.4.2 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/resourcet-1.2.6 ~amd64
-# required by dev-haskell/base64-0.4.2.4::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/text-1.2.5.0-r1 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/sop-core-0.5.0.2 ~amd64
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-default-0.7.1.1 ~amd64
-# required by dev-haskell/base64-0.4.2.4::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/text-short-0.1.5-r1 ~amd64
-# required by dev-haskell/mono-traversable-1.0.15.3::gentoo
-# required by dev-haskell/conduit-1.3.4.3::gentoo
-# required by dev-haskell/libyaml-0.1.2::gentoo
-# required by dev-haskell/yaml-0.11.11.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/split-0.2.3.5 ~amd64
-# required by dev-haskell/singleton-bool-0.1.7::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/some-1.0.5 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pretty-show-1.10 ~amd64
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unix-compat-0.7 ~amd64
-# required by dev-haskell/juicypixels-3.3.7::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/vector-0.12.3.1-r1 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/servant-0.20 ~amd64
-# required by dev-haskell/ansi-terminal-1.0::gentoo
-# required by dev-haskell/prettyprinter-ansi-terminal-1.1.3::gentoo
-# required by dev-haskell/optparse-applicative-0.18.1.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/ansi-terminal-types-0.11.5 ~amd64
-# required by dev-haskell/quickcheck-2.14.3::gentoo
-# required by dev-haskell/digits-0.3.1::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/splitmix-0.1.0.4 ~amd64
-# required by dev-haskell/citeproc-0.8.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unicode-collation-0.1.3.4 ~amd64
-# required by dev-haskell/transformers-base-0.4.6::gentoo
-# required by dev-haskell/monad-control-1.0.3.1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/transformers-compat-0.7.2 ~amd64
-# required by dev-haskell/skylighting-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/skylighting-format-context-0.1.0.1 ~amd64
-# required by dev-haskell/contravariant-1.5.5::gentoo[statevar]
-# required by dev-haskell/semigroupoids-5.3.7-r1::gentoo
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/statevar-1.2.2 ~amd64
-# required by dev-haskell/th-lift-instances-0.1.20::gentoo
-# required by dev-haskell/unicode-collation-0.1.3.4::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/th-lift-0.8.4 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/simple-sendfile-0.2.30-r1 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/quickcheck-2.14.3 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-module-zip-1.1.0 ~amd64
-# required by dev-haskell/semigroupoids-5.3.7-r1::gentoo
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/bifunctors-5.5.15 ~amd64
-# required by dev-haskell/skylighting-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/skylighting-format-ansi-0.1 ~amd64
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/crypton-x509-store-1.6.9 ~amd64
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/optparse-applicative-0.18.1.0 ~amd64
-# required by dev-haskell/haddock-library-1.10.0-r2::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/parsec-3.1.15.0-r1 ~amd64
-# required by dev-haskell/citeproc-0.8.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/uniplate-1.6.13 ~amd64
-# required by dev-haskell/crypton-0.32::gentoo
-# required by dev-haskell/crypton-x509-store-1.6.9::gentoo
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/memory-0.18.0 ~amd64
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unordered-containers-0.2.19.1 ~amd64
-# required by dev-haskell/asn1-encoding-0.9.6::gentoo
-# required by dev-haskell/crypton-x509-store-1.6.9::gentoo
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hourglass-0.2.12-r1 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/case-insensitive-1.2.1.0 ~amd64
-# required by dev-haskell/semialign-1.3::gentoo
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/indexed-traversable-instances-0.1.1.2 ~amd64
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/semigroupoids-5.3.7-r1 ~amd64
-# required by dev-haskell/singleton-bool-0.1.7::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/dec-0.0.5 ~amd64
-# required by dev-haskell/recv-0.1.0::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/network-3.1.3.0 ~amd64
-# required by dev-haskell/pandoc-lua-marshal-0.2.2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-list-1.1.1 ~amd64
-# required by dev-haskell/toml-parser-1.3.0.0::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/prettyprinter-1.7.1 ~amd64
-# required by dev-haskell/commonmark-0.2.3::gentoo
-# required by dev-haskell/commonmark-extensions-0.2.3.5::gentoo
-# required by dev-haskell/commonmark-pandoc-0.2.1.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unicode-data-0.4.0.1 ~amd64
-# required by dev-haskell/hslua-aeson-2.3.0.1::gentoo
-# required by dev-haskell/hslua-2.3.0::gentoo
-# required by dev-haskell/hslua-module-doclayout-1.1.0::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/aeson-2.1.2.1 ~amd64
-# required by dev-haskell/hslua-module-text-1.1.0.1::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-packaging-2.3.0 ~amd64
-# required by dev-haskell/text-conversions-0.3.1.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base16-bytestring-1.0.2.0 ~amd64
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/crypton-x509-system-1.6.7 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/random-1.2.1.1 ~amd64
-# required by dev-haskell/http2-4.1.2::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/psqueues-0.2.7.3 ~amd64
-# required by app-text/pandoc (argument)
-=app-text/pandoc-3 ~amd64
-# required by dev-haskell/http2-4.1.2::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/network-byte-order-0.1.6 ~amd64
-# required by dev-haskell/bifunctors-5.5.15::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/th-abstraction-0.4.5.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/commonmark-pandoc-0.2.1.3 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/haddock-library-1.10.0-r2 ~amd64
-# required by dev-haskell/pretty-show-1.10::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/haskell-lexer-1.1 ~amd64
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/wai-logger-2.4.0 ~amd64
-# required by dev-haskell/iproute-1.7.12::gentoo
-# required by dev-haskell/http-client-0.7.14::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/byteorder-1.0.4 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/doctemplates-0.11 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/blaze-markup-0.8.2.8-r1 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/mime-types-0.1.1.0 ~amd64
-# required by dev-haskell/constraints-0.13.4::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/type-equality-1 ~amd64
-# required by dev-haskell/unix-time-0.4.10::gentoo
-# required by dev-haskell/tls-1.8.0::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/old-time-1.1.0.3-r1 ~amd64
-# required by dev-haskell/blaze-markup-0.8.2.8-r1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/blaze-builder-0.4.2.2 ~amd64
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/servant-server-0.20 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/primitive-0.7.4.0 ~amd64
-# required by dev-haskell/unliftio-0.2.23.0-r1::gentoo
-# required by dev-haskell/http2-4.1.2::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/async-2.2.4-r1 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-fix-0.3.2-r1 ~amd64
-# required by dev-haskell/regex-tdfa-1.3.2.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/regex-base-0.94.0.2 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http-media-0.8.0.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/text-conversions-0.3.1.1 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/generically-0.1.1-r1 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/xml-1.3.14 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/crypton-connection-0.3.1 ~amd64
-# required by dev-haskell/unliftio-0.2.23.0-r1::gentoo
-# required by dev-haskell/http2-4.1.2::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unliftio-core-0.2.1.0 ~amd64
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/attoparsec-aeson-2.1.0.0 ~amd64
-# required by dev-haskell/conduit-extra-1.3.6-r1::gentoo
-# required by dev-haskell/xml-conduit-1.9.1.3::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/typed-process-0.2.10.1-r1 ~amd64
-# required by dev-haskell/hslua-repl-0.1.1::gentoo
-# required by dev-haskell/hslua-cli-1.4.1::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/isocline-1.0.9 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unicode-transforms-0.4.0.1 ~amd64
-# required by dev-haskell/data-default-0.7.1.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-default-class-0.1.2.0 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/indexed-traversable-0.1.2.1 ~amd64
-# required by dev-haskell/xml-conduit-1.9.1.3::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cabal-doctest-1.0.9-r1 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/vault-0.3.1.5-r2 ~amd64
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pandoc-server-0.1.0.3 ~amd64
-# required by dev-haskell/hashable-1.4.2.0-r2::gentoo
-# required by dev-haskell/cassava-0.5.3.0::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-array-byte-0.1.0.1 ~amd64
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/wai-extra-3.1.13.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http-client-tls-0.3.6.3 ~amd64
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cookie-0.4.5 ~amd64
-# required by dev-haskell/unicode-collation-0.1.3.4::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/th-lift-instances-0.1.20 ~amd64
-# required by dev-haskell/network-uri-2.6.4.2::gentoo
-# required by dev-haskell/commonmark-extensions-0.2.3.5::gentoo
-# required by dev-haskell/commonmark-pandoc-0.2.1.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/th-compat-0.1.4 ~amd64
-# required by dev-haskell/fast-logger-3.2.2::gentoo
-# required by dev-haskell/wai-logger-2.4.0::gentoo
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unix-time-0.4.10 ~amd64
-# required by dev-haskell/semigroupoids-5.3.7-r1::gentoo
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/tagged-0.8.7 ~amd64
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=app-text/pandoc-cli-0.1.1-r1 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http2-4.1.2 ~amd64
-# required by dev-haskell/crypton-x509-store-1.6.9::gentoo
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pem-0.2.4 ~amd64
-# required by dev-haskell/crypton-x509-validation-1.6.12::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/crypton-x509-1.7.6 ~amd64
-# required by dev-haskell/attoparsec-iso8601-1.1.0.0-r1::gentoo
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/attoparsec-0.14.4-r1 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/recv-0.1.0 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/dlist-1.0 ~amd64
-# required by dev-haskell/base-compat-batteries-0.13.0::gentoo
-# required by dev-haskell/attoparsec-iso8601-1.1.0.0-r1::gentoo
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base-compat-0.13.0 ~amd64
-# required by dev-haskell/these-1.2::gentoo
-# required by dev-haskell/semialign-1.3::gentoo
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/assoc-1.1 ~amd64
-# required by dev-haskell/crypton-x509-validation-1.6.12::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/asn1-types-0.3.4 ~amd64
-# required by dev-haskell/data-default-0.7.1.1::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/data-default-instances-containers-0.0.1 ~amd64
-# required by dev-haskell/crypton-x509-1.7.6::gentoo
-# required by dev-haskell/crypton-x509-system-1.6.7::gentoo
-# required by dev-haskell/crypton-connection-0.3.1::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/asn1-parse-0.9.5 ~amd64
-# required by dev-haskell/base64-0.4.2.4::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cabal-3.6.3.0 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http-date-0.0.11 ~amd64
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/old-locale-1.0.0.7 ~amd64
-# required by dev-haskell/libyaml-0.1.2::gentoo
-# required by dev-haskell/yaml-0.11.11.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/conduit-1.3.4.3 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/skylighting-0.14 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/strict-0.5 ~amd64
-# required by dev-haskell/scientific-0.3.7.0-r2::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/integer-logarithms-1.0.3.1-r2 ~amd64
-# required by dev-haskell/case-insensitive-1.2.1.0::gentoo
-# required by dev-haskell/http-client-0.7.14::gentoo
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/semigroups-0.20 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/doclayout-0.4.0.1 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/typst-0.3.2.0 ~amd64
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http-types-0.12.3 ~amd64
-# required by dev-haskell/http2-4.1.2::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/unliftio-0.2.23.0-r1 ~amd64
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/ordered-containers-0.2.3 ~amd64
-# required by dev-haskell/yaml-0.11.11.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/libyaml-0.1.2 ~amd64
-# required by dev-haskell/skylighting-0.14::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/skylighting-format-blaze-html-0.1.1.1 ~amd64
-# required by dev-haskell/strict-0.5::gentoo
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/these-1.2 ~amd64
-# required by dev-haskell/onetuple-0.4.1.1::gentoo
-# required by dev-haskell/base-compat-batteries-0.13.0::gentoo
-# required by dev-haskell/attoparsec-iso8601-1.1.0.0-r1::gentoo
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/foldable1-classes-compat-0.1 ~amd64
-# required by dev-haskell/cabal-3.6.3.0::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-lang/ghc-9.2.8 ~amd64
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/regex-tdfa-1.3.2.2 ~amd64
-# required by dev-haskell/vector-algorithms-0.9.0.1-r1::gentoo
-# required by dev-haskell/mono-traversable-1.0.15.3::gentoo
-# required by dev-haskell/conduit-1.3.4.3::gentoo
-# required by dev-haskell/libyaml-0.1.2::gentoo
-# required by dev-haskell/yaml-0.11.11.2::gentoo
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/bitvec-1.1.3.0 ~amd64
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/warp-3.3.28 ~amd64
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/wai-3.2.3 ~amd64
-# required by dev-haskell/happy-1.20.1.1::gentoo
-# required by dev-haskell/pretty-show-1.10::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/mtl-2.2.2-r1 ~amd64
-# required by dev-haskell/wai-logger-2.4.0::gentoo
-# required by dev-haskell/wai-extra-3.1.13.0::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/fast-logger-3.2.2 ~amd64
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/constraints-0.13.4 ~amd64
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/auto-update-0.1.6 ~amd64
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-module-doclayout-1.1.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pandoc-types-1.23.1 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/mmorph-1.2.0 ~amd64
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/gridtables-0.1.0.0 ~amd64
-# required by dev-haskell/http-client-tls-0.3.6.3::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/http-client-0.7.14 ~amd64
-# required by dev-lang/ghc-9.2.8::gentoo[-ghcbootstrap]
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=app-admin/haskell-updater-1.4.1.0 ~amd64
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/file-embed-0.0.15.0 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/uuid-types-1.0.5-r1 ~amd64
-# required by dev-haskell/pandoc-lua-marshal-0.2.2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/safe-0.3.19 ~amd64
-# required by dev-haskell/hslua-repl-0.1.1::gentoo
-# required by dev-haskell/hslua-cli-1.4.1::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-core-2.3.1 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/witherable-0.4.2-r1 ~amd64
-# required by dev-haskell/unliftio-0.2.23.0-r1::gentoo
-# required by dev-haskell/http2-4.1.2::gentoo
-# required by dev-haskell/warp-3.3.28::gentoo
-# required by dev-haskell/wai-app-static-3.1.7.2-r1::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/safe-exceptions-0.1.7.3 ~amd64
-# required by dev-haskell/hslua-2.3.0::gentoo
-# required by dev-haskell/hslua-module-doclayout-1.1.0::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/hslua-classes-2.3.0 ~amd64
-# required by dev-haskell/typst-0.3.2.0::gentoo
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/cassava-0.5.3.0 ~amd64
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/pandoc-lua-engine-0.2.1.2 ~amd64
-# required by dev-haskell/wai-cors-0.2.7::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/base-unicode-symbols-0.2.4.2 ~amd64
-# required by dev-haskell/semigroupoids-5.3.7-r1::gentoo
-# required by dev-haskell/semialign-1.3::gentoo[semigroupoids]
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/contravariant-1.5.5 ~amd64
-# required by dev-haskell/http-api-data-0.5.1::gentoo
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/attoparsec-iso8601-1.1.0.0-r1 ~amd64
-# required by dev-haskell/servant-0.20::gentoo
-# required by dev-haskell/servant-server-0.20::gentoo
-# required by dev-haskell/pandoc-server-0.1.0.3::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[server]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/string-conversions-0.4.0.1 ~amd64
-# required by dev-haskell/aeson-2.1.2.1::gentoo
-# required by dev-haskell/attoparsec-aeson-2.1.0.0::gentoo
-# required by dev-haskell/aeson-pretty-0.8.10::gentoo[executable]
-# required by dev-haskell/pandoc-3.1.8-r2::gentoo
-# required by dev-haskell/pandoc-lua-engine-0.2.1.2::gentoo
-# required by app-text/pandoc-cli-0.1.1-r1::gentoo[lua]
-# required by app-text/pandoc-3::gentoo
-# required by app-text/pandoc (argument)
-=dev-haskell/semialign-1.3 ~amd64
diff --git a/gentoo/portage/package.license/steam b/gentoo/portage/package.license/steam
new file mode 100644
index 00000000..1e1fb7e1
--- /dev/null
+++ b/gentoo/portage/package.license/steam
@@ -0,0 +1 @@
+games-util/steam-launcher ValveSteamLicense
diff --git a/gentoo/portage/package.mask/systemd b/gentoo/portage/package.mask/systemd
new file mode 100644
index 00000000..9b52e5de
--- /dev/null
+++ b/gentoo/portage/package.mask/systemd
@@ -0,0 +1 @@
+sys-apps/systemd
diff --git a/gentoo/portage/package.use/00video_cards b/gentoo/portage/package.use/00video_cards
index f3b4deb8..f503098c 100644
--- a/gentoo/portage/package.use/00video_cards
+++ b/gentoo/portage/package.use/00video_cards
@@ -1 +1 @@
-*/* VIDEO_CARDS: virgl
+*/* VIDEO_CARDS: nvidia
diff --git a/gentoo/portage/package.use/00xorg_entries b/gentoo/portage/package.use/00xorg_entries
new file mode 100644
index 00000000..b99a910a
--- /dev/null
+++ b/gentoo/portage/package.use/00xorg_entries
@@ -0,0 +1 @@
+*/* INPUT_DEVICES: libinput wacom
diff --git a/gentoo/portage/package.use/doas b/gentoo/portage/package.use/doas
deleted file mode 100644
index 2d1cc48a..00000000
--- a/gentoo/portage/package.use/doas
+++ /dev/null
@@ -1 +0,0 @@
-app-admin/doas persist
diff --git a/gentoo/portage/package.use/installkernel b/gentoo/portage/package.use/installkernel
deleted file mode 100644
index 6821038f..00000000
--- a/gentoo/portage/package.use/installkernel
+++ /dev/null
@@ -1,11 +0,0 @@
-sys-kernel/installkernel grub dracut
-# required by media-libs/mesa-25.1.9::gentoo
-# required by x11-drivers/xf86-video-ati-22.0.0::gentoo
-# required by x11-base/xorg-drivers-21.1-r2::gentoo[video_cards_radeonsi,video_cards_radeon]
-# required by x11-base/xorg-server-21.1.20::gentoo[xorg]
-# required by x11-drivers/xf86-input-libinput-1.5.0::gentoo
->=media-libs/libglvnd-1.7.0 X
-# required by x11-base/xorg-server-21.1.20::gentoo[elogind]
-# required by x11-drivers/xf86-input-libinput-1.5.0::gentoo
-# required by x11-base/xorg-drivers-21.1-r2::gentoo[input_devices_libinput]
->=sys-auth/pambase-20251013 elogind
diff --git a/gentoo/portage/package.use/krita b/gentoo/portage/package.use/krita
deleted file mode 100644
index 9123cbe6..00000000
--- a/gentoo/portage/package.use/krita
+++ /dev/null
@@ -1 +0,0 @@
-media-gfx/krita declarative network
diff --git a/gentoo/portage/package.use/librewolf-bin b/gentoo/portage/package.use/librewolf-bin
deleted file mode 100644
index 05239976..00000000
--- a/gentoo/portage/package.use/librewolf-bin
+++ /dev/null
@@ -1 +0,0 @@
-www-client/librewolf-bin harfbuzz pulseaudio system-pipewire
diff --git a/gentoo/portage/package.use/onlyoffice-bin b/gentoo/portage/package.use/onlyoffice-bin
deleted file mode 100644
index c5acd70c..00000000
--- a/gentoo/portage/package.use/onlyoffice-bin
+++ /dev/null
@@ -1 +0,0 @@
-app-office/onlyoffice-bin egl
diff --git a/gentoo/portage/package.use/package.use b/gentoo/portage/package.use/package.use
new file mode 100644
index 00000000..8bf1f9e5
--- /dev/null
+++ b/gentoo/portage/package.use/package.use
@@ -0,0 +1,1093 @@
+# required by x11-libs/pango-1.57.0::gentoo
+# required by gnome-base/librsvg-2.60.0::gentoo
+# required by x11-themes/adwaita-icon-theme-legacy-46.2::gentoo
+# required by x11-themes/adwaita-icon-theme-48.1::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gnome-extra/polkit-gnome-0.105-r2::gentoo
+# required by sys-auth/polkit-126-r2::gentoo[gtk]
+# required by sys-auth/elogind-255.17-r1::gentoo[policykit]
+# required by sys-apps/dbus-1.16.2::gentoo[elogind]
+# required by gnome-base/dconf-0.40.0::gentoo
+# required by dev-libs/glib-2.84.4::gentoo[dbus]
+# required by x11-libs/gdk-pixbuf-2.42.12::gentoo
+# required by dev-util/gtk-update-icon-cache-3.24.42::gentoo
+>=media-libs/harfbuzz-12.1.0 truetype
+sys-kernel/installkernel grub dracut
+app-admin/doas persist
+# required by media-sound/pulseaudio-daemon-17.0-r1::gentoo[alsa,alsa-plugin]
+# required by media-libs/libpulse-17.0::gentoo
+# required by media-sound/pavucontrol-6.1-r1::gentoo
+# required by media-sound/pavucontrol (argument)
+>=media-plugins/alsa-plugins-1.2.12 pulseaudio
+media-video/mpv pipewire pulseaudio vaapi
+# required by media-video/mpv-0.40.0-r3::gentoo
+# required by media-video/mpv (argument)
+>=media-video/ffmpeg-7.1.2 vaapi
+# required by xfce-base/xfce4-panel-4.20.5::gentoo[dbusmenu]
+# required by xfce-extra/xfce4-screenshooter-1.11.3::gentoo
+# required by xfce-extra/xfce4-screenshooter (argument)
+>=dev-libs/libdbusmenu-16.04.0-r4 gtk3
+# required by www-client/ungoogled-chromium-bin-142.0.7444.175::pf4public
+# required by ungoogled-chromium-bin (argument)
+>=sys-libs/zlib-1.3.1-r1 minizip
+sys-auth/seatd builtin server
+x11-base/xorg-server suid
+#net-print/cups zeroconf
+#net-print/cups-meta zeroconf
+sys-libs/ncurses abi_x86_32
+net-firewall/ufw ipv6
+app-containers/docker apparmor
+# required by app-containers/docker-28.0.4::gentoo
+# required by app-containers/docker (argument)
+>=app-containers/containerd-2.1.4 apparmor
+# required by app-containers/containerd-2.1.4::gentoo
+# required by app-containers/docker-28.0.4::gentoo
+# required by app-containers/docker (argument)
+>=app-containers/runc-1.3.3 apparmor
+sys-fs/android-file-transfer-linux fuse
+dev-qt/qtwidgets gtk
+net-libs/nodejs npm
+media-gfx/imagemagick heif jpeg svg tiff webp
+# required by media-gfx/imagemagick-7.1.2.3-r1::gentoo[heif]
+# required by media-gfx/imagemagick (argument)
+>=media-libs/libheif-1.19.8 x265
+# required by app-emulation/wine-proton-10.0.2d::gentoo
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libgcrypt-1.11.2 abi_x86_32
+# required by x11-libs/pango-1.57.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/freetype-2.14.1-r1 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libglvnd-1.7.0 abi_x86_32
+# required by app-emulation/wine-proton-10.0.2d::gentoo
+# required by app-emulation/wine-proton (argument)
+>=media-libs/vulkan-loader-1.4.328.0 abi_x86_32
+# required by media-libs/libsdl2-2.32.6::gentoo[X]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXcursor-1.2.3 abi_x86_32
+# required by media-libs/libsdl2-2.32.6::gentoo[X]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXfixes-6.0.2 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo[X]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXi-1.8.2 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo[X]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXrandr-1.5.4 abi_x86_32
+# required by x11-libs/libXft-2.3.9::gentoo
+# required by x11-libs/pango-1.57.0::gentoo[X]
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXrender-0.9.12 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXxf86vm-1.1.6 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo[X]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXcomposite-0.4.6 abi_x86_32
+# required by net-print/cups-2.4.14::gentoo[dbus]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=sys-apps/dbus-1.16.2 abi_x86_32
+# required by x11-libs/pango-1.57.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/fontconfig-2.17.1 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libsdl2-2.32.6 abi_x86_32
+# required by dev-libs/nettle-3.10.2::gentoo[gmp]
+# required by net-libs/gnutls-3.8.10-r1::gentoo
+# required by net-print/cups-2.4.14::gentoo[-openssl]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/gmp-6.3.0-r1 abi_x86_32
+# required by net-print/cups-2.4.14::gentoo[-openssl]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=net-libs/gnutls-3.8.10-r1 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libX11-1.8.12 abi_x86_32
+# required by x11-libs/cairo-1.18.4-r1::gentoo[X]
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXext-1.3.6 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[alsa]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/alsa-lib-1.2.14 abi_x86_32
+# required by media-libs/gst-plugins-bad-1.24.11::gentoo
+# required by media-plugins/gst-plugins-faad-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[aac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/glib-2.84.4 abi_x86_32
+# required by media-libs/gst-plugins-ugly-1.24.11::gentoo
+# required by media-plugins/gst-plugins-a52dec-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[a52,dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/gst-plugins-base-1.24.11-r1 abi_x86_32
+# required by media-plugins/gst-plugins-dvdread-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/gstreamer-1.24.11 abi_x86_32
+# required by app-emulation/wine-proton-10.0.2d::gentoo[-llvm-libunwind,unwind]
+# required by app-emulation/wine-proton (argument)
+>=sys-libs/libunwind-1.8.2-r1 abi_x86_32
+# required by app-emulation/wine-proton-10.0.2d::gentoo[usb]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libusb-1.0.29 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libdrm-2.4.127 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[wayland,opengl,gles2]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/wayland-1.24.0 abi_x86_32
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libxkbcommon-1.12.3 abi_x86_32
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/gst-plugins-bad-1.24.11 abi_x86_32
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-libav-1.24.11 abi_x86_32
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-meta-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-flac-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[flac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/gst-plugins-good-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[a52,dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-a52dec-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[aac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-faad-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dts]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-dts-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[mp3,dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/gst-plugins-ugly-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-dvdread-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dvd,mpeg,-vcd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-mpeg2dec-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-resindvd-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[flac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-flac-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[mp3]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-mpg123-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[x264]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-x264-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-x264-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[x264]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/x264-0.0.20240513 abi_x86_32
+# required by media-plugins/gst-plugins-mpg123-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[mp3]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-sound/mpg123-base-1.32.10-r2 abi_x86_32
+# required by media-plugins/gst-plugins-flac-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[flac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/flac-1.5.0 abi_x86_32
+# required by media-libs/libvorbis-1.3.7-r2::gentoo
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[vorbis]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libogg-1.3.5-r2 abi_x86_32
+# required by media-plugins/gst-plugins-resindvd-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libdvdnav-6.1.1 abi_x86_32
+# required by media-libs/libdvdnav-6.1.1::gentoo
+# required by media-video/ffmpeg-7.1.2::gentoo[dvd]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libdvdread-6.1.3 abi_x86_32
+# required by media-libs/libdvdread-6.1.3::gentoo[css]
+# required by media-video/ffmpeg-7.1.2::gentoo[dvd]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libdvdcss-1.4.3 abi_x86_32
+# required by media-plugins/gst-plugins-mpeg2dec-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dvd,mpeg,-vcd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libmpeg2-0.5.1-r3 abi_x86_32
+# required by media-plugins/gst-plugins-dts-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[dts]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libdca-0.0.7 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[orc]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-lang/orc-0.4.41 abi_x86_32
+# required by media-plugins/gst-plugins-faad-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[aac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/faad2-2.11.1 abi_x86_32
+# required by media-plugins/gst-plugins-a52dec-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[a52,dvd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/a52dec-0.7.4-r9 abi_x86_32
+# required by media-libs/gst-plugins-bad-1.24.11::gentoo[bzip2]
+# required by media-plugins/gst-plugins-faad-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[aac]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=app-arch/bzip2-1.0.8-r5 abi_x86_32
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-video/ffmpeg-7.1.2 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[X]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXv-1.0.13 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libxcb-1.17.0 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[dav1d]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/dav1d-1.5.0 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[jpegxl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libjxl-0.11.1 abi_x86_32
+# required by media-libs/libjxl-0.11.1::gentoo
+# required by media-video/ffmpeg-7.1.2::gentoo[jpegxl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/lcms-2.17 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[libass]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libass-0.17.4 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[svg]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=gnome-base/librsvg-2.60.0 abi_x86_32
+# required by x11-libs/pango-1.57.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/cairo-1.18.4-r1 abi_x86_32
+# required by x11-libs/pango-1.57.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/harfbuzz-12.1.0 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[vaapi]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libva-2.22.0-r1 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[vdpau]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libvdpau-1.5 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[vorbis]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libvorbis-1.3.7-r2 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[webp]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libwebp-1.5.0 abi_x86_32
+# required by llvm-core/llvm-20.1.8::gentoo[xml]
+# required by media-libs/mesa-25.2.7::gentoo[llvm_slot_20,llvm]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libxml2-2.15.0-r1 abi_x86_32
+# required by media-video/ffmpeg-7.1.2::gentoo[xvid]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/xvid-1.3.7-r2 abi_x86_32
+# required by media-libs/harfbuzz-12.1.0::gentoo[icu]
+# required by media-libs/freetype-2.14.1-r1::gentoo[harfbuzz]
+# required by media-libs/fontconfig-2.17.1::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/icu-77.1 abi_x86_32
+# required by media-libs/harfbuzz-12.1.0::gentoo[graphite]
+# required by media-libs/freetype-2.14.1-r1::gentoo[harfbuzz]
+# required by media-libs/fontconfig-2.17.1::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-gfx/graphite2-1.3.14_p20210810-r5 abi_x86_32
+# required by x11-libs/cairo-1.18.4-r1::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libpng-1.6.51 abi_x86_32
+# required by x11-libs/cairo-1.18.4-r1::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/pixman-0.46.4 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/gdk-pixbuf-2.42.12 abi_x86_32
+# required by gnome-base/librsvg-2.60.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/pango-1.57.0 abi_x86_32
+# required by x11-libs/pango-1.57.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/fribidi-1.0.16 abi_x86_32
+# required by x11-libs/pango-1.57.0::gentoo[X]
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXft-2.3.9 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libjpeg-turbo-3.1.1 abi_x86_32
+# required by media-libs/lcms-2.17::gentoo[tiff]
+# required by media-libs/libjxl-0.11.1::gentoo
+# required by media-video/ffmpeg-7.1.2::gentoo[jpegxl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/tiff-4.7.0-r1 abi_x86_32
+# required by media-libs/libjxl-0.11.1::gentoo
+# required by media-video/ffmpeg-7.1.2::gentoo[jpegxl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=app-arch/brotli-1.1.0 abi_x86_32
+# required by media-libs/libjxl-0.11.1::gentoo
+# required by media-video/ffmpeg-7.1.2::gentoo[jpegxl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-cpp/highway-1.3.0 abi_x86_32
+# required by media-libs/libjxl-0.11.1::gentoo[gif]
+# required by media-video/ffmpeg-7.1.2::gentoo[jpegxl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/giflib-5.2.2 abi_x86_32
+# required by x11-libs/libxcb-1.17.0::gentoo
+# required by x11-libs/xcb-util-keysyms-0.4.1::gentoo
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXau-1.0.12 abi_x86_32
+# required by x11-libs/libxcb-1.17.0::gentoo
+# required by x11-libs/xcb-util-keysyms-0.4.1::gentoo
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXdmcp-1.1.5 abi_x86_32
+# required by llvm-core/llvm-20.1.8::gentoo[libffi]
+# required by media-libs/mesa-25.2.7::gentoo[llvm_slot_20,llvm]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libffi-3.5.2 abi_x86_32
+# required by x11-libs/libdrm-2.4.127::gentoo[video_cards_intel]
+# required by media-libs/mesa-25.2.7::gentoo
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libpciaccess-0.18.1 abi_x86_32
+# required by sys-apps/systemd-utils-255.18::gentoo[udev]
+# required by virtual/libudev-251-r2::gentoo[-systemd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[udev]
+# required by app-emulation/wine-proton (argument)
+>=sys-libs/libcap-2.76 abi_x86_32
+# required by sys-libs/libcap-2.76::gentoo[pam]
+# required by sys-apps/systemd-utils-255.18::gentoo[udev]
+# required by virtual/libudev-251-r2::gentoo[-systemd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[udev]
+# required by app-emulation/wine-proton (argument)
+>=sys-libs/pam-1.7.1-r2 abi_x86_32
+# required by sys-libs/pam-1.7.1-r2::gentoo[-berkdb]
+# required by net-print/cups-2.4.14::gentoo[pam]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=sys-libs/gdbm-1.26 abi_x86_32
+# required by sys-libs/gdbm-1.26::gentoo[readline]
+# required by sys-libs/pam-1.7.1-r2::gentoo[-berkdb]
+# required by net-print/cups-2.4.14::gentoo[pam]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=sys-libs/readline-8.3_p1 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/graphene-1.10.8-r1 abi_x86_32
+# required by dev-libs/glib-2.84.4::gentoo
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libpcre2-10.46 abi_x86_32
+# required by sys-apps/systemd-utils-255.18::gentoo[udev]
+# required by virtual/libudev-251-r2::gentoo[-systemd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[udev]
+# required by app-emulation/wine-proton (argument)
+>=sys-apps/util-linux-2.41.2 abi_x86_32
+# required by net-libs/gnutls-3.8.10-r1::gentoo
+# required by net-print/cups-2.4.14::gentoo[-openssl]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libtasn1-4.20.0 abi_x86_32
+# required by net-libs/gnutls-3.8.10-r1::gentoo
+# required by net-print/cups-2.4.14::gentoo[-openssl]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libunistring-1.3 abi_x86_32
+# required by net-libs/gnutls-3.8.10-r1::gentoo
+# required by net-print/cups-2.4.14::gentoo[-openssl]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/nettle-3.10.2 abi_x86_32
+# required by net-libs/gnutls-3.8.10-r1::gentoo[idn]
+# required by net-print/cups-2.4.14::gentoo[-openssl]
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=net-dns/libidn2-2.3.8 abi_x86_32
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=gui-libs/libdecor-0.2.3 abi_x86_32
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/mesa-25.2.7 abi_x86_32
+# required by media-libs/fontconfig-2.17.1::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/expat-2.7.3 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-util/spirv-tools-1.4.328.0 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[llvm_slot_20,llvm]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=llvm-core/llvm-20.1.8 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libxshmfence-1.3.3 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[X]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/xcb-util-keysyms-0.4.1 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[zstd]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=app-arch/zstd-1.5.7-r1 abi_x86_32
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/gtk+-3.24.51 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=app-accessibility/at-spi2-core-2.56.5 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/libepoxy-1.5.10-r3 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo[cups]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=net-print/cups-2.4.14 abi_x86_32
+# required by x11-libs/gtk+-3.24.51::gentoo[X]
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXdamage-1.1.6 abi_x86_32
+# required by app-accessibility/at-spi2-core-2.56.5::gentoo[X]
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=x11-libs/libXtst-1.2.5 abi_x86_32
+# required by dev-libs/libgcrypt-1.11.2::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/libgpg-error-1.56 abi_x86_32
+# required by dev-libs/glib-2.84.4::gentoo
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=virtual/libintl-0-r2 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=virtual/zlib-1.3.1-r1 abi_x86_32
+# required by virtual/zlib-1.3.1-r1::gentoo
+# required by dev-util/mingw64-toolchain-13.0.0::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[-crossdev-mingw,-wow64]
+# required by app-emulation/wine-proton (argument)
+>=sys-libs/zlib-1.3.1-r1 abi_x86_32
+# required by media-libs/mesa-25.2.7::gentoo[-video_cards_r600,video_cards_radeon,llvm,video_cards_radeonsi]
+# required by media-libs/gst-plugins-base-1.24.11-r1::gentoo[gles2,opengl]
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=virtual/libelf-3-r1 abi_x86_32
+# required by virtual/libelf-3-r1::gentoo
+# required by dev-libs/glib-2.84.4::gentoo
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-libs/elfutils-0.193-r1 abi_x86_32
+# required by dev-libs/elfutils-0.193-r1::gentoo[lzma]
+# required by virtual/libelf-3-r1::gentoo
+# required by dev-libs/glib-2.84.4::gentoo
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=app-arch/xz-utils-5.8.1-r1 abi_x86_32
+# required by media-libs/libass-0.17.4::gentoo
+# required by media-video/ffmpeg-7.1.2::gentoo[libass]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=virtual/libiconv-0-r2 abi_x86_32
+# required by media-libs/libsdl2-2.32.6::gentoo[opengl]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=virtual/opengl-8 abi_x86_32
+# required by media-libs/libsdl2-2.32.6::gentoo[opengl]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=virtual/glu-9.0-r2 abi_x86_32
+# required by dev-libs/libusb-1.0.29::gentoo[udev]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[usb]
+# required by app-emulation/wine-proton (argument)
+>=virtual/libudev-251-r2 abi_x86_32
+# required by virtual/libudev-251-r2::gentoo[-systemd]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[udev]
+# required by app-emulation/wine-proton (argument)
+>=sys-apps/systemd-utils-255.18 abi_x86_32
+# required by virtual/glu-9.0-r2::gentoo
+# required by media-libs/libsdl2-2.32.6::gentoo[opengl]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-libs/glu-9.0.3 abi_x86_32
+# required by gnome-base/librsvg-2.60.0::gentoo
+# required by x11-libs/gtk+-3.24.51::gentoo
+# required by gui-libs/libdecor-0.2.3::gentoo[gtk]
+# required by media-libs/libsdl2-2.32.6::gentoo[wayland]
+# required by media-video/ffmpeg-7.1.2::gentoo[sdl]
+# required by media-plugins/gst-plugins-libav-1.24.11::gentoo
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=dev-lang/rust-bin-1.89.0 abi_x86_32
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-plugins/gst-plugins-cdparanoia-1.24.11 abi_x86_32
+# required by media-plugins/gst-plugins-cdparanoia-1.24.11::gentoo
+# required by media-plugins/gst-plugins-meta-1.24.11::gentoo[cdda]
+# required by app-emulation/wine-proton-10.0.2d::gentoo[gstreamer]
+# required by app-emulation/wine-proton (argument)
+>=media-sound/cdparanoia-3.10.2-r8 abi_x86_32
+# required by sys-libs/ncurses-6.5_p20250802::gentoo[gpm]
+# required by sys-libs/ncurses (argument)
+>=sys-libs/gpm-1.20.7-r6 abi_x86_32
+media-libs/vulkan-loader      abi_x86_32
+media-libs/vulkan-layers      abi_x86_32
+media-libs/freetype           abi_x86_32
+media-libs/libpng             abi_x86_32
+net-libs/gnutls               abi_x86_32
+media-libs/libpulse           abi_x86_32
+media-libs/alsa-lib           abi_x86_32
+media-libs/libsdl2            abi_x86_32
+x11-apps/mesa-progs 	      abi_x86_32
+media-plugins/gst-plugins-opus abi_x86_32
+media-libs/opus		      abi_x86_32
+app-accessibility/at-spi2-core  abi_x86_32
+app-arch/bzip2                  abi_x86_32
+app-arch/lz4                    abi_x86_32
+app-arch/xz-utils               abi_x86_32
+app-arch/zstd                   abi_x86_32
+app-crypt/p11-kit               abi_x86_32
+dev-db/sqlite                   abi_x86_32
+dev-lang/rust-bin               abi_x86_32
+dev-libs/dbus-glib              abi_x86_32
+dev-libs/elfutils               abi_x86_32
+dev-libs/expat                  abi_x86_32
+dev-libs/fribidi                abi_x86_32
+dev-libs/glib                   abi_x86_32
+dev-libs/gmp                    abi_x86_32
+dev-libs/icu                    abi_x86_32
+dev-libs/json-glib              abi_x86_32
+dev-libs/libevdev               abi_x86_32
+dev-libs/libffi                 abi_x86_32
+dev-libs/libgcrypt              abi_x86_32
+dev-libs/libgpg-error           abi_x86_32
+dev-libs/libgudev               abi_x86_32
+dev-libs/libgusb                abi_x86_32
+dev-libs/libpcre2               abi_x86_32
+dev-libs/libtasn1               abi_x86_32
+dev-libs/libunistring           abi_x86_32
+dev-libs/libusb                 abi_x86_32
+dev-libs/libxml2                abi_x86_32
+dev-libs/lzo                    abi_x86_32
+dev-libs/nettle                 abi_x86_32
+dev-libs/nspr                   abi_x86_32
+dev-libs/nss                    abi_x86_32
+dev-libs/openssl                abi_x86_32
+dev-libs/wayland                abi_x86_32
+dev-util/spirv-tools            abi_x86_32
+dev-util/sysprof-capture        abi_x86_32
+gnome-base/librsvg              abi_x86_32
+gui-libs/libdecor               abi_x86_32
+llvm-core/clang                 abi_x86_32
+llvm-core/llvm                  abi_x86_32
+media-gfx/graphite2             abi_x86_32
+media-libs/alsa-lib             abi_x86_32
+media-libs/flac                 abi_x86_32
+media-libs/fontconfig           abi_x86_32
+media-libs/freetype             abi_x86_32
+media-libs/glu                  abi_x86_32
+media-libs/harfbuzz             abi_x86_32
+media-libs/lcms                 abi_x86_32
+media-libs/libepoxy             abi_x86_32
+media-libs/libglvnd             abi_x86_32
+media-libs/libjpeg-turbo        abi_x86_32
+media-libs/libogg               abi_x86_32
+media-libs/libpng               abi_x86_32
+media-libs/libpulse             abi_x86_32
+media-libs/libsdl2              abi_x86_32
+media-libs/libsndfile           abi_x86_32
+media-libs/libva                abi_x86_32
+media-libs/libvorbis            abi_x86_32
+media-libs/mesa                 abi_x86_32
+media-libs/openal               abi_x86_32
+media-libs/opus                 abi_x86_32
+media-libs/libwebp              abi_x86_32
+media-libs/tiff                 abi_x86_32
+media-sound/lame                abi_x86_32
+media-sound/mpg123-base         abi_x86_32
+media-video/pipewire            bluetooth extra abi_x86_32
+net-dns/c-ares                  abi_x86_32
+net-dns/libidn2                 abi_x86_32
+net-libs/gnutls                 abi_x86_32
+net-libs/libasyncns             abi_x86_32
+net-libs/libndp                 abi_x86_32
+net-libs/libpsl                 abi_x86_32
+net-libs/nghttp2                abi_x86_32
+net-libs/nghttp3                abi_x86_32
+net-misc/curl                   abi_x86_32
+net-misc/networkmanager         abi_x86_32
+net-print/cups                  abi_x86_32
+sys-apps/dbus                   abi_x86_32
+sys-apps/systemd                abi_x86_32
+sys-apps/systemd-utils          abi_x86_32
+sys-apps/util-linux             abi_x86_32
+sys-libs/gdbm                   abi_x86_32
+sys-libs/gpm                    abi_x86_32
+sys-libs/libcap                 abi_x86_32
+sys-libs/libudev-compat         abi_x86_32
+sys-libs/ncurses                abi_x86_32
+sys-libs/pam                    abi_x86_32
+sys-libs/readline               abi_x86_32
+sys-libs/zlib                   abi_x86_32
+virtual/glu                     abi_x86_32
+virtual/libelf                  abi_x86_32
+virtual/libiconv                abi_x86_32
+virtual/libintl                 abi_x86_32
+virtual/libudev                 abi_x86_32
+virtual/libusb                  abi_x86_32
+virtual/opengl                  abi_x86_32
+virtual/rust                    abi_x86_32
+x11-libs/cairo                  abi_x86_32
+x11-libs/extest                 abi_x86_32
+x11-libs/gdk-pixbuf             abi_x86_32
+x11-libs/gtk+                   abi_x86_32
+x11-libs/gtk+                   abi_x86_32
+x11-libs/libdrm                 abi_x86_32
+x11-libs/libICE                 abi_x86_32
+x11-libs/libpciaccess           abi_x86_32
+x11-libs/libSM                  abi_x86_32
+x11-libs/libvdpau               abi_x86_32
+x11-libs/libX11                 abi_x86_32
+x11-libs/libXau                 abi_x86_32
+x11-libs/libxcb                 abi_x86_32
+x11-libs/libXcomposite          abi_x86_32
+x11-libs/libXcursor             abi_x86_32
+x11-libs/libXdamage             abi_x86_32
+x11-libs/libXdmcp               abi_x86_32
+x11-libs/libXext                abi_x86_32
+x11-libs/libXfixes              abi_x86_32
+x11-libs/libXft                 abi_x86_32
+x11-libs/libXi                  abi_x86_32
+x11-libs/libXinerama            abi_x86_32
+x11-libs/libxkbcommon           abi_x86_32
+x11-libs/libXrandr              abi_x86_32
+x11-libs/libXrender             abi_x86_32
+x11-libs/libXScrnSaver          abi_x86_32
+x11-libs/libxshmfence           abi_x86_32
+x11-libs/libXtst                abi_x86_32
+x11-libs/libXxf86vm             abi_x86_32
+x11-libs/pango                  abi_x86_32
+x11-libs/pixman                 abi_x86_32
+x11-libs/xcb-util-keysyms       abi_x86_32
+x11-misc/colord                 abi_x86_32
+gui-libs/egl-gbm                abi_x86_32
+gui-libs/egl-wayland            abi_x86_32
+gui-libs/egl-x11                abi_x86_32
+x11-drivers/nvidia-drivers      abi_x86_32
+games-util/game-device-udev-rules -acl abi_x86_32
+x11-drivers/nvidia-drivers      abi_x86_32
+sys-libs/libcap                 abi_x86_32
+media-libs/glew                 abi_x86_32
+media-libs/imgui                abi_x86_32
+media-libs/implot               abi_x86_32
+games-util/mangohud             abi_x86_32
+# required by games-util/mangohud-0.8.1::guru
+# required by mangohud (argument)
+>=dev-libs/spdlog-1.15.3 abi_x86_32
+# required by dev-libs/spdlog-1.15.3::gentoo
+# required by games-util/mangohud-0.8.1::guru
+# required by mangohud (argument)
+>=dev-libs/libfmt-11.1.4 abi_x86_32
+# required by media-libs/glew-2.2.0-r1::gentoo[-egl-only]
+# required by media-libs/imgui-1.89.9-r4::guru
+# required by media-libs/implot-0.16-r2::guru
+# required by games-util/mangohud-0.8.1::guru
+# required by mangohud (argument)
+>=x11-libs/libXmu-1.2.1 abi_x86_32
+# required by x11-libs/libXmu-1.2.1::gentoo
+# required by media-libs/glew-2.2.0-r1::gentoo[-egl-only]
+# required by media-libs/imgui-1.89.9-r4::guru
+# required by media-libs/implot-0.16-r2::guru
+# required by games-util/mangohud-0.8.1::guru
+# required by mangohud (argument)
+>=x11-libs/libXt-1.3.1-r1 abi_x86_32
+dev-lang/rust-bin clippy rust-analyzer rustfmt
+net-print/cups zeroconf
+net-print/cups-meta zeroconf
+# required by net-print/cups-2.4.14::gentoo[zeroconf]
+# required by net-print/libppd-2.1.1::gentoo
+# required by net-print/cups-filters-2.0.1::gentoo
+# required by net-print/cups-browsed-2.1.1-r1::gentoo
+# required by net-print/cups-meta-1::gentoo[browsed]
+# required by net-print/cups-meta (argument)
+>=net-dns/avahi-0.9_rc2-r3 abi_x86_32
+# required by net-dns/avahi-0.9_rc2-r3::gentoo
+# required by net-print/cups-2.4.14::gentoo[zeroconf]
+# required by net-print/libppd-2.1.1::gentoo
+# required by net-print/cups-filters-2.0.1::gentoo
+# required by net-print/cups-browsed-2.1.1-r1::gentoo
+# required by net-print/cups-meta-1::gentoo[browsed]
+# required by net-print/cups-meta (argument)
+>=dev-libs/libevent-2.1.12-r1 abi_x86_32
+app-text/dictd minimal
+dev-libs/libnl utils
+app-emulation/dxvk abi_x86_32
+dev-python/qtpy printsupport
+net-misc/spice-gtk usbredir
+net-dns/dnsmasq script
+net-libs/gnutls tools pkcs11
+app-emulation/qemu QEMU_SOFTMMU_TARGETS: arm x86_64 sparc QEMU_USER_TARGETS: x86_64
+app-emulation/wine-staging pulseaudio
+app-emulation/wine-proton pulseaudio
+app-text/calibre unrar
+dev-qt/qtgui jpeg
+# required by dev-python/pyqt6-webengine-6.9.0::gentoo
+# required by app-text/calibre-8.9.0::gentoo[python_single_target_python3_13]
+# required by app-text/calibre (argument)
+>=dev-python/pyqt6-6.9.1 quick webchannel
diff --git a/gentoo/portage/package.use/picom b/gentoo/portage/package.use/picom
deleted file mode 100644
index 9126ee4d..00000000
--- a/gentoo/portage/package.use/picom
+++ /dev/null
@@ -1 +0,0 @@
-x11-misc/picom doc drm dbus opengl pcre
diff --git a/gentoo/portage/package.use/pyqt5 b/gentoo/portage/package.use/pyqt5
deleted file mode 100644
index 38a8a995..00000000
--- a/gentoo/portage/package.use/pyqt5
+++ /dev/null
@@ -1 +0,0 @@
-dev-python/pyqt5 network debug declarative gui ssl widgets
diff --git a/gentoo/portage/package.use/python b/gentoo/portage/package.use/python
deleted file mode 100644
index 6ad45348..00000000
--- a/gentoo/portage/package.use/python
+++ /dev/null
@@ -1 +0,0 @@
-*/* PYTHON_TARGETS: python3_14 python3_13
diff --git a/gentoo/portage/package.use/qt5compat b/gentoo/portage/package.use/qt5compat
deleted file mode 100644
index e4822386..00000000
--- a/gentoo/portage/package.use/qt5compat
+++ /dev/null
@@ -1 +0,0 @@
-dev-qt/qt5compat icu
diff --git a/gentoo/portage/package.use/qtbase b/gentoo/portage/package.use/qtbase
deleted file mode 100644
index 375d1e9f..00000000
--- a/gentoo/portage/package.use/qtbase
+++ /dev/null
@@ -1 +0,0 @@
-dev-qt/qtbase opengl
diff --git a/gentoo/portage/package.use/qtdeclarative b/gentoo/portage/package.use/qtdeclarative
deleted file mode 100644
index 9eaaf2cf..00000000
--- a/gentoo/portage/package.use/qtdeclarative
+++ /dev/null
@@ -1 +0,0 @@
-dev-qt/qtdeclarative opengl
diff --git a/gentoo/portage/package.use/qttools b/gentoo/portage/package.use/qttools
deleted file mode 100644
index 4a9c048c..00000000
--- a/gentoo/portage/package.use/qttools
+++ /dev/null
@@ -1 +0,0 @@
-dev-qt/qttools opengl
diff --git a/gentoo/portage/package.use/st b/gentoo/portage/package.use/st
deleted file mode 100644
index 5ffd729a..00000000
--- a/gentoo/portage/package.use/st
+++ /dev/null
@@ -1 +0,0 @@
-x11-terms/st savedconfig
diff --git a/gentoo/portage/package.use/tealdeer b/gentoo/portage/package.use/tealdeer
deleted file mode 100644
index 6c79c24c..00000000
--- a/gentoo/portage/package.use/tealdeer
+++ /dev/null
@@ -1 +0,0 @@
-app-misc/tealdeer 
diff --git a/gentoo/portage/package.use/ufw b/gentoo/portage/package.use/ufw
deleted file mode 100644
index 70e04965..00000000
--- a/gentoo/portage/package.use/ufw
+++ /dev/null
@@ -1 +0,0 @@
-net-firewall/ufw ipv6
diff --git a/gentoo/portage/package.use/xorg b/gentoo/portage/package.use/xorg
deleted file mode 100644
index e69de29b..00000000
diff --git a/gentoo/portage/package.use/zsh b/gentoo/portage/package.use/zsh
deleted file mode 100644
index 118263ce..00000000
--- a/gentoo/portage/package.use/zsh
+++ /dev/null
@@ -1,99 +0,0 @@
-app-shells/zsh caps debug <F3>oc examples gdbm pcre
-# required by www-client/ungoogled-chromium-bin-142.0.7444.162::pf4public
-# required by www-client/ungoogled-chromium-bin (argument)
->=sys-libs/zlib-1.3.1-r1 minizip
-# required by x11-misc/xdg-utils-1.2.1-r9::gentoo
-# required by net-print/cups-2.4.14::gentoo[X]
-# required by www-client/ungoogled-chromium-bin-142.0.7444.162::pf4public
-# required by www-client/ungoogled-chromium-bin (argument)
->=app-text/xmlto-0.0.28-r11 text
-# required by x11-misc/pcmanfm-1.3.2-r2::gentoo
-# required by x11-misc/pcmanfm (argument)
->=x11-libs/libfm-1.3.2-r1 gtk
-# required by gnome-base/gnome-keyring-48.0-r1::gentoo
-# required by virtual/secret-service-0-r1::gentoo
-# required by app-crypt/libsecret-0.21.7::gentoo
-# required by app-crypt/gcr-4.4.0.1-r1::gentoo
-# required by gnome-base/gvfs-1.56.1-r2::gentoo
-# required by x11-libs/libfm-1.3.2-r1::gentoo[automount,-udisks]
-# required by x11-misc/pcmanfm-1.3.2-r2::gentoo
-# required by x11-misc/pcmanfm (argument)
->=app-crypt/gcr-3.41.2-r2:0 gtk
-# required by gui-apps/gcolor3-2.4.0::guru
-# required by gcolor3 (argument)
->=dev-libs/libportal-0.9.1 gtk
-# required by media-gfx/gimp-2.10.38-r3::gentoo
-# required by gimp (argument)
->=app-text/poppler-25.11.0 cairo
-# required by media-gfx/gimp-2.10.38-r3::gentoo
-# required by gimp (argument)
->=media-libs/gegl-0.4.58 cairo
-# required by media-gfx/inkscape-1.4.2::gentoo[python_single_target_python3_13]
-# required by inkscape (argument)
->=dev-python/pillow-11.3.0 webp tiff
-# required by dev-python/pillow-11.3.0::gentoo[-test,tiff]
-# required by media-gfx/inkscape-1.4.2::gentoo[python_single_target_python3_13]
-# required by inkscape (argument)
->=media-libs/tiff-4.7.0-r1 jpeg
-# required by xfce-base/xfce4-panel-4.20.5::gentoo[dbusmenu]
-# required by xfce-extra/xfce4-screenshooter-1.11.2::gentoo
-# required by xfce4-screenshooter (argument)
->=dev-libs/libdbusmenu-16.04.0-r4 gtk3
-# required by media-gfx/krita-5.2.13::gentoo[python_single_target_python3_13]
-# required by krita (argument)
->=dev-python/pyqt5-5.15.11 widgets declarative gui
-# required by dev-qt/qtwayland-6.9.3::gentoo
-# required by kde-plasma/libplasma-6.4.5::gentoo
-# required by kde-plasma/polkit-kde-agent-6.4.5::gentoo
-# required by kde-frameworks/kauth-5.116.0::gentoo[policykit]
-# required by kde-frameworks/kconfigwidgets-5.116.0::gentoo
-# required by kde-frameworks/kiconthemes-5.116.0::gentoo
-# required by kde-frameworks/kxmlgui-5.116.0::gentoo
-# required by media-gfx/krita-5.2.13::gentoo
-# required by media-gfx/krita (argument)
->=dev-qt/qtbase-6.9.3 libproxy wayland icu opengl
-# required by kde-frameworks/kauth-6.18.0::gentoo[policykit]
-# required by kde-frameworks/kio-6.18.0::gentoo
-# required by kde-plasma/libplasma-6.4.5::gentoo
-# required by kde-plasma/polkit-kde-agent-6.4.5::gentoo
-# required by kde-frameworks/kauth-5.116.0::gentoo[policykit]
-# required by kde-frameworks/kconfigwidgets-5.116.0::gentoo
-# required by kde-frameworks/kiconthemes-5.116.0::gentoo
-# required by kde-frameworks/kxmlgui-5.116.0::gentoo
-# required by media-gfx/krita-5.2.13::gentoo
-# required by media-gfx/krita (argument)
->=kde-frameworks/kwindowsystem-6.18.0 wayland
-# required by kde-plasma/polkit-kde-agent-6.4.5::gentoo
-# required by kde-frameworks/kauth-5.116.0::gentoo[policykit]
-# required by kde-frameworks/kconfigwidgets-5.116.0::gentoo
-# required by kde-frameworks/kiconthemes-5.116.0::gentoo
-# required by kde-frameworks/kxmlgui-5.116.0::gentoo
-# required by media-gfx/krita-5.2.13::gentoo
-# required by media-gfx/krita (argument)
->=dev-qt/qt5compat-6.9.3 qml
-# required by kde-plasma/libplasma-6.4.5::gentoo
-# required by kde-plasma/polkit-kde-agent-6.4.5::gentoo
-# required by kde-frameworks/kauth-5.116.0::gentoo[policykit]
-# required by kde-frameworks/kconfigwidgets-5.116.0::gentoo
-# required by kde-frameworks/kiconthemes-5.116.0::gentoo
-# required by kde-frameworks/kxmlgui-5.116.0::gentoo
-# required by media-gfx/krita-5.2.13::gentoo
-# required by media-gfx/krita (argument)
->=kde-frameworks/kconfig-6.18.0 qml
-# required by kde-frameworks/kauth-5.116.0::gentoo[policykit]
-# required by kde-frameworks/kconfigwidgets-5.116.0::gentoo
-# required by kde-frameworks/kiconthemes-5.116.0::gentoo
-# required by kde-frameworks/kxmlgui-5.116.0::gentoo
-# required by media-gfx/krita-5.2.13::gentoo
-# required by media-gfx/krita (argument)
->=sys-auth/polkit-qt-0.200.0 qt5
-# required by kde-frameworks/kcoreaddons-5.116.0::gentoo
-# required by kde-frameworks/kcrash-5.116.0::gentoo
-# required by kde-frameworks/kglobalaccel-5.116.0-r2::gentoo
-# required by kde-frameworks/kxmlgui-5.116.0::gentoo
-# required by media-gfx/krita-5.2.13::gentoo
-# required by media-gfx/krita (argument)
->=dev-qt/qtcore-5.15.18 icu
-# required by app-office/onlyoffice-bin-9.0.4::gentoo
-# required by onlyoffice-bin (argument)
->=dev-qt/qtgui-5.15.18 eglfs
diff --git a/gentoo/portage/postsync.d/50-eix-postsync b/gentoo/portage/postsync.d/50-eix-postsync
new file mode 120000
index 00000000..965aca0b
--- /dev/null
+++ b/gentoo/portage/postsync.d/50-eix-postsync
@@ -0,0 +1 @@
+../../../usr/bin/eix-postsync
\ No newline at end of file
diff --git a/gentoo/portage/profile/systemd b/gentoo/portage/profile/systemd
new file mode 100644
index 00000000..24ad079b
--- /dev/null
+++ b/gentoo/portage/profile/systemd
@@ -0,0 +1 @@
+systemd
diff --git a/gentoo/portage/repos.conf/eselect-repo.conf b/gentoo/portage/repos.conf/eselect-repo.conf
index 63a98a4d..cc2b1463 100644
--- a/gentoo/portage/repos.conf/eselect-repo.conf
+++ b/gentoo/portage/repos.conf/eselect-repo.conf
@@ -1,6 +1,22 @@
 # created by eselect-repo
 
+[guru]
+location = /var/db/repos/guru
+sync-type = git
+sync-uri = https://github.com/gentoo-mirror/guru.git
+
+[librewolf]
+location = /var/db/repos/librewolf
+sync-type = git
+sync-uri = https://codeberg.org/librewolf/gentoo.git
+
 [pf4public]
 location = /var/db/repos/pf4public
 sync-type = git
 sync-uri = https://github.com/PF4Public/gentoo-overlay.git
+
+
+[steam-overlay]
+location = /var/db/repos/steam-overlay
+sync-type = git
+sync-uri = https://github.com/anyc/steam-overlay.git
diff --git a/gentoo/portage/repos.conf/eselect-repo.conf~ b/gentoo/portage/repos.conf/eselect-repo.conf~
new file mode 100644
index 00000000..c164753c
--- /dev/null
+++ b/gentoo/portage/repos.conf/eselect-repo.conf~
@@ -0,0 +1,21 @@
+# created by eselect-repo
+
+[guru]
+location = /var/db/repos/guru
+sync-type = git
+sync-uri = https://github.com/gentoo-mirror/guru.git
+
+[librewolf]
+location = /var/db/repos/librewolf
+sync-type = git
+sync-uri = https://codeberg.org/librewolf/gentoo.git
+
+[pf4public]
+location = /var/db/repos/pf4public
+sync-type = git
+sync-uri = https://github.com/PF4Public/gentoo-overlay.git
+
+[zugaina]
+location = /var/db/repos/zugaina
+sync-type = rsync
+sync-uri = rsync://gentoo.zugaina.org/zugaina-portage
diff --git a/gentoo/portage/repos.conf/guru.conf b/gentoo/portage/repos.conf/guru.conf
deleted file mode 100644
index 90fd5894..00000000
--- a/gentoo/portage/repos.conf/guru.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-[guru]
-location = /var/db/repos/guru
-sync-type = git
-sync-uri = https://github.com/gentoo-mirror/guru.git
diff --git a/gentoo/portage/repos.conf/librewolf.conf b/gentoo/portage/repos.conf/librewolf.conf
deleted file mode 100644
index b402078f..00000000
--- a/gentoo/portage/repos.conf/librewolf.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-[librewolf]
-priority = 50
-location = /var/db/repos/librewolf
-sync-type = git
-sync-uri = https://codeberg.org/librewolf/gentoo.git
-auto-sync = Yes
diff --git a/gentoo/portage/savedconfig/sys-firmware/ipxe-1.21.1_p20230601-r1 b/gentoo/portage/savedconfig/sys-firmware/ipxe-1.21.1_p20230601-r1
new file mode 100644
index 00000000..a1655023
--- /dev/null
+++ b/gentoo/portage/savedconfig/sys-firmware/ipxe-1.21.1_p20230601-r1
@@ -0,0 +1,5 @@
+#undef BANNER_TIMEOUT
+#define BANNER_TIMEOUT 0
+#define NET_PROTO_IPV6
+#define VMWARE_SETTINGS
+#define CONSOLE_VMWARE
diff --git a/gentoo/portage/savedconfig/sys-kernel/linux-firmware-20250808 b/gentoo/portage/savedconfig/sys-kernel/linux-firmware-20250808
index 01cf4914..f0a98fe3 100644
--- a/gentoo/portage/savedconfig/sys-kernel/linux-firmware-20250808
+++ b/gentoo/portage/savedconfig/sys-kernel/linux-firmware-20250808
@@ -86,751 +86,751 @@ a300_pfp.fw
 a300_pm4.fw
 acenic/tg1.bin
 acenic/tg2.bin
-adaptec/starfire_rx.bin
 adaptec/starfire_tx.bin
-advansys/38C0800.bin
-advansys/38C1600.bin
+adaptec/starfire_rx.bin
 advansys/3550.bin
+advansys/38C1600.bin
+advansys/38C0800.bin
 advansys/mcode.bin
 aeonsemi/as21x1x_fw.bin
 agere_ap_fw.bin
 agere_sta_fw.bin
-airoha/en7581_npu_data.bin
 airoha/en7581_npu_rv32.bin
 airoha/EthMD32.dm.bin
+airoha/en7581_npu_data.bin
 airoha/EthMD32.DSP.bin
-amd/amd_sev_fam19h_modelaxh.sbin
-amd/amd_sev_fam17h_model0xh.sbin
-amd/amd_sev_fam19h_model0xh.sbin
-amd/amd_sev_fam1ah_model0xh.sbin
 amd/amd_sev_fam17h_model3xh.sbin
+amd/amd_sev_fam19h_model0xh.sbin
+amd/amd_sev_fam17h_model0xh.sbin
 amd/amd_sev_fam19h_model1xh.sbin
-amd-ucode/microcode_amd_fam16h.bin
+amd/amd_sev_fam19h_modelaxh.sbin
+amd/amd_sev_fam1ah_model0xh.sbin
+amd-ucode/microcode_amd_fam1ah.bin
 amd-ucode/README
 amd-ucode/microcode_amd_fam15h.bin
-amd-ucode/microcode_amd.bin
+amd-ucode/microcode_amd_fam16h.bin
 amd-ucode/microcode_amd_fam17h.bin
+amd-ucode/microcode_amd.bin
 amd-ucode/microcode_amd_fam19h.bin
-amd-ucode/microcode_amd_fam1ah.bin
-amdgpu/polaris10_ce_2.bin
-amdgpu/fiji_uvd.bin
-amdgpu/vega10_uvd.bin
-amdgpu/yellow_carp_rlc.bin
-amdgpu/vega10_sos.bin
-amdgpu/vpe_6_1_3.bin
-amdgpu/raven_ce.bin
-amdgpu/vega20_mec2.bin
-amdgpu/kabini_sdma1.bin
-amdgpu/kaveri_mec.bin
-amdgpu/arcturus_ta.bin
-amdgpu/bonaire_pfp.bin
-amdgpu/polaris10_ce.bin
-amdgpu/gc_11_0_1_mes1.bin
-amdgpu/navi12_gpu_info.bin
-amdgpu/cyan_skillfish2_pfp.bin
-amdgpu/smu_13_0_7.bin
-amdgpu/picasso_ce.bin
-amdgpu/tonga_mc.bin
-amdgpu/psp_14_0_3_sos.bin
-amdgpu/renoir_vcn.bin
-amdgpu/gc_11_0_0_me.bin
-amdgpu/vega20_asd.bin
-amdgpu/bonaire_me.bin
-amdgpu/vega10_pfp.bin
-amdgpu/vangogh_vcn.bin
-amdgpu/arcturus_asd.bin
-amdgpu/polaris11_smc.bin
-amdgpu/tahiti_mc.bin
-amdgpu/polaris11_sdma.bin
-amdgpu/vega12_sdma1.bin
-amdgpu/vegam_sdma.bin
-amdgpu/navi10_pfp.bin
-amdgpu/dcn_3_2_0_dmcub.bin
-amdgpu/carrizo_pfp.bin
-amdgpu/polaris11_rlc.bin
-amdgpu/aldebaran_sdma.bin
-amdgpu/polaris11_k_mc.bin
-amdgpu/raven2_vcn.bin
-amdgpu/kabini_rlc.bin
-amdgpu/green_sardine_sdma.bin
-amdgpu/hawaii_uvd.bin
-amdgpu/vega20_pfp.bin
-amdgpu/vega12_rlc.bin
-amdgpu/stoney_rlc.bin
-amdgpu/verde_mc.bin
-amdgpu/kabini_pfp.bin
-amdgpu/navy_flounder_ce.bin
-amdgpu/psp_13_0_14_sos.bin
-amdgpu/gc_11_0_1_rlc.bin
-amdgpu/topaz_smc.bin
-amdgpu/topaz_mec2.bin
-amdgpu/hainan_rlc.bin
-amdgpu/gc_10_3_7_me.bin
-amdgpu/gc_9_5_0_sjt_mec.bin
-amdgpu/mullins_vce.bin
-amdgpu/navi14_sdma1.bin
-amdgpu/fiji_rlc.bin
-amdgpu/vangogh_pfp.bin
-amdgpu/renoir_rlc.bin
-amdgpu/renoir_ce.bin
-amdgpu/navi14_gpu_info.bin
-amdgpu/picasso_mec.bin
-amdgpu/aldebaran_ta.bin
-amdgpu/tonga_mec2.bin
-amdgpu/gc_12_0_0_pfp.bin
-amdgpu/navi14_me.bin
-amdgpu/gc_9_4_4_sjt_mec.bin
-amdgpu/bonaire_uvd.bin
-amdgpu/yellow_carp_toc.bin
-amdgpu/navi14_sdma.bin
-amdgpu/yellow_carp_vcn.bin
-amdgpu/gc_11_5_3_imu.bin
-amdgpu/gc_11_0_0_mes1.bin
-amdgpu/banks_k_2_smc.bin
-amdgpu/aldebaran_sos.bin
-amdgpu/tonga_k_smc.bin
-amdgpu/polaris10_sdma.bin
-amdgpu/polaris12_rlc.bin
-amdgpu/arcturus_ip_discovery.bin
-amdgpu/yellow_carp_ta.bin
-amdgpu/fiji_mc.bin
-amdgpu/gc_10_3_7_mec2.bin
-amdgpu/gc_11_0_4_mec.bin
-amdgpu/navi10_gpu_info.bin
-amdgpu/navi12_rlc.bin
-amdgpu/polaris11_mec2_2.bin
-amdgpu/topaz_rlc.bin
-amdgpu/navi12_me.bin
-amdgpu/gc_12_0_1_me.bin
-amdgpu/cyan_skillfish2_sdma1.bin
-amdgpu/renoir_pfp.bin
-amdgpu/tonga_sdma.bin
-amdgpu/gc_11_0_0_rlc.bin
-amdgpu/aldebaran_mec.bin
-amdgpu/navi12_asd.bin
-amdgpu/vega20_mec.bin
-amdgpu/beige_goby_dmcub.bin
-amdgpu/gc_11_5_1_me.bin
-amdgpu/aldebaran_ip_discovery.bin
-amdgpu/hawaii_sdma1.bin
-amdgpu/psp_13_0_12_ta.bin
-amdgpu/vega10_rlc.bin
-amdgpu/navi10_sdma.bin
-amdgpu/sienna_cichlid_vcn.bin
-amdgpu/verde_me.bin
-amdgpu/polaris11_ce_2.bin
-amdgpu/vega10_acg_smc.bin
-amdgpu/gc_9_5_0_mec.bin
-amdgpu/navy_flounder_smc.bin
-amdgpu/dcn_3_1_4_dmcub.bin
-amdgpu/yellow_carp_me.bin
-amdgpu/polaris12_mec2.bin
-amdgpu/vega12_sos.bin
-amdgpu/beige_goby_pfp.bin
-amdgpu/fiji_me.bin
-amdgpu/gc_10_3_6_me.bin
-amdgpu/sdma_5_2_6.bin
-amdgpu/dcn_3_5_1_dmcub.bin
-amdgpu/raven_pfp.bin
-amdgpu/renoir_mec2.bin
-amdgpu/umsch_mm_4_0_0.bin
-amdgpu/kaveri_vce.bin
-amdgpu/pitcairn_uvd.bin
-amdgpu/picasso_gpu_info.bin
-amdgpu/navi10_smc.bin
-amdgpu/gc_11_5_3_rlc.bin
-amdgpu/oland_ce.bin
-amdgpu/kabini_uvd.bin
-amdgpu/sdma_6_0_0.bin
-amdgpu/green_sardine_ta.bin
-amdgpu/sdma_4_4_2.bin
-amdgpu/vega20_ce.bin
-amdgpu/navi14_sos.bin
-amdgpu/vangogh_mec.bin
-amdgpu/psp_14_0_5_ta.bin
-amdgpu/polaris12_pfp_2.bin
-amdgpu/gc_11_0_1_mes_2.bin
-amdgpu/vcn_4_0_6.bin
-amdgpu/psp_13_0_0_ta_kicker.bin
-amdgpu/raven2_ce.bin
-amdgpu/vegam_mec2.bin
-amdgpu/gc_10_3_6_rlc.bin
-amdgpu/fiji_mec.bin
-amdgpu/raven_mec.bin
-amdgpu/gc_11_5_0_imu.bin
-amdgpu/smu_13_0_6.bin
-amdgpu/gc_11_5_1_mes_2.bin
-amdgpu/vcn_4_0_4.bin
-amdgpu/gc_9_4_3_sjt_mec.bin
-amdgpu/navi10_ce.bin
-amdgpu/gc_11_5_1_pfp.bin
-amdgpu/vega10_asd.bin
-amdgpu/dimgrey_cavefish_rlc.bin
-amdgpu/gc_11_5_3_mes1.bin
-amdgpu/polaris12_sdma.bin
-amdgpu/vega12_sdma.bin
-amdgpu/gc_11_0_0_imu.bin
-amdgpu/tahiti_smc.bin
-amdgpu/vegam_smc.bin
-amdgpu/raven_kicker_rlc.bin
-amdgpu/yellow_carp_mec2.bin
-amdgpu/sdma_4_4_5.bin
-amdgpu/navi14_mec2.bin
-amdgpu/hawaii_rlc.bin
-amdgpu/arcturus_sdma.bin
-amdgpu/navi10_ta.bin
-amdgpu/tonga_mec.bin
-amdgpu/tahiti_pfp.bin
-amdgpu/sdma_6_0_3.bin
-amdgpu/gc_11_0_0_rlc_1.bin
-amdgpu/gc_12_0_1_mes.bin
-amdgpu/vcn_4_0_0.bin
-amdgpu/gc_12_0_0_rlc.bin
-amdgpu/sienna_cichlid_ta.bin
-amdgpu/hawaii_pfp.bin
-amdgpu/bonaire_ce.bin
-amdgpu/polaris12_ce.bin
-amdgpu/gc_12_0_1_pfp.bin
-amdgpu/raven2_mec2.bin
-amdgpu/vega10_ip_discovery.bin
-amdgpu/vega12_ce.bin
-amdgpu/sdma_6_1_2.bin
-amdgpu/navi14_asd.bin
-amdgpu/vega10_sdma.bin
-amdgpu/gc_9_4_4_rlc.bin
-amdgpu/navi12_vcn.bin
-amdgpu/verde_k_smc.bin
-amdgpu/navi14_mec_wks.bin
-amdgpu/cyan_skillfish2_me.bin
-amdgpu/gc_12_0_1_uni_mes.bin
-amdgpu/polaris11_k_smc.bin
-amdgpu/polaris10_pfp.bin
-amdgpu/vegam_ce.bin
-amdgpu/polaris10_uvd.bin
-amdgpu/gc_10_3_7_rlc.bin
-amdgpu/vpe_6_1_0.bin
-amdgpu/oland_smc.bin
-amdgpu/tonga_pfp.bin
-amdgpu/arcturus_rlc.bin
-amdgpu/navi12_dmcu.bin
-amdgpu/pitcairn_pfp.bin
-amdgpu/navy_flounder_rlc.bin
-amdgpu/raven_gpu_info.bin
-amdgpu/bonaire_vce.bin
-amdgpu/oland_k_smc.bin
-amdgpu/kaveri_pfp.bin
-amdgpu/kaveri_mec2.bin
-amdgpu/mullins_pfp.bin
-amdgpu/psp_13_0_12_sos.bin
-amdgpu/vangogh_me.bin
-amdgpu/gc_12_0_0_mes.bin
-amdgpu/gc_11_5_1_imu.bin
-amdgpu/navi14_mec.bin
-amdgpu/gc_12_0_0_toc.bin
-amdgpu/vangogh_asd.bin
-amdgpu/vega20_sos.bin
-amdgpu/verde_rlc.bin
-amdgpu/stoney_pfp.bin
-amdgpu/navi12_smc.bin
-amdgpu/hawaii_k_smc.bin
-amdgpu/tahiti_me.bin
-amdgpu/polaris12_me_2.bin
-amdgpu/arcturus_vcn.bin
-amdgpu/sdma_4_4_4.bin
-amdgpu/tahiti_uvd.bin
-amdgpu/navi10_mec2.bin
-amdgpu/sdma_7_0_1.bin
-amdgpu/renoir_ta.bin
-amdgpu/navi10_me.bin
-amdgpu/vangogh_ce.bin
-amdgpu/sdma_6_0_2.bin
-amdgpu/aldebaran_sjt_mec.bin
-amdgpu/gc_11_5_0_rlc.bin
-amdgpu/sdma_6_1_3.bin
-amdgpu/topaz_me.bin
-amdgpu/gc_9_4_3_mec.bin
-amdgpu/cyan_skillfish2_sdma.bin
-amdgpu/vcn_4_0_3.bin
-amdgpu/psp_13_0_0_sos_kicker.bin
-amdgpu/gc_11_0_0_imu_kicker.bin
-amdgpu/mullins_sdma.bin
-amdgpu/gc_12_0_1_imu.bin
-amdgpu/yellow_carp_dmcub.bin
-amdgpu/beige_goby_ta.bin
-amdgpu/gc_11_0_1_me.bin
-amdgpu/vegam_me.bin
-amdgpu/dimgrey_cavefish_dmcub.bin
-amdgpu/psp_14_0_0_ta.bin
-amdgpu/pitcairn_mc.bin
-amdgpu/gc_11_0_1_pfp.bin
-amdgpu/tonga_rlc.bin
-amdgpu/gc_11_0_3_mes_2.bin
-amdgpu/hawaii_mec.bin
-amdgpu/carrizo_mec2.bin
-amdgpu/navi10_mec.bin
-amdgpu/picasso_rlc_am4.bin
-amdgpu/polaris10_k2_smc.bin
-amdgpu/gc_12_0_1_mec.bin
-amdgpu/smu_14_0_3.bin
-amdgpu/gc_11_5_3_mes_2.bin
-amdgpu/polaris12_mec2_2.bin
-amdgpu/tonga_sdma1.bin
-amdgpu/kaveri_uvd.bin
-amdgpu/polaris11_uvd.bin
-amdgpu/kaveri_sdma.bin
-amdgpu/vpe_6_1_1.bin
-amdgpu/gc_11_0_0_pfp.bin
-amdgpu/navi10_sdma1.bin
-amdgpu/polaris12_32_mc.bin
-amdgpu/vega10_ce.bin
-amdgpu/hawaii_smc.bin
-amdgpu/vega20_rlc.bin
-amdgpu/bonaire_sdma1.bin
-amdgpu/gc_12_0_0_me.bin
-amdgpu/fiji_sdma.bin
-amdgpu/topaz_mc.bin
-amdgpu/vegam_pfp.bin
-amdgpu/green_sardine_rlc.bin
-amdgpu/polaris10_mec2_2.bin
-amdgpu/picasso_asd.bin
-amdgpu/verde_smc.bin
-amdgpu/topaz_sdma1.bin
-amdgpu/polaris11_mec_2.bin
-amdgpu/psp_14_0_5_toc.bin
-amdgpu/polaris12_sdma1.bin
-amdgpu/tonga_smc.bin
-amdgpu/vcn_3_1_2.bin
-amdgpu/navy_flounder_ta.bin
-amdgpu/vega12_gpu_info.bin
-amdgpu/renoir_mec.bin
-amdgpu/navy_flounder_sos.bin
-amdgpu/navi14_me_wks.bin
-amdgpu/picasso_me.bin
-amdgpu/dimgrey_cavefish_pfp.bin
-amdgpu/gc_11_5_2_rlc.bin
-amdgpu/vega12_pfp.bin
-amdgpu/aldebaran_rlc.bin
-amdgpu/polaris11_ce.bin
-amdgpu/gc_11_0_0_mes_2.bin
-amdgpu/gc_10_3_7_mec.bin
-amdgpu/sienna_cichlid_me.bin
-amdgpu/mullins_sdma1.bin
-amdgpu/raven2_ta.bin
-amdgpu/gc_11_5_0_me.bin
-amdgpu/gc_11_5_2_mec.bin
-amdgpu/vega20_me.bin
-amdgpu/cyan_skillfish2_ce.bin
-amdgpu/dimgrey_cavefish_sdma.bin
-amdgpu/raven2_asd.bin
-amdgpu/hainan_ce.bin
-amdgpu/green_sardine_dmcub.bin
-amdgpu/psp_13_0_6_sos.bin
-amdgpu/dimgrey_cavefish_ta.bin
-amdgpu/gc_12_0_0_mes1.bin
-amdgpu/psp_14_0_0_toc.bin
-amdgpu/dimgrey_cavefish_sos.bin
-amdgpu/gc_10_3_7_pfp.bin
-amdgpu/vega20_uvd.bin
-amdgpu/mullins_me.bin
-amdgpu/hainan_mc.bin
-amdgpu/gc_12_0_0_mec.bin
-amdgpu/polaris12_ce_2.bin
-amdgpu/bonaire_mec.bin
-amdgpu/polaris10_me.bin
-amdgpu/gc_11_0_3_imu.bin
-amdgpu/green_sardine_me.bin
-amdgpu/hainan_pfp.bin
-amdgpu/vangogh_toc.bin
-amdgpu/psp_13_0_5_ta.bin
-amdgpu/vcn_4_0_5.bin
-amdgpu/psp_13_0_8_toc.bin
-amdgpu/topaz_sdma.bin
-amdgpu/psp_13_0_8_ta.bin
-amdgpu/vcn_4_0_2.bin
-amdgpu/vega20_vce.bin
-amdgpu/raven_sdma.bin
-amdgpu/gc_9_4_3_rlc.bin
-amdgpu/polaris10_vce.bin
-amdgpu/smu_13_0_10.bin
-amdgpu/gc_10_3_6_mec.bin
-amdgpu/gc_11_0_2_rlc.bin
-amdgpu/polaris12_k_mc.bin
-amdgpu/gc_11_0_2_mes1.bin
-amdgpu/navi12_ta.bin
-amdgpu/green_sardine_asd.bin
-amdgpu/dimgrey_cavefish_vcn.bin
-amdgpu/vega20_ta.bin
-amdgpu/psp_14_0_1_toc.bin
-amdgpu/gc_11_0_4_mes1.bin
-amdgpu/mullins_mec.bin
-amdgpu/psp_13_0_6_ta.bin
-amdgpu/dcn_3_1_5_dmcub.bin
-amdgpu/kaveri_rlc.bin
-amdgpu/hawaii_mc.bin
-amdgpu/dcn_3_6_dmcub.bin
-amdgpu/polaris12_vce.bin
-amdgpu/raven_me.bin
-amdgpu/navy_flounder_sdma.bin
-amdgpu/navi12_mec.bin
-amdgpu/polaris12_mc.bin
-amdgpu/oland_rlc.bin
-amdgpu/pitcairn_smc.bin
-amdgpu/raven2_rlc.bin
-amdgpu/dcn_3_1_6_dmcub.bin
-amdgpu/vcn_5_0_0.bin
-amdgpu/vangogh_rlc.bin
-amdgpu/fiji_mec2.bin
-amdgpu/gc_11_0_0_mec.bin
-amdgpu/kaveri_me.bin
-amdgpu/green_sardine_pfp.bin
-amdgpu/polaris11_me_2.bin
-amdgpu/gc_11_0_3_mec.bin
-amdgpu/raven2_pfp.bin
-amdgpu/pitcairn_ce.bin
-amdgpu/polaris12_pfp.bin
-amdgpu/gc_10_3_6_pfp.bin
-amdgpu/tonga_ce.bin
-amdgpu/gc_11_0_1_mes.bin
-amdgpu/navi12_pfp.bin
-amdgpu/psp_13_0_10_sos.bin
-amdgpu/vega12_uvd.bin
-amdgpu/bonaire_rlc.bin
-amdgpu/hainan_me.bin
-amdgpu/vega20_smc.bin
-amdgpu/gc_12_0_1_rlc.bin
-amdgpu/beige_goby_sdma.bin
-amdgpu/hawaii_ce.bin
-amdgpu/dimgrey_cavefish_ce.bin
-amdgpu/psp_14_0_2_ta.bin
-amdgpu/polaris12_mec_2.bin
-amdgpu/psp_14_0_3_ta.bin
-amdgpu/raven_rlc.bin
-amdgpu/yellow_carp_asd.bin
-amdgpu/aldebaran_vcn.bin
-amdgpu/navi14_smc.bin
-amdgpu/kabini_mec.bin
-amdgpu/tonga_me.bin
-amdgpu/smu_13_0_14.bin
-amdgpu/bonaire_mc.bin
-amdgpu/polaris11_mec2.bin
-amdgpu/vegam_vce.bin
-amdgpu/sienna_cichlid_sos.bin
-amdgpu/green_sardine_mec.bin
-amdgpu/sienna_cichlid_mec.bin
-amdgpu/gc_11_5_1_mec.bin
-amdgpu/polaris10_sdma1.bin
-amdgpu/gc_11_0_2_me.bin
-amdgpu/gc_11_0_4_rlc.bin
-amdgpu/navi12_ce.bin
-amdgpu/vegam_rlc.bin
-amdgpu/psp_13_0_11_ta.bin
-amdgpu/polaris10_me_2.bin
-amdgpu/vega20_ip_discovery.bin
-amdgpu/vega10_vce.bin
-amdgpu/gc_11_0_1_mec.bin
-amdgpu/psp_13_0_14_ta.bin
-amdgpu/pitcairn_k_smc.bin
-amdgpu/navy_flounder_pfp.bin
-amdgpu/beige_goby_vcn.bin
-amdgpu/psp_13_0_7_sos.bin
-amdgpu/beige_goby_me.bin
-amdgpu/aldebaran_smc.bin
-amdgpu/gc_11_0_2_mec.bin
-amdgpu/raven2_me.bin
-amdgpu/stoney_ce.bin
-amdgpu/polaris12_uvd.bin
-amdgpu/gc_12_0_0_uni_mes.bin
-amdgpu/psp_13_0_5_toc.bin
-amdgpu/bonaire_sdma.bin
-amdgpu/raven_mec2.bin
-amdgpu/carrizo_vce.bin
-amdgpu/psp_13_0_0_sos.bin
-amdgpu/picasso_mec2.bin
-amdgpu/navy_flounder_mec.bin
-amdgpu/mullins_uvd.bin
-amdgpu/bonaire_k_smc.bin
-amdgpu/gc_12_0_1_toc.bin
-amdgpu/oland_pfp.bin
-amdgpu/aldebaran_sjt_mec2.bin
-amdgpu/polaris11_sdma1.bin
-amdgpu/vega10_gpu_info.bin
-amdgpu/tahiti_rlc.bin
-amdgpu/fiji_smc.bin
-amdgpu/vangogh_mec2.bin
-amdgpu/renoir_asd.bin
-amdgpu/gc_11_0_1_imu.bin
-amdgpu/gc_11_0_3_rlc.bin
-amdgpu/psp_14_0_4_ta.bin
-amdgpu/navi14_pfp.bin
-amdgpu/topaz_ce.bin
-amdgpu/sienna_cichlid_pfp.bin
-amdgpu/sienna_cichlid_dmcub.bin
-amdgpu/hainan_k_smc.bin
-amdgpu/dcn_4_0_1_dmcub.bin
-amdgpu/gc_11_0_0_rlc_kicker.bin
-amdgpu/hawaii_me.bin
-amdgpu/navi14_ce.bin
-amdgpu/kabini_ce.bin
-amdgpu/navi12_sos.bin
-amdgpu/navi14_mec2_wks.bin
-amdgpu/gc_11_5_2_me.bin
-amdgpu/kaveri_ce.bin
-amdgpu/beige_goby_mec.bin
-amdgpu/sienna_cichlid_smc.bin
-amdgpu/gc_11_0_3_mes1.bin
-amdgpu/carrizo_uvd.bin
-amdgpu/vega12_me.bin
-amdgpu/gc_11_5_1_rlc.bin
-amdgpu/polaris12_me.bin
-amdgpu/dcn_3_2_1_dmcub.bin
-amdgpu/mullins_rlc.bin
-amdgpu/dimgrey_cavefish_mec2.bin
-amdgpu/raven_dmcu.bin
-amdgpu/oland_me.bin
-amdgpu/fiji_ce.bin
-amdgpu/sdma_6_0_1.bin
-amdgpu/stoney_sdma.bin
-amdgpu/pitcairn_me.bin
-amdgpu/carrizo_rlc.bin
-amdgpu/navi14_ta.bin
-amdgpu/smu_13_0_0_kicker.bin
-amdgpu/dimgrey_cavefish_mec.bin
-amdgpu/raven2_gpu_info.bin
-amdgpu/oland_mc.bin
-amdgpu/gc_11_0_4_pfp.bin
-amdgpu/polaris11_pfp_2.bin
-amdgpu/raven_asd.bin
-amdgpu/psp_13_0_7_ta.bin
-amdgpu/polaris10_pfp_2.bin
-amdgpu/gc_11_5_3_pfp.bin
-amdgpu/beige_goby_smc.bin
-amdgpu/si58_mc.bin
-amdgpu/gc_11_0_2_mes.bin
-amdgpu/gc_11_0_4_mes_2.bin
-amdgpu/polaris10_k_mc.bin
-amdgpu/picasso_rlc.bin
-amdgpu/polaris10_mec2.bin
-amdgpu/vega12_vce.bin
-amdgpu/psp_13_0_4_toc.bin
-amdgpu/smu_14_0_2.bin
-amdgpu/raven_ta.bin
-amdgpu/polaris10_mc.bin
-amdgpu/arcturus_smc.bin
-amdgpu/vega10_me.bin
-amdgpu/gc_10_3_6_ce.bin
-amdgpu/gc_11_5_2_mes_2.bin
-amdgpu/verde_ce.bin
-amdgpu/psp_13_0_4_ta.bin
-amdgpu/bonaire_smc.bin
-amdgpu/yellow_carp_ce.bin
-amdgpu/renoir_sdma.bin
-amdgpu/gc_11_0_0_mes.bin
-amdgpu/polaris12_smc.bin
-amdgpu/polaris10_smc.bin
-amdgpu/topaz_k_smc.bin
-amdgpu/beige_goby_mec2.bin
-amdgpu/hainan_smc.bin
-amdgpu/cyan_skillfish2_mec.bin
-amdgpu/gc_11_5_0_mes_2.bin
-amdgpu/carrizo_mec.bin
-amdgpu/raven2_mec.bin
-amdgpu/sienna_cichlid_ce.bin
-amdgpu/yellow_carp_pfp.bin
-amdgpu/gc_11_0_2_imu.bin
-amdgpu/navi12_sdma1.bin
-amdgpu/arcturus_mec2.bin
-amdgpu/raven_vcn.bin
 amdgpu/gc_9_5_0_rlc.bin
-amdgpu/beige_goby_ce.bin
-amdgpu/navi10_vcn.bin
-amdgpu/stoney_uvd.bin
-amdgpu/yellow_carp_mec.bin
-amdgpu/navi10_rlc.bin
-amdgpu/yellow_carp_sdma.bin
-amdgpu/psp_13_0_0_ta.bin
-amdgpu/carrizo_ce.bin
-amdgpu/gc_11_5_3_me.bin
-amdgpu/stoney_mec.bin
-amdgpu/gc_11_5_2_imu.bin
-amdgpu/vcn_4_0_6_1.bin
-amdgpu/tahiti_ce.bin
-amdgpu/tahiti_k_smc.bin
-amdgpu/gc_11_0_4_imu.bin
-amdgpu/polaris11_pfp.bin
-amdgpu/pitcairn_rlc.bin
-amdgpu/gc_11_0_3_pfp.bin
+amdgpu/navi10_asd.bin
+amdgpu/navi10_mec2.bin
 amdgpu/oland_uvd.bin
-amdgpu/gc_11_5_2_mes1.bin
-amdgpu/green_sardine_mec2.bin
-amdgpu/navi14_rlc.bin
-amdgpu/hawaii_sdma.bin
-amdgpu/gc_12_0_1_mes1.bin
-amdgpu/gc_11_5_2_pfp.bin
-amdgpu/cyan_skillfish2_mec2.bin
-amdgpu/dimgrey_cavefish_me.bin
-amdgpu/sdma_7_0_0.bin
-amdgpu/polaris11_mec.bin
-amdgpu/raven2_sdma.bin
-amdgpu/navy_flounder_dmcub.bin
-amdgpu/navi12_mec2.bin
-amdgpu/psp_13_0_8_asd.bin
-amdgpu/picasso_ip_discovery.bin
-amdgpu/dimgrey_cavefish_smc.bin
-amdgpu/kaveri_sdma1.bin
-amdgpu/vegam_mec.bin
-amdgpu/psp_14_0_2_sos.bin
-amdgpu/renoir_dmcub.bin
-amdgpu/picasso_pfp.bin
-amdgpu/arcturus_sos.bin
-amdgpu/sienna_cichlid_mec2.bin
-amdgpu/psp_13_0_11_toc.bin
-amdgpu/isp_4_1_1.bin
-amdgpu/polaris11_k2_smc.bin
-amdgpu/vega12_ip_discovery.bin
-amdgpu/carrizo_sdma1.bin
-amdgpu/vega10_smc.bin
-amdgpu/polaris10_mec.bin
-amdgpu/gc_11_5_0_pfp.bin
-amdgpu/topaz_pfp.bin
-amdgpu/kabini_vce.bin
-amdgpu/fiji_pfp.bin
-amdgpu/kabini_me.bin
-amdgpu/gc_11_5_3_mec.bin
-amdgpu/vegam_uvd.bin
-amdgpu/arcturus_gpu_info.bin
-amdgpu/psp_14_0_4_toc.bin
-amdgpu/dcn_3_5_dmcub.bin
-amdgpu/vega10_mec.bin
-amdgpu/psp_13_0_5_asd.bin
-amdgpu/picasso_sdma.bin
-amdgpu/polaris10_rlc.bin
-amdgpu/gc_11_0_2_mes_2.bin
-amdgpu/gc_11_0_4_mes.bin
-amdgpu/vegam_sdma1.bin
-amdgpu/gc_10_3_6_mec2.bin
-amdgpu/polaris10_k_smc.bin
-amdgpu/polaris11_vce.bin
-amdgpu/vega12_mec.bin
-amdgpu/renoir_gpu_info.bin
-amdgpu/polaris12_mec.bin
-amdgpu/sdma_6_1_0.bin
+amdgpu/hawaii_ce.bin
+amdgpu/polaris10_smc_sk.bin
+amdgpu/vegam_ce.bin
+amdgpu/gc_11_0_0_mes.bin
+amdgpu/polaris11_k_smc.bin
+amdgpu/navi10_mec.bin
+amdgpu/polaris12_rlc.bin
+amdgpu/psp_13_0_14_ta.bin
+amdgpu/polaris10_mec2_2.bin
+amdgpu/vega20_mec2.bin
+amdgpu/oland_rlc.bin
+amdgpu/vega20_ce.bin
+amdgpu/navi10_vcn.bin
 amdgpu/psp_13_0_10_ta.bin
+amdgpu/gc_11_0_4_mes.bin
+amdgpu/gc_11_0_4_mes_2.bin
+amdgpu/vega12_sos.bin
+amdgpu/navi12_smc.bin
+amdgpu/yellow_carp_pfp.bin
+amdgpu/fiji_mec2.bin
+amdgpu/smu_13_0_6.bin
+amdgpu/sienna_cichlid_ce.bin
+amdgpu/navy_flounder_dmcub.bin
+amdgpu/bonaire_me.bin
+amdgpu/bonaire_k_smc.bin
+amdgpu/vcn_4_0_6.bin
+amdgpu/smu_13_0_14.bin
+amdgpu/sdma_6_0_3.bin
+amdgpu/polaris10_mec2.bin
+amdgpu/tahiti_mc.bin
+amdgpu/polaris11_pfp.bin
+amdgpu/carrizo_vce.bin
+amdgpu/renoir_pfp.bin
+amdgpu/topaz_sdma.bin
+amdgpu/tahiti_rlc.bin
+amdgpu/green_sardine_ce.bin
+amdgpu/mullins_sdma1.bin
+amdgpu/gc_11_0_1_imu.bin
+amdgpu/vega12_pfp.bin
+amdgpu/kaveri_sdma.bin
+amdgpu/psp_14_0_4_toc.bin
+amdgpu/kabini_uvd.bin
+amdgpu/raven2_vcn.bin
+amdgpu/raven2_gpu_info.bin
+amdgpu/navi14_ta.bin
+amdgpu/yellow_carp_vcn.bin
+amdgpu/gc_12_0_1_imu.bin
+amdgpu/carrizo_pfp.bin
+amdgpu/vega10_me.bin
+amdgpu/green_sardine_me.bin
+amdgpu/navi10_smc.bin
+amdgpu/topaz_mec.bin
+amdgpu/yellow_carp_dmcub.bin
+amdgpu/gc_11_0_2_me.bin
+amdgpu/arcturus_rlc.bin
+amdgpu/raven_pfp.bin
+amdgpu/tonga_k_smc.bin
+amdgpu/vega20_pfp.bin
+amdgpu/tonga_sdma.bin
+amdgpu/hawaii_pfp.bin
+amdgpu/gc_11_0_0_pfp.bin
+amdgpu/bonaire_rlc.bin
+amdgpu/gc_11_5_1_mes1.bin
+amdgpu/sienna_cichlid_mec.bin
+amdgpu/polaris11_mec_2.bin
+amdgpu/polaris10_pfp_2.bin
+amdgpu/tonga_sdma1.bin
+amdgpu/dimgrey_cavefish_mec2.bin
+amdgpu/vega20_sos.bin
+amdgpu/raven2_mec2.bin
+amdgpu/carrizo_sdma1.bin
+amdgpu/stoney_mec.bin
+amdgpu/gc_10_3_6_me.bin
+amdgpu/navi14_mec_wks.bin
+amdgpu/hawaii_uvd.bin
+amdgpu/gc_12_0_1_mes1.bin
+amdgpu/beige_goby_sos.bin
+amdgpu/beige_goby_sdma.bin
+amdgpu/psp_13_0_7_ta.bin
+amdgpu/vega10_gpu_info.bin
 amdgpu/carrizo_sdma.bin
-amdgpu/mullins_ce.bin
-amdgpu/vangogh_sdma.bin
-amdgpu/gc_11_0_2_pfp.bin
-amdgpu/raven2_ip_discovery.bin
-amdgpu/vangogh_dmcub.bin
-amdgpu/gc_10_3_7_ce.bin
-amdgpu/navy_flounder_mec2.bin
-amdgpu/verde_uvd.bin
-amdgpu/vega12_mec2.bin
-amdgpu/vega20_sdma1.bin
-amdgpu/navi14_ce_wks.bin
-amdgpu/stoney_me.bin
-amdgpu/fiji_vce.bin
-amdgpu/picasso_ta.bin
-amdgpu/gc_11_0_3_me.bin
-amdgpu/vcn_5_0_1.bin
-amdgpu/vega20_sdma.bin
-amdgpu/navi10_sos.bin
-amdgpu/fiji_sdma1.bin
-amdgpu/polaris10_mec_2.bin
-amdgpu/arcturus_mec.bin
+amdgpu/gc_10_3_6_ce.bin
+amdgpu/picasso_pfp.bin
+amdgpu/yellow_carp_sdma.bin
 amdgpu/carrizo_me.bin
 amdgpu/aldebaran_mec2.bin
-amdgpu/polaris11_me.bin
-amdgpu/verde_pfp.bin
-amdgpu/polaris11_mc.bin
-amdgpu/beige_goby_sos.bin
-amdgpu/topaz_mec.bin
-amdgpu/vega12_asd.bin
-amdgpu/gc_11_0_4_me.bin
-amdgpu/raven_ip_discovery.bin
-amdgpu/smu_13_0_0.bin
-amdgpu/vega10_sdma1.bin
-amdgpu/gc_12_0_0_imu.bin
-amdgpu/vega10_mec2.bin
-amdgpu/navy_flounder_vcn.bin
-amdgpu/navy_flounder_me.bin
-amdgpu/green_sardine_ce.bin
-amdgpu/green_sardine_vcn.bin
-amdgpu/gc_11_5_0_mes1.bin
-amdgpu/hawaii_vce.bin
-amdgpu/navi10_asd.bin
-amdgpu/tonga_uvd.bin
-amdgpu/navi14_pfp_wks.bin
-amdgpu/polaris11_smc_sk.bin
-amdgpu/sdma_5_2_7.bin
-amdgpu/beige_goby_rlc.bin
-amdgpu/vega12_smc.bin
-amdgpu/gc_11_5_1_mes1.bin
-amdgpu/tonga_vce.bin
-amdgpu/cyan_skillfish2_rlc.bin
-amdgpu/gc_11_5_0_mec.bin
-amdgpu/polaris10_smc_sk.bin
-amdgpu/sienna_cichlid_rlc.bin
-amdgpu/sdma_6_1_1.bin
-amdgpu/stoney_vce.bin
-amdgpu/sienna_cichlid_sdma.bin
-amdgpu/psp_14_0_1_ta.bin
-amdgpu/renoir_me.bin
+amdgpu/vangogh_toc.bin
+amdgpu/tonga_rlc.bin
+amdgpu/sienna_cichlid_vcn.bin
+amdgpu/hainan_rlc.bin
 amdgpu/kabini_sdma.bin
-amdgpu/polaris12_k_smc.bin
-amdgpu/navi14_vcn.bin
+amdgpu/gc_11_0_0_me.bin
+amdgpu/vega20_ip_discovery.bin
+amdgpu/gc_11_5_0_mec.bin
+amdgpu/dimgrey_cavefish_pfp.bin
+amdgpu/navi14_rlc.bin
+amdgpu/polaris10_ce.bin
+amdgpu/verde_ce.bin
+amdgpu/gc_12_0_0_me.bin
+amdgpu/vangogh_dmcub.bin
+amdgpu/gc_11_0_2_pfp.bin
+amdgpu/polaris10_pfp.bin
+amdgpu/picasso_gpu_info.bin
+amdgpu/polaris12_mec2.bin
+amdgpu/cyan_skillfish2_mec.bin
+amdgpu/navy_flounder_mec2.bin
+amdgpu/gc_11_5_3_mes1.bin
+amdgpu/navi12_dmcu.bin
+amdgpu/gc_11_0_0_rlc_1.bin
+amdgpu/yellow_carp_mec2.bin
+amdgpu/gc_12_0_1_mec.bin
+amdgpu/gc_11_0_3_pfp.bin
+amdgpu/gc_10_3_7_me.bin
+amdgpu/sdma_6_1_2.bin
+amdgpu/beige_goby_ce.bin
+amdgpu/cyan_skillfish2_sdma.bin
+amdgpu/sienna_cichlid_me.bin
+amdgpu/raven2_ta.bin
+amdgpu/gc_11_5_1_pfp.bin
+amdgpu/polaris12_ce_2.bin
+amdgpu/carrizo_mec2.bin
+amdgpu/psp_13_0_0_ta_kicker.bin
+amdgpu/gc_12_0_0_imu.bin
+amdgpu/dcn_3_5_dmcub.bin
+amdgpu/gc_11_5_2_pfp.bin
+amdgpu/arcturus_ta.bin
+amdgpu/picasso_rlc_am4.bin
+amdgpu/raven_rlc.bin
+amdgpu/polaris12_mec2_2.bin
+amdgpu/polaris11_k_mc.bin
+amdgpu/navy_flounder_pfp.bin
+amdgpu/gc_9_4_4_sjt_mec.bin
+amdgpu/gc_11_5_3_imu.bin
+amdgpu/tonga_ce.bin
+amdgpu/bonaire_mc.bin
+amdgpu/kaveri_mec.bin
+amdgpu/carrizo_mec.bin
+amdgpu/sdma_4_4_2.bin
+amdgpu/kaveri_pfp.bin
+amdgpu/vega20_ta.bin
+amdgpu/vangogh_sdma.bin
+amdgpu/gc_12_0_1_rlc.bin
+amdgpu/mullins_ce.bin
+amdgpu/polaris10_k_smc.bin
+amdgpu/sdma_5_2_6.bin
+amdgpu/dimgrey_cavefish_sos.bin
+amdgpu/vegam_rlc.bin
+amdgpu/polaris11_smc.bin
+amdgpu/vega20_rlc.bin
+amdgpu/gc_11_5_0_imu.bin
+amdgpu/stoney_uvd.bin
+amdgpu/hainan_smc.bin
+amdgpu/stoney_pfp.bin
+amdgpu/gc_11_0_3_me.bin
+amdgpu/gc_12_0_0_mes.bin
+amdgpu/sdma_6_1_3.bin
+amdgpu/gc_11_5_0_me.bin
+amdgpu/arcturus_vcn.bin
+amdgpu/vpe_6_1_1.bin
+amdgpu/sdma_4_4_4.bin
+amdgpu/tonga_me.bin
+amdgpu/hawaii_sdma.bin
+amdgpu/bonaire_pfp.bin
+amdgpu/isp_4_1_1.bin
+amdgpu/polaris11_rlc.bin
+amdgpu/vcn_4_0_6_1.bin
+amdgpu/vangogh_mec.bin
+amdgpu/raven_ce.bin
+amdgpu/hawaii_smc.bin
+amdgpu/verde_smc.bin
+amdgpu/vcn_5_0_1.bin
+amdgpu/psp_13_0_12_sos.bin
+amdgpu/psp_13_0_14_sos.bin
+amdgpu/bonaire_ce.bin
+amdgpu/fiji_mec.bin
+amdgpu/aldebaran_sjt_mec.bin
+amdgpu/polaris12_mec_2.bin
+amdgpu/vega10_sdma1.bin
+amdgpu/gc_11_5_2_mec.bin
+amdgpu/gc_11_0_3_mes_2.bin
+amdgpu/vega12_sdma.bin
+amdgpu/carrizo_ce.bin
+amdgpu/raven_vcn.bin
+amdgpu/pitcairn_pfp.bin
+amdgpu/hainan_mc.bin
+amdgpu/navy_flounder_mec.bin
 amdgpu/picasso_vcn.bin
+amdgpu/vega12_ip_discovery.bin
+amdgpu/sienna_cichlid_ta.bin
+amdgpu/polaris11_uvd.bin
+amdgpu/mullins_vce.bin
+amdgpu/bonaire_sdma.bin
+amdgpu/dimgrey_cavefish_dmcub.bin
+amdgpu/raven_gpu_info.bin
+amdgpu/tahiti_ce.bin
+amdgpu/vega10_ip_discovery.bin
+amdgpu/dcn_4_0_1_dmcub.bin
+amdgpu/raven_mec.bin
+amdgpu/vcn_4_0_2.bin
+amdgpu/gc_10_3_6_mec.bin
+amdgpu/psp_13_0_0_sos_kicker.bin
+amdgpu/gc_11_0_0_mes_2.bin
+amdgpu/psp_13_0_8_toc.bin
+amdgpu/polaris11_smc_sk.bin
+amdgpu/navy_flounder_me.bin
+amdgpu/fiji_ce.bin
+amdgpu/green_sardine_sdma.bin
+amdgpu/gc_11_0_2_rlc.bin
+amdgpu/vega10_sos.bin
+amdgpu/psp_14_0_2_sos.bin
+amdgpu/kabini_mec.bin
+amdgpu/kaveri_ce.bin
+amdgpu/polaris11_me.bin
+amdgpu/hainan_pfp.bin
+amdgpu/fiji_vce.bin
+amdgpu/navi10_rlc.bin
+amdgpu/picasso_asd.bin
+amdgpu/psp_14_0_2_ta.bin
+amdgpu/psp_13_0_4_toc.bin
+amdgpu/vpe_6_1_3.bin
+amdgpu/vega10_pfp.bin
+amdgpu/pitcairn_mc.bin
+amdgpu/polaris11_sdma1.bin
+amdgpu/beige_goby_me.bin
+amdgpu/topaz_mec2.bin
+amdgpu/polaris10_rlc.bin
+amdgpu/psp_14_0_5_toc.bin
+amdgpu/renoir_asd.bin
+amdgpu/gc_11_0_0_rlc_kicker.bin
+amdgpu/cyan_skillfish2_rlc.bin
+amdgpu/renoir_vcn.bin
+amdgpu/green_sardine_mec2.bin
+amdgpu/psp_13_0_8_asd.bin
+amdgpu/tonga_vce.bin
+amdgpu/tonga_pfp.bin
+amdgpu/topaz_mc.bin
 amdgpu/navi12_sdma.bin
+amdgpu/gc_9_5_0_sjt_mec.bin
+amdgpu/vega10_rlc.bin
+amdgpu/navy_flounder_rlc.bin
+amdgpu/kaveri_mec2.bin
+amdgpu/gc_11_0_0_imu_kicker.bin
+amdgpu/gc_11_0_0_imu.bin
+amdgpu/gc_11_0_4_mec.bin
+amdgpu/polaris11_k2_smc.bin
+amdgpu/psp_13_0_11_toc.bin
+amdgpu/topaz_smc.bin
+amdgpu/arcturus_mec.bin
+amdgpu/polaris12_sdma1.bin
+amdgpu/verde_k_smc.bin
+amdgpu/tonga_uvd.bin
+amdgpu/gc_11_0_4_me.bin
+amdgpu/vega12_sdma1.bin
+amdgpu/gc_11_0_2_mes.bin
+amdgpu/gc_11_0_3_mec.bin
+amdgpu/verde_rlc.bin
+amdgpu/dcn_3_2_1_dmcub.bin
+amdgpu/raven2_me.bin
+amdgpu/raven2_ip_discovery.bin
+amdgpu/psp_14_0_4_ta.bin
+amdgpu/raven_asd.bin
+amdgpu/vega12_mec.bin
+amdgpu/green_sardine_mec.bin
+amdgpu/polaris10_ce_2.bin
+amdgpu/vega12_uvd.bin
+amdgpu/topaz_pfp.bin
+amdgpu/aldebaran_ta.bin
+amdgpu/beige_goby_mec2.bin
+amdgpu/vega10_asd.bin
+amdgpu/umsch_mm_4_0_0.bin
+amdgpu/psp_14_0_5_ta.bin
+amdgpu/polaris12_mc.bin
+amdgpu/yellow_carp_ce.bin
+amdgpu/polaris11_mec.bin
+amdgpu/arcturus_asd.bin
+amdgpu/navi14_pfp.bin
+amdgpu/polaris12_k_mc.bin
+amdgpu/beige_goby_smc.bin
+amdgpu/arcturus_mec2.bin
+amdgpu/fiji_sdma1.bin
+amdgpu/navi14_ce.bin
+amdgpu/fiji_uvd.bin
+amdgpu/polaris10_mec.bin
+amdgpu/gc_10_3_7_mec2.bin
+amdgpu/gc_11_0_1_me.bin
+amdgpu/tahiti_smc.bin
+amdgpu/si58_mc.bin
+amdgpu/vega20_sdma1.bin
+amdgpu/green_sardine_asd.bin
+amdgpu/vega10_vce.bin
+amdgpu/gc_11_0_0_rlc.bin
+amdgpu/carrizo_rlc.bin
+amdgpu/psp_14_0_0_toc.bin
+amdgpu/renoir_mec.bin
+amdgpu/gc_11_0_0_mes1.bin
+amdgpu/tahiti_k_smc.bin
+amdgpu/gc_11_0_4_imu.bin
+amdgpu/gc_11_5_3_rlc.bin
+amdgpu/vega20_asd.bin
+amdgpu/topaz_k_smc.bin
+amdgpu/gc_11_0_0_mec.bin
+amdgpu/dimgrey_cavefish_smc.bin
+amdgpu/kaveri_me.bin
+amdgpu/beige_goby_pfp.bin
+amdgpu/picasso_ce.bin
+amdgpu/gc_10_3_7_ce.bin
+amdgpu/oland_ce.bin
+amdgpu/navi12_ce.bin
+amdgpu/stoney_vce.bin
+amdgpu/navy_flounder_vcn.bin
+amdgpu/sdma_7_0_0.bin
+amdgpu/pitcairn_k_smc.bin
+amdgpu/polaris12_32_mc.bin
+amdgpu/hawaii_me.bin
+amdgpu/vangogh_asd.bin
+amdgpu/polaris11_ce.bin
+amdgpu/hawaii_k_smc.bin
+amdgpu/kabini_pfp.bin
+amdgpu/renoir_sdma.bin
+amdgpu/cyan_skillfish2_pfp.bin
+amdgpu/gc_11_0_1_mes1.bin
+amdgpu/gc_11_5_1_rlc.bin
+amdgpu/picasso_rlc.bin
+amdgpu/hawaii_sdma1.bin
+amdgpu/navi14_sos.bin
+amdgpu/kabini_rlc.bin
+amdgpu/sienna_cichlid_sos.bin
+amdgpu/renoir_mec2.bin
+amdgpu/gc_11_5_3_pfp.bin
+amdgpu/polaris12_uvd.bin
+amdgpu/gc_11_0_3_mes1.bin
+amdgpu/polaris10_smc.bin
+amdgpu/hainan_k_smc.bin
+amdgpu/gc_11_0_2_imu.bin
+amdgpu/yellow_carp_mec.bin
+amdgpu/navi12_sos.bin
+amdgpu/dimgrey_cavefish_rlc.bin
+amdgpu/arcturus_ip_discovery.bin
+amdgpu/beige_goby_dmcub.bin
+amdgpu/smu_13_0_10.bin
+amdgpu/dcn_3_6_dmcub.bin
+amdgpu/vega10_mec.bin
+amdgpu/gc_12_0_1_me.bin
+amdgpu/polaris12_me.bin
+amdgpu/polaris10_vce.bin
+amdgpu/navi14_asd.bin
+amdgpu/vegam_smc.bin
+amdgpu/psp_14_0_3_sos.bin
+amdgpu/aldebaran_rlc.bin
+amdgpu/navi14_me_wks.bin
+amdgpu/bonaire_uvd.bin
+amdgpu/gc_10_3_6_rlc.bin
+amdgpu/mullins_uvd.bin
+amdgpu/cyan_skillfish2_ce.bin
+amdgpu/sdma_5_2_7.bin
+amdgpu/aldebaran_sjt_mec2.bin
+amdgpu/gc_12_0_0_mec.bin
+amdgpu/mullins_rlc.bin
+amdgpu/vega20_mec.bin
+amdgpu/gc_11_0_2_mec.bin
+amdgpu/gc_11_5_1_mes_2.bin
+amdgpu/sdma_6_1_0.bin
+amdgpu/picasso_mec2.bin
+amdgpu/vegam_mec2.bin
+amdgpu/yellow_carp_asd.bin
+amdgpu/gc_11_0_4_rlc.bin
+amdgpu/renoir_rlc.bin
+amdgpu/stoney_ce.bin
+amdgpu/polaris12_smc.bin
+amdgpu/hawaii_mec.bin
+amdgpu/hawaii_vce.bin
+amdgpu/gc_11_5_0_rlc.bin
+amdgpu/pitcairn_rlc.bin
+amdgpu/polaris11_vce.bin
+amdgpu/navi10_me.bin
+amdgpu/psp_13_0_8_ta.bin
+amdgpu/green_sardine_pfp.bin
+amdgpu/dcn_3_2_0_dmcub.bin
+amdgpu/gc_11_5_2_rlc.bin
+amdgpu/gc_11_0_1_pfp.bin
+amdgpu/gc_10_3_6_mec2.bin
+amdgpu/navi14_mec2_wks.bin
+amdgpu/tonga_mec2.bin
+amdgpu/raven_me.bin
+amdgpu/gc_9_4_3_rlc.bin
+amdgpu/polaris10_sdma.bin
 amdgpu/gc_9_4_4_mec.bin
-amdnpu/17f0_10/npu.sbin.1.0.0.63
-amdnpu/17f0_10/npu.sbin
-amdnpu/1502_00/npu.sbin.1.5.2.380
-amdnpu/1502_00/npu.sbin
-amdnpu/17f0_11/npu.sbin.1.0.0.166
+amdgpu/polaris10_k2_smc.bin
+amdgpu/polaris11_mec2.bin
+amdgpu/sienna_cichlid_smc.bin
+amdgpu/kaveri_vce.bin
+amdgpu/raven_sdma.bin
+amdgpu/yellow_carp_toc.bin
+amdgpu/pitcairn_uvd.bin
+amdgpu/vega10_sdma.bin
+amdgpu/navy_flounder_sos.bin
+amdgpu/polaris11_mec2_2.bin
+amdgpu/vangogh_ce.bin
+amdgpu/navi12_mec.bin
+amdgpu/psp_14_0_1_ta.bin
+amdgpu/polaris11_me_2.bin
+amdgpu/vega12_mec2.bin
+amdgpu/vega12_asd.bin
+amdgpu/sienna_cichlid_rlc.bin
+amdgpu/navi10_ce.bin
+amdgpu/gc_12_0_1_toc.bin
+amdgpu/smu_14_0_2.bin
+amdgpu/vega12_ce.bin
+amdgpu/mullins_pfp.bin
+amdgpu/psp_13_0_7_sos.bin
+amdgpu/polaris12_k_smc.bin
+amdgpu/aldebaran_smc.bin
+amdgpu/hainan_me.bin
+amdgpu/polaris10_uvd.bin
+amdgpu/polaris10_me_2.bin
+amdgpu/psp_13_0_6_ta.bin
+amdgpu/gc_11_5_0_mes1.bin
+amdgpu/polaris11_ce_2.bin
+amdgpu/sienna_cichlid_pfp.bin
+amdgpu/psp_14_0_1_toc.bin
+amdgpu/sdma_6_0_0.bin
+amdgpu/polaris12_pfp.bin
+amdgpu/verde_pfp.bin
+amdgpu/gc_11_5_3_me.bin
+amdgpu/vcn_4_0_0.bin
+amdgpu/smu_14_0_3.bin
+amdgpu/topaz_rlc.bin
+amdgpu/navi12_sdma1.bin
+amdgpu/vega20_vce.bin
+amdgpu/navi12_rlc.bin
+amdgpu/gc_11_5_1_mec.bin
+amdgpu/sdma_6_0_2.bin
+amdgpu/bonaire_vce.bin
+amdgpu/gc_10_3_7_pfp.bin
+amdgpu/mullins_me.bin
+amdgpu/gc_10_3_6_pfp.bin
+amdgpu/polaris12_ce.bin
+amdgpu/beige_goby_mec.bin
+amdgpu/kabini_me.bin
+amdgpu/gc_12_0_0_mes1.bin
+amdgpu/gc_9_4_4_rlc.bin
+amdgpu/vegam_uvd.bin
+amdgpu/dimgrey_cavefish_sdma.bin
+amdgpu/gc_11_0_1_mes_2.bin
+amdgpu/navi14_mec.bin
+amdgpu/sienna_cichlid_dmcub.bin
+amdgpu/picasso_me.bin
+amdgpu/cyan_skillfish2_sdma1.bin
+amdgpu/smu_13_0_0.bin
+amdgpu/dcn_3_1_5_dmcub.bin
+amdgpu/navi12_vcn.bin
+amdgpu/navy_flounder_ta.bin
+amdgpu/vega20_me.bin
+amdgpu/stoney_sdma.bin
+amdgpu/hawaii_rlc.bin
+amdgpu/vangogh_mec2.bin
+amdgpu/dcn_3_5_1_dmcub.bin
+amdgpu/polaris10_k_mc.bin
+amdgpu/polaris12_mec.bin
+amdgpu/picasso_ip_discovery.bin
+amdgpu/psp_13_0_11_ta.bin
+amdgpu/vcn_4_0_4.bin
+amdgpu/fiji_smc.bin
+amdgpu/psp_13_0_0_ta.bin
+amdgpu/gc_11_5_3_mes_2.bin
+amdgpu/navi10_ta.bin
+amdgpu/gc_12_0_0_toc.bin
+amdgpu/polaris11_sdma.bin
+amdgpu/navi14_ce_wks.bin
+amdgpu/pitcairn_ce.bin
+amdgpu/gc_10_3_7_rlc.bin
+amdgpu/vcn_3_1_2.bin
+amdgpu/vega10_mec2.bin
+amdgpu/gc_11_5_1_me.bin
+amdgpu/vega12_smc.bin
+amdgpu/vcn_5_0_0.bin
+amdgpu/navi14_pfp_wks.bin
+amdgpu/green_sardine_vcn.bin
+amdgpu/gc_11_5_1_imu.bin
+amdgpu/vega12_rlc.bin
+amdgpu/navi12_gpu_info.bin
+amdgpu/picasso_ta.bin
+amdgpu/bonaire_smc.bin
+amdgpu/renoir_me.bin
+amdgpu/raven2_asd.bin
+amdgpu/navi12_asd.bin
+amdgpu/green_sardine_dmcub.bin
+amdgpu/topaz_me.bin
+amdgpu/navy_flounder_smc.bin
+amdgpu/sdma_6_0_1.bin
+amdgpu/gc_12_0_0_rlc.bin
+amdgpu/carrizo_uvd.bin
+amdgpu/oland_k_smc.bin
+amdgpu/psp_13_0_4_ta.bin
+amdgpu/vegam_pfp.bin
+amdgpu/gc_11_5_2_imu.bin
+amdgpu/tonga_mc.bin
+amdgpu/vegam_vce.bin
+amdgpu/beige_goby_ta.bin
+amdgpu/vega12_vce.bin
+amdgpu/sienna_cichlid_sdma.bin
+amdgpu/vega20_sdma.bin
+amdgpu/gc_11_5_2_me.bin
+amdgpu/navi10_sos.bin
+amdgpu/topaz_ce.bin
+amdgpu/fiji_rlc.bin
+amdgpu/tahiti_pfp.bin
+amdgpu/polaris11_mc.bin
+amdgpu/oland_mc.bin
+amdgpu/gc_11_5_0_pfp.bin
+amdgpu/vega10_smc.bin
+amdgpu/polaris12_sdma.bin
+amdgpu/raven2_mec.bin
+amdgpu/polaris10_mc.bin
+amdgpu/vegam_mec.bin
+amdgpu/hawaii_mc.bin
+amdgpu/bonaire_sdma1.bin
+amdgpu/psp_13_0_5_ta.bin
+amdgpu/gc_12_0_1_pfp.bin
+amdgpu/raven_dmcu.bin
+amdgpu/green_sardine_ta.bin
+amdgpu/vangogh_rlc.bin
+amdgpu/dimgrey_cavefish_ta.bin
+amdgpu/vega10_acg_smc.bin
+amdgpu/gc_11_0_2_mes1.bin
+amdgpu/mullins_sdma.bin
+amdgpu/polaris12_vce.bin
+amdgpu/gc_11_5_2_mes_2.bin
+amdgpu/navi12_mec2.bin
+amdgpu/tonga_mec.bin
+amdgpu/aldebaran_vcn.bin
+amdgpu/beige_goby_vcn.bin
+amdgpu/gc_9_4_3_mec.bin
+amdgpu/navi12_me.bin
+amdgpu/gc_12_0_0_uni_mes.bin
+amdgpu/arcturus_smc.bin
+amdgpu/arcturus_sos.bin
+amdgpu/renoir_ta.bin
+amdgpu/navy_flounder_ce.bin
+amdgpu/psp_13_0_10_sos.bin
+amdgpu/vega20_smc.bin
+amdgpu/sdma_7_0_1.bin
+amdgpu/kaveri_uvd.bin
+amdgpu/renoir_dmcub.bin
+amdgpu/navi14_sdma.bin
+amdgpu/fiji_me.bin
+amdgpu/navi12_pfp.bin
+amdgpu/sdma_4_4_5.bin
+amdgpu/vangogh_vcn.bin
+amdgpu/vegam_sdma1.bin
+amdgpu/cyan_skillfish2_me.bin
+amdgpu/oland_smc.bin
+amdgpu/tonga_smc.bin
+amdgpu/smu_13_0_7.bin
+amdgpu/gc_11_0_1_rlc.bin
+amdgpu/gc_9_4_3_sjt_mec.bin
+amdgpu/psp_13_0_5_asd.bin
+amdgpu/oland_pfp.bin
+amdgpu/vega12_gpu_info.bin
+amdgpu/gc_11_0_3_rlc.bin
+amdgpu/stoney_rlc.bin
+amdgpu/gc_12_0_1_mes.bin
+amdgpu/yellow_carp_ta.bin
+amdgpu/topaz_sdma1.bin
+amdgpu/kaveri_sdma1.bin
+amdgpu/fiji_pfp.bin
+amdgpu/raven_ta.bin
+amdgpu/verde_mc.bin
+amdgpu/fiji_mc.bin
+amdgpu/vegam_me.bin
+amdgpu/navi10_sdma1.bin
+amdgpu/psp_14_0_0_ta.bin
+amdgpu/raven2_ce.bin
+amdgpu/vega10_uvd.bin
+amdgpu/kaveri_rlc.bin
+amdgpu/dimgrey_cavefish_mec.bin
+amdgpu/stoney_me.bin
+amdgpu/dimgrey_cavefish_ce.bin
+amdgpu/vcn_4_0_5.bin
+amdgpu/cyan_skillfish2_mec2.bin
+amdgpu/vpe_6_1_0.bin
+amdgpu/tahiti_uvd.bin
+amdgpu/navi14_me.bin
+amdgpu/aldebaran_sdma.bin
+amdgpu/gc_12_0_0_pfp.bin
+amdgpu/polaris10_sdma1.bin
+amdgpu/vega10_ce.bin
+amdgpu/verde_uvd.bin
+amdgpu/gc_12_0_1_uni_mes.bin
+amdgpu/navi12_ta.bin
+amdgpu/psp_13_0_0_sos.bin
+amdgpu/picasso_mec.bin
+amdgpu/dimgrey_cavefish_vcn.bin
+amdgpu/psp_13_0_6_sos.bin
+amdgpu/raven2_sdma.bin
+amdgpu/fiji_sdma.bin
+amdgpu/dcn_3_1_6_dmcub.bin
+amdgpu/pitcairn_smc.bin
+amdgpu/gc_11_5_3_mec.bin
+amdgpu/psp_14_0_3_ta.bin
+amdgpu/verde_me.bin
+amdgpu/navi14_sdma1.bin
+amdgpu/psp_13_0_12_ta.bin
+amdgpu/gc_11_0_3_imu.bin
+amdgpu/oland_me.bin
+amdgpu/raven2_pfp.bin
+amdgpu/beige_goby_rlc.bin
+amdgpu/raven_mec2.bin
+amdgpu/kabini_vce.bin
+amdgpu/vangogh_pfp.bin
+amdgpu/kabini_sdma1.bin
+amdgpu/navy_flounder_sdma.bin
+amdgpu/aldebaran_mec.bin
+amdgpu/dimgrey_cavefish_me.bin
+amdgpu/gc_11_0_1_mec.bin
+amdgpu/yellow_carp_me.bin
+amdgpu/polaris10_mec_2.bin
+amdgpu/vegam_sdma.bin
+amdgpu/yellow_carp_rlc.bin
+amdgpu/gc_11_5_2_mes1.bin
+amdgpu/sienna_cichlid_mec2.bin
+amdgpu/pitcairn_me.bin
+amdgpu/aldebaran_sos.bin
+amdgpu/vega12_me.bin
+amdgpu/tahiti_me.bin
+amdgpu/gc_11_0_1_mes.bin
+amdgpu/picasso_sdma.bin
+amdgpu/banks_k_2_smc.bin
+amdgpu/gc_11_0_4_pfp.bin
+amdgpu/navi14_vcn.bin
+amdgpu/gc_11_5_0_mes_2.bin
+amdgpu/navi14_gpu_info.bin
+amdgpu/gc_11_0_2_mes_2.bin
+amdgpu/arcturus_sdma.bin
+amdgpu/psp_13_0_5_toc.bin
+amdgpu/vega20_uvd.bin
+amdgpu/polaris12_me_2.bin
+amdgpu/smu_13_0_0_kicker.bin
+amdgpu/polaris12_pfp_2.bin
+amdgpu/gc_9_5_0_mec.bin
+amdgpu/arcturus_gpu_info.bin
+amdgpu/sdma_6_1_1.bin
+amdgpu/vcn_4_0_3.bin
+amdgpu/green_sardine_rlc.bin
+amdgpu/dcn_3_1_4_dmcub.bin
+amdgpu/navi10_sdma.bin
+amdgpu/vangogh_me.bin
+amdgpu/navi10_gpu_info.bin
+amdgpu/kabini_ce.bin
+amdgpu/aldebaran_ip_discovery.bin
+amdgpu/navi14_mec2.bin
+amdgpu/mullins_mec.bin
+amdgpu/polaris10_me.bin
+amdgpu/renoir_gpu_info.bin
+amdgpu/navi14_smc.bin
+amdgpu/raven_ip_discovery.bin
+amdgpu/bonaire_mec.bin
+amdgpu/raven2_rlc.bin
+amdgpu/hainan_ce.bin
+amdgpu/navi10_pfp.bin
+amdgpu/gc_10_3_7_mec.bin
+amdgpu/gc_11_0_4_mes1.bin
+amdgpu/renoir_ce.bin
+amdgpu/polaris11_pfp_2.bin
+amdgpu/raven_kicker_rlc.bin
 amdnpu/17f0_11/npu.sbin
-amdtee/amd_pmf_v3_1.bin
-amdtee/amd_pmf_v3.bin
+amdnpu/17f0_11/npu.sbin.1.0.0.166
+amdnpu/1502_00/npu.sbin
+amdnpu/1502_00/npu.sbin.1.5.2.380
+amdnpu/17f0_10/npu.sbin
+amdnpu/17f0_10/npu.sbin.1.0.0.63
 amdtee/773bd96f-b83f-4d52-b12dc529b13d8543.bin
+amdtee/amd_pmf_v3.bin
+amdtee/amd_pmf_v3_1.bin
 amdtee/f29bb3d9-bd66-5441-afb88acc2b2b60d6.bin
+amlogic/aml_w155s2_bt_uart.bin
 amlogic/aml_w265s2_bt_uart.bin
 amlogic/aml_w265s1_bt_uart.bin
-amlogic/aml_w155s2_bt_uart.bin
 amphion/vpu/vpu_fw_imx8_enc.bin
 amphion/vpu/vpu_fw_imx8_dec.bin
 ar3k/ramps_0x01020001_26.dfu
-ar3k/ramps_0x01020201_26.dfu
-ar3k/AthrBT_0x41020000.dfu
-ar3k/30000/PS_ASIC.pst
-ar3k/30000/RamPatch.txt
-ar3k/30000/ar3kbdaddr.pst
-ar3k/AthrBT_0x11020000.dfu
-ar3k/1020201/PS_ASIC.pst
-ar3k/1020201/RamPatch.txt
-ar3k/ramps_0x01020200_40.dfu
-ar3k/ramps_0x31010100_40.dfu
-ar3k/ramps_0x11020000_40.dfu
 ar3k/ramps_0x01020201_40.dfu
+ar3k/ramps_0x31010100_40.dfu
+ar3k/ramps_0x01020200_40.dfu
 ar3k/AthrBT_0x01020001.dfu
-ar3k/ramps_0x31010000_40.dfu
-ar3k/AthrBT_0x01020200.dfu
-ar3k/AthrBT_0x11020100.dfu
-ar3k/1020200/PS_ASIC.pst
-ar3k/1020200/RamPatch.txt
-ar3k/1020200/ar3kbdaddr.pst
-ar3k/AthrBT_0x31010000.dfu
-ar3k/ramps_0x41020000_40.dfu
+ar3k/30101/ar3kbdaddr.pst
 ar3k/30101/PS_ASIC.pst
 ar3k/30101/RamPatch.txt
-ar3k/30101/ar3kbdaddr.pst
-ar3k/AthrBT_0x01020201.dfu
 ar3k/ramps_0x11020100_40.dfu
-ar3k/AthrBT_0x31010100.dfu
 ar3k/1020201coex/ramps_0x01020201_26_HighPriority.dfu
+ar3k/1020200/ar3kbdaddr.pst
+ar3k/1020200/PS_ASIC.pst
+ar3k/1020200/RamPatch.txt
+ar3k/ramps_0x31010000_40.dfu
+ar3k/1020201/PS_ASIC.pst
+ar3k/1020201/RamPatch.txt
+ar3k/AthrBT_0x31010100.dfu
+ar3k/ramps_0x01020201_26.dfu
+ar3k/30000/ar3kbdaddr.pst
+ar3k/30000/PS_ASIC.pst
+ar3k/30000/RamPatch.txt
+ar3k/AthrBT_0x31010000.dfu
+ar3k/ramps_0x11020000_40.dfu
+ar3k/AthrBT_0x11020100.dfu
+ar3k/AthrBT_0x01020201.dfu
+ar3k/ramps_0x41020000_40.dfu
 ar3k/ramps_0x01020200_26.dfu
-ar3k/30101coex/PS_ASIC.pst
-ar3k/30101coex/PS_ASIC_aclHighPri.pst
-ar3k/30101coex/RamPatch.txt
 ar3k/30101coex/ar3kbdaddr.pst
+ar3k/30101coex/PS_ASIC.pst
 ar3k/30101coex/PS_ASIC_aclLowPri.pst
+ar3k/30101coex/RamPatch.txt
+ar3k/30101coex/PS_ASIC_aclHighPri.pst
+ar3k/AthrBT_0x11020000.dfu
+ar3k/AthrBT_0x01020200.dfu
+ar3k/AthrBT_0x41020000.dfu
 ar5523.bin
 ar7010.fw
 ar7010_1_1.fw
@@ -840,1741 +840,1741 @@ ar9271.fw
 arm/mali/arch10.8/mali_csffw.bin
 as102_data1_st.hex
 as102_data2_st.hex
-ath10k/QCA9888/hw2.0/board-2.bin
-ath10k/QCA9888/hw2.0/notice_ath10k_firmware-5.txt
-ath10k/QCA9888/hw2.0/firmware-5.bin
-ath10k/QCA9984/hw1.0/board-2.bin
-ath10k/QCA9984/hw1.0/notice_ath10k_firmware-5.txt
-ath10k/QCA9984/hw1.0/firmware-5.bin
-ath10k/QCA99X0/hw2.0/board-2.bin
-ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt
-ath10k/QCA99X0/hw2.0/firmware-5.bin
 ath10k/QCA9887/hw1.0/board.bin
-ath10k/QCA9887/hw1.0/notice_ath10k_firmware-5.txt
 ath10k/QCA9887/hw1.0/firmware-5.bin
-ath10k/QCA9377/hw1.0/board.bin
-ath10k/QCA9377/hw1.0/notice_ath10k_firmware-sdio-5.txt
-ath10k/QCA9377/hw1.0/board-2.bin
-ath10k/QCA9377/hw1.0/notice_ath10k_firmware-6.txt
-ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
-ath10k/QCA9377/hw1.0/firmware-5.bin
-ath10k/QCA9377/hw1.0/firmware-6.bin
-ath10k/QCA9377/hw1.0/firmware-sdio-5.bin
-ath10k/QCA6174/hw2.1/board.bin
-ath10k/QCA6174/hw2.1/board-2.bin
-ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt
-ath10k/QCA6174/hw2.1/firmware-5.bin
-ath10k/QCA6174/hw3.0/notice_ath10k_firmware-sdio-6.txt
-ath10k/QCA6174/hw3.0/board.bin
-ath10k/QCA6174/hw3.0/firmware-sdio-6.bin
+ath10k/QCA9887/hw1.0/notice_ath10k_firmware-5.txt
+ath10k/QCA9888/hw2.0/firmware-5.bin
+ath10k/QCA9888/hw2.0/notice_ath10k_firmware-5.txt
+ath10k/QCA9888/hw2.0/board-2.bin
 ath10k/QCA6174/hw3.0/notice_ath10k_firmware-4.txt
-ath10k/QCA6174/hw3.0/board-2.bin
-ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
-ath10k/QCA6174/hw3.0/firmware-6.bin
+ath10k/QCA6174/hw3.0/board.bin
+ath10k/QCA6174/hw3.0/notice_ath10k_firmware-sdio-6.txt
+ath10k/QCA6174/hw3.0/firmware-sdio-6.bin
 ath10k/QCA6174/hw3.0/firmware-4.bin
-ath10k/WCN3990/hw1.0/qrb4210/wlanmdsp.mbn
-ath10k/WCN3990/hw1.0/qrb4210/firmware-5.bin
-ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
-ath10k/WCN3990/hw1.0/board-2.bin
+ath10k/QCA6174/hw3.0/firmware-6.bin
+ath10k/QCA6174/hw3.0/notice_ath10k_firmware-6.txt
+ath10k/QCA6174/hw3.0/board-2.bin
+ath10k/QCA6174/hw2.1/board.bin
+ath10k/QCA6174/hw2.1/firmware-5.bin
+ath10k/QCA6174/hw2.1/notice_ath10k_firmware-5.txt
+ath10k/QCA6174/hw2.1/board-2.bin
+ath10k/QCA9984/hw1.0/firmware-5.bin
+ath10k/QCA9984/hw1.0/notice_ath10k_firmware-5.txt
+ath10k/QCA9984/hw1.0/board-2.bin
+ath10k/QCA4019/hw1.0/firmware-5.bin
+ath10k/QCA4019/hw1.0/notice_ath10k_firmware-5.txt
+ath10k/QCA4019/hw1.0/board-2.bin
+ath10k/QCA99X0/hw2.0/firmware-5.bin
+ath10k/QCA99X0/hw2.0/notice_ath10k_firmware-5.txt
+ath10k/QCA99X0/hw2.0/board-2.bin
 ath10k/WCN3990/hw1.0/wlanmdsp.mbn
 ath10k/WCN3990/hw1.0/firmware-5.bin
 ath10k/WCN3990/hw1.0/qcm2290/wlanmdsp.mbn
 ath10k/WCN3990/hw1.0/qcm2290/firmware-5.bin
-ath10k/QCA988X/hw2.0/board.bin
+ath10k/WCN3990/hw1.0/notice.txt_wlanmdsp
+ath10k/WCN3990/hw1.0/qrb4210/wlanmdsp.mbn
+ath10k/WCN3990/hw1.0/qrb4210/firmware-5.bin
+ath10k/WCN3990/hw1.0/board-2.bin
+ath10k/QCA9377/hw1.0/board.bin
+ath10k/QCA9377/hw1.0/firmware-5.bin
+ath10k/QCA9377/hw1.0/firmware-sdio-5.bin
+ath10k/QCA9377/hw1.0/notice_ath10k_firmware-5.txt
+ath10k/QCA9377/hw1.0/firmware-6.bin
+ath10k/QCA9377/hw1.0/notice_ath10k_firmware-6.txt
+ath10k/QCA9377/hw1.0/notice_ath10k_firmware-sdio-5.txt
+ath10k/QCA9377/hw1.0/board-2.bin
 ath10k/QCA988X/hw2.0/notice_ath10k_firmware-4.txt
-ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
+ath10k/QCA988X/hw2.0/board.bin
 ath10k/QCA988X/hw2.0/firmware-5.bin
 ath10k/QCA988X/hw2.0/firmware-4.bin
-ath10k/QCA4019/hw1.0/board-2.bin
-ath10k/QCA4019/hw1.0/notice_ath10k_firmware-5.txt
-ath10k/QCA4019/hw1.0/firmware-5.bin
-ath11k/WCN6855/hw2.1/board-2.bin
-ath11k/WCN6855/hw2.1/amss.bin
-ath11k/WCN6855/hw2.1/regdb.bin
-ath11k/WCN6855/hw2.1/m3.bin
-ath11k/WCN6855/hw2.0/board-2.bin
-ath11k/WCN6855/hw2.0/amss.bin
-ath11k/WCN6855/hw2.0/regdb.bin
-ath11k/WCN6855/hw2.0/m3.bin
-ath11k/WCN6855/hw2.0/Notice.txt
-ath11k/WCN6750/hw1.0/wpss.mdt
-ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
-ath11k/WCN6750/hw1.0/board-2.bin
-ath11k/WCN6750/hw1.0/sc7280/wpss.mbn
-ath11k/WCN6750/hw1.0/Notice.txt
-ath11k/QCA6698AQ/hw2.1/board-2.bin
-ath11k/QCA6698AQ/hw2.1/amss.bin
-ath11k/QCA6698AQ/hw2.1/m3.bin
-ath11k/QCA6698AQ/hw2.1/Notice.txt
-ath11k/QCA2066/hw2.1/board-2.bin
-ath11k/QCA2066/hw2.1/amss.bin
-ath11k/QCA2066/hw2.1/m3.bin
-ath11k/QCA2066/hw2.1/Notice.txt
-ath11k/QCN9074/hw1.0/.notice
-ath11k/QCN9074/hw1.0/board-2.bin
-ath11k/QCN9074/hw1.0/amss.bin
-ath11k/QCN9074/hw1.0/m3.bin
-ath11k/QCN9074/hw1.0/Notice.txt
-ath11k/IPQ5018/hw1.0/m3_fw.b02
-ath11k/IPQ5018/hw1.0/q6_fw.b02
-ath11k/IPQ5018/hw1.0/q6_fw.flist
-ath11k/IPQ5018/hw1.0/q6_fw.b08
-ath11k/IPQ5018/hw1.0/q6_fw.mdt
-ath11k/IPQ5018/hw1.0/m3_fw.b00
-ath11k/IPQ5018/hw1.0/m3_fw.mdt
-ath11k/IPQ5018/hw1.0/m3_fw.flist
-ath11k/IPQ5018/hw1.0/q6_fw.b09
-ath11k/IPQ5018/hw1.0/board-2.bin
-ath11k/IPQ5018/hw1.0/q6_fw.b04
-ath11k/IPQ5018/hw1.0/q6_fw.b01
-ath11k/IPQ5018/hw1.0/q6_fw.b10
-ath11k/IPQ5018/hw1.0/q6_fw.b13
-ath11k/IPQ5018/hw1.0/m3_fw.b01
-ath11k/IPQ5018/hw1.0/q6_fw.b00
-ath11k/IPQ5018/hw1.0/q6_fw.b07
-ath11k/IPQ5018/hw1.0/Notice.txt
-ath11k/IPQ5018/hw1.0/q6_fw.b03
-ath11k/IPQ5018/hw1.0/q6_fw.b11
-ath11k/IPQ5018/hw1.0/q6_fw.b05
-ath11k/IPQ5018/hw1.0/q6_fw.b14
-ath11k/IPQ8074/hw2.0/m3_fw.b02
-ath11k/IPQ8074/hw2.0/q6_fw.b02
-ath11k/IPQ8074/hw2.0/q6_fw.flist
-ath11k/IPQ8074/hw2.0/q6_fw.b08
+ath10k/QCA988X/hw2.0/notice_ath10k_firmware-5.txt
+ath11k/IPQ8074/hw2.0/m3_fw.mdt
+ath11k/IPQ8074/hw2.0/q6_fw.b00
 ath11k/IPQ8074/hw2.0/q6_fw.mdt
 ath11k/IPQ8074/hw2.0/m3_fw.b00
-ath11k/IPQ8074/hw2.0/m3_fw.mdt
-ath11k/IPQ8074/hw2.0/m3_fw.flist
-ath11k/IPQ8074/hw2.0/board-2.bin
+ath11k/IPQ8074/hw2.0/q6_fw.b08
 ath11k/IPQ8074/hw2.0/q6_fw.b04
-ath11k/IPQ8074/hw2.0/q6_fw.b01
-ath11k/IPQ8074/hw2.0/m3_fw.b01
-ath11k/IPQ8074/hw2.0/q6_fw.b00
-ath11k/IPQ8074/hw2.0/q6_fw.b07
+ath11k/IPQ8074/hw2.0/q6_fw.flist
+ath11k/IPQ8074/hw2.0/m3_fw.flist
 ath11k/IPQ8074/hw2.0/Notice.txt
+ath11k/IPQ8074/hw2.0/m3_fw.b02
 ath11k/IPQ8074/hw2.0/q6_fw.b03
 ath11k/IPQ8074/hw2.0/q6_fw.b05
-ath11k/QCA6390/hw2.0/board-2.bin
-ath11k/QCA6390/hw2.0/amss.bin
+ath11k/IPQ8074/hw2.0/m3_fw.b01
+ath11k/IPQ8074/hw2.0/q6_fw.b02
+ath11k/IPQ8074/hw2.0/q6_fw.b07
+ath11k/IPQ8074/hw2.0/board-2.bin
+ath11k/IPQ8074/hw2.0/q6_fw.b01
+ath11k/QCN9074/hw1.0/.notice
+ath11k/QCN9074/hw1.0/m3.bin
+ath11k/QCN9074/hw1.0/Notice.txt
+ath11k/QCN9074/hw1.0/board-2.bin
+ath11k/QCN9074/hw1.0/amss.bin
 ath11k/QCA6390/hw2.0/m3.bin
 ath11k/QCA6390/hw2.0/Notice.txt
-ath11k/IPQ6018/hw1.0/m3_fw.b02
-ath11k/IPQ6018/hw1.0/q6_fw.b02
-ath11k/IPQ6018/hw1.0/q6_fw.flist
-ath11k/IPQ6018/hw1.0/q6_fw.b08
+ath11k/QCA6390/hw2.0/board-2.bin
+ath11k/QCA6390/hw2.0/amss.bin
+ath11k/IPQ5018/hw1.0/m3_fw.mdt
+ath11k/IPQ5018/hw1.0/q6_fw.b00
+ath11k/IPQ5018/hw1.0/q6_fw.mdt
+ath11k/IPQ5018/hw1.0/m3_fw.b00
+ath11k/IPQ5018/hw1.0/q6_fw.b08
+ath11k/IPQ5018/hw1.0/q6_fw.b09
+ath11k/IPQ5018/hw1.0/q6_fw.b14
+ath11k/IPQ5018/hw1.0/q6_fw.b04
+ath11k/IPQ5018/hw1.0/q6_fw.flist
+ath11k/IPQ5018/hw1.0/q6_fw.b10
+ath11k/IPQ5018/hw1.0/m3_fw.flist
+ath11k/IPQ5018/hw1.0/Notice.txt
+ath11k/IPQ5018/hw1.0/m3_fw.b02
+ath11k/IPQ5018/hw1.0/q6_fw.b03
+ath11k/IPQ5018/hw1.0/q6_fw.b05
+ath11k/IPQ5018/hw1.0/m3_fw.b01
+ath11k/IPQ5018/hw1.0/q6_fw.b02
+ath11k/IPQ5018/hw1.0/q6_fw.b07
+ath11k/IPQ5018/hw1.0/board-2.bin
+ath11k/IPQ5018/hw1.0/q6_fw.b13
+ath11k/IPQ5018/hw1.0/q6_fw.b11
+ath11k/IPQ5018/hw1.0/q6_fw.b01
+ath11k/WCN6750/hw1.0/qcm6490/wpss.mbn
+ath11k/WCN6750/hw1.0/sc7280/wpss.mbn
+ath11k/WCN6750/hw1.0/Notice.txt
+ath11k/WCN6750/hw1.0/board-2.bin
+ath11k/WCN6750/hw1.0/wpss.mdt
+ath11k/WCN6855/hw2.0/m3.bin
+ath11k/WCN6855/hw2.0/regdb.bin
+ath11k/WCN6855/hw2.0/Notice.txt
+ath11k/WCN6855/hw2.0/board-2.bin
+ath11k/WCN6855/hw2.0/amss.bin
+ath11k/WCN6855/hw2.1/m3.bin
+ath11k/WCN6855/hw2.1/regdb.bin
+ath11k/WCN6855/hw2.1/board-2.bin
+ath11k/WCN6855/hw2.1/amss.bin
+ath11k/IPQ6018/hw1.0/m3_fw.mdt
+ath11k/IPQ6018/hw1.0/q6_fw.b00
 ath11k/IPQ6018/hw1.0/q6_fw.mdt
 ath11k/IPQ6018/hw1.0/m3_fw.b00
-ath11k/IPQ6018/hw1.0/m3_fw.mdt
-ath11k/IPQ6018/hw1.0/m3_fw.flist
-ath11k/IPQ6018/hw1.0/board-2.bin
+ath11k/IPQ6018/hw1.0/q6_fw.b08
 ath11k/IPQ6018/hw1.0/q6_fw.b04
-ath11k/IPQ6018/hw1.0/q6_fw.b01
-ath11k/IPQ6018/hw1.0/m3_fw.b01
-ath11k/IPQ6018/hw1.0/q6_fw.b00
-ath11k/IPQ6018/hw1.0/q6_fw.b07
+ath11k/IPQ6018/hw1.0/q6_fw.flist
+ath11k/IPQ6018/hw1.0/m3_fw.flist
 ath11k/IPQ6018/hw1.0/Notice.txt
+ath11k/IPQ6018/hw1.0/m3_fw.b02
 ath11k/IPQ6018/hw1.0/q6_fw.b03
 ath11k/IPQ6018/hw1.0/q6_fw.b05
-ath12k/QCN9274/hw2.0/firmware-2.bin
-ath12k/QCN9274/hw2.0/board-2.bin
-ath12k/QCN9274/hw2.0/Notice.txt
-ath12k/WCN7850/hw2.0/board-2.bin
-ath12k/WCN7850/hw2.0/amss.bin
+ath11k/IPQ6018/hw1.0/m3_fw.b01
+ath11k/IPQ6018/hw1.0/q6_fw.b02
+ath11k/IPQ6018/hw1.0/q6_fw.b07
+ath11k/IPQ6018/hw1.0/board-2.bin
+ath11k/IPQ6018/hw1.0/q6_fw.b01
+ath11k/QCA6698AQ/hw2.1/m3.bin
+ath11k/QCA6698AQ/hw2.1/Notice.txt
+ath11k/QCA6698AQ/hw2.1/board-2.bin
+ath11k/QCA6698AQ/hw2.1/amss.bin
+ath11k/QCA2066/hw2.1/m3.bin
+ath11k/QCA2066/hw2.1/Notice.txt
+ath11k/QCA2066/hw2.1/board-2.bin
+ath11k/QCA2066/hw2.1/amss.bin
 ath12k/WCN7850/hw2.0/m3.bin
 ath12k/WCN7850/hw2.0/Notice.txt
+ath12k/WCN7850/hw2.0/board-2.bin
+ath12k/WCN7850/hw2.0/amss.bin
+ath12k/QCN9274/hw2.0/firmware-2.bin
+ath12k/QCN9274/hw2.0/Notice.txt
+ath12k/QCN9274/hw2.0/board-2.bin
 ath3k-1.fw
-ath6k/AR6004/hw1.2/fw-2.bin
-ath6k/AR6004/hw1.2/bdata.bin
-ath6k/AR6004/hw1.3/bdata.bin
-ath6k/AR6004/hw1.3/fw-3.bin
 ath6k/AR6003/hw2.0/otp.bin.z77
-ath6k/AR6003/hw2.0/bdata.WB31.bin
-ath6k/AR6003/hw2.0/bdata.SD32.bin
-ath6k/AR6003/hw2.0/data.patch.bin
 ath6k/AR6003/hw2.0/bdata.SD31.bin
+ath6k/AR6003/hw2.0/bdata.SD32.bin
+ath6k/AR6003/hw2.0/bdata.WB31.bin
+ath6k/AR6003/hw2.0/data.patch.bin
 ath6k/AR6003/hw2.0/athwlan.bin.z77
-ath6k/AR6003/hw1.0/otp.bin.z77
-ath6k/AR6003/hw1.0/bdata.WB31.bin
-ath6k/AR6003/hw1.0/bdata.SD32.bin
-ath6k/AR6003/hw1.0/data.patch.bin
-ath6k/AR6003/hw1.0/bdata.SD31.bin
-ath6k/AR6003/hw1.0/athwlan.bin.z77
+ath6k/AR6003/hw2.1.1/fw-2.bin
 ath6k/AR6003/hw2.1.1/endpointping.bin
 ath6k/AR6003/hw2.1.1/otp.bin
-ath6k/AR6003/hw2.1.1/fw-2.bin
-ath6k/AR6003/hw2.1.1/bdata.WB31.bin
-ath6k/AR6003/hw2.1.1/bdata.SD32.bin
-ath6k/AR6003/hw2.1.1/data.patch.bin
 ath6k/AR6003/hw2.1.1/bdata.SD31.bin
-ath6k/AR6003/hw2.1.1/fw-3.bin
+ath6k/AR6003/hw2.1.1/bdata.SD32.bin
+ath6k/AR6003/hw2.1.1/bdata.WB31.bin
+ath6k/AR6003/hw2.1.1/data.patch.bin
 ath6k/AR6003/hw2.1.1/athwlan.bin
-ath6k/AR6002/data.patch.hw2_0.bin
-ath6k/AR6002/eeprom.data
-ath6k/AR6002/eeprom.bin
-ath6k/AR6002/athwlan.bin.z77
+ath6k/AR6003/hw2.1.1/fw-3.bin
+ath6k/AR6003/hw1.0/otp.bin.z77
+ath6k/AR6003/hw1.0/bdata.SD31.bin
+ath6k/AR6003/hw1.0/bdata.SD32.bin
+ath6k/AR6003/hw1.0/bdata.WB31.bin
+ath6k/AR6003/hw1.0/data.patch.bin
+ath6k/AR6003/hw1.0/athwlan.bin.z77
 ath6k/AR6003.1/hw2.1.1/endpointping.bin
 ath6k/AR6003.1/hw2.1.1/otp.bin
-ath6k/AR6003.1/hw2.1.1/bdata.WB31.bin
-ath6k/AR6003.1/hw2.1.1/bdata.SD32.bin
-ath6k/AR6003.1/hw2.1.1/data.patch.bin
 ath6k/AR6003.1/hw2.1.1/bdata.SD31.bin
+ath6k/AR6003.1/hw2.1.1/bdata.SD32.bin
+ath6k/AR6003.1/hw2.1.1/bdata.WB31.bin
+ath6k/AR6003.1/hw2.1.1/data.patch.bin
 ath6k/AR6003.1/hw2.1.1/athwlan.bin
+ath6k/AR6002/data.patch.hw2_0.bin
+ath6k/AR6002/eeprom.bin
+ath6k/AR6002/athwlan.bin.z77
+ath6k/AR6002/eeprom.data
+ath6k/AR6004/hw1.3/bdata.bin
+ath6k/AR6004/hw1.3/fw-3.bin
+ath6k/AR6004/hw1.2/fw-2.bin
+ath6k/AR6004/hw1.2/bdata.bin
 ath9k_htc/htc_7010-1.4.0.fw
 ath9k_htc/htc_9271-1.4.0.fw
-atmel/wilc1000_wifi_firmware.bin
 atmel/wilc1000_wifi_firmware-1.bin
+atmel/wilc1000_fw.bin
+atmel/wilc1000_wifi_firmware.bin
 atmel/wilc1000_ap_fw.bin
 atmel/wilc1000_p2p_fw.bin
-atmel/wilc1000_fw.bin
 atmel/wilc3000_wifi_firmware-1.bin
-atusb/atusb-0.2.dfu
 atusb/atusb-0.3.dfu
 atusb/rzusb-0.3.bin
+atusb/atusb-0.2.dfu
 av7110/bootcode.bin
 bmi260-init-data.fw
-bnx2/bnx2-mips-06-6.2.3.fw
-bnx2/bnx2-rv2p-09-6.0.17.fw
 bnx2/bnx2-rv2p-09ax-6.0.17.fw
+bnx2/bnx2-rv2p-09-6.0.17.fw
 bnx2/bnx2-mips-09-6.2.1b.fw
 bnx2/bnx2-rv2p-06-6.0.15.fw
+bnx2/bnx2-mips-06-6.2.3.fw
+bnx2x/bnx2x-e2-7.13.1.0.fw
 bnx2x/bnx2x-e1h-7.13.15.0.fw
 bnx2x/bnx2x-e1h-7.13.21.0.fw
-bnx2x/bnx2x-e1-7.13.1.0.fw
-bnx2x/bnx2x-e2-7.13.15.0.fw
-bnx2x/bnx2x-e1-7.13.15.0.fw
 bnx2x/bnx2x-e1-7.13.11.0.fw
-bnx2x/bnx2x-e2-7.13.21.0.fw
-bnx2x/bnx2x-e2-7.13.11.0.fw
-bnx2x/bnx2x-e1h-7.13.1.0.fw
+bnx2x/bnx2x-e2-7.13.15.0.fw
 bnx2x/bnx2x-e1-7.13.21.0.fw
-bnx2x/bnx2x-e2-7.13.1.0.fw
+bnx2x/bnx2x-e1-7.13.15.0.fw
+bnx2x/bnx2x-e2-7.13.21.0.fw
+bnx2x/bnx2x-e1h-7.13.1.0.fw
 bnx2x/bnx2x-e1h-7.13.11.0.fw
-brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
-brcm/brcmfmac43455-sdio.pine64,pinenote-v1.2.txt
-brcm/brcmfmac43430a0-sdio.ilife-S806.txt
-brcm/brcmfmac43455-sdio.clm_blob
-brcm/brcmfmac43340-sdio.Insyde-VESPA2.txt
-brcm/brcmfmac43143-sdio.bin
-brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
-brcm/brcmfmac43362-sdio.ASUSTeK COMPUTER INC.-ME176C.txt
-brcm/brcmfmac4366b-pcie.bin
-brcm/brcmfmac43455-sdio.raspberrypi,5-compute-module.txt
-brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
-brcm/brcmfmac43012-sdio.bin
-brcm/brcmfmac43455-sdio.pine64,soquartz-blade.txt
-brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
-brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
-brcm/brcmfmac4330-sdio.bin
-brcm/brcmfmac4358-pcie.bin
-brcm/brcmfmac43362-sdio.kobo,tolino-shine2hd.txt
-brcm/brcmfmac43430a0-sdio.bin
-brcm/brcmfmac43570-pcie.bin
-brcm/brcmfmac43430-sdio.AP6212.txt
-brcm/brcmfmac43241b4-sdio.Intel Corp.-VALLEYVIEW C0 PLATFORM.txt
-brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
-brcm/brcmfmac54591-pcie.clm_blob
-brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt
-brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
-brcm/brcmfmac43362-sdio.kobo,aura.txt
-brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo4.txt
-brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt
-brcm/brcmfmac43143.bin
-brcm/brcmfmac43455-sdio.acepc-t8.txt
-brcm/brcmfmac4354-sdio.clm_blob
-brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
-brcm/brcmfmac43602-pcie.bin
-brcm/bcm43xx_hdr-0.fw
-brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt
-brcm/brcmfmac4366c-pcie.bin
-brcm/brcmfmac4350-pcie.bin
-brcm/brcmfmac43455-sdio.khadas,vim.txt
-brcm/brcmfmac4356-sdio.khadas,vim2.txt
-brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt
-brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
-brcm/brcmfmac43430-sdio.sinovoip,bananapi-m64.txt
-brcm/brcmfmac4334-sdio.bin
-brcm/brcmfmac43455-sdio.pine64,soquartz-model-a.txt
-brcm/brcmfmac43241b4-sdio.bin
-brcm/brcmfmac43241b0-sdio.bin
-brcm/brcmfmac43455-sdio.pine64,rockpro64-v2.0.txt
-brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
-brcm/brcmfmac43569.bin
-brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt
-brcm/brcmfmac4356-sdio.vamrs,rock960.txt
-brcm/brcmfmac4354-sdio.nvidia,p2371-2180.txt
-brcm/brcmfmac43362-sdio.WC121.txt
-brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt
-brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt
-brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
-brcm/brcmfmac4356-sdio.friendlyarm,nanopc-t4.txt
-brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt
-brcm/brcmfmac43455-sdio.raspberrypi,500.txt
-brcm/brcmfmac43455-sdio.pine64,pinenote-v1.1.txt
-brcm/brcmfmac4356-sdio.friendlyarm,nanopi-m4.txt
-brcm/brcmfmac43340-sdio.bin
-brcm/bcm4329-fullmac-4.bin
-brcm/brcmfmac4356-pcie.Intel Corporation-CHERRYVIEW D1 PLATFORM.txt
-brcm/brcmfmac4373.bin
-brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt
+bnx2x/bnx2x-e1-7.13.1.0.fw
+bnx2x/bnx2x-e2-7.13.11.0.fw
+brcm/brcmfmac4330-sdio.Prowise-PT301.txt
+brcm/brcmfmac4354-sdio.bin
 brcm/brcmfmac43455-sdio.Radxa-ROCK Pi X.txt
-brcm/brcmfmac43570-pcie.clm_blob
-brcm/brcmfmac4329-sdio.bin
-brcm/brcmfmac4356-pcie.bin
-brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt
-brcm/brcmfmac4371-pcie.bin
-brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt
+brcm/brcmfmac43455-sdio.acepc-t8.txt
+brcm/brcmfmac4373-sdio.clm_blob
 brcm/brcmfmac43242a.bin
-brcm/brcmfmac43602-pcie.ap.bin
-brcm/brcmfmac43340-sdio.ASUSTeK COMPUTER INC.-TF103CE.txt
-brcm/brcmfmac43012-sdio.clm_blob
-brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt
-brcm/brcmfmac43455-sdio.pine64,rockpro64-v2.1.txt
-brcm/brcmfmac43430-sdio.ilife-S806.txt
-brcm/brcmfmac43430-sdio.clm_blob
-brcm/brcmfmac4356-sdio.AP6356S.txt
-brcm/brcmfmac43340-sdio.predia-basic.txt
-brcm/brcmfmac43455-sdio.pine64,soquartz-cm4io.txt
-brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.txt
-brcm/bcm43xx-0.fw
-brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
-brcm/brcmfmac4356-pcie.clm_blob
-brcm/brcmfmac54591-pcie.bin
-brcm/brcmfmac43455-sdio.AW-CM256SM.txt
-brcm/brcmfmac4339-sdio.bin
-brcm/brcmfmac43430-sdio.bin
+brcm/brcmfmac43455-sdio.raspberrypi,3-model-b-plus.txt
+brcm/brcmfmac4356-sdio.khadas,vim2.txt
+brcm/brcmfmac43362-sdio.kobo,aura.txt
+brcm/BCM-0bb4-0306.hcd
 brcm/brcmfmac43430-sdio.MUR1DX.txt
-brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+brcm/brcmfmac43236b.bin
+brcm/brcmfmac54591-pcie.clm_blob
+brcm/brcmfmac43455-sdio.pine64,pinephone-pro.txt
+brcm/brcmfmac43569.bin
+brcm/brcmfmac43455-sdio.pine64,quartz64-a.txt
+brcm/brcmfmac43455-sdio.raspberrypi,5-model-b.txt
+brcm/brcmfmac4335-sdio.bin
+brcm/brcmfmac4356-sdio.clm_blob
+brcm/brcmfmac43602-pcie.bin
+brcm/brcmfmac43455-sdio.pine64,rockpro64-v2.0.txt
+brcm/brcmfmac43430-sdio.bin
+brcm/brcmfmac43455-sdio.bin
+brcm/brcmfmac4334-sdio.bin
+brcm/brcmfmac4356-sdio.firefly,firefly-rk3399.txt
+brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
+brcm/brcmfmac43430a0-sdio.jumper-ezpad-mini3.txt
+brcm/brcmfmac43362-sdio.ASUSTeK COMPUTER INC.-ME176C.txt
+brcm/brcmfmac43430-sdio.AP6212.txt
+brcm/brcmfmac4356-pcie.gpd-win-pocket.txt
+brcm/brcmfmac43455-sdio.beagle,am5729-beagleboneai.txt
+brcm/brcmfmac4356-pcie.Intel Corporation-CHERRYVIEW D1 PLATFORM.txt
+brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt
+brcm/brcmfmac43455-sdio.raspberrypi,4-model-b.txt
+brcm/brcmfmac43362-sdio.cubietech,cubietruck.txt
 brcm/BCM-0a5c-6410.hcd
+brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
+brcm/brcmfmac4354-sdio.nvidia,p2371-2180.txt
+brcm/brcmfmac43455-sdio.pine64,pinebook-pro.txt
+brcm/bcm43xx-0.fw
+brcm/brcmfmac43570-pcie.clm_blob
+brcm/brcmfmac43430-sdio.Hampoo-D2D3_Vi8A1.txt
+brcm/brcmfmac43241b0-sdio.bin
+brcm/brcmfmac4356-sdio.bin
+brcm/brcmfmac43012-sdio.bin
+brcm/brcmfmac4356-pcie.bin
+brcm/brcmfmac43430a0-sdio.bin
+brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt
+brcm/brcmfmac43455-sdio.raspberrypi,4-compute-module.txt
+brcm/brcmfmac43455-sdio.pine64,rockpro64-v2.1.txt
+brcm/brcmfmac4339-sdio.bin
+brcm/brcmfmac43430a0-sdio.ONDA-V80 PLUS.txt
+brcm/bcm43xx_hdr-0.fw
+brcm/brcmfmac43430-sdio.friendlyarm,nanopi-neo4.txt
+brcm/brcmfmac4350-pcie.bin
+brcm/brcmfmac4371-pcie.bin
+brcm/brcmfmac4356-pcie.clm_blob
+brcm/brcmfmac43340-sdio.Insyde-VESPA2.txt
+brcm/brcmfmac43455-sdio.clm_blob
+brcm/brcmfmac43362-sdio.WC121.txt
+brcm/brcmfmac43455-sdio.raspberrypi,5-compute-module.txt
+brcm/brcmfmac4330-sdio.bin
+brcm/brcmfmac43430-sdio.sinovoip,bananapi-m64.txt
+brcm/brcmfmac43362-sdio.bin
+brcm/brcmfmac4366b-pcie.bin
+brcm/brcmfmac4356-sdio.friendlyarm,nanopi-m4.txt
+brcm/brcmfmac4329-sdio.bin
+brcm/brcmfmac43455-sdio.pine64,pinenote-v1.2.txt
+brcm/brcmfmac4373.bin
+brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
+brcm/brcmfmac43602-pcie.ap.bin
+brcm/brcmfmac43455-sdio.raspberrypi,500.txt
+brcm/brcmfmac43362-sdio.lemaker,bananapro.txt
+brcm/brcmfmac43430-sdio.raspberrypi,model-zero-2-w.txt
+brcm/brcmfmac4366c-pcie.bin
+brcm/brcmfmac43340-sdio.pov-tab-p1006w-data.txt
+brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-zero.txt
+brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi Compute Module 4.txt
+brcm/brcmfmac43455-sdio.khadas,vim.txt
+brcm/brcmfmac43430-sdio.clm_blob
+brcm/brcmfmac43241b4-sdio.Intel Corp.-VALLEYVIEW C0 PLATFORM.txt
+brcm/brcmfmac43241b4-sdio.bin
+brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
+brcm/brcmfmac4350c2-pcie.bin
+brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-ultra.txt
+brcm/bcm4329-fullmac-4.bin
+brcm/brcmfmac4373-sdio.bin
+brcm/brcmfmac43455-sdio.pine64,pinenote-v1.1.txt
+brcm/brcmfmac43143-sdio.bin
+brcm/brcmfmac4356-sdio.AP6356S.txt
+brcm/brcmfmac43430a0-sdio.ilife-S806.txt
+brcm/brcmfmac4358-pcie.bin
+brcm/brcmfmac4356-sdio.friendlyarm,nanopc-t4.txt
+brcm/brcmfmac43455-sdio.pine64,quartz64-b.txt
+brcm/brcmfmac43430-sdio.friendlyarm,nanopi-r1.txt
+brcm/brcmfmac43455-sdio.pine64,soquartz-model-a.txt
+brcm/brcmfmac43430-sdio.ilife-S806.txt
+brcm/brcmfmac43455-sdio.pine64,soquartz-cm4io.txt
+brcm/brcmfmac4354-sdio.clm_blob
+brcm/brcmfmac43570-pcie.bin
+brcm/brcmfmac43340-sdio.bin
+brcm/brcmfmac43430-sdio.starfive,visionfive-v1.txt
+brcm/brcmfmac43012-sdio.clm_blob
+brcm/brcmfmac43455-sdio.pine64,soquartz-blade.txt
+brcm/brcmfmac43143.bin
+brcm/brcmfmac43455-sdio.Raspberry Pi Foundation-Raspberry Pi 4 Model B.txt
+brcm/brcmfmac43340-sdio.ASUSTeK COMPUTER INC.-TF103CE.txt
+brcm/brcmfmac43430-sdio.raspberrypi,3-model-b.txt
+brcm/brcmfmac43340-sdio.predia-basic.txt
 brcm/brcmfmac43241b5-sdio.bin
 brcm/brcmfmac43340-sdio.meegopad-t08.txt
-brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-a1.txt
-brcm/brcmfmac43430-sdio.sinovoip,bpi-m2-plus.txt
-brcm/brcmfmac43362-sdio.bin
-brcm/brcmfmac4373-sdio.bin
-brcm/brcmfmac43241b4-sdio.Advantech-MICA-071.txt
-brcm/brcmfmac43455-sdio.bin
-brcm/brcmfmac4356-sdio.bin
-brcm/brcmfmac4373-sdio.clm_blob
-brcm/brcmfmac4356-sdio.clm_blob
-brcm/brcmfmac43455-sdio.MINIX-NEO Z83-4.txt
-brcm/brcmfmac43236b.bin
-brcm/brcmfmac4335-sdio.bin
-brcm/brcmfmac43430-sdio.raspberrypi,model-zero-w.txt
-brcm/brcmfmac4330-sdio.Prowise-PT301.txt
-brcm/brcmfmac43455-sdio.pine64,quartz64-a.txt
-brcm/brcmfmac4350c2-pcie.bin
-brcm/brcmfmac4354-sdio.bin
-brcm/brcmfmac4356-pcie.Xiaomi Inc-Mipad2.txt
-brcm/BCM-0bb4-0306.hcd
-brcm/brcmfmac43430-sdio.beagle,beaglev-starlight-jh7100-r0.txt
+brcm/brcmfmac54591-pcie.bin
+brcm/brcmfmac4356-sdio.vamrs,rock960.txt
+brcm/brcmfmac43455-sdio.raspberrypi,3-model-a-plus.txt
+brcm/brcmfmac43455-sdio.AW-CM256SM.txt
+brcm/brcmfmac43430-sdio.sinovoip,bpi-m3.txt
+brcm/brcmfmac43362-sdio.kobo,tolino-shine2hd.txt
 cadence/mhdp8546.bin
 carl9170-1.fw
-cavium/cnn55xx_ae.fw
 cavium/cnn55xx_se.fw
+cavium/cnn55xx_ae.fw
 cbfw-3.2.5.1.bin
-cirrus/cs35l41-dsp1-spk-prot-104331f1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431294-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431034-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431f12.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b42.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433011-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431863-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-17aa391b-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8da8-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c6-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8e2c-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431caf.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid0-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b47.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8994.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid1-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa231a-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid0-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-10431454-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a30.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3878-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c898f.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ad8.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbf.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c3-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390c-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390c-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e11-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9b.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431863-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-vlv1776.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280b27-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431074-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431463-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431b93.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid0-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ad8.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8971.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2319-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b70.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d91.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa22f1-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid2-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3878-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cf5-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c48.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431ed3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280b27-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431194-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a50.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10433061-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10251844-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431054-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431454-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c49.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3877-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid1.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid1-ampr.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cde.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa2318-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89e7-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431533-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280c4d.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e02.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa392d-spkid0-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bdd.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid3.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b8f-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbe.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid2.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8995.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp4.bin
-cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid1-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10431044-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10431df3-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431194-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433061.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431483.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-l1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid1-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431fb3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431034-spkid0-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431463.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e12.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431294-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid0-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431663-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8d91-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid0-ampl.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid1-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431044-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433011-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390d-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c6.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d8c-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b44.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b72.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9e-spkid0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3911-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-17aa3911-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-103c8c53.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390c-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431503-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a6e-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9b-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431473-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431024-spkid0-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid1-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3921-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b8f-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c71.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431473.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8973.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38c8.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8975-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38fa-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431573-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c6-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e60-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-1f660105.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c67.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8cdd.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433ff0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ce0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280b28.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431e13-amp4.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d85.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8cf5.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8c26.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431493-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cdd-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8981-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c16.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8da8-spkid1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8d9d-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433071-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431264-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433061-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10433071-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8992.bin
-cirrus/cs35l41-dsp1-spk-prot-10431533-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid1-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a6e-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431054-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431663-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4f.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8e.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8981.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid0-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e3b-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c51.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433d88.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d78.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104330e1.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2319-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2318-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d8e-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431573.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431cdf.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8da1-spkid1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e18-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e36.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa22f2-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa231a-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392c-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2d.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8e19-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp3.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa233c-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid1-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c43.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e11.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38fa-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433391.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-l1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa391e-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8e1b.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a6e-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ca7.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431503-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431314-spkid1.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f1f.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8e2c-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e37-spkid1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e16.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c896e-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431da2.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e13.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp3.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392c-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431683.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be5.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa2319.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8d90-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3877-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b63-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9d.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8d91-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8e2c.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104388f4-spkid1.bin
-cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b63-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431663.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10251844.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433071-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f3-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b74.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c89e7-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38f9-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431473-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid3-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104330d1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431074.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8d92.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa386f-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431314-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cf5-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid2-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10251826-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e17.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa386f-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104331e1.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3910-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431054-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433011-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c9f.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c46.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3865.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid0-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8e-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be6.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b8f.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431314-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da7.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433061-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431463-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid2-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8974.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a6e.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp3.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid0-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9d-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-104388f4.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c70.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid1-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e16-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid3-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431454-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9c-spkid1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431024-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c896e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431533-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e13-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104388f4-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3905.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c50.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8d9b-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f2-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8d92-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc4.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3866-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8992.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104314e3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431194-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8975-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431f43-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3905-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b8f-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f2-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431503-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9c-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f63.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433391-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa231a.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8975.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8e14.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b92.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c47.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e13-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f63-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e3b-spkid0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa391b-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b43.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cde-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp4.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa391e-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e61.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431663-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ca7.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa391b.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b45.bin
-cirrus/cs35l56-b0-dsp1-misc-10431034-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc1.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8e1c-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cef.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3855.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid1-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-l0.bincfg
-cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cdd-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid1-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8e61-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cde-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431024-spkid1-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid3-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431054.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e3a.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431483-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431df3-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431493-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b4.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392d-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10433011.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid1-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2319-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e60.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431454.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid2-ampl.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8d9f.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38c7.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ccf.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ee2-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c72.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d08.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa231a-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp3.bin
 cirrus/cs35l41-dsp1-spk-prot-10431483-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-17aa390d-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c66.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e60-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8c.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8e19-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431024-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-104318d3.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c70.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104312af.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8971.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp4.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8d90-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392c-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10251826-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10251844-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431294-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3911-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9f-spkid0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid1-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c896e-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid0-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e15-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431314-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8981-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid1-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433071.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a2e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a31.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e36-spkid1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38fa.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b63-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431473-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8d9e-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c52.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9f-spkid1.bin
-cirrus/cs35l56-b0-dsp1-misc-10431f43-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431493.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431034-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433fd0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be9.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10251826.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid0-amp1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d86.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e13-spkid0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-1f660105.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38f9-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3878.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid0-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b46.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8e18.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e36-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2317.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a30.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp4.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e18-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8995.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa38b4.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa392e.wmfw
 cirrus/cs35l54-b0-dsp1-misc-103c8e16-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431863-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-104312b4.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid0-amp2.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8d.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b70.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp4.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431194-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b47.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid1-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d01.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431df3-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2318.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-1025182c-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431863.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431483-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431454-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c68.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c47.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8991.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431493-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10280b27.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8e1c.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c898e.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cf5-r1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3910-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433e00.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3877.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3921-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10433a20.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431034-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8ca4.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431034-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c898e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b3a.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b5.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433391-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid0-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid2.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8e1a-amp2.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e17-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8974.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bde.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2a.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8981-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid0-r0.bin
 cirrus/cs35l54-b0-dsp1-misc-103c8e15-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa386e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38ab.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e62-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid1-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d91-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e14-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8e12-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3866-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431044-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c17.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431264-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280beb-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da0-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c71.bin
-cirrus/cs35l41/v6.56.0/halo_cspl_RAM_revB2_29.58.0.wmfw
-cirrus/cs35l41/v6.83.0/halo_cspl_RAM_revB2_29.85.0.wmfw
-cirrus/cs35l41/v6.51.0/halo_cspl_RAM_revB2_29.53.0.wmfw
-cirrus/cs35l41/v6.61.1/halo_cspl_RAM_revB2_29.63.1.wmfw
-cirrus/cs35l41/v6.78.0/halo_cspl_RAM_revB2_29.80.0.wmfw
-cirrus/cs35l41/v6.39.0/halo_cspl_RAM_revB2_29.41.0.wmfw
-cirrus/cs35l41/v6.63.0/halo_cspl_RAM_revB2_29.65.0.wmfw
-cirrus/cs35l41/v6.47.0/halo_cspl_RAM_revB2_29.49.0.wmfw
-cirrus/cs35l41/bincfgs/cs35l41-dsp1-19_5dB.bincfg
-cirrus/cs35l41/bincfgs/cs35l41-dsp1-16_5dB.bincfg
-cirrus/cs35l41/bincfgs/cs35l41-dsp1-14_5dB.bincfg
-cirrus/cs35l41/v6.68.0/halo_cspl_RAM_revB2_29.70.0.wmfw
-cirrus/cs35l41/v6.80.0/halo_cspl_RAM_revB2_29.82.0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid3-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-104316d3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-l1.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid1-ampl.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a28.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c89e7-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433071.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3855.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433011-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8981.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431573.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c898e.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8d-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa392d-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid0.wmfw
 cirrus/cs35l54-b0-dsp1-misc-103c8e1a.wmfw
 cirrus/cs35l56-b0-dsp1-misc-17aa3932.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d8c-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f1f-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa233c-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b46.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431483-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-104316f3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8da7-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431573-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid0-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-10431503-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104312af-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ee2.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp4.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3910-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a8f.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3921-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b43.bin
-cirrus/cs35l41-dsp1-spk-prot-10433391-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e13-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp3.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8e1b-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431054-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cdf.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e37.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2319-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa2318-r0.bincfg
-cirrus/cs35l54-b0-dsp1-misc-103c8e15.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c6a.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e3b.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa22f2-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f62.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3866.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp3.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e61-spkid1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8f-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431194.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa22f3-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431463-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431663-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa3847.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8e1b-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid1-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa391e-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f3-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-r0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c3-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b72.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10431d1f.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid0-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-10431863-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10280beb-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c49.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433e20.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b92.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104312af-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431573-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c3-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e62.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8da7-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8b77.bin
-cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8991.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89c3-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8981-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431294.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8a2c.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431ee2-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431df3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431294-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c46.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa2318-l0.bincfg
-cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431473-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8b8f-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-l1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390b-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8981-l1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e1a-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f2.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8b74.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8973.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid0-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104316a3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid0-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390b-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c898f.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38b7.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433011-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f1f-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp3.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8d-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8972.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8994.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8a2b.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid0-ampl.bin
-cirrus/cs35l41-dsp1-spk-prot-vlv1776.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431074-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431044-spkid0-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa38a9.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be7.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c16.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3866-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1.wmfw
 cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c89e7.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8972.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e13-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e12.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433391-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433061-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b63.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104317f3.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-1025182c.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa231a-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10431e13.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104314d3.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431f1f-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433061.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280b28.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431473-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa233c.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid0-l0.bin
 cirrus/cs35l41-dsp1-spk-prot-10431433.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1.wmfw
-cirrus/cs35l56/CS35L56_Rev3.11.26.wmfw
-cirrus/cs35l56/CS35L56_Rev3.11.21.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3911-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e3a.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid1-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa392c-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e20.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-l0.bincfg
+cirrus/cs35l54-b0-dsp1-misc-103c8e15-amp2.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d91.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8973.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b77.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390b.wmfw
+cirrus/cs35l41-dsp1-spk-prot-vlv1776.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b46.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa22f1-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431314-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdd.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9d.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b47.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89c3-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89c6-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b44.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9c-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e2c.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431cef.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp4.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f2-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa3878-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-vlv1776.wmfw
+cirrus/cs35l56-b0-dsp1-misc-103c8e2c-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa2318-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8ca7.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b70.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e60.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8b92.bin
+cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp3.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e18-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431194-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e3a-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-10431f43-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431663-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431314-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433a30.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c89e7-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431493-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8973.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c03.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8d9f-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431454.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330c1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2318-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8ce0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431024-spkid0-amp2.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8e.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431e13-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3878-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431034-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8b42.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431473-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f2-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b3a.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8995.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8c48.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431034-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b45.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8ca4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431493.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid1-ampl.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot.bin
+cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp4.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390c-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431074-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c898f.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e00.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431463.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid1-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid1-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e18.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8e14.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431463-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c896e-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8974.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8972.wmfw
+cirrus/cs35l56/CS35L56_Rev3.11.11.1.wmfw
 cirrus/cs35l56/CS35L56_Rev3.11.25.wmfw
-cirrus/cs35l56/CS35L56_Rev3.11.11.wmfw
+cirrus/cs35l56/CS35L56_Rev3.11.26.wmfw
 cirrus/cs35l56/CS35L56_Rev3.11.20.wmfw
-cirrus/cs35l56/CS35L56_Rev3.11.18.wmfw
+cirrus/cs35l56/CS35L56_Rev3.11.28.wmfw
 cirrus/cs35l56/CS35L56_Rev3.11.16.wmfw
 cirrus/cs35l56/CS35L56_Rev3.11.28B.wmfw
-cirrus/cs35l56/CS35L56_Rev3.11.28.wmfw
-cirrus/cs35l56/CS35L56_Rev3.11.11.1.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3905-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a83.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390b.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433a40.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431573-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa392d-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431314-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8cf5-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104312af-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4.wmfw
-cirrus/cs35l56-b0-dsp1-misc-17aa392e.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-l0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e19.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b42.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38f9.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa233c.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e3a-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b77.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-103c8d91.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431f43-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10431024-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid0-l0.bin
+cirrus/cs35l56/CS35L56_Rev3.11.18.wmfw
+cirrus/cs35l56/CS35L56_Rev3.11.21.wmfw
+cirrus/cs35l56/CS35L56_Rev3.11.11.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3866.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104331e1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c66.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp3.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa391e-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3865.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid0-r0.bin
 cirrus/cs35l41-dsp1-spk-prot-103c8c72.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431f43.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433071-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b44.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8d9c.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8e17-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280beb.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e11-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2a.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da8.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e62-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa2316.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-10431074-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a29.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431264.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8e1c-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a28.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid1-ampr.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa386f.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431024-spkid1-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da1-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid0-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431c33.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d8d-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-1025182c-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp4.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp3.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da0-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid0-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa22f3-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e37-spkid0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3865-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431463-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa38b6.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-l0.bincfg
-cirrus/cs35l54-b0-dsp1-misc-103c8d8f-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8e12-spkid1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8da0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431533-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431493-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8ca4.wmfw
-cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b63-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid1-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be7.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c26.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8a6e-r1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid1-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431264-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid0-r0.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid1-ampr.bin
-cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431533.wmfw
-cirrus/cs35l41-dsp1-spk-prot-17aa3865-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8c48.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a60.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid0-amp1.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp2.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid3.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8d90.wmfw
-cirrus/cs35l41-dsp1-spk-prot-103c8e3a-spkid0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431f43-amp4.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid0-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8d8f.wmfw
-cirrus/cs35l56-b0-dsp1-misc-103c8d92-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-l0.bincfg
-cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid1-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-r0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be2.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431df3-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid0-l0.bin
-cirrus/cs35l41-dsp1-spk-prot-10431503.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid1-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431503-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8e15.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431314-spkid1-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e13-amp4.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid0-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431314-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431533-spkid1-r0.bin
 cirrus/cs35l56-b0-dsp1-misc-10431044-spkid0.wmfw
-cirrus/cs35l56-b0-dsp1-misc-10431264-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10431314-spkid1-amp2.bin
-cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp1.bin
-cirrus/cs35l56-b0-dsp1-misc-17aa390d-spkid0.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104312af-spkid0-r0.bin
-cirrus/cs35l54-b0-dsp1-misc-103c8e14-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8c15.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid0-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8b45.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431e13-amp3.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp2.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c48.bin
+cirrus/cs35l41-dsp1-spk-prot-10431194.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-104331f1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid1-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-10431074.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa391b.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid0-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8d-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3905-amp2.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp4.bin
 cirrus/cs35l54-b0-dsp1-misc-103c8d91-amp1.bin
-cirrus/cs35l41-dsp1-spk-prot-104330c1.wmfw
-cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-l0.bincfg
-cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-r0.bin
-cirrus/cs35l41-dsp1-spk-prot-103c8be8.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8d9e.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431194-spkid0-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d01.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid0-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8c-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431264-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid0-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da8-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid0-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3865-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid2-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-10280b27.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431663-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid1-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431ee2-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b5.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b63.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d8f-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e13-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d78.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid2-ampr.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid0-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e13-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b72.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431463-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3921-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e61-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e1c-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386f-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid1-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e18-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b63-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da1-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a8f.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid1-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8c-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280beb-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3877-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431663-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431044-spkid0-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10431454-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431533-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3.wmfw
+cirrus/cs35l56-b0-dsp1-misc-103c8e1c-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid0-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e12-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433391.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c70.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8cf5-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e36-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3865-l0.bin
 cirrus/cs35l41-dsp1-spk-prot-103c8bdf.wmfw
-cirrus/cs35l41-dsp1-spk-prot-10431f63-l0.bin
-cirrus/cs35l56-b0-dsp1-misc-10431044-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa22f3-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8e11-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431df3-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10433061-spkid1-r0.bin
 cirrus/cs35l41-dsp1-spk-prot-10431074-spkid1-l0.bin
-cis/SW_7xx_SER.cis
-cis/COMpad4.cis
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid1-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8991.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a6e-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431314-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid2.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3877-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cf5-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid1-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b70.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f3-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433071-spkid1-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e13.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cdf.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431863-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid1-ampl.bin
+cirrus/cs35l56-b0-dsp1-misc-10431f43-amp4.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa2317.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38c7-spkid0-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431473-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8b63-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8971.bin
+cirrus/cs35l41-dsp1-spk-prot-1025182c-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104312af-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f3-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid1-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a6e.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp3.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104312af-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431294-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da7-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386f-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8e-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e1b-amp2.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e17-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10251826-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cf5.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431264-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b92.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431533-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431533-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a6e-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431044-spkid1-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433fd0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa231a-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid3-ampl.bin
+cirrus/cs35l56-b0-dsp1-misc-10431264-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f3-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431f43-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e12.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cde-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid0-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b63-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b47.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid0-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be8.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3877.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f2-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10431503.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10251844-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390b-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431054-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431024-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e1b.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8e17.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc2.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431d1f.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d91-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-103c8d91.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e12.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8992.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e13-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c16-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104388f4-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-10431044-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b6.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid1-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d85.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104318d3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38c7.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid1-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9c-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8d9f-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa231a-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-r0.bincfg
+cirrus/cs35l54-b0-dsp1-misc-103c8e1a-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433061-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431314-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e61-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104316d3.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8e19-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b72.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431f12.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431df3-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-r0.bincfg
+cirrus/cs35l54-b0-dsp1-misc-103c8e14-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431683.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330e1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a40.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3866-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cdd-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8975-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431294-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be2.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431264.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8992.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be5.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431ed3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431f1f.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431573-spkid1-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp4.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e37-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9d-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8971.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b8f.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104316f3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10251826.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a20.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104312af.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-1f660105.bin
+cirrus/cs35l41-dsp1-spk-prot-104317f3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2319.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431e02.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9e-spkid0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be3.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa391e-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3878.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431074-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c67.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38fa.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c47.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8da7.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp3.bin
+cirrus/cs35l56-b0-dsp1-misc-10431f43-amp3.bin
+cirrus/cs35l41/v6.78.0/halo_cspl_RAM_revB2_29.80.0.wmfw
+cirrus/cs35l41/v6.51.0/halo_cspl_RAM_revB2_29.53.0.wmfw
+cirrus/cs35l41/bincfgs/cs35l41-dsp1-19_5dB.bincfg
+cirrus/cs35l41/bincfgs/cs35l41-dsp1-14_5dB.bincfg
+cirrus/cs35l41/bincfgs/cs35l41-dsp1-16_5dB.bincfg
+cirrus/cs35l41/v6.47.0/halo_cspl_RAM_revB2_29.49.0.wmfw
+cirrus/cs35l41/v6.63.0/halo_cspl_RAM_revB2_29.65.0.wmfw
+cirrus/cs35l41/v6.39.0/halo_cspl_RAM_revB2_29.41.0.wmfw
+cirrus/cs35l41/v6.80.0/halo_cspl_RAM_revB2_29.82.0.wmfw
+cirrus/cs35l41/v6.61.1/halo_cspl_RAM_revB2_29.63.1.wmfw
+cirrus/cs35l41/v6.68.0/halo_cspl_RAM_revB2_29.70.0.wmfw
+cirrus/cs35l41/v6.56.0/halo_cspl_RAM_revB2_29.58.0.wmfw
+cirrus/cs35l41/v6.83.0/halo_cspl_RAM_revB2_29.85.0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431054-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431b93.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431503-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10433011-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid1-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8c68.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431f63-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdf-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431054.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280beb.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433ff0-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431044-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104316f3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8995.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-l0.bincfg
+cirrus/cs35l54-b0-dsp1-misc-103c8e19.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431ee2-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431054-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e12-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390d-spkid0.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8e1a-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9b-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38f9-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104316a3.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-17aa390d-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10280b27-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4f-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431034-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-17aa3905.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431294-spkid0-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e17-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa231a-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8c4f.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a40-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9b.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431024-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431483-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8e60-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431493-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b43.wmfw
+cirrus/cs35l41-dsp1-spk-prot.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431863-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c49.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b74.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2318-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2316-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10251844-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a6e-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431493-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e3b-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2318-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8b43.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c26.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e62-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b8f-l1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cde.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431ccf-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a30.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433391-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bde-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c46.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2319-r0.bincfg
+cirrus/cs35l54-b0-dsp1-misc-103c8d86-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431683-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10433a60.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e60-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e36-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9c.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c9f.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa391b-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c71.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be7-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89c3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431493-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e11-spkid0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9b-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c49.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433011-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8975-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8f-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10433391-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3932-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-104388f4.wmfw
+cirrus/cs35l56-b0-dsp1-misc-103c8d90.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431f43.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid1-amp1.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d01-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-1f660105.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431683-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid2-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a50.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbd.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9d-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da1-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433061-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431da2.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa2319-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b46.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa392d-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104388f4-spkid0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431df3-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8b42.bin
+cirrus/cs35l41-dsp1-spk-prot-10431caf.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c51.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431f63.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3910-spkid1-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431054-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104330d1.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d08-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cdf.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3921-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431df3-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10433011-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da8.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa390c-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid2.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2a-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da8-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390d-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bde.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid2-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c896e.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbf.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa392c-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431863-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-l1.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c17.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280b28-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e36.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c89c3-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be5-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2318.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431663.wmfw
+cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2317-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433071-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e13.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa231a.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8e19-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid0-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbe-spkid1-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-17aa392d-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8981-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-104314d3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cbe.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid3.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431034-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431683-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431034-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431294-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3910-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid0-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89c6.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa231a-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-17aa391b-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38a9.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be6-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433011.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa392e-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e37.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid0-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da7-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104312b4.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid1-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390b-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c66-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c15-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa233c-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10251826-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbf-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8b77.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431483-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a30-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280beb-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8f.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431024-spkid0-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1-amp3.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa380e-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431044-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cde-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a20-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8974.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c67-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431b93-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a50-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid0-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2e.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa391e-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431483-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-17aa233b-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa233c-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89c3-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a63-spkid1-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431024-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431454-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e12-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89c3-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431ccf.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433d88.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8b8f-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-10433ff0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3855-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e1b-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8d92-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433391-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c43.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431fb3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8d9e-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431533.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8981-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386e.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8bb4-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10431573-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da0-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c6b-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f63-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b8f-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b7-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e3b.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38b7.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431ed3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f62-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c33.wmfw
+cirrus/cs35l56-b0-dsp1-misc-103c8d92-amp1.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8c.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a6e-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38ab.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8b8f-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433071-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c9f-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e63-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c71.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-1025182c.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c70.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid1-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid1.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa392c-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c8.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e3b-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3905-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid1-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e62.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431463-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-r0.bincfg
+cirrus/cs35l54-b0-dsp1-misc-103c8d86.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid0-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-r1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431503-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8ad8.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c15.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8cdf-spkid0-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d85-amp4.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c4e-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431473-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8a31.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c89c6-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e16-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f1f-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cf5-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280b27-spkid1.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e1c.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8d90-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be9.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3832-spkid1-ampr.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a83.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8ce0-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e00-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c63-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433e20-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8d91-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid3-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e61.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8981-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8ca4.wmfw
+cirrus/cs35l54-b0-dsp1-misc-103c8d8d.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330d1-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid0-ampl.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c47.bin
+cirrus/cs35l56-b0-dsp1-misc-10280c62-spkid1-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be2-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid1-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431433-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104314d3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431264-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-104314e3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be6.wmfw
+cirrus/cs35l41-dsp1-spk-prot-1025182c-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431473.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3910-spkid1-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8e2c-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c896e-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b45.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a29.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10251844.wmfw
+cirrus/cs35l56-b0-dsp1-misc-17aa3911-spkid0-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8994.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10431caf-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8972.bin
+cirrus/cs35l41-dsp1-spk-prot-10431194-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid1-amp1.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa390c-spkid1-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386f.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280d33-spkid0-amp2.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e16.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8cdd-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bdd-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c43-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431503-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433fd0-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431863.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c898f.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a30-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8d90-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104331e1-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e11.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce6-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa22f1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433071-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be9-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431b13-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce7-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a83-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2d-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2319-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-104312b4-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431483.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c51-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b3a-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431663-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431194-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3921-spkid1-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d88-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8994.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8cf5-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f12-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e62-spkid1.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa2316.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104312af-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38fa-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c53.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c6a.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431573-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c52-amp4.bin
+cirrus/cs35l41-dsp1-spk-prot-10431e02-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8cdd.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c50.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-17aa38b4-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431c63-spkid0.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431e83-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa2319-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f2.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104330c1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c89e7.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2e-spkid0-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8e14-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2c.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104312af-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8991.bin
+cirrus/cs35l41-dsp1-spk-prot-10431573-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c33-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b44.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8c46.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce4-spkid3-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38fa-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431294.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431454-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8d9f.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8ca7.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be8-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104331f1-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431454-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3847-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8da0-spkid0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8d92.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10431034-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8e3a-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8be1-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8975.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a2c-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c898e.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431863-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d13-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a2d.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8e37-spkid0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433391-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc1-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433a60-spkid0-r0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d8e-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c17-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10431024-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa38a9-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38c8-spkid1-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid1.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280c4d-spkid0-l1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b5-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a28-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid0-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa22f1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc4-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c72.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa3847.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431074-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8ad8.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid0-r0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-17aa3911-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8be0-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cbd-spkid0-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-104330e1-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b74.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid3-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c50-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8b63-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104316a3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38f9.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8a2b-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8d91-amp2.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a31-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431f62.wmfw
+cirrus/cs35l41-dsp1-spk-prot-17aa22f2-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8c68-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38f9-spkid1-l0.bin
+cirrus/cs35l54-b0-dsp1-misc-103c8d08.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cc3-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c52.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10433d78-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid0-ampr.bin
+cirrus/cs35l41-dsp1-spk-prot-10431d1f-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-103c8c53-amp1.bin
+cirrus/cs35l41-dsp1-spk-prot-104318d3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cdf-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c6a-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38ab-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa386e-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431fb3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-104316d3-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8c26.bin
+cirrus/cs35l41-dsp1-spk-prot-10433061-spkid0-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d32-spkid1-amp3.bin
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8c4d-spkid1-l0.bin
+cirrus/cs35l56-b0-dsp1-misc-17aa3838-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10280cc2-spkid1-l0.bincfg
+cirrus/cs35l56-b0-dsp1-misc-10431df3.wmfw
+cirrus/cs35l56-b0-dsp1-misc-10280ce5-spkid0.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431c03-spkid0-r0.bin
+cirrus/cs35l56-b0-dsp1-misc-10280d12-spkid0-amp2.bin
+cirrus/cs35l56-b0-dsp1-misc-10280ce3-spkid3.wmfw
+cirrus/cs35l41-dsp1-spk-prot-104317f3-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431463-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-104314e3-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8a29-spkid0-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-17aa38b6-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-r0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-103c8a2b.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431ee2.wmfw
+cirrus/cs35l41-dsp1-spk-prot-103c8bb3-spkid1-l0.bincfg
+cirrus/cs35l41-dsp1-spk-prot-10280c4d.wmfw
+cirrus/cs35l41-dsp1-spk-prot-10431683-spkid1-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431cef-spkid0-l0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431a8f-spkid1-r0.bin
+cirrus/cs35l41-dsp1-spk-prot-10431da2-spkid0-l0.bin
 cis/3CXEM556.cis
-cis/3CCFEM556.cis
 cis/LA-PCM.cis
-cis/PCMLM28.cis
-cis/SW_8xx_SER.cis
+cis/PE-200.cis
 cis/MT5634ZLX.cis
-cis/DP83903.cis
+cis/PE520.cis
 cis/NE2K.cis
 cis/RS-COM-2P.cis
+cis/COMpad4.cis
+cis/PCMLM28.cis
+cis/DP83903.cis
+cis/SW_7xx_SER.cis
+cis/SW_8xx_SER.cis
+cis/3CCFEM556.cis
 cis/SW_555_SER.cis
-cis/PE520.cis
-cis/PE-200.cis
-cis/COMpad2.cis
 cis/tamarack.cis
+cis/COMpad2.cis
 cmmb_vega_12mhz.inp
 cmmb_venice_12mhz.inp
-cnm/wave633c_imx9_codec_fw.bin
 cnm/wave521c_k3_codec_fw.bin
+cnm/wave633c_imx9_codec_fw.bin
 cpia2/stv0672_vp4.bin
 cs42l43.bin
 ct2fw-3.2.5.1.bin
 ctefx.bin
 ctfw-3.2.5.1.bin
 ctspeq.bin
-cxgb3/ael2005_opt_edc.bin
-cxgb3/t3fw-7.4.0.bin
 cxgb3/t3b_psram-1.1.0.bin
-cxgb3/t3fw-7.1.0.bin
+cxgb3/t3fw-7.10.0.bin
+cxgb3/t3fw-7.4.0.bin
+cxgb3/t3fw-7.12.0.bin
 cxgb3/ael2020_twx_edc.bin
 cxgb3/ael2005_twx_edc.bin
-cxgb3/t3fw-7.12.0.bin
 cxgb3/t3fw-7.0.0.bin
+cxgb3/t3fw-7.1.0.bin
 cxgb3/t3c_psram-1.1.0.bin
-cxgb3/t3fw-7.10.0.bin
-cxgb4/t5-config.txt
+cxgb3/ael2005_opt_edc.bin
 cxgb4/configs/t6-config-default.txt
 cxgb4/configs/t5-config-default.txt
-cxgb4/configs/t6-config-hashfilter.txt
 cxgb4/configs/t4-config-default.txt
 cxgb4/configs/t5-config-hashfilter.txt
-cxgb4/bcm8483.bin
+cxgb4/configs/t6-config-hashfilter.txt
 cxgb4/t6-config.txt
-cxgb4/t5fw-1.14.4.0.bin
-cxgb4/t4fw-1.27.5.0.bin
 cxgb4/t5fw-1.27.5.0.bin
-cxgb4/t4fw-1.15.37.0.bin
+cxgb4/t4fw-1.14.4.0.bin
+cxgb4/t5fw-1.14.4.0.bin
+cxgb4/t4-config.txt
 cxgb4/aq1202_fw.cld
+cxgb4/t4fw-1.15.37.0.bin
+cxgb4/t4fw-1.27.5.0.bin
+cxgb4/t5-config.txt
+cxgb4/t4fw.bin
+cxgb4/t5fw-1.15.37.0.bin
+cxgb4/bcm8483.bin
 cxgb4/t6fw.bin
 cxgb4/t6fw-1.27.5.0.bin
-cxgb4/t4-config.txt
-cxgb4/t5fw-1.15.37.0.bin
-cxgb4/t4fw-1.14.4.0.bin
 cxgb4/t5fw.bin
-cxgb4/t4fw.bin
-cypress/cyfmac4356-sdio.bin
-cypress/cyfmac4373-sdio.bin
-cypress/cyfmac43430-sdio.bin
-cypress/cyfmac4356-pcie.clm_blob
-cypress/cyfmac43570-pcie.clm_blob
-cypress/cyfmac54591-pcie.clm_blob
-cypress/cyfmac43340-sdio.bin
-cypress/cyfmac4339-sdio.bin
-cypress/cyfmac4356-sdio.clm_blob
 cypress/cyfmac43430-sdio.clm_blob
-cypress/cyfmac4356-pcie.bin
-cypress/cyfmac4354-sdio.bin
+cypress/cyfmac4373-sdio.clm_blob
+cypress/cyfmac43430-sdio.bin
 cypress/cyfmac43570-pcie.bin
 cypress/cyfmac43362-sdio.bin
+cypress/cyfmac54591-pcie.clm_blob
+cypress/cyfmac43455-sdio.bin
+cypress/cyfmac4339-sdio.bin
+cypress/cyfmac4354-sdio.bin
+cypress/cyfmac43012-sdio.bin
+cypress/cyfmac43012-sdio.clm_blob
 cypress/cyfmac4354-sdio.clm_blob
 cypress/cyfmac43455-sdio.clm_blob
-cypress/cyfmac43012-sdio.bin
-cypress/cyfmac4373-sdio.clm_blob
+cypress/cyfmac4356-pcie.clm_blob
+cypress/cyfmac4356-sdio.bin
+cypress/cyfmac4373-sdio.bin
+cypress/cyfmac4356-sdio.clm_blob
+cypress/cyfmac43570-pcie.clm_blob
 cypress/cyfmac54591-pcie.bin
-cypress/cyfmac43455-sdio.bin
-cypress/cyfmac43012-sdio.clm_blob
+cypress/cyfmac43340-sdio.bin
+cypress/cyfmac4356-pcie.bin
 dabusb/bitstream.bin
 dabusb/firmware.fw
-dpaa2/mc/mc_10.16.2_ls1088a.itb
-dpaa2/mc/mc_10.14.3_ls2088a.itb
-dpaa2/mc/mc_10.28.1_ls2088a.itb
-dpaa2/mc/mc_10.10.0_ls2088a.itb
-dpaa2/mc/mc_10.14.3_ls1088a.itb
-dpaa2/mc/mc_10.18.0_lx2160a.itb
-dpaa2/mc/mc_10.10.0_ls1088a.itb
-dpaa2/mc/mc_10.18.0_ls1088a.itb
-dpaa2/mc/mc_10.16.2_ls2088a.itb
-dpaa2/mc/mc_10.16.2_lx2160a.itb
 dpaa2/mc/mc_10.18.0_ls2088a.itb
-dpaa2/mc/mc_10.14.3_lx2160a.itb
+dpaa2/mc/mc_10.16.2_ls1088a.itb
+dpaa2/mc/mc_10.18.0_ls1088a.itb
 dpaa2/mc/mc_10.28.1_lx2160a.itb
-dpaa2/mc/mc_10.28.1_ls1088a.itb
+dpaa2/mc/mc_10.16.2_lx2160a.itb
+dpaa2/mc/mc_10.14.3_ls2088a.itb
+dpaa2/mc/mc_10.10.0_ls1088a.itb
+dpaa2/mc/mc_10.18.0_lx2160a.itb
 dpaa2/mc/mc_10.10.0_lx2160a.itb
+dpaa2/mc/mc_10.14.3_ls1088a.itb
+dpaa2/mc/mc_10.28.1_ls1088a.itb
+dpaa2/mc/mc_10.28.1_ls2088a.itb
+dpaa2/mc/mc_10.16.2_ls2088a.itb
+dpaa2/mc/mc_10.14.3_lx2160a.itb
+dpaa2/mc/mc_10.10.0_ls2088a.itb
 dsp56k/bootstrap.bin
 dvb-fe-xc4000-1.4.1.fw
 dvb-fe-xc5000-1.6.114.fw
@@ -2585,383 +2585,383 @@ dvb-usb-it9135-02.fw
 dvb-usb-terratec-h5-drxk.fw
 dvb_nova_12mhz.inp
 dvb_nova_12mhz_b0.inp
-e100/d101m_ucode.bin
 e100/d102e_ucode.bin
 e100/d101s_ucode.bin
-edgeport/boot.fw
-edgeport/boot2.fw
-edgeport/down.fw
+e100/d101m_ucode.bin
 edgeport/down2.fw
+edgeport/boot2.fw
 edgeport/down3.bin
-emi26/firmware.fw
+edgeport/down.fw
+edgeport/boot.fw
 emi26/loader.fw
 emi26/bitstream.fw
-emi62/spdif.fw
+emi26/firmware.fw
 emi62/loader.fw
+emi62/spdif.fw
 emi62/midi.fw
 emi62/bitstream.fw
-ene-ub6250/sd_rdwr.bin
-ene-ub6250/sd_init1.bin
-ene-ub6250/ms_rdwr.bin
 ene-ub6250/sd_init2.bin
-ene-ub6250/ms_init.bin
+ene-ub6250/sd_init1.bin
 ene-ub6250/msp_rdwr.bin
-ess/maestro3_assp_minisrc.fw
+ene-ub6250/ms_rdwr.bin
+ene-ub6250/ms_init.bin
+ene-ub6250/sd_rdwr.bin
 ess/maestro3_assp_kernel.fw
+ess/maestro3_assp_minisrc.fw
 f2255usb.bin
-go7007/px-tv402u.fw
 go7007/lr192.fw
+go7007/wis-startrek.fw
+go7007/px-tv402u.fw
+go7007/px-m402u.fw
+go7007/go7007tv.bin
 go7007/s2250-1.fw
 go7007/s2250-2.fw
-go7007/wis-startrek.fw
-go7007/go7007tv.bin
 go7007/go7007fw.bin
-go7007/px-m402u.fw
 hfi1_dc8051.fw
 hfi1_fabric.fw
 hfi1_pcie.fw
 hfi1_sbus.fw
 htc_7010.fw
 htc_9271.fw
-i915/skl_guc_ver9_33.bin
-i915/icl_guc_69.0.3.bin
-i915/dg2_dmc_ver2_07.bin
-i915/tgl_guc_49.0.1.bin
-i915/bxt_huc_ver01_8_2893.bin
-i915/kbl_guc_33.0.0.bin
-i915/kbl_huc_4.0.0.bin
-i915/glk_guc_32.0.3.bin
-i915/dg2_huc_gsc.bin
-i915/adlp_dmc.bin
-i915/bxt_guc_ver8_7.bin
-i915/tgl_guc_70.1.1.bin
-i915/dg1_huc.bin
-i915/tgl_huc_7.0.12.bin
-i915/adlp_guc_70.1.1.bin
-i915/ehl_huc_9.0.0.bin
-i915/kbl_guc_69.0.3.bin
-i915/skl_guc_33.0.0.bin
-i915/icl_guc_49.0.1.bin
-i915/icl_guc_32.0.3.bin
-i915/tgl_guc_62.0.0.bin
-i915/glk_guc_62.0.0.bin
-i915/skl_guc_ver4.bin
-i915/skl_guc_ver6_1.bin
-i915/skl_huc_2.0.0.bin
-i915/dg2_dmc_ver2_06.bin
-i915/icl_huc_ver8_4_3238.bin
-i915/cml_guc_49.0.1.bin
-i915/kbl_guc_70.1.1.bin
-i915/adlp_guc_69.0.3.bin
-i915/glk_dmc_ver1_04.bin
-i915/adlp_dmc_ver2_16.bin
-i915/dg1_guc_70.1.1.bin
-i915/bxt_guc_32.0.3.bin
-i915/tgl_dmc_ver2_12.bin
-i915/dg2_guc_70.1.2.bin
-i915/skl_dmc_ver1.bin
-i915/dg2_guc_70.4.1.bin
-i915/tgl_huc_7.0.3.bin
-i915/icl_guc_62.0.0.bin
-i915/bxt_guc_49.0.1.bin
-i915/mtl_gsc_1.bin
-i915/skl_guc_69.0.3.bin
-i915/cml_guc_70.1.1.bin
-i915/mtl_dmc_ver2_10.bin
-i915/dg1_guc_70.bin
-i915/dg1_huc_7.9.3.bin
-i915/adlp_dmc_ver2_12.bin
-i915/skl_guc_ver1.bin
-i915/cml_guc_62.0.0.bin
-i915/cml_guc_69.0.3.bin
-i915/tgl_guc_70.bin
-i915/bxt_guc_62.0.0.bin
-i915/tgl_dmc_ver2_04.bin
-i915/icl_dmc_ver1_07.bin
-i915/kbl_dmc_ver1_04.bin
-i915/tgl_guc_35.2.0.bin
-i915/bxt_dmc_ver1_07.bin
-i915/kbl_dmc_ver1_01.bin
-i915/mtl_huc_gsc.bin
-i915/skl_guc_62.0.0.bin
 i915/tgl_huc_7.5.0.bin
-i915/skl_guc_32.0.3.bin
-i915/rkl_dmc_ver2_02.bin
-i915/ehl_guc_33.0.4.bin
-i915/glk_guc_69.0.3.bin
-i915/tgl_huc.bin
-i915/glk_guc_33.0.0.bin
-i915/skl_guc_70.1.1.bin
-i915/bxt_guc_69.0.3.bin
-i915/kbl_huc_ver02_00_1810.bin
-i915/adlp_guc_62.0.3.bin
-i915/cnl_dmc_ver1_07.bin
-i915/bxt_huc_2.0.0.bin
-i915/kbl_dmc_ver1.bin
-i915/kbl_guc_ver9_14.bin
-i915/cnl_dmc_ver1_06.bin
-i915/kbl_guc_49.0.1.bin
-i915/kbl_guc_32.0.3.bin
-i915/skl_dmc_ver1_26.bin
-i915/xe3lpd_dmc.bin
-i915/bmg_dmc.bin
-i915/dg1_huc_7.7.1.bin
-i915/tgl_dmc_ver2_06.bin
-i915/kbl_guc_62.0.0.bin
-i915/icl_guc_33.0.0.bin
-i915/cml_huc_4.0.0.bin
-i915/tgl_dmc_ver2_08.bin
-i915/bxt_guc_ver9_29.bin
-i915/mtl_guc_70.bin
-i915/tgl_guc_69.0.3.bin
-i915/adlp_dmc_ver2_14.bin
-i915/dg1_guc_49.0.1.bin
-i915/dg1_guc_62.0.0.bin
-i915/dg2_dmc_ver2_08.bin
-i915/adls_dmc_ver2_01.bin
-i915/bxt_dmc_ver1.bin
-i915/xe2lpd_dmc.bin
-i915/glk_guc_49.0.1.bin
-i915/dg1_dmc_ver2_02.bin
-i915/icl_guc_70.1.1.bin
-i915/adlp_dmc_ver2_10.bin
-i915/bxt_guc_70.1.1.bin
-i915/skl_guc_49.0.1.bin
-i915/skl_dmc_ver1_23.bin
-i915/cml_guc_33.0.0.bin
-i915/ehl_guc_70.1.1.bin
-i915/mtl_dmc.bin
-i915/kbl_guc_ver9_39.bin
-i915/dg2_guc_70.bin
-i915/icl_dmc_ver1_09.bin
-i915/skl_huc_ver01_07_1398.bin
-i915/ehl_guc_49.0.1.bin
-i915/glk_guc_70.1.1.bin
-i915/icl_huc_9.0.0.bin
-i915/glk_huc_ver03_01_2893.bin
-i915/skl_guc_ver6.bin
-i915/bxt_guc_33.0.0.bin
-i915/rkl_dmc_ver2_03.bin
-i915/ehl_guc_62.0.0.bin
-i915/ehl_guc_69.0.3.bin
-i915/adlp_dmc_ver2_09.bin
 i915/skl_dmc_ver1_27.bin
-i915/glk_huc_4.0.0.bin
 i915/adlp_guc_70.bin
 i915/dg1_guc_69.0.3.bin
+i915/bxt_guc_70.1.1.bin
+i915/ehl_guc_70.1.1.bin
+i915/skl_guc_33.0.0.bin
+i915/kbl_dmc_ver1_04.bin
+i915/adlp_dmc.bin
+i915/bxt_guc_ver8_7.bin
+i915/kbl_dmc_ver1.bin
+i915/skl_guc_ver6.bin
+i915/kbl_guc_70.1.1.bin
+i915/tgl_huc_7.0.12.bin
+i915/dg1_guc_49.0.1.bin
+i915/tgl_dmc_ver2_08.bin
+i915/mtl_guc_70.bin
+i915/glk_guc_70.1.1.bin
+i915/bxt_guc_69.0.3.bin
+i915/skl_guc_ver1.bin
+i915/ehl_huc_9.0.0.bin
+i915/icl_huc_9.0.0.bin
+i915/mtl_dmc.bin
+i915/bxt_guc_32.0.3.bin
+i915/kbl_huc_4.0.0.bin
+i915/mtl_gsc_1.bin
+i915/skl_huc_2.0.0.bin
+i915/skl_guc_32.0.3.bin
+i915/icl_guc_62.0.0.bin
+i915/skl_huc_ver01_07_1398.bin
+i915/skl_guc_70.1.1.bin
+i915/tgl_huc_7.0.3.bin
+i915/skl_guc_69.0.3.bin
+i915/skl_guc_49.0.1.bin
+i915/tgl_guc_62.0.0.bin
+i915/tgl_guc_70.bin
+i915/adlp_dmc_ver2_12.bin
+i915/adls_dmc_ver2_01.bin
+i915/skl_guc_ver6_1.bin
+i915/kbl_dmc_ver1_01.bin
+i915/dg2_huc_gsc.bin
+i915/glk_guc_33.0.0.bin
+i915/cml_guc_62.0.0.bin
+i915/kbl_guc_ver9_14.bin
+i915/tgl_guc_35.2.0.bin
+i915/dg2_dmc_ver2_07.bin
+i915/dg1_huc.bin
+i915/tgl_guc_49.0.1.bin
+i915/dg1_huc_7.7.1.bin
+i915/skl_guc_62.0.0.bin
+i915/icl_guc_70.1.1.bin
+i915/adlp_guc_62.0.3.bin
+i915/adlp_dmc_ver2_09.bin
+i915/cml_huc_4.0.0.bin
+i915/dg2_dmc_ver2_08.bin
+i915/tgl_huc.bin
+i915/icl_guc_49.0.1.bin
+i915/bxt_guc_62.0.0.bin
+i915/cnl_dmc_ver1_06.bin
 i915/tgl_huc_7.9.3.bin
+i915/tgl_dmc_ver2_12.bin
+i915/kbl_huc_ver02_00_1810.bin
+i915/dg2_guc_70.bin
+i915/kbl_guc_ver9_39.bin
+i915/cml_guc_70.1.1.bin
+i915/xe2lpd_dmc.bin
+i915/tgl_guc_69.0.3.bin
+i915/bxt_guc_33.0.0.bin
+i915/skl_dmc_ver1.bin
+i915/icl_huc_ver8_4_3238.bin
+i915/kbl_guc_69.0.3.bin
+i915/cml_guc_33.0.0.bin
+i915/mtl_huc_gsc.bin
+i915/skl_dmc_ver1_26.bin
+i915/skl_guc_ver9_33.bin
+i915/glk_huc_4.0.0.bin
+i915/mtl_dmc_ver2_10.bin
+i915/adlp_dmc_ver2_16.bin
+i915/cnl_dmc_ver1_07.bin
+i915/dg2_guc_70.4.1.bin
+i915/skl_dmc_ver1_23.bin
+i915/kbl_guc_49.0.1.bin
+i915/icl_guc_33.0.0.bin
+i915/kbl_guc_33.0.0.bin
+i915/icl_guc_69.0.3.bin
+i915/xe3lpd_dmc.bin
+i915/adlp_dmc_ver2_14.bin
+i915/dg1_guc_70.bin
+i915/bmg_dmc.bin
+i915/dg2_dmc_ver2_06.bin
+i915/bxt_dmc_ver1.bin
+i915/glk_guc_49.0.1.bin
+i915/ehl_guc_33.0.4.bin
+i915/tgl_dmc_ver2_06.bin
+i915/kbl_guc_62.0.0.bin
+i915/bxt_huc_2.0.0.bin
+i915/tgl_dmc_ver2_04.bin
+i915/adlp_dmc_ver2_10.bin
+i915/rkl_dmc_ver2_03.bin
+i915/dg1_huc_7.9.3.bin
+i915/glk_huc_ver03_01_2893.bin
+i915/bxt_guc_49.0.1.bin
+i915/rkl_dmc_ver2_02.bin
+i915/dg1_guc_62.0.0.bin
+i915/glk_guc_62.0.0.bin
+i915/adlp_guc_70.1.1.bin
+i915/kbl_guc_32.0.3.bin
+i915/icl_guc_32.0.3.bin
+i915/tgl_guc_70.1.1.bin
+i915/cml_guc_69.0.3.bin
+i915/bxt_huc_ver01_8_2893.bin
+i915/glk_guc_69.0.3.bin
+i915/icl_dmc_ver1_07.bin
+i915/bxt_guc_ver9_29.bin
+i915/bxt_dmc_ver1_07.bin
+i915/dg1_dmc_ver2_02.bin
+i915/dg1_guc_70.1.1.bin
+i915/adlp_guc_69.0.3.bin
+i915/dg2_guc_70.1.2.bin
+i915/skl_guc_ver4.bin
+i915/cml_guc_49.0.1.bin
+i915/ehl_guc_69.0.3.bin
 i915/bxt_huc_ver01_07_1398.bin
+i915/ehl_guc_62.0.0.bin
+i915/glk_guc_32.0.3.bin
+i915/ehl_guc_49.0.1.bin
+i915/icl_dmc_ver1_09.bin
+i915/glk_dmc_ver1_04.bin
 imx/sdma/sdma-imx7d.bin
 imx/sdma/sdma-imx6q.bin
 inside-secure/eip197_minifw/ipue.bin
 inside-secure/eip197_minifw/ifpp.bin
-intel/ibt-0180-1050.ddc
-intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq
-intel/ibt-19-32-4.sfi
+intel/ibt-0040-1020.ddc
 intel/dsp_fw_kbl.bin
-intel/ibt-0291-0291.sfi
-intel/vsc/ivsc_skucfg_ovti2740_0_1.bin
-intel/vsc/ivsc_pkg_himx2172_0.bin
-intel/vsc/ivsc_pkg_himx11b1_0.bin
-intel/vsc/ivsc_skucfg_hi556_0_1.bin
-intel/vsc/ivsc_pkg_ovti9734_0.bin
-intel/vsc/ivsc_pkg_int3537_0.bin
-intel/vsc/ivsc_skucfg_himx2172_0_1.bin
-intel/vsc/ivsc_pkg_hi556_0.bin
-intel/vsc/ivsc_pkg_ovti02e1_0.bin
-intel/vsc/ivsc_skucfg_int3537_0_1.bin
-intel/vsc/ivsc_pkg_ovti01a0_0.bin
-intel/vsc/ivsc_pkg_ovti02c1_0.bin
-intel/vsc/ivsc_skucfg_ovti01as_0_1.bin
-intel/vsc/ivsc_skucfg_ovti02e1_0_1.bin
-intel/vsc/ivsc_pkg_ovti2740_0.bin
-intel/vsc/ivsc_skucfg_ovti5678_0_1.bin
-intel/vsc/ivsc_pkg_himx2170_0.bin
-intel/vsc/ivsc_skucfg_himx2170_0_1.bin
-intel/vsc/ivsc_pkg_ovti5678_0.bin
-intel/vsc/ivsc_pkg_ovti01af_0.bin
-intel/vsc/ivsc_skucfg_ovti9738_0_1.bin
-intel/vsc/ivsc_pkg_ovti01as_0.bin
-intel/vsc/ivsc_skucfg_ovti02c1_0_1.bin
-intel/vsc/ivsc_pkg_ovti9738_0.bin
-intel/vsc/ivsc_skucfg_ovti01af_0_1.bin
-intel/vsc/ivsc_fw.bin
-intel/vsc/ivsc_skucfg_himx11b1_0_1.bin
-intel/vsc/ivsc_skucfg_ovti01a0_0_1.bin
-intel/vsc/ivsc_skucfg_ovti9734_0_1.bin
-intel/dsp_fw_release.bin
-intel/ibt-1040-2120.ddc
-intel/ibt-19-32-0.ddc
-intel/ibt-1040-1020.ddc
-intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
-intel/fw_sst_0f28.bin
-intel/dsp_fw_cnl_v1858.bin
-intel/ibt-0040-4150.sfi
-intel/ibt-0180-4150.sfi
-intel/ibt-20-1-3.ddc
-intel/ibt-0190-0291.sfi
-intel/catpt/bdw/dsp_basefw.bin
-intel/dsp_fw_kbl_v1037.bin
-intel/ibt-19-0-4.ddc
-intel/ibt-19-240-4.sfi
 intel/ibt-18-2.ddc
+intel/dsp_fw_kbl_v1037.bin
+intel/ibt-19-32-1.ddc
+intel/ibt-0093-0041.sfi
+intel/ibt-19-0-0.ddc
+intel/ibt-18-16-1.sfi
+intel/ibt-1040-1020.sfi
+intel/ibt-1040-4150.sfi
+intel/ibt-hw-37.7.bseq
+intel/ibt-0040-2120.sfi
+intel/ibt-0180-1050.sfi
+intel/ibt-19-0-4.ddc
+intel/ibt-0040-1050.sfi
+intel/ibt-0093-0291.sfi
+intel/vpu/vpu_40xx_v0.0.bin
+intel/vpu/vpu_40xx_v1.bin
+intel/vpu/vpu_37xx_v1.bin
+intel/vpu/vpu_37xx_v0.0.bin
+intel/dsp_fw_bxtn.bin
+intel/ibt-19-32-0.ddc
+intel/ibt-20-0-3.sfi
+intel/fw_sst_22a8.bin
+intel/ibt-20-1-3.sfi
+intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
+intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
+intel/dsp_fw_kbl_v701.bin
+intel/ibt-19-32-4.ddc
+intel/ibt-18-0-1.sfi
+intel/ibt-19-0-3.ddc
+intel/ibt-0040-1020.sfi
+intel/ibt-0190-0041.ddc
+intel/ibt-19-16-4.ddc
+intel/ibt-12-16.ddc
+intel/ibt-1040-1050.ddc
+intel/ibt-17-2.sfi
+intel/ibt-1040-2120.ddc
+intel/ibt-0180-4150.ddc
+intel/ibt-0040-2120.ddc
+intel/IntcSST2.bin
+intel/ibt-19-240-4.sfi
+intel/ibt-17-1.sfi
 intel/ice/ddp-wireless_edge/ice_wireless_edge-1.3.23.0.pkg
+intel/ice/ddp/ice.pkg
+intel/ice/ddp/ice-1.3.43.0.pkg
 intel/ice/ddp-comms/ice_comms-1.3.55.0.pkg
 intel/ice/ddp-lag/ice_lag-1.3.1.0.pkg
-intel/ice/ddp/ice-1.3.43.0.pkg
-intel/ice/ddp/ice.pkg
+intel/ibt-0190-0291-pci.sfi
+intel/ibt-19-0-1.ddc
+intel/ibt-0190-0041-iml.sfi
+intel/ibt-0190-0041-pci.sfi
+intel/ibt-1040-1050.sfi
+intel/ibt-0190-0291-usb.sfi
+intel/dsp_fw_glk_v3366.bin
+intel/dsp_fw_release_v969.bin
+intel/dsp_fw_glk.bin
+intel/fw_sst_0f28_ssp0.bin
+intel/ibt-0040-4150.sfi
+intel/ibt-17-2.ddc
+intel/dsp_fw_kbl_v3266.bin
+intel/ibt-17-0-1.sfi
+intel/ibt-0190-0291-usb.ddc
+intel/ibt-0190-0041-pci.ddc
+intel/ibt-17-16-1.sfi
+intel/dsp_fw_kbl_v3402.bin
+intel/ibt-19-32-0.sfi
+intel/dsp_fw_glk_v1814.bin
+intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq
+intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
+intel/ibt-0040-4150.ddc
+intel/ibt-0190-0041-usb.sfi
+intel/dsp_fw_cnl.bin
+intel/ibt-0093-4150.ddc
+intel/ibt-0093-0291.ddc
+intel/ibt-20-0-3.ddc
+intel/dsp_fw_bxtn_v3366.bin
+intel/ibt-17-1.ddc
+intel/ibt-20-1-3.ddc
+intel/dsp_fw_kbl_v3420.bin
+intel/dsp_fw_glk_v2880.bin
+intel/ibt-0041-0041.ddc
+intel/ibt-0041-0041.sfi
+intel/ibt-0291-0291.ddc
 intel/ibt-0190-0291.ddc
+intel/ibt-0180-4150.sfi
+intel/ibt-19-32-4.sfi
+intel/ibt-20-1-4.ddc
+intel/vsc/ivsc_pkg_ovti2740_0.bin
+intel/vsc/ivsc_fw.bin
+intel/vsc/ivsc_pkg_hi556_0.bin
+intel/vsc/ivsc_skucfg_himx11b1_0_1.bin
+intel/vsc/ivsc_skucfg_himx2172_0_1.bin
+intel/vsc/ivsc_pkg_himx11b1_0.bin
+intel/vsc/ivsc_pkg_ovti02e1_0.bin
+intel/vsc/ivsc_skucfg_ovti01as_0_1.bin
+intel/vsc/ivsc_pkg_ovti01a0_0.bin
+intel/vsc/ivsc_skucfg_ovti02e1_0_1.bin
+intel/vsc/ivsc_pkg_ovti01as_0.bin
+intel/vsc/ivsc_pkg_int3537_0.bin
+intel/vsc/ivsc_pkg_ovti9734_0.bin
+intel/vsc/ivsc_skucfg_ovti9738_0_1.bin
+intel/vsc/ivsc_skucfg_ovti9734_0_1.bin
+intel/vsc/ivsc_skucfg_ovti2740_0_1.bin
+intel/vsc/ivsc_skucfg_ovti01af_0_1.bin
+intel/vsc/ivsc_skucfg_int3537_0_1.bin
+intel/vsc/ivsc_pkg_ovti02c1_0.bin
+intel/vsc/ivsc_skucfg_ovti02c1_0_1.bin
+intel/vsc/ivsc_pkg_ovti5678_0.bin
+intel/vsc/ivsc_skucfg_hi556_0_1.bin
+intel/vsc/ivsc_pkg_ovti01af_0.bin
+intel/vsc/ivsc_pkg_ovti9738_0.bin
+intel/vsc/ivsc_pkg_himx2170_0.bin
+intel/vsc/ivsc_skucfg_ovti01a0_0_1.bin
+intel/vsc/ivsc_skucfg_ovti5678_0_1.bin
+intel/vsc/ivsc_pkg_himx2172_0.bin
+intel/vsc/ivsc_skucfg_himx2170_0_1.bin
+intel/ibt-0190-0291.sfi
+intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
+intel/dsp_fw_release.bin
+intel/ibt-1040-4150.ddc
+intel/ipu3-fw.bin
+intel/ibt-17-0-1.ddc
+intel/catpt/bdw/dsp_basefw.bin
+intel/dsp_fw_cnl_v1858.bin
+intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq
+intel/ibt-19-240-4.ddc
+intel/ibt-0190-0291-pci.ddc
+intel/ibt-18-1.sfi
+intel/ibt-19-0-3.sfi
+intel/dsp_fw_cnl_v1191.bin
+intel/ibt-11-5.sfi
+intel/ibt-0180-1050.ddc
+intel/ibt-19-0-0.sfi
+intel/ibt-19-16-4.sfi
+intel/ibt-12-16.sfi
+intel/ibt-0093-4150.sfi
+intel/ibt-hw-37.7.10-fw-1.0.2.3.d.bseq
+intel/ipu/ipu6epmtl_fw.bin
+intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
+intel/ipu/ipu7_fw.bin
+intel/ipu/ipu6_fw.bin
+intel/ipu/shisp_2401a0_v21.bin
+intel/ipu/ipu6se_fw.bin
+intel/ipu/ipu6epadln_fw.bin
+intel/ipu/ipu7ptl_fw.bin
+intel/ipu/shisp_2400b0_v21.bin
+intel/ipu/ipu6ep_fw.bin
 intel/ibt-1040-0041.sfi
-intel/ibt-18-16-1.sfi
-intel/ibt-0180-0041.ddc
-intel/avs/hda-generic-1ep-tplg.bin
-intel/avs/skl/dsp_basefw.bin
-intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin
-intel/avs/rt286-tplg.bin
-intel/avs/ssm4567-tplg.bin
-intel/avs/max98927-tplg.bin
+intel/ibt-18-0-1.ddc
+intel/ibt-1040-0041.ddc
+intel/ibt-18-2.sfi
+intel/dsp_fw_release_v3402.bin
+intel/ibt-0190-0041.sfi
+intel/ibt-19-240-1.ddc
+intel/ibt-19-0-1.sfi
+intel/ibt-18-16-1.ddc
+intel/ibt-19-240-1.sfi
+intel/dsp_fw_glk_v2768.bin
+intel/ibt-0093-1050.sfi
+intel/avs/max98373-tplg.bin
 intel/avs/rt5663-tplg.bin
-intel/avs/cnl/dsp_basefw.bin
-intel/avs/hda-8086-generic-tplg.bin
-intel/avs/rt298-tplg.bin
-intel/avs/max98357a-tplg.bin
-intel/avs/dmic-tplg.bin
-intel/avs/da7219-tplg.bin
+intel/avs/rt5640-tplg.bin
 intel/avs/rt5514-tplg.bin
+intel/avs/hda-generic-1ep-tplg.bin
+intel/avs/nau8825-tplg.bin
+intel/avs/rt298-tplg.bin
+intel/avs/rt286-tplg.bin
+intel/avs/max98927-tplg.bin
+intel/avs/da7219-tplg.bin
+intel/avs/hda-generic-tplg.bin
+intel/avs/ssm4567-tplg.bin
 intel/avs/apl/dsp_basefw.bin
 intel/avs/rt274-tplg.bin
-intel/avs/max98373-tplg.bin
-intel/avs/rt5640-tplg.bin
-intel/avs/hda-generic-tplg.bin
 intel/avs/hda-808628xx-3ep-tplg.bin
-intel/avs/nau8825-tplg.bin
-intel/dsp_fw_kbl_v3420.bin
-intel/dsp_fw_kbl_v3402.bin
-intel/ibt-0093-0291.sfi
-intel/ibt-19-0-0.sfi
-intel/ibt-hw-37.8.10-fw-22.50.19.14.f.bseq
-intel/fw_sst_0f28.bin-48kHz_i2s_master
-intel/ibt-0190-0041-usb.ddc
-intel/ibt-0093-0041.ddc
-intel/ibt-12-16.sfi
-intel/ibt-0190-0041-pci.sfi
-intel/ibt-0190-0041-usb.sfi
-intel/ibt-hw-37.7.bseq
-intel/ibt-18-2.sfi
-intel/ibt-17-16-1.ddc
-intel/ibt-19-16-4.sfi
-intel/ibt-1040-1050.sfi
-intel/ibt-19-0-3.ddc
-intel/ibt-19-32-1.ddc
-intel/ibt-0040-2120.ddc
-intel/ibt-18-16-1.ddc
-intel/ibt-19-0-1.sfi
-intel/ibt-17-0-1.sfi
-intel/dsp_fw_bxtn_v3366.bin
-intel/fw_sst_22a8.bin
-intel/dsp_fw_kbl_v3266.bin
-intel/ibt-19-16-4.ddc
-intel/ibt-17-16-1.sfi
-intel/ibt-0040-2120.sfi
-intel/dsp_fw_glk_v2880.bin
-intel/dsp_fw_bxtn_v2219.bin
-intel/ibt-17-0-1.ddc
-intel/ibt-19-0-4.sfi
-intel/ibt-hw-37.8.10-fw-1.10.3.11.e.bseq
-intel/ibt-0040-1020.ddc
-intel/ibt-12-16.ddc
-intel/ibt-18-1.ddc
-intel/ibt-0040-1050.sfi
-intel/ibt-0190-0291-iml.sfi
-intel/dsp_fw_kbl_v2042.bin
-intel/ibt-19-240-4.ddc
-intel/ibt-0093-1050.sfi
-intel/ibt-0180-4150.ddc
-intel/ibt-0291-0291.ddc
-intel/ibt-0040-0041.ddc
-intel/ibt-19-32-4.ddc
-intel/ibt-19-0-0.ddc
-intel/ibt-0093-0291.ddc
-intel/IntcSST2.bin
-intel/ibt-0190-0291-usb.sfi
-intel/ibt-0041-0041.ddc
-intel/ibt-0093-4150.sfi
-intel/ibt-0040-0041.sfi
-intel/ibt-0190-0041-pci.ddc
-intel/ibt-0190-0041-iml.sfi
-intel/ibt-19-240-1.sfi
-intel/ibt-1040-4150.ddc
-intel/ibt-0093-1050.ddc
-intel/ibt-0190-0041.sfi
-intel/ibt-0040-1050.ddc
-intel/ibt-17-2.sfi
-intel/ibt-11-5.sfi
-intel/dsp_fw_release_v969.bin
-intel/ibt-17-2.ddc
-intel/ibt-19-0-1.ddc
-intel/ibt-20-0-3.sfi
-intel/ibt-18-1.sfi
-intel/ibt-0093-0041.sfi
-intel/ibt-20-1-3.sfi
-intel/ibt-1040-1020.sfi
-intel/fw_sst_0f28_ssp0.bin
-intel/dsp_fw_kbl_v701.bin
-intel/ibt-20-1-4.sfi
-intel/ibt-0041-0041.sfi
-intel/ibt-0040-4150.ddc
+intel/avs/hda-8086-generic-tplg.bin
+intel/avs/max98357a-tplg.bin
+intel/avs/skl/dsp_mod_7CAD0808-AB10-CD23-EF45-12AB34CD56EF.bin
+intel/avs/skl/dsp_basefw.bin
+intel/avs/dmic-tplg.bin
+intel/avs/cnl/dsp_basefw.bin
 intel/dsp_fw_kbl_v2630.bin
-intel/ibt-0190-0291-usb.ddc
-intel/ibt-1040-4150.sfi
-intel/ibt-1040-1050.ddc
-intel/ipu3-fw.bin
-intel/ibt-hw-37.7.10-fw-1.80.2.3.d.bseq
-intel/ibt-1040-0041.ddc
-intel/dsp_fw_glk_v2768.bin
-intel/ibt-0190-0291-pci.ddc
-intel/ibt-19-0-3.sfi
-intel/ibt-11-5.ddc
-intel/dsp_fw_cnl.bin
-intel/ibt-19-32-0.sfi
-intel/ibt-hw-37.7.10-fw-1.0.1.2d.d.bseq
-intel/ibt-19-240-1.ddc
-intel/ibt-0093-4150.ddc
+intel/ibt-20-1-4.sfi
+intel/ibt-hw-37.7.10-fw-1.80.1.2d.d.bseq
+intel/ibt-1040-1020.ddc
+intel/ibt-0040-0041.sfi
 intel/ibt-19-32-1.sfi
-intel/ibt-0180-0041.sfi
-intel/ibt-0190-0291-pci.sfi
-intel/dsp_fw_cnl_v1191.bin
-intel/ibt-17-1.ddc
-intel/ipu/shisp_2400b0_v21.bin
-intel/ipu/ipu7_fw.bin
-intel/ipu/ipu6se_fw.bin
-intel/ipu/ipu6epmtl_fw.bin
-intel/ipu/ipu6ep_fw.bin
-intel/ipu/ipu7ptl_fw.bin
-intel/ipu/ipu6epadln_fw.bin
-intel/ipu/shisp_2401a0_v21.bin
-intel/ipu/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
-intel/ipu/ipu6_fw.bin
-intel/dsp_fw_bxtn.bin
-intel/ibt-0180-1050.sfi
-intel/ibt-20-1-4.ddc
-intel/ibt-20-0-3.ddc
-intel/ibt-17-1.sfi
-intel/irci_irci_ecr-master_20161208_0213_20170112_1500.bin
-intel/ibt-0190-0041.ddc
-intel/dsp_fw_release_v3402.bin
+intel/ibt-18-1.ddc
+intel/ibt-0093-0041.ddc
+intel/ibt-17-16-1.ddc
+intel/fw_sst_0f28.bin
+intel/fw_sst_0f28.bin-48kHz_i2s_master
+intel/ibt-19-0-4.sfi
+intel/ibt-0190-0041-usb.ddc
+intel/ibt-0190-0291-iml.sfi
 intel/ish/ish_lnlm.bin
-intel/dsp_fw_glk_v3366.bin
-intel/ibt-18-0-1.sfi
-intel/vpu/vpu_37xx_v0.0.bin
-intel/vpu/vpu_40xx_v1.bin
-intel/vpu/vpu_40xx_v0.0.bin
-intel/vpu/vpu_37xx_v1.bin
-intel/dsp_fw_glk.bin
+intel/ibt-0040-0041.ddc
 intel/ibt-hw-37.8.bseq
-intel/dsp_fw_glk_v1814.bin
-intel/ibt-18-0-1.ddc
+intel/ibt-0180-0041.ddc
+intel/ibt-0180-0041.sfi
+intel/dsp_fw_kbl_v2042.bin
+intel/ibt-0093-1050.ddc
+intel/ibt-11-5.ddc
 intel/ibt-1040-2120.sfi
-intel/ibt-hw-37.8.10-fw-1.10.2.27.d.bseq
-intel/ibt-0040-1020.sfi
+intel/ibt-0040-1050.ddc
+intel/dsp_fw_bxtn_v2219.bin
+intel/ibt-0291-0291.sfi
 isci/isci_firmware.bin
 isdbt_nova_12mhz.inp
 isdbt_nova_12mhz_b0.inp
@@ -3136,301 +3136,301 @@ ixp4xx/NPE-A
 ixp4xx/NPE-A-HSS
 ixp4xx/NPE-B
 ixp4xx/NPE-C
-kaweth/new_code.bin
 kaweth/trigger_code.bin
-kaweth/trigger_code_fix.bin
+kaweth/new_code.bin
 kaweth/new_code_fix.bin
-keyspan/usa49w.fw
-keyspan/usa19qi.fw
-keyspan/usa28x.fw
-keyspan/usa49wlc.fw
-keyspan/usa19qw.fw
-keyspan/usa28xb.fw
-keyspan/usa18x.fw
-keyspan/usa19w.fw
-keyspan/usa19.fw
-keyspan/mpr.fw
+kaweth/trigger_code_fix.bin
 keyspan/usa28xa.fw
+keyspan/usa18x.fw
+keyspan/usa19qw.fw
+keyspan/mpr.fw
+keyspan/usa49w.fw
+keyspan/usa19w.fw
+keyspan/usa49wlc.fw
+keyspan/usa19.fw
+keyspan/usa28x.fw
 keyspan/usa28.fw
+keyspan/usa28xb.fw
+keyspan/usa19qi.fw
 keyspan_pda/keyspan_pda.fw
 keyspan_pda/xircom_pgs.fw
 korg/k1212.dsp
 lbtf_usb.bin
 lgs8g75.fw
-libertas/sd8686_v8.bin
-libertas/cf8381_helper.bin
-libertas/gspi8688.bin
-libertas/sd8686_v9.bin
-libertas/gspi8682.bin
-libertas/sd8682.bin
-libertas/usb8388_olpc.bin
-libertas/usb8388_v9.bin
-libertas/sd8682_helper.bin
-libertas/sd8385.bin
 libertas/gspi8686_v9.bin
+libertas/sd8686_v9.bin
+libertas/usb8388_v9.bin
+libertas/sd8686_v8.bin
+libertas/gspi8688.bin
 libertas/cf8385_helper.bin
-libertas/gspi8686_v9_helper.bin
-libertas/gspi8688_helper.bin
-libertas/sd8686_v8_helper.bin
+libertas/sd8682.bin
 libertas/sd8686_v9_helper.bin
-libertas/sd8688.bin
-libertas/usb8682.bin
-libertas/sd8688_helper.bin
-libertas/sd8385_helper.bin
-libertas/cf8385.bin
+libertas/sd8682_helper.bin
+libertas/gspi8682.bin
+libertas/sd8686_v8_helper.bin
 libertas/lbtf_sdio.bin
-libertas/usb8388_v5.bin
-libertas/cf8381.bin
+libertas/sd8385.bin
+libertas/sd8688_helper.bin
+libertas/gspi8688_helper.bin
+libertas/sd8688.bin
+libertas/cf8385.bin
+libertas/usb8682.bin
+libertas/gspi8686_v9_helper.bin
 libertas/gspi8682_helper.bin
-liquidio/lio_210nv_nic.bin
-liquidio/lio_210sv_nic.bin
-liquidio/lio_410nv_nic.bin
+libertas/cf8381.bin
+libertas/usb8388_olpc.bin
+libertas/cf8381_helper.bin
+libertas/sd8385_helper.bin
+libertas/usb8388_v5.bin
 liquidio/lio_23xx_nic.bin
+liquidio/lio_210nv_nic.bin
+liquidio/lio_410nv_nic.bin
+liquidio/lio_210sv_nic.bin
 lt9611uxc_fw.bin
-matrox/g200_warp.fw
 matrox/g400_warp.fw
-mediatek/mt7610e.bin
-mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
-mediatek/mt7986_eeprom_mt7976_dual.bin
-mediatek/WIFI_MT7961_patch_mcu_1a_2_hdr.bin
-mediatek/mt8192/scp.img
-mediatek/mt7981_wm.bin
+matrox/g200_warp.fw
+mediatek/mt7650.bin
 mediatek/mt7981_wo.bin
-mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin
-mediatek/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin
-mediatek/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin
-mediatek/mt7601u.bin
-mediatek/sof-tplg/sof-mt8188.tplg
-mediatek/sof-tplg/sof-mt8186.tplg
-mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682.tplg
-mediatek/sof-tplg/sof-mt8195.tplg
-mediatek/sof-tplg/sof-mt8195-mt6359-max98390-rt5682.tplg
-mediatek/WIFI_RAM_CODE_MT7922_1.bin
+mediatek/mt7615_n9.bin
 mediatek/mt8173/vpu_d.bin
 mediatek/mt8173/vpu_p.bin
-mediatek/mt7668pr2h.bin
-mediatek/mt7610u.bin
+mediatek/WIFI_RAM_CODE_MT7961_1.bin
 mediatek/mt7981_wa.bin
-mediatek/mt8195/scp.img
-mediatek/mt7986_wo_1.bin
-mediatek/mt7622_rom_patch.bin
-mediatek/mt7986_wo_0.bin
-mediatek/mt7988_wo_0.bin
-mediatek/mt7916_wm.bin
-mediatek/mt8188/scp.img
-mediatek/mt7662u_rom_patch.bin
-mediatek/mt7622pr2h.bin
-mediatek/WIFI_RAM_CODE_MT7961_1a.bin
-mediatek/mt8183/scp.img
-mediatek/mt7663pr2h_rebb.bin
-mediatek/mt7915_wm.bin
-mediatek/mt7986_rom_patch.bin
-mediatek/mt7915_eeprom_dbdc.bin
-mediatek/mt8196/vcp.img
-mediatek/mt7662_rom_patch.bin
-mediatek/mt7986_rom_patch_mt7975.bin
-mediatek/mt7986_eeprom_mt7976.bin
-mediatek/mt7986_eeprom_mt7976_dbdc.bin
-mediatek/mt7663pr2h.bin
-mediatek/mt7650.bin
+mediatek/mt7610u.bin
 mediatek/mt7662.bin
-mediatek/mt7988/mt7988_wo_0.bin
-mediatek/mt7988/i2p5ge-phy-pmb.bin
-mediatek/mt7988/mt7988_wo_1.bin
-mediatek/sof/sof-mt8188.ri
-mediatek/sof/sof-mt8195.ri
-mediatek/sof/sof-mt8186.ldc
-mediatek/sof/sof-mt8195.ldc
-mediatek/sof/sof-mt8188.ldc
-mediatek/sof/sof-mt8186.ri
-mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
-mediatek/mt7615_rom_patch.bin
-mediatek/mt7916_rom_patch.bin
-mediatek/mt7916_eeprom.bin
-mediatek/mt7663_n9_rebb.bin
-mediatek/BT_RAM_CODE_MT7961_1a_2_hdr.bin
-mediatek/mt8186/scp.img
-mediatek/mt7915_wa.bin
-mediatek/mt7663_n9_v3.bin
-mediatek/mt7615_cr4.bin
-mediatek/mt7981_rom_patch.bin
-mediatek/mt7916_wa.bin
-mediatek/mt7915_eeprom.bin
-mediatek/mt7996/mt7996_eeprom.bin
-mediatek/mt7996/mt7992_wa_23.bin
-mediatek/mt7996/mt7996_dsp.bin
+mediatek/mt7996/mt7996_eeprom_233_2i5i6i.bin
+mediatek/mt7996/mt7996_rom_patch_233.bin
+mediatek/mt7996/mt7996_rom_patch.bin
+mediatek/mt7996/mt7996_wa.bin
+mediatek/mt7996/mt7992_wm.bin
 mediatek/mt7996/mt7992_eeprom_2i5i.bin
+mediatek/mt7996/mt7996_dsp.bin
+mediatek/mt7996/mt7996_wm_233.bin
+mediatek/mt7996/mt7992_wm_23.bin
+mediatek/mt7996/mt7992_eeprom_2i5e.bin
+mediatek/mt7996/mt7992_rom_patch.bin
 mediatek/mt7996/mt7996_wm.bin
 mediatek/mt7996/mt7996_eeprom_233.bin
 mediatek/mt7996/mt7996_eeprom_2i5i6i.bin
+mediatek/mt7996/mt7996_eeprom.bin
 mediatek/mt7996/mt7992_rom_patch_23.bin
-mediatek/mt7996/mt7996_wa_233.bin
-mediatek/mt7996/mt7992_wm.bin
-mediatek/mt7996/mt7992_eeprom_2i5e.bin
-mediatek/mt7996/mt7992_eeprom_23_2i5i.bin
-mediatek/mt7996/mt7996_wa.bin
-mediatek/mt7996/mt7992_wm_23.bin
-mediatek/mt7996/mt7992_dsp_23.bin
-mediatek/mt7996/mt7996_eeprom_233_2i5i6i.bin
-mediatek/mt7996/mt7996_rom_patch.bin
-mediatek/mt7996/mt7992_dsp.bin
-mediatek/mt7996/mt7992_rom_patch.bin
-mediatek/mt7996/mt7996_wm_233.bin
 mediatek/mt7996/mt7992_eeprom_23.bin
-mediatek/mt7996/mt7996_rom_patch_233.bin
-mediatek/mt7996/mt7992_wa.bin
 mediatek/mt7996/mt7992_eeprom.bin
-mediatek/mt7662u.bin
-mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
-mediatek/mt7615_n9.bin
-mediatek/mt7988_wo_1.bin
-mediatek/mt7986_wa.bin
-mediatek/mt7986_wm.bin
-mediatek/mt7622_n9.bin
-mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
-mediatek/mt7650e.bin
-mediatek/WIFI_RAM_CODE_MT7961_1.bin
-mediatek/mt7986_eeprom_mt7975_dual.bin
+mediatek/mt7996/mt7992_eeprom_23_2i5i.bin
+mediatek/mt7996/mt7992_wa.bin
+mediatek/mt7996/mt7992_wa_23.bin
+mediatek/mt7996/mt7992_dsp.bin
+mediatek/mt7996/mt7996_wa_233.bin
+mediatek/mt7996/mt7992_dsp_23.bin
 mediatek/mt7986_wm_mt7975.bin
+mediatek/BT_RAM_CODE_MT7961_1_2_hdr.bin
+mediatek/mt7916_wa.bin
+mediatek/mt7986_wo_0.bin
+mediatek/mt7986_rom_patch_mt7975.bin
+mediatek/mt8196/vcp.img
+mediatek/mt7663_n9_rebb.bin
+mediatek/mt7915_eeprom_dbdc.bin
+mediatek/mt7986_eeprom_mt7976.bin
+mediatek/mt7662u.bin
+mediatek/BT_RAM_CODE_MT7961_1a_2_hdr.bin
+mediatek/WIFI_MT7922_patch_mcu_1_1_hdr.bin
+mediatek/BT_RAM_CODE_MT7922_1_1_hdr.bin
+mediatek/WIFI_MT7961_patch_mcu_1_2_hdr.bin
+mediatek/WIFI_RAM_CODE_MT7922_1.bin
+mediatek/mt7622_n9.bin
+mediatek/mt8188/scp.img
 mediatek/mt7915_rom_patch.bin
-mellanox/mlxsw_spectrum2-29.2012.1012.mfa2
-mellanox/mlxsw_spectrum-13.2008.1036.mfa2
-mellanox/mlxsw_spectrum-13.2010.1006.mfa2
-mellanox/mlxsw_spectrum3-30.2014.4012.mfa2
-mellanox/mlxsw_spectrum-13.1420.122.mfa2
-mellanox/mlxsw_spectrum3-30.2008.1312.mfa2
-mellanox/mlxsw_spectrum-13.2008.2018.mfa2
-mellanox/mlxsw_spectrum-13.2008.2406.mfa2
-mellanox/mlxsw_spectrum3-30.2012.1012.mfa2
-mellanox/mlxsw_spectrum2-29.2008.1036.mfa2
-mellanox/mlxsw_spectrum2-29.2008.2946.mfa2
-mellanox/mlxsw_spectrum-13.1530.152.mfa2
-mellanox/mlxsw_spectrum3-30.2010.1502.mfa2
-mellanox/mlxsw_spectrum4-34.2014.4012.mfa2
-mellanox/mlxsw_spectrum2-29.2010.3020.mfa2
-mellanox/mlxsw_spectrum2-29.2008.2304.mfa2
-mellanox/mlxsw_spectrum3-30.2008.1036.mfa2
-mellanox/mlxsw_spectrum-13.2000.2714.mfa2
-mellanox/mlxsw_spectrum4-34.2012.1012.mfa2
-mellanox/lc_ini_bundle_2010_3020.bin
-mellanox/mlxsw_spectrum2-29.2010.1006.mfa2
-mellanox/mlxsw_spectrum-13.2010.1502.mfa2
-mellanox/mlxsw_spectrum2-29.2007.1168.mfa2
-mellanox/mlxsw_spectrum3-30.2007.1168.mfa2
-mellanox/mlxsw_spectrum-13.2007.1168.mfa2
-mellanox/mlxsw_spectrum2-29.2000.2308.mfa2
-mellanox/mlxsw_spectrum-13.2014.4012.mfa2
-mellanox/mlxsw_spectrum-13.2008.3326.mfa2
-mellanox/mlxsw_spectrum3-30.2008.1310.mfa2
-mellanox/mlxsw_spectrum-13.2008.2946.mfa2
-mellanox/mlxsw_spectrum3-30.2010.1232.mfa2
-mellanox/mlxsw_spectrum3-30.2010.3020.mfa2
-mellanox/mlxsw_spectrum-13.1702.6.mfa2
-mellanox/mlxsw_spectrum2-29.2010.1406.mfa2
-mellanox/mlxsw_spectrum2-29.2008.1310.mfa2
-mellanox/mlxsw_spectrum2-29.2014.4012.mfa2
-mellanox/mlxsw_spectrum3-30.2008.2304.mfa2
-mellanox/lc_ini_bundle_2010_1006.bin
-mellanox/mlxsw_spectrum-13.2010.1232.mfa2
+mediatek/mt7986_rom_patch.bin
+mediatek/mt7988/i2p5ge-phy-pmb.bin
+mediatek/mt7988/mt7988_wo_0.bin
+mediatek/mt7988/mt7988_wo_1.bin
+mediatek/mt7915_wa.bin
+mediatek/sof-tplg/sof-mt8186.tplg
+mediatek/sof-tplg/sof-mt8195-mt6359-max98390-rt5682.tplg
+mediatek/sof-tplg/sof-mt8195-mt6359-rt1019-rt5682.tplg
+mediatek/sof-tplg/sof-mt8188.tplg
+mediatek/sof-tplg/sof-mt8195.tplg
+mediatek/WIFI_MT7961_patch_mcu_1a_2_hdr.bin
+mediatek/WIFI_RAM_CODE_MT7961_1a.bin
+mediatek/mt7981_wm.bin
+mediatek/mt7986_eeprom_mt7975_dual.bin
+mediatek/mt7650e.bin
+mediatek/mt7668pr2h.bin
+mediatek/mt7986_wm.bin
+mediatek/mt8183/scp.img
+mediatek/mt7988_wo_0.bin
+mediatek/mt7986_wa.bin
+mediatek/mt7663pr2h_rebb.bin
+mediatek/mt7986_eeprom_mt7976_dual.bin
+mediatek/mt7986_eeprom_mt7976_dbdc.bin
+mediatek/mt7915_eeprom.bin
+mediatek/mt7662u_rom_patch.bin
+mediatek/sof/sof-mt8186.ldc
+mediatek/sof/sof-mt8188.ldc
+mediatek/sof/sof-mt8195.ldc
+mediatek/sof/sof-mt8188.ri
+mediatek/sof/sof-mt8186.ri
+mediatek/sof/sof-mt8195.ri
+mediatek/mt7663_n9_v3.bin
+mediatek/mt7610e.bin
+mediatek/mt7925/WIFI_RAM_CODE_MT7925_1_1.bin
+mediatek/mt7925/WIFI_MT7925_PATCH_MCU_1_1_hdr.bin
+mediatek/mt7925/BT_RAM_CODE_MT7925_1_1_hdr.bin
+mediatek/mt7622_rom_patch.bin
+mediatek/mt8192/scp.img
+mediatek/mt7601u.bin
+mediatek/mt7915_wm.bin
+mediatek/mt7986_wo_1.bin
+mediatek/mt7663pr2h.bin
+mediatek/mt7622pr2h.bin
+mediatek/mt7916_wm.bin
+mediatek/mt7615_rom_patch.bin
+mediatek/mt7916_eeprom.bin
+mediatek/mt7662_rom_patch.bin
+mediatek/mt8195/scp.img
+mediatek/mt7916_rom_patch.bin
+mediatek/mt8186/scp.img
+mediatek/mt7981_rom_patch.bin
+mediatek/mt7615_cr4.bin
+mediatek/mt7988_wo_1.bin
 mellanox/mlxsw_spectrum-13.2010.1406.mfa2
-mellanox/mlxsw_spectrum3-30.2008.2946.mfa2
-mellanox/mlxsw_spectrum2-29.2008.2018.mfa2
-mellanox/mlxsw_spectrum3-30.2008.2438.mfa2
-mellanox/mlxsw_spectrum2-29.2000.2714.mfa2
-mellanox/mlxsw_spectrum2-29.2008.3326.mfa2
+mellanox/mlxsw_spectrum3-30.2012.1012.mfa2
 mellanox/mlxsw_spectrum-13.2000.1122.mfa2
-mellanox/mlxsw_spectrum-13.2008.1312.mfa2
-mellanox/mlxsw_spectrum-13.2008.1310.mfa2
-mellanox/mlxsw_spectrum2-29.2008.2406.mfa2
-mellanox/lc_ini_bundle_2010_1502.bin
-mellanox/mlxsw_spectrum-13.2010.3020.mfa2
-mellanox/mlxsw_spectrum3-30.2008.3326.mfa2
-mellanox/mlxsw_spectrum3-30.2010.1006.mfa2
+mellanox/mlxsw_spectrum2-29.2008.3326.mfa2
+mellanox/mlxsw_spectrum2-29.2008.1310.mfa2
 mellanox/mlxsw_spectrum3-30.2008.2018.mfa2
-mellanox/mlxsw_spectrum-13.2008.2438.mfa2
-mellanox/mlxsw_spectrum2-29.2010.1502.mfa2
-mellanox/mlxsw_spectrum3-30.2010.3146.mfa2
-mellanox/mlxsw_spectrum2-29.2010.1232.mfa2
-mellanox/mlxsw_spectrum2-29.2008.1312.mfa2
+mellanox/mlxsw_spectrum2-29.2008.2406.mfa2
+mellanox/mlxsw_spectrum3-30.2008.2438.mfa2
 mellanox/mlxsw_spectrum-13.2000.2308.mfa2
-mellanox/mlxsw_spectrum3-30.2008.2406.mfa2
-mellanox/mlxsw_spectrum2-29.2008.2438.mfa2
-mellanox/lc_ini_bundle_2010_3146.bin
-mellanox/mlxsw_spectrum-13.1703.4.mfa2
-mellanox/mlxsw_spectrum-13.2008.2304.mfa2
-mellanox/mlxsw_spectrum-13.2000.1886.mfa2
+mellanox/lc_ini_bundle_2010_1006.bin
+mellanox/mlxsw_spectrum2-29.2010.1006.mfa2
+mellanox/lc_ini_bundle_2010_1502.bin
+mellanox/mlxsw_spectrum-13.1530.152.mfa2
+mellanox/mlxsw_spectrum-13.2010.3020.mfa2
+mellanox/mlxsw_spectrum4-34.2012.1012.mfa2
+mellanox/mlxsw_spectrum3-30.2008.1312.mfa2
+mellanox/mlxsw_spectrum3-30.2010.1502.mfa2
+mellanox/mlxsw_spectrum-13.2008.1312.mfa2
+mellanox/mlxsw_spectrum-13.2010.1006.mfa2
+mellanox/mlxsw_spectrum2-29.2010.1502.mfa2
 mellanox/mlxsw_spectrum-13.2012.1012.mfa2
-mellanox/mlxsw_spectrum-13.1910.622.mfa2
-mellanox/mlxsw_spectrum-13.1620.192.mfa2
-mellanox/mlxsw_spectrum2-29.2010.3146.mfa2
-mellanox/mlxsw_spectrum3-30.2010.1406.mfa2
+mellanox/mlxsw_spectrum3-30.2008.3326.mfa2
+mellanox/mlxsw_spectrum3-30.2010.3020.mfa2
+mellanox/mlxsw_spectrum3-30.2008.1310.mfa2
+mellanox/mlxsw_spectrum2-29.2012.1012.mfa2
 mellanox/mlxsw_spectrum-13.2010.3146.mfa2
-meson/vdec/sm1_hevc_mmu.bin
+mellanox/mlxsw_spectrum2-29.2010.1406.mfa2
+mellanox/mlxsw_spectrum2-29.2010.3020.mfa2
+mellanox/lc_ini_bundle_2010_3020.bin
+mellanox/mlxsw_spectrum-13.2008.2018.mfa2
+mellanox/mlxsw_spectrum-13.1620.192.mfa2
+mellanox/mlxsw_spectrum3-30.2007.1168.mfa2
+mellanox/mlxsw_spectrum4-34.2014.4012.mfa2
+mellanox/mlxsw_spectrum2-29.2008.1036.mfa2
+mellanox/mlxsw_spectrum3-30.2008.1036.mfa2
+mellanox/lc_ini_bundle_2010_3146.bin
+mellanox/mlxsw_spectrum2-29.2010.1232.mfa2
+mellanox/mlxsw_spectrum2-29.2008.2946.mfa2
+mellanox/mlxsw_spectrum3-30.2008.2406.mfa2
+mellanox/mlxsw_spectrum3-30.2010.1006.mfa2
+mellanox/mlxsw_spectrum-13.2008.1036.mfa2
+mellanox/mlxsw_spectrum3-30.2010.3146.mfa2
+mellanox/mlxsw_spectrum3-30.2008.2946.mfa2
+mellanox/mlxsw_spectrum2-29.2008.2304.mfa2
+mellanox/mlxsw_spectrum2-29.2000.2308.mfa2
+mellanox/mlxsw_spectrum-13.2008.2406.mfa2
+mellanox/mlxsw_spectrum-13.2008.2946.mfa2
+mellanox/mlxsw_spectrum-13.2010.1232.mfa2
+mellanox/mlxsw_spectrum3-30.2010.1232.mfa2
+mellanox/mlxsw_spectrum-13.1420.122.mfa2
+mellanox/mlxsw_spectrum-13.2008.2304.mfa2
+mellanox/mlxsw_spectrum-13.1910.622.mfa2
+mellanox/mlxsw_spectrum-13.2000.1886.mfa2
+mellanox/mlxsw_spectrum-13.2008.3326.mfa2
+mellanox/mlxsw_spectrum-13.1703.4.mfa2
+mellanox/mlxsw_spectrum-13.2014.4012.mfa2
+mellanox/mlxsw_spectrum2-29.2008.1312.mfa2
+mellanox/mlxsw_spectrum-13.2008.1310.mfa2
+mellanox/mlxsw_spectrum2-29.2000.2714.mfa2
+mellanox/mlxsw_spectrum3-30.2008.2304.mfa2
+mellanox/mlxsw_spectrum3-30.2010.1406.mfa2
+mellanox/mlxsw_spectrum-13.2000.2714.mfa2
+mellanox/mlxsw_spectrum2-29.2008.2438.mfa2
+mellanox/mlxsw_spectrum2-29.2007.1168.mfa2
+mellanox/mlxsw_spectrum2-29.2010.3146.mfa2
+mellanox/mlxsw_spectrum2-29.2008.2018.mfa2
+mellanox/mlxsw_spectrum-13.2008.2438.mfa2
+mellanox/mlxsw_spectrum-13.2010.1502.mfa2
+mellanox/mlxsw_spectrum2-29.2014.4012.mfa2
+mellanox/mlxsw_spectrum3-30.2014.4012.mfa2
+mellanox/mlxsw_spectrum-13.2007.1168.mfa2
+mellanox/mlxsw_spectrum-13.1702.6.mfa2
 meson/vdec/gxl_mpeg12.bin
-meson/vdec/gxm_h264.bin
-meson/vdec/sm1_vp9_mmu.bin
-meson/vdec/gxbb_h264.bin
-meson/vdec/gxl_h263.bin
-meson/vdec/gxl_h264.bin
-meson/vdec/gxl_mpeg4_5.bin
-meson/vdec/g12a_h264.bin
-meson/vdec/gxl_vp9.bin
-meson/vdec/g12a_vp9.bin
-meson/vdec/g12a_hevc_mmu.bin
-meson/vdec/gxl_hevc_mmu.bin
-meson/vdec/gxl_hevc.bin
 meson/vdec/gxl_mjpeg.bin
-microchip/mscc_vsc8574_revb_int8051_29e8.bin
+meson/vdec/g12a_hevc_mmu.bin
+meson/vdec/gxm_h264.bin
+meson/vdec/gxbb_h264.bin
+meson/vdec/sm1_hevc_mmu.bin
+meson/vdec/g12a_vp9.bin
+meson/vdec/gxl_h263.bin
+meson/vdec/gxl_mpeg4_5.bin
+meson/vdec/gxl_h264.bin
+meson/vdec/sm1_vp9_mmu.bin
+meson/vdec/g12a_h264.bin
+meson/vdec/gxl_hevc_mmu.bin
+meson/vdec/gxl_vp9.bin
+meson/vdec/gxl_hevc.bin
 microchip/mscc_vsc8584_revb_int8051_fb48.bin
-moxa/moxa-1451.fw
-moxa/moxa-1658.fw
-moxa/moxa-1251.fw
-moxa/moxa-1150.fw
-moxa/moxa-1613.fw
-moxa/moxa-1130.fw
-moxa/moxa-1450.fw
-moxa/moxa-1410.fw
+microchip/mscc_vsc8574_revb_int8051_29e8.bin
 moxa/moxa-1653.fw
+moxa/moxa-1451.fw
+moxa/moxa-1613.fw
+moxa/moxa-1251.fw
 moxa/moxa-1151.fw
+moxa/moxa-1410.fw
+moxa/moxa-1150.fw
+moxa/moxa-1110.fw
+moxa/moxa-1450.fw
+moxa/moxa-1130.fw
+moxa/moxa-1658.fw
+moxa/moxa-1131.fw
 moxa/moxa-1618.fw
 moxa/moxa-1250.fw
-moxa/moxa-1131.fw
-moxa/moxa-1110.fw
-mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img
-mrvl/prestera/mvsw_prestera_fw-v2.0.img
-mrvl/prestera/mvsw_prestera_fw-v3.0.img
-mrvl/prestera/mvsw_prestera_fw-v4.0.img
-mrvl/prestera/mvsw_prestera_fw-v4.1.img
-mrvl/pcieusb8997_combo_v4.bin
-mrvl/pcie8997_wlan_v4.bin
-mrvl/usb8766_uapsta.bin
-mrvl/sd8897_uapsta.bin
-mrvl/cpt01/se.out
-mrvl/cpt01/ae.out
-mrvl/cpt01/ie.out
-mrvl/pcie8897_uapsta.bin
-mrvl/sdsd8997_combo_v4.bin
 mrvl/usbusb8997_combo_v4.bin
-mrvl/usb8797_uapsta.bin
-mrvl/usb8897_uapsta.bin
-mrvl/sd8801_uapsta.bin
-mrvl/pcieuart8997_combo_v4.bin
-mrvl/sd8887_uapsta.bin
-mrvl/sd8688.bin
+mrvl/cpt04/ie.out
 mrvl/cpt04/se.out
 mrvl/cpt04/ae.out
-mrvl/cpt04/ie.out
-mrvl/sd8688_helper.bin
-mrvl/sd8787_uapsta.bin
 mrvl/sdsd8977_combo_v2.bin
-mrvl/usb8801_uapsta.bin
-mrvl/sd8797_uapsta.bin
-mrvl/cpt03/se.out
-mrvl/cpt03/ae.out
-mrvl/cpt03/ie.out
+mrvl/sd8887_uapsta.bin
+mrvl/prestera/mvsw_prestera_fw-v3.0.img
+mrvl/prestera/mvsw_prestera_fw-v4.1.img
+mrvl/prestera/mvsw_prestera_fw-v4.0.img
+mrvl/prestera/mvsw_prestera_fw-v2.0.img
+mrvl/prestera/mvsw_prestera_fw_arm64-v4.1.img
+mrvl/usb8897_uapsta.bin
+mrvl/pcie8897_uapsta.bin
+mrvl/sd8787_uapsta.bin
+mrvl/usb8766_uapsta.bin
+mrvl/cpt02/ie.out
 mrvl/cpt02/se.out
 mrvl/cpt02/ae.out
-mrvl/cpt02/ie.out
+mrvl/sd8797_uapsta.bin
+mrvl/cpt03/ie.out
+mrvl/cpt03/se.out
+mrvl/cpt03/ae.out
+mrvl/cpt01/ie.out
+mrvl/cpt01/se.out
+mrvl/cpt01/ae.out
+mrvl/sd8688_helper.bin
+mrvl/sdsd8997_combo_v4.bin
+mrvl/pcieuart8997_combo_v4.bin
+mrvl/sd8688.bin
+mrvl/usb8801_uapsta.bin
+mrvl/sd8801_uapsta.bin
+mrvl/sd8897_uapsta.bin
+mrvl/usb8797_uapsta.bin
+mrvl/pcieusb8997_combo_v4.bin
+mrvl/pcie8997_wlan_v4.bin
 mt7601u.bin
 mt7650.bin
 mt7662.bin
@@ -3440,16 +3440,16 @@ mts_edge.fw
 mts_gsm.fw
 mts_mt9234mu.fw
 mts_mt9234zba.fw
-mwl8k/fmimage_8366_ap-3.fw
-mwl8k/fmimage_8366_ap-2.fw
-mwl8k/fmimage_8366.fw
-mwl8k/fmimage_8366_ap-1.fw
-mwl8k/helper_8687.fw
-mwl8k/fmimage_8687.fw
-mwl8k/fmimage_8764_ap-1.fw
 mwl8k/helper_8366.fw
-mwlwifi/88W8864.bin
+mwl8k/helper_8687.fw
+mwl8k/fmimage_8366_ap-3.fw
+mwl8k/fmimage_8687.fw
+mwl8k/fmimage_8366_ap-1.fw
+mwl8k/fmimage_8366.fw
+mwl8k/fmimage_8764_ap-1.fw
+mwl8k/fmimage_8366_ap-2.fw
 mwlwifi/88W8897.bin
+mwlwifi/88W8864.bin
 myri10ge_eth_big_z8e.dat
 myri10ge_eth_z8e.dat
 myri10ge_ethp_big_z8e.dat
@@ -3459,582 +3459,582 @@ myri10ge_rss_eth_z8e.dat
 myri10ge_rss_ethp_big_z8e.dat
 myri10ge_rss_ethp_z8e.dat
 myricom/lanai.bin
-netronome/nic_AMDA0099-0001_2x10.nffw
-netronome/nic_AMDA0096-0001_2x10.nffw
-netronome/nic-sriov/nic_AMDA0099-0001_2x10.nffw
-netronome/nic-sriov/nic_AMDA0096-0001_2x10.nffw
 netronome/nic-sriov/nic_AMDA0078-0011_1x100.nffw
 netronome/nic-sriov/nic_AMDA0097-0001_8x10.nffw
-netronome/nic-sriov/nic_AMDA0058-0012_2x40.nffw
-netronome/nic-sriov/nic_AMDA0097-0001_2x40.nffw
+netronome/nic-sriov/nic_AMDA0099-0001_2x10.nffw
+netronome/nic-sriov/nic_AMDA0099-0001_2x25.nffw
 netronome/nic-sriov/nic_AMDA0099-0001_1x10_1x25.nffw
 netronome/nic-sriov/nic_AMDA0058-0011_2x40.nffw
-netronome/nic-sriov/nic_AMDA0099-0001_2x25.nffw
-netronome/nic-sriov/nic_AMDA0081-0001_1x40.nffw
-netronome/nic-sriov/nic_AMDA0081-0001_4x10.nffw
 netronome/nic-sriov/nic_AMDA0097-0001_4x10_1x40.nffw
+netronome/nic-sriov/nic_AMDA0097-0001_2x40.nffw
+netronome/nic-sriov/nic_AMDA0096-0001_2x10.nffw
+netronome/nic-sriov/nic_AMDA0081-0001_1x40.nffw
+netronome/nic-sriov/nic_AMDA0058-0012_2x40.nffw
+netronome/nic-sriov/nic_AMDA0081-0001_4x10.nffw
 netronome/nic_AMDA0078-0011_1x100.nffw
 netronome/nic_AMDA0097-0001_8x10.nffw
-netronome/nic_AMDA0058-0012_2x40.nffw
-netronome/flower/nic_AMDA0099-0001_2x10.nffw
-netronome/flower/nic_AMDA0078-0012_2x40.nffw
-netronome/flower/nic_AMDA0078-0011_8x10.nffw
-netronome/flower/nic_AMDA0096-0001_2x10.nffw
-netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw
-netronome/flower/nic_AMDA0081.nffw
-netronome/flower/nic_AMDA0078-0011_1x100.nffw
-netronome/flower/nic_AMDA0099.nffw
-netronome/flower/nic_AMDA0097-0001_8x10.nffw
-netronome/flower/nic_AMDA0058-0012_2x40.nffw
-netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw
-netronome/flower/nic_AMDA0058.nffw
-netronome/flower/nic_AMDA0096.nffw
-netronome/flower/nic_AMDA0097.nffw
-netronome/flower/nic_AMDA0097-0001_2x40.nffw
-netronome/flower/nic_AMDA0078-0012_1x100.nffw
-netronome/flower/nic_AMDA0099-0001_1x10_1x25.nffw
-netronome/flower/nic_AMDA0058-0011_1x100.nffw
-netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw
-netronome/flower/nic_AMDA0058-0011_2x40.nffw
-netronome/flower/nic_AMDA0078-0011_2x40.nffw
-netronome/flower/nic_AMDA0099-0001_2x25.nffw
-netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw
-netronome/flower/nic_AMDA0058-0011_8x10.nffw
-netronome/flower/nic_AMDA0081-0001_1x40.nffw
-netronome/flower/nic_AMDA0078-0012_8x10.nffw
-netronome/flower/nic_AMDA0081-0001_4x10.nffw
-netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
-netronome/flower/nic_AMDA0058-0012_1x100.nffw
-netronome/flower/nic_AMDA0058-0012_8x10.nffw
-netronome/bpf/nic_AMDA0099-0001_2x10.nffw
-netronome/bpf/nic_AMDA0096-0001_2x10.nffw
-netronome/bpf/nic_AMDA0078-0011_1x100.nffw
-netronome/bpf/nic_AMDA0097-0001_8x10.nffw
-netronome/bpf/nic_AMDA0058-0012_2x40.nffw
-netronome/bpf/nic_AMDA0097-0001_2x40.nffw
-netronome/bpf/nic_AMDA0099-0001_1x10_1x25.nffw
-netronome/bpf/nic_AMDA0058-0011_2x40.nffw
-netronome/bpf/nic_AMDA0099-0001_2x25.nffw
-netronome/bpf/nic_AMDA0081-0001_1x40.nffw
-netronome/bpf/nic_AMDA0081-0001_4x10.nffw
-netronome/bpf/nic_AMDA0097-0001_4x10_1x40.nffw
-netronome/nic/nic_AMDA0099-0001_2x10.nffw
-netronome/nic/nic_AMDA0096-0001_2x10.nffw
-netronome/nic/nic_AMDA0078-0011_1x100.nffw
-netronome/nic/nic_AMDA0097-0001_8x10.nffw
-netronome/nic/nic_AMDA0058-0012_2x40.nffw
-netronome/nic/nic_AMDA0097-0001_2x40.nffw
-netronome/nic/nic_AMDA0099-0001_1x10_1x25.nffw
-netronome/nic/nic_AMDA0058-0011_2x40.nffw
-netronome/nic/nic_AMDA0099-0001_2x25.nffw
-netronome/nic/nic_AMDA0081-0001_1x40.nffw
-netronome/nic/nic_AMDA0081-0001_4x10.nffw
-netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
-netronome/nic_AMDA0097-0001_2x40.nffw
+netronome/nic_AMDA0099-0001_2x10.nffw
+netronome/nic_AMDA0099-0001_2x25.nffw
 netronome/nic_AMDA0099-0001_1x10_1x25.nffw
 netronome/nic_AMDA0058-0011_2x40.nffw
-netronome/nic_AMDA0099-0001_2x25.nffw
-netronome/nic_AMDA0081-0001_1x40.nffw
-netronome/nic_AMDA0081-0001_4x10.nffw
 netronome/nic_AMDA0097-0001_4x10_1x40.nffw
-nvidia/gb102
-nvidia/gm204/gr/gpccs_data.bin
-nvidia/gm204/gr/sw_ctx.bin
-nvidia/gm204/gr/fecs_inst.bin
-nvidia/gm204/gr/fecs_sig.bin
-nvidia/gm204/gr/fecs_bl.bin
-nvidia/gm204/gr/fecs_data.bin
-nvidia/gm204/gr/sw_bundle_init.bin
-nvidia/gm204/gr/gpccs_inst.bin
-nvidia/gm204/gr/sw_nonctx.bin
-nvidia/gm204/gr/sw_method_init.bin
-nvidia/gm204/gr/gpccs_sig.bin
-nvidia/gm204/gr/gpccs_bl.bin
-nvidia/gm204/acr/ucode_load.bin
-nvidia/gm204/acr/bl.bin
-nvidia/gm204/acr/ucode_unload.bin
-nvidia/tu104/gr/gpccs_data.bin
-nvidia/tu104/gr/sw_veid_bundle_init.bin
-nvidia/tu104/gr/sw_ctx.bin
-nvidia/tu104/gr/fecs_inst.bin
-nvidia/tu104/gr/fecs_sig.bin
-nvidia/tu104/gr/fecs_bl.bin
-nvidia/tu104/gr/fecs_data.bin
-nvidia/tu104/gr/sw_bundle_init.bin
-nvidia/tu104/gr/gpccs_inst.bin
-nvidia/tu104/gr/sw_nonctx.bin
-nvidia/tu104/gr/sw_method_init.bin
-nvidia/tu104/gr/gpccs_sig.bin
-nvidia/tu104/gr/gpccs_bl.bin
-nvidia/tu104/gsp
-nvidia/tu104/sec2/sig.bin
-nvidia/tu104/sec2/image.bin
-nvidia/tu104/sec2/desc.bin
-nvidia/tu104/acr/ucode_ahesasc.bin
-nvidia/tu104/acr/ucode_asb.bin
-nvidia/tu104/acr/bl.bin
-nvidia/tu104/acr/ucode_unload.bin
-nvidia/tu104/acr/unload_bl.bin
-nvidia/tu104/nvdec/scrubber.bin
-nvidia/gp107/gr/gpccs_data.bin
-nvidia/gp107/gr/sw_ctx.bin
-nvidia/gp107/gr/fecs_inst.bin
-nvidia/gp107/gr/fecs_sig.bin
-nvidia/gp107/gr/fecs_bl.bin
-nvidia/gp107/gr/fecs_data.bin
-nvidia/gp107/gr/sw_bundle_init.bin
-nvidia/gp107/gr/gpccs_inst.bin
-nvidia/gp107/gr/sw_nonctx.bin
-nvidia/gp107/gr/sw_method_init.bin
-nvidia/gp107/gr/gpccs_sig.bin
-nvidia/gp107/gr/gpccs_bl.bin
-nvidia/gp107/sec2/sig.bin
-nvidia/gp107/sec2/sig-1.bin
-nvidia/gp107/sec2/image.bin
-nvidia/gp107/sec2/desc.bin
-nvidia/gp107/sec2/image-1.bin
-nvidia/gp107/sec2/desc-1.bin
-nvidia/gp107/acr/ucode_load.bin
-nvidia/gp107/acr/bl.bin
-nvidia/gp107/acr/ucode_unload.bin
-nvidia/gp107/acr/unload_bl.bin
-nvidia/gp107/nvdec/scrubber.bin
-nvidia/gp10b/gr/gpccs_data.bin
-nvidia/gp10b/gr/sw_ctx.bin
-nvidia/gp10b/gr/fecs_inst.bin
-nvidia/gp10b/gr/fecs_sig.bin
-nvidia/gp10b/gr/fecs_bl.bin
-nvidia/gp10b/gr/fecs_data.bin
-nvidia/gp10b/gr/sw_bundle_init.bin
-nvidia/gp10b/gr/gpccs_inst.bin
-nvidia/gp10b/gr/sw_nonctx.bin
-nvidia/gp10b/gr/sw_method_init.bin
-nvidia/gp10b/gr/gpccs_sig.bin
-nvidia/gp10b/gr/gpccs_bl.bin
-nvidia/gp10b/acr/ucode_load.bin
-nvidia/gp10b/acr/bl.bin
-nvidia/gp10b/pmu/sig.bin
-nvidia/gp10b/pmu/image.bin
-nvidia/gp10b/pmu/desc.bin
-nvidia/gp100/gr/gpccs_data.bin
-nvidia/gp100/gr/sw_ctx.bin
-nvidia/gp100/gr/fecs_inst.bin
-nvidia/gp100/gr/fecs_sig.bin
-nvidia/gp100/gr/fecs_bl.bin
-nvidia/gp100/gr/fecs_data.bin
-nvidia/gp100/gr/sw_bundle_init.bin
-nvidia/gp100/gr/gpccs_inst.bin
-nvidia/gp100/gr/sw_nonctx.bin
-nvidia/gp100/gr/sw_method_init.bin
-nvidia/gp100/gr/gpccs_sig.bin
-nvidia/gp100/gr/gpccs_bl.bin
-nvidia/gp100/acr/ucode_load.bin
-nvidia/gp100/acr/bl.bin
-nvidia/gp100/acr/ucode_unload.bin
-nvidia/tegra210/vic04_ucode.bin
-nvidia/tegra210/xusb.bin
-nvidia/tegra210/vic.bin
-nvidia/tegra186/vic04_ucode.bin
-nvidia/tegra186/xusb.bin
-nvidia/tegra186/vic.bin
-nvidia/ad104
-nvidia/gv100/gr/gpccs_data.bin
-nvidia/gv100/gr/sw_ctx.bin
-nvidia/gv100/gr/fecs_inst.bin
-nvidia/gv100/gr/fecs_sig.bin
-nvidia/gv100/gr/fecs_bl.bin
-nvidia/gv100/gr/fecs_data.bin
-nvidia/gv100/gr/sw_bundle_init.bin
-nvidia/gv100/gr/gpccs_inst.bin
-nvidia/gv100/gr/sw_nonctx.bin
-nvidia/gv100/gr/sw_method_init.bin
-nvidia/gv100/gr/gpccs_sig.bin
-nvidia/gv100/gr/gpccs_bl.bin
-nvidia/gv100/sec2/sig.bin
-nvidia/gv100/sec2/image.bin
-nvidia/gv100/sec2/desc.bin
-nvidia/gv100/acr/ucode_load.bin
-nvidia/gv100/acr/bl.bin
-nvidia/gv100/acr/ucode_unload.bin
-nvidia/gv100/acr/unload_bl.bin
-nvidia/gv100/nvdec/scrubber.bin
-nvidia/tu102/gr/gpccs_data.bin
-nvidia/tu102/gr/sw_veid_bundle_init.bin
-nvidia/tu102/gr/sw_ctx.bin
-nvidia/tu102/gr/fecs_inst.bin
-nvidia/tu102/gr/fecs_sig.bin
-nvidia/tu102/gr/fecs_bl.bin
-nvidia/tu102/gr/fecs_data.bin
-nvidia/tu102/gr/sw_bundle_init.bin
-nvidia/tu102/gr/gpccs_inst.bin
-nvidia/tu102/gr/sw_nonctx.bin
-nvidia/tu102/gr/sw_method_init.bin
-nvidia/tu102/gr/gpccs_sig.bin
-nvidia/tu102/gr/gpccs_bl.bin
-nvidia/tu102/gsp/booter_load-535.113.01.bin
-nvidia/tu102/gsp/booter_unload-535.113.01.bin
-nvidia/tu102/gsp/bootloader-535.113.01.bin
-nvidia/tu102/gsp/booter_unload-570.144.bin
-nvidia/tu102/gsp/bootloader-570.144.bin
-nvidia/tu102/gsp/gsp-570.144.bin
-nvidia/tu102/gsp/gsp-535.113.01.bin
-nvidia/tu102/gsp/booter_load-570.144.bin
-nvidia/tu102/sec2/sig.bin
-nvidia/tu102/sec2/image.bin
-nvidia/tu102/sec2/desc.bin
-nvidia/tu102/acr/ucode_ahesasc.bin
-nvidia/tu102/acr/ucode_asb.bin
-nvidia/tu102/acr/bl.bin
-nvidia/tu102/acr/ucode_unload.bin
-nvidia/tu102/acr/unload_bl.bin
-nvidia/tu102/nvdec/scrubber.bin
-nvidia/gp102/gr/gpccs_data.bin
-nvidia/gp102/gr/sw_ctx.bin
-nvidia/gp102/gr/fecs_inst.bin
-nvidia/gp102/gr/fecs_sig.bin
-nvidia/gp102/gr/fecs_bl.bin
-nvidia/gp102/gr/fecs_data.bin
-nvidia/gp102/gr/sw_bundle_init.bin
-nvidia/gp102/gr/gpccs_inst.bin
-nvidia/gp102/gr/sw_nonctx.bin
-nvidia/gp102/gr/sw_method_init.bin
-nvidia/gp102/gr/gpccs_sig.bin
-nvidia/gp102/gr/gpccs_bl.bin
-nvidia/gp102/sec2/sig.bin
-nvidia/gp102/sec2/sig-1.bin
-nvidia/gp102/sec2/image.bin
-nvidia/gp102/sec2/desc.bin
-nvidia/gp102/sec2/image-1.bin
-nvidia/gp102/sec2/desc-1.bin
-nvidia/gp102/acr/ucode_load.bin
-nvidia/gp102/acr/bl.bin
-nvidia/gp102/acr/ucode_unload.bin
-nvidia/gp102/acr/unload_bl.bin
-nvidia/gp102/nvdec/scrubber.bin
-nvidia/gp104/gr/gpccs_data.bin
-nvidia/gp104/gr/sw_ctx.bin
-nvidia/gp104/gr/fecs_inst.bin
-nvidia/gp104/gr/fecs_sig.bin
-nvidia/gp104/gr/fecs_bl.bin
-nvidia/gp104/gr/fecs_data.bin
-nvidia/gp104/gr/sw_bundle_init.bin
-nvidia/gp104/gr/gpccs_inst.bin
-nvidia/gp104/gr/sw_nonctx.bin
-nvidia/gp104/gr/sw_method_init.bin
-nvidia/gp104/gr/gpccs_sig.bin
-nvidia/gp104/gr/gpccs_bl.bin
-nvidia/gp104/sec2/sig.bin
-nvidia/gp104/sec2/sig-1.bin
-nvidia/gp104/sec2/image.bin
-nvidia/gp104/sec2/desc.bin
-nvidia/gp104/sec2/image-1.bin
-nvidia/gp104/sec2/desc-1.bin
-nvidia/gp104/acr/ucode_load.bin
-nvidia/gp104/acr/bl.bin
-nvidia/gp104/acr/ucode_unload.bin
-nvidia/gp104/acr/unload_bl.bin
-nvidia/gp104/nvdec/scrubber.bin
-nvidia/ga102/gr/NET_img.bin
-nvidia/ga102/gr/fecs_sig.bin
-nvidia/ga102/gr/fecs_bl.bin
-nvidia/ga102/gr/gpccs_sig.bin
-nvidia/ga102/gr/gpccs_bl.bin
-nvidia/ga102/gsp/booter_load-535.113.01.bin
-nvidia/ga102/gsp/booter_unload-535.113.01.bin
-nvidia/ga102/gsp/bootloader-535.113.01.bin
-nvidia/ga102/gsp/booter_unload-570.144.bin
-nvidia/ga102/gsp/bootloader-570.144.bin
-nvidia/ga102/gsp/gsp-570.144.bin
-nvidia/ga102/gsp/gsp-535.113.01.bin
-nvidia/ga102/gsp/booter_load-570.144.bin
-nvidia/ga102/sec2/sig.bin
-nvidia/ga102/sec2/hs_bl_sig.bin
-nvidia/ga102/sec2/image.bin
-nvidia/ga102/sec2/desc.bin
-nvidia/ga102/acr/ucode_ahesasc.bin
-nvidia/ga102/acr/ucode_asb.bin
-nvidia/ga102/acr/ucode_unload.bin
-nvidia/ga102/nvdec/scrubber.bin
-nvidia/tegra124/xusb.bin
-nvidia/tegra124/vic.bin
-nvidia/tegra124/vic03_ucode.bin
-nvidia/gm200/gr/gpccs_data.bin
-nvidia/gm200/gr/sw_ctx.bin
-nvidia/gm200/gr/fecs_inst.bin
-nvidia/gm200/gr/fecs_sig.bin
-nvidia/gm200/gr/fecs_bl.bin
-nvidia/gm200/gr/fecs_data.bin
-nvidia/gm200/gr/sw_bundle_init.bin
-nvidia/gm200/gr/gpccs_inst.bin
-nvidia/gm200/gr/sw_nonctx.bin
-nvidia/gm200/gr/sw_method_init.bin
-nvidia/gm200/gr/gpccs_sig.bin
-nvidia/gm200/gr/gpccs_bl.bin
-nvidia/gm200/acr/ucode_load.bin
-nvidia/gm200/acr/bl.bin
-nvidia/gm200/acr/ucode_unload.bin
-nvidia/tu116/gr/gpccs_data.bin
-nvidia/tu116/gr/sw_veid_bundle_init.bin
-nvidia/tu116/gr/sw_ctx.bin
-nvidia/tu116/gr/fecs_inst.bin
-nvidia/tu116/gr/fecs_sig.bin
-nvidia/tu116/gr/fecs_bl.bin
-nvidia/tu116/gr/fecs_data.bin
-nvidia/tu116/gr/sw_bundle_init.bin
-nvidia/tu116/gr/gpccs_inst.bin
-nvidia/tu116/gr/sw_nonctx.bin
-nvidia/tu116/gr/sw_method_init.bin
-nvidia/tu116/gr/gpccs_sig.bin
-nvidia/tu116/gr/gpccs_bl.bin
-nvidia/tu116/gsp/booter_load-535.113.01.bin
-nvidia/tu116/gsp/booter_unload-535.113.01.bin
-nvidia/tu116/gsp/bootloader-535.113.01.bin
-nvidia/tu116/gsp/booter_unload-570.144.bin
-nvidia/tu116/gsp/bootloader-570.144.bin
-nvidia/tu116/gsp/gsp-570.144.bin
-nvidia/tu116/gsp/gsp-535.113.01.bin
-nvidia/tu116/gsp/booter_load-570.144.bin
-nvidia/tu116/sec2/sig.bin
-nvidia/tu116/sec2/image.bin
-nvidia/tu116/sec2/desc.bin
-nvidia/tu116/acr/ucode_ahesasc.bin
-nvidia/tu116/acr/ucode_asb.bin
-nvidia/tu116/acr/bl.bin
-nvidia/tu116/acr/ucode_unload.bin
-nvidia/tu116/acr/unload_bl.bin
-nvidia/tu116/nvdec/scrubber.bin
-nvidia/gb207
-nvidia/gp108/gr/gpccs_data.bin
-nvidia/gp108/gr/sw_ctx.bin
-nvidia/gp108/gr/fecs_inst.bin
-nvidia/gp108/gr/fecs_sig.bin
-nvidia/gp108/gr/fecs_bl.bin
-nvidia/gp108/gr/fecs_data.bin
-nvidia/gp108/gr/sw_bundle_init.bin
-nvidia/gp108/gr/gpccs_inst.bin
-nvidia/gp108/gr/sw_nonctx.bin
-nvidia/gp108/gr/sw_method_init.bin
-nvidia/gp108/gr/gpccs_sig.bin
-nvidia/gp108/gr/gpccs_bl.bin
-nvidia/gp108/sec2/sig.bin
-nvidia/gp108/sec2/image.bin
-nvidia/gp108/sec2/desc.bin
-nvidia/gp108/acr/ucode_load.bin
-nvidia/gp108/acr/bl.bin
-nvidia/gp108/acr/ucode_unload.bin
-nvidia/gp108/acr/unload_bl.bin
-nvidia/gp108/nvdec/scrubber.bin
-nvidia/gp106/gr/gpccs_data.bin
-nvidia/gp106/gr/sw_ctx.bin
-nvidia/gp106/gr/fecs_inst.bin
-nvidia/gp106/gr/fecs_sig.bin
-nvidia/gp106/gr/fecs_bl.bin
-nvidia/gp106/gr/fecs_data.bin
-nvidia/gp106/gr/sw_bundle_init.bin
-nvidia/gp106/gr/gpccs_inst.bin
-nvidia/gp106/gr/sw_nonctx.bin
-nvidia/gp106/gr/sw_method_init.bin
-nvidia/gp106/gr/gpccs_sig.bin
-nvidia/gp106/gr/gpccs_bl.bin
-nvidia/gp106/sec2/sig.bin
-nvidia/gp106/sec2/sig-1.bin
-nvidia/gp106/sec2/image.bin
-nvidia/gp106/sec2/desc.bin
-nvidia/gp106/sec2/image-1.bin
-nvidia/gp106/sec2/desc-1.bin
-nvidia/gp106/acr/ucode_load.bin
-nvidia/gp106/acr/bl.bin
-nvidia/gp106/acr/ucode_unload.bin
-nvidia/gp106/acr/unload_bl.bin
-nvidia/gp106/nvdec/scrubber.bin
-nvidia/gb203
-nvidia/ad106
+netronome/nic_AMDA0097-0001_2x40.nffw
+netronome/nic/nic_AMDA0078-0011_1x100.nffw
+netronome/nic/nic_AMDA0097-0001_8x10.nffw
+netronome/nic/nic_AMDA0099-0001_2x10.nffw
+netronome/nic/nic_AMDA0099-0001_2x25.nffw
+netronome/nic/nic_AMDA0099-0001_1x10_1x25.nffw
+netronome/nic/nic_AMDA0058-0011_2x40.nffw
+netronome/nic/nic_AMDA0097-0001_4x10_1x40.nffw
+netronome/nic/nic_AMDA0097-0001_2x40.nffw
+netronome/nic/nic_AMDA0096-0001_2x10.nffw
+netronome/nic/nic_AMDA0081-0001_1x40.nffw
+netronome/nic/nic_AMDA0058-0012_2x40.nffw
+netronome/nic/nic_AMDA0081-0001_4x10.nffw
+netronome/nic_AMDA0096-0001_2x10.nffw
+netronome/nic_AMDA0081-0001_1x40.nffw
+netronome/nic_AMDA0058-0012_2x40.nffw
+netronome/flower/nic_AMDA0078-0011_1x100.nffw
+netronome/flower/nic_AMDA0097-0001_8x10.nffw
+netronome/flower/nic_AMDA0099-0001_2x10.nffw
+netronome/flower/nic_AMDA0058.nffw
+netronome/flower/nic_AMDA0099-0001_2x25.nffw
+netronome/flower/nic_AMDA0078-0011_2x40.nffw
+netronome/flower/nic_AMDA0058-0012_1x100.nffw
+netronome/flower/nic_AMDA0096.nffw
+netronome/flower/nic_AMDA0078-0012_1x100.nffw
+netronome/flower/nic_AMDA0058-0011_8x10.nffw
+netronome/flower/nic_AMDA0099-0001_1x10_1x25.nffw
+netronome/flower/nic_AMDA0099.nffw
+netronome/flower/nic_AMDA0078-0012_2x40.nffw
+netronome/flower/nic_AMDA0058-0011_2x40.nffw
+netronome/flower/nic_AMDA0097-0001_4x10_1x40.nffw
+netronome/flower/nic_AMDA0058-0011_4x10_1x40.nffw
+netronome/flower/nic_AMDA0078-0012_8x10.nffw
+netronome/flower/nic_AMDA0097-0001_2x40.nffw
+netronome/flower/nic_AMDA0081.nffw
+netronome/flower/nic_AMDA0058-0012_8x10.nffw
+netronome/flower/nic_AMDA0096-0001_2x10.nffw
+netronome/flower/nic_AMDA0081-0001_1x40.nffw
+netronome/flower/nic_AMDA0097.nffw
+netronome/flower/nic_AMDA0058-0012_2x40.nffw
+netronome/flower/nic_AMDA0058-0012_4x10_1x40.nffw
+netronome/flower/nic_AMDA0078-0011_4x10_1x40.nffw
+netronome/flower/nic_AMDA0081-0001_4x10.nffw
+netronome/flower/nic_AMDA0058-0011_1x100.nffw
+netronome/flower/nic_AMDA0078-0011_8x10.nffw
+netronome/flower/nic_AMDA0078-0012_4x10_1x40.nffw
+netronome/bpf/nic_AMDA0078-0011_1x100.nffw
+netronome/bpf/nic_AMDA0097-0001_8x10.nffw
+netronome/bpf/nic_AMDA0099-0001_2x10.nffw
+netronome/bpf/nic_AMDA0099-0001_2x25.nffw
+netronome/bpf/nic_AMDA0099-0001_1x10_1x25.nffw
+netronome/bpf/nic_AMDA0058-0011_2x40.nffw
+netronome/bpf/nic_AMDA0097-0001_4x10_1x40.nffw
+netronome/bpf/nic_AMDA0097-0001_2x40.nffw
+netronome/bpf/nic_AMDA0096-0001_2x10.nffw
+netronome/bpf/nic_AMDA0081-0001_1x40.nffw
+netronome/bpf/nic_AMDA0058-0012_2x40.nffw
+netronome/bpf/nic_AMDA0081-0001_4x10.nffw
+netronome/nic_AMDA0081-0001_4x10.nffw
 nvidia/tu10x/typec/ccg_primary.cyacd
 nvidia/tu10x/typec/ccg_boot.cyacd
 nvidia/tu10x/typec/ccg_secondary.cyacd
-nvidia/gb205
-nvidia/ga104/gr/NET_img.bin
-nvidia/ga104/gr/fecs_sig.bin
-nvidia/ga104/gr/fecs_bl.bin
-nvidia/ga104/gr/gpccs_sig.bin
-nvidia/ga104/gr/gpccs_bl.bin
-nvidia/ga104/gsp
-nvidia/ga104/sec2/sig.bin
-nvidia/ga104/sec2/hs_bl_sig.bin
-nvidia/ga104/sec2/image.bin
-nvidia/ga104/sec2/desc.bin
-nvidia/ga104/acr/ucode_ahesasc.bin
-nvidia/ga104/acr/ucode_asb.bin
-nvidia/ga104/acr/ucode_unload.bin
-nvidia/ga104/nvdec/scrubber.bin
-nvidia/gk20a/gpccs_data.bin
-nvidia/gk20a/sw_ctx.bin
-nvidia/gk20a/fecs_inst.bin
-nvidia/gk20a/fecs_data.bin
-nvidia/gk20a/sw_bundle_init.bin
-nvidia/gk20a/gpccs_inst.bin
-nvidia/gk20a/sw_nonctx.bin
-nvidia/gk20a/sw_method_init.bin
-nvidia/tu106/gr/gpccs_data.bin
-nvidia/tu106/gr/sw_veid_bundle_init.bin
-nvidia/tu106/gr/sw_ctx.bin
-nvidia/tu106/gr/fecs_inst.bin
-nvidia/tu106/gr/fecs_sig.bin
-nvidia/tu106/gr/fecs_bl.bin
-nvidia/tu106/gr/fecs_data.bin
-nvidia/tu106/gr/sw_bundle_init.bin
-nvidia/tu106/gr/gpccs_inst.bin
-nvidia/tu106/gr/sw_nonctx.bin
-nvidia/tu106/gr/sw_method_init.bin
-nvidia/tu106/gr/gpccs_sig.bin
-nvidia/tu106/gr/gpccs_bl.bin
-nvidia/tu106/gsp
-nvidia/tu106/sec2/sig.bin
-nvidia/tu106/sec2/image.bin
-nvidia/tu106/sec2/desc.bin
-nvidia/tu106/acr/ucode_ahesasc.bin
-nvidia/tu106/acr/ucode_asb.bin
-nvidia/tu106/acr/bl.bin
-nvidia/tu106/acr/ucode_unload.bin
-nvidia/tu106/acr/unload_bl.bin
-nvidia/tu106/nvdec/scrubber.bin
-nvidia/tegra194/xusb.bin
-nvidia/tegra194/vic.bin
-nvidia/ga106/gr/NET_img.bin
-nvidia/ga106/gr/fecs_sig.bin
-nvidia/ga106/gr/fecs_bl.bin
-nvidia/ga106/gr/gpccs_sig.bin
-nvidia/ga106/gr/gpccs_bl.bin
-nvidia/ga106/gsp
-nvidia/ga106/sec2/sig.bin
-nvidia/ga106/sec2/hs_bl_sig.bin
-nvidia/ga106/sec2/image.bin
-nvidia/ga106/sec2/desc.bin
-nvidia/ga106/acr/ucode_ahesasc.bin
-nvidia/ga106/acr/ucode_asb.bin
-nvidia/ga106/acr/ucode_unload.bin
-nvidia/ga106/nvdec/scrubber.bin
-nvidia/ad103
-nvidia/ga103/gr/NET_img.bin
-nvidia/ga103/gr/fecs_sig.bin
-nvidia/ga103/gr/fecs_bl.bin
-nvidia/ga103/gr/gpccs_sig.bin
-nvidia/ga103/gr/gpccs_bl.bin
-nvidia/ga103/gsp
-nvidia/ga103/sec2/sig.bin
-nvidia/ga103/sec2/hs_bl_sig.bin
-nvidia/ga103/sec2/image.bin
-nvidia/ga103/sec2/desc.bin
-nvidia/ga103/acr/ucode_ahesasc.bin
-nvidia/ga103/acr/ucode_asb.bin
-nvidia/ga103/acr/ucode_unload.bin
-nvidia/ga103/nvdec/scrubber.bin
-nvidia/gb202/gsp/fmc-570.144.bin
-nvidia/gb202/gsp/bootloader-570.144.bin
-nvidia/gb202/gsp/gsp-570.144.bin
-nvidia/ad102/gsp/booter_load-535.113.01.bin
-nvidia/ad102/gsp/booter_unload-535.113.01.bin
-nvidia/ad102/gsp/bootloader-535.113.01.bin
-nvidia/ad102/gsp/booter_unload-570.144.bin
-nvidia/ad102/gsp/scrubber-570.144.bin
-nvidia/ad102/gsp/bootloader-570.144.bin
-nvidia/ad102/gsp/gsp-570.144.bin
-nvidia/ad102/gsp/gsp-535.113.01.bin
-nvidia/ad102/gsp/booter_load-570.144.bin
-nvidia/ad107
-nvidia/gm20b/gr/gpccs_data.bin
-nvidia/gm20b/gr/sw_ctx.bin
-nvidia/gm20b/gr/fecs_inst.bin
-nvidia/gm20b/gr/fecs_sig.bin
-nvidia/gm20b/gr/fecs_bl.bin
-nvidia/gm20b/gr/fecs_data.bin
-nvidia/gm20b/gr/sw_bundle_init.bin
-nvidia/gm20b/gr/gpccs_inst.bin
-nvidia/gm20b/gr/sw_nonctx.bin
-nvidia/gm20b/gr/sw_method_init.bin
-nvidia/gm20b/acr/ucode_load.bin
-nvidia/gm20b/acr/bl.bin
-nvidia/gm20b/pmu/sig.bin
-nvidia/gm20b/pmu/image.bin
-nvidia/gm20b/pmu/desc.bin
+nvidia/ad104
+nvidia/ad106
+nvidia/tu102/sec2/desc.bin
+nvidia/tu102/sec2/image.bin
+nvidia/tu102/sec2/sig.bin
+nvidia/tu102/gr/sw_method_init.bin
+nvidia/tu102/gr/gpccs_sig.bin
+nvidia/tu102/gr/sw_nonctx.bin
+nvidia/tu102/gr/fecs_sig.bin
+nvidia/tu102/gr/gpccs_inst.bin
+nvidia/tu102/gr/gpccs_bl.bin
+nvidia/tu102/gr/gpccs_data.bin
+nvidia/tu102/gr/fecs_bl.bin
+nvidia/tu102/gr/fecs_inst.bin
+nvidia/tu102/gr/sw_ctx.bin
+nvidia/tu102/gr/sw_bundle_init.bin
+nvidia/tu102/gr/sw_veid_bundle_init.bin
+nvidia/tu102/gr/fecs_data.bin
+nvidia/tu102/nvdec/scrubber.bin
+nvidia/tu102/gsp/booter_unload-570.144.bin
+nvidia/tu102/gsp/booter_load-570.144.bin
+nvidia/tu102/gsp/gsp-570.144.bin
+nvidia/tu102/gsp/gsp-535.113.01.bin
+nvidia/tu102/gsp/bootloader-570.144.bin
+nvidia/tu102/gsp/booter_load-535.113.01.bin
+nvidia/tu102/gsp/bootloader-535.113.01.bin
+nvidia/tu102/gsp/booter_unload-535.113.01.bin
+nvidia/tu102/acr/ucode_ahesasc.bin
+nvidia/tu102/acr/ucode_unload.bin
+nvidia/tu102/acr/unload_bl.bin
+nvidia/tu102/acr/bl.bin
+nvidia/tu102/acr/ucode_asb.bin
+nvidia/tegra186/xusb.bin
+nvidia/tegra186/vic.bin
+nvidia/tegra186/vic04_ucode.bin
+nvidia/gb100/gsp/gsp-570.144.bin
 nvidia/gb100/gsp/fmc-570.144.bin
 nvidia/gb100/gsp/bootloader-570.144.bin
-nvidia/gb100/gsp/gsp-570.144.bin
-nvidia/ga107/gr/NET_img.bin
-nvidia/ga107/gr/fecs_sig.bin
-nvidia/ga107/gr/fecs_bl.bin
-nvidia/ga107/gr/gpccs_sig.bin
-nvidia/ga107/gr/gpccs_bl.bin
-nvidia/ga107/gsp
-nvidia/ga107/sec2/sig.bin
-nvidia/ga107/sec2/hs_bl_sig.bin
-nvidia/ga107/sec2/image.bin
-nvidia/ga107/sec2/desc.bin
-nvidia/ga107/acr/ucode_ahesasc.bin
-nvidia/ga107/acr/ucode_asb.bin
-nvidia/ga107/acr/ucode_unload.bin
-nvidia/ga107/nvdec/scrubber.bin
-nvidia/gh100/gsp/fmc-570.144.bin
-nvidia/gh100/gsp/bootloader-570.144.bin
-nvidia/gh100/gsp/gsp-570.144.bin
+nvidia/gb202/gsp/gsp-570.144.bin
+nvidia/gb202/gsp/fmc-570.144.bin
+nvidia/gb202/gsp/bootloader-570.144.bin
+nvidia/gp102/sec2/sig-1.bin
+nvidia/gp102/sec2/desc.bin
+nvidia/gp102/sec2/image.bin
+nvidia/gp102/sec2/sig.bin
+nvidia/gp102/sec2/image-1.bin
+nvidia/gp102/sec2/desc-1.bin
+nvidia/gp102/gr/sw_method_init.bin
+nvidia/gp102/gr/gpccs_sig.bin
+nvidia/gp102/gr/sw_nonctx.bin
+nvidia/gp102/gr/fecs_sig.bin
+nvidia/gp102/gr/gpccs_inst.bin
+nvidia/gp102/gr/gpccs_bl.bin
+nvidia/gp102/gr/gpccs_data.bin
+nvidia/gp102/gr/fecs_bl.bin
+nvidia/gp102/gr/fecs_inst.bin
+nvidia/gp102/gr/sw_ctx.bin
+nvidia/gp102/gr/sw_bundle_init.bin
+nvidia/gp102/gr/fecs_data.bin
+nvidia/gp102/nvdec/scrubber.bin
+nvidia/gp102/acr/ucode_unload.bin
+nvidia/gp102/acr/unload_bl.bin
+nvidia/gp102/acr/bl.bin
+nvidia/gp102/acr/ucode_load.bin
+nvidia/gp104/sec2/sig-1.bin
+nvidia/gp104/sec2/desc.bin
+nvidia/gp104/sec2/image.bin
+nvidia/gp104/sec2/sig.bin
+nvidia/gp104/sec2/image-1.bin
+nvidia/gp104/sec2/desc-1.bin
+nvidia/gp104/gr/sw_method_init.bin
+nvidia/gp104/gr/gpccs_sig.bin
+nvidia/gp104/gr/sw_nonctx.bin
+nvidia/gp104/gr/fecs_sig.bin
+nvidia/gp104/gr/gpccs_inst.bin
+nvidia/gp104/gr/gpccs_bl.bin
+nvidia/gp104/gr/gpccs_data.bin
+nvidia/gp104/gr/fecs_bl.bin
+nvidia/gp104/gr/fecs_inst.bin
+nvidia/gp104/gr/sw_ctx.bin
+nvidia/gp104/gr/sw_bundle_init.bin
+nvidia/gp104/gr/fecs_data.bin
+nvidia/gp104/nvdec/scrubber.bin
+nvidia/gp104/acr/ucode_unload.bin
+nvidia/gp104/acr/unload_bl.bin
+nvidia/gp104/acr/bl.bin
+nvidia/gp104/acr/ucode_load.bin
+nvidia/ga104/sec2/desc.bin
+nvidia/ga104/sec2/image.bin
+nvidia/ga104/sec2/sig.bin
+nvidia/ga104/sec2/hs_bl_sig.bin
+nvidia/ga104/gr/gpccs_sig.bin
+nvidia/ga104/gr/fecs_sig.bin
+nvidia/ga104/gr/gpccs_bl.bin
+nvidia/ga104/gr/NET_img.bin
+nvidia/ga104/gr/fecs_bl.bin
+nvidia/ga104/nvdec/scrubber.bin
+nvidia/ga104/gsp
+nvidia/ga104/acr/ucode_ahesasc.bin
+nvidia/ga104/acr/ucode_unload.bin
+nvidia/ga104/acr/ucode_asb.bin
+nvidia/gb205
+nvidia/gm200/gr/sw_method_init.bin
+nvidia/gm200/gr/gpccs_sig.bin
+nvidia/gm200/gr/sw_nonctx.bin
+nvidia/gm200/gr/fecs_sig.bin
+nvidia/gm200/gr/gpccs_inst.bin
+nvidia/gm200/gr/gpccs_bl.bin
+nvidia/gm200/gr/gpccs_data.bin
+nvidia/gm200/gr/fecs_bl.bin
+nvidia/gm200/gr/fecs_inst.bin
+nvidia/gm200/gr/sw_ctx.bin
+nvidia/gm200/gr/sw_bundle_init.bin
+nvidia/gm200/gr/fecs_data.bin
+nvidia/gm200/acr/ucode_unload.bin
+nvidia/gm200/acr/bl.bin
+nvidia/gm200/acr/ucode_load.bin
+nvidia/ga102/sec2/desc.bin
+nvidia/ga102/sec2/image.bin
+nvidia/ga102/sec2/sig.bin
+nvidia/ga102/sec2/hs_bl_sig.bin
+nvidia/ga102/gr/gpccs_sig.bin
+nvidia/ga102/gr/fecs_sig.bin
+nvidia/ga102/gr/gpccs_bl.bin
+nvidia/ga102/gr/NET_img.bin
+nvidia/ga102/gr/fecs_bl.bin
+nvidia/ga102/nvdec/scrubber.bin
+nvidia/ga102/gsp/booter_unload-570.144.bin
+nvidia/ga102/gsp/booter_load-570.144.bin
+nvidia/ga102/gsp/gsp-570.144.bin
+nvidia/ga102/gsp/gsp-535.113.01.bin
+nvidia/ga102/gsp/bootloader-570.144.bin
+nvidia/ga102/gsp/booter_load-535.113.01.bin
+nvidia/ga102/gsp/bootloader-535.113.01.bin
+nvidia/ga102/gsp/booter_unload-535.113.01.bin
+nvidia/ga102/acr/ucode_ahesasc.bin
+nvidia/ga102/acr/ucode_unload.bin
+nvidia/ga102/acr/ucode_asb.bin
 nvidia/gb206
-nvidia/tu117/gr/gpccs_data.bin
-nvidia/tu117/gr/sw_veid_bundle_init.bin
-nvidia/tu117/gr/sw_ctx.bin
-nvidia/tu117/gr/fecs_inst.bin
-nvidia/tu117/gr/fecs_sig.bin
-nvidia/tu117/gr/fecs_bl.bin
-nvidia/tu117/gr/fecs_data.bin
-nvidia/tu117/gr/sw_bundle_init.bin
-nvidia/tu117/gr/gpccs_inst.bin
-nvidia/tu117/gr/sw_nonctx.bin
-nvidia/tu117/gr/sw_method_init.bin
-nvidia/tu117/gr/gpccs_sig.bin
-nvidia/tu117/gr/gpccs_bl.bin
-nvidia/tu117/gsp
-nvidia/tu117/sec2/sig.bin
-nvidia/tu117/sec2/image.bin
-nvidia/tu117/sec2/desc.bin
-nvidia/tu117/acr/ucode_ahesasc.bin
-nvidia/tu117/acr/ucode_asb.bin
-nvidia/tu117/acr/bl.bin
-nvidia/tu117/acr/ucode_unload.bin
-nvidia/tu117/acr/unload_bl.bin
-nvidia/tu117/nvdec/scrubber.bin
-nvidia/ga100/gsp/booter_load-535.113.01.bin
-nvidia/ga100/gsp/booter_unload-535.113.01.bin
-nvidia/ga100/gsp/bootloader-535.113.01.bin
 nvidia/ga100/gsp/booter_unload-570.144.bin
-nvidia/ga100/gsp/bootloader-570.144.bin
+nvidia/ga100/gsp/booter_load-570.144.bin
 nvidia/ga100/gsp/gsp-570.144.bin
 nvidia/ga100/gsp/gsp-535.113.01.bin
-nvidia/ga100/gsp/booter_load-570.144.bin
-nvidia/gm206/gr/gpccs_data.bin
-nvidia/gm206/gr/sw_ctx.bin
-nvidia/gm206/gr/fecs_inst.bin
-nvidia/gm206/gr/fecs_sig.bin
-nvidia/gm206/gr/fecs_bl.bin
-nvidia/gm206/gr/fecs_data.bin
-nvidia/gm206/gr/sw_bundle_init.bin
-nvidia/gm206/gr/gpccs_inst.bin
-nvidia/gm206/gr/sw_nonctx.bin
+nvidia/ga100/gsp/bootloader-570.144.bin
+nvidia/ga100/gsp/booter_load-535.113.01.bin
+nvidia/ga100/gsp/bootloader-535.113.01.bin
+nvidia/ga100/gsp/booter_unload-535.113.01.bin
+nvidia/tu104/sec2/desc.bin
+nvidia/tu104/sec2/image.bin
+nvidia/tu104/sec2/sig.bin
+nvidia/tu104/gr/sw_method_init.bin
+nvidia/tu104/gr/gpccs_sig.bin
+nvidia/tu104/gr/sw_nonctx.bin
+nvidia/tu104/gr/fecs_sig.bin
+nvidia/tu104/gr/gpccs_inst.bin
+nvidia/tu104/gr/gpccs_bl.bin
+nvidia/tu104/gr/gpccs_data.bin
+nvidia/tu104/gr/fecs_bl.bin
+nvidia/tu104/gr/fecs_inst.bin
+nvidia/tu104/gr/sw_ctx.bin
+nvidia/tu104/gr/sw_bundle_init.bin
+nvidia/tu104/gr/sw_veid_bundle_init.bin
+nvidia/tu104/gr/fecs_data.bin
+nvidia/tu104/nvdec/scrubber.bin
+nvidia/tu104/gsp
+nvidia/tu104/acr/ucode_ahesasc.bin
+nvidia/tu104/acr/ucode_unload.bin
+nvidia/tu104/acr/unload_bl.bin
+nvidia/tu104/acr/bl.bin
+nvidia/tu104/acr/ucode_asb.bin
 nvidia/gm206/gr/sw_method_init.bin
 nvidia/gm206/gr/gpccs_sig.bin
+nvidia/gm206/gr/sw_nonctx.bin
+nvidia/gm206/gr/fecs_sig.bin
+nvidia/gm206/gr/gpccs_inst.bin
 nvidia/gm206/gr/gpccs_bl.bin
-nvidia/gm206/acr/ucode_load.bin
-nvidia/gm206/acr/bl.bin
+nvidia/gm206/gr/gpccs_data.bin
+nvidia/gm206/gr/fecs_bl.bin
+nvidia/gm206/gr/fecs_inst.bin
+nvidia/gm206/gr/sw_ctx.bin
+nvidia/gm206/gr/sw_bundle_init.bin
+nvidia/gm206/gr/fecs_data.bin
 nvidia/gm206/acr/ucode_unload.bin
-nxp/uartuart8997_bt_v4.bin
-nxp/uartuart9098_bt_v1.bin
-nxp/helper_uart_3000000.bin
+nvidia/gm206/acr/bl.bin
+nvidia/gm206/acr/ucode_load.bin
+nvidia/gm20b/gr/sw_method_init.bin
+nvidia/gm20b/gr/sw_nonctx.bin
+nvidia/gm20b/gr/fecs_sig.bin
+nvidia/gm20b/gr/gpccs_inst.bin
+nvidia/gm20b/gr/gpccs_data.bin
+nvidia/gm20b/gr/fecs_bl.bin
+nvidia/gm20b/gr/fecs_inst.bin
+nvidia/gm20b/gr/sw_ctx.bin
+nvidia/gm20b/gr/sw_bundle_init.bin
+nvidia/gm20b/gr/fecs_data.bin
+nvidia/gm20b/pmu/desc.bin
+nvidia/gm20b/pmu/image.bin
+nvidia/gm20b/pmu/sig.bin
+nvidia/gm20b/acr/bl.bin
+nvidia/gm20b/acr/ucode_load.bin
+nvidia/gh100/gsp/gsp-570.144.bin
+nvidia/gh100/gsp/fmc-570.144.bin
+nvidia/gh100/gsp/bootloader-570.144.bin
+nvidia/gp107/sec2/sig-1.bin
+nvidia/gp107/sec2/desc.bin
+nvidia/gp107/sec2/image.bin
+nvidia/gp107/sec2/sig.bin
+nvidia/gp107/sec2/image-1.bin
+nvidia/gp107/sec2/desc-1.bin
+nvidia/gp107/gr/sw_method_init.bin
+nvidia/gp107/gr/gpccs_sig.bin
+nvidia/gp107/gr/sw_nonctx.bin
+nvidia/gp107/gr/fecs_sig.bin
+nvidia/gp107/gr/gpccs_inst.bin
+nvidia/gp107/gr/gpccs_bl.bin
+nvidia/gp107/gr/gpccs_data.bin
+nvidia/gp107/gr/fecs_bl.bin
+nvidia/gp107/gr/fecs_inst.bin
+nvidia/gp107/gr/sw_ctx.bin
+nvidia/gp107/gr/sw_bundle_init.bin
+nvidia/gp107/gr/fecs_data.bin
+nvidia/gp107/nvdec/scrubber.bin
+nvidia/gp107/acr/ucode_unload.bin
+nvidia/gp107/acr/unload_bl.bin
+nvidia/gp107/acr/bl.bin
+nvidia/gp107/acr/ucode_load.bin
+nvidia/tu117/sec2/desc.bin
+nvidia/tu117/sec2/image.bin
+nvidia/tu117/sec2/sig.bin
+nvidia/tu117/gr/sw_method_init.bin
+nvidia/tu117/gr/gpccs_sig.bin
+nvidia/tu117/gr/sw_nonctx.bin
+nvidia/tu117/gr/fecs_sig.bin
+nvidia/tu117/gr/gpccs_inst.bin
+nvidia/tu117/gr/gpccs_bl.bin
+nvidia/tu117/gr/gpccs_data.bin
+nvidia/tu117/gr/fecs_bl.bin
+nvidia/tu117/gr/fecs_inst.bin
+nvidia/tu117/gr/sw_ctx.bin
+nvidia/tu117/gr/sw_bundle_init.bin
+nvidia/tu117/gr/sw_veid_bundle_init.bin
+nvidia/tu117/gr/fecs_data.bin
+nvidia/tu117/nvdec/scrubber.bin
+nvidia/tu117/gsp
+nvidia/tu117/acr/ucode_ahesasc.bin
+nvidia/tu117/acr/ucode_unload.bin
+nvidia/tu117/acr/unload_bl.bin
+nvidia/tu117/acr/bl.bin
+nvidia/tu117/acr/ucode_asb.bin
+nvidia/tegra124/vic03_ucode.bin
+nvidia/tegra124/xusb.bin
+nvidia/tegra124/vic.bin
+nvidia/gm204/gr/sw_method_init.bin
+nvidia/gm204/gr/gpccs_sig.bin
+nvidia/gm204/gr/sw_nonctx.bin
+nvidia/gm204/gr/fecs_sig.bin
+nvidia/gm204/gr/gpccs_inst.bin
+nvidia/gm204/gr/gpccs_bl.bin
+nvidia/gm204/gr/gpccs_data.bin
+nvidia/gm204/gr/fecs_bl.bin
+nvidia/gm204/gr/fecs_inst.bin
+nvidia/gm204/gr/sw_ctx.bin
+nvidia/gm204/gr/sw_bundle_init.bin
+nvidia/gm204/gr/fecs_data.bin
+nvidia/gm204/acr/ucode_unload.bin
+nvidia/gm204/acr/bl.bin
+nvidia/gm204/acr/ucode_load.bin
+nvidia/ad107
+nvidia/gb102
+nvidia/gp108/sec2/desc.bin
+nvidia/gp108/sec2/image.bin
+nvidia/gp108/sec2/sig.bin
+nvidia/gp108/gr/sw_method_init.bin
+nvidia/gp108/gr/gpccs_sig.bin
+nvidia/gp108/gr/sw_nonctx.bin
+nvidia/gp108/gr/fecs_sig.bin
+nvidia/gp108/gr/gpccs_inst.bin
+nvidia/gp108/gr/gpccs_bl.bin
+nvidia/gp108/gr/gpccs_data.bin
+nvidia/gp108/gr/fecs_bl.bin
+nvidia/gp108/gr/fecs_inst.bin
+nvidia/gp108/gr/sw_ctx.bin
+nvidia/gp108/gr/sw_bundle_init.bin
+nvidia/gp108/gr/fecs_data.bin
+nvidia/gp108/nvdec/scrubber.bin
+nvidia/gp108/acr/ucode_unload.bin
+nvidia/gp108/acr/unload_bl.bin
+nvidia/gp108/acr/bl.bin
+nvidia/gp108/acr/ucode_load.bin
+nvidia/tegra194/xusb.bin
+nvidia/tegra194/vic.bin
+nvidia/tu106/sec2/desc.bin
+nvidia/tu106/sec2/image.bin
+nvidia/tu106/sec2/sig.bin
+nvidia/tu106/gr/sw_method_init.bin
+nvidia/tu106/gr/gpccs_sig.bin
+nvidia/tu106/gr/sw_nonctx.bin
+nvidia/tu106/gr/fecs_sig.bin
+nvidia/tu106/gr/gpccs_inst.bin
+nvidia/tu106/gr/gpccs_bl.bin
+nvidia/tu106/gr/gpccs_data.bin
+nvidia/tu106/gr/fecs_bl.bin
+nvidia/tu106/gr/fecs_inst.bin
+nvidia/tu106/gr/sw_ctx.bin
+nvidia/tu106/gr/sw_bundle_init.bin
+nvidia/tu106/gr/sw_veid_bundle_init.bin
+nvidia/tu106/gr/fecs_data.bin
+nvidia/tu106/nvdec/scrubber.bin
+nvidia/tu106/gsp
+nvidia/tu106/acr/ucode_ahesasc.bin
+nvidia/tu106/acr/ucode_unload.bin
+nvidia/tu106/acr/unload_bl.bin
+nvidia/tu106/acr/bl.bin
+nvidia/tu106/acr/ucode_asb.bin
+nvidia/gp106/sec2/sig-1.bin
+nvidia/gp106/sec2/desc.bin
+nvidia/gp106/sec2/image.bin
+nvidia/gp106/sec2/sig.bin
+nvidia/gp106/sec2/image-1.bin
+nvidia/gp106/sec2/desc-1.bin
+nvidia/gp106/gr/sw_method_init.bin
+nvidia/gp106/gr/gpccs_sig.bin
+nvidia/gp106/gr/sw_nonctx.bin
+nvidia/gp106/gr/fecs_sig.bin
+nvidia/gp106/gr/gpccs_inst.bin
+nvidia/gp106/gr/gpccs_bl.bin
+nvidia/gp106/gr/gpccs_data.bin
+nvidia/gp106/gr/fecs_bl.bin
+nvidia/gp106/gr/fecs_inst.bin
+nvidia/gp106/gr/sw_ctx.bin
+nvidia/gp106/gr/sw_bundle_init.bin
+nvidia/gp106/gr/fecs_data.bin
+nvidia/gp106/nvdec/scrubber.bin
+nvidia/gp106/acr/ucode_unload.bin
+nvidia/gp106/acr/unload_bl.bin
+nvidia/gp106/acr/bl.bin
+nvidia/gp106/acr/ucode_load.bin
+nvidia/gk20a/sw_method_init.bin
+nvidia/gk20a/sw_nonctx.bin
+nvidia/gk20a/gpccs_inst.bin
+nvidia/gk20a/gpccs_data.bin
+nvidia/gk20a/fecs_inst.bin
+nvidia/gk20a/sw_ctx.bin
+nvidia/gk20a/sw_bundle_init.bin
+nvidia/gk20a/fecs_data.bin
+nvidia/ga103/sec2/desc.bin
+nvidia/ga103/sec2/image.bin
+nvidia/ga103/sec2/sig.bin
+nvidia/ga103/sec2/hs_bl_sig.bin
+nvidia/ga103/gr/gpccs_sig.bin
+nvidia/ga103/gr/fecs_sig.bin
+nvidia/ga103/gr/gpccs_bl.bin
+nvidia/ga103/gr/NET_img.bin
+nvidia/ga103/gr/fecs_bl.bin
+nvidia/ga103/nvdec/scrubber.bin
+nvidia/ga103/gsp
+nvidia/ga103/acr/ucode_ahesasc.bin
+nvidia/ga103/acr/ucode_unload.bin
+nvidia/ga103/acr/ucode_asb.bin
+nvidia/gb207
+nvidia/ad103
+nvidia/ad102/gsp/booter_unload-570.144.bin
+nvidia/ad102/gsp/booter_load-570.144.bin
+nvidia/ad102/gsp/gsp-570.144.bin
+nvidia/ad102/gsp/gsp-535.113.01.bin
+nvidia/ad102/gsp/bootloader-570.144.bin
+nvidia/ad102/gsp/scrubber-570.144.bin
+nvidia/ad102/gsp/booter_load-535.113.01.bin
+nvidia/ad102/gsp/bootloader-535.113.01.bin
+nvidia/ad102/gsp/booter_unload-535.113.01.bin
+nvidia/ga107/sec2/desc.bin
+nvidia/ga107/sec2/image.bin
+nvidia/ga107/sec2/sig.bin
+nvidia/ga107/sec2/hs_bl_sig.bin
+nvidia/ga107/gr/gpccs_sig.bin
+nvidia/ga107/gr/fecs_sig.bin
+nvidia/ga107/gr/gpccs_bl.bin
+nvidia/ga107/gr/NET_img.bin
+nvidia/ga107/gr/fecs_bl.bin
+nvidia/ga107/nvdec/scrubber.bin
+nvidia/ga107/gsp
+nvidia/ga107/acr/ucode_ahesasc.bin
+nvidia/ga107/acr/ucode_unload.bin
+nvidia/ga107/acr/ucode_asb.bin
+nvidia/tegra210/xusb.bin
+nvidia/tegra210/vic.bin
+nvidia/tegra210/vic04_ucode.bin
+nvidia/gb203
+nvidia/gp100/gr/sw_method_init.bin
+nvidia/gp100/gr/gpccs_sig.bin
+nvidia/gp100/gr/sw_nonctx.bin
+nvidia/gp100/gr/fecs_sig.bin
+nvidia/gp100/gr/gpccs_inst.bin
+nvidia/gp100/gr/gpccs_bl.bin
+nvidia/gp100/gr/gpccs_data.bin
+nvidia/gp100/gr/fecs_bl.bin
+nvidia/gp100/gr/fecs_inst.bin
+nvidia/gp100/gr/sw_ctx.bin
+nvidia/gp100/gr/sw_bundle_init.bin
+nvidia/gp100/gr/fecs_data.bin
+nvidia/gp100/acr/ucode_unload.bin
+nvidia/gp100/acr/bl.bin
+nvidia/gp100/acr/ucode_load.bin
+nvidia/ga106/sec2/desc.bin
+nvidia/ga106/sec2/image.bin
+nvidia/ga106/sec2/sig.bin
+nvidia/ga106/sec2/hs_bl_sig.bin
+nvidia/ga106/gr/gpccs_sig.bin
+nvidia/ga106/gr/fecs_sig.bin
+nvidia/ga106/gr/gpccs_bl.bin
+nvidia/ga106/gr/NET_img.bin
+nvidia/ga106/gr/fecs_bl.bin
+nvidia/ga106/nvdec/scrubber.bin
+nvidia/ga106/gsp
+nvidia/ga106/acr/ucode_ahesasc.bin
+nvidia/ga106/acr/ucode_unload.bin
+nvidia/ga106/acr/ucode_asb.bin
+nvidia/gv100/sec2/desc.bin
+nvidia/gv100/sec2/image.bin
+nvidia/gv100/sec2/sig.bin
+nvidia/gv100/gr/sw_method_init.bin
+nvidia/gv100/gr/gpccs_sig.bin
+nvidia/gv100/gr/sw_nonctx.bin
+nvidia/gv100/gr/fecs_sig.bin
+nvidia/gv100/gr/gpccs_inst.bin
+nvidia/gv100/gr/gpccs_bl.bin
+nvidia/gv100/gr/gpccs_data.bin
+nvidia/gv100/gr/fecs_bl.bin
+nvidia/gv100/gr/fecs_inst.bin
+nvidia/gv100/gr/sw_ctx.bin
+nvidia/gv100/gr/sw_bundle_init.bin
+nvidia/gv100/gr/fecs_data.bin
+nvidia/gv100/nvdec/scrubber.bin
+nvidia/gv100/acr/ucode_unload.bin
+nvidia/gv100/acr/unload_bl.bin
+nvidia/gv100/acr/bl.bin
+nvidia/gv100/acr/ucode_load.bin
+nvidia/gp10b/gr/sw_method_init.bin
+nvidia/gp10b/gr/gpccs_sig.bin
+nvidia/gp10b/gr/sw_nonctx.bin
+nvidia/gp10b/gr/fecs_sig.bin
+nvidia/gp10b/gr/gpccs_inst.bin
+nvidia/gp10b/gr/gpccs_bl.bin
+nvidia/gp10b/gr/gpccs_data.bin
+nvidia/gp10b/gr/fecs_bl.bin
+nvidia/gp10b/gr/fecs_inst.bin
+nvidia/gp10b/gr/sw_ctx.bin
+nvidia/gp10b/gr/sw_bundle_init.bin
+nvidia/gp10b/gr/fecs_data.bin
+nvidia/gp10b/pmu/desc.bin
+nvidia/gp10b/pmu/image.bin
+nvidia/gp10b/pmu/sig.bin
+nvidia/gp10b/acr/bl.bin
+nvidia/gp10b/acr/ucode_load.bin
+nvidia/tu116/sec2/desc.bin
+nvidia/tu116/sec2/image.bin
+nvidia/tu116/sec2/sig.bin
+nvidia/tu116/gr/sw_method_init.bin
+nvidia/tu116/gr/gpccs_sig.bin
+nvidia/tu116/gr/sw_nonctx.bin
+nvidia/tu116/gr/fecs_sig.bin
+nvidia/tu116/gr/gpccs_inst.bin
+nvidia/tu116/gr/gpccs_bl.bin
+nvidia/tu116/gr/gpccs_data.bin
+nvidia/tu116/gr/fecs_bl.bin
+nvidia/tu116/gr/fecs_inst.bin
+nvidia/tu116/gr/sw_ctx.bin
+nvidia/tu116/gr/sw_bundle_init.bin
+nvidia/tu116/gr/sw_veid_bundle_init.bin
+nvidia/tu116/gr/fecs_data.bin
+nvidia/tu116/nvdec/scrubber.bin
+nvidia/tu116/gsp/booter_unload-570.144.bin
+nvidia/tu116/gsp/booter_load-570.144.bin
+nvidia/tu116/gsp/gsp-570.144.bin
+nvidia/tu116/gsp/gsp-535.113.01.bin
+nvidia/tu116/gsp/bootloader-570.144.bin
+nvidia/tu116/gsp/booter_load-535.113.01.bin
+nvidia/tu116/gsp/bootloader-535.113.01.bin
+nvidia/tu116/gsp/booter_unload-535.113.01.bin
+nvidia/tu116/acr/ucode_ahesasc.bin
+nvidia/tu116/acr/ucode_unload.bin
+nvidia/tu116/acr/unload_bl.bin
+nvidia/tu116/acr/bl.bin
+nvidia/tu116/acr/ucode_asb.bin
 nxp/uartiw416_bt_v0.bin
+nxp/helper_uart_3000000.bin
+nxp/uartuart8997_bt_v4.bin
 nxp/uartuart8987_bt.bin
 nxp/uartspi_n61x_v1.bin.se
 nxp/sr150_fw.bin
+nxp/uartuart9098_bt_v1.bin
 ositech/Xilinx7OD.bin
 phanfw.bin
-powervr/rogue_36.53.104.796_v1.fw
 powervr/rogue_33.15.11.3_v1.fw
+powervr/rogue_36.53.104.796_v1.fw
 qat_402xx.bin
 qat_402xx_mmp.bin
 qat_420xx.bin
@@ -4048,638 +4048,638 @@ qat_c3xxx_mmp.bin
 qat_c62x.bin
 qat_c62x_mmp.bin
 qat_mmp.bin
-qca/nvm_00130300.bin
-qca/msnv11.b0a
-qca/hpnv21.ba2
-qca/cmbtfw12.tlv
-qca/htbtfw20.tlv
-qca/hpnv21.ba0
-qca/nvm_usb_00130201_010a.bin
-qca/hpnv21g.309
-qca/nvm_usb_00130200_0104.bin
-qca/rampatch_usb_00130200.bin
-qca/rampatch_00230302.bin
-qca/nvm_usb_00190200_0104.bin
-qca/hpnv21.301
-qca/hpnv21g.301
-qca/hpnv21.b111
-qca/hpnv21g.302
-qca/crbtfw32.tlv
-qca/nvm_usb_00130200_0107.bin
-qca/cmnv13s.bin
-qca/hmtbtfw20.tlv
-qca/hpnv21g.baa
-qca/nvm_usb_00190200_0112.bin
-qca/nvm_usb_00130201_010b.bin
-qca/rampatch_00130300.bin
-qca/nvm_usb_00130201_0303.bin
-qca/rampatch_usb_00000300.bin
-qca/hpnv21g.b8c
-qca/crnv32u.bin
-qca/nvm_usb_00190200_010a.bin
-qca/hpbtfw21.tlv
-qca/nvm_usb_00190200_0106.bin
-qca/QCA2066/rampatch_usb_00130201.bin
-qca/QCA2066/nvm_usb_00130201_030a.bin
-qca/QCA2066/nvm_usb_00130201_gf_030a.bin
-qca/crnv21.bin
-qca/nvm_usb_00000201.bin
-qca/hpnv21.bb8
-qca/nvm_00440302.bin
-qca/nvm_usb_00130201.bin
-qca/rampatch_usb_00000201.bin
-qca/hpnv21g.bin
-qca/hpnv21.302
-qca/hpnv21.bin
-qca/nvm_usb_00000302.bin
-qca/crnv32.bin
-qca/rampatch_usb_00130201.bin
-qca/rampatch_00130302.bin
-qca/hpnv21g.b111
-qca/hpnv21g.b9f
-qca/nvm_usb_00190200_0110.bin
-qca/apnv11.bin
-qca/msnv11.b09
-qca/nvm_usb_00190200_0108.bin
-qca/nvm_usb_00000300.bin
-qca/hpnv21.ba3
-qca/nvm_usb_00130200_0106.bin
-qca/hpnv21.ba4
-qca/hpnv21g.ba1
-qca/nvm_usb_00190200.bin
-qca/nvm_usb_00130200_0105.bin
-qca/nvm_usb_00190200_010e.bin
-qca/apbtfw10.tlv
-qca/hpnv21g.ba2
-qca/nvm_usb_00130201_gf_010b.bin
-qca/nvm_00440302_eu.bin
-qca/nvm_usb_00130200_0109.bin
-qca/apnv10.bin
-qca/msbtfw11.tlv
-qca/nvm_usb_00130200.bin
-qca/nvm_usb_00190200_010c.bin
-qca/hpnv21.b8c
-qca/nvm_usb_00190200_0109.bin
-qca/hpnv21.ba1
 qca/msbtfw11.mbn
-qca/nvm_usb_00190200_0111.bin
-qca/nvm_usb_00130201_gf_0303.bin
+qca/nvm_usb_00000300.bin
+qca/hpnv21g.30a
+qca/nvm_usb_00130201_010a.bin
+qca/cmnv13s.bin
+qca/nvm_usb_00000201.bin
 qca/nvm_00130302.bin
-qca/hmtnv20.b112
-qca/rampatch_00440302.bin
-qca/nvm_00440302_i2s_eu.bin
+qca/hpnv21g.301
+qca/nvm_usb_00000200.bin
+qca/hpnv21.b10c
+qca/nvm_usb_00130200_0110.bin
+qca/nvm_usb_00000302_eu.bin
+qca/rampatch_00130302.bin
 qca/QCA6698/hpnv21.b206
+qca/QCA6698/hpnv21.bin
 qca/QCA6698/hpnv21.b207
 qca/QCA6698/hpbtfw21.tlv
-qca/QCA6698/hpnv21.bin
-qca/hpnv21.baa
-qca/hpnv21.309
+qca/nvm_usb_00190200_0110.bin
+qca/nvm_usb_00130201_010b.bin
+qca/rampatch_usb_00190200.bin
+qca/rampatch_00230302.bin
+qca/nvm_00130300.bin
+qca/hpnv21.302
+qca/nvm_usb_00130201.bin
+qca/hpnv21g.b111
+qca/hpnv21.b9f
+qca/cmnv13t.bin
+qca/hmtbtfw20.tlv
+qca/hpnv21g.b9f
+qca/rampatch_00440302.bin
+qca/hpnv21g.302
+qca/rampatch_usb_00000201.bin
 qca/hmtnv20.bin
+qca/hpnv21g.b8c
+qca/nvm_usb_00190200_010c.bin
+qca/hpnv21.bin
+qca/hpnv21.309
+qca/nvm_usb_00190200.bin
+qca/nvm_usb_00130200_0106.bin
+qca/apbtfw11.tlv
+qca/hpnv21.ba3
+qca/nvm_00440302.bin
+qca/nvm_usb_00190200_0109.bin
+qca/hpnv21g.bb8
+qca/apnv10.bin
+qca/hpnv21.b111
+qca/nvm_usb_00130200_0107.bin
+qca/msnv11.b0a
 qca/cmnv13.bin
-qca/msnv11.bin
 qca/nvm_usb_00130201_gf.bin
 qca/rampatch_usb_00000302.bin
-qca/hmtnv20.b10f
-qca/hpnv21g.ba0
-qca/rampatch_usb_00190200.bin
-qca/apbtfw11.tlv
-qca/hpnv21.30a
-qca/hpnv21g.b10c
-qca/hpnv21g.30a
 qca/cmnv12.bin
-qca/hpnv21g.ba4
-qca/rampatch_usb_00000200.bin
-qca/cmnv13t.bin
-qca/nvm_usb_00130201_gf_010a.bin
-qca/hpnv21.b10c
-qca/crbtfw21.tlv
-qca/cmbtfw13.tlv
-qca/nvm_usb_00130200_0110.bin
+qca/rampatch_usb_00000300.bin
+qca/hpnv21g.ba0
 qca/htnv20.bin
-qca/nvm_usb_00000200.bin
-qca/nvm_usb_00000302_eu.bin
+qca/nvm_usb_00130201_gf_0303.bin
+qca/hpbtfw21.tlv
 qca/hpnv21g.ba3
-qca/hpnv21g.bb8
-qca/hpnv21.b9f
+qca/crnv32.bin
+qca/msbtfw11.tlv
+qca/hpnv21g.baa
+qca/nvm_usb_00190200_010e.bin
+qca/hpnv21.ba0
+qca/nvm_usb_00130200.bin
+qca/nvm_usb_00190200_0111.bin
+qca/crbtfw32.tlv
+qca/hpnv21g.ba1
+qca/nvm_usb_00190200_010a.bin
+qca/rampatch_00130300.bin
+qca/hpnv21.baa
+qca/nvm_usb_00190200_0104.bin
+qca/apnv11.bin
+qca/nvm_usb_00130200_0104.bin
+qca/nvm_00440302_eu.bin
+qca/hpnv21g.bin
+qca/rampatch_usb_00000200.bin
+qca/hpnv21g.ba2
+qca/nvm_usb_00190200_0108.bin
+qca/msnv11.b09
+qca/hpnv21.ba1
+qca/crbtfw21.tlv
+qca/hpnv21.301
+qca/hpnv21.ba4
+qca/hpnv21g.ba4
+qca/hmtnv20.b112
+qca/hpnv21.ba2
+qca/crnv32u.bin
+qca/rampatch_usb_00130201.bin
+qca/nvm_usb_00130200_0105.bin
+qca/hpnv21.b8c
+qca/cmbtfw12.tlv
+qca/nvm_usb_00130201_0303.bin
+qca/hpnv21.bb8
+qca/nvm_usb_00190200_0112.bin
+qca/rampatch_usb_00130200.bin
+qca/hmtnv20.b10f
+qca/hpnv21g.b10c
+qca/nvm_usb_00000302.bin
+qca/nvm_usb_00130200_0109.bin
+qca/nvm_usb_00130201_gf_010b.bin
+qca/nvm_usb_00130201_gf_010a.bin
+qca/nvm_00440302_i2s_eu.bin
+qca/cmbtfw13.tlv
 qca/nvm_00230302.bin
-qcom/qrb4210/modemr.jsn
-qcom/qrb4210/adspua.jsn
-qcom/qrb4210/modem.mbn
-qcom/qrb4210/a610_zap.mbn
-qcom/qrb4210/modemuw.jsn
-qcom/qrb4210/wlanmdsp.mbn
-qcom/qrb4210/cdsp.mbn
-qcom/qrb4210/adsp.mbn
-qcom/qrb4210/adspr.jsn
-qcom/qrb4210/adsps.jsn
-qcom/qrb4210/cdspr.jsn
-qcom/a300_pm4.fw
-qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin
-qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
-qcom/sc8280xp/LENOVO/21BX/adspua.jsn
-qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin
-qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
-qcom/sc8280xp/LENOVO/21BX/adspr.jsn
-qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
-qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
-qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
-qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
-qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn
-qcom/a330_pm4.fw
-qcom/a420_pfp.fw
-qcom/sdm845/mba.mbn
-qcom/sdm845/adspua.jsn
-qcom/sdm845/modem.mbn
-qcom/sdm845/a630_zap.mbn
-qcom/sdm845/modemuw.jsn
-qcom/sdm845/wlanmdsp.mbn
-qcom/sdm845/cdsp.mbn
-qcom/sdm845/Thundercomm/db845c/slpi.mbn
-qcom/sdm845/Thundercomm/db845c/slpius.jsn
-qcom/sdm845/Thundercomm/db845c/slpir.jsn
-qcom/sdm845/adsp.mbn
-qcom/sdm845/modem_nm.mbn
-qcom/sdm845/adspr.jsn
-qcom/sdm845/cdspr.jsn
-qcom/a650_sqe.fw
-qcom/gen71500_sqe.fw
-qcom/a663_gmu.bin
-qcom/qcs6490/wpss.mbn
-qcom/qcs6490/adspua.jsn
-qcom/qcs6490/a660_zap.mbn
-qcom/qcs6490/QCS6490-RB3Gen2-tplg.bin
-qcom/qcs6490/cdsp.mbn
-qcom/qcs6490/adsp.mbn
-qcom/qcs6490/adspr.jsn
-qcom/qcs6490/qupv3fw.elf
-qcom/qcs6490/battmgr.jsn
-qcom/qcs6490/adsps.jsn
-qcom/qcs6490/cdspr.jsn
-qcom/a650_gmu.bin
-qcom/venus-5.4/venus_s2.mbn
-qcom/venus-5.4/venus.mdt
-qcom/venus-5.4/venus.mbn
-qcom/gen70500_sqe.fw
-qcom/a612_rgmu.bin
-qcom/qcm6490/wpss.mbn
-qcom/qcm6490/adspua.jsn
-qcom/qcm6490/ipa_fws.mbn
-qcom/qcm6490/a660_zap.mbn
-qcom/qcm6490/cdsp.mbn
-qcom/qcm6490/adsp.mbn
-qcom/qcm6490/adspr.jsn
-qcom/qcm6490/qupv3fw.elf
-qcom/qcm6490/battmgr.jsn
-qcom/qcm6490/adsps.jsn
-qcom/qcm6490/cdspr.jsn
-qcom/sm8350/a660_zap.mbn
-qcom/x1e80100/adspua.jsn
-qcom/x1e80100/X1E80100-LENOVO-Thinkpad-T14s-tplg.bin
-qcom/x1e80100/gen70500_zap.mbn
-qcom/x1e80100/LENOVO/83ED/adspua.jsn
-qcom/x1e80100/LENOVO/83ED/qccdsp8380.mbn
-qcom/x1e80100/LENOVO/83ED/qcadsp8380.mbn
-qcom/x1e80100/LENOVO/83ED/qcvss8380.mbn
-qcom/x1e80100/LENOVO/83ED/qcav1e8380.mbn
-qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn
-qcom/x1e80100/LENOVO/83ED/adspr.jsn
-qcom/x1e80100/LENOVO/83ED/adsp_dtbs.elf
-qcom/x1e80100/LENOVO/83ED/battmgr.jsn
-qcom/x1e80100/LENOVO/83ED/adsps.jsn
-qcom/x1e80100/LENOVO/83ED/X1E80100-LENOVO-Yoga-Slim7x-tplg.bin
-qcom/x1e80100/LENOVO/83ED/cdspr.jsn
-qcom/x1e80100/LENOVO/21N1/cdsp_dtbs.elf
-qcom/x1e80100/LENOVO/21N1/adspua.jsn
-qcom/x1e80100/LENOVO/21N1/X1E80100-LENOVO-Thinkpad-T14s-tplg.bin
-qcom/x1e80100/LENOVO/21N1/qccdsp8380.mbn
-qcom/x1e80100/LENOVO/21N1/qcadsp8380.mbn
-qcom/x1e80100/LENOVO/21N1/qcvss8380.mbn
-qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn
-qcom/x1e80100/LENOVO/21N1/adspr.jsn
-qcom/x1e80100/LENOVO/21N1/adsp_dtbs.elf
-qcom/x1e80100/LENOVO/21N1/battmgr.jsn
-qcom/x1e80100/LENOVO/21N1/adsps.jsn
-qcom/x1e80100/LENOVO/21N1/cdspr.jsn
-qcom/x1e80100/adsp.mbn
-qcom/x1e80100/adspr.jsn
-qcom/x1e80100/adsp_dtb.mbn
-qcom/x1e80100/battmgr.jsn
-qcom/x1e80100/adsps.jsn
-qcom/x1e80100/X1E80100-LENOVO-Yoga-Slim7x-tplg.bin
-qcom/leia_pm4_470.fw
-qcom/a530_pfp.fw
-qcom/a225_pm4.fw
-qcom/qdu100/xbl_config.elf
-qcom/qdu100/efs3.bin
-qcom/qdu100/aop_devcfg.mbn
-qcom/qdu100/efs2.bin
-qcom/qdu100/qdsp6sw.mbn.xz
-qcom/qdu100/aop.mbn
-qcom/qdu100/mdmddr.mbn
-qcom/qdu100/multi_image.mbn
-qcom/qdu100/xbl_ramdump.elf
-qcom/qdu100/qdsp6sw_dtbs.elf
-qcom/qdu100/kernel_boot.elf
-qcom/qdu100/efs1.bin
-qcom/qdu100/cpucp.elf
-qcom/qdu100/qupv3fw.elf
-qcom/qdu100/tz.mbn
-qcom/qdu100/fw_csm_gsi_3.0.elf
-qcom/qdu100/shrm.elf
-qcom/qdu100/multi_image_qti.mbn
-qcom/qdu100/hypvm.mbn
-qcom/qdu100/xbl_s.melf
-qcom/qdu100/zeros_1sector.bin
-qcom/qdu100/abl_userdebug.elf
-qcom/qdu100/uefi.elf
-qcom/yamato_pfp.fw
-qcom/sa8775p/adspua.jsn
-qcom/sa8775p/gpdsp1r.jsn
-qcom/sa8775p/cdsp0.mbn
-qcom/sa8775p/gpdspr.jsn
-qcom/sa8775p/gpdsp1.mbn
-qcom/sa8775p/a663_zap.mbn
-qcom/sa8775p/adsp.mbn
-qcom/sa8775p/adspr.jsn
-qcom/sa8775p/gpdsp0.mbn
-qcom/sa8775p/qupv3fw.elf
-qcom/sa8775p/cdsp1.mbn
-qcom/sa8775p/cdspr.jsn
-qcom/aic100/fw1.bin
-qcom/aic100/fw10.bin
-qcom/aic100/sbl.bin
-qcom/aic100/fw9.bin
-qcom/aic100/fw5.bin
-qcom/aic100/fw2.bin
-qcom/a300_pfp.fw
-qcom/gen70500_gmu.bin
-qcom/venus-1.8/venus.mdt
-qcom/venus-1.8/venus.mbn
-qcom/a660_sqe.fw
-qcom/qcs8300/adspua.jsn
-qcom/qcs8300/cdsp0.mbn
-qcom/qcs8300/a623_zap.mbn
-qcom/qcs8300/adsp.mbn
-qcom/qcs8300/adspr.jsn
-qcom/qcs8300/gpdsp0.mbn
-qcom/qcs8300/qupv3fw.elf
-qcom/qcs8300/cdspr.jsn
-qcom/venus-5.2/venus.mdt
-qcom/venus-5.2/venus.mbn
-qcom/a530_pm4.fw
-qcom/a225_pfp.fw
-qcom/a530_zap.mdt
-qcom/a660_gmu.bin
-qcom/gen71500_gmu.bin
-qcom/vpu-2.0/venus.mbn
+qca/nvm_usb_00190200_0106.bin
+qca/QCA2066/nvm_usb_00130201_030a.bin
+qca/QCA2066/nvm_usb_00130201_gf_030a.bin
+qca/QCA2066/rampatch_usb_00130201.bin
+qca/msnv11.bin
+qca/htbtfw20.tlv
+qca/hpnv21g.309
+qca/hpnv21.30a
+qca/apbtfw10.tlv
+qca/crnv21.bin
 qcom/leia_pfp_470.fw
-qcom/vpu-1.0/venus.mdt
-qcom/vpu-1.0/venus.mbn
+qcom/a330_pfp.fw
+qcom/a660_sqe.fw
+qcom/a650_gmu.bin
+qcom/x1p42100/gen71500_zap.mbn
+qcom/a530_pm4.fw
 qcom/sm8550/SM8550-HDK-tplg.bin
 qcom/sm8550/SM8550-QRD-tplg.bin
-qcom/apq8016/mba.mbn
-qcom/apq8016/modem.mbn
-qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin
-qcom/apq8016/wcnss.mbn
-qcom/qcs615/a612_zap.mbn
-qcom/a420_pm4.fw
-qcom/a630_gmu.bin
-qcom/apq8096/modemr.jsn
-qcom/apq8096/mba.mbn
-qcom/apq8096/adspua.jsn
-qcom/apq8096/modem.mbn
-qcom/apq8096/a530_zap.mbn
-qcom/apq8096/adsp.mbn
-qcom/apq8096/adspr.jsn
-qcom/qcm2290/modemr.jsn
-qcom/qcm2290/adspua.jsn
-qcom/qcm2290/modem.mbn
-qcom/qcm2290/modemuw.jsn
-qcom/qcm2290/wlanmdsp.mbn
-qcom/qcm2290/adsp.mbn
-qcom/qcm2290/a702_zap.mbn
-qcom/qcm2290/adspr.jsn
-qcom/qcm2290/adsps.jsn
-qcom/x1p42100/gen71500_zap.mbn
-qcom/a702_sqe.fw
-qcom/a330_pfp.fw
-qcom/sm8650/SM8650-QRD-tplg.bin
-qcom/sm8650/SM8650-MTP-tplg.bin
-qcom/sm8250/adspua.jsn
-qcom/sm8250/a650_zap.mbn
-qcom/sm8250/cdsp.mbn
-qcom/sm8250/Thundercomm/RB5/slpi.mbn
-qcom/sm8250/Thundercomm/RB5/slpius.jsn
-qcom/sm8250/Thundercomm/RB5/slpir.jsn
-qcom/sm8250/adsp.mbn
-qcom/sm8250/adspr.jsn
-qcom/sm8250/cdspr.jsn
 qcom/vpu/vpu30_p4.mbn
-qcom/vpu/vpu20_p4.mbn
+qcom/vpu/vpu30_p4_s6_16mb.mbn
 qcom/vpu/vpu30_p4_s6.mbn
 qcom/vpu/vpu20_p1_gen2.mbn
-qcom/vpu/vpu20_p1.mbn
+qcom/vpu/vpu20_p4.mbn
 qcom/vpu/vpu35_p4.mbn
-qcom/vpu/vpu30_p4_s6_16mb.mbn
-qcom/venus-6.0/venus.mbn
-qcom/a530v3_gpmu.fw2
-qcom/a623_gmu.bin
-qcom/venus-4.2/venus.mdt
-qcom/venus-4.2/venus.mbn
-qcom/a630_sqe.fw
+qcom/vpu/vpu20_p1.mbn
+qcom/sm8650/SM8650-MTP-tplg.bin
+qcom/sm8650/SM8650-QRD-tplg.bin
 qcom/yamato_pm4.fw
+qcom/a530_zap.mdt
+qcom/venus-5.4/venus_s2.mbn
+qcom/venus-5.4/venus.mbn
+qcom/venus-5.4/venus.mdt
+qcom/vpu-2.0/venus.mbn
+qcom/a623_gmu.bin
+qcom/qcs8300/a623_zap.mbn
+qcom/qcs8300/cdspr.jsn
+qcom/qcs8300/gpdsp0.mbn
+qcom/qcs8300/adsp.mbn
+qcom/qcs8300/cdsp0.mbn
+qcom/qcs8300/adspua.jsn
+qcom/qcs8300/qupv3fw.elf
+qcom/qcs8300/adspr.jsn
+qcom/sa8775p/gpdsp1.mbn
+qcom/sa8775p/gpdspr.jsn
+qcom/sa8775p/cdspr.jsn
+qcom/sa8775p/gpdsp0.mbn
+qcom/sa8775p/adsp.mbn
+qcom/sa8775p/gpdsp1r.jsn
+qcom/sa8775p/cdsp0.mbn
+qcom/sa8775p/a663_zap.mbn
+qcom/sa8775p/cdsp1.mbn
+qcom/sa8775p/adspua.jsn
+qcom/sa8775p/qupv3fw.elf
+qcom/sa8775p/adspr.jsn
+qcom/a225_pm4.fw
+qcom/x1e80100/battmgr.jsn
+qcom/x1e80100/adsp_dtb.mbn
+qcom/x1e80100/gen70500_zap.mbn
+qcom/x1e80100/adsp.mbn
+qcom/x1e80100/X1E80100-LENOVO-Yoga-Slim7x-tplg.bin
+qcom/x1e80100/LENOVO/21N1/battmgr.jsn
+qcom/x1e80100/LENOVO/21N1/qcadsp8380.mbn
+qcom/x1e80100/LENOVO/21N1/qccdsp8380.mbn
+qcom/x1e80100/LENOVO/21N1/cdspr.jsn
+qcom/x1e80100/LENOVO/21N1/qcdxkmsuc8380.mbn
+qcom/x1e80100/LENOVO/21N1/adsp_dtbs.elf
+qcom/x1e80100/LENOVO/21N1/cdsp_dtbs.elf
+qcom/x1e80100/LENOVO/21N1/qcvss8380.mbn
+qcom/x1e80100/LENOVO/21N1/X1E80100-LENOVO-Thinkpad-T14s-tplg.bin
+qcom/x1e80100/LENOVO/21N1/adspua.jsn
+qcom/x1e80100/LENOVO/21N1/adspr.jsn
+qcom/x1e80100/LENOVO/21N1/adsps.jsn
+qcom/x1e80100/LENOVO/83ED/battmgr.jsn
+qcom/x1e80100/LENOVO/83ED/qcadsp8380.mbn
+qcom/x1e80100/LENOVO/83ED/qccdsp8380.mbn
+qcom/x1e80100/LENOVO/83ED/cdspr.jsn
+qcom/x1e80100/LENOVO/83ED/qcav1e8380.mbn
+qcom/x1e80100/LENOVO/83ED/qcdxkmsuc8380.mbn
+qcom/x1e80100/LENOVO/83ED/X1E80100-LENOVO-Yoga-Slim7x-tplg.bin
+qcom/x1e80100/LENOVO/83ED/adsp_dtbs.elf
+qcom/x1e80100/LENOVO/83ED/qcvss8380.mbn
+qcom/x1e80100/LENOVO/83ED/adspua.jsn
+qcom/x1e80100/LENOVO/83ED/adspr.jsn
+qcom/x1e80100/LENOVO/83ED/adsps.jsn
+qcom/x1e80100/X1E80100-LENOVO-Thinkpad-T14s-tplg.bin
+qcom/x1e80100/adspua.jsn
+qcom/x1e80100/adspr.jsn
+qcom/x1e80100/adsps.jsn
+qcom/gen70500_sqe.fw
+qcom/venus-5.2/venus.mbn
+qcom/venus-5.2/venus.mdt
+qcom/a530_pfp.fw
+qcom/aic100/fw1.bin
+qcom/aic100/fw9.bin
+qcom/aic100/fw10.bin
+qcom/aic100/sbl.bin
+qcom/aic100/fw2.bin
+qcom/aic100/fw5.bin
+qcom/qcm2290/wlanmdsp.mbn
+qcom/qcm2290/a702_zap.mbn
+qcom/qcm2290/modemuw.jsn
+qcom/qcm2290/adsp.mbn
+qcom/qcm2290/modemr.jsn
+qcom/qcm2290/modem.mbn
+qcom/qcm2290/adspua.jsn
+qcom/qcm2290/adspr.jsn
+qcom/qcm2290/adsps.jsn
+qcom/qcm6490/battmgr.jsn
+qcom/qcm6490/ipa_fws.mbn
+qcom/qcm6490/cdsp.mbn
+qcom/qcm6490/cdspr.jsn
+qcom/qcm6490/a660_zap.mbn
+qcom/qcm6490/adsp.mbn
+qcom/qcm6490/adspua.jsn
+qcom/qcm6490/wpss.mbn
+qcom/qcm6490/qupv3fw.elf
+qcom/qcm6490/adspr.jsn
+qcom/qcm6490/adsps.jsn
+qcom/venus-4.2/venus.mbn
+qcom/venus-4.2/venus.mdt
+qcom/yamato_pfp.fw
+qcom/sc8280xp/SC8280XP-LENOVO-X13S-tplg.bin
+qcom/sc8280xp/LENOVO/21BX/battmgr.jsn
+qcom/sc8280xp/LENOVO/21BX/cdspr.jsn
+qcom/sc8280xp/LENOVO/21BX/qcvss8280.mbn
+qcom/sc8280xp/LENOVO/21BX/audioreach-tplg.bin
+qcom/sc8280xp/LENOVO/21BX/qcadsp8280.mbn
+qcom/sc8280xp/LENOVO/21BX/qcdxkmsuc8280.mbn
+qcom/sc8280xp/LENOVO/21BX/qccdsp8280.mbn
+qcom/sc8280xp/LENOVO/21BX/adspua.jsn
+qcom/sc8280xp/LENOVO/21BX/qcslpi8280.mbn
+qcom/sc8280xp/LENOVO/21BX/adspr.jsn
+qcom/apq8096/adsp.mbn
+qcom/apq8096/modemr.jsn
+qcom/apq8096/modem.mbn
+qcom/apq8096/adspua.jsn
+qcom/apq8096/mba.mbn
+qcom/apq8096/adspr.jsn
+qcom/apq8096/a530_zap.mbn
+qcom/a530v3_gpmu.fw2
+qcom/apq8016/wcnss.mbn
+qcom/apq8016/modem.mbn
+qcom/apq8016/WCNSS_qcom_wlan_nv_sbc.bin
+qcom/apq8016/mba.mbn
+qcom/a630_gmu.bin
+qcom/a650_sqe.fw
+qcom/sm8250/Thundercomm/RB5/slpir.jsn
+qcom/sm8250/Thundercomm/RB5/slpi.mbn
+qcom/sm8250/Thundercomm/RB5/slpius.jsn
+qcom/sm8250/cdsp.mbn
+qcom/sm8250/cdspr.jsn
+qcom/sm8250/adsp.mbn
+qcom/sm8250/a650_zap.mbn
+qcom/sm8250/adspua.jsn
+qcom/sm8250/adspr.jsn
+qcom/qrb4210/a610_zap.mbn
+qcom/qrb4210/cdsp.mbn
+qcom/qrb4210/cdspr.jsn
+qcom/qrb4210/wlanmdsp.mbn
+qcom/qrb4210/modemuw.jsn
+qcom/qrb4210/adsp.mbn
+qcom/qrb4210/modemr.jsn
+qcom/qrb4210/modem.mbn
+qcom/qrb4210/adspua.jsn
+qcom/qrb4210/adspr.jsn
+qcom/qrb4210/adsps.jsn
+qcom/a702_sqe.fw
+qcom/a420_pm4.fw
+qcom/sm8350/a660_zap.mbn
+qcom/vpu-1.0/venus.mbn
+qcom/vpu-1.0/venus.mdt
+qcom/leia_pm4_470.fw
+qcom/a420_pfp.fw
+qcom/gen70500_gmu.bin
+qcom/a660_gmu.bin
+qcom/a225_pfp.fw
+qcom/a630_sqe.fw
+qcom/a330_pm4.fw
+qcom/sdm845/Thundercomm/db845c/slpir.jsn
+qcom/sdm845/Thundercomm/db845c/slpi.mbn
+qcom/sdm845/Thundercomm/db845c/slpius.jsn
+qcom/sdm845/cdsp.mbn
+qcom/sdm845/cdspr.jsn
+qcom/sdm845/wlanmdsp.mbn
+qcom/sdm845/modemuw.jsn
+qcom/sdm845/adsp.mbn
+qcom/sdm845/modem_nm.mbn
+qcom/sdm845/modem.mbn
+qcom/sdm845/adspua.jsn
+qcom/sdm845/mba.mbn
+qcom/sdm845/a630_zap.mbn
+qcom/sdm845/adspr.jsn
+qcom/gen71500_gmu.bin
+qcom/a300_pm4.fw
+qcom/a612_rgmu.bin
+qcom/venus-1.8/venus.mbn
+qcom/venus-1.8/venus.mdt
+qcom/qdu100/xbl_config.elf
+qcom/qdu100/aop_devcfg.mbn
+qcom/qdu100/efs1.bin
+qcom/qdu100/xbl_ramdump.elf
+qcom/qdu100/multi_image_qti.mbn
+qcom/qdu100/abl_userdebug.elf
+qcom/qdu100/tz.mbn
+qcom/qdu100/cpucp.elf
+qcom/qdu100/qdsp6sw.mbn.xz
+qcom/qdu100/qdsp6sw_dtbs.elf
+qcom/qdu100/zeros_1sector.bin
+qcom/qdu100/hypvm.mbn
+qcom/qdu100/uefi.elf
+qcom/qdu100/efs3.bin
+qcom/qdu100/multi_image.mbn
+qcom/qdu100/shrm.elf
+qcom/qdu100/xbl_s.melf
+qcom/qdu100/aop.mbn
+qcom/qdu100/qupv3fw.elf
+qcom/qdu100/efs2.bin
+qcom/qdu100/mdmddr.mbn
+qcom/qdu100/fw_csm_gsi_3.0.elf
+qcom/qdu100/kernel_boot.elf
+qcom/a300_pfp.fw
+qcom/a663_gmu.bin
+qcom/gen71500_sqe.fw
+qcom/qcs6490/battmgr.jsn
+qcom/qcs6490/cdsp.mbn
+qcom/qcs6490/cdspr.jsn
+qcom/qcs6490/QCS6490-RB3Gen2-tplg.bin
+qcom/qcs6490/a660_zap.mbn
+qcom/qcs6490/adsp.mbn
+qcom/qcs6490/adspua.jsn
+qcom/qcs6490/wpss.mbn
+qcom/qcs6490/qupv3fw.elf
+qcom/qcs6490/adspr.jsn
+qcom/qcs6490/adsps.jsn
+qcom/venus-6.0/venus.mbn
 qcom/sdx61/foxconn/prog_firehose_lite.elf
-qed/qed_init_values_zipped-8.33.11.0.bin
-qed/qed_init_values_zipped-8.59.1.0.bin
-qed/qed_init_values_zipped-8.10.5.0.bin
-qed/qed_init_values-8.30.12.0.bin
-qed/qed_init_values-8.37.7.0.bin
-qed/qed_init_values_zipped-8.15.3.0.bin
-qed/qed_init_values_zipped-8.10.10.0.bin
-qed/qed_init_values-8.10.9.0.bin
-qed/qed_init_values_zipped-8.20.0.0.bin
+qcom/qcs615/a612_zap.mbn
 qed/qed_init_values-8.33.12.0.bin
-qed/qed_init_values-8.20.0.0.bin
-qed/qed_init_values_zipped-8.4.2.0.bin
 qed/qed_init_values_zipped-8.37.2.0.bin
 qed/qed_init_values_zipped-8.42.2.0.bin
+qed/qed_init_values-8.10.9.0.bin
+qed/qed_init_values-8.20.0.0.bin
 qed/qed_init_values_zipped-8.7.3.0.bin
+qed/qed_init_values_zipped-8.15.3.0.bin
 qed/qed_init_values-8.40.33.0.bin
+qed/qed_init_values_zipped-8.10.5.0.bin
 qed/qed_init_values-8.14.6.0.bin
+qed/qed_init_values_zipped-8.4.2.0.bin
+qed/qed_init_values-8.37.7.0.bin
+qed/qed_init_values-8.30.12.0.bin
+qed/qed_init_values_zipped-8.20.0.0.bin
 qed/qed_init_values_zipped-8.37.7.0.bin
-qed/qed_init_values-8.18.9.0.bin
 qed/qed_init_values_zipped-8.33.1.0.bin
+qed/qed_init_values_zipped-8.33.11.0.bin
+qed/qed_init_values_zipped-8.10.10.0.bin
+qed/qed_init_values-8.18.9.0.bin
+qed/qed_init_values_zipped-8.59.1.0.bin
 ql2100_fw.bin
 ql2200_fw.bin
 ql2300_fw.bin
 ql2322_fw.bin
 ql2400_fw.bin
 ql2500_fw.bin
-qlogic/12160.bin
-qlogic/1040.bin
-qlogic/1280.bin
 qlogic/sd7220.fw
 qlogic/isp1000.bin
+qlogic/1040.bin
+qlogic/1280.bin
+qlogic/12160.bin
 r128/r128_cce.bin
 r8a779x_usb3_v1.dlmem
 r8a779x_usb3_v2.dlmem
 r8a779x_usb3_v3.dlmem
-radeon/PITCAIRN_mc.bin
-radeon/CAICOS_smc.bin
-radeon/CEDAR_pfp.bin
-radeon/TAHITI_smc.bin
-radeon/REDWOOD_pfp.bin
-radeon/kabini_sdma1.bin
-radeon/kaveri_mec.bin
-radeon/bonaire_pfp.bin
-radeon/BONAIRE_mc2.bin
-radeon/bonaire_me.bin
-radeon/JUNIPER_pfp.bin
-radeon/tahiti_mc.bin
-radeon/KABINI_ce.bin
-radeon/kabini_rlc.bin
-radeon/HAINAN_ce.bin
-radeon/hawaii_uvd.bin
-radeon/verde_mc.bin
-radeon/kabini_pfp.bin
-radeon/R420_cp.bin
-radeon/BONAIRE_vce.bin
-radeon/OLAND_rlc.bin
-radeon/hainan_rlc.bin
-radeon/PALM_pfp.bin
-radeon/mullins_vce.bin
-radeon/R300_cp.bin
-radeon/RV770_pfp.bin
-radeon/HAINAN_mc.bin
-radeon/HAWAII_sdma.bin
-radeon/RV740_smc.bin
-radeon/SUMO_uvd.bin
-radeon/RV630_pfp.bin
-radeon/bonaire_uvd.bin
-radeon/BONAIRE_uvd.bin
-radeon/SUMO_rlc.bin
-radeon/KABINI_me.bin
-radeon/HAINAN_me.bin
-radeon/KABINI_rlc.bin
-radeon/banks_k_2_smc.bin
-radeon/TAHITI_rlc.bin
-radeon/BONAIRE_me.bin
-radeon/VERDE_rlc.bin
-radeon/hawaii_sdma1.bin
-radeon/verde_me.bin
-radeon/MULLINS_me.bin
-radeon/RV670_pfp.bin
-radeon/BONAIRE_rlc.bin
-radeon/CAICOS_mc.bin
-radeon/HAWAII_mec.bin
-radeon/RV635_pfp.bin
-radeon/OLAND_smc.bin
-radeon/kaveri_vce.bin
-radeon/oland_ce.bin
-radeon/BARTS_me.bin
-radeon/kabini_uvd.bin
-radeon/CAICOS_pfp.bin
-radeon/KAVERI_pfp.bin
-radeon/TAHITI_ce.bin
-radeon/CAYMAN_me.bin
-radeon/KAVERI_ce.bin
-radeon/KABINI_pfp.bin
-radeon/BONAIRE_sdma.bin
-radeon/tahiti_smc.bin
-radeon/R600_me.bin
-radeon/HAWAII_me.bin
-radeon/hawaii_rlc.bin
 radeon/R200_cp.bin
-radeon/REDWOOD_rlc.bin
-radeon/tahiti_pfp.bin
-radeon/ARUBA_rlc.bin
-radeon/KAVERI_mec.bin
-radeon/hawaii_pfp.bin
-radeon/bonaire_ce.bin
-radeon/HAWAII_smc.bin
-radeon/MULLINS_ce.bin
-radeon/verde_k_smc.bin
-radeon/HAWAII_rlc.bin
-radeon/SUMO_me.bin
-radeon/oland_smc.bin
-radeon/PITCAIRN_rlc.bin
-radeon/pitcairn_pfp.bin
-radeon/RS780_uvd.bin
-radeon/bonaire_vce.bin
-radeon/oland_k_smc.bin
-radeon/kaveri_pfp.bin
-radeon/kaveri_mec2.bin
-radeon/mullins_pfp.bin
-radeon/RV770_smc.bin
-radeon/RV770_uvd.bin
-radeon/RV730_pfp.bin
-radeon/RV620_pfp.bin
-radeon/verde_rlc.bin
-radeon/hawaii_k_smc.bin
-radeon/tahiti_me.bin
-radeon/RS600_cp.bin
-radeon/TAHITI_me.bin
-radeon/CAYMAN_mc.bin
-radeon/mullins_sdma.bin
-radeon/CAYMAN_smc.bin
-radeon/KAVERI_sdma.bin
-radeon/pitcairn_mc.bin
-radeon/OLAND_mc.bin
-radeon/hawaii_mec.bin
-radeon/CAYMAN_pfp.bin
-radeon/kaveri_uvd.bin
-radeon/TAHITI_vce.bin
-radeon/BONAIRE_ce.bin
-radeon/kaveri_sdma.bin
-radeon/SUMO2_pfp.bin
-radeon/hawaii_smc.bin
-radeon/R600_uvd.bin
-radeon/bonaire_sdma1.bin
-radeon/CAICOS_me.bin
-radeon/verde_smc.bin
-radeon/RV770_me.bin
-radeon/R100_cp.bin
-radeon/mullins_sdma1.bin
-radeon/PALM_me.bin
-radeon/hainan_ce.bin
-radeon/REDWOOD_me.bin
-radeon/HAINAN_rlc.bin
-radeon/mullins_me.bin
-radeon/hainan_mc.bin
-radeon/CYPRESS_me.bin
-radeon/bonaire_mec.bin
-radeon/TURKS_mc.bin
-radeon/hainan_pfp.bin
-radeon/HAINAN_mc2.bin
-radeon/BONAIRE_mc.bin
-radeon/BONAIRE_pfp.bin
-radeon/VERDE_pfp.bin
-radeon/OLAND_ce.bin
-radeon/TAHITI_pfp.bin
-radeon/mullins_mec.bin
-radeon/kaveri_rlc.bin
-radeon/hawaii_mc.bin
-radeon/RV730_smc.bin
-radeon/oland_rlc.bin
-radeon/pitcairn_smc.bin
-radeon/JUNIPER_smc.bin
-radeon/TAHITI_mc2.bin
-radeon/kaveri_me.bin
-radeon/pitcairn_ce.bin
-radeon/VERDE_me.bin
+radeon/HAINAN_me.bin
 radeon/RV610_me.bin
-radeon/RV635_me.bin
-radeon/OLAND_me.bin
-radeon/bonaire_rlc.bin
-radeon/hainan_me.bin
-radeon/TAHITI_uvd.bin
-radeon/HAINAN_smc.bin
 radeon/hawaii_ce.bin
 radeon/BONAIRE_mec.bin
-radeon/kabini_mec.bin
-radeon/bonaire_mc.bin
-radeon/VERDE_ce.bin
-radeon/CYPRESS_smc.bin
-radeon/RV730_me.bin
-radeon/TURKS_me.bin
-radeon/HAINAN_pfp.bin
-radeon/pitcairn_k_smc.bin
-radeon/HAWAII_mc2.bin
-radeon/PITCAIRN_smc.bin
-radeon/RV710_me.bin
-radeon/bonaire_sdma.bin
-radeon/mullins_uvd.bin
-radeon/bonaire_k_smc.bin
-radeon/oland_pfp.bin
-radeon/BONAIRE_smc.bin
-radeon/KAVERI_me.bin
-radeon/tahiti_rlc.bin
-radeon/R520_cp.bin
-radeon/hainan_k_smc.bin
-radeon/hawaii_me.bin
-radeon/kabini_ce.bin
-radeon/RV630_me.bin
-radeon/kaveri_ce.bin
-radeon/JUNIPER_me.bin
-radeon/SUMO2_me.bin
-radeon/PITCAIRN_me.bin
-radeon/mullins_rlc.bin
-radeon/PITCAIRN_mc2.bin
-radeon/oland_me.bin
-radeon/RV620_me.bin
-radeon/pitcairn_me.bin
-radeon/JUNIPER_rlc.bin
-radeon/CAYMAN_rlc.bin
-radeon/HAWAII_mc.bin
-radeon/oland_mc.bin
-radeon/si58_mc.bin
-radeon/BARTS_smc.bin
-radeon/TURKS_pfp.bin
-radeon/HAWAII_ce.bin
-radeon/CEDAR_rlc.bin
-radeon/verde_ce.bin
-radeon/bonaire_smc.bin
-radeon/ARUBA_me.bin
-radeon/KAVERI_rlc.bin
-radeon/CEDAR_smc.bin
-radeon/hainan_smc.bin
-radeon/CEDAR_me.bin
-radeon/ARUBA_pfp.bin
-radeon/CYPRESS_uvd.bin
-radeon/KABINI_sdma.bin
-radeon/CYPRESS_rlc.bin
-radeon/HAWAII_pfp.bin
-radeon/OLAND_pfp.bin
-radeon/RV670_me.bin
-radeon/VERDE_mc.bin
-radeon/MULLINS_mec.bin
-radeon/tahiti_ce.bin
-radeon/tahiti_k_smc.bin
-radeon/pitcairn_rlc.bin
-radeon/REDWOOD_smc.bin
-radeon/hawaii_sdma.bin
-radeon/RS780_pfp.bin
+radeon/oland_rlc.bin
+radeon/RV730_smc.bin
 radeon/BARTS_mc.bin
-radeon/RV610_pfp.bin
-radeon/kaveri_sdma1.bin
+radeon/BONAIRE_vce.bin
+radeon/bonaire_me.bin
+radeon/bonaire_k_smc.bin
+radeon/REDWOOD_me.bin
+radeon/tahiti_mc.bin
+radeon/HAWAII_sdma.bin
+radeon/tahiti_rlc.bin
+radeon/mullins_sdma1.bin
+radeon/kaveri_sdma.bin
+radeon/kabini_uvd.bin
+radeon/TAHITI_uvd.bin
+radeon/TAHITI_ce.bin
+radeon/CYPRESS_smc.bin
 radeon/OLAND_mc2.bin
-radeon/RV710_pfp.bin
-radeon/MULLINS_sdma.bin
-radeon/RV710_uvd.bin
-radeon/kabini_vce.bin
-radeon/kabini_me.bin
-radeon/R600_pfp.bin
-radeon/VERDE_mc2.bin
-radeon/PITCAIRN_pfp.bin
-radeon/BTC_rlc.bin
-radeon/VERDE_smc.bin
-radeon/mullins_ce.bin
-radeon/RS690_cp.bin
-radeon/SUMO_pfp.bin
-radeon/R600_rlc.bin
-radeon/KABINI_mec.bin
+radeon/PITCAIRN_rlc.bin
+radeon/TAHITI_rlc.bin
+radeon/OLAND_ce.bin
+radeon/hawaii_pfp.bin
+radeon/bonaire_rlc.bin
+radeon/CEDAR_smc.bin
 radeon/RV710_smc.bin
-radeon/RS780_me.bin
-radeon/MULLINS_pfp.bin
-radeon/verde_pfp.bin
-radeon/BARTS_pfp.bin
-radeon/TAHITI_mc.bin
-radeon/hawaii_vce.bin
-radeon/R700_rlc.bin
-radeon/TURKS_smc.bin
-radeon/MULLINS_rlc.bin
-radeon/CYPRESS_pfp.bin
-radeon/PITCAIRN_ce.bin
+radeon/BONAIRE_ce.bin
+radeon/KAVERI_sdma.bin
+radeon/RV670_me.bin
+radeon/hawaii_uvd.bin
+radeon/HAINAN_pfp.bin
+radeon/BONAIRE_uvd.bin
+radeon/SUMO_uvd.bin
+radeon/REDWOOD_pfp.bin
+radeon/hainan_rlc.bin
+radeon/MULLINS_sdma.bin
 radeon/kabini_sdma.bin
-realtek/rt1320/rt1320-patch-code-vc.bin
+radeon/HAINAN_rlc.bin
+radeon/BONAIRE_mc.bin
+radeon/VERDE_ce.bin
+radeon/RS780_pfp.bin
+radeon/verde_ce.bin
+radeon/R600_uvd.bin
+radeon/SUMO2_me.bin
+radeon/HAWAII_pfp.bin
+radeon/RV710_uvd.bin
+radeon/bonaire_mc.bin
+radeon/kaveri_mec.bin
+radeon/kaveri_pfp.bin
+radeon/CAYMAN_rlc.bin
+radeon/mullins_ce.bin
+radeon/PALM_pfp.bin
+radeon/MULLINS_me.bin
+radeon/MULLINS_rlc.bin
+radeon/RV620_me.bin
+radeon/hainan_smc.bin
+radeon/PITCAIRN_pfp.bin
+radeon/HAWAII_mec.bin
+radeon/CAICOS_mc.bin
+radeon/hawaii_sdma.bin
+radeon/bonaire_pfp.bin
+radeon/hawaii_smc.bin
+radeon/verde_smc.bin
+radeon/SUMO2_pfp.bin
+radeon/ARUBA_rlc.bin
+radeon/bonaire_ce.bin
+radeon/R520_cp.bin
+radeon/R300_cp.bin
+radeon/RV770_uvd.bin
+radeon/VERDE_pfp.bin
+radeon/pitcairn_pfp.bin
+radeon/hainan_mc.bin
+radeon/PITCAIRN_mc.bin
+radeon/mullins_vce.bin
+radeon/bonaire_sdma.bin
+radeon/JUNIPER_rlc.bin
+radeon/tahiti_ce.bin
+radeon/CYPRESS_uvd.bin
+radeon/RV770_pfp.bin
+radeon/kabini_mec.bin
+radeon/kaveri_ce.bin
+radeon/hainan_pfp.bin
+radeon/TURKS_pfp.bin
+radeon/pitcairn_mc.bin
+radeon/KABINI_sdma.bin
+radeon/OLAND_pfp.bin
+radeon/RV770_me.bin
+radeon/RV670_pfp.bin
+radeon/R420_cp.bin
+radeon/RV710_me.bin
+radeon/kaveri_mec2.bin
+radeon/PITCAIRN_ce.bin
+radeon/verde_k_smc.bin
+radeon/R700_rlc.bin
+radeon/verde_rlc.bin
+radeon/TAHITI_smc.bin
+radeon/CAICOS_pfp.bin
+radeon/HAWAII_smc.bin
+radeon/REDWOOD_smc.bin
+radeon/TAHITI_pfp.bin
+radeon/CAYMAN_me.bin
+radeon/HAWAII_mc.bin
+radeon/CAYMAN_mc.bin
+radeon/tahiti_smc.bin
+radeon/si58_mc.bin
+radeon/BONAIRE_rlc.bin
+radeon/CAICOS_smc.bin
+radeon/VERDE_mc2.bin
+radeon/TAHITI_me.bin
+radeon/tahiti_k_smc.bin
+radeon/RV635_me.bin
+radeon/HAWAII_ce.bin
+radeon/MULLINS_ce.bin
+radeon/kaveri_me.bin
+radeon/MULLINS_mec.bin
+radeon/oland_ce.bin
+radeon/ARUBA_pfp.bin
+radeon/CEDAR_pfp.bin
+radeon/KABINI_ce.bin
+radeon/pitcairn_k_smc.bin
+radeon/SUMO_rlc.bin
+radeon/hawaii_me.bin
+radeon/REDWOOD_rlc.bin
+radeon/hawaii_k_smc.bin
+radeon/kabini_pfp.bin
+radeon/hawaii_sdma1.bin
+radeon/kabini_rlc.bin
+radeon/KABINI_mec.bin
+radeon/hainan_k_smc.bin
+radeon/TURKS_me.bin
+radeon/BARTS_pfp.bin
+radeon/R100_cp.bin
+radeon/TURKS_smc.bin
+radeon/BONAIRE_sdma.bin
+radeon/HAINAN_mc2.bin
+radeon/ARUBA_me.bin
+radeon/BONAIRE_pfp.bin
+radeon/bonaire_uvd.bin
+radeon/HAINAN_ce.bin
+radeon/R600_pfp.bin
+radeon/mullins_uvd.bin
+radeon/VERDE_smc.bin
+radeon/TAHITI_mc2.bin
+radeon/mullins_rlc.bin
+radeon/CYPRESS_rlc.bin
+radeon/CYPRESS_me.bin
+radeon/SUMO_me.bin
+radeon/hawaii_mec.bin
+radeon/hawaii_vce.bin
+radeon/pitcairn_rlc.bin
+radeon/OLAND_smc.bin
+radeon/kaveri_vce.bin
+radeon/RV610_pfp.bin
+radeon/RS600_cp.bin
+radeon/RV710_pfp.bin
+radeon/R600_rlc.bin
+radeon/mullins_pfp.bin
+radeon/hainan_me.bin
+radeon/BARTS_smc.bin
+radeon/HAINAN_mc.bin
+radeon/VERDE_mc.bin
+radeon/verde_pfp.bin
+radeon/PITCAIRN_smc.bin
+radeon/RV730_pfp.bin
+radeon/bonaire_vce.bin
+radeon/mullins_me.bin
+radeon/RS780_uvd.bin
+radeon/kabini_me.bin
+radeon/JUNIPER_smc.bin
+radeon/KAVERI_pfp.bin
+radeon/HAWAII_mc2.bin
+radeon/RV630_pfp.bin
+radeon/RV730_me.bin
+radeon/BONAIRE_mc2.bin
+radeon/hawaii_rlc.bin
+radeon/TAHITI_mc.bin
+radeon/pitcairn_ce.bin
+radeon/SUMO_pfp.bin
+radeon/bonaire_smc.bin
+radeon/CAYMAN_smc.bin
+radeon/BONAIRE_me.bin
+radeon/RV630_me.bin
+radeon/oland_k_smc.bin
+radeon/BARTS_me.bin
+radeon/tahiti_pfp.bin
+radeon/oland_mc.bin
+radeon/hawaii_mc.bin
+radeon/bonaire_sdma1.bin
+radeon/R600_me.bin
+radeon/RV620_pfp.bin
+radeon/mullins_sdma.bin
+radeon/RS690_cp.bin
+radeon/KAVERI_ce.bin
+radeon/CAICOS_me.bin
+radeon/JUNIPER_pfp.bin
+radeon/PITCAIRN_me.bin
+radeon/KABINI_rlc.bin
+radeon/PITCAIRN_mc2.bin
+radeon/kaveri_uvd.bin
+radeon/HAINAN_smc.bin
+radeon/oland_smc.bin
+radeon/RV770_smc.bin
+radeon/oland_pfp.bin
+radeon/KAVERI_me.bin
+radeon/CAYMAN_pfp.bin
+radeon/OLAND_me.bin
+radeon/KAVERI_rlc.bin
+radeon/kaveri_sdma1.bin
+radeon/KABINI_pfp.bin
+radeon/CEDAR_me.bin
+radeon/verde_mc.bin
+radeon/BONAIRE_smc.bin
+radeon/kaveri_rlc.bin
+radeon/MULLINS_pfp.bin
+radeon/pitcairn_smc.bin
+radeon/OLAND_mc.bin
+radeon/verde_me.bin
+radeon/oland_me.bin
+radeon/CEDAR_rlc.bin
+radeon/OLAND_rlc.bin
+radeon/kabini_vce.bin
+radeon/kabini_sdma1.bin
+radeon/VERDE_me.bin
+radeon/TURKS_mc.bin
+radeon/JUNIPER_me.bin
+radeon/pitcairn_me.bin
+radeon/RS780_me.bin
+radeon/tahiti_me.bin
+radeon/VERDE_rlc.bin
+radeon/banks_k_2_smc.bin
+radeon/TAHITI_vce.bin
+radeon/KAVERI_mec.bin
+radeon/RV635_pfp.bin
+radeon/PALM_me.bin
+radeon/CYPRESS_pfp.bin
+radeon/HAWAII_rlc.bin
+radeon/BTC_rlc.bin
+radeon/kabini_ce.bin
+radeon/mullins_mec.bin
+radeon/KABINI_me.bin
+radeon/bonaire_mec.bin
+radeon/hainan_ce.bin
+radeon/RV740_smc.bin
+radeon/HAWAII_me.bin
 realtek/rt1320/rt1320-patch-code-vab.bin
+realtek/rt1320/rt1320-patch-code-vc.bin
 rockchip/dptx.bin
 rp2.fw
-rsi/rs9113_ap_bt_dual_mode.rps
-rsi/rs9113_wlan_qspi.rps
 rsi/rs9113_wlan_bt_dual_mode.rps
-rsi/rs9116_wlan_bt_classic.rps
+rsi/rs9113_wlan_qspi.rps
+rsi/rs9113_ap_bt_dual_mode.rps
 rsi/rs9116_wlan.rps
+rsi/rs9116_wlan_bt_classic.rps
 rsi_91x.fw
 rt2561.bin
 rt2561s.bin
@@ -4691,152 +4691,152 @@ rt3071.bin
 rt3090.bin
 rt3290.bin
 rt73.bin
-rtl_bt/rtl8761bu_config.bin
 rtl_bt/rtl8922au_config.bin
-rtl_bt/rtl8723cs_xx_fw.bin
-rtl_bt/rtl8852bu_config.bin
-rtl_bt/rtl8852cu_config.bin
-rtl_bt/rtl8822cu_fw.bin
-rtl_bt/rtl8821cs_fw.bin
-rtl_bt/rtl8852btu_config.bin
-rtl_bt/rtl8822b_config.bin
-rtl_bt/rtl8821c_fw.bin
-rtl_bt/rtl8822cs_config.bin
 rtl_bt/rtl8723bs_fw.bin
-rtl_bt/rtl8192eu_fw.bin
-rtl_bt/rtl8761bu_fw.bin
-rtl_bt/rtl8852au_fw.bin
-rtl_bt/rtl8851bu_fw.bin
-rtl_bt/rtl8723bs_config.bin
-rtl_bt/rtl8852bu_fw.bin
-rtl_bt/rtl8761b_fw.bin
-rtl_bt/rtl8922au_fw.bin
-rtl_bt/rtl8723b_fw.bin
-rtl_bt/rtl8192ee_fw.bin
-rtl_bt/rtl8822cs_fw.bin
-rtl_bt/rtl8723cs_xx_config.bin
-rtl_bt/rtl8852cu_fw_v2.bin
-rtl_bt/rtl8852au_config.bin
+rtl_bt/rtl8852btu_fw.bin
+rtl_bt/rtl8723cs_xx_fw.bin
 rtl_bt/rtl8821a_fw.bin
+rtl_bt/rtl8852bu_fw.bin
+rtl_bt/rtl8852au_config.bin
+rtl_bt/rtl8723bs_config.bin
 rtl_bt/rtl8812ae_fw.bin
-rtl_bt/rtl8821a_config.bin
-rtl_bt/rtl8822b_fw.bin
 rtl_bt/rtl8851bu_config.bin
-rtl_bt/rtl8761b_config.bin
-rtl_bt/rtl8761a_fw.bin
+rtl_bt/rtl8761bu_config.bin
+rtl_bt/rtl8852btu_config.bin
+rtl_bt/rtl8852bu_config.bin
+rtl_bt/rtl8822cu_config.bin
+rtl_bt/rtl8761bu_fw.bin
+rtl_bt/rtl8821c_fw.bin
+rtl_bt/rtl8852au_fw.bin
+rtl_bt/rtl8822cu_fw.bin
+rtl_bt/rtl8723d_fw.bin
+rtl_bt/rtl8922au_fw.bin
+rtl_bt/rtl8821c_config.bin
+rtl_bt/rtl8822b_config.bin
+rtl_bt/rtl8822b_fw.bin
+rtl_bt/rtl8821cs_fw.bin
+rtl_bt/rtl8822cs_config.bin
+rtl_bt/rtl8852cu_fw_v2.bin
+rtl_bt/rtl8723a_fw.bin
+rtl_bt/rtl8723cs_xx_config.bin
+rtl_bt/rtl8852cu_fw.bin
 rtl_bt/rtl8723d_config.bin
 rtl_bt/rtl8723bs_config-OBDA0623.bin
-rtl_bt/rtl8821c_config.bin
-rtl_bt/rtl8723d_fw.bin
-rtl_bt/rtl8852btu_fw.bin
+rtl_bt/rtl8852cu_config.bin
+rtl_bt/rtl8761a_fw.bin
+rtl_bt/rtl8761b_fw.bin
 rtl_bt/rtl8723bs_config-OBDA8723.bin
-rtl_bt/rtl8852cu_fw.bin
+rtl_bt/rtl8822cs_fw.bin
+rtl_bt/rtl8192eu_fw.bin
+rtl_bt/rtl8761b_config.bin
 rtl_bt/rtl8821cs_config.bin
-rtl_bt/rtl8822cu_config.bin
-rtl_bt/rtl8723a_fw.bin
-rtl_nic/rtl8168fp-3.fw
-rtl_nic/rtl8125b-1.fw
-rtl_nic/rtl8168e-1.fw
-rtl_nic/rtl8106e-1.fw
-rtl_nic/rtl8156b-2.fw
-rtl_nic/rtl8168g-3.fw
-rtl_nic/rtl8168g-2.fw
-rtl_nic/rtl8153a-4.fw
-rtl_nic/rtl8126a-2.fw
-rtl_nic/rtl8153a-3.fw
-rtl_nic/rtl8107e-2.fw
-rtl_nic/rtl8125a-3.fw
-rtl_nic/rtl8125d-2.fw
+rtl_bt/rtl8723b_fw.bin
+rtl_bt/rtl8821a_config.bin
+rtl_bt/rtl8851bu_fw.bin
+rtl_bt/rtl8192ee_fw.bin
 rtl_nic/rtl8168h-2.fw
-rtl_nic/rtl8105e-1.fw
-rtl_nic/rtl8168h-1.fw
-rtl_nic/rtl8411-2.fw
-rtl_nic/rtl8411-1.fw
-rtl_nic/rtl8153c-1.fw
-rtl_nic/rtl8127a-1.fw
-rtl_nic/rtl8168d-1.fw
-rtl_nic/rtl8168f-2.fw
-rtl_nic/rtl8153a-2.fw
+rtl_nic/rtl8168e-1.fw
 rtl_nic/rtl8168e-2.fw
-rtl_nic/rtl8107e-1.fw
+rtl_nic/rtl8168d-1.fw
+rtl_nic/rtl8153a-2.fw
+rtl_nic/rtl8106e-1.fw
+rtl_nic/rtl8107e-2.fw
+rtl_nic/rtl8168e-3.fw
 rtl_nic/rtl8125d-1.fw
+rtl_nic/rtl8168g-3.fw
+rtl_nic/rtl8126a-2.fw
+rtl_nic/rtl8153c-1.fw
+rtl_nic/rtl8107e-1.fw
+rtl_nic/rtl8411-2.fw
+rtl_nic/rtl8126a-3.fw
+rtl_nic/rtl8153a-4.fw
+rtl_nic/rtl8153b-2.fw
 rtl_nic/rtl8156a-2.fw
+rtl_nic/rtl8168f-2.fw
+rtl_nic/rtl8106e-2.fw
+rtl_nic/rtl8168h-1.fw
+rtl_nic/rtl8411-1.fw
+rtl_nic/rtl8168g-2.fw
+rtl_nic/rtl8125d-2.fw
+rtl_nic/rtl8168fp-3.fw
 rtl_nic/rtl8168f-1.fw
+rtl_nic/rtl8105e-1.fw
+rtl_nic/rtl8127a-1.fw
 rtl_nic/rtl8402-1.fw
+rtl_nic/rtl8125b-2.fw
+rtl_nic/rtl8153a-3.fw
+rtl_nic/rtl8125a-3.fw
+rtl_nic/rtl8125b-1.fw
+rtl_nic/rtl8168d-2.fw
+rtl_nic/rtl8156b-2.fw
 rtl_nic/rtl8168g-1.fw
 rtl_nic/rtl8125bp-2.fw
-rtl_nic/rtl8126a-3.fw
-rtl_nic/rtl8168e-3.fw
-rtl_nic/rtl8168d-2.fw
-rtl_nic/rtl8106e-2.fw
-rtl_nic/rtl8125b-2.fw
-rtl_nic/rtl8153b-2.fw
-rtlwifi/rtl8723bu_ap_wowlan.bin
-rtlwifi/rtl8812aefw.bin
-rtlwifi/rtl8723bs_ap_wowlan.bin
-rtlwifi/rtl8188fufw.bin
-rtlwifi/rtl8821aefw_wowlan.bin
-rtlwifi/rtl8192cufw_A.bin
-rtlwifi/rtl8723bu_nic.bin
-rtlwifi/rtl8723befw_36.bin
+rtlwifi/rtl8821aefw_29.bin
 rtlwifi/rtl8192defw.bin
-rtlwifi/rtl8192cfw.bin
-rtlwifi/rtl8192cufw.bin
-rtlwifi/rtl8710bufw_UMC.bin
-rtlwifi/rtl8723fw.bin
-rtlwifi/rtl8723aufw_A.bin
-rtlwifi/rtl8723bs_nic.bin
-rtlwifi/rtl8822befw.bin
-rtlwifi/rtl8188efw.bin
-rtlwifi/rtl8723bs_bt.bin
-rtlwifi/rtl8192dufw.bin
-rtlwifi/rtl8192eu_ap_wowlan.bin
-rtlwifi/rtl8192eefw.bin
-rtlwifi/rtl8723aufw_B_NoBT.bin
-rtlwifi/rtl8723bu_wowlan.bin
-rtlwifi/rtl8192eu_nic.bin
-rtlwifi/rtl8192cfwU_B.bin
-rtlwifi/rtl8723fw_B.bin
-rtlwifi/rtl8723aufw_B.bin
-rtlwifi/rtl8192sefw.bin
-rtlwifi/rtl8192eu_wowlan.bin
 rtlwifi/rtl8192fufw.bin
+rtlwifi/rtl8821aefw_wowlan.bin
+rtlwifi/rtl8192eu_nic.bin
+rtlwifi/rtl8192eu_ap_wowlan.bin
+rtlwifi/rtl8822befw.bin
 rtlwifi/rtl8188eufw.bin
+rtlwifi/rtl8723fw.bin
+rtlwifi/rtl8192sefw.bin
+rtlwifi/rtl8710bufw_UMC.bin
+rtlwifi/rtl8192cufw.bin
 rtlwifi/rtl8723bs_wowlan.bin
+rtlwifi/rtl8723bs_nic.bin
+rtlwifi/rtl8712u.bin
+rtlwifi/rtl8723fw_B.bin
+rtlwifi/rtl8812aefw.bin
+rtlwifi/rtl8723aufw_B_NoBT.bin
+rtlwifi/rtl8723aufw_A.bin
+rtlwifi/rtl8192cufw_TMSC.bin
+rtlwifi/rtl8192eefw.bin
+rtlwifi/rtl8192cfwU_B.bin
+rtlwifi/rtl8723bs_ap_wowlan.bin
+rtlwifi/rtl8192dufw.bin
+rtlwifi/rtl8188fufw.bin
+rtlwifi/rtl8723defw.bin
+rtlwifi/rtl8723befw.bin
+rtlwifi/rtl8192cufw_A.bin
+rtlwifi/rtl8812aefw_wowlan.bin
+rtlwifi/rtl8723aufw_B.bin
+rtlwifi/rtl8723bu_wowlan.bin
+rtlwifi/rtl8192cufw_B.bin
+rtlwifi/rtl8723befw_36.bin
+rtlwifi/rtl8192eu_wowlan.bin
 rtlwifi/rtl8710bufw_SMIC.bin
 rtlwifi/rtl8192cfwU.bin
-rtlwifi/rtl8723defw.bin
-rtlwifi/rtl8812aefw_wowlan.bin
-rtlwifi/rtl8192cufw_B.bin
-rtlwifi/rtl8192cufw_TMSC.bin
-rtlwifi/rtl8821aefw_29.bin
-rtlwifi/rtl8712u.bin
+rtlwifi/rtl8723bu_nic.bin
 rtlwifi/rtl8821aefw.bin
-rtlwifi/rtl8723befw.bin
-rtw88/rtw8812a_fw.bin
+rtlwifi/rtl8723bu_ap_wowlan.bin
+rtlwifi/rtl8192cfw.bin
+rtlwifi/rtl8188efw.bin
+rtlwifi/rtl8723bs_bt.bin
 rtw88/README
 rtw88/rtw8821c_fw.bin
-rtw88/rtw8703b_fw.bin
-rtw88/rtw8723d_fw.bin
-rtw88/rtw8822b_fw.bin
-rtw88/rtw8814a_fw.bin
-rtw88/rtw8703b_wow_fw.bin
 rtw88/rtw8821a_fw.bin
-rtw88/rtw8822c_fw.bin
+rtw88/rtw8814a_fw.bin
+rtw88/rtw8703b_fw.bin
 rtw88/rtw8822c_wow_fw.bin
-rtw89/rtw8851b_fw.bin
-rtw89/rtw8922a_fw.bin
+rtw88/rtw8812a_fw.bin
+rtw88/rtw8703b_wow_fw.bin
+rtw88/rtw8822c_fw.bin
+rtw88/rtw8822b_fw.bin
+rtw88/rtw8723d_fw.bin
 rtw89/rtw8852bt_fw.bin
-rtw89/rtw8922a_fw-4.bin
 rtw89/rtw8922a_fw-1.bin
-rtw89/rtw8922a_fw-3.bin
-rtw89/rtw8852c_fw.bin
-rtw89/rtw8852a_fw.bin
-rtw89/rtw8922a_fw-2.bin
+rtw89/rtw8851b_fw.bin
+rtw89/rtw8852c_fw-2.bin
 rtw89/rtw8852c_fw-1.bin
 rtw89/rtw8852b_fw-1.bin
-rtw89/rtw8852c_fw-2.bin
+rtw89/rtw8922a_fw-2.bin
+rtw89/rtw8922a_fw-3.bin
+rtw89/rtw8922a_fw.bin
+rtw89/rtw8852c_fw.bin
+rtw89/rtw8922a_fw-4.bin
 rtw89/rtw8852b_fw.bin
+rtw89/rtw8852a_fw.bin
 s2250.fw
 s2250_loader.fw
 s5p-mfc-v12.fw
@@ -4845,166 +4845,166 @@ s5p-mfc-v6.fw
 s5p-mfc-v7.fw
 s5p-mfc-v8.fw
 s5p-mfc.fw
-sb16/ima_adpcm_capture.csp
-sb16/ima_adpcm_init.csp
-sb16/mulaw_main.csp
 sb16/ima_adpcm_playback.csp
 sb16/alaw_main.csp
+sb16/ima_adpcm_init.csp
+sb16/ima_adpcm_capture.csp
+sb16/mulaw_main.csp
 sdd_sagrad_1091_1098.bin
 slicoss/gbdownload.sys
-slicoss/oasisrcvucode.sys
 slicoss/gbrcvucode.sys
-slicoss/oasisdownload.sys
+slicoss/oasisrcvucode.sys
 slicoss/oasisdbgdownload.sys
+slicoss/oasisdownload.sys
 sms1xxx-hcw-55xxx-dvbt-02.fw
 sms1xxx-hcw-55xxx-isdbt-02.fw
 sms1xxx-nova-a-dvbt-01.fw
 sms1xxx-nova-b-dvbt-01.fw
 sms1xxx-stellar-dvbt-01.fw
 sun/cassini.bin
-sxg/saharadbgdownloadB.sys
 sxg/saharadownloadB.sys
+sxg/saharadbgdownloadB.sys
 tdmb_nova_12mhz.inp
 tehuti/bdx.bin
-ti/tas2781/TAS2XXX3EE01.bin
-ti/tas2781/TAS2XXX387E.bin
-ti/tas2781/TAS2XXX38DF.bin
-ti/tas2781/TAS2XXX38A8.bin
-ti/tas2781/TAS2XXX38D4.bin
-ti/tas2781/TAS2XXX38E0.bin
-ti/tas2781/TAS2XXX38D5.bin
-ti/tas2781/TAS2XXX38C3.bin
-ti/tas2781/TIAS2781RCA2.bin
-ti/tas2781/TAS2XXX38CB.bin
-ti/tas2781/TAS2XXX38A5.bin
-ti/tas2781/TAS2XXX12041.bin
-ti/tas2781/TAS2XXX38BF.bin
-ti/tas2781/TAS2XXX3880.bin
-ti/tas2781/TAS2XXX387D.bin
-ti/tas2781/TAS2XXX38A7.bin
-ti/tas2781/TAS2XXX10A41.bin
-ti/tas2781/TAS2XXX2234.bin
-ti/tas2781/TAS2XXX11541.bin
-ti/tas2781/TAS2XXX38B9.bin
-ti/tas2781/TAS2XXX38D6.bin
-ti/tas2781/TAS2XXX2326.bin
-ti/tas2781/TAS2XXX3886.bin
-ti/tas2781/TAS2XXX3F000.bin
-ti/tas2781/TAS2XXX3F201.bin
-ti/tas2781/TAS2XXX3E300.bin
-ti/tas2781/TAS2XXX3884.bin
-ti/tas2781/TAS2XXX38D3.bin
-ti/tas2781/TAS2XXX387F.bin
-ti/tas2781/TAS2XXX1EB31.bin
-ti/tas2781/TAS2XXX391F.bin
-ti/tas2781/TAS2XXX38FD.bin
-ti/tas2781/TAS2XXX1EB30.bin
-ti/tas2781/TAS2XXX0C97.bin
-ti/tas2781/TAS2XXX0C96.bin
-ti/tas2781/TXNW2781RCA1.bin
-ti/tas2781/TAS2XXX3EE00.bin
-ti/tas2781/TAS2XXX3F300.bin
-ti/tas2781/TAS2XXX3EF01.bin
-ti/tas2781/TAS2XXX0C95.bin
-ti/tas2781/TAS2XXX3F301.bin
-ti/tas2781/TAS2XXX3E301.bin
-ti/tas2781/TAS2XXX0C94.bin
-ti/tas2781/TAS2XXX38BA.bin
-ti/tas2781/TAS2XXX3882.bin
-ti/tas2781/TAS2XXX3881.bin
-ti/tas2781/TIAS2781RCA4.bin
-ti/tas2781/TAS2XXX3F001.bin
-ti/tas2781/TAS2XXX10A40.bin
-ti/tas2781/TAS2XXX38BB.bin
-ti/tas2781/TXNW2781RCA0.bin
-ti/tas2781/TAS2XXX3920.bin
-ti/tas2781/TAS2XXX3F101.bin
-ti/tas2781/TAS2XXX11540.bin
-ti/tas2781/TAS2XXX3EF00.bin
-ti/tas2781/TAS2XXX38BE.bin
-ti/tas2781/TAS2XXX3F100.bin
-ti/tas2781/TAS2XXX12141.bin
-ti/tas2781/TAS2XXX3F200.bin
-ti/tas2781/TAS2XXX12040.bin
-ti/tas2781/TAS2XXX38B8.bin
-ti/tas2781/TAS2XXX8DE9.bin
-ti/tas2781/TAS2XXX8DE8.bin
-ti/tas2781/TAS2XXX38CD.bin
-ti/tas2781/TAS2XXX12140.bin
-ti/vpdma-1b8.bin
-ti/tas2563/TAS2XXX3870.bin
 ti/tas2563/INT8866RCA2.bin
-ti-connectivity/wl128x-fw-5-plt.bin
-ti-connectivity/wl128x-nvs.bin
-ti-connectivity/wl127x-fw-3.bin
-ti-connectivity/wl127x-nvs.bin
-ti-connectivity/wl128x-fw-4-plt.bin
-ti-connectivity/wl18xx-fw-3.bin
-ti-connectivity/wl1271-fw-ap.bin
-ti-connectivity/wl128x-fw-4-mr.bin
-ti-connectivity/wl12xx-nvs.bin
+ti/tas2563/TAS2XXX3870.bin
+ti/vpdma-1b8.bin
+ti/tas2781/TAS2XXX3F200.bin
+ti/tas2781/TAS2XXX38D4.bin
+ti/tas2781/TAS2XXX3E301.bin
+ti/tas2781/TAS2XXX38BA.bin
+ti/tas2781/TAS2XXX38BE.bin
+ti/tas2781/TAS2XXX38CB.bin
+ti/tas2781/TAS2XXX10A40.bin
+ti/tas2781/TAS2XXX3F300.bin
+ti/tas2781/TAS2XXX3886.bin
+ti/tas2781/TIAS2781RCA2.bin
+ti/tas2781/TAS2XXX11540.bin
+ti/tas2781/TAS2XXX38BF.bin
+ti/tas2781/TAS2XXX0C97.bin
+ti/tas2781/TAS2XXX1EB30.bin
+ti/tas2781/TAS2XXX3EE01.bin
+ti/tas2781/TAS2XXX38CD.bin
+ti/tas2781/TAS2XXX38A8.bin
+ti/tas2781/TAS2XXX38B8.bin
+ti/tas2781/TAS2XXX3EE00.bin
+ti/tas2781/TAS2XXX38B9.bin
+ti/tas2781/TAS2XXX8DE9.bin
+ti/tas2781/TAS2XXX3F201.bin
+ti/tas2781/TAS2XXX10A41.bin
+ti/tas2781/TAS2XXX38D3.bin
+ti/tas2781/TAS2XXX0C95.bin
+ti/tas2781/TAS2XXX3E300.bin
+ti/tas2781/TAS2XXX3EF01.bin
+ti/tas2781/TAS2XXX3880.bin
+ti/tas2781/TAS2XXX2234.bin
+ti/tas2781/TAS2XXX38D5.bin
+ti/tas2781/TAS2XXX3881.bin
+ti/tas2781/TAS2XXX12140.bin
+ti/tas2781/TAS2XXX3EF00.bin
+ti/tas2781/TAS2XXX391F.bin
+ti/tas2781/TAS2XXX0C96.bin
+ti/tas2781/TAS2XXX38FD.bin
+ti/tas2781/TAS2XXX38C3.bin
+ti/tas2781/TAS2XXX3F001.bin
+ti/tas2781/TAS2XXX38D6.bin
+ti/tas2781/TIAS2781RCA4.bin
+ti/tas2781/TAS2XXX12141.bin
+ti/tas2781/TAS2XXX38A5.bin
+ti/tas2781/TAS2XXX0C94.bin
+ti/tas2781/TAS2XXX1EB31.bin
+ti/tas2781/TAS2XXX38E0.bin
+ti/tas2781/TAS2XXX38DF.bin
+ti/tas2781/TAS2XXX38BB.bin
+ti/tas2781/TAS2XXX12040.bin
+ti/tas2781/TAS2XXX3884.bin
+ti/tas2781/TAS2XXX8DE8.bin
+ti/tas2781/TAS2XXX3882.bin
+ti/tas2781/TXNW2781RCA1.bin
+ti/tas2781/TAS2XXX3F101.bin
+ti/tas2781/TAS2XXX3F100.bin
+ti/tas2781/TAS2XXX11541.bin
+ti/tas2781/TAS2XXX387E.bin
+ti/tas2781/TAS2XXX2326.bin
+ti/tas2781/TAS2XXX38A7.bin
+ti/tas2781/TAS2XXX3920.bin
+ti/tas2781/TXNW2781RCA0.bin
+ti/tas2781/TAS2XXX12041.bin
+ti/tas2781/TAS2XXX3F000.bin
+ti/tas2781/TAS2XXX387D.bin
+ti/tas2781/TAS2XXX387F.bin
+ti/tas2781/TAS2XXX3F301.bin
 ti-connectivity/wl1251-nvs.bin
-ti-connectivity/wl128x-fw-4-sr.bin
-ti-connectivity/TIInit_6.2.31.bts
+ti-connectivity/wl127x-fw-4-sr.bin
+ti-connectivity/wl127x-fw-4-mr.bin
 ti-connectivity/wl1271-fw.bin
-ti-connectivity/wl1251-fw.bin
-ti-connectivity/wl18xx-fw-4.bin
-ti-connectivity/wl127x-fw-plt-3.bin
-ti-connectivity/wl128x-fw-5-sr.bin
-ti-connectivity/TIInit_6.6.15.bts
+ti-connectivity/wl128x-fw-5-plt.bin
 ti-connectivity/cc33xx_2nd_loader.bin
 ti-connectivity/cc33xx-conf.bin
-ti-connectivity/wl128x-fw-ap.bin
-ti-connectivity/wl1271-fw-2.bin
-ti-connectivity/wl127x-fw-4-sr.bin
-ti-connectivity/wl128x-fw-plt-3.bin
-ti-connectivity/wl1271-nvs.bin
-ti-connectivity/wl128x-fw.bin
-ti-connectivity/wl127x-fw-5-mr.bin
-ti-connectivity/wl127x-fw-5-sr.bin
-ti-connectivity/wl127x-fw-4-plt.bin
-ti-connectivity/wl18xx-fw.bin
-ti-connectivity/wl128x-fw-5-mr.bin
 ti-connectivity/TIInit_7.2.31.bts
+ti-connectivity/wl12xx-nvs.bin
+ti-connectivity/wl127x-fw-5-mr.bin
+ti-connectivity/wl18xx-fw.bin
+ti-connectivity/wl128x-fw.bin
 ti-connectivity/wl127x-fw-5-plt.bin
-ti-connectivity/wl127x-fw-4-mr.bin
-ti-connectivity/wl128x-fw-3.bin
-ti-connectivity/cc33xx_fw.bin
 ti-connectivity/wl18xx-fw-2.bin
+ti-connectivity/TIInit_6.2.31.bts
+ti-connectivity/wl128x-fw-4-sr.bin
+ti-connectivity/wl128x-fw-5-sr.bin
+ti-connectivity/wl127x-fw-4-plt.bin
+ti-connectivity/wl128x-nvs.bin
+ti-connectivity/wl128x-fw-ap.bin
+ti-connectivity/wl128x-fw-4-mr.bin
+ti-connectivity/wl1271-nvs.bin
+ti-connectivity/wl1251-fw.bin
+ti-connectivity/TIInit_6.6.15.bts
+ti-connectivity/wl127x-fw-5-sr.bin
+ti-connectivity/wl18xx-fw-4.bin
+ti-connectivity/wl18xx-fw-3.bin
+ti-connectivity/wl1271-fw-2.bin
+ti-connectivity/wl128x-fw-4-plt.bin
+ti-connectivity/wl127x-nvs.bin
+ti-connectivity/cc33xx_fw.bin
+ti-connectivity/wl127x-fw-plt-3.bin
+ti-connectivity/wl128x-fw-5-mr.bin
+ti-connectivity/wl127x-fw-3.bin
+ti-connectivity/wl128x-fw-3.bin
+ti-connectivity/wl128x-fw-plt-3.bin
+ti-connectivity/wl1271-fw-ap.bin
 ti-keystone/ks2_qmss_pdsp_acc48_k2_le_1_0_0_9.bin
 ti_3410.fw
 ti_5052.fw
 tigon/tg357766.bin
-tigon/tg3.bin
-tigon/tg3_tso5.bin
 tigon/tg3_tso.bin
+tigon/tg3_tso5.bin
+tigon/tg3.bin
 tlg2300_firmware.bin
 tsse_firmware.bin
 ttusb-budget/dspbootcode.bin
-ueagle-atm/eagleI.fw
+ueagle-atm/CMVepES03.bin
+ueagle-atm/CMVepFR10.bin
+ueagle-atm/eagleIII.fw
+ueagle-atm/DSP9i.bin
 ueagle-atm/eagleIV.fw
-ueagle-atm/CMVepWO.bin
+ueagle-atm/930-fpga.bin
+ueagle-atm/CMVepIT.bin
 ueagle-atm/DSP4p.bin
 ueagle-atm/CMV4p.bin.v2
-ueagle-atm/CMVepFR.bin
+ueagle-atm/CMVepFR04.bin
+ueagle-atm/DSPep.bin
+ueagle-atm/CMVeiWO.bin
+ueagle-atm/DSP9p.bin
+ueagle-atm/CMVepWO.bin
+ueagle-atm/CMV9i.bin
+ueagle-atm/adi930.fw
+ueagle-atm/CMVep.bin
 ueagle-atm/CMVei.bin
 ueagle-atm/DSPei.bin
-ueagle-atm/eagleIII.fw
-ueagle-atm/DSP9p.bin
-ueagle-atm/CMVep.bin
-ueagle-atm/DSP9i.bin
+ueagle-atm/eagleI.fw
+ueagle-atm/CMVepFR.bin
 ueagle-atm/eagleII.fw
-ueagle-atm/CMVepFR04.bin
-ueagle-atm/930-fpga.bin
-ueagle-atm/CMVepES03.bin
-ueagle-atm/CMVepIT.bin
-ueagle-atm/CMVepFR10.bin
-ueagle-atm/CMVeiWO.bin
 ueagle-atm/CMV9p.bin
-ueagle-atm/CMV9i.bin
-ueagle-atm/DSPep.bin
 ueagle-atm/CMVepES.bin
-ueagle-atm/adi930.fw
 usbdux_firmware.bin
 usbduxfast_firmware.bin
 usbduxsigma_firmware.bin
@@ -5021,25 +5021,25 @@ vpu_p.bin
 vxge/X3fw-pxe.ncf
 vxge/X3fw.ncf
 wfx/brd8022a.pds
-wfx/wfm_wf200_C0.sec
-wfx/brd8023a.pds
 wfx/brd4001a.pds
+wfx/brd8023a.pds
+wfx/wfm_wf200_C0.sec
 whiteheat.fw
 whiteheat_loader.fw
 wil6210.brd
 wil6210.fw
 wsm_22.bin
-xe/bmg_guc_70.bin
-xe/bmg_huc.bin
-xe/lnl_gsc_1.bin
 xe/lnl_guc_70.bin
-xe/ptl_huc.bin
-xe/fan_control_8086_e20b_8086_1100.bin
 xe/lnl_huc.bin
+xe/bmg_huc.bin
 xe/ptl_guc_70.bin
+xe/ptl_huc.bin
+xe/bmg_guc_70.bin
+xe/lnl_gsc_1.bin
+xe/fan_control_8086_e20b_8086_1100.bin
 yam/1200.bin
 yam/9600.bin
-yamaha/ds1_ctrl.fw
 yamaha/ds1_dsp.fw
 yamaha/yss225_registers.bin
+yamaha/ds1_ctrl.fw
 yamaha/ds1e_ctrl.fw
diff --git a/gentoo/portage/savedconfig/x11-terms/st-0.9.2 b/gentoo/portage/savedconfig/x11-terms/st-0.9.2
deleted file mode 100644
index eabac9e7..00000000
--- a/gentoo/portage/savedconfig/x11-terms/st-0.9.2
+++ /dev/null
@@ -1,482 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/*
- * appearance
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
-// static char *font = "Source Code Pro:pixelsize=20:antialias=true:autohint=true";
-static char *font = "mono:pixelsize=18.5:antialias=true:autohint=true";
-static int borderpx = 2;
-
-/*
- * What program is execed by st depends of these precedence rules:
- * 1: program passed with -e
- * 2: scroll and/or utmp
- * 3: SHELL environment variable
- * 4: value of shell in /etc/passwd
- * 5: value of shell in config.h
- */
-static char *shell = "/bin/sh";
-char *utmp = NULL;
-/* scroll program: to enable use a string like "scroll" */
-char *scroll = NULL;
-char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
-
-/* identification sequence returned in DA and DECID */
-char *vtiden = "\033[?6c";
-
-/* Kerning / character bounding-box multipliers */
-static float cwscale = 1.0;
-static float chscale = 1.0;
-
-/*
- * word delimiter string
- *
- * More advanced example: L" `'\"()[]{}"
- */
-wchar_t *worddelimiters = L" ";
-
-/* selection timeouts (in milliseconds) */
-static unsigned int doubleclicktimeout = 300;
-static unsigned int tripleclicktimeout = 600;
-
-/* alt screens */
-int allowaltscreen = 1;
-
-/* allow certain non-interactive (insecure) window operations such as:
-   setting the clipboard text */
-int allowwindowops = 0;
-
-/*
- * draw latency range in ms - from new content/keypress/etc until drawing.
- * within this range, st draws when content stops arriving (idle). mostly it's
- * near minlatency, but it waits longer for slow updates to avoid partial draw.
- * low minlatency will tear/flicker more, as it can "detect" idle too early.
- */
-static double minlatency = 8;
-static double maxlatency = 33;
-
-/*
- * blinking timeout (set to 0 to disable blinking) for the terminal blinking
- * attribute.
- */
-static unsigned int blinktimeout = 800;
-
-/*
- * thickness of underline and bar cursors
- */
-static unsigned int cursorthickness = 2;
-
-/*
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
- */
-static int bellvolume = 0;
-
-/* default TERM value */
-char *termname = "st-256color";
-
-/*
- * spaces per tab
- *
- * When you are changing this value, don't forget to adapt the »it« value in
- * the st.info and appropriately install the st.info in the environment where
- * you use this st version.
- *
- *	it#$tabspaces,
- *
- * Secondly make sure your kernel is not expanding tabs. When running `stty
- * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
- *  running following command:
- *
- *	stty tabs
- */
-unsigned int tabspaces = 8;
-
-/* bg opacity */
-float alpha = 0.7;
-
-/* Terminal colors (16 first used in escape sequence) */
-static const char *colorname[] = {
-	/* 8 normal colors */
-	"#3b4252", /* black   */
-	"#bf616a", /* red     */
-	"#a3be8c", /* green   */
-	"#ebcb8b", /* yellow  */
-	"#81a1c1", /* blue    */
-	"#b48ead", /* magenta */
-	"#88c0d0", /* cyan    */
-	"#e5e9f0", /* white   */
-
-	/* 8 bright colors */
-	"#4c566a", /* black   */
-	"#bf616a", /* red     */
-	"#a3be8c", /* green   */
-	"#ebcb8b", /* yellow  */
-	"#81a1c1", /* blue    */
-	"#b48ead", /* magenta */
-	"#8fbcbb", /* cyan    */
-	"#eceff4", /* white   */
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	// "#2e3440", // background //
-	// "#1d222b", // background //
-        "#1a1e26", // background //
-	"#d8dee9", /* foreground */
-};
-
-
-/*
- * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
-unsigned int defaultfg = 257;
-unsigned int defaultbg = 256;
-unsigned int defaultcs = 257;
-static unsigned int defaultrcs = 256;
-
-/*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
- */
-static unsigned int cursorshape = 2;
-
-/*
- * Default columns and rows numbers
- */
-
-// static unsigned int cols = 80;
-static unsigned int cols = 150;
-// static unsigned int rows = 24;
-static unsigned int rows = 36;
-
-/*
- * Default colour and shape of the mouse cursor
- */
-static unsigned int mouseshape = XC_xterm;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
-
-/*
- * Color used to display font attributes when fontconfig selected a font which
- * doesn't match the ones requested.
- */
-static unsigned int defaultattr = 11;
-
-/*
- * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forcemousemod = ShiftMask;
-
-/*
- * Internal mouse shortcuts.
- * Beware that overloading Button1 will disable the selection.
- */
-static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
-};
-
-/* Internal keyboard shortcuts. */
-#define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
-
-static Shortcut shortcuts[] = {
-	/* mask                 keysym          function        argument */
-	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
-	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
-	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
-	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
-	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
-	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
-	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
-	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
-	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
-	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-	{ ShiftMask,            XK_Page_Up,     kscrollup,      {.i = -1} },
-	{ ShiftMask,            XK_Page_Down,   kscrolldown,    {.i = -1} },
-};
-
-/*
- * Special keys (change & recompile st.info accordingly)
- *
- * Mask value:
- * * Use XK_ANY_MOD to match the key no matter modifiers state
- * * Use XK_NO_MOD to match the key alone (no modifiers)
- * appkey value:
- * * 0: no value
- * * > 0: keypad application mode enabled
- * *   = 2: term.numlock = 1
- * * < 0: keypad application mode disabled
- * appcursor value:
- * * 0: no value
- * * > 0: cursor application mode enabled
- * * < 0: cursor application mode disabled
- *
- * Be careful with the order of the definitions because st searches in
- * this table sequentially, so any XK_ANY_MOD must be in the last
- * position for a key.
- */
-
-/*
- * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
- * to be mapped below, add them to this array.
- */
-static KeySym mappedkeys[] = { -1 };
-
-/*
- * State bits to ignore when matching key or button events.  By default,
- * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
- */
-static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
-
-/*
- * This is the huge key array which defines all compatibility to the Linux
- * world. Please decide about changes wisely.
- */
-static Key key[] = {
-	/* keysym           mask            string      appkey appcursor */
-	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
-	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
-	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
-	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
-	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
-	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
-	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
-	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
-	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
-	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
-	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
-	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
-	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
-	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
-	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
-	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
-	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
-	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
-	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0},
-	{ XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0},
-	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0},
-	{ XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0},
-	{ XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0},
-	{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  0,    0},
-	{ XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_Down,          ShiftMask,      "\033[1;2B",     0,    0},
-	{ XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0},
-	{ XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0},
-	{ XK_Down,          ControlMask,    "\033[1;5B",     0,    0},
-	{ XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0},
-	{ XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0},
-	{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0,    0},
-	{ XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_Left,          ShiftMask,      "\033[1;2D",     0,    0},
-	{ XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0},
-	{ XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0},
-	{ XK_Left,          ControlMask,    "\033[1;5D",     0,    0},
-	{ XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0},
-	{ XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0},
-	{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0,    0},
-	{ XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_Right,         ShiftMask,      "\033[1;2C",     0,    0},
-	{ XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0},
-	{ XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0},
-	{ XK_Right,         ControlMask,    "\033[1;5C",     0,    0},
-	{ XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0},
-	{ XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0},
-	{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0,   0},
-	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0},
-	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0},
-	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0},
-	{ XK_Insert,        ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_Insert,        ControlMask,    "\033[L",       -1,    0},
-	{ XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_Delete,        ControlMask,    "\033[M",       -1,    0},
-	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0},
-	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0},
-	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_End,           ControlMask,    "\033[J",       -1,    0},
-	{ XK_End,           ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_End,           ShiftMask,      "\033[K",       -1,    0},
-	{ XK_End,           ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_Prior,         ControlMask,    "\033[5;5~",     0,    0},
-	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
-	{ XK_Next,          ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0},
-	{ XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0},
-	{ XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0},
-	{ XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0},
-	{ XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0},
-	{ XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0},
-	{ XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0},
-	{ XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0},
-	{ XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0},
-	{ XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0},
-	{ XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0},
-	{ XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0},
-	{ XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0},
-	{ XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0},
-	{ XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0},
-	{ XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0},
-	{ XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0},
-	{ XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0},
-	{ XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0},
-	{ XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0},
-	{ XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0},
-	{ XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0},
-	{ XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0},
-	{ XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0},
-	{ XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0},
-	{ XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0},
-	{ XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0},
-	{ XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0},
-	{ XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0},
-	{ XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0},
-	{ XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0},
-	{ XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0},
-	{ XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0},
-	{ XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0},
-	{ XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0},
-	{ XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0},
-	{ XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0},
-	{ XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0},
-	{ XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0},
-	{ XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0},
-	{ XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0},
-	{ XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0},
-	{ XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0},
-	{ XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0},
-	{ XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0},
-	{ XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0},
-	{ XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0},
-	{ XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0},
-	{ XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0},
-	{ XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0},
-	{ XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0},
-	{ XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0},
-	{ XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0},
-	{ XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0},
-	{ XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0},
-	{ XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0},
-	{ XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0},
-	{ XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0},
-	{ XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0},
-	{ XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0},
-	{ XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0},
-	{ XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0},
-	{ XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0},
-	{ XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0},
-	{ XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0},
-	{ XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0},
-	{ XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0},
-	{ XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0},
-	{ XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0},
-	{ XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0},
-	{ XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0},
-	{ XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0},
-	{ XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0},
-	{ XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0},
-	{ XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0},
-	{ XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0},
-	{ XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0},
-	{ XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0},
-	{ XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0},
-	{ XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0},
-	{ XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0},
-	{ XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0},
-	{ XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    0},
-	{ XK_F33,           XK_NO_MOD,      "\033[20;5~",    0,    0},
-	{ XK_F34,           XK_NO_MOD,      "\033[21;5~",    0,    0},
-	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0},
-};
-
-/*
- * Selection types' masks.
- * Use the same masks as usual.
- * Button1Mask is always unset, to make masks match between ButtonPress.
- * ButtonRelease and MotionNotify.
- * If no match is found, regular selection is used.
- */
-static uint selmasks[] = {
-	[SEL_RECTANGULAR] = Mod1Mask,
-};
-
-/*
- * Printable characters in ASCII, used to estimate the advance width
- * of single wide characters.
- */
-static char ascii_printable[] =
-	" !\"#$%&'()*+,-./0123456789:;<=>?"
-	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-	"`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/gentoo/portage/savedconfig/x11-terms/st-0.9.2.bak b/gentoo/portage/savedconfig/x11-terms/st-0.9.2.bak
deleted file mode 100644
index 2cd740a2..00000000
--- a/gentoo/portage/savedconfig/x11-terms/st-0.9.2.bak
+++ /dev/null
@@ -1,474 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/*
- * appearance
- *
- * font: see http://freedesktop.org/software/fontconfig/fontconfig-user.html
- */
-static char *font = "Liberation Mono:pixelsize=12:antialias=true:autohint=true";
-static int borderpx = 2;
-
-/*
- * What program is execed by st depends of these precedence rules:
- * 1: program passed with -e
- * 2: scroll and/or utmp
- * 3: SHELL environment variable
- * 4: value of shell in /etc/passwd
- * 5: value of shell in config.h
- */
-static char *shell = "/bin/sh";
-char *utmp = NULL;
-/* scroll program: to enable use a string like "scroll" */
-char *scroll = NULL;
-char *stty_args = "stty raw pass8 nl -echo -iexten -cstopb 38400";
-
-/* identification sequence returned in DA and DECID */
-char *vtiden = "\033[?6c";
-
-/* Kerning / character bounding-box multipliers */
-static float cwscale = 1.0;
-static float chscale = 1.0;
-
-/*
- * word delimiter string
- *
- * More advanced example: L" `'\"()[]{}"
- */
-wchar_t *worddelimiters = L" ";
-
-/* selection timeouts (in milliseconds) */
-static unsigned int doubleclicktimeout = 300;
-static unsigned int tripleclicktimeout = 600;
-
-/* alt screens */
-int allowaltscreen = 1;
-
-/* allow certain non-interactive (insecure) window operations such as:
-   setting the clipboard text */
-int allowwindowops = 0;
-
-/*
- * draw latency range in ms - from new content/keypress/etc until drawing.
- * within this range, st draws when content stops arriving (idle). mostly it's
- * near minlatency, but it waits longer for slow updates to avoid partial draw.
- * low minlatency will tear/flicker more, as it can "detect" idle too early.
- */
-static double minlatency = 2;
-static double maxlatency = 33;
-
-/*
- * blinking timeout (set to 0 to disable blinking) for the terminal blinking
- * attribute.
- */
-static unsigned int blinktimeout = 800;
-
-/*
- * thickness of underline and bar cursors
- */
-static unsigned int cursorthickness = 2;
-
-/*
- * bell volume. It must be a value between -100 and 100. Use 0 for disabling
- * it
- */
-static int bellvolume = 0;
-
-/* default TERM value */
-char *termname = "st-256color";
-
-/*
- * spaces per tab
- *
- * When you are changing this value, don't forget to adapt the »it« value in
- * the st.info and appropriately install the st.info in the environment where
- * you use this st version.
- *
- *	it#$tabspaces,
- *
- * Secondly make sure your kernel is not expanding tabs. When running `stty
- * -a` »tab0« should appear. You can tell the terminal to not expand tabs by
- *  running following command:
- *
- *	stty tabs
- */
-unsigned int tabspaces = 8;
-
-/* Terminal colors (16 first used in escape sequence) */
-static const char *colorname[] = {
-	/* 8 normal colors */
-	"black",
-	"red3",
-	"green3",
-	"yellow3",
-	"blue2",
-	"magenta3",
-	"cyan3",
-	"gray90",
-
-	/* 8 bright colors */
-	"gray50",
-	"red",
-	"green",
-	"yellow",
-	"#5c5cff",
-	"magenta",
-	"cyan",
-	"white",
-
-	[255] = 0,
-
-	/* more colors can be added after 255 to use with DefaultXX */
-	"#cccccc",
-	"#555555",
-	"gray90", /* default foreground colour */
-	"black", /* default background colour */
-};
-
-
-/*
- * Default colors (colorname index)
- * foreground, background, cursor, reverse cursor
- */
-unsigned int defaultfg = 258;
-unsigned int defaultbg = 259;
-unsigned int defaultcs = 256;
-static unsigned int defaultrcs = 257;
-
-/*
- * Default shape of cursor
- * 2: Block ("█")
- * 4: Underline ("_")
- * 6: Bar ("|")
- * 7: Snowman ("☃")
- */
-static unsigned int cursorshape = 2;
-
-/*
- * Default columns and rows numbers
- */
-
-static unsigned int cols = 80;
-static unsigned int rows = 24;
-
-/*
- * Default colour and shape of the mouse cursor
- */
-static unsigned int mouseshape = XC_xterm;
-static unsigned int mousefg = 7;
-static unsigned int mousebg = 0;
-
-/*
- * Color used to display font attributes when fontconfig selected a font which
- * doesn't match the ones requested.
- */
-static unsigned int defaultattr = 11;
-
-/*
- * Force mouse select/shortcuts while mask is active (when MODE_MOUSE is set).
- * Note that if you want to use ShiftMask with selmasks, set this to an other
- * modifier, set to 0 to not use it.
- */
-static uint forcemousemod = ShiftMask;
-
-/*
- * Internal mouse shortcuts.
- * Beware that overloading Button1 will disable the selection.
- */
-static MouseShortcut mshortcuts[] = {
-	/* mask                 button   function        argument       release */
-	{ XK_ANY_MOD,           Button2, selpaste,       {.i = 0},      1 },
-	{ ShiftMask,            Button4, ttysend,        {.s = "\033[5;2~"} },
-	{ XK_ANY_MOD,           Button4, ttysend,        {.s = "\031"} },
-	{ ShiftMask,            Button5, ttysend,        {.s = "\033[6;2~"} },
-	{ XK_ANY_MOD,           Button5, ttysend,        {.s = "\005"} },
-};
-
-/* Internal keyboard shortcuts. */
-#define MODKEY Mod1Mask
-#define TERMMOD (ControlMask|ShiftMask)
-
-static Shortcut shortcuts[] = {
-	/* mask                 keysym          function        argument */
-	{ XK_ANY_MOD,           XK_Break,       sendbreak,      {.i =  0} },
-	{ ControlMask,          XK_Print,       toggleprinter,  {.i =  0} },
-	{ ShiftMask,            XK_Print,       printscreen,    {.i =  0} },
-	{ XK_ANY_MOD,           XK_Print,       printsel,       {.i =  0} },
-	{ TERMMOD,              XK_Prior,       zoom,           {.f = +1} },
-	{ TERMMOD,              XK_Next,        zoom,           {.f = -1} },
-	{ TERMMOD,              XK_Home,        zoomreset,      {.f =  0} },
-	{ TERMMOD,              XK_C,           clipcopy,       {.i =  0} },
-	{ TERMMOD,              XK_V,           clippaste,      {.i =  0} },
-	{ TERMMOD,              XK_Y,           selpaste,       {.i =  0} },
-	{ ShiftMask,            XK_Insert,      selpaste,       {.i =  0} },
-	{ TERMMOD,              XK_Num_Lock,    numlock,        {.i =  0} },
-};
-
-/*
- * Special keys (change & recompile st.info accordingly)
- *
- * Mask value:
- * * Use XK_ANY_MOD to match the key no matter modifiers state
- * * Use XK_NO_MOD to match the key alone (no modifiers)
- * appkey value:
- * * 0: no value
- * * > 0: keypad application mode enabled
- * *   = 2: term.numlock = 1
- * * < 0: keypad application mode disabled
- * appcursor value:
- * * 0: no value
- * * > 0: cursor application mode enabled
- * * < 0: cursor application mode disabled
- *
- * Be careful with the order of the definitions because st searches in
- * this table sequentially, so any XK_ANY_MOD must be in the last
- * position for a key.
- */
-
-/*
- * If you want keys other than the X11 function keys (0xFD00 - 0xFFFF)
- * to be mapped below, add them to this array.
- */
-static KeySym mappedkeys[] = { -1 };
-
-/*
- * State bits to ignore when matching key or button events.  By default,
- * numlock (Mod2Mask) and keyboard layout (XK_SWITCH_MOD) are ignored.
- */
-static uint ignoremod = Mod2Mask|XK_SWITCH_MOD;
-
-/*
- * This is the huge key array which defines all compatibility to the Linux
- * world. Please decide about changes wisely.
- */
-static Key key[] = {
-	/* keysym           mask            string      appkey appcursor */
-	{ XK_KP_Home,       ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_KP_Home,       ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_KP_Home,       XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033Ox",       +1,    0},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_KP_Up,         XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033Or",       +1,    0},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_KP_Down,       XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033Ot",       +1,    0},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_KP_Left,       XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033Ov",       +1,    0},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_KP_Right,      XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_KP_Prior,      ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_KP_Prior,      XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_KP_Begin,      XK_ANY_MOD,     "\033[E",        0,    0},
-	{ XK_KP_End,        ControlMask,    "\033[J",       -1,    0},
-	{ XK_KP_End,        ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[K",       -1,    0},
-	{ XK_KP_End,        ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_KP_End,        XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_KP_Next,       ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_KP_Next,       XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_KP_Insert,     ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[L",       -1,    0},
-	{ XK_KP_Insert,     ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_KP_Insert,     XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[M",       -1,    0},
-	{ XK_KP_Delete,     ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_KP_Delete,     ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_KP_Delete,     XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_KP_Multiply,   XK_ANY_MOD,     "\033Oj",       +2,    0},
-	{ XK_KP_Add,        XK_ANY_MOD,     "\033Ok",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\033OM",       +2,    0},
-	{ XK_KP_Enter,      XK_ANY_MOD,     "\r",           -1,    0},
-	{ XK_KP_Subtract,   XK_ANY_MOD,     "\033Om",       +2,    0},
-	{ XK_KP_Decimal,    XK_ANY_MOD,     "\033On",       +2,    0},
-	{ XK_KP_Divide,     XK_ANY_MOD,     "\033Oo",       +2,    0},
-	{ XK_KP_0,          XK_ANY_MOD,     "\033Op",       +2,    0},
-	{ XK_KP_1,          XK_ANY_MOD,     "\033Oq",       +2,    0},
-	{ XK_KP_2,          XK_ANY_MOD,     "\033Or",       +2,    0},
-	{ XK_KP_3,          XK_ANY_MOD,     "\033Os",       +2,    0},
-	{ XK_KP_4,          XK_ANY_MOD,     "\033Ot",       +2,    0},
-	{ XK_KP_5,          XK_ANY_MOD,     "\033Ou",       +2,    0},
-	{ XK_KP_6,          XK_ANY_MOD,     "\033Ov",       +2,    0},
-	{ XK_KP_7,          XK_ANY_MOD,     "\033Ow",       +2,    0},
-	{ XK_KP_8,          XK_ANY_MOD,     "\033Ox",       +2,    0},
-	{ XK_KP_9,          XK_ANY_MOD,     "\033Oy",       +2,    0},
-	{ XK_Up,            ShiftMask,      "\033[1;2A",     0,    0},
-	{ XK_Up,            Mod1Mask,       "\033[1;3A",     0,    0},
-	{ XK_Up,         ShiftMask|Mod1Mask,"\033[1;4A",     0,    0},
-	{ XK_Up,            ControlMask,    "\033[1;5A",     0,    0},
-	{ XK_Up,      ShiftMask|ControlMask,"\033[1;6A",     0,    0},
-	{ XK_Up,       ControlMask|Mod1Mask,"\033[1;7A",     0,    0},
-	{ XK_Up,ShiftMask|ControlMask|Mod1Mask,"\033[1;8A",  0,    0},
-	{ XK_Up,            XK_ANY_MOD,     "\033[A",        0,   -1},
-	{ XK_Up,            XK_ANY_MOD,     "\033OA",        0,   +1},
-	{ XK_Down,          ShiftMask,      "\033[1;2B",     0,    0},
-	{ XK_Down,          Mod1Mask,       "\033[1;3B",     0,    0},
-	{ XK_Down,       ShiftMask|Mod1Mask,"\033[1;4B",     0,    0},
-	{ XK_Down,          ControlMask,    "\033[1;5B",     0,    0},
-	{ XK_Down,    ShiftMask|ControlMask,"\033[1;6B",     0,    0},
-	{ XK_Down,     ControlMask|Mod1Mask,"\033[1;7B",     0,    0},
-	{ XK_Down,ShiftMask|ControlMask|Mod1Mask,"\033[1;8B",0,    0},
-	{ XK_Down,          XK_ANY_MOD,     "\033[B",        0,   -1},
-	{ XK_Down,          XK_ANY_MOD,     "\033OB",        0,   +1},
-	{ XK_Left,          ShiftMask,      "\033[1;2D",     0,    0},
-	{ XK_Left,          Mod1Mask,       "\033[1;3D",     0,    0},
-	{ XK_Left,       ShiftMask|Mod1Mask,"\033[1;4D",     0,    0},
-	{ XK_Left,          ControlMask,    "\033[1;5D",     0,    0},
-	{ XK_Left,    ShiftMask|ControlMask,"\033[1;6D",     0,    0},
-	{ XK_Left,     ControlMask|Mod1Mask,"\033[1;7D",     0,    0},
-	{ XK_Left,ShiftMask|ControlMask|Mod1Mask,"\033[1;8D",0,    0},
-	{ XK_Left,          XK_ANY_MOD,     "\033[D",        0,   -1},
-	{ XK_Left,          XK_ANY_MOD,     "\033OD",        0,   +1},
-	{ XK_Right,         ShiftMask,      "\033[1;2C",     0,    0},
-	{ XK_Right,         Mod1Mask,       "\033[1;3C",     0,    0},
-	{ XK_Right,      ShiftMask|Mod1Mask,"\033[1;4C",     0,    0},
-	{ XK_Right,         ControlMask,    "\033[1;5C",     0,    0},
-	{ XK_Right,   ShiftMask|ControlMask,"\033[1;6C",     0,    0},
-	{ XK_Right,    ControlMask|Mod1Mask,"\033[1;7C",     0,    0},
-	{ XK_Right,ShiftMask|ControlMask|Mod1Mask,"\033[1;8C",0,   0},
-	{ XK_Right,         XK_ANY_MOD,     "\033[C",        0,   -1},
-	{ XK_Right,         XK_ANY_MOD,     "\033OC",        0,   +1},
-	{ XK_ISO_Left_Tab,  ShiftMask,      "\033[Z",        0,    0},
-	{ XK_Return,        Mod1Mask,       "\033\r",        0,    0},
-	{ XK_Return,        XK_ANY_MOD,     "\r",            0,    0},
-	{ XK_Insert,        ShiftMask,      "\033[4l",      -1,    0},
-	{ XK_Insert,        ShiftMask,      "\033[2;2~",    +1,    0},
-	{ XK_Insert,        ControlMask,    "\033[L",       -1,    0},
-	{ XK_Insert,        ControlMask,    "\033[2;5~",    +1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[4h",      -1,    0},
-	{ XK_Insert,        XK_ANY_MOD,     "\033[2~",      +1,    0},
-	{ XK_Delete,        ControlMask,    "\033[M",       -1,    0},
-	{ XK_Delete,        ControlMask,    "\033[3;5~",    +1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[2K",      -1,    0},
-	{ XK_Delete,        ShiftMask,      "\033[3;2~",    +1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[P",       -1,    0},
-	{ XK_Delete,        XK_ANY_MOD,     "\033[3~",      +1,    0},
-	{ XK_BackSpace,     XK_NO_MOD,      "\177",          0,    0},
-	{ XK_BackSpace,     Mod1Mask,       "\033\177",      0,    0},
-	{ XK_Home,          ShiftMask,      "\033[2J",       0,   -1},
-	{ XK_Home,          ShiftMask,      "\033[1;2H",     0,   +1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[H",        0,   -1},
-	{ XK_Home,          XK_ANY_MOD,     "\033[1~",       0,   +1},
-	{ XK_End,           ControlMask,    "\033[J",       -1,    0},
-	{ XK_End,           ControlMask,    "\033[1;5F",    +1,    0},
-	{ XK_End,           ShiftMask,      "\033[K",       -1,    0},
-	{ XK_End,           ShiftMask,      "\033[1;2F",    +1,    0},
-	{ XK_End,           XK_ANY_MOD,     "\033[4~",       0,    0},
-	{ XK_Prior,         ControlMask,    "\033[5;5~",     0,    0},
-	{ XK_Prior,         ShiftMask,      "\033[5;2~",     0,    0},
-	{ XK_Prior,         XK_ANY_MOD,     "\033[5~",       0,    0},
-	{ XK_Next,          ControlMask,    "\033[6;5~",     0,    0},
-	{ XK_Next,          ShiftMask,      "\033[6;2~",     0,    0},
-	{ XK_Next,          XK_ANY_MOD,     "\033[6~",       0,    0},
-	{ XK_F1,            XK_NO_MOD,      "\033OP" ,       0,    0},
-	{ XK_F1, /* F13 */  ShiftMask,      "\033[1;2P",     0,    0},
-	{ XK_F1, /* F25 */  ControlMask,    "\033[1;5P",     0,    0},
-	{ XK_F1, /* F37 */  Mod4Mask,       "\033[1;6P",     0,    0},
-	{ XK_F1, /* F49 */  Mod1Mask,       "\033[1;3P",     0,    0},
-	{ XK_F1, /* F61 */  Mod3Mask,       "\033[1;4P",     0,    0},
-	{ XK_F2,            XK_NO_MOD,      "\033OQ" ,       0,    0},
-	{ XK_F2, /* F14 */  ShiftMask,      "\033[1;2Q",     0,    0},
-	{ XK_F2, /* F26 */  ControlMask,    "\033[1;5Q",     0,    0},
-	{ XK_F2, /* F38 */  Mod4Mask,       "\033[1;6Q",     0,    0},
-	{ XK_F2, /* F50 */  Mod1Mask,       "\033[1;3Q",     0,    0},
-	{ XK_F2, /* F62 */  Mod3Mask,       "\033[1;4Q",     0,    0},
-	{ XK_F3,            XK_NO_MOD,      "\033OR" ,       0,    0},
-	{ XK_F3, /* F15 */  ShiftMask,      "\033[1;2R",     0,    0},
-	{ XK_F3, /* F27 */  ControlMask,    "\033[1;5R",     0,    0},
-	{ XK_F3, /* F39 */  Mod4Mask,       "\033[1;6R",     0,    0},
-	{ XK_F3, /* F51 */  Mod1Mask,       "\033[1;3R",     0,    0},
-	{ XK_F3, /* F63 */  Mod3Mask,       "\033[1;4R",     0,    0},
-	{ XK_F4,            XK_NO_MOD,      "\033OS" ,       0,    0},
-	{ XK_F4, /* F16 */  ShiftMask,      "\033[1;2S",     0,    0},
-	{ XK_F4, /* F28 */  ControlMask,    "\033[1;5S",     0,    0},
-	{ XK_F4, /* F40 */  Mod4Mask,       "\033[1;6S",     0,    0},
-	{ XK_F4, /* F52 */  Mod1Mask,       "\033[1;3S",     0,    0},
-	{ XK_F5,            XK_NO_MOD,      "\033[15~",      0,    0},
-	{ XK_F5, /* F17 */  ShiftMask,      "\033[15;2~",    0,    0},
-	{ XK_F5, /* F29 */  ControlMask,    "\033[15;5~",    0,    0},
-	{ XK_F5, /* F41 */  Mod4Mask,       "\033[15;6~",    0,    0},
-	{ XK_F5, /* F53 */  Mod1Mask,       "\033[15;3~",    0,    0},
-	{ XK_F6,            XK_NO_MOD,      "\033[17~",      0,    0},
-	{ XK_F6, /* F18 */  ShiftMask,      "\033[17;2~",    0,    0},
-	{ XK_F6, /* F30 */  ControlMask,    "\033[17;5~",    0,    0},
-	{ XK_F6, /* F42 */  Mod4Mask,       "\033[17;6~",    0,    0},
-	{ XK_F6, /* F54 */  Mod1Mask,       "\033[17;3~",    0,    0},
-	{ XK_F7,            XK_NO_MOD,      "\033[18~",      0,    0},
-	{ XK_F7, /* F19 */  ShiftMask,      "\033[18;2~",    0,    0},
-	{ XK_F7, /* F31 */  ControlMask,    "\033[18;5~",    0,    0},
-	{ XK_F7, /* F43 */  Mod4Mask,       "\033[18;6~",    0,    0},
-	{ XK_F7, /* F55 */  Mod1Mask,       "\033[18;3~",    0,    0},
-	{ XK_F8,            XK_NO_MOD,      "\033[19~",      0,    0},
-	{ XK_F8, /* F20 */  ShiftMask,      "\033[19;2~",    0,    0},
-	{ XK_F8, /* F32 */  ControlMask,    "\033[19;5~",    0,    0},
-	{ XK_F8, /* F44 */  Mod4Mask,       "\033[19;6~",    0,    0},
-	{ XK_F8, /* F56 */  Mod1Mask,       "\033[19;3~",    0,    0},
-	{ XK_F9,            XK_NO_MOD,      "\033[20~",      0,    0},
-	{ XK_F9, /* F21 */  ShiftMask,      "\033[20;2~",    0,    0},
-	{ XK_F9, /* F33 */  ControlMask,    "\033[20;5~",    0,    0},
-	{ XK_F9, /* F45 */  Mod4Mask,       "\033[20;6~",    0,    0},
-	{ XK_F9, /* F57 */  Mod1Mask,       "\033[20;3~",    0,    0},
-	{ XK_F10,           XK_NO_MOD,      "\033[21~",      0,    0},
-	{ XK_F10, /* F22 */ ShiftMask,      "\033[21;2~",    0,    0},
-	{ XK_F10, /* F34 */ ControlMask,    "\033[21;5~",    0,    0},
-	{ XK_F10, /* F46 */ Mod4Mask,       "\033[21;6~",    0,    0},
-	{ XK_F10, /* F58 */ Mod1Mask,       "\033[21;3~",    0,    0},
-	{ XK_F11,           XK_NO_MOD,      "\033[23~",      0,    0},
-	{ XK_F11, /* F23 */ ShiftMask,      "\033[23;2~",    0,    0},
-	{ XK_F11, /* F35 */ ControlMask,    "\033[23;5~",    0,    0},
-	{ XK_F11, /* F47 */ Mod4Mask,       "\033[23;6~",    0,    0},
-	{ XK_F11, /* F59 */ Mod1Mask,       "\033[23;3~",    0,    0},
-	{ XK_F12,           XK_NO_MOD,      "\033[24~",      0,    0},
-	{ XK_F12, /* F24 */ ShiftMask,      "\033[24;2~",    0,    0},
-	{ XK_F12, /* F36 */ ControlMask,    "\033[24;5~",    0,    0},
-	{ XK_F12, /* F48 */ Mod4Mask,       "\033[24;6~",    0,    0},
-	{ XK_F12, /* F60 */ Mod1Mask,       "\033[24;3~",    0,    0},
-	{ XK_F13,           XK_NO_MOD,      "\033[1;2P",     0,    0},
-	{ XK_F14,           XK_NO_MOD,      "\033[1;2Q",     0,    0},
-	{ XK_F15,           XK_NO_MOD,      "\033[1;2R",     0,    0},
-	{ XK_F16,           XK_NO_MOD,      "\033[1;2S",     0,    0},
-	{ XK_F17,           XK_NO_MOD,      "\033[15;2~",    0,    0},
-	{ XK_F18,           XK_NO_MOD,      "\033[17;2~",    0,    0},
-	{ XK_F19,           XK_NO_MOD,      "\033[18;2~",    0,    0},
-	{ XK_F20,           XK_NO_MOD,      "\033[19;2~",    0,    0},
-	{ XK_F21,           XK_NO_MOD,      "\033[20;2~",    0,    0},
-	{ XK_F22,           XK_NO_MOD,      "\033[21;2~",    0,    0},
-	{ XK_F23,           XK_NO_MOD,      "\033[23;2~",    0,    0},
-	{ XK_F24,           XK_NO_MOD,      "\033[24;2~",    0,    0},
-	{ XK_F25,           XK_NO_MOD,      "\033[1;5P",     0,    0},
-	{ XK_F26,           XK_NO_MOD,      "\033[1;5Q",     0,    0},
-	{ XK_F27,           XK_NO_MOD,      "\033[1;5R",     0,    0},
-	{ XK_F28,           XK_NO_MOD,      "\033[1;5S",     0,    0},
-	{ XK_F29,           XK_NO_MOD,      "\033[15;5~",    0,    0},
-	{ XK_F30,           XK_NO_MOD,      "\033[17;5~",    0,    0},
-	{ XK_F31,           XK_NO_MOD,      "\033[18;5~",    0,    0},
-	{ XK_F32,           XK_NO_MOD,      "\033[19;5~",    0,    0},
-	{ XK_F33,           XK_NO_MOD,      "\033[20;5~",    0,    0},
-	{ XK_F34,           XK_NO_MOD,      "\033[21;5~",    0,    0},
-	{ XK_F35,           XK_NO_MOD,      "\033[23;5~",    0,    0},
-};
-
-/*
- * Selection types' masks.
- * Use the same masks as usual.
- * Button1Mask is always unset, to make masks match between ButtonPress.
- * ButtonRelease and MotionNotify.
- * If no match is found, regular selection is used.
- */
-static uint selmasks[] = {
-	[SEL_RECTANGULAR] = Mod1Mask,
-};
-
-/*
- * Printable characters in ASCII, used to estimate the advance width
- * of single wide characters.
- */
-static char ascii_printable[] =
-	" !\"#$%&'()*+,-./0123456789:;<=>?"
-	"@ABCDEFGHIJKLMNOPQRSTUVWXYZ[\\]^_"
-	"`abcdefghijklmnopqrstuvwxyz{|}~";
diff --git a/scripts/mkbackup b/scripts/mkbackup
index 6638f027..5c4b9630 100755
--- a/scripts/mkbackup
+++ b/scripts/mkbackup
@@ -2,4 +2,4 @@
 
 BACKUP_DATE=$(date +%m_%d_%Y)
 
-doas rsync -aHAXS --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found","/var/cache/distfiles/*","/home/brian/Documents/books/*","/home/brian/Videos/*","/home/brian/Music/*","/home/brian/Pictures/*","/home/brian/Audio/*","/home/brian/Games/*"} /* /mnt/media/usb-drive/"$HOST"_backup_"${BACKUP_DATE}"
+doas rsync -aHAXS --exclude={"/dev/*","/proc/*","/sys/*","/tmp/*","/run/*","/mnt/*","/media/*","/lost+found","/var/cache/distfiles/*","/var/cache/ccache/*","/home/brian/Documents/books/*","/home/brian/Videos/*","/home/brian/Music/*","/home/brian/Pictures/*","/home/brian/Audio/*","/home/brian/Games/*"} /* /mnt/media/usb-drive/gentoo_backup_"${BACKUP_DATE}"