diff --git a/.gitignore b/.gitignore
index e45103b..00e4653 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,3 @@
+.kilo
+tmp
 zsh/cache/*
diff --git a/README.md b/README.md
index d07da92..eba6ed1 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,17 @@
+# Исходники
+
+## Oh My Zsh
+https://github.com/ohmyzsh/ohmyzsh
+
+## Tmux
+https://github.com/samoshkin/tmux-config
+https://github.com/orgs/tmux-plugins/repositories?type=all
+
 ### Зависимости
+
 * tmux
 * zsh
 * vim
 * htop
 * xsel | xclip
-* tree
\ No newline at end of file
+* tree
diff --git a/install.sh b/install.sh
index e082e0f..1036245 100755
--- a/install.sh
+++ b/install.sh
@@ -26,4 +26,7 @@ ln -sf .dots/tmux/tmux.conf "$HOME"/.tmux.conf
 ln -sf .dots/zshrc "$HOME"/.zshrc
 ln -sf .dots/vim/vimrc "$HOME"/.vimrc
 
+# Initialise tmux plugin manager (https://github.com/tmux-plugins/tpm)
+git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm
+
 printf "OK: Completed\n"
diff --git a/tmux/plugins/tmux-battery/LICENSE.md b/tmux/plugins/tmux-battery/LICENSE.md
deleted file mode 100644
index 40f6ddd..0000000
--- a/tmux/plugins/tmux-battery/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Bruno Sutic
-
-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/tmux/plugins/tmux-battery/README.md b/tmux/plugins/tmux-battery/README.md
deleted file mode 100644
index 5bf4775..0000000
--- a/tmux/plugins/tmux-battery/README.md
+++ /dev/null
@@ -1,262 +0,0 @@
-# Tmux battery status
-
-Enables displaying battery percentage and status icon in tmux status-right.
-
-## Installation
-
-In order to read the battery status, this plugin depends on having one of the following applications installed:
-- pmset (MacOS only)
-- acpi
-- upower
-- termux-battery-status
-- apm
-
-In a normal situation, one of the above should be installed on your system by default and thus it should not be necessary to specifically install one of them. That being said, the `acpi` utility is currently recommended for use over `upower` where possible due to ongoing CPU usage issues.
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-```tmux
-set -g @plugin 'tmux-plugins/tmux-battery'
-```
-
-Hit `<prefix> + I` to fetch the plugin and source it.
-
-If format strings are added to `status-right`, they should now be visible.
-
-### Manual Installation
-
-Clone the repo:
-
-```shell
-git clone https://github.com/tmux-plugins/tmux-battery ~/clone/path
-```
-
-Add this line to the bottom of `.tmux.conf`:
-
-```tmux
-run-shell ~/clone/path/battery.tmux
-```
-
-From the terminal, reload TMUX environment:
-
-```shell
-tmux source-file ~/.tmux.conf
-```
-
-If format strings are added to `status-right`, they should now be visible.
-
-## Usage
-
-Add any of the supported format strings (see below) to the `status-right` tmux option in `.tmux.conf`. Example:
-
-```tmux
-set -g status-right '#{battery_status_bg} Batt: #{battery_icon} #{battery_percentage} #{battery_remain} | %a %h-%d %H:%M '
-```
-
-### Supported Format Strings
-
- - `#{battery_color_bg}` - will set the background color of the status bar based on the battery charge level if discharging and status otherwise
- - `#{battery_color_fg}` - will set the foreground color of the status bar based on the battery charge level if discharging and status otherwise
- - `#{battery_color_charge_bg}` - will set the background color of the status bar based solely on the battery charge level
- - `#{battery_color_charge_fg}` - will set the foreground color of the status bar based solely on the battery charge level
- - `#{battery_color_status_bg}` - will set the background color of the status bar based solely on the battery status
- - `#{battery_color_status_fg}` - will set the foreground color of the status bar based solely on the battery status
- - `#{battery_graph}` - will show battery percentage as a bar graph: ▁▂▄▆█
- - `#{battery_icon}` - will display a battery status/charge icon
- - `#{battery_icon_charge}` - will display a battery charge icon
- - `#{battery_icon_status}` - will display a battery status icon
- - `#{battery_percentage}` - will show battery percentage
- - `#{battery_remain}` - will show remaining time of battery charge\*
-
-\* These format strings can be further customized via options as described below.
-
-#### Options
-
-`#{battery_remain}`
-
- - `@batt_remain_short`: 'true' / 'false' - This will shorten the time remaining (when charging or discharging) to `~H:MM`.
-
-### Defaults
-
-#### Options
-
- - `@batt_remain_short`: 'false'
-
-#### Icons/Colors
-
-By default, the following colors and icons are used. (The exact colors displayed depends on your terminal / X11 config.)
-
-Please be aware that the 'level of charge' as noted below (e.g. `[80%-95%)`) uses interval notation. If you are unfamiliar with it, <a href="https://en.wikipedia.org/wiki/Bracket_(mathematics)#Intervals">check it out here</a>.
-
-Also, a note about the `@batt_color_...` options: `@batt_color_..._primary_...` options are what will be displayed in the main `bg` or `fg` format strings you choose - e.g. if you use `#{battery_color_bg}`, the `@batt_color_..._primary_...` colors you choose will be the background. Likewise, the corresponding `@batt_color_..._secondary_...` color will be the foreground.
-
-Level of Charge Colors:
-
- - primary tier 8 \[95%-100%] (`@batt_color_charge_primary_tier8`): '#00ff00'
- - primary tier 7 \[80%-95%) (`@batt_color_charge_primary_tier7`): '#55ff00'
- - primary tier 6 \[65%-80%) (`@batt_color_charge_primary_tier6`): '#aaff00'
- - primary tier 5 \[50%-65%) (`@batt_color_charge_primary_tier5`): '#ffff00'
- - primary tier 4 \[35%-50%) (`@batt_color_charge_primary_tier4`): '#ffc000'
- - primary tier 3 \[20%-35%) (`@batt_color_charge_primary_tier3`): '#ff8000'
- - primary tier 2 (5%-20%) (`@batt_color_charge_primary_tier2`): '#ff4000'
- - primary tier 1 \[0%-5%] (`@batt_color_charge_primary_tier1`): '#ff0000'
- - secondary tier 8 \[95%-100%] (`@batt_color_charge_secondary_tier8`): 'colour0'
- - secondary tier 7 \[80%-95%) (`@batt_color_charge_secondary_tier7`): 'colour0'
- - secondary tier 6 \[65%-80%) (`@batt_color_charge_secondary_tier6`): 'colour0'
- - secondary tier 5 \[50%-65%) (`@batt_color_charge_secondary_tier5`): 'colour0'
- - secondary tier 4 \[35%-50%) (`@batt_color_charge_secondary_tier4`): 'colour0'
- - secondary tier 3 \[20%-35%) (`@batt_color_charge_secondary_tier3`): 'colour0'
- - secondary tier 2 (5%-20%) (`@batt_color_charge_secondary_tier2`): 'colour0'
- - secondary tier 1 \[0%-5%] (`@batt_color_charge_secondary_tier1`): 'colour0'
-
-Status Colors:
-
- - primary charged (`@batt_color_status_primary_charged`): 'colour33'
- - primary charging (`@batt_color_status_primary_charging`): 'colour33'
- - primary discharging (`@batt_color_status_primary_discharging`): 'colour14'
- - primary attached (`@batt_color_status_primary_attached`): 'colour201'
- - primary unknown (`@batt_color_status_primary_unknown`): 'colour7'
- - secondary charged (`@batt_color_status_secondary_charged`): 'colour0'
- - secondary charging (`@batt_color_status_secondary_charging`): 'colour0'
- - secondary discharging (`@batt_color_status_secondary_discharging`): 'colour0'
- - secondary attached (`@batt_color_status_secondary_attached`): 'colour0'
- - secondary unknown (`@batt_color_status_secondary_unknown`): 'colour0'
-
-Level of Charge Icons:
-
- - tier 8 \[95%-100%] (`@batt_icon_charge_tier8`): '█'
- - tier 7 \[80%-95%) (`@batt_icon_charge_tier7`): '▇'
- - tier 6 \[65%-80%) (`@batt_icon_charge_tier6`): '▆'
- - tier 5 \[50%-65%) (`@batt_icon_charge_tier5`): '▅'
- - tier 4 \[35%-50%) (`@batt_icon_charge_tier4`): '▄'
- - tier 3 \[20%-35%) (`@batt_icon_charge_tier3`): '▃'
- - tier 2 (5%-20%) (`@batt_icon_charge_tier2`): '▂'
- - tier 1 \[0%-5%] (`@batt_icon_charge_tier1`): '▁'
-
-Status Icons:
-
- - charged (`@batt_icon_status_charged`): '🔌'
- - charged - OS X (`@batt_icon_status_charged`): '🔌'
- - charging (`@batt_icon_status_charging`): '🔌'
- - discharging (`@batt_icon_status_discharging`): '🔋'
- - attached (`@batt_icon_status_attached`): '⚠️'
- - unknown (`@batt_icon_status_unknown`): '?'
-
-#### Changing the Defaults
-
-All efforts have been made to make sane defaults, but if you wish to change any of them, add the option to `.tmux.conf`. For example:
-
-```tmux
-set -g @batt_icon_charge_tier8 '🌕'
-set -g @batt_icon_charge_tier7 '🌖'
-set -g @batt_icon_charge_tier6 '🌖'
-set -g @batt_icon_charge_tier5 '🌗'
-set -g @batt_icon_charge_tier4 '🌗'
-set -g @batt_icon_charge_tier3 '🌘'
-set -g @batt_icon_charge_tier2 '🌘'
-set -g @batt_icon_charge_tier1 '🌑'
-set -g @batt_icon_status_charged '🔋'
-set -g @batt_icon_status_charging '⚡'
-set -g @batt_icon_status_discharging '👎'
-set -g @batt_color_status_primary_charged '#3daee9'
-set -g @batt_color_status_primary_charging '#3daee9'
-```
-
-Don't forget to reload the tmux environment after you do this by either hitting `<prefix> + I` if tmux battery is installed via the tmux plugin manager, or by typing `tmux source-file ~/.tmux.conf` in the terminal if tmux battery is manually installed.
-
-*Warning*: The battery icon change most likely will not be instant. When you un-plug the power cord, it will take some time (15 - 60 seconds) for the icon to change. This depends on the `status-interval` tmux option. Setting it to 15 seconds should be good enough.
-
-## Examples
-
-These are all examples of the default plugin color and icon schemes paired with the default tmux color scheme using the following `status-right` and `status-right-length` settings in `.tmux.conf`
-
-```tmux
-set -g status-right 'Colors: #{battery_color_bg}bg#[default] #{battery_color_fg}fg#[default] #{battery_color_charge_bg}charge_bg#[default] #{battery_color_charge_fg}charge_fg#[default] #{battery_color_status_bg}status_bg#[default] #{battery_color_status_fg}status_fg#[default] | Graph: #{battery_graph} | Icon: #{battery_icon} | Charge Icon: #{battery_icon_charge} | Status Icon: #{battery_icon_status} | Percent: #{battery_percentage} | Remain: #{battery_remain}'
-set -g status-right-length '150'
-```
-
-Battery charging at tier 8 \[95%-100%]:<br>
-![battery-charging-tier8](./screenshots/battery_charging_tier8.png)
-
-Battery charging at tier 7 \[80%-95%):<br>
-![battery-charging-tier7](./screenshots/battery_charging_tier7.png)
-
-Battery charging at tier 6 \[65%-80%):<br>
-![battery-charging-tier6](./screenshots/battery_charging_tier6.png)
-
-Battery charging at tier 5 \[50%-65%):<br>
-![battery-charging-tier5](./screenshots/battery_charging_tier5.png)
-
-Battery charging at tier 4 \[35%-50%):<br>
-![battery-charging-tier4](./screenshots/battery_charging_tier4.png)
-
-Battery charging at tier 3 \[20%-35%):<br>
-![battery-charging-tier3](./screenshots/battery_charging_tier3.png)
-
-Battery charging at tier 2 (5%-20%):<br>
-![battery-charging-tier2](./screenshots/battery_charging_tier2.png)
-
-Battery charging at tier 1 \[0%-5%]:<br>
-![battery-charging-tier1](./screenshots/battery_charging_tier1.png)
-
-Battery discharging at tier 8 \[95%-100%]:<br>
-![battery-discharging-tier8](./screenshots/battery_discharging_tier8.png)
-
-Battery discharging at tier 7 \[80%-95%):<br>
-![battery-discharging-tier7](./screenshots/battery_discharging_tier7.png)
-
-Battery discharging at tier 6 \[65%-80%):<br>
-![battery-discharging-tier6](./screenshots/battery_discharging_tier6.png)
-
-Battery discharging at tier 5 \[50%-65%):<br>
-![battery-discharging-tier5](./screenshots/battery_discharging_tier5.png)
-
-Battery discharging at tier 4 \[35%-50%):<br>
-![battery-discharging-tier4](./screenshots/battery_discharging_tier4.png)
-
-Battery discharging at tier 3 \[20%-35%):<br>
-![battery-discharging-tier3](./screenshots/battery_discharging_tier3.png)
-
-Battery discharging at tier 2 (5%-20%):<br>
-![battery-discharging-tier2](./screenshots/battery_discharging_tier2.png)
-
-Battery discharging at tier 1 \[0%-5%]:<br>
-![battery-discharging-tier1](./screenshots/battery_discharging_tier1.png)
-
-Battery in 'attached' status:<br>
-![battery-status-attached](./screenshots/battery_status_attached.png)
-
-Battery in an unknown status:<br>
-![battery-status-unknown](./screenshots/battery_status_unknown.png)
-
-### Tmux Plugins
-
-This plugin is part of the [tmux-plugins](https://github.com/tmux-plugins) organisation. Checkout plugins as [resurrect](https://github.com/tmux-plugins/tmux-resurrect), [logging](https://github.com/tmux-plugins/tmux-logging), [online status](https://github.com/tmux-plugins/tmux-online-status), and many more over at the [tmux-plugins](https://github.com/tmux-plugins) organisation page.
-
-### Maintainer
-
- - [Martin Beentjes](https://github.com/martinbeentjes)
-
-### Contributors
-
- - Adam Biggs
- - Aleksandar Djurdjic
- - Bruno Sutic
- - Caleb
- - Dan Cassidy
- - Diego Ximenes
- - Evan N-D
- - Jan Ahrens
- - Joey Geralnik
- - HyunJong (Joseph) Lee
- - Martin Beentjes
- - Mike Foley
- - Ryan Frantz
- - Seth Wright
- - Tom Levens
-
-### License
-
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-battery/battery.tmux b/tmux/plugins/tmux-battery/battery.tmux
deleted file mode 100755
index 0c666b8..0000000
--- a/tmux/plugins/tmux-battery/battery.tmux
+++ /dev/null
@@ -1,62 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/scripts/helpers.sh"
-
-battery_interpolation=(
-	"\#{battery_color_bg}"
-	"\#{battery_color_fg}"
-	"\#{battery_color_charge_bg}"
-	"\#{battery_color_charge_fg}"
-	"\#{battery_color_status_bg}"
-	"\#{battery_color_status_fg}"
-	"\#{battery_graph}"
-	"\#{battery_icon}"
-	"\#{battery_icon_charge}"
-	"\#{battery_icon_status}"
-	"\#{battery_percentage}"
-	"\#{battery_remain}"
-)
-
-battery_commands=(
-	"#($CURRENT_DIR/scripts/battery_color.sh bg)"
-	"#($CURRENT_DIR/scripts/battery_color.sh fg)"
-	"#($CURRENT_DIR/scripts/battery_color_charge.sh bg)"
-	"#($CURRENT_DIR/scripts/battery_color_charge.sh fg)"
-	"#($CURRENT_DIR/scripts/battery_color_status.sh bg)"
-	"#($CURRENT_DIR/scripts/battery_color_status.sh fg)"
-	"#($CURRENT_DIR/scripts/battery_graph.sh)"
-	"#($CURRENT_DIR/scripts/battery_icon.sh)"
-	"#($CURRENT_DIR/scripts/battery_icon_charge.sh)"
-	"#($CURRENT_DIR/scripts/battery_icon_status.sh)"
-	"#($CURRENT_DIR/scripts/battery_percentage.sh)"
-	"#($CURRENT_DIR/scripts/battery_remain.sh)"
-)
-
-set_tmux_option() {
-	local option="$1"
-	local value="$2"
-	tmux set-option -gq "$option" "$value"
-}
-
-do_interpolation() {
-	local all_interpolated="$1"
-	for ((i=0; i<${#battery_commands[@]}; i++)); do
-		all_interpolated=${all_interpolated//${battery_interpolation[$i]}/${battery_commands[$i]}}
-	done
-	echo "$all_interpolated"
-}
-
-update_tmux_option() {
-	local option="$1"
-	local option_value="$(get_tmux_option "$option")"
-	local new_option_value="$(do_interpolation "$option_value")"
-	set_tmux_option "$option" "$new_option_value"
-}
-
-main() {
-	update_tmux_option "status-right"
-	update_tmux_option "status-left"
-}
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_color.sh b/tmux/plugins/tmux-battery/scripts/battery_color.sh
deleted file mode 100755
index d8fefeb..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_color.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-print_color() {
-	local plane="$1"
-	local status="$2"
-	if [ "$status" == "discharging" ]; then
-		$CURRENT_DIR/battery_color_charge.sh "$plane"
-	else
-		$CURRENT_DIR/battery_color_status.sh "$plane" "$status"
-	fi
-}
-
-main() {
-	local status="$(battery_status)"
-	local plane="$1"
-	print_color "$plane" "$status"
-}
-
-main $@
diff --git a/tmux/plugins/tmux-battery/scripts/battery_color_charge.sh b/tmux/plugins/tmux-battery/scripts/battery_color_charge.sh
deleted file mode 100755
index c09a8d4..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_color_charge.sh
+++ /dev/null
@@ -1,98 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-# script global variables
-color_charge_primary_tier8=''
-color_charge_primary_tier7=''
-color_charge_primary_tier6=''
-color_charge_primary_tier5=''
-color_charge_primary_tier4=''
-color_charge_primary_tier3=''
-color_charge_primary_tier2=''
-color_charge_primary_tier1=''
-color_charge_secondary_tier8=''
-color_charge_secondary_tier7=''
-color_charge_secondary_tier6=''
-color_charge_secondary_tier5=''
-color_charge_secondary_tier4=''
-color_charge_secondary_tier3=''
-color_charge_secondary_tier2=''
-color_charge_secondary_tier1=''
-
-# script default variables
-color_charge_primary_tier8_default='#00ff00'
-color_charge_primary_tier7_default='#55ff00'
-color_charge_primary_tier6_default='#aaff00'
-color_charge_primary_tier5_default='#ffff00'
-color_charge_primary_tier4_default='#ffc000'
-color_charge_primary_tier3_default='#ff8000'
-color_charge_primary_tier2_default='#ff4000'
-color_charge_primary_tier1_default='#ff0000'
-color_charge_secondary_tier8_default='colour0'
-color_charge_secondary_tier7_default='colour0'
-color_charge_secondary_tier6_default='colour0'
-color_charge_secondary_tier5_default='colour0'
-color_charge_secondary_tier4_default='colour0'
-color_charge_secondary_tier3_default='colour0'
-color_charge_secondary_tier2_default='colour0'
-color_charge_secondary_tier1_default='colour0'
-
-# colors are set as script global variables
-get_color_charge_settings() {
-	color_charge_primary_tier8=$(get_tmux_option "@batt_color_charge_primary_tier8" "$color_charge_primary_tier8_default")
-	color_charge_primary_tier7=$(get_tmux_option "@batt_color_charge_primary_tier7" "$color_charge_primary_tier7_default")
-	color_charge_primary_tier6=$(get_tmux_option "@batt_color_charge_primary_tier6" "$color_charge_primary_tier6_default")
-	color_charge_primary_tier5=$(get_tmux_option "@batt_color_charge_primary_tier5" "$color_charge_primary_tier5_default")
-	color_charge_primary_tier4=$(get_tmux_option "@batt_color_charge_primary_tier4" "$color_charge_primary_tier4_default")
-	color_charge_primary_tier3=$(get_tmux_option "@batt_color_charge_primary_tier3" "$color_charge_primary_tier3_default")
-	color_charge_primary_tier2=$(get_tmux_option "@batt_color_charge_primary_tier2" "$color_charge_primary_tier2_default")
-	color_charge_primary_tier1=$(get_tmux_option "@batt_color_charge_primary_tier1" "$color_charge_primary_tier1_default")
-	color_charge_secondary_tier8=$(get_tmux_option "@batt_color_charge_secondary_tier8" "$color_charge_secondary_tier8_default")
-	color_charge_secondary_tier7=$(get_tmux_option "@batt_color_charge_secondary_tier7" "$color_charge_secondary_tier7_default")
-	color_charge_secondary_tier6=$(get_tmux_option "@batt_color_charge_secondary_tier6" "$color_charge_secondary_tier6_default")
-	color_charge_secondary_tier5=$(get_tmux_option "@batt_color_charge_secondary_tier5" "$color_charge_secondary_tier5_default")
-	color_charge_secondary_tier4=$(get_tmux_option "@batt_color_charge_secondary_tier4" "$color_charge_secondary_tier4_default")
-	color_charge_secondary_tier3=$(get_tmux_option "@batt_color_charge_secondary_tier3" "$color_charge_secondary_tier3_default")
-	color_charge_secondary_tier2=$(get_tmux_option "@batt_color_charge_secondary_tier2" "$color_charge_secondary_tier2_default")
-	color_charge_secondary_tier1=$(get_tmux_option "@batt_color_charge_secondary_tier1" "$color_charge_secondary_tier1_default")
-}
-
-print_color_charge() {
-	local primary_plane="$1"
-	local secondary_plane=""
-	if [ "$primary_plane" == "bg" ]; then
-		secondary_plane="fg"
-	else
-		secondary_plane="bg"
-	fi
-	percentage=$($CURRENT_DIR/battery_percentage.sh | sed -e 's/%//')
-	if [ $percentage -ge 95 -o "$percentage" == "" ]; then
-		# if percentage is empty, assume it's a desktop
-		printf "#[$primary_plane=$color_charge_primary_tier8${color_charge_secondary_tier8:+",$secondary_plane=$color_charge_secondary_tier8"}]"
-	elif [ $percentage -ge 80 ]; then
-		printf "#[$primary_plane=$color_charge_primary_tier7${color_charge_secondary_tier7:+",$secondary_plane=$color_charge_secondary_tier7"}]"
-	elif [ $percentage -ge 65 ]; then
-		printf "#[$primary_plane=$color_charge_primary_tier6${color_charge_secondary_tier6:+",$secondary_plane=$color_charge_secondary_tier6"}]"
-	elif [ $percentage -ge 50 ]; then
-		printf "#[$primary_plane=$color_charge_primary_tier5${color_charge_secondary_tier5:+",$secondary_plane=$color_charge_secondary_tier5"}]"
-	elif [ $percentage -ge 35 ]; then
-		printf "#[$primary_plane=$color_charge_primary_tier4${color_charge_secondary_tier4:+",$secondary_plane=$color_charge_secondary_tier4"}]"
-	elif [ $percentage -ge 20 ]; then
-		printf "#[$primary_plane=$color_charge_primary_tier3${color_charge_secondary_tier3:+",$secondary_plane=$color_charge_secondary_tier3"}]"
-	elif [ $percentage -gt 5 ]; then
-		printf "#[$primary_plane=$color_charge_primary_tier2${color_charge_secondary_tier2:+",$secondary_plane=$color_charge_secondary_tier2"}]"
-	else
-		printf "#[$primary_plane=$color_charge_primary_tier1${color_charge_secondary_tier1:+",$secondary_plane=$color_charge_secondary_tier1"}]"
-	fi
-}
-
-main() {
-	local plane="$1"
-	get_color_charge_settings
-	print_color_charge "$plane"
-}
-
-main $@
diff --git a/tmux/plugins/tmux-battery/scripts/battery_color_status.sh b/tmux/plugins/tmux-battery/scripts/battery_color_status.sh
deleted file mode 100755
index 429f847..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_color_status.sh
+++ /dev/null
@@ -1,74 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-# script global variables
-color_status_primary_charged=''
-color_status_primary_charging=''
-color_status_primary_discharging=''
-color_status_primary_attached=''
-color_status_primary_unknown=''
-color_status_secondary_charged=''
-color_status_secondary_charging=''
-color_status_secondary_discharging=''
-color_status_secondary_attached=''
-color_status_secondary_unknown=''
-
-# script default variables
-color_status_primary_charged_default='colour33'
-color_status_primary_charging_default='colour33'
-color_status_primary_discharging_default='colour14'
-color_status_primary_attached_default='colour201'
-color_status_primary_unknown_default='colour7'
-color_status_secondary_charged_default='colour0'
-color_status_secondary_charging_default='colour0'
-color_status_secondary_discharging_default='colour0'
-color_status_secondary_attached_default='colour0'
-color_status_secondary_unknown_default='colour0'
-
-# colors are set as script global variables
-get_color_status_settings() {
-	color_status_primary_charged=$(get_tmux_option "@batt_color_status_primary_charged" "$color_status_primary_charged_default")
-	color_status_primary_charging=$(get_tmux_option "@batt_color_status_primary_charging" "$color_status_primary_charging_default")
-	color_status_primary_discharging=$(get_tmux_option "@batt_color_status_primary_discharging" "$color_status_primary_discharging_default")
-	color_status_primary_attached=$(get_tmux_option "@batt_color_status_primary_attached" "$color_status_primary_attached_default")
-	color_status_primary_unknown=$(get_tmux_option "@batt_color_status_primary_unknown" "$color_status_primary_unknown_default")
-	color_status_secondary_charged=$(get_tmux_option "@batt_color_status_secondary_charged" "$color_status_secondary_charged_default")
-	color_status_secondary_charging=$(get_tmux_option "@batt_color_status_secondary_charging" "$color_status_secondary_charging_default")
-	color_status_secondary_discharging=$(get_tmux_option "@batt_color_status_secondary_discharging" "$color_status_secondary_discharging_default")
-	color_status_secondary_attached=$(get_tmux_option "@batt_color_status_secondary_attached" "$color_status_secondary_attached_default")
-	color_status_secondary_unknown=$(get_tmux_option "@batt_color_status_secondary_unknown" "$color_status_secondary_unknown_default")
-}
-
-print_color_status() {
-	local plane_primary="$1"
-	local plane_secondary=""
-	if [ "$plane_primary" == "bg" ]; then
-		plane_secondary="fg"
-	else
-		plane_secondary="bg"
-	fi
-	local status="$2"
-	if [[ $status =~ (charged) || $status =~ (full) ]]; then
-		printf "#[$plane_primary=$color_status_primary_charged${color_status_secondary_charged:+",$plane_secondary=$color_status_secondary_charged"}]"
-	elif [[ $status =~ (^charging) ]]; then
-		printf "#[$plane_primary=$color_status_primary_charging${color_status_secondary_charging:+",$plane_secondary=$color_status_secondary_charging"}]"
-	elif [[ $status =~ (^discharging) ]]; then
-		printf "#[$plane_primary=$color_status_primary_discharging${color_status_secondary_discharging:+",$plane_secondary=$color_status_secondary_discharging"}]"
-	elif [[ $status =~ (attached) ]]; then
-		printf "#[$plane_primary=$color_status_primary_attached${color_status_secondary_attached:+",$plane_secondary=$color_status_secondary_attached"}]"
-	else
-		printf "#[$plane_primary=$color_status_primary_unknown${color_status_secondary_unknown:+",$plane_secondary=$color_status_secondary_unknown"}]"
-	fi
-}
-
-main() {
-	local plane="$1"
-	local status=${2:-$(battery_status)}
-	get_color_status_settings
-	print_color_status "$plane" "$status"
-}
-
-main $@
diff --git a/tmux/plugins/tmux-battery/scripts/battery_graph.sh b/tmux/plugins/tmux-battery/scripts/battery_graph.sh
deleted file mode 100755
index 42f23c4..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_graph.sh
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-print_graph() {
-	local percentage=$1
-	if [ $percentage -gt 5 ]; then
-		printf "▁"
-	else
-		printf " "
-	fi
-	if [ $percentage -ge 25 ]; then
-		printf "▂"
-	else
-		printf " "
-	fi
-	if [ $percentage -ge 50 ]; then
-		printf "▄"
-	else
-		printf " "
-	fi
-	if [ $percentage -ge 75 ]; then
-		printf "▆"
-	else
-		printf " "
-	fi
-	if [ $percentage -ge 95 ]; then
-		printf "█"
-	else
-		printf " "
-		echo "▇"
-	fi
-}
-
-main() {
-	local percentage=$($CURRENT_DIR/battery_percentage.sh)
-	if [ "$(uname)" == "OpenBSD" ]; then
-		print_graph ${percentage}
-	else
-		print_graph ${percentage%?}
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_icon.sh b/tmux/plugins/tmux-battery/scripts/battery_icon.sh
deleted file mode 100755
index b40c42e..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_icon.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-print_icon() {
-	local status=$1
-	if [ "$status" == "discharging" ]; then
-		$CURRENT_DIR/battery_icon_charge.sh
-	else
-		$CURRENT_DIR/battery_icon_status.sh "$status"
-	fi
-}
-
-main() {
-	local status=$(battery_status)
-	print_icon "$status"
-}
-
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_icon_charge.sh b/tmux/plugins/tmux-battery/scripts/battery_icon_charge.sh
deleted file mode 100755
index 8bdd568..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_icon_charge.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-# script global variables
-icon_charge_tier8=''
-icon_charge_tier7=''
-icon_charge_tier6=''
-icon_charge_tier5=''
-icon_charge_tier4=''
-icon_charge_tier3=''
-icon_charge_tier2=''
-icon_charge_tier1=''
-
-# script default variables
-icon_charge_tier8_default='█'
-icon_charge_tier7_default='▇'
-icon_charge_tier6_default='▆'
-icon_charge_tier5_default='▅'
-icon_charge_tier4_default='▄'
-icon_charge_tier3_default='▃'
-icon_charge_tier2_default='▂'
-icon_charge_tier1_default='▁'
-
-# icons are set as script global variables
-get_icon_charge_settings() {
-	icon_charge_tier8=$(get_tmux_option "@batt_icon_charge_tier8" "$icon_charge_tier8_default")
-	icon_charge_tier7=$(get_tmux_option "@batt_icon_charge_tier7" "$icon_charge_tier7_default")
-	icon_charge_tier6=$(get_tmux_option "@batt_icon_charge_tier6" "$icon_charge_tier6_default")
-	icon_charge_tier5=$(get_tmux_option "@batt_icon_charge_tier5" "$icon_charge_tier5_default")
-	icon_charge_tier4=$(get_tmux_option "@batt_icon_charge_tier4" "$icon_charge_tier4_default")
-	icon_charge_tier3=$(get_tmux_option "@batt_icon_charge_tier3" "$icon_charge_tier3_default")
-	icon_charge_tier2=$(get_tmux_option "@batt_icon_charge_tier2" "$icon_charge_tier2_default")
-	icon_charge_tier1=$(get_tmux_option "@batt_icon_charge_tier1" "$icon_charge_tier1_default")
-}
-
-print_icon_charge() {
-	percentage=$($CURRENT_DIR/battery_percentage.sh | sed -e 's/%//')
-	if [ $percentage -ge 95 -o "$percentage" == "" ]; then
-		# if percentage is empty, assume it's a desktop
-		printf "$icon_charge_tier8"
-	elif [ $percentage -ge 80 ]; then
-		printf "$icon_charge_tier7"
-	elif [ $percentage -ge 65 ]; then
-		printf "$icon_charge_tier6"
-	elif [ $percentage -ge 50 ]; then
-		printf "$icon_charge_tier5"
-	elif [ $percentage -ge 35 ]; then
-		printf "$icon_charge_tier4"
-	elif [ $percentage -ge 20 ]; then
-		printf "$icon_charge_tier3"
-	elif [ $percentage -gt 5 ]; then
-		printf "$icon_charge_tier2"
-	else
-		printf "$icon_charge_tier1"
-	fi
-}
-
-main() {
-	get_icon_charge_settings
-	print_icon_charge
-}
-
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_icon_status.sh b/tmux/plugins/tmux-battery/scripts/battery_icon_status.sh
deleted file mode 100755
index e1873fb..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_icon_status.sh
+++ /dev/null
@@ -1,61 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-# script global variables
-icon_status_charged=''
-icon_status_charging=''
-icon_status_discharging=''
-icon_status_attached=''
-icon_status_unknown=''
-
-# script default variables
-icon_status_charged_default='🔌'
-icon_status_charged_default_osx='🔌'
-icon_status_charging_default='🔌'
-icon_status_discharging_default='🔋'
-icon_status_attached_default='⚠️'
-icon_status_unknown_default='?'
-
-# determine which charged_default variable to use
-get_icon_status_charged_default() {
-	if is_osx; then
-		printf "$icon_status_charged_default_osx"
-	else
-		printf "$icon_status_charged_default"
-	fi
-}
-
-# icons are set as script global variables
-get_icon_status_settings() {
-	icon_status_charged=$(get_tmux_option "@batt_icon_status_charged" "$(get_icon_status_charged_default)")
-	icon_status_charging=$(get_tmux_option "@batt_icon_status_charging" "$icon_status_charging_default")
-	icon_status_discharging=$(get_tmux_option "@batt_icon_status_discharging" "$icon_status_discharging_default")
-	icon_status_attached=$(get_tmux_option "@batt_icon_status_attached" "$icon_status_attached_default")
-	icon_status_unknown=$(get_tmux_option "@batt_icon_status_unknown" "$icon_status_unknown_default")
-}
-
-print_icon_status() {
-	local status=$1
-	if [[ $status =~ (charged) || $status =~ (full) ]]; then
-		printf "$icon_status_charged"
-	elif [[ $status =~ (^charging) ]]; then
-		printf "$icon_status_charging"
-	elif [[ $status =~ (^discharging) ]]; then
-		printf "$icon_status_discharging"
-	elif [[ $status =~ (attached) ]]; then
-		printf "$icon_status_attached"
-	else
-		printf "$icon_status_unknown"
-	fi
-}
-
-main() {
-	get_icon_status_settings
-	local status=${1:-$(battery_status)}
-	print_icon_status "$status"
-}
-
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_percentage.sh b/tmux/plugins/tmux-battery/scripts/battery_percentage.sh
deleted file mode 100755
index eb56e0e..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_percentage.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-print_battery_percentage() {
-	# percentage displayed in the 2nd field of the 2nd row
-	if command_exists "pmset"; then
-		pmset -g batt | grep -o "[0-9]\{1,3\}%"
-	elif command_exists "acpi"; then
-		acpi -b | grep -m 1 -Eo "[0-9]+%"
-	elif command_exists "upower"; then
-        # use DisplayDevice if available otherwise battery
-		local battery=$(upower -e | grep -E 'battery|DisplayDevice'| tail -n1)
-		if [ -z "$battery" ]; then
-			return
-		fi
-		local percentage=$(upower -i $battery | awk '/percentage:/ {print $2}')
-		if [ "$percentage" ]; then
-			echo ${percentage%.*%}
-			return
-		fi
-		local energy
-		local energy_full
-		energy=$(upower -i $battery | awk -v nrg="$energy" '/energy:/ {print nrg+$2}')
-		energy_full=$(upower -i $battery | awk -v nrgfull="$energy_full" '/energy-full:/ {print nrgfull+$2}')
-		if [ -n "$energy" ] && [ -n "$energy_full" ]; then
-			echo $energy $energy_full | awk '{printf("%d%%", ($1/$2)*100)}'
-		fi
-	elif command_exists "termux-battery-status"; then
-		termux-battery-status | jq -r '.percentage' | awk '{printf("%d%%", $1)}'
-	elif command_exists "apm"; then
-		apm -l
-	fi
-}
-
-main() {
-	print_battery_percentage
-}
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_remain.sh b/tmux/plugins/tmux-battery/scripts/battery_remain.sh
deleted file mode 100755
index c11158f..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_remain.sh
+++ /dev/null
@@ -1,128 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-short=false
-
-get_remain_settings() {
-	short=$(get_tmux_option "@batt_remain_short" false)
-}
-
-battery_discharging() {
-	local status="$(battery_status)"
-	[[ $status =~ (discharging) ]]
-}
-
-battery_charged() {
-	local status="$(battery_status)"
-	[[ $status =~ (charged) ]]
-}
-
-
-convertmins() {
-	((h=${1}/60))
-	((m=${1}%60))
-	printf "%02d:%02d\n" $h $m $s
-}
-
-apm_battery_remaining_time() {
-	local remaining_time="$(convertmins $(apm -m))"
-	if battery_discharging; then
-		if $short; then
-			echo $remaining_time | awk '{printf "~%s", $1}'
-		else
-			echo $remaining_time | awk '{printf "- %s left", $1}'
-		fi
-	elif battery_charged; then
-		if $short; then
-			echo $remaining_time | awk '{printf "charged", $1}'
-		else
-			echo $remaining_time | awk '{printf "fully charged", $1}'
-		fi
-	else
-		echo "charging"
-	fi
-}
-
-pmset_battery_remaining_time() {
-	local status="$(pmset -g batt)"
-	if echo $status | grep 'no estimate' >/dev/null 2>&1; then
-		if $short; then
-			echo '~?:??'
-		else
-			echo '- Calculating estimate...'
-		fi
-	else
-		local remaining_time="$(echo $status | grep -o '[0-9]\{1,2\}:[0-9]\{1,2\}')"
-		if battery_discharging; then
-			if $short; then
-				echo $remaining_time | awk '{printf "~%s", $1}'
-			else
-				echo $remaining_time | awk '{printf "- %s left", $1}'
-			fi
-		elif battery_charged; then
-			if $short; then
-				echo $remaining_time | awk '{printf "charged", $1}'
-			else
-				echo $remaining_time | awk '{printf "fully charged", $1}'
-			fi
-		else
-			if $short; then
-				echo $remaining_time | awk '{printf "~%s", $1}'
-			else
-				echo $remaining_time | awk '{printf "- %s till full", $1}'
-			fi
-		fi
-	fi
-}
-
-upower_battery_remaining_time() {
-	battery=$(upower -e | grep -E 'battery|DisplayDevice'| tail -n1)
-	if battery_discharging; then
-		local remaining_time
-		remaining_time=$(upower -i "$battery" | grep -E '(remain|time to empty)')
-		if $short; then
-			echo "$remaining_time" | awk '{printf "%s %s", $(NF-1), $(NF)}'
-		else
-			echo "$remaining_time" | awk '{printf "%s %s left", $(NF-1), $(NF)}'
-		fi
-	elif battery_charged; then
-		if $short; then
-			echo ""
-		else
-			echo "charged"
-		fi
-	else
-		local remaining_time
-		remaining_time=$(upower -i "$battery" | grep -E 'time to full')
-		if $short; then
-			echo "$remaining_time" | awk '{printf "%s %s", $(NF-1), $(NF)}'
-		else
-			echo "$remaining_time" | awk '{printf "%s %s to full", $(NF-1), $(NF)}'
-		fi
-	fi
-}
-
-acpi_battery_remaining_time() {
-	acpi -b | grep -m 1 -Eo "[0-9]+:[0-9]+:[0-9]+"
-}
-
-print_battery_remain() {
-	if command_exists "pmset"; then
-		pmset_battery_remaining_time
-	elif command_exists "acpi"; then
-		acpi_battery_remaining_time
-	elif command_exists "upower"; then
-		upower_battery_remaining_time
-	elif command_exists "apm"; then
-		apm_battery_remaining_time
-	fi
-}
-
-main() {
-	get_remain_settings
-	print_battery_remain
-}
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_status_bg.sh b/tmux/plugins/tmux-battery/scripts/battery_status_bg.sh
deleted file mode 100755
index 42d1626..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_status_bg.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-color_full_charge_default="#[bg=green]"
-color_high_charge_default="#[bg=yellow]"
-color_medium_charge_default="#[bg=colour208]" # orange
-color_low_charge_default="#[bg=red]"
-color_charging_default="#[bg=green]"
-
-color_full_charge=""
-color_high_charge=""
-color_medium_charge=""
-color_low_charge=""
-color_charging=""
-
-get_charge_color_settings() {
-    color_full_charge=$(get_tmux_option "@batt_color_full_charge" "$color_full_charge_default")
-    color_high_charge=$(get_tmux_option "@batt_color_high_charge" "$color_high_charge_default")
-    color_medium_charge=$(get_tmux_option "@batt_color_medium_charge" "$color_medium_charge_default")
-    color_low_charge=$(get_tmux_option "@batt_color_low_charge" "$color_low_charge_default")
-    color_charging=$(get_tmux_option "@batt_color_charging" "$color_charging_default")
-}
-
-print_battery_status_bg() {
-    # Call `battery_percentage.sh`.
-    percentage=$($CURRENT_DIR/battery_percentage.sh | sed -e 's/%//')
-    status=$(battery_status | awk '{print $1;}')
-    if [ $status == 'charging' ]; then
-	printf $color_charging
-    elif [ $percentage -eq 100 ]; then
-        printf $color_full_charge
-    elif [ $percentage -le 99 -a $percentage -ge 51 ];then
-        printf $color_high_charge
-    elif [ $percentage -le 50 -a $percentage -ge 16 ];then
-        printf $color_medium_charge
-    elif [ "$percentage" == "" ];then
-        printf $color_full_charge_default  # assume it's a desktop
-    else
-        printf $color_low_charge
-    fi
-}
-
-main() {
-    get_charge_color_settings
-	print_battery_status_bg
-}
-main
diff --git a/tmux/plugins/tmux-battery/scripts/battery_status_fg.sh b/tmux/plugins/tmux-battery/scripts/battery_status_fg.sh
deleted file mode 100755
index 2418b8c..0000000
--- a/tmux/plugins/tmux-battery/scripts/battery_status_fg.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-color_full_charge_default="#[fg=green]"
-color_high_charge_default="#[fg=yellow]"
-color_medium_charge_default="#[fg=colour208]" # orange
-color_low_charge_default="#[fg=red]"
-color_charging_default="#[fg=green]"
-
-color_full_charge=""
-color_high_charge=""
-color_medium_charge=""
-color_low_charge=""
-color_charging=""
-
-get_charge_color_settings() {
-    color_full_charge=$(get_tmux_option "@batt_color_full_charge" "$color_full_charge_default")
-    color_high_charge=$(get_tmux_option "@batt_color_high_charge" "$color_high_charge_default")
-    color_medium_charge=$(get_tmux_option "@batt_color_medium_charge" "$color_medium_charge_default")
-    color_low_charge=$(get_tmux_option "@batt_color_low_charge" "$color_low_charge_default")
-    color_charging=$(get_tmux_option "@batt_color_charging" "$color_charging_default")
-}
-
-print_battery_status_fg() {
-    # Call `battery_percentage.sh`.
-    percentage=$($CURRENT_DIR/battery_percentage.sh | sed -e 's/%//')
-    status=$(battery_status | awk '{print $1;}')
-    if [ $status == 'charging' ]; then
-        printf $color_charging
-    elif [ $percentage -eq 100 ]; then
-        printf $color_full_charge
-    elif [ $percentage -le 99 -a $percentage -ge 51 ];then
-        printf $color_high_charge
-    elif [ $percentage -le 50 -a $percentage -ge 16 ];then
-        printf $color_medium_charge
-    elif [ "$percentage" == "" ];then  
-        printf $color_full_charge_default  # assume it's a desktop
-    else
-        printf $color_low_charge
-    fi
-}
-
-main() {
-    get_charge_color_settings
-	print_battery_status_fg
-}
-main
diff --git a/tmux/plugins/tmux-battery/scripts/helpers.sh b/tmux/plugins/tmux-battery/scripts/helpers.sh
deleted file mode 100644
index 067c120..0000000
--- a/tmux/plugins/tmux-battery/scripts/helpers.sh
+++ /dev/null
@@ -1,50 +0,0 @@
-get_tmux_option() {
-	local option="$1"
-	local default_value="$2"
-	local option_value="$(tmux show-option -gqv "$option")"
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-is_osx() {
-	[ $(uname) == "Darwin" ]
-}
-
-is_chrome() {
-	chrome="/sys/class/chromeos/cros_ec"
-	if [ -d "$chrome" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-command_exists() {
-	local command="$1"
-	type "$command" >/dev/null 2>&1
-}
-
-battery_status() {
-	if command_exists "pmset"; then
-		pmset -g batt | awk -F '; *' 'NR==2 { print $2 }'
-	elif command_exists "acpi"; then
-		acpi -b | awk '{gsub(/,/, ""); print tolower($3); exit}'
-	elif command_exists "upower"; then
-		local battery
-		battery=$(upower -e | grep -E 'battery|DisplayDevice'| tail -n1)
-		upower -i $battery | awk '/state/ {print $2}'
-	elif command_exists "termux-battery-status"; then
-		termux-battery-status | jq -r '.status' | awk '{printf("%s%", tolower($1))}'
-	elif command_exists "apm"; then
-		local battery
-		battery=$(apm -a)
-		if [ $battery -eq 0 ]; then
-			echo "discharging"
-		elif [ $battery -eq 1 ]; then
-			echo "charging"
-		fi
-	fi
-}
diff --git a/tmux/plugins/tmux-continuum/LICENSE.md b/tmux/plugins/tmux-continuum/LICENSE.md
deleted file mode 100644
index e6e7350..0000000
--- a/tmux/plugins/tmux-continuum/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) Bruno Sutic
-
-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/tmux/plugins/tmux-continuum/README.md b/tmux/plugins/tmux-continuum/README.md
deleted file mode 100644
index bafc6aa..0000000
--- a/tmux/plugins/tmux-continuum/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# tmux-continuum
-
-Features:
-
-- continuous saving of tmux environment
-- automatic tmux start when computer/server is turned on
-- automatic restore when tmux is started
-
-Together these features enable uninterrupted tmux usage. No matter the computer
-or server restarts, if the machine is on, tmux will be there how you left it off
-the last time it was used.
-
-Tested and working on Linux, OSX and Cygwin.
-
-#### Continuous saving
-
-Tmux environment will be saved at the interval of 15 minutes. All the saving
-happens in the background without the impact to your workflow.
-
-This action starts automatically when the plugin is installed.
-
-#### Automatic tmux start
-
-Tmux is automatically started after the computer/server is turned on.
-
-See the [instructions](docs/automatic_start.md) how to enable this for your
-system.
-
-#### Automatic restore
-
-Last saved environment is automatically restored when tmux is started.
-
-Put `set -g @continuum-restore 'on'` in `.tmux.conf` to enable this.
-
-Note: automatic restore happens **exclusively** on tmux server start. No other
-action (e.g. sourcing `.tmux.conf`) triggers this.
-
-#### Dependencies
-
-`tmux 1.9` or higher, `bash`,
-[tmux-resurrect](https://github.com/tmux-plugins/tmux-resurrect) plugin.
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Please make sure you have
-[tmux-resurrect](https://github.com/tmux-plugins/tmux-resurrect) installed.
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    set -g @plugin 'tmux-plugins/tmux-resurrect'
-    set -g @plugin 'tmux-plugins/tmux-continuum'
-
-Hit `prefix + I` to fetch the plugin and source it. The plugin will
-automatically start "working" in the background, no action required.
-
-### Manual Installation
-
-Please make sure you have
-[tmux-resurrect](https://github.com/tmux-plugins/tmux-resurrect) installed.
-
-Clone the repo:
-
-    $ git clone https://github.com/tmux-plugins/tmux-continuum ~/clone/path
-
-Add this line to the bottom of `.tmux.conf`:
-
-    run-shell ~/clone/path/continuum.tmux
-
-Reload TMUX environment with: `$ tmux source-file ~/.tmux.conf`
-
-The plugin will automatically start "working" in the background, no action
-required.
-
-### Docs
-
-- [frequently asked questions](docs/faq.md)
-- [behavior when running multiple tmux servers](docs/multiple_tmux_servers.md) -
-  this doc is safe to skip, but you might want to read it if you're using tmux
-  with `-L` or `-S` flags
-- [automatically start tmux after the computer is turned on](docs/automatic_start.md)
-- [continuum status in tmux status line](docs/continuum_status.md)
-
-### Other goodies
-
-- [tmux-copycat](https://github.com/tmux-plugins/tmux-copycat) - a plugin for
-  regex searches in tmux and fast match selection
-- [tmux-yank](https://github.com/tmux-plugins/tmux-yank) - enables copying
-  highlighted text to system clipboard
-- [tmux-open](https://github.com/tmux-plugins/tmux-open) - a plugin for quickly
-  opening highlighted file or a url
-
-### Reporting bugs and contributing
-
-Both contributing and bug reports are welcome. Please check out
-[contributing guidelines](CONTRIBUTING.md).
-
-### License
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-continuum/continuum.tmux b/tmux/plugins/tmux-continuum/continuum.tmux
deleted file mode 100755
index 00ad3e9..0000000
--- a/tmux/plugins/tmux-continuum/continuum.tmux
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/usr/bin/env bash
-
-set -x
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/scripts/helpers.sh"
-source "$CURRENT_DIR/scripts/variables.sh"
-source "$CURRENT_DIR/scripts/shared.sh"
-
-save_command_interpolation="#($CURRENT_DIR/scripts/continuum_save.sh)"
-
-supported_tmux_version_ok() {
-	"$CURRENT_DIR/scripts/check_tmux_version.sh" "$SUPPORTED_VERSION"
-}
-
-handle_tmux_automatic_start() {
-	"$CURRENT_DIR/scripts/handle_tmux_automatic_start.sh"
-}
-
-another_tmux_server_running() {
-	if just_started_tmux_server; then
-		another_tmux_server_running_on_startup
-	else
-		# script loaded after tmux server start can have multiple clients attached
-		[ "$(number_tmux_processes_except_current_server)" -gt "$(number_current_server_client_processes)" ]
-	fi
-}
-
-delay_saving_environment_on_first_plugin_load() {
-	if [ -z "$(get_tmux_option "$last_auto_save_option" "")" ]; then
-		# last save option not set, this is first time plugin load
-		set_last_save_timestamp
-	fi
-}
-
-add_resurrect_save_interpolation() {
-	local status_right_value="$(get_tmux_option "status-right" "")"
-	# check interpolation not already added
-	if ! [[ "$status_right_value" == *"$save_command_interpolation"* ]]; then
-		local new_value="${save_command_interpolation}${status_right_value}"
-		set_tmux_option "status-right" "$new_value"
-	fi
-}
-
-just_started_tmux_server() {
-	local tmux_start_time
-	tmux_start_time="$(tmux display-message -p -F '#{start_time}')"
-	[ "$tmux_start_time" == "" ] || [ "$tmux_start_time" -gt "$(($(date +%s)-10))" ]
-}
-
-start_auto_restore_in_background() {
-	"$CURRENT_DIR/scripts/continuum_restore.sh" &
-}
-
-update_tmux_option() {
-	local option="$1"
-	local option_value="$(get_tmux_option "$option")"
-	# replace interpolation string with a script to execute
-	local new_option_value="${option_value/$status_interpolation_string/$status_script}"
-	set_tmux_option "$option" "$new_option_value"
-}
-
-main() {
-	if supported_tmux_version_ok; then
-		handle_tmux_automatic_start
-
-		# Advanced edge case handling: start auto-saving only if this is the
-		# only tmux server. We don't want saved files from more environments to
-		# overwrite each other.
-		if ! another_tmux_server_running; then
-			# give user a chance to restore previously saved session
-			delay_saving_environment_on_first_plugin_load
-			add_resurrect_save_interpolation
-		fi
-
-		if just_started_tmux_server; then
-			start_auto_restore_in_background
-		fi
-
-		# Put "#{continuum_status}" interpolation in status-right or
-		# status-left tmux option to get current tmux continuum status.
-		update_tmux_option "status-right"
-		update_tmux_option "status-left"
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/check_tmux_version.sh b/tmux/plugins/tmux-continuum/scripts/check_tmux_version.sh
deleted file mode 100755
index f4a887a..0000000
--- a/tmux/plugins/tmux-continuum/scripts/check_tmux_version.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION="$1"
-UNSUPPORTED_MSG="$2"
-
-# this is used to get "clean" integer version number. Examples:
-# `tmux 1.9` => `19`
-# `1.9a`     => `19`
-get_digits_from_string() {
-	local string="$1"
-	local only_digits="$(echo "$string" | tr -dC '[:digit:]')"
-	echo "$only_digits"
-}
-
-tmux_version_int() {
-	local tmux_version_string=$(tmux -V)
-	echo "$(get_digits_from_string "$tmux_version_string")"
-}
-
-exit_if_unsupported_version() {
-	local current_version="$1"
-	local supported_version="$2"
-	if [ "$current_version" -lt "$supported_version" ]; then
-		exit 1
-	fi
-}
-
-main() {
-	local supported_version_int="$(get_digits_from_string "$VERSION")"
-	local current_version_int="$(tmux_version_int)"
-	exit_if_unsupported_version "$current_version_int" "$supported_version_int"
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/continuum_restore.sh b/tmux/plugins/tmux-continuum/scripts/continuum_restore.sh
deleted file mode 100755
index 27afbc4..0000000
--- a/tmux/plugins/tmux-continuum/scripts/continuum_restore.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/variables.sh"
-
-auto_restore_enabled() {
-	local auto_restore_value="$(get_tmux_option "$auto_restore_option" "$auto_restore_default")"
-	[ "$auto_restore_value" == "on" ] && [ ! -f "$auto_restore_halt_file" ]
-}
-
-fetch_and_run_tmux_resurrect_restore_script() {
-	# give tmux some time to start and source all the plugins
-	sleep 1
-	local resurrect_restore_script_path="$(get_tmux_option "$resurrect_restore_path_option" "")"
-	if [ -n "$resurrect_restore_script_path" ]; then
-		"$resurrect_restore_script_path"
-	fi
-}
-
-main() {
-	# Advanced edge case handling: auto restore only if this is the only tmux
-	# server. If another tmux server exists, it is assumed auto-restore is not wanted.
-	if auto_restore_enabled && ! another_tmux_server_running_on_startup; then
-		fetch_and_run_tmux_resurrect_restore_script
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/continuum_save.sh b/tmux/plugins/tmux-continuum/scripts/continuum_save.sh
deleted file mode 100755
index c0e0e7e..0000000
--- a/tmux/plugins/tmux-continuum/scripts/continuum_save.sh
+++ /dev/null
@@ -1,60 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/variables.sh"
-source "$CURRENT_DIR/shared.sh"
-
-supported_tmux_version_ok() {
-	"$CURRENT_DIR/check_tmux_version.sh" "$SUPPORTED_VERSION"
-}
-
-get_interval() {
-	get_tmux_option "$auto_save_interval_option" "$auto_save_interval_default"
-}
-
-auto_save_not_disabled() {
-	[ "$(get_interval)" -gt 0 ]
-}
-
-enough_time_since_last_run_passed() {
-	local last_saved_timestamp="$(get_tmux_option "$last_auto_save_option" "0")"
-	local interval_minutes="$(get_interval)"
-	local interval_seconds="$((interval_minutes * 60))"
-	local next_run="$((last_saved_timestamp + $interval_seconds))"
-	[ "$(current_timestamp)" -ge "$next_run" ]
-}
-
-fetch_and_run_tmux_resurrect_save_script() {
-	local resurrect_save_script_path="$(get_tmux_option "$resurrect_save_path_option" "")"
-	if [ -n "$resurrect_save_script_path" ]; then
-		"$resurrect_save_script_path" "quiet" >/dev/null 2>&1 &
-		set_last_save_timestamp
-	fi
-}
-
-acquire_lock() {
-	# Sometimes tmux starts multiple saves in parallel. We want only one
-	# save to be running, otherwise we can get corrupted saved state.
-	local lockdir_prefix="/tmp/tmux-continuum-$(current_tmux_server_pid)-lock-"
-	# The following implements a lock that auto-expires after 100...200s.
-	local lock_generation=$((`date +%s` / 100))
-	local lockdir1="${lockdir_prefix}${lock_generation}"
-	local lockdir2="${lockdir_prefix}$(($lock_generation + 1))"
-	if mkdir "$lockdir1"; then
-		trap "rmdir "$lockdir1"" EXIT
-		if mkdir "$lockdir2"; then
-			trap "rmdir "$lockdir1" "$lockdir2"" EXIT
-			return 0
-		fi
-	fi
-	return 1  # Someone else has the lock.
-}
-
-main() {
-	if supported_tmux_version_ok && auto_save_not_disabled && enough_time_since_last_run_passed && acquire_lock; then
-		fetch_and_run_tmux_resurrect_save_script
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/continuum_status.sh b/tmux/plugins/tmux-continuum/scripts/continuum_status.sh
deleted file mode 100755
index 280cf00..0000000
--- a/tmux/plugins/tmux-continuum/scripts/continuum_status.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/variables.sh"
-
-print_status() {
-	local save_int="$(get_tmux_option "$auto_save_interval_option")"
-	local status=""
-	local style_wrap
-	if [ $save_int -gt 0 ]; then
-		style_wrap="$(get_tmux_option "$status_on_style_wrap_option" "")"
-		status="$save_int"
-	else
-		style_wrap="$(get_tmux_option "$status_off_style_wrap_option" "")"
-		status="off"
-	fi
-
-	if [ -n "$style_wrap" ]; then
-		status="${style_wrap/$status_wrap_string/$status}"
-	fi
-	echo "$status"
-}
-print_status
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start.sh
deleted file mode 100755
index 433798b..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start.sh
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/variables.sh"
-
-is_tmux_automatic_start_enabled() {
-	local auto_start_value="$(get_tmux_option "$auto_start_option" "$auto_start_default")"
-	[ "$auto_start_value" == "on" ]
-}
-
-is_osx() {
-	[ $(uname) == "Darwin" ]
-}
-
-is_systemd() {
-	[ $(ps -o comm= -p1) == 'systemd' ]
-}
-
-main() {
-	if is_tmux_automatic_start_enabled; then
-		if is_osx; then
-			"$CURRENT_DIR/handle_tmux_automatic_start/osx_enable.sh"
-		elif is_systemd; then
-			"$CURRENT_DIR/handle_tmux_automatic_start/systemd_enable.sh"
-		fi
-	else
-		if is_osx; then
-			"$CURRENT_DIR/handle_tmux_automatic_start/osx_disable.sh"
-		elif is_systemd; then
-			"$CURRENT_DIR/handle_tmux_automatic_start/systemd_disable.sh"
-		fi
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/README.md b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/README.md
deleted file mode 120000
index c0cc077..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/README.md
+++ /dev/null
@@ -1 +0,0 @@
-docs/automatic_start.md
\ No newline at end of file
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_disable.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_disable.sh
deleted file mode 100755
index 19f9af1..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_disable.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/../variables.sh"
-
-main() {
-	rm "$osx_auto_start_file_path" > /dev/null 2>&1
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_enable.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_enable.sh
deleted file mode 100755
index 7e3e274..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_enable.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/../helpers.sh"
-source "$CURRENT_DIR/../variables.sh"
-
-template() {
-	local tmux_start_script="$1"
-	local is_fullscreen="$2"
-
-	local fullscreen_tag=""
-	if [ "$is_fullscreen" == "true" ]; then
-		# newline and spacing so tag is aligned with other tags in template
-		fullscreen_tag=$'\n        <string>fullscreen</string>'
-	fi
-
-	local content
-	read -r -d '' content <<-EOF
-	<?xml version="1.0" encoding="UTF-8"?>
-	<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
-	<plist version="1.0">
-	<dict>
-	    <key>Label</key>
-	    <string>${osx_auto_start_file_name}</string>
-	    <key>ProgramArguments</key>
-	    <array>
-	        <string>${tmux_start_script}</string>$fullscreen_tag
-	    </array>
-	    <key>RunAtLoad</key>
-	    <true/>
-	</dict>
-	</plist>
-	EOF
-	echo "$content"
-}
-
-get_iterm_or_teminal_option_value() {
-	local options="$1"
-	if [[ "$options" =~ "iterm" ]]; then
-		echo "iterm"
-	else
-		# Terminal.app is the default console app
-		echo "terminal"
-	fi
-}
-
-get_fullscreen_option_value() {
-	local options="$1"
-	if [[ "$options" =~ "fullscreen" ]]; then
-		echo "true"
-	else
-		echo "false"
-	fi
-}
-
-main() {
-	local options="$(get_tmux_option "$auto_start_config_option" "$auto_start_config_default")"
-	local iterm_or_terminal_value="$(get_iterm_or_teminal_option_value "$options")"
-	local fullscreen_option_value="$(get_fullscreen_option_value "$options")"
-	local tmux_start_script_path="${CURRENT_DIR}/osx_${iterm_or_terminal_value}_start_tmux.sh"
-
-	local launchd_plist_file_content="$(template "$tmux_start_script_path" "$fullscreen_option_value")"
-	echo "$launchd_plist_file_content" > "$osx_auto_start_file_path"
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_iterm_start_tmux.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_iterm_start_tmux.sh
deleted file mode 100755
index b79e4d7..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_iterm_start_tmux.sh
+++ /dev/null
@@ -1,66 +0,0 @@
-#!/usr/bin/env bash
-
-# for "true full screen" call the script with "fullscreen" as the first argument
-TRUE_FULL_SCREEN="$1"
-
-start_iterm_and_run_tmux() {
-	osascript <<-EOF
-	tell application "iTerm"
-		activate
-
-		# open iterm window
-		try
-			set _session to current session of current terminal
-		on error
-			set _term to (make new terminal)
-			tell _term
-				launch session "Tmux"
-				set _session to current session
-			end tell
-		end try
-
-		# start tmux
-		tell _session
-			write text "tmux"
-		end tell
-	end tell
-	EOF
-}
-
-resize_window_to_full_screen() {
-	osascript <<-EOF
-	tell application "iTerm"
-		set winID to id of window 1
-		tell i term application "Finder"
-			set desktopSize to bounds of window of desktop
-		end tell
-		set bounds of window id winID to desktopSize
-	end tell
-	EOF
-}
-
-resize_to_true_full_screen() {
-	osascript <<-EOF
-	tell application "iTerm"
-		# wait for iTerm to start
-		delay 1
-		activate
-		# short wait for iTerm to gain focus
-		delay 0.1
-		# Command + Enter for fullscreen
-		tell i term application "System Events"
-			key code 36 using {command down}
-		end tell
-	end tell
-	EOF
-}
-
-main() {
-	start_iterm_and_run_tmux
-	if [ "$TRUE_FULL_SCREEN" == "fullscreen" ]; then
-		resize_to_true_full_screen
-	else
-		resize_window_to_full_screen
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_terminal_start_tmux.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_terminal_start_tmux.sh
deleted file mode 100755
index 5a49391..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/osx_terminal_start_tmux.sh
+++ /dev/null
@@ -1,52 +0,0 @@
-#!/usr/bin/env bash
-
-# for "true full screen" call the script with "fullscreen" as the first argument
-TRUE_FULL_SCREEN="$1"
-
-start_terminal_and_run_tmux() {
-	osascript <<-EOF
-	tell application "Terminal"
-		if not (exists window 1) then reopen
-		activate
-		set winID to id of window 1
-		do script "tmux" in window id winID
-	end tell
-	EOF
-}
-
-resize_window_to_full_screen() {
-	osascript <<-EOF
-	tell application "Terminal"
-		set winID to id of window 1
-		tell application "Finder"
-			set desktopSize to bounds of window of desktop
-		end tell
-		set bounds of window id winID to desktopSize
-	end tell
-	EOF
-}
-
-resize_to_true_full_screen() {
-	osascript <<-EOF
-	tell application "Terminal"
-		# waiting for Terminal.app to start
-		delay 1
-		activate
-		# short wait for Terminal to gain focus
-		delay 0.1
-		tell application "System Events"
-			keystroke "f" using {control down, command down}
-		end tell
-	end tell
-	EOF
-}
-
-main() {
-	start_terminal_and_run_tmux
-	if [ "$TRUE_FULL_SCREEN" == "fullscreen" ]; then
-		resize_to_true_full_screen
-	else
-		resize_window_to_full_screen
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/systemd_disable.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/systemd_disable.sh
deleted file mode 100755
index 115e1c9..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/systemd_disable.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/../variables.sh"
-
-main() {
-	systemctl --user disable ${systemd_service_name}
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/systemd_enable.sh b/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/systemd_enable.sh
deleted file mode 100755
index d37c889..0000000
--- a/tmux/plugins/tmux-continuum/scripts/handle_tmux_automatic_start/systemd_enable.sh
+++ /dev/null
@@ -1,56 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( dirname ${BASH_SOURCE[0]} )"
-
-source "$CURRENT_DIR/../helpers.sh"
-source "$CURRENT_DIR/../variables.sh"
-
-template() {
-	local tmux_start_script="$1"
-	shift
-	local options="$@"
-	local content=""
-
-	read -r -d '' content <<-EOF
-	[Unit]
-	Description=tmux default session (detached)
-	Documentation=man:tmux(1)
-
-	[Service]
-	Type=forking
-	Environment=DISPLAY=:0
-	ExecStart=/usr/bin/tmux ${systemd_tmux_server_start_cmd}
-
-	ExecStop=${HOME}/.tmux/plugins/tmux-resurrect/scripts/save.sh
-	ExecStop=/usr/bin/tmux kill-server
-	KillMode=none
-
-	RestartSec=2
-
-	[Install]
-	WantedBy=default.target
-	EOF
-
-	echo "$content"
-}
-
-systemd_tmux_is_enabled() {
-	systemctl --user is_enabled $(basename "${systemd_unit_file_path}") >/dev/null 2>&1
-}
-
-enable_tmux_unit_on_boot() {
-	if ! systemd_tmux_is_enabled; then
-		systemctl --user enable ${systemd_service_name}
-	fi
-}
-
-main() {
-	local options="$(get_tmux_option "$auto_start_config_option" "${auto_start_config_default}")"
-	local systemd_tmux_server_start_cmd="$(get_tmux_option "${systemd_tmux_server_start_cmd_option}" "${systemd_tmux_server_start_cmd_default}" )"
-	local tmux_start_script_path="${CURRENT_DIR}/linux_start_tmux.sh"
-	local systemd_unit_file=$(template "${tmux_start_script_path}" "${options}")
-	mkdir -p "$(dirname ${systemd_unit_file_path})"
-	echo "$systemd_unit_file" > "${systemd_unit_file_path}"
-	enable_tmux_unit_on_boot
-}
-main
diff --git a/tmux/plugins/tmux-continuum/scripts/helpers.sh b/tmux/plugins/tmux-continuum/scripts/helpers.sh
deleted file mode 100644
index b64fb36..0000000
--- a/tmux/plugins/tmux-continuum/scripts/helpers.sh
+++ /dev/null
@@ -1,48 +0,0 @@
-get_tmux_option() {
-	local option="$1"
-	local default_value="$2"
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-set_tmux_option() {
-	local option="$1"
-	local value="$2"
-	tmux set-option -gq "$option" "$value"
-}
-
-# multiple tmux server detection helpers
-
-current_tmux_server_pid() {
-	echo "$TMUX" |
-		cut -f2 -d","
-}
-
-all_tmux_processes() {
-	# ignores `tmux source-file .tmux.conf` command used to reload tmux.conf
-	ps -Ao "command pid" |
-		\grep "^tmux" |
-		\grep -v "^tmux source"
-}
-
-number_tmux_processes_except_current_server() {
-	all_tmux_processes |
-		\grep -v " $(current_tmux_server_pid)$" |
-		wc -l |
-		sed "s/ //g"
-}
-
-number_current_server_client_processes() {
-	tmux list-clients |
-		wc -l |
-		sed "s/ //g"
-}
-
-another_tmux_server_running_on_startup() {
-	# there are 2 tmux processes (current tmux server + 1) on tmux startup
-	[ "$(number_tmux_processes_except_current_server)" -gt 1 ]
-}
diff --git a/tmux/plugins/tmux-continuum/scripts/shared.sh b/tmux/plugins/tmux-continuum/scripts/shared.sh
deleted file mode 100644
index 5ac8885..0000000
--- a/tmux/plugins/tmux-continuum/scripts/shared.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-current_timestamp() {
-	echo "$(date +%s)"
-}
-
-set_last_save_timestamp() {
-	set_tmux_option "$last_auto_save_option" "$(current_timestamp)"
-}
diff --git a/tmux/plugins/tmux-continuum/scripts/variables.sh b/tmux/plugins/tmux-continuum/scripts/variables.sh
deleted file mode 100644
index 8d0a057..0000000
--- a/tmux/plugins/tmux-continuum/scripts/variables.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-SUPPORTED_VERSION="1.9"
-
-# these tmux options contain paths to tmux resurrect save and restore scripts
-resurrect_save_path_option="@resurrect-save-script-path"
-resurrect_restore_path_option="@resurrect-restore-script-path"
-
-auto_save_interval_option="@continuum-save-interval"
-auto_save_interval_default="15"
-
-# time when the tmux environment was last saved (unix timestamp)
-last_auto_save_option="@continuum-save-last-timestamp"
-
-auto_restore_option="@continuum-restore"
-auto_restore_default="off"
-
-auto_restore_halt_file="${HOME}/tmux_no_auto_restore"
-
-# tmux auto start options
-auto_start_option="@continuum-boot"
-auto_start_default="off"
-
-# comma separated list of additional options for tmux auto start
-auto_start_config_option="@continuum-boot-options"
-auto_start_config_default=""
-
-osx_auto_start_file_name="Tmux.Start.plist"
-osx_auto_start_file_path="${HOME}/Library/LaunchAgents/${osx_auto_start_file_name}"
-
-status_interpolation_string="\#{continuum_status}"
-status_script="#($CURRENT_DIR/scripts/continuum_status.sh)"
-# below options set style/color for #{continuum_status} interpolation
-status_on_style_wrap_option="@continuum-status-on-wrap-style"   # example value: "#[fg=green]#{value}#[fg=white]"
-status_off_style_wrap_option="@continuum-status-off-wrap-style" # example value: "#[fg=yellow,bold]#{value}#[fg=white,nobold]"
-status_wrap_string="\#{value}"
-
-systemd_service_name="tmux.service"
-systemd_unit_file_path="$HOME/.config/systemd/user/${systemd_service_name}"
-
-systemd_tmux_server_start_cmd_option="@continuum-systemd-start-cmd"
-systemd_tmux_server_start_cmd_default="new-session -d"
diff --git a/tmux/plugins/tmux-copycat/LICENSE.md b/tmux/plugins/tmux-copycat/LICENSE.md
deleted file mode 100644
index 40f6ddd..0000000
--- a/tmux/plugins/tmux-copycat/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Bruno Sutic
-
-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/tmux/plugins/tmux-copycat/README.md b/tmux/plugins/tmux-copycat/README.md
deleted file mode 100644
index 83a35fe..0000000
--- a/tmux/plugins/tmux-copycat/README.md
+++ /dev/null
@@ -1,142 +0,0 @@
-# Tmux copycat
-
-[![Build Status](https://travis-ci.org/tmux-plugins/tmux-copycat.svg?branch=master)](https://travis-ci.org/tmux-plugins/tmux-copycat)
-
-This plugin enables:
-
-- regex searches
-- search result highlighting
-- predefined searches
-
-Predefined searches are plugin killer feature. It speeds the workflow and
-reduces mouse usage with Tmux.
-
-It works even better when paired with
-[tmux yank](https://github.com/tmux-plugins/tmux-yank). Tested and working on
-Linux, OSX and Cygwin.
-
-### Screencast
-
-[![screencast screenshot](/video/screencast_img.png)](https://vimeo.com/101867689)
-
-#### Search
-
-- `prefix + /` - regex search (strings work too)
-
-Example search entries:
-
-- `foo` - searches for string `foo`
-- `[0-9]+` - regex search for numbers
-
-Grep is used for searching.<br/>
-Searches are case insensitive.<br/>
-
-#### Predefined searches
-
-- `prefix + ctrl-f` - simple *f*ile search
-- `prefix + ctrl-g` - jumping over *g*it status files (best used after `git status` command)
-- `prefix + alt-h` - jumping over SHA-1/SHA-256 hashes (best used after `git log` command)
-- `prefix + ctrl-u` - *u*rl search (http, ftp and git urls)
-- `prefix + ctrl-d` - number search (mnemonic d, as digit)
-- `prefix + alt-i` - *i*p address search
-
-These start "copycat mode" and jump to first match.
-
-#### "Copycat mode" bindings
-
-These are enabled when you search with copycat:
-
-- `n` - jumps to the next match
-- `N` - jumps to the previous match
-
-To copy a highlighted match:
-
-- `Enter` - if you're using Tmux `vi` mode
-- `ctrl-w` or `alt-w` - if you're using Tmux `emacs` mode
-
-Copying a highlighted match will take you "out" of copycat mode. Paste with
-`prefix + ]` (this is Tmux default paste).
-
-Copying highlighted matches can be enhanced with
-[tmux yank](https://github.com/tmux-plugins/tmux-yank).
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    set -g @plugin 'tmux-plugins/tmux-copycat'
-
-Hit `prefix + I` to fetch the plugin and source it. You should now be able to
-use the plugin.
-
-Optional (but recommended) install `gawk` via your package manager of choice
-for better UTF-8 character support.
-
-### Manual Installation
-
-Clone the repo:
-
-    $ git clone https://github.com/tmux-plugins/tmux-copycat ~/clone/path
-
-Add this line to the bottom of `.tmux.conf`:
-
-    run-shell ~/clone/path/copycat.tmux
-
-Reload TMUX environment with: `$ tmux source-file ~/.tmux.conf`. You should now
-be able to use the plugin.
-
-Optional (but recommended) install `gawk` via your package manager of choice
-for better UTF-8 character support.
-
-### Installation for Tmux 2.3 and earlier
-
-Due to the changes in tmux, the latest version of this plugin doesn't support
-tmux 2.3 and earlier. It is recommended you upgrade to tmux version 2.4 or
-later. If you must continue using older version, please follow
-[these steps for installation](docs/installation_for_tmux_2.3.md).
-
-### Limitations
-
-This plugin has some known limitations. Please read about it
-[here](docs/limitations.md).
-
-### Docs
-
-- Most of the behavior of tmux-copycat can be customized via tmux options.
-  [Check out the full options list](docs/customizations.md).
-- To speed up the workflow you can define new bindings in `.tmux.conf` for
-  searches you use often, more info [here](docs/defining_new_stored_searches.md)
-
-### Other goodies
-
-`tmux-copycat` works great with:
-
-- [tmux-yank](https://github.com/tmux-plugins/tmux-yank) - enables copying
-  highlighted text to system clipboard
-- [tmux-open](https://github.com/tmux-plugins/tmux-open) - a plugin for quickly
-  opening a highlighted file or a url
-- [tmux-continuum](https://github.com/tmux-plugins/tmux-continuum) - automatic
-  restoring and continuous saving of tmux env
-
-### Test suite
-
-This plugin has a pretty extensive integration test suite that runs on
-[travis](https://travis-ci.org/tmux-plugins/tmux-copycat).
-
-When run locally, it depends on `vagrant`. Run it with:
-
-    # within project top directory
-    $ ./run-tests
-
-### Contributions and new features
-
-Bug fixes and contributions are welcome.
-
-Feel free to suggest new features, via github issues.
-
-If you have a bigger idea you'd like to work on, please get in touch, also via
-github issues.
-
-### License
-
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-copycat/copycat.tmux b/tmux/plugins/tmux-copycat/copycat.tmux
deleted file mode 100755
index 7b9f8fb..0000000
--- a/tmux/plugins/tmux-copycat/copycat.tmux
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/scripts/variables.sh"
-source "$CURRENT_DIR/scripts/helpers.sh"
-source "$CURRENT_DIR/scripts/stored_search_helpers.sh"
-
-# this function defines default stored searches
-set_default_stored_searches() {
-	local file_search="$(get_tmux_option "$copycat_file_search_option" "$default_file_search_key")"
-	local url_search="$(get_tmux_option "$copycat_url_search_option" "$default_url_search_key")"
-	local digit_search="$(get_tmux_option "$copycat_digit_search_option" "$default_digit_search_key")"
-	local hash_search="$(get_tmux_option "$copycat_hash_search_option" "$default_hash_search_key")"
-	local ip_search="$(get_tmux_option "$copycat_ip_search_option" "$default_ip_search_key")"
-
-	if stored_search_not_defined "$url_search"; then
-		tmux set-option -g "${COPYCAT_VAR_PREFIX}_${url_search}" "(https?://|git@|git://|ssh://|ftp://|file:///)[[:alnum:]?=%/_.:,;~@!#$&()*+-]*"
-	fi
-	if stored_search_not_defined "$file_search"; then
-		tmux set-option -g "${COPYCAT_VAR_PREFIX}_${file_search}" "(^|^\.|[[:space:]]|[[:space:]]\.|[[:space:]]\.\.|^\.\.)[[:alnum:]~_-]*/[][[:alnum:]_.#$%&+=/@-]*"
-	fi
-	if stored_search_not_defined "$digit_search"; then
-		tmux set-option -g "${COPYCAT_VAR_PREFIX}_${digit_search}" "[[:digit:]]+"
-	fi
-	if stored_search_not_defined "$hash_search"; then
-		tmux set-option -g "${COPYCAT_VAR_PREFIX}_${hash_search}" "\b([0-9a-f]{7,40}|[[:alnum:]]{52}|[0-9a-f]{62})\b"
-	fi
-	if stored_search_not_defined "$ip_search"; then
-		tmux set-option -g "${COPYCAT_VAR_PREFIX}_${ip_search}" "[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}\.[[:digit:]]{1,3}"
-	fi
-}
-
-set_start_bindings() {
-	set_default_stored_searches
-	local stored_search_vars="$(stored_search_vars)"
-	local search_var
-	local key
-	local pattern
-	for search_var in $stored_search_vars; do
-		key="$(get_stored_search_key "$search_var")"
-		pattern="$(get_stored_search_pattern "$search_var")"
-		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/copycat_mode_start.sh '$pattern'"
-	done
-}
-
-set_copycat_search_binding() {
-	local key_bindings
-	read -r -d '' -a key_bindings <<<"$(get_tmux_option "$copycat_search_option" "$default_copycat_search_key")"
-	local key
-	for key in "${key_bindings[@]}"; do
-		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/copycat_search.sh"
-	done
-}
-
-set_copycat_git_special_binding() {
-	local key_bindings
-	read -r -d '' -a key_bindings <<<"$(get_tmux_option "$copycat_git_search_option" "$default_git_search_key")"
-	local key
-	for key in "${key_bindings[@]}"; do
-		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/copycat_git_special.sh #{pane_current_path}"
-	done
-}
-
-main() {
-	set_start_bindings
-	set_copycat_search_binding
-	set_copycat_git_special_binding
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/check_tmux_version.sh b/tmux/plugins/tmux-copycat/scripts/check_tmux_version.sh
deleted file mode 100755
index b0aedec..0000000
--- a/tmux/plugins/tmux-copycat/scripts/check_tmux_version.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION="$1"
-UNSUPPORTED_MSG="$2"
-
-get_tmux_option() {
-	local option=$1
-	local default_value=$2
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-	local message="$1"
-
-	# display_duration defaults to 5 seconds, if not passed as an argument
-	if [ "$#" -eq 2 ]; then
-		local display_duration="$2"
-	else
-		local display_duration="5000"
-	fi
-
-	# saves user-set 'display-time' option
-	local saved_display_time=$(get_tmux_option "display-time" "750")
-
-	# sets message display time to 5 seconds
-	tmux set-option -gq display-time "$display_duration"
-
-	# displays message
-	tmux display-message "$message"
-
-	# restores original 'display-time' value
-	tmux set-option -gq display-time "$saved_display_time"
-}
-
-# this is used to get "clean" integer version number. Examples:
-# `tmux 1.9` => `19`
-# `1.9a`     => `19`
-get_digits_from_string() {
-	local string="$1"
-	local only_digits="$(echo "$string" | tr -dC '[:digit:]')"
-	echo "$only_digits"
-}
-
-tmux_version_int() {
-	local tmux_version_string=$(tmux -V)
-	echo "$(get_digits_from_string "$tmux_version_string")"
-}
-
-unsupported_version_message() {
-	if [ -n "$UNSUPPORTED_MSG" ]; then
-		echo "$UNSUPPORTED_MSG"
-	else
-		echo "Error, Tmux version unsupported! Please install Tmux version $VERSION or greater!"
-	fi
-}
-
-exit_if_unsupported_version() {
-	local current_version="$1"
-	local supported_version="$2"
-	if [ "$current_version" -lt "$supported_version" ]; then
-		display_message "$(unsupported_version_message)"
-		exit 1
-	fi
-}
-
-main() {
-	local supported_version_int="$(get_digits_from_string "$VERSION")"
-	local current_version_int="$(tmux_version_int)"
-	exit_if_unsupported_version "$current_version_int" "$supported_version_int"
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_generate_results.sh b/tmux/plugins/tmux-copycat/scripts/copycat_generate_results.sh
deleted file mode 100755
index c5f94dc..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_generate_results.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-search_pattern="$1"
-
-capture_pane() {
-	local file=$1
-	# copying 9M lines back will hopefully fetch the whole scrollback
-	tmux capture-pane -S -9000000 -p > "$file"
-}
-
-# doing 2 things in 1 step so that we don't write to disk too much
-reverse_and_create_copycat_file() {
-	local file=$1
-	local copycat_file=$2
-	local grep_pattern=$3
-	(tac 2>/dev/null || tail -r) < "$file" | grep -oniE "$grep_pattern" > "$copycat_file"
-}
-
-delete_old_files() {
-	local scrollback_filename="$(get_scrollback_filename)"
-	local copycat_filename="$(get_copycat_filename)"
-	rm -f "$scrollback_filename" "$copycat_filename"
-}
-
-generate_copycat_file() {
-	local grep_pattern="$1"
-	local scrollback_filename="$(get_scrollback_filename)"
-	local copycat_filename="$(get_copycat_filename)"
-	mkdir -p "$(_get_tmp_dir)"
-	chmod 0700 "$(_get_tmp_dir)"
-	capture_pane "$scrollback_filename"
-	reverse_and_create_copycat_file "$scrollback_filename" "$copycat_filename" "$grep_pattern"
-}
-
-if_no_results_exit_with_message() {
-	local copycat_filename="$(get_copycat_filename)"
-	# check for empty filename
-	if ! [ -s "$copycat_filename" ]; then
-		display_message "No results!"
-		exit 0
-	fi
-}
-
-main() {
-	local grep_pattern="$1"
-	if not_in_copycat_mode; then
-		delete_old_files
-		generate_copycat_file "$grep_pattern"
-		if_no_results_exit_with_message
-		set_copycat_mode
-		copycat_increase_counter
-	fi
-}
-main "$search_pattern"
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_git_special.sh b/tmux/plugins/tmux-copycat/scripts/copycat_git_special.sh
deleted file mode 100755
index 6e30bf6..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_git_special.sh
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-PANE_CURRENT_PATH="$1"
-
-source "$CURRENT_DIR/helpers.sh"
-
-git_status_files() {
-	local git_working_dir="$PANE_CURRENT_PATH"
-	local git_dir="$PANE_CURRENT_PATH/.git"
-	echo "$(git --git-dir="$git_dir" --work-tree="$git_working_dir" status --porcelain)"
-}
-
-formatted_git_status() {
-	local raw_gist_status="$(git_status_files)"
-	echo "$(echo "$raw_gist_status" | cut -c 4-)"
-}
-
-exit_if_no_results() {
-	local results="$1"
-	if [ -z "$results" ]; then
-		display_message "No results!"
-		exit 0
-	fi
-}
-
-concatenate_files() {
-	local git_status_files="$(formatted_git_status)"
-	exit_if_no_results "$git_status_files"
-
-	local result=""
-	# Undefined until later within a while loop.
-	local file_separator
-	while read -r line; do
-		result="${result}${file_separator}${line}"
-		file_separator="|"
-	done <<< "$git_status_files"
-	echo "$result"
-}
-
-# Creates one, big regex out of git status files.
-# Example:
-# `git status` shows files `foo.txt` and `bar.txt`
-# output regex will be:
-# `(foo.txt|bar.txt)
-git_status_files_regex() {
-	local concatenated_files="$(concatenate_files)"
-	local regex_result="(${concatenated_files})"
-	echo "$regex_result"
-}
-
-main() {
-	local search_regex="$(git_status_files_regex)"
-	# starts copycat mode
-	$CURRENT_DIR/copycat_mode_start.sh "$search_regex"
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_jump.sh b/tmux/plugins/tmux-copycat/scripts/copycat_jump.sh
deleted file mode 100755
index fd2362c..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_jump.sh
+++ /dev/null
@@ -1,289 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-MAXIMUM_PADDING="25"   # maximum padding below the result when it can't be centered
-
-# jump to 'next' or 'prev' match
-# global var for this file
-NEXT_PREV="$1"
-
-# 'vi' or 'emacs', this variable used as a global file constant
-TMUX_COPY_MODE="$(tmux_copy_mode)"
-
-_file_number_of_lines() {
-	local file="$1"
-	echo "$(wc -l $file | $AWK_CMD '{print $1}')"
-}
-
-_get_result_line() {
-	local file="$1"
-	local number="$2"
-	echo "$(head -"$number" "$file" | tail -1)"
-}
-
-_string_starts_with_digit() {
-	local string="$1"
-	echo "$string" |
-		\grep -q '^[[:digit:]]\+:'
-}
-
-_get_line_number() {
-	local string="$1"
-	local copycat_file="$2"			# args 2 & 3 used to handle bug in OSX grep
-	local position_number="$3"
-	if _string_starts_with_digit "$string"; then
-		# we have a number!
-		local grep_line_number="$(echo "$string" | cut -f1 -d:)"
-		# grep line number index starts from 1, tmux line number index starts from 0
-		local tmux_line_number="$((grep_line_number - 1))"
-	else
-		# no number in the results line This is a bug in OSX grep.
-		# Fetching a number from a previous line.
-		local previous_line_num="$((position_number - 1))"
-		local result_line="$(_get_result_line "$copycat_file" "$previous_line_num")"
-		# recursively invoke this same function
-		tmux_line_number="$(_get_line_number "$result_line" "$copycat_file" "$previous_line_num")"
-	fi
-	echo "$tmux_line_number"
-}
-
-_get_match() {
-	local string="$1"
-	local full_match
-	if _string_starts_with_digit "$string"; then
-		full_match="$(echo "$string" | cut -f2- -d:)"
-	else
-		# This scenario handles OS X grep bug "no number in the results line".
-		# When there's no number at the beginning of the line, we're taking the
-		# whole line as a match. This handles the result line like this:
-		# `http://www.example.com` (the `http` would otherwise get cut off)
-		full_match="$string"
-	fi
-	echo -n "$full_match"
-}
-
-_escape_backslash() {
-	local string="$1"
-	echo "$(echo "$string" | sed 's/\\/\\\\/g')"
-}
-
-_get_match_line_position() {
-	local file="$1"
-	local line_number="$2"
-	local match="$3"
-	local adjusted_line_num=$((line_number + 1))
-	local result_line=$(tail -"$adjusted_line_num" "$file" | head -1)
-
-	# OS X awk cannot have `=` as the first char in the variable (bug in awk).
-	# If exists, changing the `=` character with `.` to avoid error.
-	local platform="$(uname)"
-	if [ "$platform" == "Darwin" ]; then
-		result_line="$(echo "$result_line" | sed 's/^=/./')"
-		match="$(echo "$match" | sed 's/^=/./')"
-	fi
-
-	# awk treats \r, \n, \t etc as single characters and that messes up match
-	# highlighting. For that reason, we're escaping backslashes so above chars
-	# are treated literally.
-	result_line="$(_escape_backslash "$result_line")"
-	match="$(_escape_backslash "$match")"
-
-	local index=$($AWK_CMD -v a="$result_line" -v b="$match" 'BEGIN{print index(a,b)}')
-	local zero_index=$((index - 1))
-	echo "$zero_index"
-}
-
-_copycat_jump() {
-	local line_number="$1"
-	local match_line_position="$2"
-	local match="$3"
-	local scrollback_line_number="$4"
-	_copycat_enter_mode
-	_copycat_exit_select_mode
-	_copycat_jump_to_line "$line_number" "$scrollback_line_number"
-	_copycat_position_to_match_start "$match_line_position"
-	_copycat_select "$match"
-}
-
-_copycat_enter_mode() {
-	tmux copy-mode
-}
-
-# clears selection from a previous match
-_copycat_exit_select_mode() {
-	tmux send-keys -X clear-selection
-}
-
-# "manually" go up in the scrollback for a number of lines
-_copycat_manually_go_up() {
-	local line_number="$1"
-	tmux send-keys -X -N "$line_number" cursor-up
-	tmux send-keys -X start-of-line
-}
-
-_copycat_create_padding_below_result() {
-	local number_of_lines="$1"
-	local maximum_padding="$2"
-	local padding
-
-	# Padding should not be greater than half pane height
-	# (it wouldn't be centered then).
-	if [ "$number_of_lines" -gt "$maximum_padding" ]; then
-		padding="$maximum_padding"
-	else
-		padding="$number_of_lines"
-	fi
-
-	# cannot create padding, exit function
-	if [ "$padding" -eq "0" ]; then
-		return
-	fi
-
-	tmux send-keys -X -N "$padding" cursor-down
-	tmux send-keys -X -N "$padding" cursor-up
-}
-
-# performs a jump to go to line
-_copycat_go_to_line_with_jump() {
-	local line_number="$1"
-	# first jumps to the "bottom" in copy mode so that jumps are consistent
-	tmux send-keys -X history-bottom
-	tmux send-keys -X start-of-line
-	tmux send-keys -X goto-line $line_number
-}
-
-# maximum line number that can be reached via tmux 'jump'
-_get_max_jump() {
-	local scrollback_line_number="$1"
-	local window_height="$2"
-	local max_jump=$((scrollback_line_number - $window_height))
-	# max jump can't be lower than zero
-	if [ "$max_jump" -lt "0" ]; then
-		max_jump="0"
-	fi
-	echo "$max_jump"
-}
-
-_copycat_jump_to_line() {
-	local line_number="$1"
-	local scrollback_line_number="$2"
-	local window_height="$(tmux display-message -p '#{pane_height}')"
-	local correct_line_number
-
-	local max_jump=$(_get_max_jump "$scrollback_line_number" "$window_height")
-	local correction="0"
-
-	if [ "$line_number" -gt "$max_jump" ]; then
-		# We need to 'reach' a line number that is not accessible via 'jump'.
-		# Introducing 'correction'
-		correct_line_number="$max_jump"
-		correction=$((line_number - $correct_line_number))
-	else
-		# we can reach the desired line number via 'jump'. Correction not needed.
-		correct_line_number="$line_number"
-	fi
-
-	_copycat_go_to_line_with_jump "$correct_line_number"
-
-	if [ "$correction" -gt "0" ]; then
-		_copycat_manually_go_up "$correction"
-	fi
-
-	# If no corrections (meaning result is not at the top of scrollback)
-	# we can then 'center' the result within a pane.
-	if [ "$correction" -eq "0" ]; then
-		local half_window_height="$((window_height / 2))"
-		# creating as much padding as possible, up to half pane height
-		_copycat_create_padding_below_result "$line_number" "$half_window_height"
-	fi
-}
-
-_copycat_position_to_match_start() {
-	local match_line_position="$1"
-	[ "$match_line_position" -eq "0" ] && return 0
-
-	tmux send-keys -X -N "$match_line_position" cursor-right
-}
-
-_copycat_select() {
-	local match="$1"
-	local length="${#match}"
-	tmux send-keys -X begin-selection
-	tmux send-keys -X -N "$length" cursor-right
-	if [ "$TMUX_COPY_MODE" == "vi" ]; then
-		tmux send-keys -X cursor-left # selection correction for 1 char
-	fi
-}
-
-# all functions above are "private", called from `do_next_jump` function
-
-get_new_position_number() {
-	local copycat_file="$1"
-	local current_position="$2"
-	local new_position
-
-	# doing a forward/up jump
-	if [ "$NEXT_PREV" == "next" ]; then
-		local number_of_results=$(wc -l "$copycat_file" | $AWK_CMD '{ print $1 }')
-		if [ "$current_position" -eq "$number_of_results" ]; then
-			# position can't go beyond the last result
-			new_position="$current_position"
-		else
-			new_position="$((current_position + 1))"
-		fi
-
-	# doing a backward/down jump
-	elif [ "$NEXT_PREV" == "prev" ]; then
-		if [ "$current_position" -eq "1" ]; then
-			# position can't go below 1
-			new_position="1"
-		else
-			new_position="$((current_position - 1))"
-		fi
-	fi
-	echo "$new_position"
-}
-
-do_next_jump() {
-	local position_number="$1"
-	local copycat_file="$2"
-	local scrollback_file="$3"
-
-	local scrollback_line_number=$(_file_number_of_lines "$scrollback_file")
-	local result_line="$(_get_result_line "$copycat_file" "$position_number")"
-	local line_number=$(_get_line_number "$result_line" "$copycat_file" "$position_number")
-	local match=$(_get_match "$result_line")
-	local match_line_position=$(_get_match_line_position "$scrollback_file" "$line_number" "$match")
-	_copycat_jump "$line_number" "$match_line_position" "$match" "$scrollback_line_number"
-}
-
-notify_about_first_last_match() {
-	local current_position="$1"
-	local next_position="$2"
-	local message_duration="1500"
-
-	# if position didn't change, we are either on a 'first' or 'last' match
-	if [ "$current_position" -eq "$next_position" ]; then
-		if [ "$NEXT_PREV" == "next" ]; then
-			display_message "Last match!" "$message_duration"
-		elif [ "$NEXT_PREV" == "prev" ]; then
-			display_message "First match!" "$message_duration"
-		fi
-	fi
-}
-
-main() {
-	if in_copycat_mode; then
-		local copycat_file="$(get_copycat_filename)"
-		local scrollback_file="$(get_scrollback_filename)"
-		local current_position="$(get_copycat_position)"
-		local next_position="$(get_new_position_number "$copycat_file" "$current_position")"
-		do_next_jump "$next_position" "$copycat_file" "$scrollback_file"
-		notify_about_first_last_match "$current_position" "$next_position"
-		set_copycat_position "$next_position"
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_mode_bindings.sh b/tmux/plugins/tmux-copycat/scripts/copycat_mode_bindings.sh
deleted file mode 100755
index 7c63487..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_mode_bindings.sh
+++ /dev/null
@@ -1,55 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-AWK_CMD='awk'
-if command_exists gawk; then
-	AWK_CMD='gawk'
-fi
-
-# Extends a keyboard key.
-# Benefits: tmux won't report errors and everything will work fine even if the
-# script is deleted.
-extend_key() {
-	local key="$1"
-	local script="$2"
-	local cmd
-
-	# 1. 'cmd' or 'key' is sent to tmux. This ensures the default key action is done.
-	# 2. Script is executed.
-	# 3. `true` command ensures an exit status 0 is returned. This ensures a
-	#	 user never gets an error msg - even if the script file from step 2 is
-	#	 deleted.
-	# We fetch the current behavior of the 'key' mapping in
-	# variable 'cmd'
-	cmd=$(tmux list-keys -T $(tmux_copy_mode_string) | $AWK_CMD '$4 == "'$key'"' | $AWK_CMD '{ $1=""; $2=""; $3=""; $4=""; sub("  ", " "); print }')
-	# If 'cmd' is already a copycat command, we do nothing
-	if echo "$cmd" | grep -q copycat; then
-		return
-	fi
-	# We save the previous mapping to a file in order to be able to recover
-	# the previous mapping when we unbind
-	tmux list-keys -T $(tmux_copy_mode_string) | $AWK_CMD '$4 == "'$key'"' >> "${TMPDIR:-/tmp}/copycat_$(whoami)_recover_keys"
-	tmux bind-key -T $(tmux_copy_mode_string) "$key" run-shell "tmux $cmd; $script; true"
-}
-
-copycat_cancel_bindings() {
-	# keys that quit copy mode are enhanced to quit copycat mode as well.
-	local cancel_mode_bindings=$(copycat_quit_copy_mode_keys)
-	local key
-	for key in $cancel_mode_bindings; do
-		extend_key "$key" "$CURRENT_DIR/copycat_mode_quit.sh"
-	done
-}
-
-copycat_mode_bindings() {
-	extend_key "$(copycat_next_key)" "$CURRENT_DIR/copycat_jump.sh 'next'"
-	extend_key "$(copycat_prev_key)" "$CURRENT_DIR/copycat_jump.sh 'prev'"
-}
-
-main() {
-	copycat_mode_bindings
-	copycat_cancel_bindings
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_mode_quit.sh b/tmux/plugins/tmux-copycat/scripts/copycat_mode_quit.sh
deleted file mode 100755
index 8b291e1..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_mode_quit.sh
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-
-unbind_cancel_bindings() {
-	local cancel_mode_bindings=$(copycat_quit_copy_mode_keys)
-	local key
-	for key in $cancel_mode_bindings; do
-		tmux unbind-key -n "$key"
-	done
-}
-
-unbind_prev_next_bindings() {
-	tmux unbind-key -n "$(copycat_next_key)"
-	tmux unbind-key -n "$(copycat_prev_key)"
-}
-
-unbind_all_bindings() {
-	grep -v copycat <"${TMPDIR:-/tmp}/copycat_$(whoami)_recover_keys" | while read -r key_cmd; do
-		sh -c "tmux $key_cmd"
-	done < /dev/stdin
-	rm "${TMPDIR:-/tmp}/copycat_$(whoami)_recover_keys"
-}
-
-main() {
-	if in_copycat_mode; then
-		reset_copycat_position
-		unset_copycat_mode
-		copycat_decrease_counter
-		# removing all bindings only if no panes are in copycat mode
-		if copycat_counter_zero; then
-			unbind_all_bindings
-		fi
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_mode_start.sh b/tmux/plugins/tmux-copycat/scripts/copycat_mode_start.sh
deleted file mode 100755
index 7c0c209..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_mode_start.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-SUPPORTED_VERSION="1.9"
-
-PATTERN="$1"
-
-supported_tmux_version_ok() {
-	$CURRENT_DIR/check_tmux_version.sh "$SUPPORTED_VERSION"
-}
-
-main() {
-	local pattern="$1"
-	if supported_tmux_version_ok; then
-		$CURRENT_DIR/copycat_generate_results.sh "$pattern" # will `exit 0` if no results
-		$CURRENT_DIR/copycat_mode_bindings.sh
-		$CURRENT_DIR/copycat_jump.sh 'next'
-	fi
-}
-main "$PATTERN"
diff --git a/tmux/plugins/tmux-copycat/scripts/copycat_search.sh b/tmux/plugins/tmux-copycat/scripts/copycat_search.sh
deleted file mode 100755
index b77f1f2..0000000
--- a/tmux/plugins/tmux-copycat/scripts/copycat_search.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-main() {
-	tmux command-prompt -p "copycat search:" "run-shell \"$CURRENT_DIR/copycat_mode_start.sh '%1'\""
-}
-main
diff --git a/tmux/plugins/tmux-copycat/scripts/helpers.sh b/tmux/plugins/tmux-copycat/scripts/helpers.sh
deleted file mode 100644
index edc8abb..0000000
--- a/tmux/plugins/tmux-copycat/scripts/helpers.sh
+++ /dev/null
@@ -1,192 +0,0 @@
-# config options
-
-default_next_key="n"
-tmux_option_next="@copycat_next"
-
-default_prev_key="N"
-tmux_option_prev="@copycat_prev"
-
-# keeps track of number of panes in copycat mode
-tmux_option_counter="@copycat_counter"
-
-# === awk vs gawk ===
-command_exists() {
-	command -v "$@" > /dev/null 2>&1
-}
-AWK_CMD='awk'
-if command_exists gawk; then
-	AWK_CMD='gawk'
-fi
-
-# === general helpers ===
-
-get_tmux_option() {
-	local option=$1
-	local default_value=$2
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-set_tmux_option() {
-	local option=$1
-	local value=$2
-	tmux set-option -gq "$option" "$value"
-}
-
-tmux_copy_mode() {
-	tmux show-option -gwv mode-keys
-}
-
-tmux_copy_mode_string() {
-    if [ $(tmux_copy_mode) == 'vi' ]; then
-	echo copy-mode-vi
-    else
-	echo copy-mode
-    fi
-}
-
-# === copycat mode specific helpers ===
-
-set_copycat_mode() {
-	set_tmux_option "$(_copycat_mode_var)" "true"
-}
-
-unset_copycat_mode() {
-	set_tmux_option "$(_copycat_mode_var)" "false"
-}
-
-in_copycat_mode() {
-	local copycat_mode=$(get_tmux_option "$(_copycat_mode_var)" "false")
-	[ "$copycat_mode" == "true" ]
-}
-
-not_in_copycat_mode() {
-	if in_copycat_mode; then
-		return 1
-	else
-		return 0
-	fi
-}
-
-# === copycat mode position ===
-
-get_copycat_position() {
-	local copycat_position_variable=$(_copycat_position_var)
-	echo $(get_tmux_option "$copycat_position_variable" "0")
-}
-
-set_copycat_position() {
-	local position="$1"
-	local copycat_position_variable=$(_copycat_position_var)
-	set_tmux_option "$copycat_position_variable" "$position"
-}
-
-reset_copycat_position() {
-	set_copycat_position "0"
-}
-
-# === scrollback and results position ===
-
-get_scrollback_filename() {
-	echo "$(_get_tmp_dir)/scrollback-$(_pane_unique_id)"
-}
-
-get_copycat_filename() {
-	echo "$(_get_tmp_dir)/results-$(_pane_unique_id)"
-}
-
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-	local message="$1"
-
-	# display_duration defaults to 5 seconds, if not passed as an argument
-	if [ "$#" -eq 2 ]; then
-		local display_duration="$2"
-	else
-		local display_duration="5000"
-	fi
-
-	# saves user-set 'display-time' option
-	local saved_display_time=$(get_tmux_option "display-time" "750")
-
-	# sets message display time to 5 seconds
-	tmux set-option -gq display-time "$display_duration"
-
-	# displays message
-	tmux display-message "$message"
-
-	# restores original 'display-time' value
-	tmux set-option -gq display-time "$saved_display_time"
-}
-
-# === counter functions ===
-
-copycat_increase_counter() {
-	local count=$(get_tmux_option "$tmux_option_counter" "0")
-	local new_count="$((count + 1))"
-	set_tmux_option "$tmux_option_counter" "$new_count"
-}
-
-copycat_decrease_counter() {
-	local count="$(get_tmux_option "$tmux_option_counter" "0")"
-	if [ "$count" -gt "0" ]; then
-		# decreasing the counter only if it won't go below 0
-		local new_count="$((count - 1))"
-		set_tmux_option "$tmux_option_counter" "$new_count"
-	fi
-}
-
-copycat_counter_zero() {
-	local count="$(get_tmux_option "$tmux_option_counter" "0")"
-	[ "$count" -eq "0" ]
-}
-
-# === key binding functions ===
-
-copycat_next_key() {
-	echo "$(get_tmux_option "$tmux_option_next" "$default_next_key")"
-}
-
-copycat_prev_key() {
-	echo "$(get_tmux_option "$tmux_option_prev" "$default_prev_key")"
-}
-
-# function expected output: 'C-c Enter q'
-copycat_quit_copy_mode_keys() {
-	local commands_that_quit_copy_mode="cancel"
-	local copy_mode="$(tmux_copy_mode_string)"
-	tmux list-keys -T "$copy_mode" |
-		\grep "$commands_that_quit_copy_mode" |
-		$AWK_CMD '{ print $4 }' |
-		sort -u |
-		sed 's/C-j//g' |
-		xargs echo
-}
-
-# === 'private' functions ===
-
-_copycat_mode_var() {
-	local pane_id="$(_pane_unique_id)"
-	echo "@copycat_mode_$pane_id"
-}
-
-_copycat_position_var() {
-	local pane_id="$(_pane_unique_id)"
-	echo "@copycat_position_$pane_id"
-}
-
-_get_tmp_dir() {
-	echo "${TMPDIR:-/tmp}/tmux-$EUID-copycat"
-}
-
-# returns a string unique to current pane
-# sed removes `$` sign because `session_id` contains is
-_pane_unique_id() {
-	tmux display-message -p "#{session_id}-#{window_index}-#{pane_index}" |
-		sed 's/\$//'
-}
diff --git a/tmux/plugins/tmux-copycat/scripts/stored_search_helpers.sh b/tmux/plugins/tmux-copycat/scripts/stored_search_helpers.sh
deleted file mode 100644
index 6d192fe..0000000
--- a/tmux/plugins/tmux-copycat/scripts/stored_search_helpers.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-stored_search_not_defined() {
-	local key="$1"
-	local search_value="$(tmux show-option -gqv "${COPYCAT_VAR_PREFIX}_${key}")"
-	[ -z $search_value ]
-}
-
-stored_search_vars() {
-	tmux show-options -g |
-		\grep -i "^${COPYCAT_VAR_PREFIX}_" |
-		cut -d ' ' -f1 |               # cut just variable names
-		xargs                          # splat var names in one line
-}
-
-# get the search key from the variable name
-get_stored_search_key() {
-	local search_var="$1"
-	echo "$(echo "$search_var" | sed "s/^${COPYCAT_VAR_PREFIX}_//")"
-}
-
-get_stored_search_pattern() {
-	local search_var="$1"
-	echo "$(get_tmux_option "$search_var" "")"
-}
diff --git a/tmux/plugins/tmux-copycat/scripts/variables.sh b/tmux/plugins/tmux-copycat/scripts/variables.sh
deleted file mode 100644
index 82f8f7a..0000000
--- a/tmux/plugins/tmux-copycat/scripts/variables.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-# stored search variable prefix
-COPYCAT_VAR_PREFIX="@copycat_search"
-
-# basic search
-default_copycat_search_key="/"
-copycat_search_option="@copycat_search"
-
-# git special search
-default_git_search_key="C-g"
-copycat_git_search_option="@copycat_git_special"
-
-# regular searches
-default_file_search_key="C-f"
-copycat_file_search_option="@copycat_file_search"
-
-default_url_search_key="C-u"
-copycat_url_search_option="@copycat_url_search"
-
-default_digit_search_key="C-d"
-copycat_digit_search_option="@copycat_digit_search"
-
-default_hash_search_key="M-h"
-copycat_hash_search_option="@copycat_hash_search"
-
-default_ip_search_key="M-i"
-copycat_ip_search_option="@copycat_ip_search"
diff --git a/tmux/plugins/tmux-online-status/LICENSE.md b/tmux/plugins/tmux-online-status/LICENSE.md
deleted file mode 100644
index 40f6ddd..0000000
--- a/tmux/plugins/tmux-online-status/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Bruno Sutic
-
-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/tmux/plugins/tmux-online-status/README.md b/tmux/plugins/tmux-online-status/README.md
deleted file mode 100644
index 475257e..0000000
--- a/tmux/plugins/tmux-online-status/README.md
+++ /dev/null
@@ -1,92 +0,0 @@
-# Tmux online status
-
-Tmux plugin that enables displaying online status for your workstation.
-
-Introduces a new `#{online_status}` format.
-
-This plugin is useful if:
-- you spend most of your time in Tmux and don't want to "switch" away from
-  the terminal to check whether you're connected.
-- you have a flaky internet connection and you don't want to be surprised
-  when a simple `curl` or `wget` fails because the connection just broke.
-
-Tested and working on Linux, OSX, FreeBSD, and Cygwin.
-
-### Usage
-
-Add `#{online_status}` format string to your existing `status-right` tmux
-option.
-
-Here's the example in `.tmux.conf`:
-
-    set -g status-right "Online: #{online_status} | %a %h-%d %H:%M "
-
-**OS X**<br/>
-On OS X the above will look like this when online<br/>
-![online indicator](/screenshots/online_indicator.png)<br/>
-or this when offline<br/>
-![offline indicator](/screenshots/offline_indicator.png)<br/>
-
-**Linux**<br/>
-Online status on Linux<br/>
-![online indicator](/screenshots/online_indicator_linux.png)<br/>
-offline status<br/>
-![offline indicator](/screenshots/offline_indicator_linux.png)<br/>
-
-#### Configure icons
-If the icons don't display well on your machine you can change them in
-`.tmux.conf`:
-
-    set -g @online_icon "ok"
-    set -g @offline_icon "offline!"
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    set -g @plugin 'tmux-plugins/tmux-online-status'
-
-Hit `prefix + I` to fetch the plugin and source it.
-
-`#{online_status}` interpolation should now work.
-
-### Manual Installation
-
-Clone the repo:
-
-    $ git clone https://github.com/tmux-plugins/tmux-online-status ~/clone/path
-
-Add this line to the bottom of `.tmux.conf`:
-
-    run-shell ~/clone/path/online_status.tmux
-
-Reload TMUX environment:
-
-    # type this in terminal
-    $ tmux source-file ~/.tmux.conf
-
-`#{online_status}` interpolation should now work.
-
-### Limitations
-
-Online status icon most likely won't be instant. The duration depends on the
-`status-interval` Tmux option. So, it might take anywhere between 5 and 60
-seconds for online status icon to change.
-
-Set `status-interval` to a low number to make this faster, example:
-
-    # in .tmux.conf
-    set -g status-interval 5
-
-### Other plugins
-
-You might also find these useful:
-
-- [battery](https://github.com/tmux-plugins/tmux-battery) - battery status in
-  Tmux `status-right`
-- [logging](https://github.com/tmux-plugins/tmux-logging) - easy logging and
-  screen capturing
-
-### License
-
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-online-status/online_status.tmux b/tmux/plugins/tmux-online-status/online_status.tmux
deleted file mode 100755
index 6856a06..0000000
--- a/tmux/plugins/tmux-online-status/online_status.tmux
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-online_status_icon="#($CURRENT_DIR/scripts/online_status_icon.sh)"
-online_status_interpolation_string="\#{online_status}"
-
-source $CURRENT_DIR/scripts/shared.sh
-
-do_interpolation() {
-	local string="$1"
-	local interpolated="${string/$online_status_interpolation_string/$online_status_icon}"
-	echo "$interpolated"
-}
-
-update_tmux_option() {
-	local option="$1"
-	local option_value="$(get_tmux_option "$option")"
-	local new_option_value="$(do_interpolation "$option_value")"
-	set_tmux_option "$option" "$new_option_value"
-}
-
-main() {
-	update_tmux_option "status-right"
-	update_tmux_option "status-left"
-}
-main
diff --git a/tmux/plugins/tmux-online-status/scripts/online_status_icon.sh b/tmux/plugins/tmux-online-status/scripts/online_status_icon.sh
deleted file mode 100755
index 2114b9d..0000000
--- a/tmux/plugins/tmux-online-status/scripts/online_status_icon.sh
+++ /dev/null
@@ -1,77 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-online_option_string="@online_icon"
-offline_option_string="@offline_icon"
-ping_timeout_string="@ping_timeout"
-route_to_ping_string="@route_to_ping"
-
-online_icon_osx="✅ "
-online_icon="✔"
-offline_icon_osx="⛔️ "
-offline_icon_cygwin="X"
-offline_icon="❌ "
-ping_timeout_default="3"
-route_to_ping_default="www.google.com"
-
-source $CURRENT_DIR/shared.sh
-
-is_osx() {
-	[ $(uname) == "Darwin" ]
-}
-
-is_cygwin() {
-	[[ $(uname) =~ CYGWIN ]]
-}
-
-is_freebsd() {
-	[ $(uname) == FreeBSD ]
-}
-
-online_icon_default() {
-	if is_osx; then
-		echo "$online_icon_osx"
-	else
-		echo "$online_icon"
-	fi
-}
-
-offline_icon_default() {
-	if is_osx; then
-		echo "$offline_icon_osx"
-	elif is_cygwin; then
-		echo "$offline_icon_cygwin"
-	else
-		echo "$offline_icon"
-	fi
-}
-
-online_status() {
-	if is_osx || is_freebsd; then
-		local timeout_flag="-t"
-	else
-		local timeout_flag="-w"
-	fi
-	if is_cygwin; then
-		local number_pings_flag="-n"
-	else
-		local number_pings_flag="-c"
-	fi
-	local ping_timeout="$(get_tmux_option "$ping_timeout_string" "$ping_timeout_default")"
-	local ping_route="$(get_tmux_option "$route_to_ping_string" "$route_to_ping_default")"
-	ping "$number_pings_flag" 1 "$timeout_flag" "$ping_timeout" "$ping_route" >/dev/null 2>&1
-}
-
-print_icon() {
-	if $(online_status); then
-		printf "$(get_tmux_option "$online_option_string" "$(online_icon_default)")"
-	else
-		printf "$(get_tmux_option "$offline_option_string" "$(offline_icon_default)")"
-	fi
-}
-
-main() {
-	print_icon
-}
-main
diff --git a/tmux/plugins/tmux-online-status/scripts/shared.sh b/tmux/plugins/tmux-online-status/scripts/shared.sh
deleted file mode 100644
index eba621f..0000000
--- a/tmux/plugins/tmux-online-status/scripts/shared.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-get_tmux_option() {
-	local option=$1
-	local default_value=$2
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-set_tmux_option() {
-	local option="$1"
-	local value="$2"
-	tmux set-option -gq "$option" "$value"
-}
diff --git a/tmux/plugins/tmux-open/LICENSE.md b/tmux/plugins/tmux-open/LICENSE.md
deleted file mode 100644
index 40f6ddd..0000000
--- a/tmux/plugins/tmux-open/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Bruno Sutic
-
-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/tmux/plugins/tmux-open/README.md b/tmux/plugins/tmux-open/README.md
deleted file mode 100644
index d2d17bc..0000000
--- a/tmux/plugins/tmux-open/README.md
+++ /dev/null
@@ -1,95 +0,0 @@
-# Tmux open
-
-Plugin for opening highlighted selection directly from Tmux copy mode.
-
-Tested and working on Linux, OSX and Cygwin.
-
-### Key bindings
-
-In tmux copy mode:
-
-- `o` - "open" a highlighted selection with the system default program. `open`
-    for OS X or `xdg-open` for Linux.
-- `Ctrl-o` - open a highlighted selection with the `$EDITOR`
-- `Shift-s` - search the highlighted selection directly inside a search engine (defaults to google).
-
-### Examples
-
-In copy mode:
-
-- highlight `file.pdf` and press `o` - file will open in the default PDF viewer.
-- highlight `file.doc` and press `o` - file will open in system default `.doc`
-  file viewer.
-- highlight `http://example.com` and press `o` - link will be opened in the
-  default browser.
-- highlight `file.txt` and press `Ctrl-o` - file will open in `$EDITOR`.
-- highlight `TypeError: 'undefined' is not a function` and press `Shift-s` - the text snipped will be searched directly inside google by default
-
-### Screencast
-
-[![screencast screenshot](/video/screencast_img.png)](http://vimeo.com/102455265)
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    set -g @plugin 'tmux-plugins/tmux-open'
-
-Hit `prefix + I` to fetch the plugin and source it. You should now be able to
-use the plugin.
-
-### Manual Installation
-
-Clone the repo:
-
-    $ git clone https://github.com/tmux-plugins/tmux-open ~/clone/path
-
-Add this line to the bottom of `.tmux.conf`:
-
-    run-shell ~/clone/path/open.tmux
-
-Reload TMUX environment:
-
-    # type this in terminal
-    $ tmux source-file ~/.tmux.conf
-
-You should now be able to use the plugin.
-
-### Configuration
-
-> How can I change the default "o" key binding to something else? For example,
-> key "x"?
-
-Put `set -g @open 'x'` in `tmux.conf`.
-
-> How can I change the default "Ctrl-o" key binding to "Ctrl-x"?
-
-Put `set -g @open-editor 'C-x'` in `tmux.conf`.
-
-> How can I change the default search engine to "duckduckgo" or any other one?
-
-Put `set -g @open-S 'https://www.duckduckgo.com/'` in `tmux.conf`
-
-> How can I use multiple search engines?
-
-Put:
-
-```
-set -g @open-B 'https://www.bing.com/search?q='
-set -g @open-S 'https://www.google.com/search?q='
-```
-
-in `tmux.conf`
-
-### Other goodies
-
-`tmux-open` works great with:
-
-- [tmux-copycat](https://github.com/tmux-plugins/tmux-copycat) - a plugin for
-  regex searches in tmux and fast match selection
-- [tmux-yank](https://github.com/tmux-plugins/tmux-yank) - enables copying
-  highlighted text to system clipboard
-
-### License
-
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-open/open.tmux b/tmux/plugins/tmux-open/open.tmux
deleted file mode 100755
index 824ea24..0000000
--- a/tmux/plugins/tmux-open/open.tmux
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/scripts/helpers.sh"
-
-default_open_key="o"
-open_option="@open"
-
-default_open_editor_key="C-o"
-open_editor_option="@open-editor"
-open_editor_override="@open-editor-command"
-
-command_exists() {
-	local command="$1"
-	type "$command" >/dev/null 2>&1
-}
-
-is_osx() {
-	local platform=$(uname)
-	[ "$platform" == "Darwin" ]
-}
-
-is_cygwin() {
-	[[ "$(uname)" =~ CYGWIN ]]
-}
-
-get_editor_from_the_env_var() {
-	if [ -z $EDITOR ]; then
-		# $EDITOR not set, fallback
-		echo "vi"
-	else
-		echo "$EDITOR"
-	fi
-}
-
-command_generator() {
-	local command_string="$1"
-	echo "xargs -I {} tmux run-shell -b 'cd #{pane_current_path}; $command_string \"{}\" > /dev/null'"
-}
-
-search_command_generator() {
-	local command_string="$1"
-	local engine="$2"
-
-	echo "xargs -I {} tmux run-shell -b 'cd #{pane_current_path}; $command_string $engine\"{}\" > /dev/null'"
-}
-
-generate_open_command() {
-	if is_osx; then
-		echo "$(command_generator "open")"
-	elif is_cygwin; then
-		echo "$(command_generator "cygstart")"
-	elif command_exists "xdg-open"; then
-		echo "$(command_generator "xdg-open")"
-	else
-		# error command for Linux machines when 'xdg-open' not installed
-		"$CURRENT_DIR/scripts/tmux_open_error_message.sh" "xdg-open"
-	fi
-}
-
-generate_open_search_command() {
-	local engine="$1"
-	if is_osx; then
-		echo "$(search_command_generator "open" "$engine")"
-	elif is_cygwin; then
-		echo "$(command_generator "cygstart")"
-	elif command_exists "xdg-open"; then
-		echo "$(search_command_generator "xdg-open" "$engine")"
-	else
-		# error command for Linux machines when 'xdg-open' not installed
-		"$CURRENT_DIR/scripts/tmux_open_error_message.sh" "xdg-open"
-	fi
-}
-
-# 1. write a command to the terminal, example: 'vim -- some_file.txt'
-# 2. invoke the command by pressing enter/C-m
-generate_editor_command() {
-	local environment_editor=$(get_editor_from_the_env_var)
-	local editor=$(get_tmux_option "$open_editor_override" "$environment_editor")
-	# vim freezes terminal unless there's the '--' argument. Other editors seem
-	# to be fine with it (textmate [mate], light table [table]).
-	echo "xargs -I {} tmux send-keys '$editor -- \"{}\"'; tmux send-keys 'C-m'"
-}
-
-set_copy_mode_open_bindings() {
-	local open_command="$(generate_open_command)"
-	local key_bindings=$(get_tmux_option "$open_option" "$default_open_key")
-	local key
-	for key in $key_bindings; do
-		if tmux-is-at-least 2.4; then
-			tmux bind-key -T copy-mode-vi "$key" send-keys -X copy-pipe-and-cancel "$open_command"
-			tmux bind-key -T copy-mode    "$key" send-keys -X copy-pipe-and-cancel "$open_command"
-		else
-			tmux bind-key -t vi-copy    "$key" copy-pipe "$open_command"
-			tmux bind-key -t emacs-copy "$key" copy-pipe "$open_command"
-		fi
-	done
-}
-
-set_copy_mode_open_editor_bindings() {
-	local editor_command="$(generate_editor_command)"
-	local key_bindings=$(get_tmux_option "$open_editor_option" "$default_open_editor_key")
-	local key
-	for key in $key_bindings; do
-		if tmux-is-at-least 2.4; then
-			tmux bind-key -T copy-mode-vi "$key" send-keys -X copy-pipe-and-cancel "$editor_command"
-			tmux bind-key -T copy-mode    "$key" send-keys -X copy-pipe-and-cancel "$editor_command"
-		else
-			tmux bind-key -t vi-copy    "$key" copy-pipe "$editor_command"
-			tmux bind-key -t emacs-copy "$key" copy-pipe "$editor_command"
-		fi
-	done
-}
-
-set_copy_mode_open_search_bindings() {
-	local stored_engine_vars="$(stored_engine_vars)"
-	local engine_var
-	local engine
-	local key
-
-	for engine_var in $stored_engine_vars; do
-		engine="$(get_engine "$engine_var")"
-
-		if tmux-is-at-least 2.4; then
-			tmux bind-key -T copy-mode-vi "$engine_var" send-keys -X copy-pipe-and-cancel "$(generate_open_search_command "$engine")"
-			tmux bind-key -T copy-mode    "$engine_var" send-keys -X copy-pipe-and-cancel "$(generate_open_search_command "$engine")"
-		else
-			tmux bind-key -t vi-copy    "$engine_var" copy-pipe "$(generate_open_search_command "$engine")"
-			tmux bind-key -t emacs-copy "$engine_var" copy-pipe "$(generate_open_search_command "$engine")"
-		fi
-
-	done
-}
-
-main() {
-	set_copy_mode_open_bindings
-	set_copy_mode_open_editor_bindings
-	set_copy_mode_open_search_bindings
-}
-
-main
diff --git a/tmux/plugins/tmux-plugin-sysstat/LICENSE b/tmux/plugins/tmux-plugin-sysstat/LICENSE
deleted file mode 100644
index 1aa9736..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License
-
-Copyright (c) 2017 Alexey Samoshkin
-
-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.
\ No newline at end of file
diff --git a/tmux/plugins/tmux-plugin-sysstat/readme.md b/tmux/plugins/tmux-plugin-sysstat/readme.md
deleted file mode 100644
index 2bd0295..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/readme.md
+++ /dev/null
@@ -1,372 +0,0 @@
-
-Tmux sysstat plugin
-===================
-Allow to print CPU usage, memory & swap, load average, net I/O metrics in Tmux status bar
-
-![intro](/screenshots/intro.png)
-
-You might checkout [tmux-config](https://github.com/samoshkin/tmux-config) repo to see this plugin in action.
-
-Features
---------
-- CPU usage
-- Memory available/free, used, total (KiB,MiB,GiB), free/used %
-- Swap used, free, total, free/used %
-- load average for last 1,5,15 minutes
-- configurable thresholds (low, medium, stress) with custom colors
-- tweak each metric output using templates (e.g, 'used 10% out of 16G')
-- configurable size scale (K,M,G)
-- OSX, Linux support
-- [ ] **TODO:** network I/O metric support
-
-Tested on: OS X El Capitan 10.11.5, Ubuntu 14 LTS, CentOS 7, FreeBSD 11.1.
-
-
-Installation
-------------
-Best installed through [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (TMP). Add following line to your `.tmux.conf` file:
-
-```
-set -g @plugin 'samoshkin/tmux-plugin-sysstat'
-```
-
-Use `prefix + I` from inside tmux to install all plugins and source them. If you prefer, same effect can be achieved from [command line](https://github.com/tmux-plugins/tpm/blob/master/docs/managing_plugins_via_cmd_line.md):
-
-```
-$ ~.tmux/plugins/tpm/bin/install_plugins
-```
-
-Basic usage
------------
-
-Once plugged in, tmux `status-left` or `status-right` options can be configured with following placeholders. Each placeholder will be expanded to metric's default output.
-
-- `#{sysstat_cpu}`, CPU usage - `CPU:40.2%`
-- `#{sysstat_mem}`, memory usage - `MEM:73%`
-- `#{sysstat_swap}`, swap usage - `SW:66%`
-- `#{sysstat_loadavg}`, system load average - `0.25 0.04 0.34`
-
-For example:
-```
-set -g status-right "#{sysstat_cpu} | #{sysstat_mem} | #{sysstat_swap} | #{sysstat_loadavg} | #[fg=cyan]#(echo $USER)#[default]@#H"
-```
-
-Changing default output
-------------------------
-
-You can change default output for CPU and memory metrics, if you need more fields to show, or you want to provide custom template. In your `.tmux.conf`:
-
-For example, to get `Used 4.5G out of 16G` output for memory metric:
-
-```
-set -g @sysstat_mem_view_tmpl '#Used [fg=#{mem.color}]#{mem.used}#[default] out of #{mem.total}'
-```
-
-If you don't want `CPU:` prefix and don't like colored output for CPU metric:
-
-```
-set -g @sysstat_cpu_view_tmpl '#{cpu.pused}'
-```
-
-### Supported fields
-
-As you can see, each metric can be configured with template, containing fixed text (`CPU:`), color placeholder (`#[fg=#{mem.color}]`) and field placeholder (`#{mem.used}`). This approach gives you the ultimate control over the output for each metric. Following field placeholders are supported:
-
-<table>
-    <th>CPU</th>
-    <tr>
-        <td><code>#{cpu.color}</code></td>
-        <td>main metric color</td>
-    </tr>
-    <tr>
-        <td><code>#{cpu.pused}</code></td>
-        <td>CPU usage percentage</td>
-    </tr>
-</table>
-
-<table>
-    <th>Memory</th>
-    <tr>
-        <td><code>#{mem.color}</code></td>
-        <td>main metric color</td>
-    </tr>
-    <tr>
-        <td><code>#{mem.free}</code></td>
-        <td>free/available memory</td>
-    </tr>
-    <tr>
-        <td><code>#{mem.pfree}</code></td>
-        <td>free memory percentage against total</td>
-    </tr>
-    <tr>
-        <td><code>#{mem.used}</code></td>
-        <td>used memory</td>
-    </tr>
-    <tr>
-        <td><code>#{mem.pused}</code></td>
-        <td>used memory percentage against total</td>
-    </tr>
-    <tr>
-        <td><code>#{mem.total}</code></td>
-        <td>total installed memory</td>
-    </tr>
-</table>
-
-<table>
-    <th>Swap</th>
-    <tr>
-        <td><code>#{swap.color}</code></td>
-        <td>main swap metric color</td>
-    </tr>
-    <tr>
-        <td><code>#{swap.free}</code></td>
-        <td>free swap memory</td>
-    </tr>
-    <tr>
-        <td><code>#{swap.pfree}</code></td>
-        <td>free swap memory percentage against total swap space</td>
-    </tr>
-    <tr>
-        <td><code>#{swap.used}</code></td>
-        <td>used swap memory</td>
-    </tr>
-    <tr>
-        <td><code>#{swap.pused}</code></td>
-        <td>used swap memory percentage against total swap space</td>
-    </tr>
-    <tr>
-        <td><code>#{swap.total}</code></td>
-        <td>total swap space</td>
-    </tr>
-</table>
-
-### Change size scale
-
-free/used/total memory can be shown both in absolute and relative units. When it comes to absolute units, you can choose *size scale factor* to choose between GiB, MiB, KiB. Default is GiB. If you have less than 3-4G memory installed, it makes sense to use MiB. KiB option is less practical, because it yields pretty lengthy output, which does not fit status bar limited estate.
-
-```
-set -g @sysstat_mem_size_unit "G"
-```
-
-If you choose `G` for size scale, output will have `%.1f` (1 digit after floating point), otherwise size is integer (4.5G, 1024M, 1232345K).
-
-Thresholds and colored output
----------------
-Each metric output is colored by default. Colors vary depending on metric value.
-
-<table>
-    <tr>
-      <td><b>Threshold</b></td>
-      <td><b>CPU</b></td>
-      <td><b>Memory</b></td>
-      <td><b>Swap</b></td>
-      <td><b>Default color</b></td>
-    </tr>
-    <tr>
-        <td>low</td>
-        <td>x &lt; 30%</td>
-        <td>x &lt; 75%</td>
-        <td>x &lt; 25%</td>
-        <td>green</td>
-    </tr>
-    <tr>
-        <td>medium</td>
-        <td>30% &lt; x &lt; 80%</td>
-        <td>75% &lt; x &lt; 90%</td>
-        <td>25% &lt; x &lt; 75%</td>
-        <td>yellow</td>
-    </tr>
-    <tr>
-        <td>high</td>
-        <td>x &gt; 80%</td>
-        <td>x &gt; 90%</td>
-        <td>x &gt; 75%</td>
-        <td>red</td>
-    </tr>
-</table>
-
-You can change thresholds in your `.tmux.conf`:
-
-```
-set -g @sysstat_cpu_medium_threshold "75"
-set -g @sysstat_cpu_stress_threshold "95"
-
-set -g @sysstat_mem_medium_threshold "85"
-set -g @sysstat_mem_stress_threshold "95"
-
-set -g @sysstat_swap_medium_threshold "80"
-set -g @sysstat_swap_stress_threshold "90"
-```
-
-You can change colors for each threshold individually. You can use ANSI basic colors (red, cyan, green) or if your terminal supports 256 colors (and most do nowadays), use `colourXXX` format.
-
-```
-set -g @sysstat_cpu_color_low "colour076"
-set -g @sysstat_cpu_color_medium "colour220"
-set -g @sysstat_cpu_color_stress "colour160"
-set -g @sysstat_mem_color_low "green"
-set -g @sysstat_mem_color_medium "blue"
-set -g @sysstat_mem_color_stress "cyan"
-```
-
-`#{(mem|cpu|swap).color}` placeholder in your `@sysstat_(mem|cpu|swap)_view_tmpl` would be replaced by corresponding color, depending on whether metric value falls in particular threshold.
-
-### 256 color palette support
-
-For 256 color palette support, make sure that `tmux` and parent terminal are configured with correct terminal type. See [here](https://unix.stackexchange.com/questions/1045/getting-256-colors-to-work-in-tmux) and [there](https://github.com/tmux/tmux/wiki/FAQ)
-
-```
-# ~/.tmux.conf
-set -g default-terminal "screen-256color"
-```
-
-```
-# parent terminal
-$ echo $TERM
-xterm-256color
-
-# jump into a tmux session
-$ tmux new
-$ echo $TERM
-screen-256color
-```
-
-
-
-### Multiple colors for each threshold
-
-You can have up to *3* colors configured for each threshold. To understand why you might need this, let tackle this task. Note, this is rather advanced use case.
-
-> I want `CPU: #{cpu.pused}` metric output, have green and yellow text colors at "low" and "medium" threshold, and finally, for "high" threshold, I want to use red color, but reverse foreground and background, that is use red for background, and white for text. More over I want "CPU:" text colored apart in red
-
-Like this:
-
-![cpu threshold with custom colors](/screenshots/cpu_thresholds.png)
-
-You can achieve the result using following configuration:
-
-```
-set -g @sysstat_cpu_view_tmpl '#[fg=#{cpu.color3}]CPU:#[default] #[fg=#{cpu.color},bg=#{cpu.color2}]#{cpu.pused}#[default]'
-
-set -g @sysstat_cpu_color_low "$color_level_ok default default"
-set -g @sysstat_cpu_color_medium "$color_level_warn default default"
-set -g @sysstat_cpu_color_stress "white,bold $color_level_stress $color_level_stress"
-```
-
-Tmux status-interval setting
------------------------------
-You can configure status refresh interval, increasing or reducing frequency of `tmux-plugin-sysstat` command invocations.
-
-```
-set -g status-interval 5
-```
-
-It's adviced to set `status-interval` to some reasonable value, like 5-10 seconds. More frequent updates (1 second) are useless, because they distract, and results in extra resource stress spent on metrics calculation itself.
-
-
-
-Internals: CPU calculation
---------------------------------------------------
-<span style="color: blue">**NOTE:** Stop here if you want to just use this plugin without making your feet wet. If you're hardcore tmux user and are curious about internals, keep reading</span>
-
-Internally, we use `iostat` and `top` on OSX, and `vmstat` and `top` on Linux to collect metric value. Neither requires you to install extra packages. These commands are run in sampling mode to report stats every N seconds M times. First sample include average values since the system start. Second one is the average CPU per second for last N seconds (exactly what we need)
-
-For example:
-
-```
-$ iostat -c 2 -w 5
-          disk0       cpu     load average
-    KB/t tps  MB/s  us sy id   1m   5m   15m
-   44.22   6  0.26   3  2 95  1.74 1.90 2.15
-    5.47   8  0.04   4  5 91  1.84 1.92 2.16  << use this row, 2nd sample
-```
-
-We align CPU calculation intervals (`-w`) with tmux status bar refresh interval (`status-interval` setting).
-
-Internals: memory calculation
-----------------------------
-You might ask what we treat as `free` memory and how it's calculated.
-
-### OSX
-Let's start with OSX. We use `vm_stat` command (not same as `vmstat` on Linux), which reports following data (number of memory pages, not KB):
-
-```
-$ vm_stat
-Pages free:                               37279
-Pages active:                           1514200
-Pages inactive:                         1152997
-Pages speculative:                         6214
-Pages throttled:                              0
-Pages wired down:                       1174408
-Pages purgeable:                          15405
-Pages stored in compressor:             1615663
-Pages occupied by compressor:            306717
-```
-
-Total installed memory formula is:
-```
-Total = free + active + inactive + speculative + occupied by compressor + wired
-```
-
-where
-- `free`, completely unused memory by the system
-- `wired`, critical information stored in RAM by system, kernel and key applications. Never swapped to the hard drive, never replaced with user-level data.
-- `active`, information currently in use or very recently used by applications. When this kind of memory is not used for long (or application is closed), it's move to inactive memory.
-- `inactive`, like buffers/cached memory in Linux. Memory for applications, which recently exited, retained for faster start-up of same application in future.
-
-So the question what constitutes `free` and `used` memory. It turns out, that various monitoring and system statistics tools on OSX each calculate it differently.
-
-- htop: `used = active + wired`, `free` = `total - used`
-- top. Used = `used = active + inactive + occupied by compressor + wired`; Free = `free + speculative` Resident set size (RSS) = `active`
-- OSX activity Monitor. Used = `app memory + wired + compressor`. Note, it's not clear what is app memory.
-
-In general, they either treat currently used memory, which can be reclaimed in case of need (cached, inactive, occupied by compressor), as `used` or `free`. 
-
-It makes sense to talk about `available` memory rather than `free` one. Available memory is unused memory + any used memory which can be reclaimed for application needs.
-
-So, `tmux-plugin-sysstat`, uses following formula:
-
-```
-used = active + wired
-available/free = free/unused + inactive + speculative + occupied by compressor
-```
-
-### Linux
-
-Same thinking can be applied to Linux systems.
-
-Usually commands like `free` report free/unused, used, buffers, cache memory kinds.
-
-```
-$ free
-             total       used       free     shared    buffers     cached
-Mem:       1016464     900236     116228      21048      93448     241544
--/+ buffers/cache:     565244     451220
-Swap:      1046524     141712     904812
-```
-
-Second line indicates available memory (free + buffers + cache), with an assumption that buffers and cache can be 100% reclaimed in case of need.
-
-However, we're not using free, because its output varies per system. For example on RHEL7, there is no `-/+ buffers/cache`, and `available` memory is reported in different way. We read directly from `/proc/meminfo`
-
-```
-$ cat /proc/meminfo
-
-MemTotal:        1016232 kB
-MemFree:          152672 kB
-MemAvailable:     637832 kB
-Buffers:               0 kB
-Cached:           529040 kB
-```
-
-`tmux-plugin-sysstat` uses following formula:
-
-```
-free/available = MemAvailable;  // if MemAvailable present
-free/available = MemFree + Buffers + Cached;
-used = MemTotal - free/avaialble 
-```
-
-Using `MemAvailable` is more accurate way of getting available memory, rather than manual calculation `free + buffers + cache`, because the assumption that `buffers + cache` can be 100% reclaimed for new application needs might be wrong. When using `MemAvailable`, OS calculates available memory for you, which is apparently better and accurate approach.
-
-See [this topic](https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773) on more reasoning about `MemAvailable` field.
diff --git a/tmux/plugins/tmux-plugin-sysstat/scripts/cpu.sh b/tmux/plugins/tmux-plugin-sysstat/scripts/cpu.sh
deleted file mode 100755
index adc2223..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/scripts/cpu.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-set -e
-
-LC_NUMERIC=C
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "$CURRENT_DIR/helpers.sh"
-
-cpu_tmp_dir=$(tmux show-option -gqv "@sysstat_cpu_tmp_dir")
-
-cpu_view_tmpl=$(get_tmux_option "@sysstat_cpu_view_tmpl" 'CPU:#[fg=#{cpu.color}]#{cpu.pused}#[default]')
-
-cpu_medium_threshold=$(get_tmux_option "@sysstat_cpu_medium_threshold" "30")
-cpu_stress_threshold=$(get_tmux_option "@sysstat_cpu_stress_threshold" "80")
-
-cpu_color_low=$(get_tmux_option "@sysstat_cpu_color_low" "green")
-cpu_color_medium=$(get_tmux_option "@sysstat_cpu_color_medium" "yellow")
-cpu_color_stress=$(get_tmux_option "@sysstat_cpu_color_stress" "red")
-
-get_cpu_color(){
-  local cpu_used=$1
-
-  if fcomp "$cpu_stress_threshold" "$cpu_used"; then
-    echo "$cpu_color_stress";
-  elif fcomp "$cpu_medium_threshold" "$cpu_used"; then
-    echo "$cpu_color_medium";
-  else
-    echo "$cpu_color_low";
-  fi
-}
-
-print_cpu_usage() {
-  local cpu_pused=$(get_cpu_usage_or_collect)
-  local cpu_color=$(get_cpu_color "$cpu_pused")
-  
-  local cpu_view="$cpu_view_tmpl"
-  cpu_view="${cpu_view//'#{cpu.pused}'/$(printf "%.1f%%" "$cpu_pused")}"
-  cpu_view="${cpu_view//'#{cpu.color}'/$(echo "$cpu_color" | awk '{ print $1 }')}"
-  cpu_view="${cpu_view//'#{cpu.color2}'/$(echo "$cpu_color" | awk '{ print $2 }')}"
-  cpu_view="${cpu_view//'#{cpu.color3}'/$(echo "$cpu_color" | awk '{ print $3 }')}"
-
-  echo "$cpu_view"
-}
-
-get_cpu_usage_or_collect() {
-  local collect_cpu_metric="$cpu_tmp_dir/cpu_collect.metric"
-
-  # read cpu metric from file, otherwise 0 as a temporary null value, until first cpu metric is collected
-  [ -f "$collect_cpu_metric" ] && cat "$collect_cpu_metric" || echo "0.0"
-
-  start_cpu_collect_if_required >/dev/null 2>&1
-}
-
-start_cpu_collect_if_required() {
-  local collect_cpu_pidfile="$cpu_tmp_dir/cpu_collect.pid"
-
-  # check if cpu collect process is running, otherwise start it in background
-  if [ -f "$collect_cpu_pidfile" ] && ps -p "$(cat "$collect_cpu_pidfile")" > /dev/null 2>&1; then
-    return;
-  fi
-  
-  jobs >/dev/null 2>&1
-  "$CURRENT_DIR/cpu_collect.sh" &>/dev/null &
-  if [ -n "$(jobs -n)" ]; then
-    echo "$!" > "${collect_cpu_pidfile}"
-  else
-    echo "Failed to start CPU collect job" >&2
-    exit 1
-  fi
-}
-
-main(){
-  print_cpu_usage
-}
-
-main
diff --git a/tmux/plugins/tmux-plugin-sysstat/scripts/cpu_collect.sh b/tmux/plugins/tmux-plugin-sysstat/scripts/cpu_collect.sh
deleted file mode 100755
index 768caba..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/scripts/cpu_collect.sh
+++ /dev/null
@@ -1,53 +0,0 @@
-#!/usr/bin/env bash
-
-LC_NUMERIC=C
-
-set -u
-set -e
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "$CURRENT_DIR/helpers.sh"
-
-refresh_interval=$(get_tmux_option "status-interval" "5")
-samples_count="60"
-cpu_metric_file="$(get_tmux_option "@sysstat_cpu_tmp_dir" "/dev/null")/cpu_collect.metric"
-
-get_cpu_usage() {
-  if is_osx; then
-    if command_exists "iostat"; then
-      iostat -w "$refresh_interval" -c "$samples_count" \
-        | stdbuf -o0 awk 'NR > 2 { print 100-$(NF-3); }'
-    else
-      top -l "$samples_count" -s "$refresh_interval" -n 0 \
-        | sed -u -nr '/CPU usage/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)%[[:space:]]*idle.*/\1/p' \
-        | stdbuf -o0 awk '{ print 100-$0 }'
-    fi
-  elif ! command_exists "vmstat"; then
-    if is_freebsd; then
-      vmstat -n "$refresh_interval" -c "$samples_count" \
-        | stdbuf -o0 awk 'NR>2 {print 100-$(NF-0)}'
-    else
-      vmstat -n "$refresh_interval" "$samples_count" \
-        | stdbuf -o0 awk 'NR>2 {print 100-$(NF-2)}'
-    fi
-  else
-    if is_freebsd; then
-      top -d"$samples_count" \
-        | sed -u -nr '/CPU:/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)%[[:space:]]*id.*/\1/p' \
-        | stdbuf -o0 awk '{ print 100-$0 }'
-    else
-      top -b -n "$samples_count" -d "$refresh_interval" \
-        | sed -u -nr '/%Cpu/s/.*,[[:space:]]*([0-9]+[.,][0-9]*)[[:space:]]*id.*/\1/p' \
-        | stdbuf -o0 awk '{ print 100-$0 }'
-    fi
-  fi
-}
-
-main() {
-  get_cpu_usage | while read -r value; do
-    echo "$value" | tee "$cpu_metric_file"
-  done
-}
-
-main
-
diff --git a/tmux/plugins/tmux-plugin-sysstat/scripts/helpers.sh b/tmux/plugins/tmux-plugin-sysstat/scripts/helpers.sh
deleted file mode 100755
index 92793b3..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/scripts/helpers.sh
+++ /dev/null
@@ -1,76 +0,0 @@
-
-get_tmux_option() {
-  local option="$1"
-  local default_value="$2"
-  local option_value="$(tmux show-option -gqv "$option")"
-  if [ -z "$option_value" ]; then
-    echo "$default_value"
-  else
-    echo "$option_value"
-  fi
-}
-
-set_tmux_option() {
-  local option="$1"
-  local value="$2"
-  tmux set-option -gq "$option" "$value"
-}
-
-is_osx() {
-  [ $(uname) == "Darwin" ]
-}
-
-is_linux(){
-  [ $(uname -s) == "Linux" ]
-}
-
-is_freebsd() {
-    [ $(uname) == FreeBSD ]
-}
-
-command_exists() {
-  local command="$1"
-  type "$command" >/dev/null 2>&1
-}
-
-# because bash does not support floating-point math
-# but awk does
-calc() {
-  local stdin;
-  read -d '' -u 0 stdin;
-  awk "BEGIN { print $stdin }";
-}
-
-# "<" math operator which works with floats, once again based on awk
-fcomp() {
-  awk -v n1="$1" -v n2="$2" 'BEGIN {if (n1<n2) exit 0; exit 1}'
-}
-
-# get_mem_usage* function returns values in KiB
-# 1 - scale to KiB
-# 1024 - scale to MiB
-# 1048576 - scale to GiB
-function get_size_scale_factor(){
-  local size_unit="$1"
-  case "$size_unit" in 
-    G) echo 1048576;;
-    M) echo 1024;;
-    K) echo 1;;
-  esac
-}
-
-# Depending on scale factor, change precision
-# 12612325K - no digits after floating point
-# 1261M - no digits after floating point
-# 1.1G  - 1 digit after floating point 
-function get_size_format(){
-  local size_unit="$1"
-  case "$size_unit" in 
-    G) echo '%.1f%s';;
-    M) echo '%.0f%s';;
-    K) echo '%.0f%s';;
-  esac
-}
-  
-  
-
diff --git a/tmux/plugins/tmux-plugin-sysstat/scripts/loadavg.sh b/tmux/plugins/tmux-plugin-sysstat/scripts/loadavg.sh
deleted file mode 100755
index 7152314..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/scripts/loadavg.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-set -e
-
-LC_NUMERIC=C
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "$CURRENT_DIR/helpers.sh"
-
-loadavg_per_cpu_core=$(get_tmux_option "@sysstat_loadavg_per_cpu_core" "true")
-
-get_num_of_cores(){
-  is_osx && sysctl -n hw.ncpu || nproc
-}
-
-main(){ 
-  local num_cores=$([ "$loadavg_per_cpu_core" == "true" ]  && get_num_of_cores || echo 1)
-
-  uptime | awk -v num_cores="$num_cores" '{ 
-    sub(/,$/, "", $(NF-2));
-    sub(/,$/, "", $(NF-1));
-    sub(/,$/, "", $NF);
-    printf "%.2f %.2f %.2f", $(NF-2)/num_cores, $(NF-1)/num_cores, $NF/num_cores
-  }'
-}
-
-main
diff --git a/tmux/plugins/tmux-plugin-sysstat/scripts/mem.sh b/tmux/plugins/tmux-plugin-sysstat/scripts/mem.sh
deleted file mode 100755
index 6a032bf..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/scripts/mem.sh
+++ /dev/null
@@ -1,130 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-set -e
-
-LC_NUMERIC=C
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "$CURRENT_DIR/helpers.sh"
-
-mem_view_tmpl=$(get_tmux_option "@sysstat_mem_view_tmpl" 'MEM:#[fg=#{mem.color}]#{mem.pused}#[default]')
-
-mem_medium_threshold=$(get_tmux_option "@sysstat_mem_medium_threshold" "75")
-mem_stress_threshold=$(get_tmux_option "@sysstat_mem_stress_threshold" "90")
-
-mem_color_low=$(get_tmux_option "@sysstat_mem_color_low" "green")
-mem_color_medium=$(get_tmux_option "@sysstat_mem_color_medium" "yellow")
-mem_color_stress=$(get_tmux_option "@sysstat_mem_color_stress" "red")
-
-size_unit=$(get_tmux_option "@sysstat_mem_size_unit" "G")
-
-get_mem_color() {
-  local mem_pused=$1
-
-  if fcomp "$mem_stress_threshold" "$mem_pused"; then
-    echo "$mem_color_stress";
-  elif fcomp "$mem_medium_threshold" "$mem_pused"; then
-    echo "$mem_color_medium";
-  else
-    echo "$mem_color_low";
-  fi
-}
-
-print_mem() {
-  local mem_usage
-  local scale
-  local size_format
-  
-  if is_osx; then
-    mem_usage=$(get_mem_usage_osx)
-  elif is_linux; then 
-    mem_usage=$(get_mem_usage_linux)
-  elif is_freebsd; then
-    mem_usage=$(get_mem_usage_freebsd)
-  fi
-
-  local size_scale="$(get_size_scale_factor "$size_unit")"
-  local size_format="$(get_size_format "$size_unit")"
-
-  # Extract free and used memory in MiB, calculate total and percentage
-  local mem_free=$(echo $mem_usage | awk -v scale="$size_scale" '{ print $1/scale }')
-  local mem_used=$(echo $mem_usage | awk -v scale="$size_scale" '{ print $2/scale }')
-  local mem_total=$(echo "$mem_free + $mem_used" | calc)
-  local mem_pused=$(echo "($mem_used / $mem_total) * 100" | calc)
-  local mem_pfree=$(echo "($mem_free / $mem_total) * 100" | calc)
-  
-  # Calculate colors for mem and swap
-  local mem_color=$(get_mem_color "$mem_pused")
-  
-  local mem_view="$mem_view_tmpl"
-  mem_view="${mem_view//'#{mem.used}'/$(printf "$size_format" "$mem_used" "$size_unit")}"
-  mem_view="${mem_view//'#{mem.pused}'/$(printf "%.0f%%" "$mem_pused")}"
-  mem_view="${mem_view//'#{mem.free}'/$(printf "$size_format" "$mem_free" "$size_unit")}"
-  mem_view="${mem_view//'#{mem.pfree}'/$(printf "%.0f%%" "$mem_pfree")}"
-  mem_view="${mem_view//'#{mem.total}'/$(printf "$size_format" "$mem_total" "$size_unit")}"  
-  mem_view="${mem_view//'#{mem.color}'/$(echo "$mem_color" | awk '{ print $1 }')}"
-  mem_view="${mem_view//'#{mem.color2}'/$(echo "$mem_color" | awk '{ print $2 }')}"
-  mem_view="${mem_view//'#{mem.color3}'/$(echo "$mem_color" | awk '{ print $3 }')}"
-
-  echo "$mem_view"
-}
-
-
-# Report like it does htop on OSX:
-# used = active + wired
-# free = free + inactive + speculative + occupied by compressor
-# see `vm_stat` command
-get_mem_usage_osx(){
-  
-  local page_size=$(sysctl -nq "vm.pagesize")
-  vm_stat | awk -v page_size=$page_size -F ':' '
-    BEGIN { free=0; used=0 }
-    
-    /Pages active/ || 
-    /Pages wired/ { 
-      gsub(/^[ \t]+|[ \t]+$/, "", $2); used+=$2;
-    }
-    /Pages free/ || 
-    /Pages inactive/ || 
-    /Pages speculative/ || 
-    /Pages occupied by compressor/ { 
-      gsub(/^[ \t]+|[ \t]+$/, "", $2); free+=$2;
-    }
-
-    END { print (free * page_size)/1024, (used * page_size)/1024 }
-  '
-}
-
-# Relies on vmstat, but could also be done with top on FreeBSD
-get_mem_usage_freebsd(){
-  vmstat -H | tail -n 1 | awk '{ print $5, $4 }'
-}
-
-# Method #1. Sum up free+buffers+cached, treat it as "available" memory, assuming buff+cache can be reclaimed. Note, that this assumption is not 100% correct, buff+cache most likely cannot be 100% reclaimed, but this is how memory calculation is used to be done on Linux
-
-# Method #2. If "MemAvailable" is provided by system, use it. This is more correct method, because we're not relying on fragile "free+buffer+cache" equation. 
-
-# See: Interpreting /proc/meminfo and free output for Red Hat Enterprise Linux 5, 6 and 7 - Red Hat Customer Portal - https://access.redhat.com/solutions/406773
-
-# See: kernel/git/torvalds/linux.git - /proc/meminfo: provide estimated available memory - https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=34e431b0ae398fc54ea69ff85ec700722c9da773
-get_mem_usage_linux(){
-  </proc/meminfo awk '
-    BEGIN { total=0; free=0; }
-      /MemTotal:/ { total=$2; }
-      
-      /MemFree:/ { free+=$2; }
-      /Buffers:/ { free+=$2; }
-      /Cached:/ { free+=$2; }
-
-      /MemAvailable:/ { free=$2; exit;}
-    END { print free, total-free }
-  '
-}
-
-main() {
-  print_mem
-}
-
-main
-
diff --git a/tmux/plugins/tmux-plugin-sysstat/scripts/swap.sh b/tmux/plugins/tmux-plugin-sysstat/scripts/swap.sh
deleted file mode 100755
index 0717f4b..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/scripts/swap.sh
+++ /dev/null
@@ -1,95 +0,0 @@
-#!/usr/bin/env bash
-
-set -u
-set -e
-
-LC_NUMERIC=C
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "$CURRENT_DIR/helpers.sh"
-
-swap_view_tmpl=$(get_tmux_option "@sysstat_swap_view_tmpl" 'SW:#[fg=#{swap.color}]#{swap.pused}#[default]')
-
-swap_medium_threshold=$(get_tmux_option "@sysstat_swap_medium_threshold" "25")
-swap_stress_threshold=$(get_tmux_option "@sysstat_swap_stress_threshold" "75")
-
-swap_color_low=$(get_tmux_option "@sysstat_swap_color_low" "green")
-swap_color_medium=$(get_tmux_option "@sysstat_swap_color_medium" "yellow")
-swap_color_stress=$(get_tmux_option "@sysstat_swap_color_stress" "red")
-
-size_unit=$(get_tmux_option "@sysstat_swap_size_unit" "G")
-
-get_swap_color() {
-  local swap_pused=$1
-
-  if fcomp "$swap_stress_threshold" "$swap_pused"; then
-    echo "$swap_color_stress";
-  elif fcomp "$swap_medium_threshold" "$swap_pused"; then
-    echo "$swap_color_medium";
-  else
-    echo "$swap_color_low";
-  fi
-}
-
-print_swap() {
-  local swap_usage
-  
-  
-  if is_osx; then
-    swap_usage=$(get_swap_usage_osx)
-  elif is_linux; then 
-    swap_usage=$(get_swap_usage_linux)
-  fi
-
-  local size_scale="$(get_size_scale_factor "$size_unit")"
-  local size_format="$(get_size_format "$size_unit")"
-
-  # Extract swap free and used in MiB, calculate total and percentage
-  local swap_free=$(echo $swap_usage | awk -v scale="$size_scale" '{ print $1/scale }')
-  local swap_used=$(echo $swap_usage | awk -v scale="$size_scale" '{ print $2/scale }')
-  local swap_total=$(echo "$swap_free + $swap_used" | calc)
-  local swap_pused=$(echo "($swap_used / $swap_total) * 100" | calc)
-  local swap_pfree=$(echo "($swap_free / $swap_total) * 100" | calc)
-  
-  # Calculate colors for mem and swap
-  local swap_color=$(get_swap_color "$swap_pused")
-  
-  local swap_view="$swap_view_tmpl"
-  swap_view="${swap_view//'#{swap.used}'/$(printf "$size_format" "$swap_used" "$size_unit")}"
-  swap_view="${swap_view//'#{swap.pused}'/$(printf "%.0f%%" "$swap_pused")}"
-  swap_view="${swap_view//'#{swap.free}'/$(printf "$size_format" "$swap_free" "$size_unit")}"
-  swap_view="${swap_view//'#{swap.pfree}'/$(printf "%.0f%%" "$swap_pfree")}"
-  swap_view="${swap_view//'#{swap.total}'/$(printf "$size_format" "$swap_total" "$size_unit")}"
-  swap_view="${swap_view//'#{swap.color}'/$(echo "$swap_color" | awk '{ print $1 }')}"
-  swap_view="${swap_view//'#{swap.color2}'/$(echo "$swap_color" | awk '{ print $2 }')}"
-  swap_view="${swap_view//'#{swap.color3}'/$(echo "$swap_color" | awk '{ print $3 }')}"
-
-  echo "$swap_view"
-}
-
-get_swap_usage_osx(){
-  
-  # assume swap size in MB
-  local swap_used=$(sysctl -nq vm.swapusage | awk -F '  ' '{ print $2 }' | awk -F '=' '{gsub(/^[ ]|[M]$/, "", $2); printf "%d", $2 * 1024 }')
-  local swap_free=$(sysctl -nq vm.swapusage | awk -F '  ' '{ print $3 }' | awk -F '=' '{gsub(/^[ ]|[M]$/, "", $2); printf "%d", $2 * 1024 }')
-
-  printf "%s %s" "$swap_free" "$swap_used"
-}
-
-get_swap_usage_linux(){
-  </proc/meminfo awk '
-    BEGIN { total=0; free=0; }
-      /SwapTotal:/ { total=$2; }
-      /SwapFree:/ { free=$2; }
-    END { print free, total-free }
-  '
-}
-
-main() {
-  print_swap
-}
-
-main
-
-
-
diff --git a/tmux/plugins/tmux-plugin-sysstat/sysstat.tmux b/tmux/plugins/tmux-plugin-sysstat/sysstat.tmux
deleted file mode 100755
index d44efdb..0000000
--- a/tmux/plugins/tmux-plugin-sysstat/sysstat.tmux
+++ /dev/null
@@ -1,43 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-source "$CURRENT_DIR/scripts/helpers.sh"
-
-placeholders=(
-  "\#{sysstat_cpu}"
-  "\#{sysstat_mem}"
-  "\#{sysstat_swap}"
-  "\#{sysstat_loadavg}"
-)
-
-commands=(
-  "#($CURRENT_DIR/scripts/cpu.sh)"
-  "#($CURRENT_DIR/scripts/mem.sh)"
-  "#($CURRENT_DIR/scripts/swap.sh)"
-  "#($CURRENT_DIR/scripts/loadavg.sh)"
-)
-
-do_interpolation() {
-  local all_interpolated="$1"
-  for ((i=0; i<${#commands[@]}; i++)); do
-    all_interpolated=${all_interpolated//${placeholders[$i]}/${commands[$i]}}
-  done
-  echo "$all_interpolated"
-}
-
-update_tmux_option() {
-  local option="$1"
-  local option_value="$(get_tmux_option "$option")"
-  local new_option_value="$(do_interpolation "$option_value")"
-  set_tmux_option "$option" "$new_option_value"
-}
-
-main() {
-  cpu_tmp_dir=$(mktemp -d)
-  tmux set-option -gq "@sysstat_cpu_tmp_dir" "$cpu_tmp_dir"
-
-  update_tmux_option "status-right"
-  update_tmux_option "status-left"
-}
-
-main
\ No newline at end of file
diff --git a/tmux/plugins/tmux-prefix-highlight/README.md b/tmux/plugins/tmux-prefix-highlight/README.md
deleted file mode 100644
index a8a569c..0000000
--- a/tmux/plugins/tmux-prefix-highlight/README.md
+++ /dev/null
@@ -1,111 +0,0 @@
-# Tmux prefix highlight
-
-Plugin that highlights when you press tmux prefix key. Inspired by
-[this](http://stackoverflow.com/questions/12003726/give-a-hint-when-press-prefix-key-in-tmux)
-thread on stackoverflow.
-
-Many thanks to [@obxhdx](https://github.com/obxhdx) for showing me this trick.
-
-Prefix off:
-![prefix_off](screenshots/prefix_off.png)
-
-Prefix on:
-![prefix_on](screenshots/prefix_on.png)
-
-### Usage
-
-Just add `#{prefix_highlight}` to your left/right status bar.
-
-```tmux.conf
-set -g status-right '#{prefix_highlight} | %a %Y-%m-%d %H:%M'
-```
-
-The plugin can also be configured to show when copy mode is active; see the
-**Configurations** section for details.
-
-### Installation with Tmux Plugin Manager (recommended)
-
-Add plugin to the list of TPM plugins:
-
-```tmux.conf
-set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
-```
-
-Press prefix + I to install it.
-
-### Manual Installation
-
-Clone the repo:
-
-```bash
-$ git clone https://github.com/tmux-plugins/tmux-prefix-highlight.git ~/clone/path
-```
-
-Add this line to your .tmux.conf:
-
-```tmux.conf
-run-shell ~/clone/path/prefix_highlight.tmux
-```
-
-Reload TMUX environment with:
-
-```bash
-$ tmux source-file ~/.tmux.conf
-```
-
-### Configurations
-
-The colors used for the prefix highlight can be configured:
-
-```tmux.conf
-set -g @prefix_highlight_fg 'white' # default is 'colour231'
-set -g @prefix_highlight_bg 'blue'  # default is 'colour04'
-```
-
-The plugin can also be configured to show when copy mode is active. If enabled,
-the `#{prefix_highlight}` token will be replaced with the string `Copy` when
-copy mode is enabled. The style for copy mode can be configured as a
-comma-separated list of colors and attributes:
-
-```tmux.conf
-set -g @prefix_highlight_show_copy_mode 'on'
-set -g @prefix_highlight_copy_mode_attr 'fg=black,bg=yellow,bold' # default is 'fg=default,bg=yellow'
-```
-
-The `prefix` prompt and `copy` prompt can also be configured:
-
-```tmux.conf
-set -g @prefix_highlight_prefix_prompt 'Wait'
-set -g @prefix_highlight_copy_prompt 'Copy'
-```
-
-Additionally, the plugin can be configured to attach optional affixes to the
-value contained in `#{prefix_highlight}`.
-(e.g. `< ^B >`)
-
-```tmux.conf
-set -g @prefix_highlight_output_prefix '< '
-set -g @prefix_highlight_output_suffix ' >'
-```
-
-The empty (shown when prefix is off) prompt and attribute can be configured,
-It is useful for aligning segments.
-
-```tmux.conf
-set -g @prefix_highlight_empty_prompt '        '          # default is '' (empty char)
-set -g @prefix_highlight_empty_attr 'fg=default,bg=green' # default is 'fg=default,bg=default'
-```
-
-Defaultly, empty prompt can't be attached optional affixes.
-If you want attach affixes on empty prompt, config `@prefix_highlight_empty_has_affixes` to `on`.
-
-```tmux.conf
-set -g @prefix_highlight_empty_has_affixes 'on' # default is 'off'
-set -g @prefix_highlight_empty_prompt 'Tmux'
-set -g @prefix_highlight_output_prefix '< '
-set -g @prefix_highlight_output_suffix ' >'
-```
-
-### License
-
-[MIT](LICENSE)
diff --git a/tmux/plugins/tmux-prefix-highlight/prefix_highlight.tmux b/tmux/plugins/tmux-prefix-highlight/prefix_highlight.tmux
deleted file mode 100755
index 7fa21be..0000000
--- a/tmux/plugins/tmux-prefix-highlight/prefix_highlight.tmux
+++ /dev/null
@@ -1,117 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-# Place holder for status left/right
-place_holder="\#{prefix_highlight}"
-
-# Possible configurations
-fg_color_config='@prefix_highlight_fg'
-bg_color_config='@prefix_highlight_bg'
-output_prefix='@prefix_highlight_output_prefix'
-output_suffix='@prefix_highlight_output_suffix'
-show_copy_config='@prefix_highlight_show_copy_mode'
-copy_attr_config='@prefix_highlight_copy_mode_attr'
-prefix_prompt='@prefix_highlight_prefix_prompt'
-copy_prompt='@prefix_highlight_copy_prompt'
-empty_prompt='@prefix_highlight_empty_prompt'
-empty_attr_config='@prefix_highlight_empty_attr'
-empty_has_affixes='@prefix_highlight_empty_has_affixes'
-
-tmux_option() {
-    local -r value=$(tmux show-option -gqv "$1")
-    local -r default="$2"
-
-    if [ ! -z "$value" ]; then
-        echo "$value"
-    else
-        echo "$default"
-    fi
-}
-
-# Defaults
-default_fg='colour231'
-default_bg='colour04'
-default_copy_attr='fg=default,bg=yellow'
-default_empty_attr='fg=default,bg=default'
-default_prefix_prompt=$(tmux_option prefix | tr "[:lower:]" "[:upper:]" | sed 's/C-/\^/')
-default_copy_prompt='Copy'
-default_empty_prompt=''
-
-highlight() {
-    local -r \
-        status="$1" \
-        prefix="$2" \
-        prefix_highlight="$3" \
-        show_copy_mode="$4" \
-        copy_highlight="$5" \
-        output_prefix="$6" \
-        output_suffix="$7" \
-        copy="$8" \
-        empty="$9"
-
-    local -r status_value="$(tmux_option "$status")"
-    local -r prefix_with_optional_affixes="$output_prefix$prefix$output_suffix"
-    local -r copy_with_optional_affixes="$output_prefix$copy$output_suffix"
-
-    if [[ "on" = "$empty_has_affixes" ]]; then
-        local -r empty_with_optional_affixes="$output_prefix$empty$output_suffix"
-    else
-        local -r empty_with_optional_affixes="$empty"
-    fi
-
-    if [[ "on" = "$show_copy_mode" ]]; then
-        local -r fallback="${copy_highlight}#{?pane_in_mode,$copy_with_optional_affixes,${empty_highlight}$empty_with_optional_affixes}"
-    else
-        local -r fallback="${empty_highlight}$empty_with_optional_affixes"
-    fi
-
-    local -r highlight_on_prefix="${prefix_highlight}#{?client_prefix,$prefix_with_optional_affixes,$fallback}#[default]"
-    tmux set-option -gq "$status" "${status_value/$place_holder/$highlight_on_prefix}"
-}
-
-main() {
-    local -r \
-        fg_color=$(tmux_option "$fg_color_config" "$default_fg") \
-        bg_color=$(tmux_option "$bg_color_config" "$default_bg") \
-        show_copy_mode=$(tmux_option "$show_copy_config" "off") \
-        output_prefix=$(tmux_option "$output_prefix" " ") \
-        output_suffix=$(tmux_option "$output_suffix" " ") \
-        copy_attr=$(tmux_option "$copy_attr_config" "$default_copy_attr") \
-        prefix_prompt=$(tmux_option "$prefix_prompt" "$default_prefix_prompt") \
-        copy_prompt=$(tmux_option "$copy_prompt" "$default_copy_prompt") \
-        empty_prompt=$(tmux_option "$empty_prompt" "$default_empty_prompt") \
-        empty_attr=$(tmux_option "$empty_attr_config" "$default_empty_attr") \
-        empty_has_affixes=$(tmux_option "$empty_has_affixes" "off")
-
-    local -r \
-        prefix_highlight="#[fg=$fg_color,bg=$bg_color]" \
-        copy_highlight="${copy_attr:+#[default,$copy_attr]}" \
-        empty_highlight="${empty_attr:+#[default,$empty_attr]}"
-
-    highlight "status-right" \
-              "$prefix_prompt" \
-              "$prefix_highlight" \
-              "$show_copy_mode" \
-              "$copy_highlight" \
-              "$output_prefix" \
-              "$output_suffix" \
-              "$copy_prompt" \
-              "$empty_prompt" \
-              "$empty_highlight" \
-              "$empty_has_affixes"
-
-    highlight "status-left" \
-              "$prefix_prompt" \
-              "$prefix_highlight" \
-              "$show_copy_mode" \
-              "$copy_highlight" \
-              "$output_prefix" \
-              "$output_suffix" \
-              "$copy_prompt" \
-              "$empty_prompt" \
-              "$empty_highlight" \
-              "$empty_has_affixes"
-}
-
-main
diff --git a/tmux/plugins/tmux-ressurect/LICENSE.md b/tmux/plugins/tmux-ressurect/LICENSE.md
deleted file mode 100644
index 40f6ddd..0000000
--- a/tmux/plugins/tmux-ressurect/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Bruno Sutic
-
-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/tmux/plugins/tmux-ressurect/README.md b/tmux/plugins/tmux-ressurect/README.md
deleted file mode 100644
index 94f68f1..0000000
--- a/tmux/plugins/tmux-ressurect/README.md
+++ /dev/null
@@ -1,133 +0,0 @@
-# Tmux Resurrect
-
-[![Build Status](https://travis-ci.org/tmux-plugins/tmux-resurrect.svg?branch=master)](https://travis-ci.org/tmux-plugins/tmux-resurrect)
-
-Restore `tmux` environment after system restart.
-
-Tmux is great, except when you have to restart the computer. You lose all the
-running programs, working directories, pane layouts etc.
-There are helpful management tools out there, but they require initial
-configuration and continuous updates as your workflow evolves or you start new
-projects.
-
-`tmux-resurrect` saves all the little details from your tmux environment so it
-can be completely restored after a system restart (or when you feel like it).
-No configuration is required. You should feel like you never quit tmux.
-
-It even (optionally)
-[restores vim and neovim sessions](docs/restoring_vim_and_neovim_sessions.md)!
-
-Automatic restoring and continuous saving of tmux env is also possible with
-[tmux-continuum](https://github.com/tmux-plugins/tmux-continuum) plugin.
-
-### Screencast
-
-[![screencast screenshot](/video/screencast_img.png)](https://vimeo.com/104763018)
-
-### Key bindings
-
-- `prefix + Ctrl-s` - save
-- `prefix + Ctrl-r` - restore
-
-### About
-
-This plugin goes to great lengths to save and restore all the details from your
-`tmux` environment. Here's what's been taken care of:
-
-- all sessions, windows, panes and their order
-- current working directory for each pane
-- **exact pane layouts** within windows (even when zoomed)
-- active and alternative session
-- active and alternative window for each session
-- windows with focus
-- active pane for each window
-- "grouped sessions" (useful feature when using tmux with multiple monitors)
-- programs running within a pane! More details in the
-  [restoring programs doc](docs/restoring_programs.md).
-
-Optional:
-
-- [restoring vim and neovim sessions](docs/restoring_vim_and_neovim_sessions.md)
-- [restoring pane contents](docs/restoring_pane_contents.md)
-- [restoring shell history](docs/restoring_shell_history.md) (experimental)
-
-Requirements / dependencies: `tmux 1.9` or higher, `bash`.
-
-Tested and working on Linux, OSX and Cygwin.
-
-`tmux-resurrect` is idempotent! It will not try to restore panes or windows that
-already exist.<br/>
-The single exception to this is when tmux is started with only 1 pane in order
-to restore previous tmux env. Only in this case will this single pane be
-overwritten.
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    set -g @plugin 'tmux-plugins/tmux-resurrect'
-
-Hit `prefix + I` to fetch the plugin and source it. You should now be able to
-use the plugin.
-
-### Manual Installation
-
-Clone the repo:
-
-    $ git clone https://github.com/tmux-plugins/tmux-resurrect ~/clone/path
-
-Add this line to the bottom of `.tmux.conf`:
-
-    run-shell ~/clone/path/resurrect.tmux
-
-Reload TMUX environment with: `$ tmux source-file ~/.tmux.conf`.
-You should now be able to use the plugin.
-
-### Docs
-
-- [Guide for migrating from tmuxinator](docs/migrating_from_tmuxinator.md)
-
-**Configuration**
-
-- [Changing the default key bindings](docs/custom_key_bindings.md).
-- [Setting up hooks on save & restore](docs/hooks.md).
-- Only a conservative list of programs is restored by default:<br/>
-  `vi vim nvim emacs man less more tail top htop irssi weechat mutt`.<br/>
-  [Restoring programs doc](docs/restoring_programs.md) explains how to restore
-  additional programs.
-- [Change a directory](docs/save_dir.md) where `tmux-resurrect` saves tmux
-  environment.
-
-**Optional features**
-
-- [Restoring vim and neovim sessions](docs/restoring_vim_and_neovim_sessions.md)
-  is nice if you're a vim/neovim user.
-- [Restoring pane contents](docs/restoring_pane_contents.md) feature.
-
-**Experimental features (also optional)**
-
-- [restoring shell history](docs/restoring_shell_history.md)
-
-### Other goodies
-
-- [tmux-copycat](https://github.com/tmux-plugins/tmux-copycat) - a plugin for
-  regex searches in tmux and fast match selection
-- [tmux-yank](https://github.com/tmux-plugins/tmux-yank) - enables copying
-  highlighted text to system clipboard
-- [tmux-open](https://github.com/tmux-plugins/tmux-open) - a plugin for quickly
-  opening highlighted file or a url
-- [tmux-continuum](https://github.com/tmux-plugins/tmux-continuum) - automatic
-  restoring and continuous saving of tmux env
-
-### Reporting bugs and contributing
-
-Both contributing and bug reports are welcome. Please check out
-[contributing guidelines](CONTRIBUTING.md).
-
-### Credits
-
-[Mislav Marohnić](https://github.com/mislav) - the idea for the plugin came from his
-[tmux-session script](https://github.com/mislav/dotfiles/blob/2036b5e03fb430bbcbc340689d63328abaa28876/bin/tmux-session).
-
-### License
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-ressurect/docs/custom_key_bindings.md b/tmux/plugins/tmux-ressurect/docs/custom_key_bindings.md
deleted file mode 100644
index 99bfc2c..0000000
--- a/tmux/plugins/tmux-ressurect/docs/custom_key_bindings.md
+++ /dev/null
@@ -1,11 +0,0 @@
-# Custom key bindings
-
-The default key bindings are:
-
-- `prefix + Ctrl-s` - save
-- `prefix + Ctrl-r` - restore
-
-To change these, add to `.tmux.conf`:
-
-    set -g @resurrect-save 'S'
-    set -g @resurrect-restore 'R'
diff --git a/tmux/plugins/tmux-ressurect/docs/hooks.md b/tmux/plugins/tmux-ressurect/docs/hooks.md
deleted file mode 100644
index cb4e7a3..0000000
--- a/tmux/plugins/tmux-ressurect/docs/hooks.md
+++ /dev/null
@@ -1,39 +0,0 @@
-# Save & Restore Hooks
-
-Hooks allow to set custom commands that will be executed during session save
-and restore. Most hooks are called with zero arguments, unless explicitly
-stated otherwise.
-
-Currently the following hooks are supported:
-
-- `@resurrect-hook-post-save-layout`
-
-  Called after all sessions, panes and windows have been saved.
-
-  Passed single argument of the state file.
-
-- `@resurrect-hook-post-save-all`
-
-  Called at end of save process right before the spinner is turned off.
-
-- `@resurrect-hook-pre-restore-all`
-
-  Called before any tmux state is altered.
-
-- `@resurrect-hook-pre-restore-history`
-
-  Called after panes and layout have been restores, but before bash history is
-  restored (if it is enabled) -- the hook is always called even if history
-  saving is disabled.
-
-- `@resurrect-hook-pre-restore-pane-processes`
-
-  Called after history is restored, but before running processes are restored.
-
-### Examples
-
-Here is an example how to save and restore window geometry for most terminals in X11.
-Add this to `.tmux.conf`:
-
-    set -g @resurrect-hook-post-save-all 'eval $(xdotool getwindowgeometry --shell $WINDOWID); echo 0,$X,$Y,$WIDTH,$HEIGHT > $HOME/.tmux/resurrect/geometry'
-    set -g @resurrect-hook-pre-restore-all 'wmctrl -i -r $WINDOWID -e $(cat $HOME/.tmux/resurrect/geometry)'
diff --git a/tmux/plugins/tmux-ressurect/docs/migrating_from_tmuxinator.md b/tmux/plugins/tmux-ressurect/docs/migrating_from_tmuxinator.md
deleted file mode 100644
index f59f90f..0000000
--- a/tmux/plugins/tmux-ressurect/docs/migrating_from_tmuxinator.md
+++ /dev/null
@@ -1,72 +0,0 @@
-# Migrating from `tmuxinator`
-
-### Why migrate to `tmux-resurrect`?
-
-Here are some reasons why you'd want to migrate from `tmuxinator` to
-`tmux-resurrect`:
-
-- **Less dependencies**<br/>
-  `tmuxinator` depends on `ruby` which can be a hassle to set up if you're not a
-  rubyist.<br/>
-  `tmux-resurrect` depends just on `bash` which is virtually
-  omnipresent.
-
-- **Simplicity**<br/>
-  `tmuxinator` has an executable, CLI interface with half dozen commands and
-  command completion.<br/>
-  `tmux-resurrect` defines just 2 tmux key bindings.
-
-- **No configuration**<br/>
-  `tmuxinator` is all about config files (and their constant updating).<br/>
-  `tmux-resurrect` requires no configuration to work.
-
-- **Better change handling**<br/>
-  When you make a change to any aspect of tmux layout, you also have to
-  update related `tmuxinator` project file (and test to make sure change is
-  ok).<br/>
-  With `tmux-resurrect` there's nothing to do: your change will be
-  remembered on the next save.
-
-### How to migrate?
-
-1. Install `tmux-resurrect`.
-2. Open \*all* existing `tmuxinator` projects.<br/>
-   Verify all projects are open by pressing `prefix + s` and checking they are
-   all on the list.
-3. Perform a `tmux-resurrect` save.
-
-That's it! You can continue using just `tmux-resurrect` should you choose so.
-
-Note: it probably makes no sense to use both tools at the same time as they do
-the same thing (creating tmux environment for you to work in).
-Technically however, there should be no issues.
-
-### Usage differences
-
-`tmuxinator` focuses on managing individual tmux sessions (projects).
-`tmux-resurrect` keeps track of the \*whole* tmux environment: all sessions are
-saved and restored together.
-
-A couple tips if you decide to switch to `tmux-resurrect`:
-
-- Keep all tmux sessions (projects) running all the time.<br/>
-  If you want to work on an existing project, you should be able to just
-  \*switch* to an already open session using `prefix + s`.<br/>
-  This is different from `tmuxinator` where you'd usually run `mux new [project]`
-  in order to start working on something.
-
-- No need to kill sessions with `tmux kill-session` (unless you really don't
-  want to work on it ever).<br/>
-  It's the recurring theme by now: just keep all the sessions running all the
-  time. This is convenient and also cheap in terms of resources.
-
-- The only 2 situations when you need `tmux-resurrect`:<br/>
-  1) Save tmux environment just before restarting/shutting down your
-  computer.<br/>
-  2) Restore tmux env after you turn the computer on.
-
-### Other questions?
-
-Still have questions? Feel free to open an
-[issue](ihttps://github.com/tmux-plugins/tmux-resurrect/issues). We'll try to
-answer it and also update this doc.
diff --git a/tmux/plugins/tmux-ressurect/docs/restoring_pane_contents.md b/tmux/plugins/tmux-ressurect/docs/restoring_pane_contents.md
deleted file mode 100644
index 2dff59a..0000000
--- a/tmux/plugins/tmux-ressurect/docs/restoring_pane_contents.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Restoring pane contents
-
-This plugin enables saving and restoring tmux pane contents.
-
-This feature can be enabled by adding this line to `.tmux.conf`:
-
-    set -g @resurrect-capture-pane-contents 'on'
-
-##### Known issue
-
-When using this feature, please check the value of `default-command`
-tmux option. That can be done with `$ tmux show -g default-command`.
-
-The value should NOT contain `&&` or `||` operators. If it does, simplify the
-option so those operators are removed.
-
-Example:
-
-- this will cause issues (notice the `&&` and `||` operators):
-
-        set -g default-command "which reattach-to-user-namespace > /dev/null && reattach-to-user-namespace -l $SHELL || $SHELL -l"
-
-- this is ok:
-
-        set -g default-command "reattach-to-user-namespace -l $SHELL"
-
-Related [bug](https://github.com/tmux-plugins/tmux-resurrect/issues/98).
-
-Alternatively, you can let
-[tmux-sensible](https://github.com/tmux-plugins/tmux-sensible)
-handle this option in a cross-platform way and you'll have no problems.
diff --git a/tmux/plugins/tmux-ressurect/docs/restoring_programs.md b/tmux/plugins/tmux-ressurect/docs/restoring_programs.md
deleted file mode 100644
index 995d0a7..0000000
--- a/tmux/plugins/tmux-ressurect/docs/restoring_programs.md
+++ /dev/null
@@ -1,179 +0,0 @@
-# Restoring programs
-  - [General instructions](#general-instructions)
-  - [Clarifications](#clarifications)
-  - [Working with NodeJS](#nodejs)
-  - [Restoring Mosh](#mosh)
-
-### General instructions <a name="general-instructions"></a>
-Only a conservative list of programs is restored by default:<br/>
-`vi vim nvim emacs man less more tail top htop irssi weechat mutt`.
-
-This can be configured with `@resurrect-processes` option in `.tmux.conf`. It
-contains space-separated list of additional programs to restore.
-
-- Example restoring additional programs:
-
-        set -g @resurrect-processes 'ssh psql mysql sqlite3'
-
-- Programs with arguments should be double quoted:
-
-        set -g @resurrect-processes 'some_program "git log"'
-
-- Start with tilde to restore a program whose process contains target name:
-
-        set -g @resurrect-processes 'irb pry "~rails server" "~rails console"'
-
-- Use `->` to specify a command to be used when restoring a program (useful if
-  the default restore command fails ):
-
-        set -g @resurrect-processes 'some_program "grunt->grunt development"'
-
-- Don't restore any programs:
-
-        set -g @resurrect-processes 'false'
-
-- Restore **all** programs (be careful with this!):
-
-        set -g @resurrect-processes ':all:'
-
-### Clarifications <a name="clarfications"></a>
-
-> I don't understand tilde `~`, what is it and why is it used when restoring
-  programs?
-
-Let's say you use `rails server` command often. You want `tmux-resurrect` to
-save and restore it automatically. You might try adding `rails server` to the
-list of programs that will be restored:
-
-    set -g @resurrect-processes '"rails server"'  # will NOT work
-
-Upon save, `rails server` command will actually be saved as this command:
-`/Users/user/.rbenv/versions/2.0.0-p481/bin/ruby script/rails server`
-(if you wanna see how is any command saved, check it yourself in
-`~/.tmux/resurrect/last` file).
-
-When programs are restored, the `rails server` command will NOT be restored
-because it does not **strictly** match the long
-`/Users/user/.rbenv/versions/2.0.0-p481/bin/ruby script/rails server` string.
-
-The tilde `~` at the start of the string relaxes process name matching.
-
-    set -g @resurrect-processes '"~rails server"'  # OK
-
-The above option says: "restore full process if `rails server` string is found
-ANYWHERE in the process name".
-
-If you check long process string, there is in fact a `rails server` string at
-the end, so now the process will be successfully restored.
-
-> What is arrow `->` and why is is used?
-
-(Please read the above clarification about tilde `~`).
-
-Continuing with our `rails server` example, when the process is finally restored
-correctly it might not look pretty as you'll see the whole
-`/Users/user/.rbenv/versions/2.0.0-p481/bin/ruby script/rails server` string in
-the command line.
-
-Naturally, you'd rather want to see just `rails server` (what you initially
-typed), but that information is now unfortunately lost.
-
-To aid this, you can use arrow `->`: (**note**: there is no space before and after `->`)
-
-    set -g @resurrect-processes '"~rails server->rails server"'  # OK
-
-This option says: "when this process is restored use `rails server` as the
-command name".
-
-Full (long) process name is now ignored and you'll see just `rails server` in
-the command line when the program is restored.
-
-> Now I understand the tilde and the arrow, but things still don't work for me
-
-Here's the general workflow for figuring this out:
-
-- Set up your whole tmux environment manually.<br/>
-  In our example case, we'd type `rails server` in a pane where we want it to
-  run.
-- Save tmux env (it will get saved to `~/.tmux/resurrect/last`).
-- Open `~/.tmux/resurrect/last` file and try to find full process string for
-  your program.<br/>
-  Unfortunately this is a little vague but it should be easy. A smart
-  thing to do for our example is to search for string `rails` in the `last`
-  file.
-- Now that you know the full and the desired process string use tilde `~` and
-  arrow `->` in `.tmux.conf` to make things work.
-
-### Working with NodeJS <a name="nodejs"></a> 
-If you are working with NodeJS, you may get some troubles with configuring restoring programs.
-
-Particularly, some programs like `gulp`, `grunt` or `npm` are not saved with parameters so tmux-resurrect cannot restore it. This is actually **not tmux-resurrect's issue** but more likely, those programs' issues. For example if you run `gulp watch` or `npm start` and then try to look at `ps` or `pgrep`, you will only see `gulp` or `npm`.
-
-To deal with these issues, one solution is to use [yarn](https://yarnpkg.com/en/docs/install) which a package manager for NodeJS and an alternative for `npm`. It's nearly identical to `npm` and very easy to use. Therefore you don't have to do any migration, you can simply use it immediately. For example: 
-- `npm test` is equivalent to `yarn test`, 
-- `npm run watch:dev` is equivalent to `yarn watch:dev`
-- more interestingly, `gulp watch:dev` is equivalent to `yarn gulp watch:dev`
-
-Before continuing, please ensure that you understand the [clarifications](#clarifications) section about `~` and `->`
-
-#### yarn
-It's fairly straight forward if you have been using `yarn` already.
-
-    set -g @resurrect-processes '"~yarn watch"'
-    set -g @resurrect-processes '"~yarn watch->yarn watch"'
-
-
-#### npm
-Instead of 
-
-    set -g @resurrect-processes '"~npm run watch"'  # will NOT work
-
-we use 
-
-    set -g @resurrect-processes '"~yarn watch"'     # OK
-
-
-#### gulp
-Instead of
-
-    set -g @resurrect-processes '"~gulp test"'      # will NOT work
-
-we use
-
-    set -g @resurrect-processes '"~yarn gulp test"' # OK
-
-
-#### nvm
-If you use `nvm` in your project, here is how you could config tmux-resurrect:
-
-    set -g @resurrect-processes '"~yarn gulp test->nvm use && gulp test"'
-
-#### Another problem 
-Let take a look at this example
-
-    set -g @resurrect-processes '\
-          "~yarn gulp test->gulp test" \ 
-          "~yarn gulp test-it->gulp test-it" \
-    '
-**This will not work properly**, only `gulp test` is run, although you can see the command `node /path/to/yarn gulp test-it` is added correctly in `.tmux/resurrect/last` file. 
-
-The reason is when restoring program, the **command part after the dash `-` is ignored** so instead  of command `gulp test-it`, the command `gulp test` which will be run.
-
-A work around, for this problem until it's fixed, is:
-- the config should be like this:
-
-      set -g @resurrect-processes '\
-          "~yarn gulp test->gulp test" \ 
-          "~yarn gulp \"test-it\"->gulp test-it" \
-
-- and in `.tmux/resurrect/last`, we should add quote to `test-it` word
-
-      ... node:node /path/to/yarn gulp "test-it"
-
-
-### Restoring Mosh <a name="#mosh"></a>
-Mosh spawns a `mosh-client` process, so we need to specify that as the process to be resurrected.
-
-    set -g @resurrect-processes 'mosh-client'
-
-Additionally a mosh-client strategy is provided to handle extracting the original arguments and re-run Mosh.
diff --git a/tmux/plugins/tmux-ressurect/docs/restoring_shell_history.md b/tmux/plugins/tmux-ressurect/docs/restoring_shell_history.md
deleted file mode 100644
index 62fc1e2..0000000
--- a/tmux/plugins/tmux-ressurect/docs/restoring_shell_history.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# Restoring shell history (experimental)
-
-**Supported shells**: `bash` and `zsh`.
-
-Enable feature with this option in `.tmux.conf`:
-
-    set -g @resurrect-save-shell-history 'on'
-
-**Note**: the older `@resurrect-save-bash-history` is now an alias to
-`@resurrect-save-shell-history`.
-
-Shell `history` for individual panes will now be saved and restored. Due to
-technical limitations, this only works for panes which have no program running
-in foreground when saving. `tmux-resurrect` will send history write command to
-each such pane.
-
-To prevent these commands from being added to `bash` history
-themselves, add `HISTCONTROL=ignoreboth` to your `.bashrc`
-(this is set by default in Ubuntu).
diff --git a/tmux/plugins/tmux-ressurect/docs/restoring_vim_and_neovim_sessions.md b/tmux/plugins/tmux-ressurect/docs/restoring_vim_and_neovim_sessions.md
deleted file mode 100644
index f92587f..0000000
--- a/tmux/plugins/tmux-ressurect/docs/restoring_vim_and_neovim_sessions.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Restoring vim and neovim sessions
-
-- save vim/neovim sessions. I recommend
-  [tpope/vim-obsession](https://github.com/tpope/vim-obsession) (as almost every
-  plugin, it works for both vim and neovim).
-- in `.tmux.conf`:
-
-        # for vim
-        set -g @resurrect-strategy-vim 'session'
-        # for neovim
-        set -g @resurrect-strategy-nvim 'session'
-
-`tmux-resurrect` will now restore vim and neovim sessions if `Session.vim` file
-is present.
-
diff --git a/tmux/plugins/tmux-ressurect/docs/save_dir.md b/tmux/plugins/tmux-ressurect/docs/save_dir.md
deleted file mode 100644
index bf724c6..0000000
--- a/tmux/plugins/tmux-ressurect/docs/save_dir.md
+++ /dev/null
@@ -1,15 +0,0 @@
-# Resurrect save dir
-
-By default Tmux environment is saved to a file in `~/.tmux/resurrect` dir.
-Change this with:
-
-    set -g @resurrect-dir '/some/path'
-
-Using environment variables or shell interpolation in this option is not
-allowed as the string is used literally. So the following won't do what is
-expected:
-
-    set -g @resurrect-dir '/path/$MY_VAR/$(some_executable)'
-
-Only the following variables and special chars are allowed:
-`$HOME`, `$HOSTNAME`, and `~`.
diff --git a/tmux/plugins/tmux-ressurect/resurrect.tmux b/tmux/plugins/tmux-ressurect/resurrect.tmux
deleted file mode 100755
index 21fed7e..0000000
--- a/tmux/plugins/tmux-ressurect/resurrect.tmux
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/scripts/variables.sh"
-source "$CURRENT_DIR/scripts/helpers.sh"
-
-set_save_bindings() {
-	local key_bindings=$(get_tmux_option "$save_option" "$default_save_key")
-	local key
-	for key in $key_bindings; do
-		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/save.sh"
-	done
-}
-
-set_restore_bindings() {
-	local key_bindings=$(get_tmux_option "$restore_option" "$default_restore_key")
-	local key
-	for key in $key_bindings; do
-		tmux bind-key "$key" run-shell "$CURRENT_DIR/scripts/restore.sh"
-	done
-}
-
-set_default_strategies() {
-	tmux set-option -gq "${restore_process_strategy_option}irb" "default_strategy"
-	tmux set-option -gq "${restore_process_strategy_option}mosh-client" "default_strategy"
-}
-
-set_script_path_options() {
-	tmux set-option -gq "$save_path_option" "$CURRENT_DIR/scripts/save.sh"
-	tmux set-option -gq "$restore_path_option" "$CURRENT_DIR/scripts/restore.sh"
-}
-
-main() {
-	set_save_bindings
-	set_restore_bindings
-	set_default_strategies
-	set_script_path_options
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/save_command_strategies/gdb.sh b/tmux/plugins/tmux-ressurect/save_command_strategies/gdb.sh
deleted file mode 100755
index 2f0ab56..0000000
--- a/tmux/plugins/tmux-ressurect/save_command_strategies/gdb.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-PANE_PID="$1"
-
-exit_safely_if_empty_ppid() {
-	if [ -z "$PANE_PID" ]; then
-		exit 0
-	fi
-}
-
-full_command() {
-	gdb -batch --eval "attach $PANE_PID" --eval "call write_history(\"/tmp/bash_history-${PANE_PID}.txt\")" --eval 'detach' --eval 'q' >/dev/null 2>&1
-	\tail -1 "/tmp/bash_history-${PANE_PID}.txt"
-}
-
-main() {
-	exit_safely_if_empty_ppid
-	full_command
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/save_command_strategies/pgrep.sh b/tmux/plugins/tmux-ressurect/save_command_strategies/pgrep.sh
deleted file mode 100755
index 15d98b3..0000000
--- a/tmux/plugins/tmux-ressurect/save_command_strategies/pgrep.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-PANE_PID="$1"
-
-exit_safely_if_empty_ppid() {
-	if [ -z "$PANE_PID" ]; then
-		exit 0
-	fi
-}
-
-full_command() {
-	\pgrep -lf -P "$PANE_PID" |
-		cut -d' ' -f2-
-}
-
-main() {
-	exit_safely_if_empty_ppid
-	full_command
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/save_command_strategies/ps.sh b/tmux/plugins/tmux-ressurect/save_command_strategies/ps.sh
deleted file mode 100755
index 544426c..0000000
--- a/tmux/plugins/tmux-ressurect/save_command_strategies/ps.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-PANE_PID="$1"
-
-exit_safely_if_empty_ppid() {
-	if [ -z "$PANE_PID" ]; then
-		exit 0
-	fi
-}
-
-full_command() {
-	ps -ao "ppid command" |
-		sed "s/^ *//" |
-		grep "^${PANE_PID}" |
-		cut -d' ' -f2-
-}
-
-main() {
-	exit_safely_if_empty_ppid
-	full_command
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/scripts/check_tmux_version.sh b/tmux/plugins/tmux-ressurect/scripts/check_tmux_version.sh
deleted file mode 100755
index b0aedec..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/check_tmux_version.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION="$1"
-UNSUPPORTED_MSG="$2"
-
-get_tmux_option() {
-	local option=$1
-	local default_value=$2
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-	local message="$1"
-
-	# display_duration defaults to 5 seconds, if not passed as an argument
-	if [ "$#" -eq 2 ]; then
-		local display_duration="$2"
-	else
-		local display_duration="5000"
-	fi
-
-	# saves user-set 'display-time' option
-	local saved_display_time=$(get_tmux_option "display-time" "750")
-
-	# sets message display time to 5 seconds
-	tmux set-option -gq display-time "$display_duration"
-
-	# displays message
-	tmux display-message "$message"
-
-	# restores original 'display-time' value
-	tmux set-option -gq display-time "$saved_display_time"
-}
-
-# this is used to get "clean" integer version number. Examples:
-# `tmux 1.9` => `19`
-# `1.9a`     => `19`
-get_digits_from_string() {
-	local string="$1"
-	local only_digits="$(echo "$string" | tr -dC '[:digit:]')"
-	echo "$only_digits"
-}
-
-tmux_version_int() {
-	local tmux_version_string=$(tmux -V)
-	echo "$(get_digits_from_string "$tmux_version_string")"
-}
-
-unsupported_version_message() {
-	if [ -n "$UNSUPPORTED_MSG" ]; then
-		echo "$UNSUPPORTED_MSG"
-	else
-		echo "Error, Tmux version unsupported! Please install Tmux version $VERSION or greater!"
-	fi
-}
-
-exit_if_unsupported_version() {
-	local current_version="$1"
-	local supported_version="$2"
-	if [ "$current_version" -lt "$supported_version" ]; then
-		display_message "$(unsupported_version_message)"
-		exit 1
-	fi
-}
-
-main() {
-	local supported_version_int="$(get_digits_from_string "$VERSION")"
-	local current_version_int="$(tmux_version_int)"
-	exit_if_unsupported_version "$current_version_int" "$supported_version_int"
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/scripts/helpers.sh b/tmux/plugins/tmux-ressurect/scripts/helpers.sh
deleted file mode 100644
index 8a8ea12..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/helpers.sh
+++ /dev/null
@@ -1,168 +0,0 @@
-default_resurrect_dir="$HOME/.tmux/resurrect"
-resurrect_dir_option="@resurrect-dir"
-
-SUPPORTED_VERSION="1.9"
-RESURRECT_FILE_PREFIX="tmux_resurrect"
-RESURRECT_FILE_EXTENSION="txt"
-_RESURRECT_DIR=""
-_RESURRECT_FILE_PATH=""
-
-d=$'\t'
-
-# helper functions
-get_tmux_option() {
-	local option="$1"
-	local default_value="$2"
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-	local message="$1"
-
-	# display_duration defaults to 5 seconds, if not passed as an argument
-	if [ "$#" -eq 2 ]; then
-		local display_duration="$2"
-	else
-		local display_duration="5000"
-	fi
-
-	# saves user-set 'display-time' option
-	local saved_display_time=$(get_tmux_option "display-time" "750")
-
-	# sets message display time to 5 seconds
-	tmux set-option -gq display-time "$display_duration"
-
-	# displays message
-	tmux display-message "$message"
-
-	# restores original 'display-time' value
-	tmux set-option -gq display-time "$saved_display_time"
-}
-
-
-supported_tmux_version_ok() {
-	$CURRENT_DIR/check_tmux_version.sh "$SUPPORTED_VERSION"
-}
-
-remove_first_char() {
-	echo "$1" | cut -c2-
-}
-
-capture_pane_contents_option_on() {
-	local option="$(get_tmux_option "$pane_contents_option" "off")"
-	[ "$option" == "on" ]
-}
-
-files_differ() {
-	! cmp -s "$1" "$2"
-}
-
-save_shell_history_option_on() {
-	local option_shell="$(get_tmux_option "$shell_history_option" "off")"
-	local option_bash="$(get_tmux_option "$bash_history_option" "off")"
-
-	[ "$option_shell" == "on" ] || [ "$option_bash" == "on" ]
-}
-
-get_grouped_sessions() {
-	local grouped_sessions_dump="$1"
-	export GROUPED_SESSIONS="${d}$(echo "$grouped_sessions_dump" | cut -f2 -d"$d" | tr "\\n" "$d")"
-}
-
-is_session_grouped() {
-	local session_name="$1"
-	[[ "$GROUPED_SESSIONS" == *"${d}${session_name}${d}"* ]]
-}
-
-# pane content file helpers
-
-pane_contents_create_archive() {
-	tar cf - -C "$(resurrect_dir)/save/" ./pane_contents/ |
-		gzip > "$(pane_contents_archive_file)"
-}
-
-pane_content_files_restore_from_archive() {
-	local archive_file="$(pane_contents_archive_file)"
-	if [ -f "$archive_file" ]; then
-		mkdir -p "$(pane_contents_dir "restore")"
-		gzip -d < "$archive_file" |
-			tar xf - -C "$(resurrect_dir)/restore/"
-	fi
-}
-
-# path helpers
-
-resurrect_dir() {
-	if [ -z "$_RESURRECT_DIR" ]; then
-		local path="$(get_tmux_option "$resurrect_dir_option" "$default_resurrect_dir")"
-		# expands tilde, $HOME and $HOSTNAME if used in @resurrect-dir
-		echo "$path" | sed "s,\$HOME,$HOME,g; s,\$HOSTNAME,$(hostname),g; s,\~,$HOME,g"
-	else
-		echo "$_RESURRECT_DIR"
-	fi
-}
-_RESURRECT_DIR="$(resurrect_dir)"
-
-resurrect_file_path() {
-	if [ -z "$_RESURRECT_FILE_PATH" ]; then
-		local timestamp="$(date +"%Y%m%dT%H%M%S")"
-		echo "$(resurrect_dir)/${RESURRECT_FILE_PREFIX}_${timestamp}.${RESURRECT_FILE_EXTENSION}"
-	else
-		echo "$_RESURRECT_FILE_PATH"
-	fi
-}
-_RESURRECT_FILE_PATH="$(resurrect_file_path)"
-
-last_resurrect_file() {
-	echo "$(resurrect_dir)/last"
-}
-
-pane_contents_dir() {
-	echo "$(resurrect_dir)/$1/pane_contents/"
-}
-
-pane_contents_file() {
-	local save_or_restore="$1"
-	local pane_id="$2"
-	echo "$(pane_contents_dir "$save_or_restore")/pane-${pane_id}"
-}
-
-pane_contents_file_exists() {
-	local pane_id="$1"
-	[ -f "$(pane_contents_file "restore" "$pane_id")" ]
-}
-
-pane_contents_archive_file() {
-	echo "$(resurrect_dir)/pane_contents.tar.gz"
-}
-
-resurrect_history_file() {
-	local pane_id="$1"
-	local shell_name="$2"
-	echo "$(resurrect_dir)/${shell_name}_history-${pane_id}"
-}
-
-execute_hook() {
-	local kind="$1"
-	shift
-	local args="" hook=""
-
-	hook=$(get_tmux_option "$hook_prefix$kind" "")
-
-	# If there are any args, pass them to the hook (in a way that preserves/copes
-	# with spaces and unusual characters.
-	if [ "$#" -gt 0 ]; then
-		printf -v args "%q " "$@"
-	fi
-
-	if [ -n "$hook" ]; then
-		eval "$hook $args"
-	fi
-}
diff --git a/tmux/plugins/tmux-ressurect/scripts/process_restore_helpers.sh b/tmux/plugins/tmux-ressurect/scripts/process_restore_helpers.sh
deleted file mode 100644
index 0b88177..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/process_restore_helpers.sh
+++ /dev/null
@@ -1,172 +0,0 @@
-restore_pane_processes_enabled() {
-	local restore_processes="$(get_tmux_option "$restore_processes_option" "$restore_processes")"
-	if [ "$restore_processes" == "false" ]; then
-		return 1
-	else
-		return 0
-	fi
-}
-
-restore_pane_process() {
-	local pane_full_command="$1"
-	local session_name="$2"
-	local window_number="$3"
-	local pane_index="$4"
-	local dir="$5"
-	local command
-	if _process_should_be_restored "$pane_full_command" "$session_name" "$window_number" "$pane_index"; then
-		tmux switch-client -t "${session_name}:${window_number}"
-		tmux select-pane -t "$pane_index"
-
-		local inline_strategy="$(_get_inline_strategy "$pane_full_command")" # might not be defined
-		if [ -n "$inline_strategy" ]; then
-			# inline strategy exists
-			# check for additional "expansion" of inline strategy, e.g. `vim` to `vim -S`
-			if _strategy_exists "$inline_strategy"; then
-				local strategy_file="$(_get_strategy_file "$inline_strategy")"
-				local inline_strategy="$($strategy_file "$pane_full_command" "$dir")"
-			fi
-			command="$inline_strategy"
-		elif _strategy_exists "$pane_full_command"; then
-			local strategy_file="$(_get_strategy_file "$pane_full_command")"
-			local strategy_command="$($strategy_file "$pane_full_command" "$dir")"
-			command="$strategy_command"
-		else
-			# just invoke the raw command
-			command="$pane_full_command"
-		fi
-		tmux send-keys -t "${session_name}:${window_number}.${pane_index}" "$command" "C-m"
-	fi
-}
-
-# private functions below
-
-_process_should_be_restored() {
-	local pane_full_command="$1"
-	local session_name="$2"
-	local window_number="$3"
-	local pane_index="$4"
-	if is_pane_registered_as_existing "$session_name" "$window_number" "$pane_index"; then
-		# Scenario where pane existed before restoration, so we're not
-		# restoring the proces either.
-		return 1
-	elif ! pane_exists "$session_name" "$window_number" "$pane_index"; then
-		# pane number limit exceeded, pane does not exist
-		return 1
-	elif _restore_all_processes; then
-		return 0
-	elif _process_on_the_restore_list "$pane_full_command"; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-_restore_all_processes() {
-	local restore_processes="$(get_tmux_option "$restore_processes_option" "$restore_processes")"
-	if [ "$restore_processes" == ":all:" ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-_process_on_the_restore_list() {
-	local pane_full_command="$1"
-	# TODO: make this work without eval
-	eval set $(_restore_list)
-	local proc
-	local match
-	for proc in "$@"; do
-		match="$(_get_proc_match_element "$proc")"
-		if _proc_matches_full_command "$pane_full_command" "$match"; then
-			return 0
-		fi
-	done
-	return 1
-}
-
-_proc_matches_full_command() {
-	local pane_full_command="$1"
-	local match="$2"
-	if _proc_starts_with_tildae "$match"; then
-		match="$(remove_first_char "$match")"
-		# regex matching the command makes sure `$match` string is somewhere in the command string
-		if [[ "$pane_full_command" =~ ($match) ]]; then
-			return 0
-		fi
-	else
-		# regex matching the command makes sure process is a "word"
-		if [[ "$pane_full_command" =~ (^${match} ) ]] || [[ "$pane_full_command" =~ (^${match}$) ]]; then
-			return 0
-		fi
-	fi
-	return 1
-}
-
-_get_proc_match_element() {
-	echo "$1" | sed "s/${inline_strategy_token}.*//"
-}
-
-_get_proc_restore_element() {
-	echo "$1" | sed "s/.*${inline_strategy_token}//"
-}
-
-_restore_list() {
-	local user_processes="$(get_tmux_option "$restore_processes_option" "$restore_processes")"
-	local default_processes="$(get_tmux_option "$default_proc_list_option" "$default_proc_list")"
-	if [ -z "$user_processes" ]; then
-		# user didn't define any processes
-		echo "$default_processes"
-	else
-		echo "$default_processes $user_processes"
-	fi
-}
-
-_proc_starts_with_tildae() {
-	[[ "$1" =~ (^~) ]]
-}
-
-_get_inline_strategy() {
-	local pane_full_command="$1"
-	# TODO: make this work without eval
-	eval set $(_restore_list)
-	local proc
-	local match
-	for proc in "$@"; do
-		if [[ "$proc" =~ "$inline_strategy_token" ]]; then
-			match="$(_get_proc_match_element "$proc")"
-			if _proc_matches_full_command "$pane_full_command" "$match"; then
-				echo "$(_get_proc_restore_element "$proc")"
-			fi
-		fi
-	done
-}
-
-_strategy_exists() {
-	local pane_full_command="$1"
-	local strategy="$(_get_command_strategy "$pane_full_command")"
-	if [ -n "$strategy" ]; then # strategy set?
-		local strategy_file="$(_get_strategy_file "$pane_full_command")"
-		[ -e "$strategy_file" ] # strategy file exists?
-	else
-		return 1
-	fi
-}
-
-_get_command_strategy() {
-	local pane_full_command="$1"
-	local command="$(_just_command "$pane_full_command")"
-	get_tmux_option "${restore_process_strategy_option}${command}" ""
-}
-
-_just_command() {
-	echo "$1" | cut -d' ' -f1
-}
-
-_get_strategy_file() {
-	local pane_full_command="$1"
-	local strategy="$(_get_command_strategy "$pane_full_command")"
-	local command="$(_just_command "$pane_full_command")"
-	echo "$CURRENT_DIR/../strategies/${command}_${strategy}.sh"
-}
diff --git a/tmux/plugins/tmux-ressurect/scripts/restore.exp b/tmux/plugins/tmux-ressurect/scripts/restore.exp
deleted file mode 100755
index 8664b1d..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/restore.exp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env expect
-
-# start tmux
-spawn tmux -S/tmp/foo
-
-# delay with sleep to compensate for tmux starting time
-sleep 2
-
-# run restore script directly
-send "~/.tmux/plugins/tmux-resurrect/scripts/restore.sh\r"
-
-# long wait until tmux restore is complete
-# (things get messed up if expect client isn't attached)
-sleep 100
diff --git a/tmux/plugins/tmux-ressurect/scripts/restore.sh b/tmux/plugins/tmux-ressurect/scripts/restore.sh
deleted file mode 100755
index 4104af3..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/restore.sh
+++ /dev/null
@@ -1,369 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/variables.sh"
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/process_restore_helpers.sh"
-source "$CURRENT_DIR/spinner_helpers.sh"
-
-# delimiter
-d=$'\t'
-
-# Global variable.
-# Used during the restore: if a pane already exists from before, it is
-# saved in the array in this variable. Later, process running in existing pane
-# is also not restored. That makes the restoration process more idempotent.
-EXISTING_PANES_VAR=""
-
-RESTORING_FROM_SCRATCH="false"
-
-RESTORE_PANE_CONTENTS="false"
-
-is_line_type() {
-	local line_type="$1"
-	local line="$2"
-	echo "$line" |
-		\grep -q "^$line_type"
-}
-
-check_saved_session_exists() {
-	local resurrect_file="$(last_resurrect_file)"
-	if [ ! -f $resurrect_file ]; then
-		display_message "Tmux resurrect file not found!"
-		return 1
-	fi
-}
-
-pane_exists() {
-	local session_name="$1"
-	local window_number="$2"
-	local pane_index="$3"
-	tmux list-panes -t "${session_name}:${window_number}" -F "#{pane_index}" 2>/dev/null |
-		\grep -q "^$pane_index$"
-}
-
-register_existing_pane() {
-	local session_name="$1"
-	local window_number="$2"
-	local pane_index="$3"
-	local pane_custom_id="${session_name}:${window_number}:${pane_index}"
-	local delimiter=$'\t'
-	EXISTING_PANES_VAR="${EXISTING_PANES_VAR}${delimiter}${pane_custom_id}"
-}
-
-is_pane_registered_as_existing() {
-	local session_name="$1"
-	local window_number="$2"
-	local pane_index="$3"
-	local pane_custom_id="${session_name}:${window_number}:${pane_index}"
-	[[ "$EXISTING_PANES_VAR" =~ "$pane_custom_id" ]]
-}
-
-restore_from_scratch_true() {
-	RESTORING_FROM_SCRATCH="true"
-}
-
-is_restoring_from_scratch() {
-	[ "$RESTORING_FROM_SCRATCH" == "true" ]
-}
-
-restore_pane_contents_true() {
-	RESTORE_PANE_CONTENTS="true"
-}
-
-is_restoring_pane_contents() {
-	[ "$RESTORE_PANE_CONTENTS" == "true" ]
-}
-
-window_exists() {
-	local session_name="$1"
-	local window_number="$2"
-	tmux list-windows -t "$session_name" -F "#{window_index}" 2>/dev/null |
-		\grep -q "^$window_number$"
-}
-
-session_exists() {
-	local session_name="$1"
-	tmux has-session -t "$session_name" 2>/dev/null
-}
-
-first_window_num() {
-	tmux show -gv base-index
-}
-
-tmux_socket() {
-	echo $TMUX | cut -d',' -f1
-}
-
-# Tmux option stored in a global variable so that we don't have to "ask"
-# tmux server each time.
-cache_tmux_default_command() {
-	local default_shell="$(get_tmux_option "default-shell" "")"
-	export TMUX_DEFAULT_COMMAND="$(get_tmux_option "default-command" "$default_shell")"
-}
-
-tmux_default_command() {
-	echo "$TMUX_DEFAULT_COMMAND"
-}
-
-pane_creation_command() {
-	echo "cat '$(pane_contents_file "restore" "${1}:${2}.${3}")'; exec $(tmux_default_command)"
-}
-
-new_window() {
-	local session_name="$1"
-	local window_number="$2"
-	local window_name="$3"
-	local dir="$4"
-	local pane_index="$5"
-	local pane_id="${session_name}:${window_number}.${pane_index}"
-	if is_restoring_pane_contents && pane_contents_file_exists "$pane_id"; then
-		local pane_creation_command="$(pane_creation_command "$session_name" "$window_number" "$pane_index")"
-		tmux new-window -d -t "${session_name}:${window_number}" -n "$window_name" -c "$dir" "$pane_creation_command"
-	else
-		tmux new-window -d -t "${session_name}:${window_number}" -n "$window_name" -c "$dir"
-	fi
-}
-
-new_session() {
-	local session_name="$1"
-	local window_number="$2"
-	local window_name="$3"
-	local dir="$4"
-	local pane_index="$5"
-	local pane_id="${session_name}:${window_number}.${pane_index}"
-	if is_restoring_pane_contents && pane_contents_file_exists "$pane_id"; then
-		local pane_creation_command="$(pane_creation_command "$session_name" "$window_number" "$pane_index")"
-		TMUX="" tmux -S "$(tmux_socket)" new-session -d -s "$session_name" -n "$window_name" -c "$dir" "$pane_creation_command"
-	else
-		TMUX="" tmux -S "$(tmux_socket)" new-session -d -s "$session_name" -n "$window_name" -c "$dir"
-	fi
-	# change first window number if necessary
-	local created_window_num="$(first_window_num)"
-	if [ $created_window_num -ne $window_number ]; then
-		tmux move-window -s "${session_name}:${created_window_num}" -t "${session_name}:${window_number}"
-	fi
-}
-
-new_pane() {
-	local session_name="$1"
-	local window_number="$2"
-	local window_name="$3"
-	local dir="$4"
-	local pane_index="$5"
-	local pane_id="${session_name}:${window_number}.${pane_index}"
-	if is_restoring_pane_contents && pane_contents_file_exists "$pane_id"; then
-		local pane_creation_command="$(pane_creation_command "$session_name" "$window_number" "$pane_index")"
-		tmux split-window -t "${session_name}:${window_number}" -c "$dir" "$pane_creation_command"
-	else
-		tmux split-window -t "${session_name}:${window_number}" -c "$dir"
-	fi
-	# minimize window so more panes can fit
-	tmux resize-pane  -t "${session_name}:${window_number}" -U "999"
-}
-
-restore_pane() {
-	local pane="$1"
-	while IFS=$d read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command pane_full_command; do
-		dir="$(remove_first_char "$dir")"
-		window_name="$(remove_first_char "$window_name")"
-		pane_full_command="$(remove_first_char "$pane_full_command")"
-		if pane_exists "$session_name" "$window_number" "$pane_index"; then
-			tmux rename-window -t "$window_number" "$window_name"
-			if is_restoring_from_scratch; then
-				# overwrite the pane
-				# happens only for the first pane if it's the only registered pane for the whole tmux server
-				local pane_id="$(tmux display-message -p -F "#{pane_id}" -t "$session_name:$window_number")"
-				new_pane "$session_name" "$window_number" "$window_name" "$dir" "$pane_index"
-				tmux kill-pane -t "$pane_id"
-			else
-				# Pane exists, no need to create it!
-				# Pane existence is registered. Later, its process also won't be restored.
-				register_existing_pane "$session_name" "$window_number" "$pane_index"
-			fi
-		elif window_exists "$session_name" "$window_number"; then
-			tmux rename-window -t "$window_number" "$window_name"
-			new_pane "$session_name" "$window_number" "$window_name" "$dir" "$pane_index"
-		elif session_exists "$session_name"; then
-			new_window "$session_name" "$window_number" "$window_name" "$dir" "$pane_index"
-		else
-			new_session "$session_name" "$window_number" "$window_name" "$dir" "$pane_index"
-		fi
-	done < <(echo "$pane")
-}
-
-restore_state() {
-	local state="$1"
-	echo "$state" |
-	while IFS=$d read line_type client_session client_last_session; do
-		tmux switch-client -t "$client_last_session"
-		tmux switch-client -t "$client_session"
-	done
-}
-
-restore_grouped_session() {
-	local grouped_session="$1"
-	echo "$grouped_session" |
-	while IFS=$d read line_type grouped_session original_session alternate_window active_window; do
-		TMUX="" tmux -S "$(tmux_socket)" new-session -d -s "$grouped_session" -t "$original_session"
-	done
-}
-
-restore_active_and_alternate_windows_for_grouped_sessions() {
-	local grouped_session="$1"
-	echo "$grouped_session" |
-	while IFS=$d read line_type grouped_session original_session alternate_window_index active_window_index; do
-		alternate_window_index="$(remove_first_char "$alternate_window_index")"
-		active_window_index="$(remove_first_char "$active_window_index")"
-		if [ -n "$alternate_window_index" ]; then
-			tmux switch-client -t "${grouped_session}:${alternate_window_index}"
-		fi
-		if [ -n "$active_window_index" ]; then
-			tmux switch-client -t "${grouped_session}:${active_window_index}"
-		fi
-	done
-}
-
-never_ever_overwrite() {
-	local overwrite_option_value="$(get_tmux_option "$overwrite_option" "")"
-	[ -n "$overwrite_option_value" ]
-}
-
-detect_if_restoring_from_scratch() {
-	if never_ever_overwrite; then
-		return
-	fi
-	local total_number_of_panes="$(tmux list-panes -a | wc -l | sed 's/ //g')"
-	if [ "$total_number_of_panes" -eq 1 ]; then
-		restore_from_scratch_true
-	fi
-}
-
-detect_if_restoring_pane_contents() {
-	if capture_pane_contents_option_on; then
-		cache_tmux_default_command
-		restore_pane_contents_true
-	fi
-}
-
-# functions called from main (ordered)
-
-restore_all_panes() {
-	detect_if_restoring_from_scratch   # sets a global variable
-	detect_if_restoring_pane_contents  # sets a global variable
-	if is_restoring_pane_contents; then
-		pane_content_files_restore_from_archive
-	fi
-	while read line; do
-		if is_line_type "pane" "$line"; then
-			restore_pane "$line"
-		fi
-	done < $(last_resurrect_file)
-	if is_restoring_pane_contents; then
-		rm "$(pane_contents_dir "restore")"/*
-	fi
-}
-
-restore_pane_layout_for_each_window() {
-	\grep '^window' $(last_resurrect_file) |
-		while IFS=$d read line_type session_name window_number window_active window_flags window_layout; do
-			tmux select-layout -t "${session_name}:${window_number}" "$window_layout"
-		done
-}
-
-restore_shell_history() {
-	awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ { print $2, $3, $7, $10; }' $(last_resurrect_file) |
-		while IFS=$d read session_name window_number pane_index pane_command; do
-			if ! is_pane_registered_as_existing "$session_name" "$window_number" "$pane_index"; then
-				local pane_id="$session_name:$window_number.$pane_index"
-				local history_file="$(resurrect_history_file "$pane_id" "$pane_command")"
-
-				if [ "$pane_command" = "bash" ]; then
-					local read_command="history -r '$history_file'"
-					tmux send-keys -t "$pane_id" "$read_command" C-m
-				elif [ "$pane_command" = "zsh" ]; then
-					local accept_line="$(expr "$(zsh -i -c bindkey | grep -m1 '\saccept-line$')" : '^"\(.*\)".*')"
-					local read_command="fc -R '$history_file'; clear"
-					tmux send-keys -t "$pane_id" "$read_command" "$accept_line"
-				fi
-			fi
-		done
-}
-
-restore_all_pane_processes() {
-	if restore_pane_processes_enabled; then
-		local pane_full_command
-		awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ && $11 !~ "^:$" { print $2, $3, $7, $8, $11; }' $(last_resurrect_file) |
-			while IFS=$d read session_name window_number pane_index dir pane_full_command; do
-				dir="$(remove_first_char "$dir")"
-				pane_full_command="$(remove_first_char "$pane_full_command")"
-				restore_pane_process "$pane_full_command" "$session_name" "$window_number" "$pane_index" "$dir"
-			done
-	fi
-}
-
-restore_active_pane_for_each_window() {
-	awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ && $9 == 1 { print $2, $3, $7; }' $(last_resurrect_file) |
-		while IFS=$d read session_name window_number active_pane; do
-			tmux switch-client -t "${session_name}:${window_number}"
-			tmux select-pane -t "$active_pane"
-		done
-}
-
-restore_zoomed_windows() {
-	awk 'BEGIN { FS="\t"; OFS="\t" } /^pane/ && $6 ~ /Z/ && $9 == 1 { print $2, $3; }' $(last_resurrect_file) |
-		while IFS=$d read session_name window_number; do
-			tmux resize-pane -t "${session_name}:${window_number}" -Z
-		done
-}
-
-restore_grouped_sessions() {
-	while read line; do
-		if is_line_type "grouped_session" "$line"; then
-			restore_grouped_session "$line"
-			restore_active_and_alternate_windows_for_grouped_sessions "$line"
-		fi
-	done < $(last_resurrect_file)
-}
-
-restore_active_and_alternate_windows() {
-	awk 'BEGIN { FS="\t"; OFS="\t" } /^window/ && $5 ~ /[*-]/ { print $2, $4, $3; }' $(last_resurrect_file) |
-		sort -u |
-		while IFS=$d read session_name active_window window_number; do
-			tmux switch-client -t "${session_name}:${window_number}"
-		done
-}
-
-restore_active_and_alternate_sessions() {
-	while read line; do
-		if is_line_type "state" "$line"; then
-			restore_state "$line"
-		fi
-	done < $(last_resurrect_file)
-}
-
-main() {
-	if supported_tmux_version_ok && check_saved_session_exists; then
-		start_spinner "Restoring..." "Tmux restore complete!"
-		execute_hook "pre-restore-all"
-		restore_all_panes
-		restore_pane_layout_for_each_window >/dev/null 2>&1
-		execute_hook "pre-restore-history"
-		if save_shell_history_option_on; then
-			restore_shell_history
-		fi
-		execute_hook "pre-restore-pane-processes"
-		restore_all_pane_processes
-		# below functions restore exact cursor positions
-		restore_active_pane_for_each_window
-		restore_zoomed_windows
-		restore_grouped_sessions  # also restores active and alt windows for grouped sessions
-		restore_active_and_alternate_windows
-		restore_active_and_alternate_sessions
-		execute_hook "post-restore-all"
-		stop_spinner
-		display_message "Tmux restore complete!"
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/scripts/save.sh b/tmux/plugins/tmux-ressurect/scripts/save.sh
deleted file mode 100755
index 9d80af7..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/save.sh
+++ /dev/null
@@ -1,322 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/variables.sh"
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/spinner_helpers.sh"
-
-# delimiters
-d=$'\t'
-delimiter=$'\t'
-
-# if "quiet" script produces no output
-SCRIPT_OUTPUT="$1"
-
-grouped_sessions_format() {
-	local format
-	format+="#{session_grouped}"
-	format+="${delimiter}"
-	format+="#{session_group}"
-	format+="${delimiter}"
-	format+="#{session_id}"
-	format+="${delimiter}"
-	format+="#{session_name}"
-	echo "$format"
-}
-
-pane_format() {
-	local format
-	format+="pane"
-	format+="${delimiter}"
-	format+="#{session_name}"
-	format+="${delimiter}"
-	format+="#{window_index}"
-	format+="${delimiter}"
-	format+=":#{window_name}"
-	format+="${delimiter}"
-	format+="#{window_active}"
-	format+="${delimiter}"
-	format+=":#{window_flags}"
-	format+="${delimiter}"
-	format+="#{pane_index}"
-	format+="${delimiter}"
-	format+=":#{pane_current_path}"
-	format+="${delimiter}"
-	format+="#{pane_active}"
-	format+="${delimiter}"
-	format+="#{pane_current_command}"
-	format+="${delimiter}"
-	format+="#{pane_pid}"
-	format+="${delimiter}"
-	format+="#{history_size}"
-	echo "$format"
-}
-
-window_format() {
-	local format
-	format+="window"
-	format+="${delimiter}"
-	format+="#{session_name}"
-	format+="${delimiter}"
-	format+="#{window_index}"
-	format+="${delimiter}"
-	format+="#{window_active}"
-	format+="${delimiter}"
-	format+=":#{window_flags}"
-	format+="${delimiter}"
-	format+="#{window_layout}"
-	echo "$format"
-}
-
-state_format() {
-	local format
-	format+="state"
-	format+="${delimiter}"
-	format+="#{client_session}"
-	format+="${delimiter}"
-	format+="#{client_last_session}"
-	echo "$format"
-}
-
-dump_panes_raw() {
-	tmux list-panes -a -F "$(pane_format)"
-}
-
-dump_windows_raw(){
-	tmux list-windows -a -F "$(window_format)"
-}
-
-toggle_window_zoom() {
-	local target="$1"
-	tmux resize-pane -Z -t "$target"
-}
-
-_save_command_strategy_file() {
-	local save_command_strategy="$(get_tmux_option "$save_command_strategy_option" "$default_save_command_strategy")"
-	local strategy_file="$CURRENT_DIR/../save_command_strategies/${save_command_strategy}.sh"
-	local default_strategy_file="$CURRENT_DIR/../save_command_strategies/${default_save_command_strategy}.sh"
-	if [ -e "$strategy_file" ]; then # strategy file exists?
-		echo "$strategy_file"
-	else
-		echo "$default_strategy_file"
-	fi
-}
-
-pane_full_command() {
-	local pane_pid="$1"
-	local strategy_file="$(_save_command_strategy_file)"
-	# execute strategy script to get pane full command
-	$strategy_file "$pane_pid"
-}
-
-number_nonempty_lines_on_screen() {
-	local pane_id="$1"
-	tmux capture-pane -pJ -t "$pane_id" |
-		sed '/^$/d' |
-		wc -l |
-		sed 's/ //g'
-}
-
-# tests if there was any command output in the current pane
-pane_has_any_content() {
-	local pane_id="$1"
-	local history_size="$(tmux display -p -t "$pane_id" -F "#{history_size}")"
-	local cursor_y="$(tmux display -p -t "$pane_id" -F "#{cursor_y}")"
-	# doing "cheap" tests first
-	[ "$history_size" -gt 0 ] || # history has any content?
-		[ "$cursor_y" -gt 0 ] || # cursor not in first line?
-		[ "$(number_nonempty_lines_on_screen "$pane_id")" -gt 1 ]
-}
-
-capture_pane_contents() {
-	local pane_id="$1"
-	local start_line="-$2"
-	local pane_contents_area="$3"
-	if pane_has_any_content "$pane_id"; then
-		if [ "$pane_contents_area" = "visible" ]; then
-			start_line="0"
-		fi
-		# the printf hack below removes *trailing* empty lines
-		printf '%s\n' "$(tmux capture-pane -epJ -S "$start_line" -t "$pane_id")" > "$(pane_contents_file "save" "$pane_id")"
-	fi
-}
-
-save_shell_history() {
-	if [ "$pane_command" = "bash" ]; then
-		local history_w='history -w'
-		local history_r='history -r'
-		local accept_line='C-m'
-		local end_of_line='C-e'
-		local backward_kill_line='C-u'
-	elif [ "$pane_command" = "zsh" ]; then
-		# fc -W does not work with -L
-		# fc -l format is different from what's written by fc -W
-		# fc -R either reads the format produced by fc -W or considers
-		# the entire line to be a command. That's why we need -n.
-		# fc -l only list the last 16 items by default, I think 64 is more reasonable.
-		local history_w='fc -lLn -64 >'
-		local history_r='fc -R'
-
-		local zsh_bindkey="$(zsh -i -c bindkey)"
-		local accept_line="$(expr "$(echo "$zsh_bindkey" | grep -m1 '\saccept-line$')" : '^"\(.*\)".*')"
-		local end_of_line="$(expr "$(echo "$zsh_bindkey" | grep -m1 '\send-of-line$')" : '^"\(.*\)".*')"
-		local backward_kill_line="$(expr "$(echo "$zsh_bindkey" | grep -m1 '\sbackward-kill-line$')" : '^"\(.*\)".*')"
-	else
-		return
-	fi
-
-	local pane_id="$1"
-	local pane_command="$2"
-	local full_command="$3"
-	if [ "$full_command" = ":" ]; then
-		# leading space prevents the command from being saved to history
-		# (assuming default HISTCONTROL settings)
-		local write_command=" $history_w '$(resurrect_history_file "$pane_id" "$pane_command")'"
-		local read_command=" $history_r '$(resurrect_history_file "$pane_id" "$pane_command")'"
-		# C-e C-u is a Bash shortcut sequence to clear whole line. It is necessary to
-		# delete any pending input so it does not interfere with our history command.
-		tmux send-keys -t "$pane_id" "$end_of_line" "$backward_kill_line" "$write_command" "$accept_line"
-		# Immediately restore after saving
-		tmux send-keys -t "$pane_id" "$end_of_line" "$backward_kill_line" "$read_command" "$accept_line"
-	fi
-}
-
-get_active_window_index() {
-	local session_name="$1"
-	tmux list-windows -t "$session_name" -F "#{window_flags} #{window_index}" |
-		awk '$1 ~ /\*/ { print $2; }'
-}
-
-get_alternate_window_index() {
-	local session_name="$1"
-	tmux list-windows -t "$session_name" -F "#{window_flags} #{window_index}" |
-		awk '$1 ~ /-/ { print $2; }'
-}
-
-dump_grouped_sessions() {
-	local current_session_group=""
-	local original_session
-	tmux list-sessions -F "$(grouped_sessions_format)" |
-		grep "^1" |
-		cut -c 3- |
-		sort |
-		while IFS=$d read session_group session_id session_name; do
-			if [ "$session_group" != "$current_session_group" ]; then
-				# this session is the original/first session in the group
-				original_session="$session_name"
-				current_session_group="$session_group"
-			else
-				# this session "points" to the original session
-				active_window_index="$(get_active_window_index "$session_name")"
-				alternate_window_index="$(get_alternate_window_index "$session_name")"
-				echo "grouped_session${d}${session_name}${d}${original_session}${d}:${alternate_window_index}${d}:${active_window_index}"
-			fi
-		done
-}
-
-fetch_and_dump_grouped_sessions(){
-	local grouped_sessions_dump="$(dump_grouped_sessions)"
-	get_grouped_sessions "$grouped_sessions_dump"
-	if [ -n "$grouped_sessions_dump" ]; then
-		echo "$grouped_sessions_dump"
-	fi
-}
-
-# translates pane pid to process command running inside a pane
-dump_panes() {
-	local full_command
-	dump_panes_raw |
-		while IFS=$d read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command pane_pid history_size; do
-			# not saving panes from grouped sessions
-			if is_session_grouped "$session_name"; then
-				continue
-			fi
-			full_command="$(pane_full_command $pane_pid)"
-			dir=$(echo $dir | sed 's/ /\\ /') # escape all spaces in directory path
-			echo "${line_type}${d}${session_name}${d}${window_number}${d}${window_name}${d}${window_active}${d}${window_flags}${d}${pane_index}${d}${dir}${d}${pane_active}${d}${pane_command}${d}:${full_command}"
-		done
-}
-
-dump_windows() {
-	dump_windows_raw |
-		while IFS=$d read line_type session_name window_index window_active window_flags window_layout; do
-			# not saving windows from grouped sessions
-			if is_session_grouped "$session_name"; then
-				continue
-			fi
-			echo "${line_type}${d}${session_name}${d}${window_index}${d}${window_active}${d}${window_flags}${d}${window_layout}"
-		done
-}
-
-dump_state() {
-	tmux display-message -p "$(state_format)"
-}
-
-dump_pane_contents() {
-	local pane_contents_area="$(get_tmux_option "$pane_contents_area_option" "$default_pane_contents_area")"
-	dump_panes_raw |
-		while IFS=$d read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command pane_pid history_size; do
-			capture_pane_contents "${session_name}:${window_number}.${pane_index}" "$history_size" "$pane_contents_area"
-		done
-}
-
-dump_shell_history() {
-	dump_panes |
-		while IFS=$d read line_type session_name window_number window_name window_active window_flags pane_index dir pane_active pane_command full_command; do
-			save_shell_history "$session_name:$window_number.$pane_index" "$pane_command" "$full_command"
-		done
-}
-
-remove_old_backups() {
-	# remove resurrect files older than 30 days, but keep at least 5 copies of backup.
-	local -a files
-	files=($(ls -t $(resurrect_dir)/${RESURRECT_FILE_PREFIX}_*.${RESURRECT_FILE_EXTENSION} | tail -n +6))
-	[[ ${#files[@]} -eq 0 ]] ||
-		find "${files[@]}" -type f -mtime +30 -exec rm -v "{}" \;
-}
-
-save_all() {
-	local resurrect_file_path="$(resurrect_file_path)"
-	local last_resurrect_file="$(last_resurrect_file)"
-	mkdir -p "$(resurrect_dir)"
-	fetch_and_dump_grouped_sessions > "$resurrect_file_path"
-	dump_panes   >> "$resurrect_file_path"
-	dump_windows >> "$resurrect_file_path"
-	dump_state   >> "$resurrect_file_path"
-	execute_hook "post-save-layout" "$resurrect_file_path"
-	if files_differ "$resurrect_file_path" "$last_resurrect_file"; then
-		ln -fs "$(basename "$resurrect_file_path")" "$last_resurrect_file"
-	else
-		rm "$resurrect_file_path"
-	fi
-	if capture_pane_contents_option_on; then
-		mkdir -p "$(pane_contents_dir "save")"
-		dump_pane_contents
-		pane_contents_create_archive
-		rm "$(pane_contents_dir "save")"/*
-	fi
-	if save_shell_history_option_on; then
-		dump_shell_history
-	fi
-	remove_old_backups
-	execute_hook "post-save-all"
-}
-
-show_output() {
-	[ "$SCRIPT_OUTPUT" != "quiet" ]
-}
-
-main() {
-	if supported_tmux_version_ok; then
-		if show_output; then
-			start_spinner "Saving..." "Tmux environment saved!"
-		fi
-		save_all
-		if show_output; then
-			stop_spinner
-			display_message "Tmux environment saved!"
-		fi
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/scripts/spinner_helpers.sh b/tmux/plugins/tmux-ressurect/scripts/spinner_helpers.sh
deleted file mode 100644
index fe73cd7..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/spinner_helpers.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-start_spinner() {
-	$CURRENT_DIR/tmux_spinner.sh "$1" "$2" &
-	export SPINNER_PID=$!
-}
-
-stop_spinner() {
-	kill $SPINNER_PID
-}
diff --git a/tmux/plugins/tmux-ressurect/scripts/tmux_spinner.sh b/tmux/plugins/tmux-ressurect/scripts/tmux_spinner.sh
deleted file mode 100755
index 9b1b979..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/tmux_spinner.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/usr/bin/env bash
-
-# This script shows tmux spinner with a message. It is intended to be running
-# as a background process which should be `kill`ed at the end.
-#
-# Example usage:
-#
-#   ./tmux_spinner.sh "Working..." "End message!" &
-#   SPINNER_PID=$!
-#   ..
-#   .. execute commands here
-#   ..
-#   kill $SPINNER_PID # Stops spinner and displays 'End message!'
-
-MESSAGE="$1"
-END_MESSAGE="$2"
-SPIN='-\|/'
-
-trap "tmux display-message '$END_MESSAGE'; exit" SIGINT SIGTERM
-
-main() {
-	local i=0
-	while true; do
-	  i=$(( (i+1) %4 ))
-	  tmux display-message " ${SPIN:$i:1} $MESSAGE"
-	  sleep 0.1
-	done
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/scripts/variables.sh b/tmux/plugins/tmux-ressurect/scripts/variables.sh
deleted file mode 100644
index 9436957..0000000
--- a/tmux/plugins/tmux-ressurect/scripts/variables.sh
+++ /dev/null
@@ -1,47 +0,0 @@
-# key bindings
-default_save_key="C-s"
-save_option="@resurrect-save"
-save_path_option="@resurrect-save-script-path"
-
-default_restore_key="C-r"
-restore_option="@resurrect-restore"
-restore_path_option="@resurrect-restore-script-path"
-
-# default processes that are restored
-default_proc_list_option="@resurrect-default-processes"
-default_proc_list='vi vim nvim emacs man less more tail top htop irssi weechat mutt'
-
-# User defined processes that are restored
-#  'false' - nothing is restored
-#  ':all:' - all processes are restored
-#
-# user defined list of programs that are restored:
-#  'my_program foo another_program'
-restore_processes_option="@resurrect-processes"
-restore_processes=""
-
-# Defines part of the user variable. Example usage:
-#   set -g @resurrect-strategy-vim "session"
-restore_process_strategy_option="@resurrect-strategy-"
-
-inline_strategy_token="->"
-
-save_command_strategy_option="@resurrect-save-command-strategy"
-default_save_command_strategy="ps"
-
-# Pane contents capture options.
-# @resurrect-pane-contents-area option can be:
-#   'visible' - capture only the visible pane area
-#   'full'    - capture the full pane contents
-pane_contents_option="@resurrect-capture-pane-contents"
-pane_contents_area_option="@resurrect-pane-contents-area"
-default_pane_contents_area="full"
-
-bash_history_option="@resurrect-save-bash-history" # deprecated
-shell_history_option="@resurrect-save-shell-history"
-
-# set to 'on' to ensure panes are never ever overwritten
-overwrite_option="@resurrect-never-overwrite"
-
-# Hooks are set via ${hook_prefix}${name}, i.e. "@resurrect-hook-post-save-all"
-hook_prefix="@resurrect-hook-"
diff --git a/tmux/plugins/tmux-ressurect/strategies/irb_default_strategy.sh b/tmux/plugins/tmux-ressurect/strategies/irb_default_strategy.sh
deleted file mode 100755
index 897f5bb..0000000
--- a/tmux/plugins/tmux-ressurect/strategies/irb_default_strategy.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-
-# "irb default strategy"
-#
-# Example irb process with junk variables:
-#   irb RBENV_VERSION=1.9.3-p429 GREP_COLOR=34;47 TERM_PROGRAM=Apple_Terminal
-#
-# When executed, the above will fail. This strategy handles that.
-
-ORIGINAL_COMMAND="$1"
-DIRECTORY="$2"
-
-original_command_wo_junk_vars() {
-	echo "$ORIGINAL_COMMAND" |
-		sed 's/RBENV_VERSION[^ ]*//' |
-		sed 's/GREP_COLOR[^ ]*//'    |
-		sed 's/TERM_PROGRAM[^ ]*//'
-}
-
-main() {
-	echo "$(original_command_wo_junk_vars)"
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/strategies/mosh-client_default_strategy.sh b/tmux/plugins/tmux-ressurect/strategies/mosh-client_default_strategy.sh
deleted file mode 100755
index 4d2f06b..0000000
--- a/tmux/plugins/tmux-ressurect/strategies/mosh-client_default_strategy.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/usr/bin/env bash
-
-# "mosh-client default strategy"
-#
-# Example mosh-client process:
-#   mosh-client -# charm tmux at | 198.199.104.142 60001
-#
-# When executed, the above will fail. This strategy handles that.
-
-ORIGINAL_COMMAND="$1"
-DIRECTORY="$2"
-
-mosh_command() {
-	local args="$ORIGINAL_COMMAND"
-
-	args="${args#*-#}"
-	args="${args%|*}"
-
-	echo "mosh $args"
-}
-
-main() {
-	echo "$(mosh_command)"
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/strategies/nvim_session.sh b/tmux/plugins/tmux-ressurect/strategies/nvim_session.sh
deleted file mode 100755
index 4987c68..0000000
--- a/tmux/plugins/tmux-ressurect/strategies/nvim_session.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/usr/bin/env bash
-
-# "nvim session strategy"
-#
-# Same as vim strategy, see file 'vim_session.sh'
-
-ORIGINAL_COMMAND="$1"
-DIRECTORY="$2"
-
-nvim_session_file_exists() {
-	[ -e "${DIRECTORY}/Session.vim" ]
-}
-
-original_command_contains_session_flag() {
-	[[ "$ORIGINAL_COMMAND" =~ "-S" ]]
-}
-
-main() {
-	if nvim_session_file_exists; then
-		echo "nvim -S"
-	elif original_command_contains_session_flag; then
-		# Session file does not exist, yet the original nvim command contains
-		# session flag `-S`. This will cause an error, so we're falling back to
-		# starting plain nvim.
-		echo "nvim"
-	else
-		echo "$ORIGINAL_COMMAND"
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-ressurect/strategies/vim_session.sh b/tmux/plugins/tmux-ressurect/strategies/vim_session.sh
deleted file mode 100755
index 8121344..0000000
--- a/tmux/plugins/tmux-ressurect/strategies/vim_session.sh
+++ /dev/null
@@ -1,32 +0,0 @@
-#!/usr/bin/env bash
-
-# "vim session strategy"
-#
-# Restores a vim session from 'Session.vim' file, if it exists.
-# If 'Session.vim' does not exist, it falls back to invoking the original
-# command (without the `-S` flag).
-
-ORIGINAL_COMMAND="$1"
-DIRECTORY="$2"
-
-vim_session_file_exists() {
-	[ -e "${DIRECTORY}/Session.vim" ]
-}
-
-original_command_contains_session_flag() {
-	[[ "$ORIGINAL_COMMAND" =~ "-S" ]]
-}
-
-main() {
-	if vim_session_file_exists; then
-		echo "vim -S"
-	elif original_command_contains_session_flag; then
-		# Session file does not exist, yet the original vim command contains
-		# session flag `-S`. This will cause an error, so we're falling back to
-		# starting plain vim.
-		echo "vim"
-	else
-		echo "$ORIGINAL_COMMAND"
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-sidebar/LICENSE.md b/tmux/plugins/tmux-sidebar/LICENSE.md
deleted file mode 100644
index 40f6ddd..0000000
--- a/tmux/plugins/tmux-sidebar/LICENSE.md
+++ /dev/null
@@ -1,19 +0,0 @@
-Copyright (C) 2014 Bruno Sutic
-
-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/tmux/plugins/tmux-sidebar/README.md b/tmux/plugins/tmux-sidebar/README.md
deleted file mode 100644
index bfefb1a..0000000
--- a/tmux/plugins/tmux-sidebar/README.md
+++ /dev/null
@@ -1,74 +0,0 @@
-# Tmux Sidebar
-
-`tmux-sidebar` does one thing: it opens a tree directory listing for the current
-path. It's fast, convenient and works great with vim.
-
-![screenshot](/screenshot.gif)
-
-Some of the features that make the plugin more appealing than doing the same
-thing manually each time:
-
-- **fast**<br/>
-  Much faster than doing each step manually.
-- **smart sizing**<br/>
-  Sidebar remembers its size, so the next time you open it, it will have the
-  **exact same** width. This is a per-directory property, so you can have just
-  the right size for multiple dirs.
-- **toggling**<br/>
-  The same key binding opens and closes the sidebar.
-- **uninterrupted workflow**<br/>
-  The main `prefix + Tab` key binding opens a sidebar but **does not** move
-  cursor to it.
-- **pane layout stays the same**<br/>
-  No matter which pane layout you prefer, sidebar tries hard not to mess your
-  pane splits. Open, then close the sidebar and everything should look the same.
-
-Requirements: `tmux 1.9` or higher, `tree` recommended but not required
-
-Tested and working on Linux, OSX and Cygwin.
-
-### Key bindings
-
-- `prefix + Tab` - toggle sidebar with a directory tree
-- `prefix + Backspace` - toggle sidebar and move cursor to it (focus it)
-
-### Installation with [Tmux Plugin Manager](https://github.com/tmux-plugins/tpm) (recommended)
-
-Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    set -g @plugin 'tmux-plugins/tmux-sidebar'
-
-Hit `prefix + I` to fetch the plugin and source it. You should now be able to
-use the plugin.
-
-### Manual Installation
-
-Clone the repo:
-
-    $ git clone https://github.com/tmux-plugins/tmux-sidebar ~/clone/path
-
-Add this line to the bottom of `.tmux.conf`:
-
-    run-shell ~/clone/path/sidebar.tmux
-
-Reload TMUX environment:
-
-    # type this in terminal
-    $ tmux source-file ~/.tmux.conf
-
-You should now be able to use the plugin.
-
-### Docs
-
-- [customization options](docs/options.md)
-
-### Other goodies
-
-- [tmux-copycat](https://github.com/tmux-plugins/tmux-copycat) - a plugin for
-  regex searches in tmux and fast match selection
-- [tmux-resurrect](https://github.com/tmux-plugins/tmux-resurrect) - restore
-  tmux environment after a system restart
-
-### License
-
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-sidebar/docs/options.md b/tmux/plugins/tmux-sidebar/docs/options.md
deleted file mode 100644
index a05f57a..0000000
--- a/tmux/plugins/tmux-sidebar/docs/options.md
+++ /dev/null
@@ -1,41 +0,0 @@
-## Options
-
-Customize `tmux-sidebar` by placing options in `.tmux.conf` and reloading Tmux
-environment.
-
-> How can I run some other command in the sidebar?
-
-    set -g @sidebar-tree-command 'ls -1'
-
-> Can I have the sidebar on the right?
-
-    set -g @sidebar-tree-position 'right'
-
-> I don't like the default 'prefix + Tab' key binding. Can I change it to be
-'prefix + e'?
-
-    set -g @sidebar-tree 'e'
-
-> How can I change the default 'prefix + Backspace' to be 'prefix + w'?
-
-    set -g @sidebar-tree-focus 'w'
-
-> I see the tree sidebar uses 'less' as a pager. I would like to use 'view'.
-
-    set -g @sidebar-tree-pager 'view -'
-
-> The default sidebar width is 40 columns. I want the sidebar to be wider by
-default!
-
-    set -g @sidebar-tree-width '60'
-
-> Can I colorize the ``tree`` directory listing in the sidebar?
-
-    set -g @sidebar-tree-command 'tree -C'
-
-### Notes
-
-The command used to display the directory listing
-(`@sidebar-tree-pager`, if set) must support color codes. If it does not,
-unusual characters - the color control codes - will be visible in the sidebar.
-
diff --git a/tmux/plugins/tmux-sidebar/scripts/check_tmux_version.sh b/tmux/plugins/tmux-sidebar/scripts/check_tmux_version.sh
deleted file mode 100755
index b0aedec..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/check_tmux_version.sh
+++ /dev/null
@@ -1,78 +0,0 @@
-#!/usr/bin/env bash
-
-VERSION="$1"
-UNSUPPORTED_MSG="$2"
-
-get_tmux_option() {
-	local option=$1
-	local default_value=$2
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-	local message="$1"
-
-	# display_duration defaults to 5 seconds, if not passed as an argument
-	if [ "$#" -eq 2 ]; then
-		local display_duration="$2"
-	else
-		local display_duration="5000"
-	fi
-
-	# saves user-set 'display-time' option
-	local saved_display_time=$(get_tmux_option "display-time" "750")
-
-	# sets message display time to 5 seconds
-	tmux set-option -gq display-time "$display_duration"
-
-	# displays message
-	tmux display-message "$message"
-
-	# restores original 'display-time' value
-	tmux set-option -gq display-time "$saved_display_time"
-}
-
-# this is used to get "clean" integer version number. Examples:
-# `tmux 1.9` => `19`
-# `1.9a`     => `19`
-get_digits_from_string() {
-	local string="$1"
-	local only_digits="$(echo "$string" | tr -dC '[:digit:]')"
-	echo "$only_digits"
-}
-
-tmux_version_int() {
-	local tmux_version_string=$(tmux -V)
-	echo "$(get_digits_from_string "$tmux_version_string")"
-}
-
-unsupported_version_message() {
-	if [ -n "$UNSUPPORTED_MSG" ]; then
-		echo "$UNSUPPORTED_MSG"
-	else
-		echo "Error, Tmux version unsupported! Please install Tmux version $VERSION or greater!"
-	fi
-}
-
-exit_if_unsupported_version() {
-	local current_version="$1"
-	local supported_version="$2"
-	if [ "$current_version" -lt "$supported_version" ]; then
-		display_message "$(unsupported_version_message)"
-		exit 1
-	fi
-}
-
-main() {
-	local supported_version_int="$(get_digits_from_string "$VERSION")"
-	local current_version_int="$(tmux_version_int)"
-	exit_if_unsupported_version "$current_version_int" "$supported_version_int"
-}
-main
diff --git a/tmux/plugins/tmux-sidebar/scripts/custom_tree.sh b/tmux/plugins/tmux-sidebar/scripts/custom_tree.sh
deleted file mode 100755
index 41fa246..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/custom_tree.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-find . -path '*/.git*' -prune -o -print |
-	sed -e 's;[^/]*/;|___;g;s;___|; |;g'
diff --git a/tmux/plugins/tmux-sidebar/scripts/helpers.sh b/tmux/plugins/tmux-sidebar/scripts/helpers.sh
deleted file mode 100644
index 4593095..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/helpers.sh
+++ /dev/null
@@ -1,101 +0,0 @@
-get_tmux_option() {
-	local option=$1
-	local default_value=$2
-	local option_value=$(tmux show-option -gqv "$option")
-	if [ -z "$option_value" ]; then
-		echo "$default_value"
-	else
-		echo "$option_value"
-	fi
-}
-
-set_tmux_option() {
-	local option=$1
-	local value=$2
-	tmux set-option -gq "$option" "$value"
-}
-
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-	local message="$1"
-
-	# display_duration defaults to 5 seconds, if not passed as an argument
-	if [ "$#" -eq 2 ]; then
-		local display_duration="$2"
-	else
-		local display_duration="5000"
-	fi
-
-	# saves user-set 'display-time' option
-	local saved_display_time=$(get_tmux_option "display-time" "750")
-
-	# sets message display time to 5 seconds
-	tmux set-option -gq display-time "$display_duration"
-
-	# displays message
-	tmux display-message "$message"
-
-	# restores original 'display-time' value
-	tmux set-option -gq display-time "$saved_display_time"
-}
-
-stored_key_vars() {
-	tmux show-options -g |
-		\grep -i "^${VAR_KEY_PREFIX}-" |
-		cut -d ' ' -f1 |               # cut just the variable names
-		xargs                          # splat var names in one line
-}
-
-# get the key from the variable name
-get_key_from_option_name() {
-	local option="$1"
-	echo "$option" |
-		sed "s/^${VAR_KEY_PREFIX}-//"
-}
-
-get_value_from_option_name() {
-	local option="$1"
-	echo "$(get_tmux_option "$option" "")"
-}
-
-get_pane_info() {
-	local pane_id="$1"
-	local format_strings="#{pane_id},$2"
-	tmux list-panes -t "$pane_id" -F "$format_strings" |
-		\grep "$pane_id" |
-		cut -d',' -f2-
-}
-
-sidebar_dir() {
-	echo "$SIDEBAR_DIR"
-}
-
-sidebar_file() {
-	echo "$(sidebar_dir)/directory_widths.txt"
-}
-
-directory_in_sidebar_file() {
-	local pane_current_path="$1"
-	grep -q "^${pane_current_path}\t" $(sidebar_file) 2>/dev/null
-}
-
-width_from_sidebar_file() {
-	local pane_current_path="$1"
-	grep "^${pane_current_path}\t" $(sidebar_file) |
-		cut -f2
-}
-
-# function is used to get "clean" integer version number. Examples:
-# `tmux 1.9` => `19`
-# `1.9a`     => `19`
-_get_digits_from_string() {
-	local string="$1"
-	local only_digits="$(echo "$string" | tr -dC '[:digit:]')"
-	echo "$only_digits"
-}
-
-tmux_version_int() {
-	local tmux_version_string=$(tmux -V)
-	echo "$(_get_digits_from_string "$tmux_version_string")"
-}
diff --git a/tmux/plugins/tmux-sidebar/scripts/save_sidebar_width.sh b/tmux/plugins/tmux-sidebar/scripts/save_sidebar_width.sh
deleted file mode 100755
index 51eaf87..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/save_sidebar_width.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/variables.sh"
-
-DIR_PATH="$(echo "$1" | tail -1)" # fixes a bug with invalid param
-WIDTH="$2"
-delimiter=$'\t'
-
-replace_directory_width() {
-	sed "s|^${DIR_PATH}${delimiter}.*|${DIR_PATH}${delimiter}${WIDTH}|g" $(sidebar_file) > $(sidebar_file).bak
-	mv $(sidebar_file).bak $(sidebar_file)
-}
-
-add_directory_width() {
-	mkdir -p "$(sidebar_dir)"
-	echo "${DIR_PATH}${delimiter}${WIDTH}" >> $(sidebar_file)
-}
-
-save_sidebar_width() {
-	if directory_in_sidebar_file "$DIR_PATH"; then
-		replace_directory_width
-	else
-		add_directory_width
-	fi
-}
-
-main() {
-	save_sidebar_width
-}
-main
diff --git a/tmux/plugins/tmux-sidebar/scripts/toggle.sh b/tmux/plugins/tmux-sidebar/scripts/toggle.sh
deleted file mode 100755
index 1c27b8a..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/toggle.sh
+++ /dev/null
@@ -1,204 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-source "$CURRENT_DIR/helpers.sh"
-source "$CURRENT_DIR/variables.sh"
-
-# script global vars
-ARGS="$1"               # example args format: "tree | less,right,20,focus"
-PANE_ID="$2"
-COMMAND="$(echo "$ARGS"  | cut -d',' -f1)"   # "tree | less"
-POSITION="$(echo "$ARGS" | cut -d',' -f2)"   # "right"
-SIZE="$(echo "$ARGS"     | cut -d',' -f3)"   # "20"
-FOCUS="$(echo "$ARGS"    | cut -d',' -f4)"   # "focus"
-
-PANE_WIDTH="$(get_pane_info "$PANE_ID" "#{pane_width}")"
-PANE_CURRENT_PATH="$(get_pane_info "$PANE_ID" "#{pane_current_path}")"
-
-supported_tmux_version_ok() {
-	$CURRENT_DIR/check_tmux_version.sh "$SUPPORTED_TMUX_VERSION"
-}
-
-sidebar_registration() {
-	get_tmux_option "${REGISTERED_PANE_PREFIX}-${PANE_ID}" ""
-}
-
-sidebar_pane_id() {
-	sidebar_registration |
-		cut -d',' -f1
-}
-
-sidebar_pane_args() {
-	echo "$(sidebar_registration)" |
-		cut -d',' -f2-
-}
-
-register_sidebar() {
-	local sidebar_id="$1"
-	set_tmux_option "${REGISTERED_SIDEBAR_PREFIX}-${sidebar_id}" "$PANE_ID"
-	set_tmux_option "${REGISTERED_PANE_PREFIX}-${PANE_ID}" "${sidebar_id},${ARGS}"
-}
-
-registration_not_for_the_same_command() {
-	local registered_args="$(sidebar_registration | cut -d',' -f2-)"
-	[[ $ARGS != $registered_args ]]
-}
-
-sidebar_exists() {
-	local pane_id="$(sidebar_pane_id)"
-	tmux list-panes -F "#{pane_id}" 2>/dev/null |
-		\grep -q "^${pane_id}$"
-}
-
-has_sidebar() {
-	if [ -n "$(sidebar_registration)" ] && sidebar_exists; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-current_pane_width_not_changed() {
-	if [ $PANE_WIDTH -eq $1 ]; then
-		return 0
-	else
-		return 1
-	fi
-}
-
-kill_sidebar() {
-	# get data before killing the sidebar
-	local sidebar_pane_id="$(sidebar_pane_id)"
-	local sidebar_args="$(sidebar_pane_args)"
-	local sidebar_position="$(echo "$sidebar_args" | cut -d',' -f2)" # left or defults to right
-	local sidebar_width="$(get_pane_info "$sidebar_pane_id" "#{pane_width}")"
-
-	$CURRENT_DIR/save_sidebar_width.sh "$PANE_CURRENT_PATH" "$sidebar_width"
-
-	# kill the sidebar
-	tmux kill-pane -t "$sidebar_pane_id"
-
-	# check current pane "expanded" properly
-	local new_current_pane_width="$(get_pane_info "$PANE_ID" "#{pane_width}")"
-	if current_pane_width_not_changed "$new_current_pane_width"; then
-		# need to expand current pane manually
-		local direction_flag
-		if [[ "$sidebar_position" =~ "left" ]]; then
-			direction_flag="-L"
-		else
-			direction_flag="-R"
-		fi
-		# compensate 1 column
-		tmux resize-pane "$direction_flag" "$((sidebar_width + 1))"
-	fi
-	PANE_WIDTH="$new_current_pane_width"
-}
-
-sidebar_left() {
-	[[ $POSITION =~ "left" ]]
-}
-
-no_focus() {
-	if [[ $FOCUS =~ (^focus) ]]; then
-		return 1
-	else
-		return 0
-	fi
-}
-
-size_defined() {
-	[ -n $SIZE ]
-}
-
-desired_sidebar_size() {
-	local half_pane="$((PANE_WIDTH / 2))"
-	if directory_in_sidebar_file "$PANE_CURRENT_PATH"; then
-		# use stored sidebar width for the directory
-		echo "$(width_from_sidebar_file "$PANE_CURRENT_PATH")"
-	elif size_defined && [ $SIZE -lt $half_pane ]; then
-		echo "$SIZE"
-	else
-		echo "$half_pane"
-	fi
-}
-
-# tmux version 2.0 and below requires different argument for `join-pane`
-use_inverted_size() {
-	[ tmux_version_int -le 20 ]
-}
-
-split_sidebar_left() {
-	local sidebar_size=$(desired_sidebar_size)
-	if use_inverted_size; then
-		sidebar_size=$((PANE_WIDTH - $sidebar_size - 1))
-	fi
-	local sidebar_id="$(tmux new-window -c "$PANE_CURRENT_PATH" -P -F "#{pane_id}" "$COMMAND")"
-	tmux join-pane -hb -l "$sidebar_size" -t "$PANE_ID" -s "$sidebar_id"
-	echo "$sidebar_id"
-}
-
-split_sidebar_right() {
-	local sidebar_size=$(desired_sidebar_size)
-	tmux split-window -h -l "$sidebar_size" -c "$PANE_CURRENT_PATH" -P -F "#{pane_id}" "$COMMAND"
-}
-
-create_sidebar() {
-	local position="$1" # left / right
-	local sidebar_id="$(split_sidebar_${position})"
-	register_sidebar "$sidebar_id"
-	if no_focus; then
-		tmux last-pane
-	fi
-}
-
-current_pane_is_sidebar() {
-	local var="$(get_tmux_option "${REGISTERED_SIDEBAR_PREFIX}-${PANE_ID}" "")"
-	[ -n "$var" ]
-}
-
-current_pane_too_narrow() {
-	[ $PANE_WIDTH -lt $MINIMUM_WIDTH_FOR_SIDEBAR ]
-}
-
-execute_command_from_main_pane() {
-	# get pane_id for this sidebar
-	local main_pane_id="$(get_tmux_option "${REGISTERED_SIDEBAR_PREFIX}-${PANE_ID}" "")"
-	# execute the same command as if from the "main" pane
-	$CURRENT_DIR/toggle.sh "$ARGS" "$main_pane_id"
-}
-
-exit_if_pane_too_narrow() {
-	if current_pane_too_narrow; then
-		display_message "Pane too narrow for the sidebar"
-		exit
-	fi
-}
-
-toggle_sidebar() {
-	if has_sidebar; then
-		kill_sidebar
-		# if using different sidebar command automatically open a new sidebar
-		# if registration_not_for_the_same_command; then
-		# 	create_sidebar
-		# fi
-	else
-		exit_if_pane_too_narrow
-		if sidebar_left; then
-			create_sidebar "left"
-		else
-			create_sidebar "right"
-		fi
-	fi
-}
-
-main() {
-	if supported_tmux_version_ok; then
-		if current_pane_is_sidebar; then
-			execute_command_from_main_pane
-		else
-			toggle_sidebar
-		fi
-	fi
-}
-main
diff --git a/tmux/plugins/tmux-sidebar/scripts/tree_helpers.sh b/tmux/plugins/tmux-sidebar/scripts/tree_helpers.sh
deleted file mode 100644
index 41e39d3..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/tree_helpers.sh
+++ /dev/null
@@ -1,42 +0,0 @@
-# file sourced from ./sidebar.tmux
-custom_tree_command="$CURRENT_DIR/scripts/custom_tree.sh"
-
-command_exists() {
-	local command="$1"
-	type "$command" >/dev/null 2>&1
-}
-
-tree_command() {
-	local user_command="$(tree_user_command)"
-	if [ -n "$user_command" ]; then
-		echo "$user_command"
-	elif command_exists "tree"; then
-		echo "$TREE_COMMAND"
-	else
-		echo "$custom_tree_command"
-	fi
-}
-
-tree_user_command() {
-	get_tmux_option "$TREE_COMMAND_OPTION" ""
-}
-
-tree_key() {
-	get_tmux_option "$TREE_OPTION" "$TREE_KEY"
-}
-
-tree_focus_key() {
-	get_tmux_option "$TREE_FOCUS_OPTION" "$TREE_FOCUS_KEY"
-}
-
-tree_pager() {
-	get_tmux_option "$TREE_PAGER_OPTION" "$TREE_PAGER"
-}
-
-tree_position() {
-	get_tmux_option "$TREE_POSITION_OPTION" "$TREE_POSITION"
-}
-
-tree_width() {
-	get_tmux_option "$TREE_WIDTH_OPTION" "$TREE_WIDTH"
-}
diff --git a/tmux/plugins/tmux-sidebar/scripts/variables.sh b/tmux/plugins/tmux-sidebar/scripts/variables.sh
deleted file mode 100644
index 9d7c3fc..0000000
--- a/tmux/plugins/tmux-sidebar/scripts/variables.sh
+++ /dev/null
@@ -1,26 +0,0 @@
-VAR_KEY_PREFIX="@sidebar-key"
-REGISTERED_PANE_PREFIX="@-sidebar-registered-pane"
-REGISTERED_SIDEBAR_PREFIX="@-sidebar-is-sidebar"
-MINIMUM_WIDTH_FOR_SIDEBAR="71"
-
-TREE_KEY="Tab"
-TREE_OPTION="@sidebar-tree"
-
-TREE_FOCUS_KEY="Bspace"
-TREE_FOCUS_OPTION="@sidebar-tree-focus"
-
-TREE_COMMAND="tree"
-TREE_COMMAND_OPTION="@sidebar-tree-command"
-
-TREE_PAGER='sh -c "LESS= less --dumb --chop-long-lines --tilde --IGNORE-CASE --RAW-CONTROL-CHARS"'
-TREE_PAGER_OPTION="@sidebar-tree-pager"
-
-TREE_POSITION="left"
-TREE_POSITION_OPTION="@sidebar-tree-position"
-
-TREE_WIDTH="40"
-TREE_WIDTH_OPTION="@sidebar-tree-width"
-
-SUPPORTED_TMUX_VERSION="1.9"
-
-SIDEBAR_DIR="$HOME/.tmux/sidebar"
diff --git a/tmux/plugins/tmux-sidebar/sidebar.tmux b/tmux/plugins/tmux-sidebar/sidebar.tmux
deleted file mode 100755
index 61b973d..0000000
--- a/tmux/plugins/tmux-sidebar/sidebar.tmux
+++ /dev/null
@@ -1,38 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-SCRIPTS_DIR="$CURRENT_DIR/scripts"
-
-source "$SCRIPTS_DIR/helpers.sh"
-source "$SCRIPTS_DIR/variables.sh"
-source "$SCRIPTS_DIR/tree_helpers.sh"
-
-set_default_key_binding_options() {
-	local tree_command="$(tree_command)"
-	local tree_key="$(tree_key)"
-	local tree_focus_key="$(tree_focus_key)"
-	local tree_pager="$(tree_pager)"
-	local tree_position="$(tree_position)"
-	local tree_width="$(tree_width)"
-
-	set_tmux_option "${VAR_KEY_PREFIX}-${tree_key}" "$tree_command | ${tree_pager},${tree_position},${tree_width}"
-	set_tmux_option "${VAR_KEY_PREFIX}-${tree_focus_key}" "$tree_command | ${tree_pager},${tree_position},${tree_width},focus"
-}
-
-set_key_bindings() {
-	local stored_key_vars="$(stored_key_vars)"
-	local search_var
-	local key
-	local pattern
-	for option in $stored_key_vars; do
-		key="$(get_key_from_option_name "$option")"
-		value="$(get_value_from_option_name "$option")"
-		tmux bind-key "$key" run-shell "$SCRIPTS_DIR/toggle.sh '$value' '#{pane_id}'"
-	done
-}
-
-main() {
-	set_default_key_binding_options
-	set_key_bindings
-}
-main
diff --git a/tmux/plugins/tmux-yank/LICENSE.md b/tmux/plugins/tmux-yank/LICENSE.md
deleted file mode 100644
index a898835..0000000
--- a/tmux/plugins/tmux-yank/LICENSE.md
+++ /dev/null
@@ -1,20 +0,0 @@
-Copyright (C) 2014, 2017 Bruno Sutic
-Copyright (C) 2017 Christian Höltje
-
-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/tmux/plugins/tmux-yank/README.md b/tmux/plugins/tmux-yank/README.md
deleted file mode 100644
index b6d8916..0000000
--- a/tmux/plugins/tmux-yank/README.md
+++ /dev/null
@@ -1,288 +0,0 @@
-[![Build
-Status](https://travis-ci.org/tmux-plugins/tmux-yank.svg?branch=master)](https://travis-ci.org/tmux-plugins/tmux-yank)
-[![GitHub
-release](https://img.shields.io/github/release/tmux-plugins/tmux-yank.svg)](https://github.com/tmux-plugins/tmux-yank/releases)
-[![GitHub
-issues](https://img.shields.io/github/issues/tmux-plugins/tmux-yank.svg)](https://github.com/tmux-plugins/tmux-yank/issues)
-
-tmux-yank
-=========
-
-Copy to the system clipboard in [`tmux`](https://tmux.github.io/).
-
-Supports:
-
--   Linux
--   macOS
--   Cygwin
--   Windows Subsystem for Linux (WSL)
-
-Installing
-----------
-
-### Via TPM (recommended)
-
-The easiest way to install `tmux-yank` is via the [Tmux Plugin
-Manager](https://github.com/tmux-plugins/tpm).
-
-1.  Add plugin to the list of TPM plugins in `.tmux.conf`:
-
-    ``` tmux
-    set -g @plugin 'tmux-plugins/tmux-yank'
-    ```
-
-2.  Use <kbd>prefix</kbd>–<kbd>I</kbd> install `tmux-yank`. You should now
-    be able to `tmux-yank` immediately.
-3.  When you want to update `tmux-yank` use <kbd>prefix</kbd>–<kbd>U</kbd>.
-
-### Manual Installation
-
-1.  Clone the repository
-
-    ``` sh
-    $ git clone https://github.com/tmux-plugins/tmux-yank ~/clone/path
-    ```
-
-2.  Add this line to the bottom of `.tmux.conf`
-
-    ``` tmux
-    run-shell ~/clone/path/yank.tmux
-    ```
-
-3.  Reload the `tmux` environment
-
-    ``` sh
-    # type this inside tmux
-    $ tmux source-file ~/.tmux.conf
-    ```
-
-You should now be able to use `tmux-yank` immediately.
-
-Requirements
-------------
-
-In order for `tmux-yank` to work, there must be a program that store data in
-the system clipboard.
-
-### macOS
-
--   [`reattach-to-user-namespace`](https://github.com/ChrisJohnsen/tmux-MacOSX-pasteboard)
-
-**Note**: Some versions of macOS (aka OS X) have been reported to work
-without `reattach-to-user-namespace`. It doesn't hurt to have it installed.
-
--   OS X 10.8: Mountain Lion – *required*
--   OS X 10.9: Mavericks – *required*
--   OS X 10.10: Yosemite – *not required*
--   OS X 10.11: El Capitan – *not required*
--   macOS 10.12: Sierra – *required*
-
-The easiest way to use `reattach-to-user-namespace` with `tmux` is use to
-use the [`tmux-sensible`](https://github.com/tmux-plugins/tmux-sensible)
-plugin.
-
-To use it manually, use:
-
-``` tmux
-# ~/.tmux.conf
-set-option -g default-command "reattach-to-user-namespace -l $SHELL"
-```
-
-If you have `tmux` 1.5 or newer and are using
-[iTerm2](https://www.iterm2.com/) version 3 or newer then the <kbd>y</kbd>
-in `copy-mode` and mouse selection will work without `tmux-yank`.
-
-To enable this:
-
-1.  Go into iTerm2's preferences.
-2.  Go to the "General" tab.
-3.  Check "Applications in terminal may access clipboard"
-4.  In `tmux`, ensure `set-clipboard` is turned on:
-
-    ``` sh
-    $ tmux show-options -g -s set-clipboard
-    set-clipboard on
-    ```
-
-#### [HomeBrew](https://brew.sh/) (recommended)
-
-``` sh
-$ brew install reattach-to-user-namespace
-```
-
-#### MacPorts
-
-``` sh
-$ sudo port install tmux-pasteboard
-```
-
-### Linux
-
--   `xsel` (recommended) or `xclip` (for X).
--   `wl-copy` from [wl-clipboard](https://github.com/bugaevc/wl-clipboard) (for Wayland)
-
-If you have `tmux` 1.5 or newer and are using `xterm`, the <kbd>y</kbd> in
-`copy-mode` and mouse selection will work without `tmux-yank`. See the
-`tmux(1)` man page entry for the `set-clipboard` option.
-
-#### Debian & Ubuntu
-
-``` sh
-$ sudo apt-get install xsel # or xclip
-```
-
-#### RedHat & CentOS
-
-``` sh
-$ sudo yum install xsel # or xclip
-```
-
-### Cygwin
-
--   (*optional*) `putclip` which is part of the `cygutils-extra` package.
-
-### Windows Subsystem for Linux (WSL)
-
--   `clip.exe` is shipped with Windows Subsystem for Linux.
-
-Configuration
--------------
-
-### Key bindings
-
--   Normal Mode
-    -   <kbd>prefix</kbd>–<kbd>y</kbd> — copies text from the command line
-        to the clipboard.
-
-        Works with all popular shells/repls. Tested with:
-
-        -   shells: `bash`, `zsh` (with `bindkey -e`), `tcsh`
-        -   repls: `irb`, `pry`, `node`, `psql`, `python`, `php -a`,
-            `coffee`
-        -   remote shells: `ssh`, [mosh](http://mosh.mit.edu/)
-        -   vim/neovim command line (requires
-            [vim-husk](https://github.com/bruno-/vim-husk) or
-            [vim-rsi](https://github.com/tpope/vim-rsi) plugin)
-
-    -   <kbd>prefix</kbd>–<kbd>Y</kbd> — copy the current pane's current
-        working directory to the clipboard.
-
--   Copy Mode
-    -   <kbd>y</kbd> — copy selection to system clipboard.
-    -   <kbd>Y</kbd> (shift-y) — "put" selection. Equivalent to copying a
-        selection, and pasting it to the command line.
-
-
-### Default and Preferred Clipboard Programs
-
-tmux-yank does its best to detect a reasonable choice for a clipboard
-program on your OS.
-
-If tmux-yank can't detect a known clipboard program then it uses the
-`@custom_copy_command` tmux option as your clipboard program if set.
-
-If you need to always override tmux-yank's choice for a clipboard program,
-then you can set `@override_copy_command` to force tmux-yank to use whatever
-you want.
-
-Note that both programs _must_ accept `STDIN` for the text to be copied.
-
-An example of setting `@override_copy_command`:
-
-``` tmux
-# ~/.tmux.conf
-
-set -g @custom_copy_command 'my-clipboard-copy --some-arg'
-# or
-set -g @override_copy_command 'my-clipboard-copy --some-arg'
-```
-
-### Linux Clipboards
-
-Linux has several cut-and-paste clipboards: `primary`, `secondary`, and
-`clipboard` (default in tmux-yank is `clipboard`).
-
-You can change this by setting `@yank_selection`:
-
-``` tmux
-# ~/.tmux.conf
-
-set -g @yank_selection 'primary' # or 'secondary' or 'clipboard'
-```
-
-With mouse support turned on (see below) the default clipboard for mouse
-selections is `primary`.
-
-You can change this by setting `@yank_selection_mouse`:
-
-``` tmux
-# ~/.tmux.conf
-
-set -g @yank_selection_mouse 'clipboard' # or 'primary' or 'secondary'
-```
-
-### Controlling Yank Behavior
-
-By default, `tmux-yank` will exit copy mode after yanking text. If you wish to
-remain in copy mode, you can set `@yank_action`:
-
-``` tmux
-# ~/.tmux.conf
-
-set -g @yank_action 'copy-pipe' # or 'copy-pipe-and-cancel' for the default
-```
-
-### Mouse Support
-
-`tmux-yank` has mouse support enabled by default. It will only work if `tmux`'s
-built-in mouse support is also enabled (with `mouse on` since `tmux` 2.1, or
-`mode-mouse on` in older versions).
-
-To yank with the mouse, click and drag with the primary button to begin
-selection, and release to yank.
-
-If you would prefer to disable this behavior, or provide your own bindings for
-the `MouseDragEnd1Pane` event, you can do so with:
-
-``` tmux
-# ~/.tmux.conf
-
-set -g @yank_with_mouse off # or 'on'
-```
-
-If you want to remain in copy mode after making a mouse selection, set
-`@yank_action` as described above.
-
-### vi mode support
-
-If using `tmux` 2.3 or older *and* using vi keys then you'll have add the
-following configuration setting:
-
-``` tmux
-# ~/.tmux.conf
-
-set -g @shell_mode 'vi'
-```
-
-This isn't needed with `tmux` 2.4 or newer.
-
-### Screen-cast
-
-[![screencast
-screenshot](/video/screencast_img.png)](https://vimeo.com/102039099)
-
-**Note**: The screen-cast uses <kbd>Control</kbd>–<kbd>y</kbd> for
-"put selection". Use <kbd>Y</kbd> in `v2.0.0` and later.
-
-### Other tmux plugins
-
--   [tmux-copycat](https://github.com/tmux-plugins/tmux-copycat) - a plugin
-    for regular expression searches in tmux and fast match selection
--   [tmux-open](https://github.com/tmux-plugins/tmux-open) - a plugin for
-    quickly opening highlighted file or a URL
--   [tmux-continuum](https://github.com/tmux-plugins/tmux-continuum) -
-    automatic restoring and continuous saving of tmux environment.
-
-### License
-
-[MIT](LICENSE.md)
diff --git a/tmux/plugins/tmux-yank/scripts/copy_line.sh b/tmux/plugins/tmux-yank/scripts/copy_line.sh
deleted file mode 100755
index 20a70e1..0000000
--- a/tmux/plugins/tmux-yank/scripts/copy_line.sh
+++ /dev/null
@@ -1,111 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-HELPERS_DIR="$CURRENT_DIR"
-TMUX_COPY_MODE=""
-
-REMOTE_SHELL_WAIT_TIME="0.4"
-
-# shellcheck source=scripts/helpers.sh
-source "${HELPERS_DIR}/helpers.sh"
-
-# sets a TMUX_COPY_MODE that is used as a global variable
-get_tmux_copy_mode() {
-    TMUX_COPY_MODE="$(tmux show-option -gwv mode-keys)"
-}
-
-# The command when on ssh with latency. To make it work in this case too,
-# sleep is added.
-add_sleep_for_remote_shells() {
-    local pane_command
-    pane_command="$(tmux display-message -p '#{pane_current_command}')"
-    if [[ $pane_command =~ (ssh|mosh) ]]; then
-        sleep "$REMOTE_SHELL_WAIT_TIME"
-    fi
-}
-
-go_to_the_beginning_of_current_line() {
-    if [ "$(shell_mode)" == "emacs" ]; then
-        tmux send-key 'C-a'
-    else
-        tmux send-key 'Escape' '0'
-    fi
-}
-
-enter_tmux_copy_mode() {
-    tmux copy-mode
-}
-
-start_tmux_selection() {
-    if tmux_is_at_least 2.4; then
-        tmux send -X begin-selection
-    elif [ "$TMUX_COPY_MODE" == "vi" ]; then
-        # vi copy mode
-        tmux send-key 'Space'
-    else
-        # emacs copy mode
-        tmux send-key 'C-Space'
-    fi
-}
-
-# works when command spans accross multiple lines
-end_of_line_in_copy_mode() {
-    if tmux_is_at_least 2.4; then
-        tmux send -X -N 150 'cursor-down' # 'down' key. 'vi' mode is faster so we're
-        # jumping more lines than emacs.
-        tmux send -X 'end-of-line'   # End of line (just in case we are already at the last line).
-        tmux send -X 'previous-word' # Beginning of the previous word.
-        tmux send -X 'next-word-end' # End of next word.
-    elif [ "$TMUX_COPY_MODE" == "vi" ]; then
-        # vi copy mode
-        # This sequence of keys consistently selects multiple lines
-        tmux send-key '150' # Go to the bottom of scrollback buffer by using
-        tmux send-key 'j'   # 'down' key. 'vi' mode is faster so we're
-        # jumping more lines than emacs.
-        tmux send-key '$' # End of line (just in case we are already at the last line).
-        tmux send-key 'b' # Beginning of the previous word.
-        tmux send-key 'e' # End of next word.
-    else
-        # emacs copy mode
-        for ((c = 1; c <= '30'; c++)); do # go to the bottom of scrollback buffer
-            tmux send-key 'C-n'
-        done
-        tmux send-key 'C-e'
-        tmux send-key 'M-b'
-        tmux send-key 'M-f'
-    fi
-}
-
-yank_to_clipboard() {
-    if tmux_is_at_least 2.4; then
-        # shellcheck disable=SC2119
-        tmux send -X copy-pipe-and-cancel "$(clipboard_copy_command)"
-    else
-        tmux send-key "$(yank_wo_newline_key)"
-    fi
-}
-
-go_to_the_end_of_current_line() {
-    if [ "$(shell_mode)" == "emacs" ]; then
-        tmux send-keys 'C-e'
-    else
-        tmux send-keys '$' 'a'
-    fi
-}
-
-yank_current_line() {
-    go_to_the_beginning_of_current_line
-    add_sleep_for_remote_shells
-    enter_tmux_copy_mode
-    start_tmux_selection
-    end_of_line_in_copy_mode
-    yank_to_clipboard
-    go_to_the_end_of_current_line
-    display_message 'Line copied to clipboard!'
-}
-
-main() {
-    get_tmux_copy_mode
-    yank_current_line
-}
-main
diff --git a/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh b/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh
deleted file mode 100755
index 1db321f..0000000
--- a/tmux/plugins/tmux-yank/scripts/copy_pane_pwd.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-HELPERS_DIR="$CURRENT_DIR"
-
-# shellcheck source=scripts/helpers.sh
-source "${HELPERS_DIR}/helpers.sh"
-
-pane_current_path() {
-    tmux display -p -F "#{pane_current_path}"
-}
-
-display_notice() {
-    display_message 'PWD copied to clipboard!'
-}
-
-main() {
-    local copy_command
-    local payload
-    # shellcheck disable=SC2119
-    copy_command="$(clipboard_copy_command)"
-    payload="$(pane_current_path | tr -d '\n')"
-    # $copy_command below should not be quoted
-    echo "$payload" | $copy_command
-    tmux set-buffer "$payload"
-    display_notice
-}
-main
diff --git a/tmux/plugins/tmux-yank/scripts/helpers.sh b/tmux/plugins/tmux-yank/scripts/helpers.sh
deleted file mode 100644
index 66beeec..0000000
--- a/tmux/plugins/tmux-yank/scripts/helpers.sh
+++ /dev/null
@@ -1,208 +0,0 @@
-#!bash
-# shellcheck disable=SC2239
-
-yank_line="y"
-yank_line_option="@yank_line"
-
-yank_pane_pwd="Y"
-yank_pane_pwd_option="@yank_pane_pwd"
-
-yank_default="y"
-yank_option="@copy_mode_yank"
-
-put_default="Y"
-put_option="@copy_mode_put"
-
-yank_put_default="M-y"
-yank_put_option="@copy_mode_yank_put"
-
-yank_wo_newline_default="!"
-yank_wo_newline_option="@copy_mode_yank_wo_newline"
-
-yank_selection_default="clipboard"
-yank_selection_option="@yank_selection"
-
-yank_selection_mouse_default="primary"
-yank_selection_mouse_option="@yank_selection_mouse"
-
-yank_with_mouse_default="on"
-yank_with_mouse_option="@yank_with_mouse"
-
-yank_action_default="copy-pipe-and-cancel"
-yank_action_option="@yank_action"
-
-shell_mode_default="emacs"
-shell_mode_option="@shell_mode"
-
-custom_copy_command_default=""
-custom_copy_command_option="@custom_copy_command"
-
-override_copy_command_default=""
-override_copy_command_option="@override_copy_command"
-
-# helper functions
-get_tmux_option() {
-    local option="$1"
-    local default_value="$2"
-    local option_value
-    option_value=$(tmux show-option -gqv "$option")
-    if [ -z "$option_value" ]; then
-        echo "$default_value"
-    else
-        echo "$option_value"
-    fi
-}
-
-yank_line_key() {
-    get_tmux_option "$yank_line_option" "$yank_line"
-}
-
-yank_pane_pwd_key() {
-    get_tmux_option "$yank_pane_pwd_option" "$yank_pane_pwd"
-}
-
-yank_key() {
-    get_tmux_option "$yank_option" "$yank_default"
-}
-
-put_key() {
-    get_tmux_option "$put_option" "$put_default"
-}
-
-yank_put_key() {
-    get_tmux_option "$yank_put_option" "$yank_put_default"
-}
-
-yank_wo_newline_key() {
-    get_tmux_option "$yank_wo_newline_option" "$yank_wo_newline_default"
-}
-
-yank_selection() {
-    get_tmux_option "$yank_selection_option" "$yank_selection_default"
-}
-
-yank_selection_mouse() {
-    get_tmux_option "$yank_selection_mouse_option" "$yank_selection_mouse_default"
-}
-
-yank_with_mouse() {
-    get_tmux_option "$yank_with_mouse_option" "$yank_with_mouse_default"
-}
-
-yank_action() {
-    get_tmux_option "$yank_action_option" "$yank_action_default"
-}
-
-shell_mode() {
-    get_tmux_option "$shell_mode_option" "$shell_mode_default"
-}
-
-custom_copy_command() {
-    get_tmux_option "$custom_copy_command_option" "$custom_copy_command_default"
-}
-
-override_copy_command() {
-    get_tmux_option "$override_copy_command_option" "$override_copy_command_default"
-}
-# Ensures a message is displayed for 5 seconds in tmux prompt.
-# Does not override the 'display-time' tmux option.
-display_message() {
-    local message="$1"
-
-    # display_duration defaults to 5 seconds, if not passed as an argument
-    if [ "$#" -eq 2 ]; then
-        local display_duration="$2"
-    else
-        local display_duration="5000"
-    fi
-
-    # saves user-set 'display-time' option
-    local saved_display_time
-    saved_display_time=$(get_tmux_option "display-time" "750")
-
-    # sets message display time to 5 seconds
-    tmux set-option -gq display-time "$display_duration"
-
-    # displays message
-    tmux display-message "$message"
-
-    # restores original 'display-time' value
-    tmux set-option -gq display-time "$saved_display_time"
-}
-
-command_exists() {
-    local command="$1"
-    type "$command" >/dev/null 2>&1
-}
-
-clipboard_copy_command() {
-    local mouse="${1:-false}"
-    # installing reattach-to-user-namespace is recommended on OS X
-    if [ -n "$(override_copy_command)" ]; then
-        override_copy_command
-    elif command_exists "pbcopy"; then
-        if command_exists "reattach-to-user-namespace"; then
-            echo "reattach-to-user-namespace pbcopy"
-        else
-            echo "pbcopy"
-        fi
-    elif command_exists "clip.exe"; then # WSL clipboard command
-        echo "cat | clip.exe"
-    elif command_exists "wl-copy"; then # wl-clipboard: Wayland clipboard utilities
-        echo "wl-copy"
-    elif command_exists "xsel"; then
-        local xsel_selection
-        if [[ $mouse == "true" ]]; then
-            xsel_selection="$(yank_selection_mouse)"
-        else
-            xsel_selection="$(yank_selection)"
-        fi
-        echo "xsel -i --$xsel_selection"
-    elif command_exists "xclip"; then
-        local xclip_selection
-        if [[ $mouse == "true" ]]; then
-            xclip_selection="$(yank_selection_mouse)"
-        else
-            xclip_selection="$(yank_selection)"
-        fi
-        echo "xclip -selection $xclip_selection"
-    elif command_exists "putclip"; then # cygwin clipboard command
-        echo "putclip"
-    elif [ -n "$(custom_copy_command)" ]; then
-        custom_copy_command
-    fi
-}
-
-# Cache the TMUX version for speed.
-tmux_version="$(tmux -V | cut -d ' ' -f 2 | sed 's/next-//')"
-
-tmux_is_at_least() {
-    if [[ $tmux_version == "$1" ]] || [[ $tmux_version == master ]]; then
-        return 0
-    fi
-
-    local i
-    local -a current_version wanted_version
-    IFS='.' read -ra current_version <<<"$tmux_version"
-    IFS='.' read -ra wanted_version <<<"$1"
-
-    # fill empty fields in current_version with zeros
-    for ((i = ${#current_version[@]}; i < ${#wanted_version[@]}; i++)); do
-        current_version[i]=0
-    done
-
-    # fill empty fields in wanted_version with zeros
-    for ((i = ${#wanted_version[@]}; i < ${#current_version[@]}; i++)); do
-        wanted_version[i]=0
-    done
-
-    for ((i = 0; i < ${#current_version[@]}; i++)); do
-        if ((10#${current_version[i]} < 10#${wanted_version[i]})); then
-            return 1
-        fi
-        if ((10#${current_version[i]} > 10#${wanted_version[i]})); then
-            return 0
-        fi
-    done
-    return 0
-}
diff --git a/tmux/plugins/tmux-yank/yank.tmux b/tmux/plugins/tmux-yank/yank.tmux
deleted file mode 100755
index 3ca43c5..0000000
--- a/tmux/plugins/tmux-yank/yank.tmux
+++ /dev/null
@@ -1,92 +0,0 @@
-#!/usr/bin/env bash
-
-CURRENT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
-SCRIPTS_DIR="${CURRENT_DIR}/scripts"
-HELPERS_DIR="${CURRENT_DIR}/scripts"
-
-# shellcheck source=scripts/helpers.sh
-source "${HELPERS_DIR}/helpers.sh"
-
-clipboard_copy_without_newline_command() {
-    local copy_command="$1"
-    printf "tr -d '\\n' | %s" "$copy_command"
-}
-
-set_error_bindings() {
-    local key_bindings key
-    key_bindings="$(yank_key) $(put_key) $(yank_put_key)"
-    for key in $key_bindings; do
-        if tmux_is_at_least 2.4; then
-            tmux bind-key -T copy-mode-vi "$key" send-keys -X copy-pipe-and-cancel "tmux display-message 'Error! tmux-yank dependencies not installed!'"
-            tmux bind-key -T copy-mode "$key" send-keys -X copy-pipe-and-cancel "tmux display-message 'Error! tmux-yank dependencies not installed!'"
-        else
-            tmux bind-key -t vi-copy "$key" copy-pipe "tmux display-message 'Error! tmux-yank dependencies not installed!'"
-            tmux bind-key -t emacs-copy "$key" copy-pipe "tmux display-message 'Error! tmux-yank dependencies not installed!'"
-        fi
-    done
-}
-
-error_handling_if_command_not_present() {
-    local copy_command="$1"
-    if [ -z "$copy_command" ]; then
-        set_error_bindings
-        exit 0
-    fi
-}
-
-# `yank_without_newline` binding isn't intended to be used by the user. It is
-# a helper for `copy_line` command.
-set_copy_mode_bindings() {
-    local copy_command="$1"
-    local copy_wo_newline_command
-    copy_wo_newline_command="$(clipboard_copy_without_newline_command "$copy_command")"
-    local copy_command_mouse
-    copy_command_mouse="$(clipboard_copy_command "true")"
-    if tmux_is_at_least 2.4; then
-        tmux bind-key -T copy-mode-vi "$(yank_key)" send-keys -X "$(yank_action)" "$copy_command"
-        tmux bind-key -T copy-mode-vi "$(put_key)" send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
-        tmux bind-key -T copy-mode-vi "$(yank_put_key)" send-keys -X copy-pipe-and-cancel "$copy_command; tmux paste-buffer"
-        tmux bind-key -T copy-mode-vi "$(yank_wo_newline_key)" send-keys -X "$(yank_action)" "$copy_wo_newline_command"
-        if [[ "$(yank_with_mouse)" == "on" ]]; then
-            tmux bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X "$(yank_action)" "$copy_command_mouse"
-        fi
-
-        tmux bind-key -T copy-mode "$(yank_key)" send-keys -X "$(yank_action)" "$copy_command"
-        tmux bind-key -T copy-mode "$(put_key)" send-keys -X copy-pipe-and-cancel "tmux paste-buffer"
-        tmux bind-key -T copy-mode "$(yank_put_key)" send-keys -X copy-pipe-and-cancel "$copy_command; tmux paste-buffer"
-        tmux bind-key -T copy-mode "$(yank_wo_newline_key)" send-keys -X "$(yank_action)" "$copy_wo_newline_command"
-        if [[ "$(yank_with_mouse)" == "on" ]]; then
-            tmux bind-key -T copy-mode MouseDragEnd1Pane send-keys -X "$(yank_action)" "$copy_command_mouse"
-        fi
-    else
-        tmux bind-key -t vi-copy "$(yank_key)" copy-pipe "$copy_command"
-        tmux bind-key -t vi-copy "$(put_key)" copy-pipe "tmux paste-buffer"
-        tmux bind-key -t vi-copy "$(yank_put_key)" copy-pipe "$copy_command; tmux paste-buffer"
-        tmux bind-key -t vi-copy "$(yank_wo_newline_key)" copy-pipe "$copy_wo_newline_command"
-        if [[ "$(yank_with_mouse)" == "on" ]]; then
-            tmux bind-key -t vi-copy MouseDragEnd1Pane copy-pipe "$copy_command_mouse"
-        fi
-
-        tmux bind-key -t emacs-copy "$(yank_key)" copy-pipe "$copy_command"
-        tmux bind-key -t emacs-copy "$(put_key)" copy-pipe "tmux paste-buffer"
-        tmux bind-key -t emacs-copy "$(yank_put_key)" copy-pipe "$copy_command; tmux paste-buffer"
-        tmux bind-key -t emacs-copy "$(yank_wo_newline_key)" copy-pipe "$copy_wo_newline_command"
-        if [[ "$(yank_with_mouse)" == "on" ]]; then
-            tmux bind-key -t emacs-copy MouseDragEnd1Pane copy-pipe "$copy_command_mouse"
-        fi
-    fi
-}
-
-set_normal_bindings() {
-    tmux bind-key "$(yank_line_key)" run-shell -b "$SCRIPTS_DIR/copy_line.sh"
-    tmux bind-key "$(yank_pane_pwd_key)" run-shell -b "$SCRIPTS_DIR/copy_pane_pwd.sh"
-}
-
-main() {
-    local copy_command
-    copy_command="$(clipboard_copy_command)"
-    error_handling_if_command_not_present "$copy_command"
-    set_copy_mode_bindings "$copy_command"
-    set_normal_bindings
-}
-main
diff --git a/tmux/tmux.conf b/tmux/tmux.conf
index aa1b106..d8ffa80 100644
--- a/tmux/tmux.conf
+++ b/tmux/tmux.conf
@@ -17,7 +17,7 @@ setw -g aggressive-resize on
 unbind C-b
 set -g prefix C-a
 
-# Set parent terminal title to reflect current window in tmux session 
+# Set parent terminal title to reflect current window in tmux session
 set -g set-titles on
 set -g set-titles-string "#I:#W"
 
@@ -28,6 +28,7 @@ setw -g pane-base-index 1
 # Enable mouse support
 set -g mouse on
 
+
 # ==========================
 # ===   Key bindings     ===
 # ==========================
@@ -37,10 +38,10 @@ unbind "\$" # rename-session
 unbind ,    # rename-window
 unbind %    # split-window -h
 unbind '"'  # split-window
-unbind '}'  # swap-pane -D
-unbind '{'  # swap-pane -U
+unbind '}'    # swap-pane -D
+unbind '{'    # swap-pane -U
 unbind [    # paste-buffer
-unbind ]    
+unbind ]
 unbind "'"  # select-window
 unbind n    # next-window
 unbind p    # previous-window
@@ -49,17 +50,19 @@ unbind M-n  # next window with alert
 unbind M-p  # next window with alert
 unbind o    # focus thru panes
 unbind &    # kill-window
-unbind "#"  # list-buffer 
+unbind "#"  # list-buffer
 unbind =    # choose-buffer
+unbind z    # zoom-pane
 unbind M-Up  # resize 5 rows up
 unbind M-Down # resize 5 rows down
 unbind M-Right # resize 5 rows right
 unbind M-Left # resize 5 rows left
 
+
 # Edit configuration and reload
 bind C-e new-window -n 'tmux.conf' "sh -c '\${EDITOR:-vim} ~/.tmux.conf && tmux source ~/.tmux.conf && tmux display \"Config reloaded\"'"
 
-# Reload tmux configuration 
+# Reload tmux configuration
 bind C-w source-file ~/.tmux.conf \; display "Config reloaded"
 
 # New window and retain cwd
@@ -84,6 +87,9 @@ bind -r ] select-pane -t :.+
 bind -r Tab last-window   # cycle thru MRU tabs
 bind -r C-o swap-pane -D
 
+# Zoom pane
+bind + resize-pane -Z
+
 # Link window
 bind L command-prompt -p "Link window from (session:window): " "link-window -s %% -a"
 
@@ -305,6 +311,18 @@ bind '$' run "~/.dots/tmux/utils/renew_env.sh"
 # ===       Plugins        ===
 # ============================
 
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-battery'
+set -g @plugin 'tmux-plugins/tmux-prefix-highlight'
+set -g @plugin 'tmux-plugins/tmux-online-status'
+set -g @plugin 'tmux-plugins/tmux-sidebar'
+set -g @plugin 'tmux-plugins/tmux-copycat'
+set -g @plugin 'tmux-plugins/tmux-open'
+set -g @plugin 'samoshkin/tmux-plugin-sysstat'
+set -g @plugin 'tmux-plugins/tmux-yank'
+set -g @plugin 'tmux-plugins/tmux-ressurect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
+
 # Plugin properties
 set -g @sidebar-tree 't'
 set -g @sidebar-tree-focus 'T'
@@ -314,10 +332,6 @@ set -g @continuum-restore 'on'
 
 set -g @open-S 'https://www.google.com/search?q='
 
-# tmux-yank
-#set -g @custom_copy_command 'xsel' # xclip or something else
-#set -g @yank_action 'copy-pipe' # or 'copy-pipe-and-cancel' for the default
-
 # ==============================================
 # ===   Nesting local and remote sessions     ===
 # ==============================================
@@ -341,7 +355,7 @@ bind -T root F12  \
   if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\
   refresh-client -S \;\
 
-bind -T off F12 \
+bind -T off F12\
   set -u prefix \;\
   set -u key-table \;\
   set -u status-style \;\
@@ -349,16 +363,22 @@ bind -T off F12 \
   set -u window-status-current-format \;\
   refresh-client -S
 
-# Run all plugins' scripts
-run '~/.dots/tmux/plugins/tmux-battery/battery.tmux'
-run '~/.dots/tmux/plugins/tmux-online-status/online_status.tmux'
-run '~/.dots/tmux/plugins/tmux-plugin-sysstat/sysstat.tmux'
-run '~/.dots/tmux/plugins/tmux-prefix-highlight/prefix_highlight.tmux'
-run '~/.dots/tmux/plugins/tmux-copycat/copycat.tmux'
-run '~/.dots/tmux/plugins/tmux-open/open.tmux'
-run '~/.dots/tmux/plugins/tmux-sidebar/sidebar.tmux'
-run '~/.dots/tmux/plugins/tmux-yank/yank.tmux'
+bind -T root C-q  \
+  set prefix None \;\
+  set key-table off \;\
+  set status-style "fg=$color_status_text,bg=$color_window_off_status_bg" \;\
+  set window-status-current-format "#[fg=$color_window_off_status_bg,bg=$color_window_off_status_current_bg]$separator_powerline_right#[default] #I:#W# #[fg=$color_window_off_status_current_bg,bg=$color_window_off_status_bg]$separator_powerline_right#[default]" \;\
+  set window-status-current-style "fg=$color_dark,bold,bg=$color_window_off_status_current_bg" \;\
+  if -F '#{pane_in_mode}' 'send-keys -X cancel' \;\
+  refresh-client -S \;\
 
-run '~/.dots/tmux/plugins/tmux-ressurect/resurrect.tmux'
-run '~/.dots/tmux/plugins/tmux-continuum/continuum.tmux'
+bind -T off C-q \
+  set -u prefix \;\
+  set -u key-table \;\
+  set -u status-style \;\
+  set -u window-status-current-style \;\
+  set -u window-status-current-format \;\
+  refresh-client -S
 
+# Initialize TPM (must be last)
+run '~/.tmux/plugins/tpm/tpm'
diff --git a/zsh/.devcontainer/devcontainer.json b/zsh/.devcontainer/devcontainer.json
new file mode 100644
index 0000000..d3ad1a3
--- /dev/null
+++ b/zsh/.devcontainer/devcontainer.json
@@ -0,0 +1,20 @@
+{
+	"image": "mcr.microsoft.com/devcontainers/base:noble",
+	"features": {
+		"ghcr.io/devcontainers/features/common-utils": {
+			"installZsh": true,
+			"configureZshAsDefaultShell": true,
+			"username": "vscode",
+			"userUid": 1000,
+			"userGid": 1000
+		}
+	},
+	"postCreateCommand": "dir=/workspaces/ohmyzsh; rm -rf $HOME/.oh-my-zsh && ln -s $dir $HOME/.oh-my-zsh && cp $dir/templates/minimal.zshrc $HOME/.zshrc && chgrp -R 1000 $dir && chmod g-w,o-w $dir",
+	"customizations": {
+		"codespaces": {
+			"openFiles": [
+				"README.md"
+			]
+		}
+	}
+}
diff --git a/zsh/.editorconfig b/zsh/.editorconfig
index b5321de..797fb62 100644
--- a/zsh/.editorconfig
+++ b/zsh/.editorconfig
@@ -6,3 +6,10 @@ insert_final_newline = true
 charset = utf-8
 indent_size = 2
 indent_style = space
+
+[*.py]
+indent_size = 4
+
+[devcontainer.json]
+indent_size = 4
+indent_style = tab
diff --git a/zsh/.github/CODEOWNERS b/zsh/.github/CODEOWNERS
index c6b3e8c..17e8b43 100644
--- a/zsh/.github/CODEOWNERS
+++ b/zsh/.github/CODEOWNERS
@@ -1,12 +1,19 @@
 # Plugin owners
 plugins/archlinux/                  @ratijas
-plugins/aws/                        @maksyms
+plugins/dbt/                        @msempere
+plugins/eza/                        @pepoluan
 plugins/genpass/                    @atoponce
 plugins/git-lfs/                    @hellovietduc
 plugins/gitfast/                    @felipec
+plugins/kube-ps1/                   @mcornella
+plugins/kubectl/                    @mcornella
+plugins/kubectx/                    @mcornella
+plugins/opentofu/                   @mcornella
 plugins/react-native                @esthor
 plugins/sdk/                        @rgoldberg
 plugins/shell-proxy/                @septs
+plugins/starship/                   @axieax
+plugins/terraform/                  @mcornella
 plugins/universalarchive/           @Konfekt
 plugins/wp-cli/                     @joshmedeski
 plugins/zoxide/                     @ajeetdsouza
diff --git a/zsh/.github/FUNDING.yml b/zsh/.github/FUNDING.yml
index 6c86ac4..e91717d 100644
--- a/zsh/.github/FUNDING.yml
+++ b/zsh/.github/FUNDING.yml
@@ -1,2 +1,6 @@
-github: [ohmyzsh, robbyrussell, mcornella, larson-carter, carlosala]
+github: 
+  - ohmyzsh
+  - robbyrussell
+  - mcornella
+  - carlosala
 open_collective: ohmyzsh
diff --git a/zsh/.github/INCIDENT_RESPONSE_PLAN.md b/zsh/.github/INCIDENT_RESPONSE_PLAN.md
new file mode 100644
index 0000000..3f0b493
--- /dev/null
+++ b/zsh/.github/INCIDENT_RESPONSE_PLAN.md
@@ -0,0 +1,87 @@
+# Incident Response Plan
+
+## Reporting a Vulnerability
+
+Please see [the latest guidelines](https://github.com/ohmyzsh/ohmyzsh/blob/master/SECURITY.md) for instructions.
+
+## Phases
+
+### Triage
+
+1. Is this a valid security vulnerability?
+
+  - [ ] It affects our CI/CD or any of our repositories.
+    - [ ] For ohmyzsh/ohmyzsh, it affects the latest commit.
+    - [ ] For others, it affects the latest commit on the default branch.
+  - [ ] It affects a third-party dependency:
+    - [ ] Zsh or git
+    - [ ] For a plugin, the vulnerability is a result of our usage of the dependency.
+
+2. What's the scope of the vulnerability?
+
+  - [ ] Our codebase.
+  - [ ] A direct third-party dependency (Zsh, git, other plugins).
+  - [ ] An indirect third-party dependency.
+  - [ ] Out of scope, a third-party dependency that is the responsibility of the user.
+  - [ ] Out of scope, any other case (edit this plan and add the details).
+
+3. Is the vulnerability actionable?
+
+  - [ ] Yes, we can submit a fix.
+  - [ ] Yes, we can disable a feature.
+  - [ ] Yes, we can mitigate the risk.
+  - [ ] Yes, we can remove a vulnerable dependency.
+  - [ ] Yes, we can apply a workaround.
+  - [ ] Yes, we can apply a patch to a vulnerable dependency ([example for CVE-2021-45444](https://github.com/ohmyzsh/ohmyzsh/blob/cb72d7dcbf08b435c7f8a6470802b207b2aa02c3/lib/vcs_info.zsh)).
+  - [ ] No, the vulnerability is not actionable.
+
+4. What's the impact of the vulnerability?
+
+  Assess using the *CIA* triad:
+
+  - **Confidentiality**: example: report or sharing of secrets.
+  - **Integrity**: affects the integrity of the system (deletion, corruption or encryption of data, OS file corruption, etc.).
+  - **Availability**: denial of login, deletion of required files to boot / login, etc.
+
+5. What's the exploitability of the vulnerability?
+
+  Consider how easy it is to exploit, and if it affects all users or requires specific configurations.
+
+6. What's the severity of the vulnerability?
+
+  You can use the [CVSS v3.1](https://www.first.org/cvss/specification-document) to assess the severity of the vulnerability.
+
+7. When was the vulnerability introduced?
+
+  - Find the responsible code path.
+  - Find the commit or Pull Request that introduced the vulnerability.
+
+8. Who are our security contacts?
+
+  Assess upstream or downstream contacts, and their desired channels of security.
+
+  > TODO: add a list of contacts.
+
+### Mitigation
+
+- **Primary focus:** removing possibility of exploitation fast.
+- **Secondary focus:** addressing the root cause.
+
+> [!IMPORTANT]
+> Make sure to test that the mitigation works as expected, and does not introduce new vulnerabilities.
+> When deploying a patch, make sure not to disclose the vulnerability in the commit message or PR description.
+
+> TODO: introduce a fast-track update process for security patches.
+
+### Disclosure
+
+Primary goal: inform our users about the vulnerability, and whether they are affected or not affected based on information they should be able to check themselves in a straightforward way.
+
+> TODO: add a vulnerability disclosure template.
+
+### Learn
+
+- Document the vulnerability, steps performed, and lessons learned.
+- Document the timeline of events.
+- Document and address improvements on the Security Incident Response Plan.
+- Depending on the severity of the vulnerability, consider disclosing the root cause or not based on likely impact on users and estimated potential victims still affected.
diff --git a/zsh/.github/PULL_REQUEST_TEMPLATE.md b/zsh/.github/PULL_REQUEST_TEMPLATE.md
index 5c94cae..4d4b784 100644
--- a/zsh/.github/PULL_REQUEST_TEMPLATE.md
+++ b/zsh/.github/PULL_REQUEST_TEMPLATE.md
@@ -7,6 +7,7 @@
 - [ ] I have read the contribution guide and followed all the instructions.
 - [ ] The code follows the code style guide detailed in the wiki.
 - [ ] The code is mine or it's from somewhere with an MIT-compatible license.
+- [ ] If I used AI tools (ChatGPT, Claude, Gemini, etc.) to assist with this contribution, I've disclosed it below.
 - [ ] The code is efficient, to the best of my ability, and does not waste computer resources.
 - [ ] The code is stable and I have tested it myself, to the best of my abilities.
 - [ ] If the code introduces new aliases, I provide a valid use case for all plugin users down below.
diff --git a/zsh/.github/dependabot.yml b/zsh/.github/dependabot.yml
new file mode 100644
index 0000000..ebdb804
--- /dev/null
+++ b/zsh/.github/dependabot.yml
@@ -0,0 +1,14 @@
+version: 2
+updates:
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    labels: []
+  - package-ecosystem: "pip"
+    directory: "/.github/workflows/dependencies"
+    schedule:
+      interval: "weekly"
+      day: "sunday"
+    labels: []
diff --git a/zsh/.github/dependencies.yml b/zsh/.github/dependencies.yml
new file mode 100644
index 0000000..4f4fef9
--- /dev/null
+++ b/zsh/.github/dependencies.yml
@@ -0,0 +1,56 @@
+dependencies:
+  plugins/gitfast:
+    repo: felipec/git-completion
+    branch: master
+    version: tag:v2.2
+    postcopy: |
+      set -e
+      rm -rf git-completion.plugin.zsh Makefile t tools
+      mv README.adoc MANUAL.adoc
+      mv -f src/* .
+      rmdir src
+  plugins/gradle:
+    repo: gradle/gradle-completion
+    branch: master
+    version: dd3a8adb47e51b1f6e4dc180cb04bd02d5fccd4a
+    precopy: |
+      set -e
+      find . ! -name _gradle ! -name LICENSE -delete
+  plugins/history-substring-search:
+    repo: zsh-users/zsh-history-substring-search
+    branch: master
+    version: 14c8d2e0ffaee98f2df9850b19944f32546fdea5
+    precopy: |
+      set -e
+      rm -f zsh-history-substring-search.plugin.zsh
+      test -e zsh-history-substring-search.zsh && mv zsh-history-substring-search.zsh history-substring-search.zsh
+    postcopy: |
+      set -e
+      test -e dependencies/OMZ-README.md && cat dependencies/OMZ-README.md >> README.md
+  plugins/kube-ps1:
+    repo: jonmosco/kube-ps1
+    branch: master
+    version: 9b41c091d5dd4a99e58cf58b5d98a4847937b1bb
+    precopy: |
+      set -e
+      find . ! -name kube-ps1.sh ! -name LICENSE ! -name README.md -delete
+      test -e kube-ps1.sh && mv kube-ps1.sh kube-ps1.plugin.zsh
+  plugins/wd:
+    repo: mfaerevaag/wd
+    branch: master
+    version: tag:v0.10.1
+    precopy: |
+      set -e
+      rm -r test
+      rm install.sh tty.gif wd.1
+  plugins/z:
+    branch: master
+    repo: agkozak/zsh-z
+    version: cf9225feebfae55e557e103e95ce20eca5eff270
+    precopy: |
+      set -e
+      test -e README.md && mv -f README.md MANUAL.md
+    postcopy: |
+      set -e
+      test -e _zshz && mv -f _zshz _z
+      test -e zsh-z.plugin.zsh && mv -f zsh-z.plugin.zsh z.plugin.zsh
diff --git a/zsh/.github/workflows/dependencies.yml b/zsh/.github/workflows/dependencies.yml
new file mode 100644
index 0000000..8053b7a
--- /dev/null
+++ b/zsh/.github/workflows/dependencies.yml
@@ -0,0 +1,43 @@
+name: Update dependencies
+on:
+  workflow_dispatch: {}
+  schedule:
+    - cron: "0 6 * * 0"
+
+jobs:
+  check:
+    name: Check for updates
+    runs-on: ubuntu-latest
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    permissions:
+      contents: write # this is needed to push commits and branches
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
+        with:
+          egress-policy: audit
+
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          fetch-depth: 0
+      - name: Authenticate as @ohmyzsh
+        id: generate-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.OHMYZSH_APP_ID }}
+          private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
+      - name: Setup Python
+        uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
+        with:
+          python-version: "3.12"
+          cache: "pip"
+      - name: Process dependencies
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+          GIT_APP_NAME: ohmyzsh[bot]
+          GIT_APP_EMAIL: 54982679+ohmyzsh[bot]@users.noreply.github.com
+          TMP_DIR: ${{ runner.temp }}
+        run: |
+          pip install -r .github/workflows/dependencies/requirements.txt
+          python3 .github/workflows/dependencies/updater.py
diff --git a/zsh/.github/workflows/dependencies/.gitignore b/zsh/.github/workflows/dependencies/.gitignore
new file mode 100644
index 0000000..1d17dae
--- /dev/null
+++ b/zsh/.github/workflows/dependencies/.gitignore
@@ -0,0 +1 @@
+.venv
diff --git a/zsh/.github/workflows/dependencies/requirements.txt b/zsh/.github/workflows/dependencies/requirements.txt
new file mode 100644
index 0000000..359cee6
--- /dev/null
+++ b/zsh/.github/workflows/dependencies/requirements.txt
@@ -0,0 +1,7 @@
+certifi==2026.2.25
+charset-normalizer==3.4.6
+idna==3.11
+PyYAML==6.0.3
+requests==2.33.0
+semver==3.0.4
+urllib3==2.6.3
diff --git a/zsh/.github/workflows/dependencies/updater.py b/zsh/.github/workflows/dependencies/updater.py
new file mode 100644
index 0000000..b61e585
--- /dev/null
+++ b/zsh/.github/workflows/dependencies/updater.py
@@ -0,0 +1,619 @@
+import json
+import os
+import re
+import shutil
+import subprocess
+import sys
+import timeit
+from copy import deepcopy
+from typing import Literal, NotRequired, Optional, TypedDict
+
+import requests
+import yaml
+from semver import Version
+
+# Get TMP_DIR variable from environment
+TMP_DIR = os.path.join(os.environ.get("TMP_DIR", "/tmp"), "ohmyzsh")
+# Relative path to dependencies.yml file
+DEPS_YAML_FILE = ".github/dependencies.yml"
+# Dry run flag
+DRY_RUN = os.environ.get("DRY_RUN", "0") == "1"
+# GitHub Token is needed to avoid rate limiting
+GH_TOKEN = os.environ.get("GH_TOKEN")
+HEADERS = {
+    "Accept": "application/vnd.github+json",
+}
+if GH_TOKEN:
+    HEADERS["Authorization"] = f"Bearer {GH_TOKEN}"
+
+# utils for tag comparison
+BASEVERSION = re.compile(
+    r"""[vV]?
+    (?P<major>(0|[1-9])\d*)
+    (\.
+    (?P<minor>(0|[1-9])\d*)
+    (\.
+    (?P<patch>(0|[1-9])\d*)
+    )?
+    )?
+    """,
+    re.VERBOSE,
+)
+
+
+def coerce(version: str) -> Optional[Version]:
+    match = BASEVERSION.search(version)
+    if not match:
+        return None
+
+    # BASEVERSION looks for `MAJOR.minor.patch` in the string given
+    # it fills with None if any of them is missing (for example `2.1`)
+    ver = {
+        key: 0 if value is None else value for key, value in match.groupdict().items()
+    }
+    # Version takes `major`, `minor`, `patch` arguments
+    ver = Version(**ver)  # pyright: ignore[reportArgumentType]
+    return ver
+
+
+class CodeTimer:
+    def __init__(self, name=None):
+        self.name = " '" + name + "'" if name else ""
+
+    def __enter__(self):
+        self.start = timeit.default_timer()
+
+    def __exit__(self, exc_type, exc_value, traceback):
+        self.took = (timeit.default_timer() - self.start) * 1000.0
+        print("Code block" + self.name + " took: " + str(self.took) + " ms")
+
+
+### YAML representation
+def str_presenter(dumper, data):
+    """
+    Configures yaml for dumping multiline strings
+    Ref: https://stackoverflow.com/a/33300001
+    """
+    if len(data.splitlines()) > 1:  # check for multiline string
+        return dumper.represent_scalar("tag:yaml.org,2002:str", data, style="|")
+    return dumper.represent_scalar("tag:yaml.org,2002:str", data)
+
+
+yaml.add_representer(str, str_presenter)
+yaml.representer.SafeRepresenter.add_representer(str, str_presenter)
+
+
+# Types
+class DependencyDict(TypedDict):
+    repo: str
+    branch: str
+    version: str
+    precopy: NotRequired[str]
+    postcopy: NotRequired[str]
+
+
+class DependencyYAML(TypedDict):
+    dependencies: dict[str, DependencyDict]
+
+
+class UpdateStatusFalse(TypedDict):
+    has_updates: Literal[False]
+
+
+class UpdateStatusTrue(TypedDict):
+    has_updates: Literal[True]
+    version: str
+    compare_url: str
+    head_ref: str
+    head_url: str
+
+
+class CommandRunner:
+    class Exception(Exception):
+        def __init__(self, message, returncode, stage, stdout, stderr):
+            super().__init__(message)
+            self.returncode = returncode
+            self.stage = stage
+            self.stdout = stdout
+            self.stderr = stderr
+
+    @staticmethod
+    def run_or_fail(command: list[str], stage: str, *args, **kwargs):
+        if DRY_RUN and command[0] == "gh":
+            command.insert(0, "echo")
+
+        result = subprocess.run(command, *args, capture_output=True, **kwargs)
+
+        if result.returncode != 0:
+            raise CommandRunner.Exception(
+                f"{stage} command failed with exit code {result.returncode}",
+                returncode=result.returncode,
+                stage=stage,
+                stdout=result.stdout.decode("utf-8"),
+                stderr=result.stderr.decode("utf-8"),
+            )
+
+        return result
+
+
+class DependencyStore:
+    store: DependencyYAML = {"dependencies": {}}
+
+    @staticmethod
+    def set(data: DependencyYAML):
+        DependencyStore.store = data
+
+    @staticmethod
+    def update_dependency_version(path: str, version: str) -> DependencyYAML:
+        with CodeTimer(f"store deepcopy: {path}"):
+            store_copy = deepcopy(DependencyStore.store)
+
+        dependency = store_copy["dependencies"].get(path)
+        if dependency is None:
+            raise ValueError(f"Dependency {path} {version} not found")
+        dependency["version"] = version
+        store_copy["dependencies"][path] = dependency
+
+        return store_copy
+
+    @staticmethod
+    def write_store(file: str, data: DependencyYAML):
+        with open(file, "w") as yaml_file:
+            yaml.safe_dump(data, yaml_file, sort_keys=False)
+
+
+class Dependency:
+    def __init__(self, path: str, values: DependencyDict):
+        self.path = path
+        self.values = values
+
+        self.name: str = ""
+        self.desc: str = ""
+        self.kind: str = ""
+
+        match path.split("/"):
+            case ["plugins", name]:
+                self.name = name
+                self.kind = "plugin"
+                self.desc = f"{name} plugin"
+            case ["themes", name]:
+                self.name = name.replace(".zsh-theme", "")
+                self.kind = "theme"
+                self.desc = f"{self.name} theme"
+            case _:
+                self.name = self.desc = path
+
+    def __str__(self):
+        output: str = ""
+        for key in DependencyDict.__dict__["__annotations__"].keys():
+            if key not in self.values:
+                output += f"{key}: None\n"
+                continue
+
+            value = self.values[key]
+            if "\n" not in value:
+                output += f"{key}: {value}\n"
+            else:
+                output += f"{key}:\n  "
+                output += value.replace("\n", "\n  ", value.count("\n") - 1)
+        return output
+
+    def update_or_notify(self):
+        # Print dependency settings
+        print(f"Processing {self.desc}...", file=sys.stderr)
+        print(self, file=sys.stderr)
+
+        # Check for updates
+        repo = self.values["repo"]
+        remote_branch = self.values["branch"]
+        version = self.values["version"]
+        is_tag = version.startswith("tag:")
+
+        try:
+            with CodeTimer(f"update check: {repo}"):
+                if is_tag:
+                    status = GitHub.check_newer_tag(repo, version.replace("tag:", ""))
+                else:
+                    status = GitHub.check_updates(repo, remote_branch, version)
+
+            if status["has_updates"] is True:
+                short_sha = status["head_ref"][:8]
+                new_version = status["version"] if is_tag else short_sha
+
+                try:
+                    branch_name = f"update/{self.path}/{new_version}"
+
+                    # Create new branch
+                    branch = Git.checkout_or_create_branch(branch_name)
+
+                    # Update dependency files
+                    self.__apply_upstream_changes()
+
+                    if not Git.repo_is_clean():
+                        # Update dependencies.yml file
+                        self.__update_yaml(
+                            f"tag:{new_version}" if is_tag else status["version"]
+                        )
+
+                        # Add all changes and commit
+                        has_new_commit = Git.add_and_commit(self.name, new_version)
+
+                        if has_new_commit:
+                            # Push changes to remote
+                            Git.push(branch)
+
+                            # Create GitHub PR
+                            GitHub.create_pr(
+                                branch,
+                                f"chore({self.name}): update to version {new_version}",
+                                f"""## Description
+
+Update for **{self.desc}**: update to version [{new_version}]({status["head_url"]}).
+Check out the [list of changes]({status["compare_url"]}).
+""",
+                            )
+
+                    # Clean up repository
+                    Git.clean_repo()
+                except (CommandRunner.Exception, shutil.Error) as e:
+                    # Handle exception on automatic update
+                    match type(e):
+                        case CommandRunner.Exception:
+                            # Print error message
+                            print(
+                                f"Error running {e.stage} command: {e.returncode}",  # pyright: ignore[reportAttributeAccessIssue]
+                                file=sys.stderr,
+                            )
+                            print(e.stderr, file=sys.stderr)  # pyright: ignore[reportAttributeAccessIssue]
+                        case shutil.Error:
+                            print(f"Error copying files: {e}", file=sys.stderr)
+
+                    try:
+                        Git.clean_repo()
+                    except CommandRunner.Exception as e:
+                        print(
+                            f"Error reverting repository to clean state: {e}",
+                            file=sys.stderr,
+                        )
+                        sys.exit(1)
+
+                    # Create a GitHub issue to notify maintainer
+                    title = f"{self.path}: update to {new_version}"
+                    body = f"""## Description
+
+There is a new version of `{self.name}` {self.kind} available.
+
+New version: [{new_version}]({status["head_url"]})
+Check out the [list of changes]({status["compare_url"]}).
+"""
+
+                    print("Creating GitHub issue", file=sys.stderr)
+                    print(f"{title}\n\n{body}", file=sys.stderr)
+                    GitHub.create_issue(title, body)
+        except Exception as e:
+            print(e, file=sys.stderr)
+
+    def __update_yaml(self, new_version: str) -> None:
+        dep_yaml = DependencyStore.update_dependency_version(self.path, new_version)
+        DependencyStore.write_store(DEPS_YAML_FILE, dep_yaml)
+
+    def __apply_upstream_changes(self) -> None:
+        # Patterns to ignore in copying files from upstream repo
+        GLOBAL_IGNORE = [".git", ".github", ".gitignore"]
+
+        path = os.path.abspath(self.path)
+        precopy = self.values.get("precopy")
+        postcopy = self.values.get("postcopy")
+
+        repo = self.values["repo"]
+        branch = self.values["branch"]
+        remote_url = f"https://github.com/{repo}.git"
+        repo_dir = os.path.join(TMP_DIR, repo)
+
+        # Clone repository
+        Git.clone(remote_url, branch, repo_dir, reclone=True)
+
+        # Run precopy on tmp repo
+        if precopy is not None:
+            print("Running precopy script:", end="\n  ", file=sys.stderr)
+            print(
+                precopy.replace("\n", "\n  ", precopy.count("\n") - 1), file=sys.stderr
+            )
+            CommandRunner.run_or_fail(
+                ["bash", "-c", precopy], cwd=repo_dir, stage="Precopy"
+            )
+
+        # Copy files from upstream repo
+        print(f"Copying files from {repo_dir} to {path}", file=sys.stderr)
+        shutil.copytree(
+            repo_dir,
+            path,
+            dirs_exist_ok=True,
+            ignore=shutil.ignore_patterns(*GLOBAL_IGNORE),
+        )
+
+        # Run postcopy on our repository
+        if postcopy is not None:
+            print("Running postcopy script:", end="\n  ", file=sys.stderr)
+            print(
+                postcopy.replace("\n", "\n  ", postcopy.count("\n") - 1),
+                file=sys.stderr,
+            )
+            CommandRunner.run_or_fail(
+                ["bash", "-c", postcopy], cwd=path, stage="Postcopy"
+            )
+
+
+class Git:
+    default_branch = "master"
+
+    @staticmethod
+    def clone(remote_url: str, branch: str, repo_dir: str, reclone=False):
+        # If repo needs to be fresh
+        if reclone and os.path.exists(repo_dir):
+            shutil.rmtree(repo_dir)
+
+        # Clone repo in tmp directory and checkout branch
+        if not os.path.exists(repo_dir):
+            print(
+                f"Cloning {remote_url} to {repo_dir} and checking out {branch}",
+                file=sys.stderr,
+            )
+            CommandRunner.run_or_fail(
+                ["git", "clone", "--depth=1", "-b", branch, remote_url, repo_dir],
+                stage="Clone",
+            )
+
+    @staticmethod
+    def checkout_or_create_branch(branch_name: str):
+        # Get current branch name
+        result = CommandRunner.run_or_fail(
+            ["git", "rev-parse", "--abbrev-ref", "HEAD"], stage="GetDefaultBranch"
+        )
+        Git.default_branch = result.stdout.decode("utf-8").strip()
+
+        # Create new branch and return created branch name
+        try:
+            # try to checkout already existing branch
+            CommandRunner.run_or_fail(
+                ["git", "checkout", branch_name], stage="CreateBranch"
+            )
+        except CommandRunner.Exception:
+            # otherwise create new branch
+            CommandRunner.run_or_fail(
+                ["git", "checkout", "-b", branch_name], stage="CreateBranch"
+            )
+        return branch_name
+
+    @staticmethod
+    def repo_is_clean() -> bool:
+        """
+        Returns `True` if the repo is clean.
+        Returns `False` if the repo is dirty.
+        """
+        try:
+            CommandRunner.run_or_fail(
+                ["git", "diff", "--exit-code"], stage="CheckRepoClean"
+            )
+            return True
+        except CommandRunner.Exception:
+            return False
+
+    @staticmethod
+    def add_and_commit(scope: str, version: str) -> bool:
+        """
+        Returns `True` if there were changes and were indeed commited.
+        Returns `False` if the repo was clean and no changes were commited.
+        """
+        if Git.repo_is_clean():
+            return False
+
+        user_name = os.environ.get("GIT_APP_NAME")
+        user_email = os.environ.get("GIT_APP_EMAIL")
+
+        # Add all files to git staging
+        CommandRunner.run_or_fail(["git", "add", "-A", "-v"], stage="AddFiles")
+
+        # Reset environment and git config
+        clean_env = os.environ.copy()
+        clean_env["LANG"] = "C.UTF-8"
+        clean_env["GIT_CONFIG_GLOBAL"] = "/dev/null"
+        clean_env["GIT_CONFIG_NOSYSTEM"] = "1"
+
+        # Commit with settings above
+        CommandRunner.run_or_fail(
+            [
+                "git",
+                "-c",
+                f"user.name={user_name}",
+                "-c",
+                f"user.email={user_email}",
+                "commit",
+                "-m",
+                f"chore({scope}): update to {version}",
+            ],
+            stage="CreateCommit",
+            env=clean_env,
+        )
+        return True
+
+    @staticmethod
+    def push(branch: str):
+        CommandRunner.run_or_fail(
+            ["git", "push", "-u", "origin", branch], stage="PushBranch"
+        )
+
+    @staticmethod
+    def clean_repo():
+        CommandRunner.run_or_fail(
+            ["git", "reset", "--hard", "HEAD"], stage="ResetRepository"
+        )
+        CommandRunner.run_or_fail(
+            ["git", "checkout", Git.default_branch], stage="CheckoutDefaultBranch"
+        )
+
+
+class GitHub:
+    @staticmethod
+    def check_newer_tag(repo, current_tag) -> UpdateStatusFalse | UpdateStatusTrue:
+        # GET /repos/:owner/:repo/git/refs/tags
+        url = f"https://api.github.com/repos/{repo}/git/refs/tags"
+
+        # Send a GET request to the GitHub API
+        response = requests.get(url, headers=HEADERS)
+        current_version = coerce(current_tag)
+        if current_version is None:
+            raise ValueError(
+                f"Stored {current_version} from {repo} does not follow semver"
+            )
+
+        # If the request was successful
+        if response.status_code == 200:
+            # Parse the JSON response
+            data = response.json()
+
+            if len(data) == 0:
+                return {
+                    "has_updates": False,
+                }
+
+            latest_ref = None
+            latest_version: Optional[Version] = None
+            for ref in data:
+                # we find the tag since GitHub returns it as plain git ref
+                tag_version = coerce(ref["ref"].replace("refs/tags/", ""))
+                if tag_version is None:
+                    # we skip every tag that is not semver-complaint
+                    continue
+                if latest_version is None or tag_version.compare(latest_version) > 0:
+                    # if we have a "greater" semver version, set it as latest
+                    latest_version = tag_version
+                    latest_ref = ref
+
+            # raise if no valid semver tag is found
+            if latest_ref is None or latest_version is None:
+                raise ValueError(f"No tags following semver found in {repo}")
+
+            # we get the tag since GitHub returns it as plain git ref
+            latest_tag = latest_ref["ref"].replace("refs/tags/", "")
+
+            if latest_version.compare(current_version) <= 0:
+                return {
+                    "has_updates": False,
+                }
+
+            return {
+                "has_updates": True,
+                "version": latest_tag,
+                "compare_url": f"https://github.com/{repo}/compare/{current_tag}...{latest_tag}",
+                "head_ref": latest_ref["object"]["sha"],
+                "head_url": f"https://github.com/{repo}/releases/tag/{latest_tag}",
+            }
+        else:
+            # If the request was not successful, raise an exception
+            raise Exception(
+                f"GitHub API request failed with status code {response.status_code}: {response.json()}"
+            )
+
+    @staticmethod
+    def check_updates(repo, branch, version) -> UpdateStatusFalse | UpdateStatusTrue:
+        url = f"https://api.github.com/repos/{repo}/compare/{version}...{branch}"
+
+        # Send a GET request to the GitHub API
+        response = requests.get(url, headers=HEADERS)
+
+        # If the request was successful
+        if response.status_code == 200:
+            # Parse the JSON response
+            data = response.json()
+
+            # If the base is behind the head, there is a newer version
+            has_updates = data["status"] != "identical"
+
+            if not has_updates:
+                return {
+                    "has_updates": False,
+                }
+
+            return {
+                "has_updates": data["status"] != "identical",
+                "version": data["commits"][-1]["sha"],
+                "compare_url": data["permalink_url"],
+                "head_ref": data["commits"][-1]["sha"],
+                "head_url": data["commits"][-1]["html_url"],
+            }
+        else:
+            # If the request was not successful, raise an exception
+            raise Exception(
+                f"GitHub API request failed with status code {response.status_code}: {response.json()}"
+            )
+
+    @staticmethod
+    def create_issue(title: str, body: str) -> None:
+        cmd = ["gh", "issue", "create", "-t", title, "-b", body]
+        CommandRunner.run_or_fail(cmd, stage="CreateIssue")
+
+    @staticmethod
+    def create_pr(branch: str, title: str, body: str) -> None:
+        # first of all let's check if PR is already open
+        check_cmd = [
+            "gh",
+            "pr",
+            "list",
+            "--state",
+            "open",
+            "--head",
+            branch,
+            "--json",
+            "title",
+        ]
+        # returncode is 0 also if no PRs are found
+        output = json.loads(
+            CommandRunner.run_or_fail(check_cmd, stage="CheckPullRequestOpen")
+            .stdout.decode("utf-8")
+            .strip()
+        )
+        # we have PR in this case!
+        if len(output) > 0:
+            return
+        cmd = [
+            "gh",
+            "pr",
+            "create",
+            "-B",
+            Git.default_branch,
+            "-H",
+            branch,
+            "-t",
+            title,
+            "-b",
+            body,
+        ]
+        CommandRunner.run_or_fail(cmd, stage="CreatePullRequest")
+
+
+def main():
+    # Load the YAML file
+    with open(DEPS_YAML_FILE, "r") as yaml_file:
+        data: DependencyYAML = yaml.safe_load(yaml_file)
+
+    if "dependencies" not in data:
+        raise Exception("dependencies.yml not properly formatted")
+
+    # Cache YAML version
+    DependencyStore.set(data)
+
+    dependencies = data["dependencies"]
+    if len(sys.argv) > 1:
+        # argv is list of dependencies to run, default is all of them
+        dependency_list = sys.argv[1:]
+    else:
+        dependency_list = dependencies.keys()
+
+    for path in dependency_list:
+        dependency = Dependency(path, dependencies[path])
+        dependency.update_or_notify()
+
+
+if __name__ == "__main__":
+    main()
diff --git a/zsh/.github/workflows/installer.yml b/zsh/.github/workflows/installer.yml
new file mode 100644
index 0000000..cead84c
--- /dev/null
+++ b/zsh/.github/workflows/installer.yml
@@ -0,0 +1,66 @@
+name: Test and Deploy installer
+on:
+  workflow_dispatch: {}
+  push:
+    paths:
+      - 'tools/install.sh'
+      - '.github/workflows/installer/**'
+      - '.github/workflows/installer.yml'
+
+concurrency:
+  group: ${{ github.workflow }}-${{ github.head_ref || github.run_id }}
+  cancel-in-progress: false
+
+permissions:
+  contents: read # to checkout
+
+jobs:
+  test:
+    name: Test installer
+    if: github.repository == 'ohmyzsh/ohmyzsh'
+    runs-on: ${{ matrix.os }}
+    strategy:
+      matrix:
+        os:
+          - ubuntu-latest
+          - macos-latest
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
+        with:
+          egress-policy: audit
+
+      - name: Set up git repository
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install zsh
+        if: runner.os == 'Linux'
+        run: sudo apt-get update; sudo apt-get install zsh
+      - name: Test installer
+        run: sh ./tools/install.sh
+
+  deploy:
+    name: Deploy installer in install.ohmyz.sh
+    if: github.ref == 'refs/heads/master'
+    runs-on: ubuntu-latest
+    environment: vercel
+    needs:
+      - test
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
+        with:
+          egress-policy: audit
+
+      - name: Checkout
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+      - name: Install Vercel CLI
+        run: npm install -g vercel
+      - name: Setup project and deploy
+        env:
+          VERCEL_ORG_ID: ${{ secrets.VERCEL_ORG_ID }}
+          VERCEL_PROJECT_ID: ${{ secrets.VERCEL_PROJECT_ID }}
+          VERCEL_TOKEN: ${{ secrets.VERCEL_TOKEN }}
+        run: |
+          cp tools/install.sh .github/workflows/installer/install.sh
+          cd .github/workflows/installer
+          vc deploy --prod -t "$VERCEL_TOKEN"
diff --git a/zsh/.github/workflows/installer/.gitignore b/zsh/.github/workflows/installer/.gitignore
new file mode 100644
index 0000000..f66fce3
--- /dev/null
+++ b/zsh/.github/workflows/installer/.gitignore
@@ -0,0 +1 @@
+install.sh
diff --git a/zsh/.github/workflows/installer/.vercelignore b/zsh/.github/workflows/installer/.vercelignore
new file mode 100644
index 0000000..41b2333
--- /dev/null
+++ b/zsh/.github/workflows/installer/.vercelignore
@@ -0,0 +1,2 @@
+/*
+!/install.sh
diff --git a/zsh/.github/workflows/installer/vercel.json b/zsh/.github/workflows/installer/vercel.json
new file mode 100644
index 0000000..88ec187
--- /dev/null
+++ b/zsh/.github/workflows/installer/vercel.json
@@ -0,0 +1,23 @@
+{
+  "headers": [
+    {
+      "source": "/(|install.sh)",
+      "headers": [
+        {
+          "key": "Content-Type",
+          "value": "text/plain"
+        },
+        {
+          "key": "Content-Disposition",
+          "value": "inline; filename=\"install.sh\""
+        }
+      ]
+    }
+  ],
+  "rewrites": [
+    {
+      "source": "/",
+      "destination": "/install.sh"
+    }
+  ]
+}
diff --git a/zsh/.github/workflows/main.yml b/zsh/.github/workflows/main.yml
index 57a1e38..e0d9a72 100644
--- a/zsh/.github/workflows/main.yml
+++ b/zsh/.github/workflows/main.yml
@@ -7,7 +7,7 @@ on:
     branches:
       - master
   push:
-    branches: 
+    branches:
       - master
 
 concurrency:
@@ -20,19 +20,18 @@ permissions:
 jobs:
   tests:
     name: Run tests
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     if: github.repository == 'ohmyzsh/ohmyzsh'
-    strategy:
-      matrix:
-        os: [ubuntu-latest, macos-latest]
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
+        with:
+          egress-policy: audit
+
       - name: Set up git repository
-        uses: actions/checkout@v2
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
       - name: Install zsh
-        if: runner.os == 'Linux'
         run: sudo apt-get update; sudo apt-get install zsh
-      - name: Test installer
-        run: sh ./tools/install.sh
       - name: Check syntax
         run: |
           for file in ./oh-my-zsh.sh \
diff --git a/zsh/.github/workflows/project.yml b/zsh/.github/workflows/project.yml
index 999cc08..ab9d4d1 100644
--- a/zsh/.github/workflows/project.yml
+++ b/zsh/.github/workflows/project.yml
@@ -15,11 +15,20 @@ jobs:
     name: Add to project
     runs-on: ubuntu-latest
     if: github.repository == 'ohmyzsh/ohmyzsh'
-    env:
-      GITHUB_TOKEN: ${{ secrets.PROJECT_TOKEN }}
     steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
+        with:
+          egress-policy: audit
+      - name: Authenticate as @ohmyzsh
+        id: generate-token
+        uses: actions/create-github-app-token@f8d387b68d61c58ab83c6c016672934102569859 # v3.0.0
+        with:
+          app-id: ${{ secrets.OHMYZSH_APP_ID }}
+          private-key: ${{ secrets.OHMYZSH_APP_PRIVATE_KEY }}
       - name: Read project data
         env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
           ORGANIZATION: ohmyzsh
           PROJECT_NUMBER: "1"
         run: |
@@ -27,77 +36,84 @@ jobs:
           gh api graphql -f query='
             query($org: String!, $number: Int!) {
               organization(login: $org){
-                projectNext(number: $number) {
+                projectV2(number: $number) {
                   id
                   fields(first:20) {
                     nodes {
-                      id
-                      name
+                      ... on ProjectV2Field {
+                        id
+                        name
+                      }
                     }
                   }
                 }
               }
-            }
-          ' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
+            }' -f org=$ORGANIZATION -F number=$PROJECT_NUMBER > project_data.json
 
           # Parse project data
-          cat >> $GITHUB_ENV <<EOF
-          PROJECT_ID=$(jq '.data.organization.projectNext.id' project_data.json)
-          PLUGIN_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
-          THEME_FIELD_ID=$(jq '.data.organization.projectNext.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
+          cat >> "$GITHUB_ENV" <<EOF
+          PROJECT_ID=$(jq '.data.organization.projectV2.id' project_data.json)
+          PLUGIN_FIELD_ID=$(jq '.data.organization.projectV2.fields.nodes[] | select(.name == "Plugin") | .id' project_data.json)
+          THEME_FIELD_ID=$(jq '.data.organization.projectV2.fields.nodes[] | select(.name == "Theme") | .id' project_data.json)
           EOF
-
       - name: Add to project
         env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
           ISSUE_OR_PR_ID: ${{ github.event.issue.node_id || github.event.pull_request.node_id }}
         run: |
           item_id="$(gh api graphql -f query='
             mutation($project: ID!, $content: ID!) {
-              addProjectNextItem(input: {projectId: $project, contentId: $content}) {
-                projectNextItem {
+              addProjectV2ItemById(input: {projectId: $project, contentId: $content}) {
+                item {
                   id
                 }
               }
             }
-          ' -f project=$PROJECT_ID -f content=$ISSUE_OR_PR_ID --jq '.data.addProjectNextItem.projectNextItem.id')"
+          ' -f project="$PROJECT_ID" -f content="$ISSUE_OR_PR_ID" --jq '.data.addProjectV2ItemById.item.id')"
 
           echo "ITEM_ID=$item_id" >> $GITHUB_ENV
-
       - name: Classify Pull Request
         if: github.event_name == 'pull_request_target'
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
+          PR_NUMBER: ${{ github.event.pull_request.number }}
         run: |
-          touch plugins.list themes.list
-
-          gh pr view ${{ github.event.pull_request.number }} \
-            --repo ${{ github.repository }} \
+          # Get the list of modified files in the PR, and extract plugins and themes
+          gh pr view "$PR_NUMBER" \
+            --repo "$GITHUB_REPOSITORY" \
             --json files --jq '.files.[].path' | awk -F/ '
+            BEGIN {
+              plugins = 0
+              themes = 0
+            }
             /^plugins\// {
-              plugins[$2] = 1
+              if (plugin == $2) next
+              plugin = $2
+              plugins++
             }
             /^themes\// {
               gsub(/\.zsh-theme$/, "", $2)
-              themes[$2] = 1
+              if (theme == $2) next
+              theme = $2
+              themes++
             }
             END {
-              for (plugin in plugins) {
-                print plugin >> "plugins.list"
+              # plugin and theme are values controlled by the PR author
+              # so we should sanitize them before using anywhere else
+              if (plugins == 1) {
+                gsub(/[^a-zA-Z0-9._-]/, "", plugin)
+                print "PLUGIN=" plugin
               }
-              for (theme in themes) {
-                print theme >> "themes.list"
+              if (themes == 1) {
+                gsub(/[^a-zA-Z0-9._-]/, "", theme)
+                print "THEME=" theme
               }
             }
-          '
-          # If only one plugin is modified, add it to the plugin field
-          if [[ $(wc -l < plugins.list) = 1 ]]; then
-            echo "PLUGIN=$(cat plugins.list)" >> $GITHUB_ENV
-          fi
-          # If only one theme is modified, add it to the theme field
-          if [[ $(wc -l < themes.list) = 1 ]]; then
-            echo "THEME=$(cat themes.list)" >> $GITHUB_ENV
-          fi
-
+          ' >> "$GITHUB_ENV"
       - name: Fill Pull Request fields in project
         if: github.event_name == 'pull_request_target'
+        env:
+          GH_TOKEN: ${{ steps.generate-token.outputs.token }}
         run: |
           gh api graphql -f query='
             mutation (
@@ -108,29 +124,32 @@ jobs:
               $theme_field: ID!
               $theme_value: String!
             ) {
-              set_plugin: updateProjectNextItemField(input: {
+              set_plugin: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $plugin_field
-                value: $plugin_value
+                value: {
+                  text: $plugin_value
+                }
               }) {
-                projectNextItem {
+                projectV2Item {
                   id
                 }
               }
-              set_theme: updateProjectNextItemField(input: {
+              set_theme: updateProjectV2ItemFieldValue(input: {
                 projectId: $project
                 itemId: $item
                 fieldId: $theme_field
-                value: $theme_value
+                value: {
+                  text: $theme_value
+                }
               }) {
-                projectNextItem {
+                projectV2Item {
                   id
                 }
               }
             }
-          ' -f project=$PROJECT_ID -f item=$ITEM_ID \
-            -f plugin_field=$PLUGIN_FIELD_ID -f plugin_value=$PLUGIN \
-            -f theme_field=$THEME_FIELD_ID -f theme_value=$THEME \
+          ' -f project="$PROJECT_ID" -f item="$ITEM_ID" \
+            -f plugin_field="$PLUGIN_FIELD_ID" -f plugin_value="$PLUGIN" \
+            -f theme_field="$THEME_FIELD_ID" -f theme_value="$THEME" \
             --silent
-
diff --git a/zsh/.github/workflows/scorecard.yml b/zsh/.github/workflows/scorecard.yml
new file mode 100644
index 0000000..a7d573a
--- /dev/null
+++ b/zsh/.github/workflows/scorecard.yml
@@ -0,0 +1,65 @@
+# This workflow uses actions that are not certified by GitHub. They are provided
+# by a third-party and are governed by separate terms of service, privacy
+# policy, and support documentation.
+
+name: Scorecard supply-chain security
+on:
+  # For Branch-Protection check. Only the default branch is supported. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#branch-protection
+  branch_protection_rule:
+  # To guarantee Maintained check is occasionally updated. See
+  # https://github.com/ossf/scorecard/blob/main/docs/checks.md#maintained
+  schedule:
+    - cron: '20 7 * * 2'
+  push:
+    branches: ["master"]
+
+# Declare default permissions as read only.
+permissions: read-all
+
+jobs:
+  analysis:
+    name: Scorecard analysis
+    runs-on: ubuntu-latest
+    permissions:
+      # Needed to upload the results to code-scanning dashboard.
+      security-events: write
+      # Needed to publish results and get a badge (see publish_results below).
+      id-token: write
+      contents: read
+      actions: read
+      # To allow GraphQL ListCommits to work
+      issues: read
+      pull-requests: read
+      # To detect SAST tools
+      checks: read
+
+    steps:
+      - name: Harden the runner (Audit all outbound calls)
+        uses: step-security/harden-runner@fa2e9d605c4eeb9fcad4c99c224cee0c6c7f3594 # v2.16.0
+        with:
+          egress-policy: audit
+
+      - name: "Checkout code"
+        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
+        with:
+          persist-credentials: false
+
+      - name: "Run analysis"
+        uses: ossf/scorecard-action@4eaacf0543bb3f2c246792bd56e8cdeffafb205a # v2.4.3
+        with:
+          results_file: results.sarif
+          results_format: sarif
+          publish_results: true
+
+      - name: "Upload artifact"
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        with:
+          name: SARIF file
+          path: results.sarif
+          retention-days: 5
+
+      - name: "Upload to code-scanning"
+        uses: github/codeql-action/upload-sarif@c10b8064de6f491fea524254123dbe5e09572f13 # v4.35.1
+        with:
+          sarif_file: results.sarif
diff --git a/zsh/.gitignore b/zsh/.gitignore
index 71ae444..145ae9c 100644
--- a/zsh/.gitignore
+++ b/zsh/.gitignore
@@ -4,8 +4,18 @@ custom/
 # temp files directories
 cache/
 log/
+
+# Vim swap/backup files
 *.swp
+*.swo
+
+# macOS system files
 .DS_Store
 
 # editor configs
-.vscode
\ No newline at end of file
+.vscode
+.idea
+
+# zcompile cached files
+*.zwc
+*.zwc.old
diff --git a/zsh/.gitpod.Dockerfile b/zsh/.gitpod.Dockerfile
deleted file mode 100644
index b35c80d..0000000
--- a/zsh/.gitpod.Dockerfile
+++ /dev/null
@@ -1,5 +0,0 @@
-FROM gitpod/workspace-full
-
-RUN sudo apt-get update && \
-    sudo apt-get install -y zsh && \
-    sudo rm -rf /var/lib/apt/lists/*
diff --git a/zsh/.gitpod.yml b/zsh/.gitpod.yml
deleted file mode 100644
index ccc5724..0000000
--- a/zsh/.gitpod.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-image:
-  file: .gitpod.Dockerfile
-
-tasks:
-  - init: |
-      export EDITOR="command gp open -w" VISUAL="command gp open -w"
-      cp -f /workspace/ohmyzsh/templates/zshrc.zsh-template ~/.zshrc
-      ln -sf /workspace/ohmyzsh ~/.oh-my-zsh
-    command: exec zsh
diff --git a/zsh/.prettierrc b/zsh/.prettierrc
new file mode 100644
index 0000000..a8f5a14
--- /dev/null
+++ b/zsh/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "printWidth": 110,
+  "proseWrap": "always"
+}
diff --git a/zsh/CONTRIBUTING.md b/zsh/CONTRIBUTING.md
index e78bd81..5168cde 100644
--- a/zsh/CONTRIBUTING.md
+++ b/zsh/CONTRIBUTING.md
@@ -20,6 +20,7 @@ you would make is not already covered.
   - [Getting started](#getting-started)
   - [You have a solution](#you-have-a-solution)
   - [You have an addition](#you-have-an-addition)
+- [A note on AI-assisted contributions](#a-note-on-ai-assisted-contributions)
 - [Use the Search, Luke](#use-the-search-luke)
 - [Commit Guidelines](#commit-guidelines)
   - [Format](#format)
@@ -35,13 +36,13 @@ you would make is not already covered.
 Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
 your problem.
 
-If you find one, comment on it so we can know there are more people experiencing it.
+If you find one, comment on it, so we know more people are experiencing it.
 
 If not, look at the [Troubleshooting](https://github.com/ohmyzsh/ohmyzsh/wiki/Troubleshooting)
 page for instructions on how to gather data to better debug your problem.
 
 Then, you can go ahead and create an issue with as much detail as you can provide.
-It should include the data gathered as indicated above, along with:
+It should include the data gathered as indicated above, along with the following:
 
 1. How to reproduce the problem
 2. What the correct behavior should be
@@ -57,7 +58,7 @@ We will do our very best to help you.
 Please be so kind as to [search](#use-the-search-luke) for any open issue already covering
 your suggestion.
 
-If you find one, comment on it so we can know there are more people supporting it.
+If you find one, comment on it, so we know more people are supporting it.
 
 If not, you can go ahead and create an issue. Please copy to anyone relevant (e.g. plugin
 maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
@@ -84,7 +85,7 @@ your [problem](#you-have-a-problem), and any pending/merged/rejected PR covering
 
 If the solution is already reported, try it out and +1 the pull request if the
 solution works ok. On the other hand, if you think your solution is better, post
-it with a reference to the other one so we can have both solutions to compare.
+it with reference to the other one so we can have both solutions to compare.
 
 If not, then go ahead and submit a PR. Please copy to anyone relevant (e.g. plugin
 maintainers) by mentioning their GitHub handle (starting with `@`) in your message.
@@ -113,18 +114,42 @@ This has become an issue for two opposing reasons:
 - Some users want to have their personal aliases in Oh My Zsh.
 - Some users don't want any aliases at all and feel that there are too many.
 
-Because of this, from now on we're requiring that new aliases follow these conditions:
+Because of this, from now on, we require that new aliases follow these conditions:
 
 1. They will be used by many people, not just a few.
 2. The aliases will be used many times and for common tasks.
 3. Prefer one generic alias over many specific ones.
 4. When justifying the need for an alias, talk about workflows where you'll use it,
    preferably in combination with other aliases.
-5. If there exists a command with the same name, look for a different alias name.
+5. If a command with the same name exists, look for a different alias name.
 
 This list is not exhaustive! Please remember that your alias will be in the machines of many people,
 so it should be justified why they should have it.
 
+## A note on AI-assisted contributions
+
+We'll admit it: AI tools can be pretty helpful for coding tasks, and we're not here to gatekeep how you get your work done. We use these tools ourselves! 🤖
+
+But here's the thing—Oh My Zsh is maintained by a small team of volunteers who do this in their spare time. We already have hundreds of pending PRs, and we want to make sure we're spending our limited time effectively.
+
+If you used AI tools meaningfully in your contribution (code generation, agentic coding assistants, etc.), please mention it in your PR description. Basic autocomplete doesn't count, but if an AI wrote substantial parts of your code, just let us know.
+
+**Examples of good disclosure:**
+- "Used ChatGPT to help generate the initial regex pattern for parsing git status output"
+- "Claude assisted with writing the unit tests for this feature"  
+- "Generated with Gemini and then reviewed/tested manually"
+- Or simply: "AI-assisted" in your PR description
+
+Here's what we're looking for:
+
+- **You understand your code**: You should be able to explain what your contribution does and how it works. We want to collaborate with humans who are invested in the project.
+- **Context matters**: Tell us what problem you're solving, how you tested it, and link to relevant docs. Small, incremental changes work better than massive generated overhauls.
+- **Quality over quantity**: We'd rather have one thoughtful, well-tested contribution than ten AI-generated PRs that need extensive review.
+
+The disclosure helps us know how much guidance to offer. If we're just reviewing AI output that you can't explain or improve, that changes the dynamic—and frankly, it's not a great use of anyone's time.
+
+As always, we reserve the right to decline any contribution. PRs that appear to be unreviewed AI output, or code the contributor can't explain, may be closed without extensive feedback.
+
 ----
 
 ## Use the Search, Luke
@@ -214,7 +239,7 @@ type(scope)!: subject
   ```
 
 - `subject`: a brief description of the changes. This will be displayed in the changelog. If you need
-  to specify other details you can use the commit body but it won't be visible.
+  to specify other details, you can use the commit body, but it won't be visible.
 
   Formatting tricks: the commit subject may contain:
 
@@ -231,8 +256,8 @@ type(scope)!: subject
 
 ### Style
 
-Try to keep the first commit line short. This is harder to do using this commit style but try to be
-concise and if you need more space, you can use the commit body. Try to make sure that the commit
+Try to keep the first commit line short. It's harder to do using this commit style but try to be
+concise, and if you need more space, you can use the commit body. Try to make sure that the commit
 subject is clear and precise enough that users will know what changed by just looking at the changelog.
 
 ----
diff --git a/zsh/LICENSE.txt b/zsh/LICENSE.txt
index 2d7ca6f..1ea913a 100644
--- a/zsh/LICENSE.txt
+++ b/zsh/LICENSE.txt
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2022 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
+Copyright (c) 2009-2026 Robby Russell and contributors (https://github.com/ohmyzsh/ohmyzsh/contributors)
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/zsh/README.md b/zsh/README.md
index 1e4b7ff..d7f1433 100644
--- a/zsh/README.md
+++ b/zsh/README.md
@@ -1,50 +1,60 @@
 <p align="center"><img src="https://ohmyzsh.s3.amazonaws.com/omz-ansi-github.png" alt="Oh My Zsh"></p>
 
-Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/) configuration.
+Oh My Zsh is an open source, community-driven framework for managing your [zsh](https://www.zsh.org/)
+configuration.
 
 Sounds boring. Let's try again.
 
 **Oh My Zsh will not make you a 10x developer...but you may feel like one.**
 
-Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes. Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
+Once installed, your terminal shell will become the talk of the town _or your money back!_ With each keystroke
+in your command prompt, you'll take advantage of the hundreds of powerful plugins and beautiful themes.
+Strangers will come up to you in cafés and ask you, _"that is amazing! are you some sort of genius?"_
 
-Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll use the time that you're saving to start flossing more often. 😬
+Finally, you'll begin to get the sort of attention that you have always felt you deserved. ...or maybe you'll
+use the time that you're saving to start flossing more often. 😬
 
-To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter, and join us on [Discord](https://discord.gg/ohmyzsh).
+To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://x.com/ohmyzsh) on X (formerly
+Twitter), and join us on [Discord](https://discord.gg/ohmyzsh).
 
 [![CI](https://github.com/ohmyzsh/ohmyzsh/workflows/CI/badge.svg)](https://github.com/ohmyzsh/ohmyzsh/actions?query=workflow%3ACI)
-[![Follow @ohmyzsh](https://img.shields.io/twitter/follow/ohmyzsh?label=Follow+@ohmyzsh&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
+[![OpenSSF Best Practices](https://www.bestpractices.dev/projects/10713/badge)](https://www.bestpractices.dev/projects/10713)
+[![X (formerly Twitter) Follow](https://img.shields.io/twitter/follow/ohmyzsh?label=%40ohmyzsh&logo=x&style=flat)](https://twitter.com/intent/follow?screen_name=ohmyzsh)
+[![Mastodon Follow](https://img.shields.io/mastodon/follow/111169632522566717?label=%40ohmyzsh&domain=https%3A%2F%2Fmstdn.social&logo=mastodon&style=flat)](https://mstdn.social/@ohmyzsh)
 [![Discord server](https://img.shields.io/discord/642496866407284746)](https://discord.gg/ohmyzsh)
-[![Gitpod ready](https://img.shields.io/badge/Gitpod-ready-blue?logo=gitpod)](https://gitpod.io/#https://github.com/ohmyzsh/ohmyzsh)
-[![huntr.dev](https://cdn.huntr.dev/huntr_security_badge_mono.svg)](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh)
 
 <details>
 <summary>Table of Contents</summary>
 
 - [Getting Started](#getting-started)
+  - [Operating System Compatibility](#operating-system-compatibility)
   - [Prerequisites](#prerequisites)
   - [Basic Installation](#basic-installation)
-    - [Manual inspection](#manual-inspection)
+    - [Manual Inspection](#manual-inspection)
 - [Using Oh My Zsh](#using-oh-my-zsh)
   - [Plugins](#plugins)
     - [Enabling Plugins](#enabling-plugins)
     - [Using Plugins](#using-plugins)
   - [Themes](#themes)
-    - [Selecting a Theme](#selecting-a-theme)
+    - [Selecting A Theme](#selecting-a-theme)
   - [FAQ](#faq)
 - [Advanced Topics](#advanced-topics)
   - [Advanced Installation](#advanced-installation)
     - [Custom Directory](#custom-directory)
-    - [Unattended install](#unattended-install)
-    - [Installing from a forked repository](#installing-from-a-forked-repository)
+    - [Unattended Install](#unattended-install)
+    - [Installing From A Forked Repository](#installing-from-a-forked-repository)
     - [Manual Installation](#manual-installation)
   - [Installation Problems](#installation-problems)
-  - [Custom Plugins and Themes](#custom-plugins-and-themes)
+  - [Custom Plugins And Themes](#custom-plugins-and-themes)
+  - [Enable GNU ls In macOS And FreeBSD Systems](#enable-gnu-ls-in-macos-and-freebsd-systems)
+  - [Skip Aliases](#skip-aliases)
+  - [Async git prompt](#async-git-prompt)
 - [Getting Updates](#getting-updates)
+  - [Updates Verbosity](#updates-verbosity)
   - [Manual Updates](#manual-updates)
 - [Uninstalling Oh My Zsh](#uninstalling-oh-my-zsh)
-- [How do I contribute to Oh My Zsh?](#how-do-i-contribute-to-oh-my-zsh)
-  - [Do NOT send us themes](#do-not-send-us-themes)
+- [How Do I Contribute To Oh My Zsh?](#how-do-i-contribute-to-oh-my-zsh)
+  - [Do Not Send Us Themes](#do-not-send-us-themes)
 - [Contributors](#contributors)
 - [Follow Us](#follow-us)
 - [Merchandise](#merchandise)
@@ -55,16 +65,30 @@ To learn more, visit [ohmyz.sh](https://ohmyz.sh), follow [@ohmyzsh](https://twi
 
 ## Getting Started
 
+### Operating System Compatibility
+
+| O/S            | Status |
+| :------------- | :----: |
+| Android        |   ✅   |
+| FreeBSD        |   ✅   |
+| LCARS          |   🛸   |
+| Linux          |   ✅   |
+| macOS          |   ✅   |
+| OS/2 Warp      |   ❌   |
+| Windows (WSL2) |   ✅   |
+
 ### Prerequisites
 
-- A Unix-like operating system: macOS, Linux, BSD. On Windows: WSL2 is preferred, but cygwin or msys also mostly work.
-- [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent is fine but we prefer 5.0.8 and newer). If not pre-installed (run `zsh --version` to confirm), check the following wiki instructions here: [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
+- [Zsh](https://www.zsh.org) should be installed (v4.3.9 or more recent is fine but we prefer 5.0.8 and
+  newer). If not pre-installed (run `zsh --version` to confirm), check the following wiki instructions here:
+  [Installing ZSH](https://github.com/ohmyzsh/ohmyzsh/wiki/Installing-ZSH)
 - `curl` or `wget` should be installed
 - `git` should be installed (recommended v2.4.11 or higher)
 
 ### Basic Installation
 
-Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the command-line with either `curl`, `wget` or another similar tool.
+Oh My Zsh is installed by running one of the following commands in your terminal. You can install this via the
+command-line with either `curl`, `wget` or another similar tool.
 
 | Method    | Command                                                                                           |
 | :-------- | :------------------------------------------------------------------------------------------------ |
@@ -72,28 +96,44 @@ Oh My Zsh is installed by running one of the following commands in your terminal
 | **wget**  | `sh -c "$(wget -O- https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"`   |
 | **fetch** | `sh -c "$(fetch -o - https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"` |
 
-_Note that any previous `.zshrc` will be renamed to `.zshrc.pre-oh-my-zsh`. After installation, you can move the configuration you want to preserve into the new `.zshrc`._
+Alternatively, the installer is also mirrored outside GitHub. Using this URL instead may be required if you're
+in a country like China or India (for certain ISPs), that blocks `raw.githubusercontent.com`:
 
-#### Manual inspection
+| Method    | Command                                           |
+| :-------- | :------------------------------------------------ |
+| **curl**  | `sh -c "$(curl -fsSL https://install.ohmyz.sh/)"` |
+| **wget**  | `sh -c "$(wget -O- https://install.ohmyz.sh/)"`   |
+| **fetch** | `sh -c "$(fetch -o - https://install.ohmyz.sh/)"` |
 
-It's a good idea to inspect the install script from projects you don't yet know. You can do
-that by downloading the install script first, looking through it so everything looks normal,
-then running it:
+_Note that any previous `.zshrc` will be renamed to `.zshrc.pre-oh-my-zsh`. After installation, you can move
+the configuration you want to preserve into the new `.zshrc`._
+
+#### Manual Inspection
+
+It's a good idea to inspect the install script from projects you don't yet know. You can do that by
+downloading the install script first, looking through it so everything looks normal, then running it:
 
 ```sh
 wget https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh
 sh install.sh
 ```
 
+If the above URL times out or otherwise fails, you may have to substitute the URL for
+`https://install.ohmyz.sh` to be able to get the script.
+
 ## Using Oh My Zsh
 
 ### Plugins
 
-Oh My Zsh comes with a shitload of plugins for you to take advantage of. You can take a look in the [plugins](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins) directory and/or the [wiki](https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins) to see what's currently available.
+Oh My Zsh comes with a shitload of plugins for you to take advantage of. You can take a look in the
+[plugins](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins) directory and/or the
+[wiki](https://github.com/ohmyzsh/ohmyzsh/wiki/Plugins) to see what's currently available.
 
 #### Enabling Plugins
 
-Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the `.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor and you'll see a spot to list all the plugins you want to load.
+Once you spot a plugin (or several) that you'd like to use with Oh My Zsh, you'll need to enable them in the
+`.zshrc` file. You'll find the zshrc file in your `$HOME` directory. Open it with your favorite text editor
+and you'll see a spot to list all the plugins you want to load.
 
 ```sh
 vi ~/.zshrc
@@ -113,21 +153,28 @@ plugins=(
 )
 ```
 
-_Note that the plugins are separated by whitespace (spaces, tabs, new lines...). **Do not** use commas between them or it will break._
+_Note that the plugins are separated by whitespace (spaces, tabs, new lines...). **Do not** use commas between
+them or it will break._
 
 #### Using Plugins
 
-Each built-in plugin includes a **README**, documenting it. This README should show the aliases (if the plugin adds any) and extra goodies that are included in that particular plugin.
+Each built-in plugin includes a **README**, documenting it. This README should show the aliases (if the plugin
+adds any) and extra goodies that are included in that particular plugin.
 
 ### Themes
 
-We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme happy. We have over one hundred and fifty themes now bundled. Most of them have [screenshots](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) on the wiki (We are working on updating this!). Check them out!
+We'll admit it. Early in the Oh My Zsh world, we may have gotten a bit too theme-happy. We have over one
+hundred and fifty themes now bundled. Most of them have
+[screenshots](https://github.com/ohmyzsh/ohmyzsh/wiki/Themes) on the wiki (We are working on updating this!).
+Check them out!
 
-#### Selecting a Theme
+#### Selecting A Theme
 
-_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right one (for him)._
+_Robby's theme is the default one. It's not the fanciest one. It's not the simplest one. It's just the right
+one (for him)._
 
-Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an environment variable (all caps) in there that looks like:
+Once you find a theme that you'd like to use, you will need to edit the `~/.zshrc` file. You'll see an
+environment variable (all caps) in there that looks like:
 
 ```sh
 ZSH_THEME="robbyrussell"
@@ -140,21 +187,38 @@ ZSH_THEME="agnoster" # (this is one of the fancy ones)
 # see https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#agnoster
 ```
 
-_Note: many themes require installing a [Powerline Font](https://github.com/powerline/fonts) or a [Nerd Font](https://github.com/ryanoasis/nerd-fonts) in order to render properly. Without them, these themes will render [weird prompt symbols](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#i-have-a-weird-character-in-my-prompt)_
+<!-- prettier-ignore-start -->
+> [!NOTE]
+> You will many times see screenshots for a zsh theme, and try it out, and find that it doesn't look the same for you.
+>
+> This is because many themes require installing a [Powerline Font](https://github.com/powerline/fonts) or a
+> [Nerd Font](https://github.com/ryanoasis/nerd-fonts) in order to render properly. Without them, these themes
+> will render weird prompt symbols. Check out
+> [the FAQ](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#i-have-a-weird-character-in-my-prompt) for more
+> information.
+>
+> Also, beware that themes only control what your prompt looks like. This is, the text you see before or after
+> your cursor, where you'll type your commands. Themes don't control things such as the colors of your
+> terminal window (known as _color scheme_) or the font of your terminal. These are settings that you can
+> change in your terminal emulator. For more information, see
+> [what is a zsh theme](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#what-is-a-zsh-theme).
+<!-- prettier-ignore-end -->
 
 Open up a new terminal window and your prompt should look something like this:
 
 ![Agnoster theme](https://cloud.githubusercontent.com/assets/2618447/6316862/70f58fb6-ba03-11e4-82c9-c083bf9a6574.png)
 
-In case you did not find a suitable theme for your needs, please have a look at the wiki for [more of them](https://github.com/ohmyzsh/ohmyzsh/wiki/External-themes).
+In case you did not find a suitable theme for your needs, please have a look at the wiki for
+[more of them](https://github.com/ohmyzsh/ohmyzsh/wiki/External-themes).
 
-If you're feeling feisty, you can let the computer select one randomly for you each time you open a new terminal window.
+If you're feeling feisty, you can let the computer select one randomly for you each time you open a new
+terminal window.
 
 ```sh
 ZSH_THEME="random" # (...please let it be pie... please be some pie..)
 ```
 
-And if you want to pick random theme from a list of your favorite themes:
+And if you want to pick a random theme from a list of your favorite themes:
 
 ```sh
 ZSH_THEME_RANDOM_CANDIDATES=(
@@ -171,7 +235,8 @@ ZSH_THEME_RANDOM_IGNORED=(pygmalion tjkirch_mod)
 
 ### FAQ
 
-If you have some more questions or issues, you might find a solution in our [FAQ](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ).
+If you have some more questions or issues, you might find a solution in our
+[FAQ](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ).
 
 ## Advanced Topics
 
@@ -179,47 +244,50 @@ If you're the type that likes to get their hands dirty, these sections might res
 
 ### Advanced Installation
 
-Some users may want to manually install Oh My Zsh, or change the default path or other settings that
-the installer accepts (these settings are also documented at the top of the install script).
+Some users may want to manually install Oh My Zsh, or change the default path or other settings that the
+installer accepts (these settings are also documented at the top of the install script).
 
 #### Custom Directory
 
-The default location is `~/.oh-my-zsh` (hidden in your home directory, you can access it with `cd ~/.oh-my-zsh`)
+The default location is `~/.oh-my-zsh` (hidden in your home directory, you can access it with
+`cd ~/.oh-my-zsh`)
 
 If you'd like to change the install directory with the `ZSH` environment variable, either by running
-`export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline
-like this:
+`export ZSH=/your/path` before installing, or by setting it before the end of the install pipeline like this:
 
 ```sh
 ZSH="$HOME/.dotfiles/oh-my-zsh" sh install.sh
 ```
 
-#### Unattended install
+#### Unattended Install
 
-If you're running the Oh My Zsh install script as part of an automated install, you can pass the `--unattended`
-flag to the `install.sh` script. This will have the effect of not trying to change
-the default shell, and it also won't run `zsh` when the installation has finished.
+If you're running the Oh My Zsh install script as part of an automated install, you can pass the
+`--unattended` flag to the `install.sh` script. This will have the effect of not trying to change the default
+shell, and it also won't run `zsh` when the installation has finished.
 
 ```sh
 sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" "" --unattended
 ```
 
-#### Installing from a forked repository
+If you're in China, India, or another country that blocks `raw.githubusercontent.com`, you may have to
+substitute the URL for `https://install.ohmyz.sh` for it to install.
 
-The install script also accepts these variables to allow installation of a different repository:
+#### Installing From A Forked Repository
 
-- `REPO` (default: `ohmyzsh/ohmyzsh`): this takes the form of `owner/repository`. If you set
-  this variable, the installer will look for a repository at `https://github.com/{owner}/{repository}`.
+The install script also accepts these variables to allow the installation of a different repository:
 
-- `REMOTE` (default: `https://github.com/${REPO}.git`): this is the full URL of the git repository
-  clone. You can use this setting if you want to install from a fork that is not on GitHub (GitLab,
-  Bitbucket...) or if you want to clone with SSH instead of HTTPS (`git@github.com:user/project.git`).
+- `REPO` (default: `ohmyzsh/ohmyzsh`): this takes the form of `owner/repository`. If you set this variable,
+  the installer will look for a repository at `https://github.com/{owner}/{repository}`.
+
+- `REMOTE` (default: `https://github.com/${REPO}.git`): this is the full URL of the git repository clone. You
+  can use this setting if you want to install from a fork that is not on GitHub (GitLab, Bitbucket...) or if
+  you want to clone with SSH instead of HTTPS (`git@github.com:user/project.git`).
 
   _NOTE: it's incompatible with setting the `REPO` variable. This setting will take precedence._
 
 - `BRANCH` (default: `master`): you can use this setting if you want to change the default branch to be
-  checked out when cloning the repository. This might be useful for testing a Pull Request, or if you
-  want to use a branch other than `master`.
+  checked out when cloning the repository. This might be useful for testing a Pull Request, or if you want to
+  use a branch other than `master`.
 
 For example:
 
@@ -229,19 +297,19 @@ REPO=apjanke/oh-my-zsh BRANCH=edge sh install.sh
 
 #### Manual Installation
 
-##### 1. Clone the repository <!-- omit in toc -->
+##### 1. Clone The Repository <!-- omit in toc -->
 
 ```sh
 git clone https://github.com/ohmyzsh/ohmyzsh.git ~/.oh-my-zsh
 ```
 
-##### 2. _Optionally_, backup your existing `~/.zshrc` file <!-- omit in toc -->
+##### 2. _Optionally_, Backup Your Existing `~/.zshrc` File <!-- omit in toc -->
 
 ```sh
 cp ~/.zshrc ~/.zshrc.orig
 ```
 
-##### 3. Create a new zsh configuration file <!-- omit in toc -->
+##### 3. Create A New Zsh Configuration File <!-- omit in toc -->
 
 You can create a new zsh config file by copying the template that we have included for you.
 
@@ -249,7 +317,7 @@ You can create a new zsh config file by copying the template that we have includ
 cp ~/.oh-my-zsh/templates/zshrc.zsh-template ~/.zshrc
 ```
 
-##### 4. Change your default shell <!-- omit in toc -->
+##### 4. Change Your Default Shell <!-- omit in toc -->
 
 ```sh
 chsh -s $(which zsh)
@@ -257,7 +325,7 @@ chsh -s $(which zsh)
 
 You must log out from your user session and log back in to see this change.
 
-##### 5. Initialize your new zsh configuration <!-- omit in toc -->
+##### 5. Initialize Your New Zsh Configuration <!-- omit in toc -->
 
 Once you open up a new terminal window, it should load zsh with Oh My Zsh's configuration.
 
@@ -265,20 +333,111 @@ Once you open up a new terminal window, it should load zsh with Oh My Zsh's conf
 
 If you have any hiccups installing, here are a few common fixes.
 
-- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after switching to `oh-my-zsh`.
-- If you installed manually or changed the install location, check the `ZSH` environment variable in `~/.zshrc`.
+- You _might_ need to modify your `PATH` in `~/.zshrc` if you're not able to find some commands after
+  switching to `oh-my-zsh`.
+- If you installed manually or changed the install location, check the `ZSH` environment variable in
+  `~/.zshrc`.
 
-### Custom Plugins and Themes
+### Custom Plugins And Themes
 
-If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/` directory.
+If you want to override any of the default behaviors, just add a new file (ending in `.zsh`) in the `custom/`
+directory.
 
-If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the `custom/plugins/` directory and then enable this plugin.
+If you have many functions that go well together, you can put them as a `XYZ.plugin.zsh` file in the
+`custom/plugins/` directory and then enable this plugin.
 
-If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
+If you would like to override the functionality of a plugin distributed with Oh My Zsh, create a plugin of the
+same name in the `custom/plugins/` directory and it will be loaded instead of the one in `plugins/`.
+
+### Enable GNU ls In macOS And FreeBSD Systems
+
+<a name="enable-gnu-ls"></a>
+
+The default behaviour in Oh My Zsh is to use BSD `ls` in macOS and FreeBSD systems. If GNU `ls` is installed
+(as `gls` command), you can choose to use it instead. To do it, you can use zstyle-based config before
+sourcing `oh-my-zsh.sh`:
+
+```zsh
+zstyle ':omz:lib:theme-and-appearance' gnu-ls yes
+```
+
+_Note: this is not compatible with `DISABLE_LS_COLORS=true`_
+
+### Skip Aliases
+
+<a name="remove-directories-aliases"></a>
+
+If you want to skip default Oh My Zsh aliases (those defined in `lib/*` files) or plugin aliases, you can use
+the settings below in your `~/.zshrc` file, **before Oh My Zsh is loaded**. Note that there are many different
+ways to skip aliases, depending on your needs.
+
+```sh
+# Skip all aliases, in lib files and enabled plugins
+zstyle ':omz:*' aliases no
+
+# Skip all aliases in lib files
+zstyle ':omz:lib:*' aliases no
+# Skip only aliases defined in the directories.zsh lib file
+zstyle ':omz:lib:directories' aliases no
+
+# Skip all plugin aliases
+zstyle ':omz:plugins:*' aliases no
+# Skip only the aliases from the git plugin
+zstyle ':omz:plugins:git' aliases no
+```
+
+You can combine these in other ways taking into account that more specific scopes take precedence:
+
+```sh
+# Skip all plugin aliases, except for the git plugin
+zstyle ':omz:plugins:*' aliases no
+zstyle ':omz:plugins:git' aliases yes
+```
+
+A previous version of this feature was using the setting below, which has been removed:
+
+```sh
+zstyle ':omz:directories' aliases no
+```
+
+Instead, you can now use the following:
+
+```sh
+zstyle ':omz:lib:directories' aliases no
+```
+
+#### Notice <!-- omit in toc -->
+
+> This feature is currently in a testing phase and it may be subject to change in the future. It is also not
+> currently compatible with plugin managers such as zpm or zinit, which don't source the init script
+> (`oh-my-zsh.sh`) where this feature is implemented in.
+
+> It is also not currently aware of "aliases" that are defined as functions. Example of such are `gccd`,
+> `ggf`, or `ggl` functions from the git plugin.
+
+### Async git prompt
+
+Async prompt functions are an experimental feature (included on April 3, 2024) that allows Oh My Zsh to render
+prompt information asynchronously. This can improve prompt rendering performance, but it might not work well
+with some setups. We hope that's not an issue, but if you're seeing problems with this new feature, you can
+turn it off by setting the following in your .zshrc file, before Oh My Zsh is sourced:
+
+```sh
+zstyle ':omz:alpha:lib:git' async-prompt no
+```
+
+If your problem is that the git prompt just stopped appearing, you can try to force it by setting the following
+configuration before `oh-my-zsh.sh` is sourced. If it still does not work, please open an issue with your
+case.
+
+```sh
+zstyle ':omz:alpha:lib:git' async-prompt force
+```
 
 ## Getting Updates
 
-By default, you will be prompted to check for updates every 2 weeks. You can choose other update modes by adding a line to your `~/.zshrc` file, **before Oh My Zsh is loaded**:
+By default, you will be prompted to check for updates every 2 weeks. You can choose other update modes by
+adding a line to your `~/.zshrc` file, **before Oh My Zsh is loaded**:
 
 1. Automatic update without confirmation prompt:
 
@@ -307,54 +466,90 @@ zstyle ':omz:update' frequency 7
 zstyle ':omz:update' frequency 0
 ```
 
+### Updates Verbosity
+
+You can also limit the update verbosity with the following settings:
+
+```sh
+zstyle ':omz:update' verbose default # default update prompt
+
+zstyle ':omz:update' verbose minimal # only few lines
+
+zstyle ':omz:update' verbose silent # only errors
+```
+
 ### Manual Updates
 
-If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to wait a week?) you just need to run:
+If you'd like to update at any point in time (maybe someone just released a new plugin and you don't want to
+wait a week?) you just need to run:
 
 ```sh
 omz update
 ```
 
+> [!NOTE]
+> If you want to automate this process in a script, you should call directly the `upgrade` script, like this:
+>
+> ```sh
+> $ZSH/tools/upgrade.sh
+> ```
+>
+> See more options in the [FAQ: How do I update Oh My Zsh?](https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#how-do-i-update-oh-my-zsh).
+>
+> **USE OF `omz update --unattended` HAS BEEN REMOVED, AS IT HAS SIDE EFFECTS**.
+
 Magic! 🎉
 
 ## Uninstalling Oh My Zsh
 
 Oh My Zsh isn't for everyone. We'll miss you, but we want to make this an easy breakup.
 
-If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove itself and revert your previous `bash` or `zsh` configuration.
+If you want to uninstall `oh-my-zsh`, just run `uninstall_oh_my_zsh` from the command-line. It will remove
+itself and revert your previous `bash` or `zsh` configuration.
 
-## How do I contribute to Oh My Zsh?
+## How Do I Contribute To Oh My Zsh?
 
 Before you participate in our delightful community, please read the [code of conduct](CODE_OF_CONDUCT.md).
 
-I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send pull requests!
+I'm far from being a [Zsh](https://www.zsh.org/) expert and suspect there are many ways to improve – if you
+have ideas on how to make the configuration easier to maintain (and faster), don't hesitate to fork and send
+pull requests!
 
-We also need people to test out pull requests. So take a look through [the open issues](https://github.com/ohmyzsh/ohmyzsh/issues) and help where you can.
+We also need people to test out pull requests. So take a look through
+[the open issues](https://github.com/ohmyzsh/ohmyzsh/issues) and help where you can.
 
 See [Contributing](CONTRIBUTING.md) for more details.
 
-### Do NOT send us themes
+### Do Not Send Us Themes
 
-We have (more than) enough themes for the time being. Please add your theme to the [external themes](https://github.com/ohmyzsh/ohmyzsh/wiki/External-themes) wiki page.
+We have (more than) enough themes for the time being. Please add your theme to the
+[external themes](https://github.com/ohmyzsh/ohmyzsh/wiki/External-themes) wiki page.
 
 ## Contributors
 
-Oh My Zsh has a vibrant community of happy users and delightful contributors. Without all the time and help from our contributors, it wouldn't be so awesome.
+Oh My Zsh has a vibrant community of happy users and delightful contributors. Without all the time and help
+from our contributors, it wouldn't be so awesome.
 
 Thank you so much!
 
+<a href="https://github.com/ohmyzsh/ohmyzsh/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=ohmyzsh/ohmyzsh" width="100%"/>
+</a>
+
 ## Follow Us
 
 We're on social media:
 
-- [@ohmyzsh](https://twitter.com/ohmyzsh) on Twitter. You should follow it.
+- [@ohmyzsh](https://x.com/ohmyzsh) on X (formerly Twitter). You should follow it.
 - [Facebook](https://www.facebook.com/Oh-My-Zsh-296616263819290/) poke us.
 - [Instagram](https://www.instagram.com/_ohmyzsh/) tag us in your post showing Oh My Zsh!
 - [Discord](https://discord.gg/ohmyzsh) to chat with us!
 
 ## Merchandise
 
-We have [stickers, shirts, and coffee mugs available](https://shop.planetargon.com/collections/oh-my-zsh?utm_source=github) for you to show off your love of Oh My Zsh. Again, you will become the talk of the town!
+We have
+[stickers, shirts, and coffee mugs available](https://commitgoods.com/collections/oh-my-zsh?utm_source=github)
+for you to show off your love of Oh My Zsh. Again, you will become the talk of the town!
 
 ## License
 
@@ -364,4 +559,6 @@ Oh My Zsh is released under the [MIT license](LICENSE.txt).
 
 ![Planet Argon](https://pa-github-assets.s3.amazonaws.com/PARGON_logo_digital_COL-small.jpg)
 
-Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a [Ruby on Rails development agency](https://www.planetargon.com/skills/ruby-on-rails-development?utm_source=github). Check out our [other open source projects](https://www.planetargon.com/open-source?utm_source=github).
+Oh My Zsh was started by the team at [Planet Argon](https://www.planetargon.com/?utm_source=github), a
+[Ruby on Rails development agency](https://www.planetargon.com/services/ruby-on-rails-development?utm_source=github).
+Check out our [other open source projects](https://www.planetargon.com/open-source?utm_source=github).
diff --git a/zsh/SECURITY.md b/zsh/SECURITY.md
index 7e5c8ee..f823584 100644
--- a/zsh/SECURITY.md
+++ b/zsh/SECURITY.md
@@ -17,8 +17,7 @@ In the near future we will introduce versioning, so expect this section to chang
 
 **Do not submit an issue or pull request**: this might reveal the vulnerability.
 
-Instead, you should email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh).
+Instead, you should use the form to [privately report a vulnerability to us via GitHub](https://github.com/ohmyzsh/ohmyzsh/security/advisories/new)
+or email the maintainers directly at: [**security@ohmyz.sh**](mailto:security@ohmyz.sh).
 
 We will deal with the vulnerability privately and submit a patch as soon as possible.
-
-You can also submit your vulnerability report to [huntr.dev](https://huntr.dev/bounties/disclose/?utm_campaign=ohmyzsh%2Fohmyzsh&utm_medium=social&utm_source=github&target=https%3A%2F%2Fgithub.com%2Fohmyzsh%2Fohmyzsh) and see if you can get a bounty reward.
diff --git a/zsh/custom/example.zsh b/zsh/custom/example.zsh
index c505a96..c194f49 100644
--- a/zsh/custom/example.zsh
+++ b/zsh/custom/example.zsh
@@ -1,10 +1,12 @@
-# You can put files here to add functionality separated per file, which
-# will be ignored by git.
-# Files on the custom/ directory will be automatically loaded by the init
-# script, in alphabetical order.
-
-# For example: add yourself some shortcuts to projects you often work on.
+# Put files in this folder to add your own custom functionality.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization
+#
+# Files in the custom/ directory will be:
+# - loaded automatically by the init script, in alphabetical order
+# - loaded last, after all built-ins in the lib/ directory, to override them
+# - ignored by git by default
+#
+# Example: add custom/shortcuts.zsh for shortcuts to your local projects
 #
 # brainstormr=~/Projects/development/planetargon/brainstormr
 # cd $brainstormr
-#
diff --git a/zsh/custom/plugins/example/example.plugin.zsh b/zsh/custom/plugins/example/example.plugin.zsh
index 406f274..83611fe 100644
--- a/zsh/custom/plugins/example/example.plugin.zsh
+++ b/zsh/custom/plugins/example/example.plugin.zsh
@@ -1,2 +1,3 @@
 # Add your own custom plugins in the custom/plugins directory. Plugins placed
 # here will override ones with the same name in the main plugins directory.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-plugins
diff --git a/zsh/custom/plugins/yandex-cloud/yandex-cloud.plugin.zsh b/zsh/custom/plugins/yandex-cloud/yandex-cloud.plugin.zsh
deleted file mode 100644
index 7027bac..0000000
--- a/zsh/custom/plugins/yandex-cloud/yandex-cloud.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-# The next line updates PATH for Yandex Cloud CLI.
-if [ -f '$HOME/yandex-cloud/path.bash.inc' ]; then source '$HOME/yandex-cloud/path.bash.inc'; fi
-
-# The next line enables shell command completion for yc.
-if [ -f '$HOME/yandex-cloud/completion.zsh.inc' ]; then source '$HOME/yandex-cloud/completion.zsh.inc'; fi
diff --git a/zsh/custom/themes/example.zsh-theme b/zsh/custom/themes/example.zsh-theme
index ef8f1c6..5551207 100644
--- a/zsh/custom/themes/example.zsh-theme
+++ b/zsh/custom/themes/example.zsh-theme
@@ -1,4 +1,6 @@
 # Put your custom themes in this folder.
+# See: https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes
+#
 # Example:
 
 PROMPT="%{$fg[red]%}%n%{$reset_color%}@%{$fg[blue]%}%m %{$fg[yellow]%}%~ %{$reset_color%}%% "
diff --git a/zsh/lib/async_prompt.zsh b/zsh/lib/async_prompt.zsh
new file mode 100644
index 0000000..151e24b
--- /dev/null
+++ b/zsh/lib/async_prompt.zsh
@@ -0,0 +1,145 @@
+# The async code is taken from
+# https://github.com/zsh-users/zsh-autosuggestions/blob/master/src/async.zsh
+# https://github.com/woefe/git-prompt.zsh/blob/master/git-prompt.zsh
+
+zmodload zsh/system
+autoload -Uz is-at-least
+
+# For now, async prompt function handlers are set up like so:
+# First, define the async function handler and register the handler
+# with _omz_register_handler:
+#
+#  function _git_prompt_status_async {
+#    # Do some expensive operation that outputs to stdout
+#  }
+#  _omz_register_handler _git_prompt_status_async
+#
+# Then add a stub prompt function in `$PROMPT` or similar prompt variables,
+# which will show the output of "$_OMZ_ASYNC_OUTPUT[handler_name]":
+#
+#  function git_prompt_status {
+#    echo -n $_OMZ_ASYNC_OUTPUT[_git_prompt_status_async]
+#  }
+#
+#  RPROMPT='$(git_prompt_status)'
+#
+# This API is subject to change and optimization. Rely on it at your own risk.
+
+function _omz_register_handler {
+  setopt localoptions noksharrays unset
+  typeset -ga _omz_async_functions
+  # we want to do nothing if there's no $1 function or we already set it up
+  if [[ -z "$1" ]] || (( ! ${+functions[$1]} )) \
+    || (( ${_omz_async_functions[(Ie)$1]} )); then
+    return
+  fi
+  _omz_async_functions+=("$1")
+  # let's add the hook to async_request if it's not there yet
+  if (( ! ${precmd_functions[(Ie)_omz_async_request]} )) \
+    && (( ${+functions[_omz_async_request]})); then
+    autoload -Uz add-zsh-hook
+    add-zsh-hook precmd _omz_async_request
+  fi
+}
+
+# Set up async handlers and callbacks
+function _omz_async_request {
+  setopt localoptions noksharrays unset
+  local -i ret=$?
+  typeset -gA _OMZ_ASYNC_FDS _OMZ_ASYNC_PIDS _OMZ_ASYNC_OUTPUT
+
+  # executor runs a subshell for all async requests based on key
+  local handler
+  for handler in ${_omz_async_functions}; do
+    (( ${+functions[$handler]} )) || continue
+
+    local fd=${_OMZ_ASYNC_FDS[$handler]:--1}
+    local pid=${_OMZ_ASYNC_PIDS[$handler]:--1}
+
+    # If we've got a pending request, cancel it
+    if (( fd != -1 && pid != -1 )) && { true <&$fd } 2>/dev/null; then
+      # Close the file descriptor and remove the handler
+      exec {fd}<&-
+      zle -F $fd
+
+      # 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 async function handler
+        kill -TERM -$pid 2>/dev/null
+      else
+        # Kill just the child process since it wasn't placed in a new process
+        # group. If the async function handler forked any child processes they may
+        # be orphaned and left behind.
+        kill -TERM $pid 2>/dev/null
+      fi
+    fi
+
+    # Define global variables to store the file descriptor, PID and output
+    _OMZ_ASYNC_FDS[$handler]=-1
+    _OMZ_ASYNC_PIDS[$handler]=-1
+
+    # Fork a process to fetch the git status and open a pipe to read from it
+    exec {fd}< <(
+      # Tell parent process our PID
+      builtin echo ${sysparams[pid]}
+      # Set exit code for the handler if used
+      () { return $ret }
+      # Run the async function handler
+      $handler
+    )
+
+    # Save FD for handler
+    _OMZ_ASYNC_FDS[$handler]=$fd
+
+    # 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
+    # and https://github.com/zsh-users/zsh-autosuggestions/pull/612
+    is-at-least 5.8 || command true
+
+    # Save the PID from the handler child process
+    read -u $fd "_OMZ_ASYNC_PIDS[$handler]"
+
+    # When the fd is readable, call the response handler
+    zle -F "$fd" _omz_async_callback
+  done
+}
+
+# Called when new data is ready to be read from the pipe
+function _omz_async_callback() {
+  emulate -L zsh
+
+  local fd=$1   # First arg will be fd ready for reading
+  local err=$2  # Second arg will be passed in case of error
+
+  if [[ -z "$err" || "$err" == "hup" ]]; then
+    # Get handler name from fd
+    local handler="${(k)_OMZ_ASYNC_FDS[(r)$fd]}"
+
+    # Store old output which is supposed to be already printed
+    local old_output="${_OMZ_ASYNC_OUTPUT[$handler]}"
+
+    # Read output from fd
+    IFS= read -r -u $fd -d '' "_OMZ_ASYNC_OUTPUT[$handler]"
+
+    # Repaint prompt if output has changed
+    if [[ "$old_output" != "${_OMZ_ASYNC_OUTPUT[$handler]}" ]]; then
+      zle .reset-prompt
+      zle -R
+    fi
+
+    # Close the fd
+    exec {fd}<&-
+  fi
+
+  # Always remove the handler
+  zle -F "$fd"
+
+  # Unset global FD variable to prevent closing user created FDs in the precmd hook
+  _OMZ_ASYNC_FDS[$handler]=-1
+  _OMZ_ASYNC_PIDS[$handler]=-1
+}
+
+autoload -Uz add-zsh-hook
+add-zsh-hook precmd _omz_async_request
diff --git a/zsh/lib/bzr.zsh b/zsh/lib/bzr.zsh
index 005a165..78273d5 100644
--- a/zsh/lib/bzr.zsh
+++ b/zsh/lib/bzr.zsh
@@ -1,10 +1,14 @@
 ## Bazaar integration
-## Just works with the GIT integration just add $(bzr_prompt_info) to the PROMPT
+## Just works with the GIT integration. Add $(bzr_prompt_info) to the PROMPT
 function bzr_prompt_info() {
-	BZR_CB=`bzr nick 2> /dev/null | grep -v "ERROR" | cut -d ":" -f2 | awk -F / '{print "bzr::"$1}'`
-	if [ -n "$BZR_CB" ]; then
-		BZR_DIRTY=""
-		[[ -n `bzr status` ]] && BZR_DIRTY=" %{$fg[red]%} * %{$fg[green]%}"
-		echo "$ZSH_THEME_SCM_PROMPT_PREFIX$BZR_CB$BZR_DIRTY$ZSH_THEME_GIT_PROMPT_SUFFIX"
-	fi
-}
\ No newline at end of file
+    local bzr_branch
+    bzr_branch=$(bzr nick 2>/dev/null) || return
+
+    if [[ -n "$bzr_branch" ]]; then
+        local bzr_dirty=""
+        if [[ -n $(bzr status 2>/dev/null) ]]; then
+            bzr_dirty=" %{$fg[red]%}*%{$reset_color%}"
+        fi
+        printf "%s%s%s%s" "$ZSH_THEME_SCM_PROMPT_PREFIX" "bzr::${bzr_branch##*:}" "$bzr_dirty" "$ZSH_THEME_GIT_PROMPT_SUFFIX"
+    fi
+}
diff --git a/zsh/lib/cli.zsh b/zsh/lib/cli.zsh
index fed00d2..55938ba 100644
--- a/zsh/lib/cli.zsh
+++ b/zsh/lib/cli.zsh
@@ -1,6 +1,7 @@
 #!/usr/bin/env zsh
 
 function omz {
+  setopt localoptions noksharrays
   [[ $# -gt 0 ]] || {
     _omz::help
     return 1
@@ -11,7 +12,7 @@ function omz {
 
   # Subcommand functions start with _ so that they don't
   # appear as completion entries when looking for `omz`
-  (( $+functions[_omz::$command] )) || {
+  (( ${+functions[_omz::$command]} )) || {
     _omz::help
     return 1
   }
@@ -27,6 +28,7 @@ function _omz {
     'plugin:Manage plugins'
     'pr:Manage Oh My Zsh Pull Requests'
     'reload:Reload the current zsh session'
+    'shop:Open the Oh My Zsh shop'
     'theme:Manage themes'
     'update:Update Oh My Zsh'
     'version:Show the version'
@@ -71,6 +73,10 @@ function _omz {
         local -aU plugins
         plugins=("$ZSH"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t) "$ZSH_CUSTOM"/plugins/*/{_*,*.plugin.zsh}(-.N:h:t))
         _describe 'plugin' plugins ;;
+      plugin::list)
+        local -a opts
+        opts=('--enabled:List enabled plugins only')
+        _describe -o 'options' opts ;;
       theme::(set|use))
         local -aU themes
         themes=("$ZSH"/themes/*.zsh-theme(-.N:t:r) "$ZSH_CUSTOM"/**/*.zsh-theme(-.N:r:gs:"$ZSH_CUSTOM"/themes/:::gs:"$ZSH_CUSTOM"/:::))
@@ -168,6 +174,7 @@ Available commands:
   plugin <command>    Manage plugins
   pr     <command>    Manage Oh My Zsh Pull Requests
   reload              Reload the current zsh session
+  shop                Open the Oh My Zsh shop
   theme  <command>    Manage themes
   update              Update Oh My Zsh
   version             Show the version
@@ -192,7 +199,7 @@ EOF
     return 1
   fi
 
-  "$ZSH/tools/changelog.sh" "$version" "${2:-}" "$format"
+  ZSH="$ZSH" command zsh -f "$ZSH/tools/changelog.sh" "$version" "${2:-}" "$format"
 }
 
 function _omz::plugin {
@@ -205,7 +212,7 @@ Available commands:
   disable <plugin> Disable plugin(s)
   enable <plugin>  Enable plugin(s)
   info <plugin>    Get information of a plugin
-  list             List all available Oh My Zsh plugins
+  list [--enabled] List Oh My Zsh plugins
   load <plugin>    Load plugin(s)
 
 EOF
@@ -241,10 +248,18 @@ function _omz::plugin::disable {
 
   # Remove plugins substitution awk script
   local awk_subst_plugins="\
-  gsub(/[ \t]+(${(j:|:)dis_plugins})/, \"\") # with spaces before
-  gsub(/(${(j:|:)dis_plugins})[ \t]+/, \"\") # with spaces after
-  gsub(/\((${(j:|:)dis_plugins})\)/, \"\") # without spaces (only plugin)
+  gsub(/[ \t]+(${(j:|:)dis_plugins})[ \t]+/, \" \") # with spaces before or after
+  gsub(/[ \t]+(${(j:|:)dis_plugins})$/, \"\")       # with spaces before and EOL
+  gsub(/^(${(j:|:)dis_plugins})[ \t]+/, \"\")       # with BOL and spaces after
+
+  gsub(/\((${(j:|:)dis_plugins})[ \t]+/, \"(\")     # with parenthesis before and spaces after
+  gsub(/[ \t]+(${(j:|:)dis_plugins})\)/, \")\")     # with spaces before or parenthesis after
+  gsub(/\((${(j:|:)dis_plugins})\)/, \"()\")        # with only parentheses
+
+  gsub(/^(${(j:|:)dis_plugins})\)/, \")\")          # with BOL and closing parenthesis
+  gsub(/\((${(j:|:)dis_plugins})$/, \"(\")          # with opening parenthesis and EOL
 "
+
   # Disable plugins awk script
   local awk_script="
 # if plugins=() is in oneline form, substitute disabled plugins and go to next line
@@ -336,20 +351,40 @@ function _omz::plugin::enable {
   next
 }
 
-# if plugins=() is in multiline form, enable multi flag
+# if plugins=() is in multiline form, enable multi flag and indent by default with 2 spaces
 /^[ \t]*plugins=\(/ {
   multi=1
+  indent=\"  \"
+  print \$0
+  next
 }
 
 # if multi flag is enabled and we find a valid closing parenthesis,
-# add new plugins and disable multi flag
+# add new plugins with proper indent and disable multi flag
 multi == 1 && /^[^#]*\)/ {
   multi=0
-  sub(/\)/, \" $add_plugins&\")
+  split(\"$add_plugins\",p,\" \")
+  for (i in p) {
+    print indent p[i]
+  }
   print \$0
   next
 }
 
+# if multi flag is enabled and we didnt find a closing parenthesis,
+# get the indentation level to match when adding plugins
+multi == 1 && /^[^#]*/ {
+  indent=\"\"
+  for (i = 1; i <= length(\$0); i++) {
+    char=substr(\$0, i, 1)
+    if (char == \" \" || char == \"\t\") {
+      indent = indent char
+    } else {
+      break
+    }
+  }
+}
+
 { print \$0 }
 "
 
@@ -389,8 +424,23 @@ function _omz::plugin::info {
   local readme
   for readme in "$ZSH_CUSTOM/plugins/$1/README.md" "$ZSH/plugins/$1/README.md"; do
     if [[ -f "$readme" ]]; then
-      (( ${+commands[less]} )) && less "$readme" || cat "$readme"
-      return 0
+      # If being piped, just cat the README
+      if [[ ! -t 1 ]]; then
+        cat "$readme"
+        return $?
+      fi
+
+      # Enrich the README display depending on the tools we have
+      # - glow: https://github.com/charmbracelet/glow
+      # - bat: https://github.com/sharkdp/bat
+      # - less: typical pager command
+      case 1 in
+        ${+commands[glow]}) glow -p "$readme" ;;
+        ${+commands[bat]}) bat -l md --style plain "$readme" ;;
+        ${+commands[less]}) less "$readme" ;;
+        *) cat "$readme" ;;
+      esac
+      return $?
     fi
   done
 
@@ -405,8 +455,21 @@ function _omz::plugin::info {
 
 function _omz::plugin::list {
   local -a custom_plugins builtin_plugins
-  custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
-  builtin_plugins=("$ZSH"/plugins/*(-/N:t))
+
+  # If --enabled is provided, only list what's enabled
+  if [[ "$1" == "--enabled" ]]; then
+    local plugin
+    for plugin in "${plugins[@]}"; do
+      if [[ -d "${ZSH_CUSTOM}/plugins/${plugin}" ]]; then
+        custom_plugins+=("${plugin}")
+      elif [[ -d "${ZSH}/plugins/${plugin}" ]]; then
+        builtin_plugins+=("${plugin}")
+      fi
+    done
+  else
+    custom_plugins=("$ZSH_CUSTOM"/plugins/*(-/N:t))
+    builtin_plugins=("$ZSH"/plugins/*(-/N:t))
+  fi
 
   # If the command is being piped, print all found line by line
   if [[ ! -t 1 ]]; then
@@ -448,7 +511,7 @@ function _omz::plugin::load {
     if [[ ! -f "$base/_$plugin" && ! -f "$base/$plugin.plugin.zsh" ]]; then
       _omz::log warn "'$plugin' is not a valid plugin"
       continue
-    # It it is a valid plugin, add its directory to $fpath unless it is already there
+    # It is a valid plugin, add its directory to $fpath unless it is already there
     elif (( ! ${fpath[(Ie)$base]} )); then
       fpath=("$base" $fpath)
     fi
@@ -560,10 +623,48 @@ function _omz::pr::test {
     done
 
     (( $found )) || {
-      _omz::log error "could not found the ohmyzsh git remote. Aborting..."
+      _omz::log error "could not find the ohmyzsh git remote. Aborting..."
       return 1
     }
 
+    # Check if Pull Request has the "testers needed" label
+    _omz::log info "checking if PR #$1 has the 'testers needed' label..."
+    local pr_json label label_id="MDU6TGFiZWw4NzY1NTkwNA=="
+    pr_json=$(
+      curl -fsSL \
+        -H "Accept: application/vnd.github+json" \
+        -H "X-GitHub-Api-Version: 2022-11-28" \
+        "https://api.github.com/repos/ohmyzsh/ohmyzsh/pulls/$1"
+    )
+
+    if [[ $? -gt 0 || -z "$pr_json" ]]; then
+      _omz::log error "error when trying to fetch PR #$1 from GitHub."
+      return 1
+    fi
+
+    # Check if the label is present with jq or grep
+    if (( $+commands[jq] )); then
+      label="$(command jq ".labels.[] | select(.node_id == \"$label_id\")" <<< "$pr_json")"
+    else
+      label="$(command grep "\"$label_id\"" <<< "$pr_json" 2>/dev/null)"
+    fi
+
+    # If a maintainer hasn't labeled the PR to test, explain the security risk
+    if [[ -z "$label" ]]; then
+      _omz::log warn "PR #$1 does not have the 'testers needed' label. This means that the PR"
+      _omz::log warn "has not been reviewed by a maintainer and may contain malicious code."
+
+      # Ask for explicit confirmation: user needs to type "yes" to continue
+      _omz::log prompt "Do you want to continue testing it? [yes/N] "
+      builtin read -r
+      if [[ "${REPLY:l}" != yes ]]; then
+        _omz::log error "PR test canceled. Please ask a maintainer to review and label the PR."
+        return 1
+      else
+        _omz::log warn "Continuing to check out and test PR #$1. Be careful!"
+      fi
+    fi
+
     # Fetch pull request head
     _omz::log info "fetching PR #$1 to ohmyzsh/pull-$1..."
     command git fetch -f "$remote" refs/pull/$1/head:ohmyzsh/pull-$1 || {
@@ -622,6 +723,15 @@ function _omz::pr::test {
   )
 }
 
+function _omz::shop {
+  local shop_url="https://commitgoods.com/collections/oh-my-zsh"
+  
+  _omz::log info "Opening Oh My Zsh shop in your browser..."
+  _omz::log info "$shop_url"
+  
+  open_command "$shop_url"
+}
+
 function _omz::reload {
   # Delete current completion cache
   command rm -f $_comp_dumpfile $ZSH_COMPDUMP
@@ -773,14 +883,28 @@ function _omz::theme::use {
 }
 
 function _omz::update {
-  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD)
+  # Check if git command is available
+  (( $+commands[git] )) || {
+    _omz::log error "git is not installed. Aborting..."
+    return 1
+  }
+
+  # Check if --unattended was passed
+  [[ "$1" != --unattended ]] || {
+    _omz::log error "the \`\e[2m--unattended\e[0m\` flag is no longer supported, use the \`\e[2mupgrade.sh\e[0m\` script instead."
+    _omz::log error "for more information see https://github.com/ohmyzsh/ohmyzsh/wiki/FAQ#how-do-i-update-oh-my-zsh"
+    return 1
+  }
+
+  local last_commit=$(builtin cd -q "$ZSH"; git rev-parse HEAD 2>/dev/null)
+  [[ $? -eq 0 ]] || {
+    _omz::log error "\`$ZSH\` is not a git directory. Aborting..."
+    return 1
+  }
 
   # Run update script
-  if [[ "$1" != --unattended ]]; then
-    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" --interactive || return $?
-  else
-    ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" || return $?
-  fi
+  zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
+  ZSH="$ZSH" command zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode || return $?
 
   # Update last updated file
   zmodload zsh/datetime
@@ -789,7 +913,7 @@ function _omz::update {
   command rm -rf "$ZSH/log/update.lock"
 
   # Restart the zsh session if there were changes
-  if [[ "$1" != --unattended && "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
+  if [[ "$(builtin cd -q "$ZSH"; git rev-parse HEAD)" != "$last_commit" ]]; then
     # Old zsh versions don't have ZSH_ARGZERO
     local zsh="${ZSH_ARGZERO:-${functrace[-1]%:*}}"
     # Check whether to run a login shell
diff --git a/zsh/lib/clipboard.zsh b/zsh/lib/clipboard.zsh
index ad83fc4..27e8152 100644
--- a/zsh/lib/clipboard.zsh
+++ b/zsh/lib/clipboard.zsh
@@ -57,9 +57,12 @@ function detect-clipboard() {
   elif [[ "${OSTYPE}" == (cygwin|msys)* ]]; then
     function clipcopy() { cat "${1:-/dev/stdin}" > /dev/clipboard; }
     function clippaste() { cat /dev/clipboard; }
+  elif (( $+commands[clip.exe] )) && (( $+commands[powershell.exe] )); then
+    function clipcopy() { cat "${1:-/dev/stdin}" | clip.exe; }
+    function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
   elif [ -n "${WAYLAND_DISPLAY:-}" ] && (( ${+commands[wl-copy]} )) && (( ${+commands[wl-paste]} )); then
     function clipcopy() { cat "${1:-/dev/stdin}" | wl-copy &>/dev/null &|; }
-    function clippaste() { wl-paste; }
+    function clippaste() { wl-paste --no-newline; }
   elif [ -n "${DISPLAY:-}" ] && (( ${+commands[xsel]} )); then
     function clipcopy() { cat "${1:-/dev/stdin}" | xsel --clipboard --input; }
     function clippaste() { xsel --clipboard --output; }
@@ -79,11 +82,8 @@ function detect-clipboard() {
     function clipcopy() { cat "${1:-/dev/stdin}" | termux-clipboard-set; }
     function clippaste() { termux-clipboard-get; }
   elif [ -n "${TMUX:-}" ] && (( ${+commands[tmux]} )); then
-    function clipcopy() { tmux load-buffer "${1:--}"; }
+    function clipcopy() { tmux load-buffer -w "${1:--}"; }
     function clippaste() { tmux save-buffer -; }
-  elif [[ $(uname -r) = *icrosoft* ]]; then
-    function clipcopy() { cat "${1:-/dev/stdin}" | clip.exe; }
-    function clippaste() { powershell.exe -noprofile -command Get-Clipboard; }
   else
     function _retry_clipboard_detection_or_fail() {
       local clipcmd="${1}"; shift
@@ -100,8 +100,8 @@ function detect-clipboard() {
   fi
 }
 
-# Detect at startup. A non-zero exit here indicates that the dummy clipboards were set,
-# which is not really an error. If the user calls them, they will attempt to redetect
-# (for example, perhaps the user has now installed xclip) and then either print an error
-# or proceed successfully.
-detect-clipboard || true
+function clipcopy clippaste {
+  unfunction clipcopy clippaste
+  detect-clipboard || true # let one retry
+  "$0" "$@"
+}
diff --git a/zsh/lib/compfix.zsh b/zsh/lib/compfix.zsh
index b09b283..2fe9d9e 100644
--- a/zsh/lib/compfix.zsh
+++ b/zsh/lib/compfix.zsh
@@ -13,7 +13,7 @@ function handle_completion_insecurities() {
   #     /usr/share/zsh/5.0.6
   #
   # Since the ignorable first line is printed to stderr and thus not captured,
-  # stderr is squelched to prevent this output from leaking to the user. 
+  # stderr is squelched to prevent this output from leaking to the user.
   local -aU insecure_dirs
   insecure_dirs=( ${(f@):-"$(compaudit 2>/dev/null)"} )
 
diff --git a/zsh/lib/completion.zsh b/zsh/lib/completion.zsh
index 2c56954..3823c25 100644
--- a/zsh/lib/completion.zsh
+++ b/zsh/lib/completion.zsh
@@ -18,9 +18,9 @@ if [[ "$CASE_SENSITIVE" = true ]]; then
   zstyle ':completion:*' matcher-list 'r:|=*' 'l:|=* r:|=*'
 else
   if [[ "$HYPHEN_INSENSITIVE" = true ]]; then
-    zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*'
+    zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]-_}={[:upper:][:lower:]_-}' 'r:|=*' 'l:|=* r:|=*'
   else
-    zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|=*' 'l:|=* r:|=*'
+    zstyle ':completion:*' matcher-list 'm:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'r:|=*' 'l:|=* r:|=*'
   fi
 fi
 unset CASE_SENSITIVE HYPHEN_INSENSITIVE
@@ -40,7 +40,7 @@ fi
 # disable named-directories autocompletion
 zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
 
-# Use caching so that commands like apt and dpkg complete are useable
+# Use caching so that commands like apt and dpkg complete are usable
 zstyle ':completion:*' use-cache yes
 zstyle ':completion:*' cache-path $ZSH_CACHE_DIR
 
@@ -49,7 +49,7 @@ zstyle ':completion:*:*:*:users' ignored-patterns \
         adm amanda apache at avahi avahi-autoipd beaglidx bin cacti canna \
         clamav daemon dbus distcache dnsmasq dovecot fax ftp games gdm \
         gkrellmd gopher hacluster haldaemon halt hsqldb ident junkbust kdm \
-        ldap lp mail mailman mailnull man messagebus  mldonkey mysql nagios \
+        ldap lp mail mailman mailnull man messagebus mldonkey mysql nagios \
         named netdump news nfsnobody nobody nscd ntp nut nx obsrun openvpn \
         operator pcap polkitd postfix postgres privoxy pulse pvm quagga radvd \
         rpc rpcuser rpm rtkit scard shutdown squid sshd statd svn sync tftp \
diff --git a/zsh/lib/correction.zsh b/zsh/lib/correction.zsh
index 4259d34..ba9664f 100644
--- a/zsh/lib/correction.zsh
+++ b/zsh/lib/correction.zsh
@@ -1,13 +1,8 @@
 if [[ "$ENABLE_CORRECTION" == "true" ]]; then
   alias cp='nocorrect cp'
-  alias ebuild='nocorrect ebuild'
-  alias gist='nocorrect gist'
-  alias heroku='nocorrect heroku'
-  alias hpodder='nocorrect hpodder'
   alias man='nocorrect man'
   alias mkdir='nocorrect mkdir'
   alias mv='nocorrect mv'
-  alias mysql='nocorrect mysql'
   alias sudo='nocorrect sudo'
   alias su='nocorrect su'
 
diff --git a/zsh/lib/diagnostics.zsh b/zsh/lib/diagnostics.zsh
index eaeba7d..d67e6fa 100644
--- a/zsh/lib/diagnostics.zsh
+++ b/zsh/lib/diagnostics.zsh
@@ -30,7 +30,7 @@
 #
 # This is written in a defensive style so it still works (and can detect) cases when
 # basic functionality like echo and which have been redefined. In particular, almost
-# everything is invoked with "builtin" or "command", to work in the face of user 
+# everything is invoked with "builtin" or "command", to work in the face of user
 # redefinitions.
 #
 # OPTIONS
@@ -59,7 +59,7 @@ function omz_diagnostic_dump() {
   emulate -L zsh
 
   builtin echo "Generating diagnostic dump; please be patient..."
-  
+
   local thisfcn=omz_diagnostic_dump
   local -A opts
   local opt_verbose opt_noverbose opt_outfile
@@ -90,7 +90,7 @@ function omz_diagnostic_dump() {
   builtin echo
   builtin echo Diagnostic dump file created at: "$outfile"
   builtin echo
-  builtin echo To share this with OMZ developers, post it as a gist on GitHub 
+  builtin echo To share this with OMZ developers, post it as a gist on GitHub
   builtin echo at "https://gist.github.com" and share the link to the gist.
   builtin echo
   builtin echo "WARNING: This dump file contains all your zsh and omz configuration files,"
@@ -105,8 +105,8 @@ function _omz_diag_dump_one_big_text() {
   builtin echo oh-my-zsh diagnostic dump
   builtin echo
   builtin echo $outfile
-  builtin echo 
-  
+  builtin echo
+
   # Basic system and zsh information
   command date
   command uname -a
@@ -151,7 +151,7 @@ function _omz_diag_dump_one_big_text() {
 
   # Core command definitions
   _omz_diag_dump_check_core_commands || return 1
-  builtin echo  
+  builtin echo
 
   # ZSH Process state
   builtin echo Process state:
@@ -167,7 +167,7 @@ function _omz_diag_dump_one_big_text() {
   #TODO: Should this include `env` instead of or in addition to `export`?
   builtin echo Exported:
   builtin echo $(builtin export | command sed 's/=.*//')
-  builtin echo 
+  builtin echo
   builtin echo Locale:
   command locale
   builtin echo
@@ -181,7 +181,7 @@ function _omz_diag_dump_one_big_text() {
   builtin echo
   builtin echo 'compaudit output:'
   compaudit
-  builtin echo 
+  builtin echo
   builtin echo '$fpath directories:'
   command ls -lad $fpath
   builtin echo
@@ -224,7 +224,7 @@ function _omz_diag_dump_one_big_text() {
   local cfgfile cfgfiles
   # Some files for bash that zsh does not use are intentionally included
   # to help with diagnosing behavior differences between bash and zsh
-  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout 
+  cfgfiles=( /etc/zshenv /etc/zprofile /etc/zshrc /etc/zlogin /etc/zlogout
     $zdotdir/.zshenv $zdotdir/.zprofile $zdotdir/.zshrc $zdotdir/.zlogin $zdotdir/.zlogout
     ~/.zsh.pre-oh-my-zsh
     /etc/bashrc /etc/profile ~/.bashrc ~/.profile ~/.bash_profile ~/.bash_logout )
@@ -258,8 +258,8 @@ function _omz_diag_dump_check_core_commands() {
   # (For back-compatibility, if any of these are newish, they should be removed,
   # or at least made conditional on the version of the current running zsh.)
   # "history" is also excluded because OMZ is known to redefine that
-  reserved_words=( do done esac then elif else fi for case if while function 
-    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}' 
+  reserved_words=( do done esac then elif else fi for case if while function
+    repeat time until select coproc nocorrect foreach end '!' '[[' '{' '}'
     )
   builtins=( alias autoload bg bindkey break builtin bye cd chdir command
     comparguments compcall compctl compdescribe compfiles compgroups compquote comptags
@@ -331,7 +331,7 @@ function _omz_diag_dump_os_specific_version() {
   case "$OSTYPE" in
     darwin*)
       osname=$(command sw_vers -productName)
-      osver=$(command sw_vers -productVersion)      
+      osver=$(command sw_vers -productVersion)
       builtin echo "OS Version: $osname $osver build $(sw_vers -buildVersion)"
       ;;
     cygwin)
diff --git a/zsh/lib/directories.zsh b/zsh/lib/directories.zsh
index c62f564..8927a56 100644
--- a/zsh/lib/directories.zsh
+++ b/zsh/lib/directories.zsh
@@ -1,8 +1,10 @@
 # Changing/making/removing directory
+setopt auto_cd
 setopt auto_pushd
 setopt pushd_ignore_dups
 setopt pushdminus
 
+
 alias -g ...='../..'
 alias -g ....='../../..'
 alias -g .....='../../../..'
diff --git a/zsh/lib/functions.zsh b/zsh/lib/functions.zsh
index dfcc4d9..330b0e3 100644
--- a/zsh/lib/functions.zsh
+++ b/zsh/lib/functions.zsh
@@ -5,7 +5,7 @@ function zsh_stats() {
 }
 
 function uninstall_oh_my_zsh() {
-  env ZSH="$ZSH" sh "$ZSH/tools/uninstall.sh"
+  command env ZSH="$ZSH" sh "$ZSH/tools/uninstall.sh"
 }
 
 function upgrade_oh_my_zsh() {
@@ -23,6 +23,9 @@ function open_command() {
     linux*)   [[ "$(uname -r)" != *icrosoft* ]] && open_cmd='nohup xdg-open' || {
                 open_cmd='cmd.exe /c start ""'
                 [[ -e "$1" ]] && { 1="$(wslpath -w "${1:a}")" || return 1 }
+                [[ "$1" = (http|https)://* ]] && {
+                  1="$(echo "$1" | sed -E 's/([&|()<>^])/^\1/g')" || return 1
+                }
               } ;;
     msys*)    open_cmd='start ""' ;;
     *)        echo "Platform $OSTYPE not supported"
@@ -30,6 +33,13 @@ function open_command() {
               ;;
   esac
 
+  # If a URL is passed, $BROWSER might be set to a local browser within SSH.
+  # See https://github.com/ohmyzsh/ohmyzsh/issues/11098
+  if [[ -n "$BROWSER" && "$1" = (http|https)://* ]]; then
+    "$BROWSER" "$@"
+    return
+  fi
+
   ${=open_cmd} "$@" &>/dev/null
 }
 
@@ -50,14 +60,26 @@ function takeurl() {
   cd "$thedir"
 }
 
+function takezip() {
+  local data thedir
+  data="$(mktemp)"
+  curl -L "$1" > "$data"
+  unzip "$data" -d "./"
+  thedir="$(unzip -l "$data" | awk 'NR==4 {print $4}' | sed 's/\/.*//')"
+  rm "$data"
+  cd "$thedir"
+}
+
 function takegit() {
   git clone "$1"
   cd "$(basename ${1%%.git})"
 }
 
 function take() {
-  if [[ $1 =~ ^(https?|ftp).*\.tar\.(gz|bz2|xz)$ ]]; then
+  if [[ $1 =~ ^(https?|ftp).*\.(tar\.(gz|bz2|xz)|tgz)$ ]]; then
     takeurl "$1"
+  elif [[ $1 =~ ^(https?|ftp).*\.(zip)$ ]]; then
+    takezip "$1"
   elif [[ $1 =~ ^([A-Za-z0-9]\+@|https?|git|ssh|ftps?|rsync).*\.git/?$ ]]; then
     takegit "$1"
   else
@@ -153,6 +175,8 @@ zmodload zsh/langinfo
 #    -P causes spaces to be encoded as '%20' instead of '+'
 function omz_urlencode() {
   emulate -L zsh
+  setopt norematchpcre
+
   local -a opts
   zparseopts -D -E -a opts r m P
 
@@ -175,6 +199,8 @@ function omz_urlencode() {
   fi
 
   # Use LC_CTYPE=C to process text byte-by-byte
+  # Note that this doesn't work in Termux, as it only has UTF-8 locale.
+  # Characters will be processed as UTF-8, which is fine for URLs.
   local i byte ord LC_ALL=C
   export LC_ALL
   local reserved=';/?:@&=+$,'
@@ -199,6 +225,9 @@ function omz_urlencode() {
     else
       if [[ "$byte" == " " && -n $spaces_as_plus ]]; then
         url_str+="+"
+      elif [[ "$PREFIX" = *com.termux* ]]; then
+        # Termux does not have non-UTF8 locales, so just send the UTF-8 character directly
+        url_str+="$byte"
       else
         ord=$(( [##16] #byte ))
         url_str+="%$ord"
diff --git a/zsh/lib/git.zsh b/zsh/lib/git.zsh
index be9fa7e..8d38f32 100644
--- a/zsh/lib/git.zsh
+++ b/zsh/lib/git.zsh
@@ -1,3 +1,5 @@
+autoload -Uz is-at-least
+
 # The git prompt's git commands are read-only and should not interfere with
 # other processes. This environment variable is equivalent to running with `git
 # --no-optional-locks`, but falls back gracefully for older versions of git.
@@ -9,16 +11,21 @@ function __git_prompt_git() {
   GIT_OPTIONAL_LOCKS=0 command git "$@"
 }
 
-function git_prompt_info() {
+function _omz_git_prompt_info() {
   # If we are on a folder not tracked by git, get out.
   # Otherwise, check for hide-info at global and local repository level
   if ! __git_prompt_git rev-parse --git-dir &> /dev/null \
-     || [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
+    || [[ "$(__git_prompt_git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
     return 0
   fi
 
+  # Get either:
+  # - the current branch name
+  # - the tag name if we are on a tag
+  # - the short SHA of the current commit
   local ref
   ref=$(__git_prompt_git symbolic-ref --short HEAD 2> /dev/null) \
+  || ref=$(__git_prompt_git describe --tags --exact-match HEAD 2> /dev/null) \
   || ref=$(__git_prompt_git rev-parse --short HEAD 2> /dev/null) \
   || return 0
 
@@ -32,6 +39,172 @@ function git_prompt_info() {
   echo "${ZSH_THEME_GIT_PROMPT_PREFIX}${ref:gs/%/%%}${upstream:gs/%/%%}$(parse_git_dirty)${ZSH_THEME_GIT_PROMPT_SUFFIX}"
 }
 
+function _omz_git_prompt_status() {
+  [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
+
+  # Maps a git status prefix to an internal constant
+  # This cannot use the prompt constants, as they may be empty
+  local -A prefix_constant_map
+  prefix_constant_map=(
+    '\?\? '     'UNTRACKED'
+    'A  '       'ADDED'
+    'M  '       'MODIFIED'
+    'MM '       'MODIFIED'
+    ' M '       'MODIFIED'
+    'AM '       'MODIFIED'
+    ' T '       'MODIFIED'
+    'R  '       'RENAMED'
+    ' D '       'DELETED'
+    'D  '       'DELETED'
+    'UU '       'UNMERGED'
+    'ahead'     'AHEAD'
+    'behind'    'BEHIND'
+    'diverged'  'DIVERGED'
+    'stashed'   'STASHED'
+  )
+
+  # Maps the internal constant to the prompt theme
+  local -A constant_prompt_map
+  constant_prompt_map=(
+    'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
+    'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
+    'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
+    'RENAMED'   "$ZSH_THEME_GIT_PROMPT_RENAMED"
+    'DELETED'   "$ZSH_THEME_GIT_PROMPT_DELETED"
+    'UNMERGED'  "$ZSH_THEME_GIT_PROMPT_UNMERGED"
+    'AHEAD'     "$ZSH_THEME_GIT_PROMPT_AHEAD"
+    'BEHIND'    "$ZSH_THEME_GIT_PROMPT_BEHIND"
+    'DIVERGED'  "$ZSH_THEME_GIT_PROMPT_DIVERGED"
+    'STASHED'   "$ZSH_THEME_GIT_PROMPT_STASHED"
+  )
+
+  # The order that the prompt displays should be added to the prompt
+  local status_constants
+  status_constants=(
+    UNTRACKED ADDED MODIFIED RENAMED DELETED
+    STASHED UNMERGED AHEAD BEHIND DIVERGED
+  )
+
+  local status_text
+  status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
+
+  # Don't continue on a catastrophic failure
+  if [[ $? -eq 128 ]]; then
+    return 1
+  fi
+
+  # A lookup table of each git status encountered
+  local -A statuses_seen
+
+  if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then
+    statuses_seen[STASHED]=1
+  fi
+
+  local status_lines
+  status_lines=("${(@f)${status_text}}")
+
+  # If the tracking line exists, get and parse it
+  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
+    local branch_statuses
+    branch_statuses=("${(@s/,/)match}")
+    for branch_status in $branch_statuses; do
+      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
+        continue
+      fi
+      local last_parsed_status=$prefix_constant_map[$match[1]]
+      statuses_seen[$last_parsed_status]=$match[2]
+    done
+  fi
+
+  # For each status prefix, do a regex comparison
+  for status_prefix in "${(@k)prefix_constant_map}"; do
+    local status_constant="${prefix_constant_map[$status_prefix]}"
+    local status_regex=$'(^|\n)'"$status_prefix"
+
+    if [[ "$status_text" =~ $status_regex ]]; then
+      statuses_seen[$status_constant]=1
+    fi
+  done
+
+  # Display the seen statuses in the order specified
+  local status_prompt
+  for status_constant in $status_constants; do
+    if (( ${+statuses_seen[$status_constant]} )); then
+      local next_display=$constant_prompt_map[$status_constant]
+      status_prompt="$next_display$status_prompt"
+    fi
+  done
+
+  echo $status_prompt
+}
+
+# Use async version if setting is enabled, or unset but zsh version is at least 5.0.6.
+# This avoids async prompt issues caused by previous zsh versions:
+# - https://github.com/ohmyzsh/ohmyzsh/issues/12331
+# - https://github.com/ohmyzsh/ohmyzsh/issues/12360
+# TODO(2024-06-12): @mcornella remove workaround when CentOS 7 reaches EOL
+local _style
+if zstyle -t ':omz:alpha:lib:git' async-prompt \
+  || { is-at-least 5.0.6 && zstyle -T ':omz:alpha:lib:git' async-prompt }; then
+  function git_prompt_info() {
+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" ]]; then
+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}"
+    fi
+  }
+
+  function git_prompt_status() {
+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" ]]; then
+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}"
+    fi
+  }
+
+  # Conditionally register the async handler, only if it's needed in $PROMPT
+  # or any of the other prompt variables
+  function _defer_async_git_register() {
+    # Check if git_prompt_info is used in a prompt variable
+    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
+    *(\$\(git_prompt_info\)|\`git_prompt_info\`)*)
+      _omz_register_handler _omz_git_prompt_info
+      ;;
+    esac
+
+    case "${PS1}:${PS2}:${PS3}:${PS4}:${RPROMPT}:${RPS1}:${RPS2}:${RPS3}:${RPS4}" in
+    *(\$\(git_prompt_status\)|\`git_prompt_status\`)*)
+      _omz_register_handler _omz_git_prompt_status
+      ;;
+    esac
+
+    add-zsh-hook -d precmd _defer_async_git_register
+    unset -f _defer_async_git_register
+  }
+
+  # Register the async handler first. This needs to be done before
+  # the async request prompt is run
+  precmd_functions=(_defer_async_git_register $precmd_functions)
+elif zstyle -s ':omz:alpha:lib:git' async-prompt _style && [[ $_style == "force" ]]; then
+  function git_prompt_info() {
+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}" ]]; then
+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_info]}"
+    fi
+  }
+
+  function git_prompt_status() {
+    if [[ -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}" ]]; then
+      echo -n "${_OMZ_ASYNC_OUTPUT[_omz_git_prompt_status]}"
+    fi
+  }
+
+  _omz_register_handler _omz_git_prompt_info
+  _omz_register_handler _omz_git_prompt_status
+else
+  function git_prompt_info() {
+    _omz_git_prompt_info
+  }
+  function git_prompt_status() {
+    _omz_git_prompt_status
+  }
+fi
+
 # Checks if working tree is dirty
 function parse_git_dirty() {
   local STATUS
@@ -104,6 +277,18 @@ function git_current_branch() {
   echo ${ref#refs/heads/}
 }
 
+# Outputs the name of the previously checked out branch
+# Usage example: git pull origin $(git_previous_branch)
+# rev-parse --symbolic-full-name @{-1} only prints if it is a branch
+function git_previous_branch() {
+  local ref
+  ref=$(__git_prompt_git rev-parse --quiet --symbolic-full-name @{-1} 2> /dev/null)
+  local ret=$?
+  if [[ $ret != 0 ]] || [[ -z $ref ]]; then
+    return  # no git repo or non-branch previous ref
+  fi
+  echo ${ref#refs/heads/}
+}
 
 # Gets the number of commits ahead from remote
 function git_commits_ahead() {
@@ -160,105 +345,6 @@ function git_prompt_long_sha() {
   SHA=$(__git_prompt_git rev-parse HEAD 2> /dev/null) && echo "$ZSH_THEME_GIT_PROMPT_SHA_BEFORE$SHA$ZSH_THEME_GIT_PROMPT_SHA_AFTER"
 }
 
-function git_prompt_status() {
-  [[ "$(__git_prompt_git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]] && return
-
-  # Maps a git status prefix to an internal constant
-  # This cannot use the prompt constants, as they may be empty
-  local -A prefix_constant_map
-  prefix_constant_map=(
-    '\?\? '     'UNTRACKED'
-    'A  '       'ADDED'
-    'M  '       'ADDED'
-    'MM '       'MODIFIED'
-    ' M '       'MODIFIED'
-    'AM '       'MODIFIED'
-    ' T '       'MODIFIED'
-    'R  '       'RENAMED'
-    ' D '       'DELETED'
-    'D  '       'DELETED'
-    'UU '       'UNMERGED'
-    'ahead'     'AHEAD'
-    'behind'    'BEHIND'
-    'diverged'  'DIVERGED'
-    'stashed'   'STASHED'
-  )
-
-  # Maps the internal constant to the prompt theme
-  local -A constant_prompt_map
-  constant_prompt_map=(
-    'UNTRACKED' "$ZSH_THEME_GIT_PROMPT_UNTRACKED"
-    'ADDED'     "$ZSH_THEME_GIT_PROMPT_ADDED"
-    'MODIFIED'  "$ZSH_THEME_GIT_PROMPT_MODIFIED"
-    'RENAMED'   "$ZSH_THEME_GIT_PROMPT_RENAMED"
-    'DELETED'   "$ZSH_THEME_GIT_PROMPT_DELETED"
-    'UNMERGED'  "$ZSH_THEME_GIT_PROMPT_UNMERGED"
-    'AHEAD'     "$ZSH_THEME_GIT_PROMPT_AHEAD"
-    'BEHIND'    "$ZSH_THEME_GIT_PROMPT_BEHIND"
-    'DIVERGED'  "$ZSH_THEME_GIT_PROMPT_DIVERGED"
-    'STASHED'   "$ZSH_THEME_GIT_PROMPT_STASHED"
-  )
-
-  # The order that the prompt displays should be added to the prompt
-  local status_constants
-  status_constants=(
-    UNTRACKED ADDED MODIFIED RENAMED DELETED
-    STASHED UNMERGED AHEAD BEHIND DIVERGED
-  )
-
-  local status_text
-  status_text="$(__git_prompt_git status --porcelain -b 2> /dev/null)"
-
-  # Don't continue on a catastrophic failure
-  if [[ $? -eq 128 ]]; then
-    return 1
-  fi
-
-  # A lookup table of each git status encountered
-  local -A statuses_seen
-
-  if __git_prompt_git rev-parse --verify refs/stash &>/dev/null; then
-    statuses_seen[STASHED]=1
-  fi
-
-  local status_lines
-  status_lines=("${(@f)${status_text}}")
-
-  # If the tracking line exists, get and parse it
-  if [[ "$status_lines[1]" =~ "^## [^ ]+ \[(.*)\]" ]]; then
-    local branch_statuses
-    branch_statuses=("${(@s/,/)match}")
-    for branch_status in $branch_statuses; do
-      if [[ ! $branch_status =~ "(behind|diverged|ahead) ([0-9]+)?" ]]; then
-        continue
-      fi
-      local last_parsed_status=$prefix_constant_map[$match[1]]
-      statuses_seen[$last_parsed_status]=$match[2]
-    done
-  fi
-
-  # For each status prefix, do a regex comparison
-  for status_prefix in ${(k)prefix_constant_map}; do
-    local status_constant="${prefix_constant_map[$status_prefix]}"
-    local status_regex=$'(^|\n)'"$status_prefix"
-
-    if [[ "$status_text" =~ $status_regex ]]; then
-      statuses_seen[$status_constant]=1
-    fi
-  done
-
-  # Display the seen statuses in the order specified
-  local status_prompt
-  for status_constant in $status_constants; do
-    if (( ${+statuses_seen[$status_constant]} )); then
-      local next_display=$constant_prompt_map[$status_constant]
-      status_prompt="$next_display$status_prompt"
-    fi
-  done
-
-  echo $status_prompt
-}
-
 # Outputs the name of the current user
 # Usage example: $(git_current_user_name)
 function git_current_user_name() {
diff --git a/zsh/lib/grep.zsh b/zsh/lib/grep.zsh
index 54e0f69..1a70de7 100644
--- a/zsh/lib/grep.zsh
+++ b/zsh/lib/grep.zsh
@@ -10,7 +10,7 @@ else
     }
 
     # Ignore these folders (if the necessary grep flags are available)
-    EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox}"
+    EXC_FOLDERS="{.bzr,CVS,.git,.hg,.svn,.idea,.tox,.venv,venv}"
 
     # Check for --exclude-dir, otherwise check for --exclude. If --exclude
     # isn't available, --color won't be either (they were released at the same
@@ -24,8 +24,8 @@ else
     if [[ -n "$GREP_OPTIONS" ]]; then
         # export grep, egrep and fgrep settings
         alias grep="grep $GREP_OPTIONS"
-        alias egrep="grep -E $GREP_OPTIONS"
-        alias fgrep="grep -F $GREP_OPTIONS"
+        alias egrep="grep -E"
+        alias fgrep="grep -F"
 
         # write to cache file if cache directory is writable
         if [[ -w "$ZSH_CACHE_DIR" ]]; then
diff --git a/zsh/lib/history.zsh b/zsh/lib/history.zsh
index 7940769..781a0e9 100644
--- a/zsh/lib/history.zsh
+++ b/zsh/lib/history.zsh
@@ -1,19 +1,27 @@
 ## History wrapper
 function omz_history {
-  local clear list
-  zparseopts -E c=clear l=list
+  # parse arguments and remove from $@
+  local clear list stamp REPLY
+  zparseopts -E -D c=clear l=list f=stamp E=stamp i=stamp t:=stamp
 
   if [[ -n "$clear" ]]; then
     # if -c provided, clobber the history file
-    echo -n >| "$HISTFILE"
+
+    # confirm action before deleting history
+    print -nu2 "This action will irreversibly delete your command history. Are you sure? [y/N] "
+    builtin read -E
+    [[ "$REPLY" = [yY] ]] || return 0
+
+    print -nu2 >| "$HISTFILE"
     fc -p "$HISTFILE"
-    echo >&2 History file deleted.
-  elif [[ -n "$list" ]]; then
-    # if -l provided, run as if calling `fc' directly
-    builtin fc "$@"
+
+    print -u2 History file deleted.
+  elif [[ $# -eq 0 ]]; then
+    # if no arguments provided, show full history starting from 1
+    builtin fc "${stamp[@]}" -l 1
   else
-    # unless a number is provided, show all history events (starting from 1)
-    [[ ${@[-1]-} = *[0-9]* ]] && builtin fc -l "$@" || builtin fc -l "$@" 1
+    # otherwise, run `fc -l` with a custom format
+    builtin fc "${stamp[@]}" -l "$@"
   fi
 }
 
diff --git a/zsh/lib/key-bindings.zsh b/zsh/lib/key-bindings.zsh
index aaa7304..0d2cecb 100644
--- a/zsh/lib/key-bindings.zsh
+++ b/zsh/lib/key-bindings.zsh
@@ -32,19 +32,26 @@ if [[ -n "${terminfo[knp]}" ]]; then
 fi
 
 # Start typing + [Up-Arrow] - fuzzy find history forward
-if [[ -n "${terminfo[kcuu1]}" ]]; then
-  autoload -U up-line-or-beginning-search
-  zle -N up-line-or-beginning-search
+autoload -U up-line-or-beginning-search
+zle -N up-line-or-beginning-search
 
+bindkey -M emacs "^[[A" up-line-or-beginning-search
+bindkey -M viins "^[[A" up-line-or-beginning-search
+bindkey -M vicmd "^[[A" up-line-or-beginning-search
+if [[ -n "${terminfo[kcuu1]}" ]]; then
   bindkey -M emacs "${terminfo[kcuu1]}" up-line-or-beginning-search
   bindkey -M viins "${terminfo[kcuu1]}" up-line-or-beginning-search
   bindkey -M vicmd "${terminfo[kcuu1]}" up-line-or-beginning-search
 fi
-# Start typing + [Down-Arrow] - fuzzy find history backward
-if [[ -n "${terminfo[kcud1]}" ]]; then
-  autoload -U down-line-or-beginning-search
-  zle -N down-line-or-beginning-search
 
+# Start typing + [Down-Arrow] - fuzzy find history backward
+autoload -U down-line-or-beginning-search
+zle -N down-line-or-beginning-search
+
+bindkey -M emacs "^[[B" down-line-or-beginning-search
+bindkey -M viins "^[[B" down-line-or-beginning-search
+bindkey -M vicmd "^[[B" down-line-or-beginning-search
+if [[ -n "${terminfo[kcud1]}" ]]; then
   bindkey -M emacs "${terminfo[kcud1]}" down-line-or-beginning-search
   bindkey -M viins "${terminfo[kcud1]}" down-line-or-beginning-search
   bindkey -M vicmd "${terminfo[kcud1]}" down-line-or-beginning-search
@@ -105,12 +112,12 @@ bindkey -M vicmd '^[[1;5D' backward-word
 
 
 bindkey '\ew' kill-region                             # [Esc-w] - Kill from the cursor to the mark
-bindkey -s '\el' 'ls\n'                               # [Esc-l] - run command: ls
+bindkey -s '\el' '^q ls\n'                            # [Esc-l] - run command: ls
 bindkey '^r' history-incremental-search-backward      # [Ctrl-r] - Search backward incrementally for a specified string. The string may begin with ^ to anchor the search to the beginning of the line.
 bindkey ' ' magic-space                               # [Space] - don't do history expansion
 
 
-# Edit the current command line in $EDITOR
+# Edit the current command line in $VISUAL (or $EDITOR / `vi` if not set)
 autoload -U edit-command-line
 zle -N edit-command-line
 bindkey '\C-x\C-e' edit-command-line
diff --git a/zsh/lib/misc.zsh b/zsh/lib/misc.zsh
index 1f63708..054485f 100644
--- a/zsh/lib/misc.zsh
+++ b/zsh/lib/misc.zsh
@@ -15,11 +15,17 @@ if [[ $DISABLE_MAGIC_FUNCTIONS != true ]]; then
   done
 fi
 
-## jobs
-setopt long_list_jobs
+setopt multios              # enable redirect to multiple streams: echo >file1 >file2
+setopt long_list_jobs       # show long list format job notifications
+setopt interactivecomments  # recognize comments
 
-env_default 'PAGER' 'less'
-env_default 'LESS' '-R'
+# define pager depending on what is available (less or more)
+if (( ${+commands[less]} )); then
+  env_default 'PAGER' 'less'
+  env_default 'LESS' '-R'
+elif (( ${+commands[more]} )); then
+  env_default 'PAGER' 'more'
+fi
 
 ## super user alias
 alias _='sudo '
@@ -30,6 +36,3 @@ if (( $+commands[ack-grep] )); then
 elif (( $+commands[ack] )); then
   alias afind='ack -il'
 fi
-
-# recognize comments
-setopt interactivecomments
diff --git a/zsh/lib/prompt_info_functions.zsh b/zsh/lib/prompt_info_functions.zsh
index e553584..722ae58 100644
--- a/zsh/lib/prompt_info_functions.zsh
+++ b/zsh/lib/prompt_info_functions.zsh
@@ -18,7 +18,9 @@ function chruby_prompt_info \
   vi_mode_prompt_info \
   virtualenv_prompt_info \
   jenv_prompt_info \
+  azure_prompt_info \
   tf_prompt_info \
+  conda_prompt_info \
 {
   return 1
 }
@@ -39,5 +41,5 @@ ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
 # use this to enable users to see their ruby version, no matter which
 # version management system they use
 function ruby_prompt_info() {
-  echo $(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)
+  echo "$(rvm_prompt_info || rbenv_prompt_info || chruby_prompt_info)"
 }
diff --git a/zsh/lib/spectrum.zsh b/zsh/lib/spectrum.zsh
index 97f5c36..31e3779 100644
--- a/zsh/lib/spectrum.zsh
+++ b/zsh/lib/spectrum.zsh
@@ -7,6 +7,7 @@ typeset -AHg FX FG BG
 FX=(
   reset     "%{%}"
   bold      "%{%}" no-bold      "%{%}"
+  dim       "%{%}" no-dim       "%{%}"
   italic    "%{%}" no-italic    "%{%}"
   underline "%{%}" no-underline "%{%}"
   blink     "%{%}" no-blink     "%{%}"
diff --git a/zsh/lib/termsupport.zsh b/zsh/lib/termsupport.zsh
index 80ca7ef..852a543 100644
--- a/zsh/lib/termsupport.zsh
+++ b/zsh/lib/termsupport.zsh
@@ -17,7 +17,7 @@ function title {
   : ${2=$1}
 
   case "$TERM" in
-    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty|st*|foot)
+    cygwin|xterm*|putty*|rxvt*|konsole*|ansi|mlterm*|alacritty*|st*|foot*|contour*|wezterm*)
       print -Pn "\e]2;${2:q}\a" # set window name
       print -Pn "\e]1;${1:q}\a" # set tab name
       ;;
@@ -47,13 +47,13 @@ fi
 
 # Runs before showing the prompt
 function omz_termsupport_precmd {
-  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return 0
   title "$ZSH_THEME_TERM_TAB_TITLE_IDLE" "$ZSH_THEME_TERM_TITLE_IDLE"
 }
 
 # Runs before executing the command
 function omz_termsupport_preexec {
-  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return
+  [[ "${DISABLE_AUTO_TITLE:-}" != true ]] || return 0
 
   emulate -L zsh
   setopt extended_glob
@@ -109,28 +109,56 @@ if [[ -z "$INSIDE_EMACS" || "$INSIDE_EMACS" = vterm ]]; then
   add-zsh-hook preexec omz_termsupport_preexec
 fi
 
-# Keep Apple Terminal.app's current working directory updated
-# Based on this answer: https://superuser.com/a/315029
-# With extra fixes to handle multibyte chars and non-UTF-8 locales
+# Keep terminal emulator's current working directory correct,
+# even if the current working directory path contains symbolic links
+#
+# References:
+# - Apple's Terminal.app: https://superuser.com/a/315029
+# - iTerm2: https://iterm2.com/documentation-escape-codes.html (iTerm2 Extension / CurrentDir+RemoteHost)
+# - Konsole: https://bugs.kde.org/show_bug.cgi?id=327720#c1
+# - libvte (gnome-terminal, mate-terminal, …): https://bugzilla.gnome.org/show_bug.cgi?id=675987#c14
+#   Apparently it had a bug before ~2012 were it would display the unknown OSC 7 code
+#
+# As of May 2021 mlterm, PuTTY, rxvt, screen, termux & xterm simply ignore the unknown OSC.
 
-if [[ "$TERM_PROGRAM" == "Apple_Terminal" ]] && [[ -z "$INSIDE_EMACS" ]]; then
-  # Emits the control sequence to notify Terminal.app of the cwd
-  # Identifies the directory using a file: URI scheme, including
-  # the host name to disambiguate local vs. remote paths.
-  function update_terminalapp_cwd() {
-    emulate -L zsh
-
-    # Percent-encode the host and path names.
-    local URL_HOST URL_PATH
-    URL_HOST="$(omz_urlencode -P $HOST)" || return 1
-    URL_PATH="$(omz_urlencode -P $PWD)" || return 1
-
-    # Undocumented Terminal.app-specific control sequence
-    printf '\e]7;%s\a' "file://$URL_HOST$URL_PATH"
-  }
-
-  # Use a precmd hook instead of a chpwd hook to avoid contaminating output
-  add-zsh-hook precmd update_terminalapp_cwd
-  # Run once to get initial cwd set
-  update_terminalapp_cwd
+# Don't define the function if we're inside Emacs or in an SSH session (#11696)
+if [[ -n "$INSIDE_EMACS" || -n "$SSH_CLIENT" || -n "$SSH_TTY" ]]; then
+  return
 fi
+
+# Don't define the function if we're in an unsupported terminal
+case "$TERM" in
+  # all of these either process OSC 7 correctly or ignore entirely
+  xterm*|putty*|rxvt*|konsole*|mlterm*|alacritty*|screen*|tmux*) ;;
+  contour*|foot*) ;;
+  *)
+    # Terminal.app and iTerm2 process OSC 7 correctly
+    case "$TERM_PROGRAM" in
+      Apple_Terminal|iTerm.app) ;;
+      *) return ;;
+    esac ;;
+esac
+
+# Emits the control sequence to notify many terminal emulators
+# of the cwd
+#
+# Identifies the directory using a file: URI scheme, including
+# the host name to disambiguate local vs. remote paths.
+function omz_termsupport_cwd {
+  setopt localoptions unset
+  # Percent-encode the host and path names.
+  local URL_HOST URL_PATH
+  URL_HOST="$(omz_urlencode -P $HOST)" || return 1
+  URL_PATH="$(omz_urlencode -P $PWD)" || return 1
+
+  # Konsole errors if the HOST is provided
+  [[ -z "$KONSOLE_PROFILE_NAME" && -z "$KONSOLE_DBUS_SESSION"  ]] || URL_HOST=""
+
+  # common control sequence (OSC 7) to set current host and path
+  printf "\e]7;file://%s%s\e\\" "${URL_HOST}" "${URL_PATH}"
+}
+
+# Use a precmd hook instead of a chpwd hook to avoid contaminating output
+# i.e. when a script or function changes directory without `cd -q`, chpwd
+# will be called the output may be swallowed by the script or function.
+add-zsh-hook precmd omz_termsupport_cwd
diff --git a/zsh/lib/tests/cli.test.zsh b/zsh/lib/tests/cli.test.zsh
new file mode 100644
index 0000000..9ee5cd2
--- /dev/null
+++ b/zsh/lib/tests/cli.test.zsh
@@ -0,0 +1,169 @@
+#!/usr/bin/zsh -df
+
+run_awk() {
+  local -a dis_plugins=(${=1})
+  local input_text="$2"
+
+  (( ! DEBUG )) || set -xv
+
+  local awk_subst_plugins="\
+    gsub(/[ \t]+(${(j:|:)dis_plugins})[ \t]+/, \" \") # with spaces before or after
+    gsub(/[ \t]+(${(j:|:)dis_plugins})$/, \"\")       # with spaces before and EOL
+    gsub(/^(${(j:|:)dis_plugins})[ \t]+/, \"\")       # with BOL and spaces after
+
+    gsub(/\((${(j:|:)dis_plugins})[ \t]+/, \"(\")     # with parenthesis before and spaces after
+    gsub(/[ \t]+(${(j:|:)dis_plugins})\)/, \")\")     # with spaces before or parenthesis after
+    gsub(/\((${(j:|:)dis_plugins})\)/, \"()\")        # with only parentheses
+
+    gsub(/^(${(j:|:)dis_plugins})\)/, \")\")          # with BOL and closing parenthesis
+    gsub(/\((${(j:|:)dis_plugins})$/, \"(\")          # with opening parenthesis and EOL
+  "
+    # Disable plugins awk script
+    local awk_script="
+  # if plugins=() is in oneline form, substitute disabled plugins and go to next line
+  /^[ \t]*plugins=\([^#]+\).*\$/ {
+    $awk_subst_plugins
+    print \$0
+    next
+  }
+
+  # if plugins=() is in multiline form, enable multi flag and disable plugins if they're there
+  /^[ \t]*plugins=\(/ {
+    multi=1
+    $awk_subst_plugins
+    print \$0
+    next
+  }
+
+  # if multi flag is enabled and we find a valid closing parenthesis, remove plugins and disable multi flag
+  multi == 1 && /^[^#]*\)/ {
+    multi=0
+    $awk_subst_plugins
+    print \$0
+    next
+  }
+
+  multi == 1 && length(\$0) > 0 {
+    $awk_subst_plugins
+    if (length(\$0) > 0) print \$0
+    next
+  }
+
+  { print \$0 }
+  "
+
+  command awk "$awk_script" <<< "$input_text"
+
+  (( ! DEBUG )) || set +xv
+}
+
+# runs awk against stdin, checks if the resulting file is not empty and then checks if the file has valid zsh syntax
+run_awk_and_test() {
+  local description="$1"
+  local plugins_to_disable="$2"
+  local input_text="$3"
+  local expected_output="$4"
+
+  local tmpfile==(:)
+
+  {
+    print -u2 "Test: $description"
+    DEBUG=0 run_awk "$plugins_to_disable" "$input_text" >| $tmpfile
+
+    if [[ ! -s "$tmpfile" ]]; then
+      print -u2 "\e[31mError\e[0m: output file empty"
+      return 1
+    fi
+
+    if ! zsh -n $tmpfile; then
+      print -u2 "\e[31mError\e[0m: zsh syntax error"
+      diff -u $tmpfile <(echo "$expected_output")
+      return 1
+    fi
+
+    if ! diff -u --color=always $tmpfile <(echo "$expected_output"); then
+      if (( DEBUG )); then
+        print -u2 ""
+        DEBUG=1 run_awk "$plugins_to_disable" "$input_text"
+        print -u2 ""
+      fi
+      print -u2 "\e[31mError\e[0m: output file does not match expected output"
+      return 1
+    fi
+
+    print -u2 "\e[32mSuccess\e[0m"
+  } always {
+    print -u2 ""
+    command rm -f "$tmpfile"
+  }
+}
+
+# These tests are for the `omz plugin disable` command
+run_awk_and_test \
+  "it should delete a single plugin in oneline format" \
+  "git" \
+  "plugins=(git)" \
+  "plugins=()"
+
+run_awk_and_test \
+  "it should delete a single plugin in multiline format" \
+  "github" \
+"plugins=(
+  github
+)" \
+"plugins=(
+)"
+
+run_awk_and_test \
+  "it should delete multiple plugins in oneline format" \
+  "github git z" \
+  "plugins=(github git z)" \
+  "plugins=()"
+
+run_awk_and_test \
+  "it should delete multiple plugins in multiline format" \
+  "github git z" \
+"plugins=(
+  github
+  git
+  z
+)" \
+"plugins=(
+)"
+
+run_awk_and_test \
+  "it should delete a single plugin among multiple in oneline format" \
+  "git" \
+  "plugins=(github git z)" \
+  "plugins=(github z)"
+
+run_awk_and_test \
+  "it should delete a single plugin among multiple in multiline format" \
+  "git" \
+"plugins=(
+  github
+  git
+  z
+)" \
+"plugins=(
+  github
+  z
+)"
+
+run_awk_and_test \
+  "it should delete multiple plugins in mixed format" \
+  "git z" \
+"plugins=(github
+git z)" \
+"plugins=(github
+)"
+
+run_awk_and_test \
+  "it should delete multiple plugins in mixed format 2" \
+  "github z" \
+"plugins=(github
+  git
+z)" \
+"plugins=(
+  git
+)"
diff --git a/zsh/lib/theme-and-appearance.zsh b/zsh/lib/theme-and-appearance.zsh
index 00947f7..5cfa2e6 100644
--- a/zsh/lib/theme-and-appearance.zsh
+++ b/zsh/lib/theme-and-appearance.zsh
@@ -1,59 +1,81 @@
-# ls colors
+# Sets color variable such as $fg, $bg, $color and $reset_color
 autoload -U colors && colors
 
-# Enable ls colors
+# Expand variables and commands in PROMPT variables
+setopt prompt_subst
+
+# Prompt function theming defaults
+ZSH_THEME_GIT_PROMPT_PREFIX="git:("   # Beginning of the git prompt, before the branch name
+ZSH_THEME_GIT_PROMPT_SUFFIX=")"       # End of the git prompt
+ZSH_THEME_GIT_PROMPT_DIRTY="*"        # Text to display if the branch is dirty
+ZSH_THEME_GIT_PROMPT_CLEAN=""         # Text to display if the branch is clean
+ZSH_THEME_RUBY_PROMPT_PREFIX="("
+ZSH_THEME_RUBY_PROMPT_SUFFIX=")"
+
+
+# Use diff --color if available
+if command diff --color /dev/null{,} &>/dev/null; then
+  function diff {
+    command diff --color "$@"
+  }
+fi
+
+# Don't set ls coloring if disabled
+[[ "$DISABLE_LS_COLORS" != true ]] || return 0
+
+# Default coloring for BSD-based ls
 export LSCOLORS="Gxfxcxdxbxegedabagacad"
 
-# TODO organise this chaotic logic
-
-if [[ "$DISABLE_LS_COLORS" != "true" ]]; then
-  # Find the option for using colors in ls, depending on the version
-  if [[ "$OSTYPE" == netbsd* ]]; then
-    # On NetBSD, test if "gls" (GNU ls) is installed (this one supports colors);
-    # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
-    gls --color -d . &>/dev/null && alias ls='gls --color=tty'
-  elif [[ "$OSTYPE" == openbsd* ]]; then
-    # On OpenBSD, "gls" (ls from GNU coreutils) and "colorls" (ls from base,
-    # with color and multibyte support) are available from ports.  "colorls"
-    # will be installed on purpose and can't be pulled in by installing
-    # coreutils, so prefer it to "gls".
-    gls --color -d . &>/dev/null && alias ls='gls --color=tty'
-    colorls -G -d . &>/dev/null && alias ls='colorls -G'
-  elif [[ "$OSTYPE" == (darwin|freebsd)* ]]; then
-    # this is a good alias, it works by default just using $LSCOLORS
-    ls -G . &>/dev/null && alias ls='ls -G'
-
-    # only use coreutils ls if there is a dircolors customization present ($LS_COLORS or .dircolors file)
-    # otherwise, gls will use the default color scheme which is ugly af
-    [[ -n "$LS_COLORS" || -f "$HOME/.dircolors" ]] && gls --color -d . &>/dev/null && alias ls='gls --color=tty'
+# Default coloring for GNU-based ls
+if [[ -z "$LS_COLORS" ]]; then
+  # Define LS_COLORS via dircolors if available. Otherwise, set a default
+  # equivalent to LSCOLORS (generated via https://geoff.greer.fm/lscolors)
+  if (( $+commands[dircolors] )); then
+    [[ -f "$HOME/.dircolors" ]] \
+      && source <(dircolors -b "$HOME/.dircolors") \
+      || source <(dircolors -b)
   else
-    # For GNU ls, we use the default ls color theme. They can later be overwritten by themes.
-    if [[ -z "$LS_COLORS" ]]; then
-      (( $+commands[dircolors] )) && eval "$(dircolors -b)"
-    fi
-
-    ls --color -d . &>/dev/null && alias ls='ls --color=tty' || { ls -G . &>/dev/null && alias ls='ls -G' }
-
-    # Take advantage of $LS_COLORS for completion as well.
-    zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
+    export LS_COLORS="di=1;36:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
   fi
 fi
 
-# enable diff color if possible.
-if command diff --color /dev/null /dev/null &>/dev/null; then
-  alias diff='diff --color'
-fi
+function test-ls-args {
+  # Usage: test-ls-args cmd args...
+  # e.g. test-ls-args gls --color
+  command "$@" /dev/null &>/dev/null
+}
 
-setopt auto_cd
-setopt multios
-setopt prompt_subst
+# Find the option for using colors in ls, depending on the version
+case "$OSTYPE" in
+  netbsd*)
+    # On NetBSD, test if `gls` (GNU ls) is installed (this one supports colors);
+    # otherwise, leave ls as is, because NetBSD's ls doesn't support -G
+    test-ls-args gls --color && alias ls='gls --color=tty'
+    ;;
+  openbsd*)
+    # On OpenBSD, `gls` (ls from GNU coreutils) and `colorls` (ls from base,
+    # with color and multibyte support) are available from ports.
+    # `colorls` will be installed on purpose and can't be pulled in by installing
+    # coreutils (which might be installed for ), so prefer it to `gls`.
+    test-ls-args gls --color && alias ls='gls --color=tty'
+    test-ls-args colorls -G && alias ls='colorls -G'
+    ;;
+  (darwin|freebsd)*)
+    # This alias works by default just using $LSCOLORS
+    test-ls-args ls -G && alias ls='ls -G'
+    # Only use GNU ls if installed and there are user defaults for $LS_COLORS,
+    # as the default coloring scheme is not very pretty
+    zstyle -t ':omz:lib:theme-and-appearance' gnu-ls \
+      && test-ls-args gls --color \
+      && alias ls='gls --color=tty'
+    ;;
+  *)
+    if test-ls-args ls --color; then
+      alias ls='ls --color=tty'
+    elif test-ls-args ls -G; then
+      alias ls='ls -G'
+    fi
+    ;;
+esac
 
-[[ -n "$WINDOW" ]] && SCREEN_NO="%B$WINDOW%b " || SCREEN_NO=""
-
-# git theming default: Variables for theming the git info prompt
-ZSH_THEME_GIT_PROMPT_PREFIX="git:("         # Prefix at the very beginning of the prompt, before the branch name
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"             # At the very end of the prompt
-ZSH_THEME_GIT_PROMPT_DIRTY="*"              # Text to display if the branch is dirty
-ZSH_THEME_GIT_PROMPT_CLEAN=""               # Text to display if the branch is clean
-ZSH_THEME_RUBY_PROMPT_PREFIX="("
-ZSH_THEME_RUBY_PROMPT_SUFFIX=")"
+unfunction test-ls-args
diff --git a/zsh/lib/vcs_info.zsh b/zsh/lib/vcs_info.zsh
index e60938c..be6d32e 100644
--- a/zsh/lib/vcs_info.zsh
+++ b/zsh/lib/vcs_info.zsh
@@ -38,7 +38,7 @@
 # due to malicious input as a consequence of CVE-2021-45444, which affects
 # zsh versions from 5.0.3 to 5.8.
 #
-autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return
+autoload -Uz +X regexp-replace VCS_INFO_formats 2>/dev/null || return 0
 
 # We use $tmp here because it's already a local variable in VCS_INFO_formats
 typeset PATCH='for tmp (base base-name branch misc revision subdir) hook_com[$tmp]="${hook_com[$tmp]//\%/%%}"'
diff --git a/zsh/oh-my-zsh.sh b/zsh/oh-my-zsh.sh
index 29d39ca..3e547d3 100644
--- a/zsh/oh-my-zsh.sh
+++ b/zsh/oh-my-zsh.sh
@@ -1,14 +1,14 @@
+# ANSI formatting function (\033[<code>m)
+# 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
+omz_f() {
+  [ $# -gt 0 ] || return
+  IFS=";" printf "\033[%sm" $*
+}
+# If stdout is not a terminal ignore all formatting
+[ -t 1 ] || omz_f() { :; }
+
 # Protect against non-zsh execution of Oh My Zsh (use POSIX syntax here)
 [ -n "$ZSH_VERSION" ] || {
-  # ANSI formatting function (\033[<code>m)
-  # 0: reset, 1: bold, 4: underline, 22: no bold, 24: no underline, 31: red, 33: yellow
-  omz_f() {
-    [ $# -gt 0 ] || return
-    IFS=";" printf "\033[%sm" $*
-  }
-  # If stdout is not a terminal ignore all formatting
-  [ -t 1 ] || omz_f() { :; }
-
   omz_ptree() {
     # Get process tree of the current process
     pid=$$; pids="$pid"
@@ -38,14 +38,25 @@
   return 1
 }
 
+# Check if in emulation mode, if so early return
+# https://github.com/ohmyzsh/ohmyzsh/issues/11686
+[[ "$(emulate)" = zsh ]] || {
+  printf "$(omz_f 1 31)Error:$(omz_f 22) Oh My Zsh can't be loaded in \`$(emulate)\` emulation mode.$(omz_f 0)\n" >&2
+  return 1
+}
+
+unset -f omz_f
+
 # If ZSH is not defined, use the current script's directory.
-[[ -z "$ZSH" ]] && export ZSH="${${(%):-%x}:a:h}"
+[[ -n "$ZSH" ]] || export ZSH="${${(%):-%x}:a:h}"
+
+# Set ZSH_CUSTOM to the path where your custom config files
+# and plugins exists, or else we will use the default custom/
+[[ -n "$ZSH_CUSTOM" ]] || ZSH_CUSTOM="$ZSH/custom"
 
 # Set ZSH_CACHE_DIR to the path where cache files should be created
 # or else we will use the default cache/
-if [[ -z "$ZSH_CACHE_DIR" ]]; then
-  ZSH_CACHE_DIR="$ZSH/cache"
-fi
+[[ -n "$ZSH_CACHE_DIR" ]] || ZSH_CACHE_DIR="$ZSH/cache"
 
 # Make sure $ZSH_CACHE_DIR is writable, otherwise use a directory in $HOME
 if [[ ! -w "$ZSH_CACHE_DIR" ]]; then
@@ -54,27 +65,19 @@ fi
 
 # Create cache and completions dir and add to $fpath
 mkdir -p "$ZSH_CACHE_DIR/completions"
-(( ${fpath[(Ie)"$ZSH_CACHE_DIR/completions"]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
+(( ${fpath[(Ie)$ZSH_CACHE_DIR/completions]} )) || fpath=("$ZSH_CACHE_DIR/completions" $fpath)
 
 # Check for updates on initial load...
-if [[ "$DISABLE_AUTO_UPDATE" != true ]]; then
-  source "$ZSH/tools/check_for_upgrade.sh"
-fi
+source "$ZSH/tools/check_for_upgrade.sh"
 
 # Initializes Oh My Zsh
 
 # add a function path
-fpath=("$ZSH/functions" "$ZSH/completions" $fpath)
+fpath=($ZSH/{functions,completions} $ZSH_CUSTOM/{functions,completions} $fpath)
 
 # Load all stock functions (from $fpath files) called below.
 autoload -U compaudit compinit zrecompile
 
-# Set ZSH_CUSTOM to the path where your custom config files
-# and plugins exists, or else we will use the default custom/
-if [[ -z "$ZSH_CUSTOM" ]]; then
-    ZSH_CUSTOM="$ZSH/custom"
-fi
-
 is_plugin() {
   local base_dir=$1
   local name=$2
@@ -96,8 +99,8 @@ done
 
 # Figure out the SHORT hostname
 if [[ "$OSTYPE" = darwin* ]]; then
-  # macOS's $HOST changes with dhcp, etc. Use ComputerName if possible.
-  SHORT_HOST=$(scutil --get ComputerName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
+  # macOS's $HOST changes with dhcp, etc. Use LocalHostName if possible.
+  SHORT_HOST=$(scutil --get LocalHostName 2>/dev/null) || SHORT_HOST="${HOST/.*/}"
 else
   SHORT_HOST="${HOST/.*/}"
 fi
@@ -143,24 +146,62 @@ fi
 unset zcompdump_revision zcompdump_fpath zcompdump_refresh
 
 # zcompile the completion dump file if the .zwc is older or missing.
-zrecompile -q -p "$ZSH_COMPDUMP" && command rm -f "$ZSH_COMPDUMP.zwc.old"
+if command mkdir "${ZSH_COMPDUMP}.lock" 2>/dev/null; then
+  zrecompile -q -p "$ZSH_COMPDUMP"
+  command rm -rf "$ZSH_COMPDUMP.zwc.old" "${ZSH_COMPDUMP}.lock"
+fi
 
-# Load all of the config files in ~/oh-my-zsh that end in .zsh
+_omz_source() {
+  local context filepath="$1"
+
+  # Construct zstyle context based on path
+  case "$filepath" in
+  lib/*) context="lib:${filepath:t:r}" ;;         # :t = lib_name.zsh, :r = lib_name
+  plugins/*) context="plugins:${filepath:h:t}" ;; # :h = plugins/plugin_name, :t = plugin_name
+  esac
+
+  local disable_aliases=0
+  zstyle -T ":omz:${context}" aliases || disable_aliases=1
+
+  # Back up alias names prior to sourcing
+  local -A aliases_pre galiases_pre
+  if (( disable_aliases )); then
+    aliases_pre=("${(@kv)aliases}")
+    galiases_pre=("${(@kv)galiases}")
+  fi
+
+  # Source file from $ZSH_CUSTOM if it exists, otherwise from $ZSH
+  if [[ -f "$ZSH_CUSTOM/$filepath" ]]; then
+    source "$ZSH_CUSTOM/$filepath"
+  elif [[ -f "$ZSH/$filepath" ]]; then
+    source "$ZSH/$filepath"
+  fi
+
+  # Unset all aliases that don't appear in the backed up list of aliases
+  if (( disable_aliases )); then
+    if (( #aliases_pre )); then
+      aliases=("${(@kv)aliases_pre}")
+    else
+      (( #aliases )) && unalias "${(@k)aliases}"
+    fi
+    if (( #galiases_pre )); then
+      galiases=("${(@kv)galiases_pre}")
+    else
+      (( #galiases )) && unalias "${(@k)galiases}"
+    fi
+  fi
+}
+
+# Load all of the lib files in ~/.oh-my-zsh/lib that end in .zsh
 # TIP: Add files you don't want in git to .gitignore
-for config_file ("$ZSH"/lib/*.zsh); do
-  custom_config_file="$ZSH_CUSTOM/lib/${config_file:t}"
-  [[ -f "$custom_config_file" ]] && config_file="$custom_config_file"
-  source "$config_file"
+for lib_file ("$ZSH"/lib/*.zsh); do
+  _omz_source "lib/${lib_file:t}"
 done
-unset custom_config_file
+unset lib_file
 
 # Load all of the plugins that were defined in ~/.zshrc
 for plugin ($plugins); do
-  if [[ -f "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh" ]]; then
-    source "$ZSH_CUSTOM/plugins/$plugin/$plugin.plugin.zsh"
-  elif [[ -f "$ZSH/plugins/$plugin/$plugin.plugin.zsh" ]]; then
-    source "$ZSH/plugins/$plugin/$plugin.plugin.zsh"
-  fi
+  _omz_source "plugins/$plugin/$plugin.plugin.zsh"
 done
 unset plugin
 
@@ -188,3 +229,6 @@ if [[ -n "$ZSH_THEME" ]]; then
     echo "[oh-my-zsh] theme '$ZSH_THEME' not found"
   fi
 fi
+
+# set completion colors to be the same as `ls`, after theme has been loaded
+[[ -z "$LS_COLORS" ]] || zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}"
diff --git a/zsh/plugins/1password/1password.plugin.zsh b/zsh/plugins/1password/1password.plugin.zsh
index 941523c..e8f91f8 100644
--- a/zsh/plugins/1password/1password.plugin.zsh
+++ b/zsh/plugins/1password/1password.plugin.zsh
@@ -1,9 +1,15 @@
 # Do nothing if op is not installed
 (( ${+commands[op]} )) || return
 
-# Load op completion
-eval "$(op completion zsh)"
-compdef _op op
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `op`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_op" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _op
+  _comps[op]=_op
+fi
+
+op completion zsh >| "$ZSH_CACHE_DIR/completions/_op" &|
 
 # Load opswd function
 autoload -Uz opswd
diff --git a/zsh/plugins/1password/README.md b/zsh/plugins/1password/README.md
index f6854da..ace6da8 100644
--- a/zsh/plugins/1password/README.md
+++ b/zsh/plugins/1password/README.md
@@ -14,16 +14,18 @@ clipboard.
 ## `opswd`
 
 The `opswd` command is a wrapper around the `op` command. It takes a service
-name as an argument and copies the password for that service to the clipboard.
+name as an argument and copies the username, then the password for that service
+to the clipboard, after confirmation on the user part.
 
-If the service also contains a TOTP, it is copied to the clipboard after 10 seconds.
-Finally, after 20 seconds, the clipboard is cleared.
+If the service also contains a TOTP, it is copied to the clipboard after confirmation
+on the user part. Finally, after 20 seconds, the clipboard is cleared.
 
-The function has completion support, so you can use tab completion to select
-which service you want to get.
+For example, `opswd github.com` will put your GitHub username into your clipboard. Then,
+it will ask for confirmation to continue, and copy the password to your clipboard. Finally,
+if a TOTP is available, it will be copied to the clipboard after your confirmation.
 
-For example, `opswd github.com` will put your GitHub password into your clipboard, and if
-a TOTP is available, it will be copied to the clipboard after 10 seconds.
+This function has completion support, so you can use tab completion to select which
+service you want to get.
 
 > NOTE: you need to be signed in for `opswd` to work. If you are using biometric unlock,
 > 1Password CLI will automatically prompt you to sign in. See:
diff --git a/zsh/plugins/1password/_opswd b/zsh/plugins/1password/_opswd
index dbc094f..694df5c 100644
--- a/zsh/plugins/1password/_opswd
+++ b/zsh/plugins/1password/_opswd
@@ -6,14 +6,4 @@ function _opswd() {
   [[ -z "$services" ]] || compadd -a -- services
 }
 
-# TODO: 2022-03-26: Remove support for op CLI 1
-autoload -Uz is-at-least
-is-at-least 2.0.0 $(op --version) || {
-  function _opswd() {
-    local -a services
-    services=("${(@f)$(op list items --categories Login 2>/dev/null | op get item - --fields title 2>/dev/null)}")
-    [[ -z "$services" ]] || compadd -a -- services
-  }
-}
-
 _opswd "$@"
diff --git a/zsh/plugins/1password/opswd b/zsh/plugins/1password/opswd
index 5767280..9e09ae7 100644
--- a/zsh/plugins/1password/opswd
+++ b/zsh/plugins/1password/opswd
@@ -14,65 +14,36 @@ function opswd() {
   # If not logged in, print error and return
   op user list > /dev/null || return
 
+  local username
+  # Copy the username to the clipboard
+  if ! username=$(op item get "$service" --fields username 2>/dev/null); then
+    echo "error: could not obtain username for $service"
+    return 1
+  fi
+
+  echo -n "$username" | clipcopy
+  echo "✔ username for service $service copied to the clipboard. Press Enter to continue"
+  read
+
   local password
   # Copy the password to the clipboard
-  if ! password=$(op item get "$service" --fields password 2>/dev/null); then
+  if ! password=$(op item get "$service" --reveal --fields password 2>/dev/null); then
     echo "error: could not obtain password for $service"
     return 1
   fi
 
   echo -n "$password" | clipcopy
-  echo "✔ password for $service copied to clipboard"
+  echo "✔ password for $service copied to clipboard. Press Enter to continue"
+  read
 
-  # If there's a one time password, copy it to the clipboard after 10 seconds
+  # If there's a one time password, copy it to the clipboard
   local totp
   if totp=$(op item get --otp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
-    sleep 10 && echo -n "$totp" | clipcopy
+    echo -n "$totp" | clipcopy
     echo "✔ TOTP for $service copied to clipboard"
   fi
 
   (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
 }
 
-# TODO: 2022-03-26: Remove support for op CLI 1
-autoload -Uz is-at-least
-is-at-least 2.0.0 $(op --version) || {
-  print -ru2 ${(%):-"%F{yellow}opswd: usage with op version $(op --version) is deprecated. Upgrade to CLI 2 and reload zsh.
-For instructions, see https://developer.1password.com/docs/cli/upgrade.%f"}
-
-  # opswd puts the password of the named service into the clipboard. If there's a
-  # one time password, it will be copied into the clipboard after 10 seconds. The
-  # clipboard is cleared after another 20 seconds.
-  function opswd() {
-    if [[ $# -lt 1 ]]; then
-      echo "Usage: opswd <service>"
-      return 1
-    fi
-
-    local service=$1
-
-    # If not logged in, print error and return
-    op list users > /dev/null || return
-
-    local password
-    # Copy the password to the clipboard
-    if ! password=$(op get item "$service" --fields password 2>/dev/null); then
-      echo "error: could not obtain password for $service"
-      return 1
-    fi
-
-    echo -n "$password" | clipcopy
-    echo "✔ password for $service copied to clipboard"
-
-    # If there's a one time password, copy it to the clipboard after 5 seconds
-    local totp
-    if totp=$(op get totp "$service" 2>/dev/null) && [[ -n "$totp" ]]; then
-      sleep 10 && echo -n "$totp" | clipcopy
-      echo "✔ TOTP for $service copied to clipboard"
-    fi
-
-    (sleep 20 && clipcopy </dev/null 2>/dev/null) &!
-  }
-}
-
 opswd "$@"
diff --git a/zsh/plugins/adb/README.md b/zsh/plugins/adb/README.md
deleted file mode 100644
index 83dcc72..0000000
--- a/zsh/plugins/adb/README.md
+++ /dev/null
@@ -1,8 +0,0 @@
-# adb autocomplete plugin
-
-* Adds autocomplete options for all adb commands.
-* Add autocomplete for `adb -s`
-
-## Requirements
-
-In order to make this work, you will need to have the Android adb tools set up in your path.
diff --git a/zsh/plugins/adb/_adb b/zsh/plugins/adb/_adb
deleted file mode 100644
index 78c4577..0000000
--- a/zsh/plugins/adb/_adb
+++ /dev/null
@@ -1,67 +0,0 @@
-#compdef adb
-#autoload
-
-# in order to make this work, you will need to have the android adb tools
-
-# adb zsh completion, based on homebrew completion
-
-local -a _1st_arguments
-_1st_arguments=(
-'bugreport:return all information from the device that should be included in a bug report.'
-'connect:connect to a device via TCP/IP Port 5555 is default.'
-'devices:list all connected devices'
-'disconnect:disconnect from a TCP/IP device. Port 5555 is default.'
-'emu:run emulator console command'
-'forward:forward socket connections'
-'get-devpath:print the device path'
-'get-serialno:print the serial number of the device'
-'get-state:print the current state of the device: offline | bootloader | device'
-'help:show the help message'
-'install:push this package file to the device and install it'
-'jdwp:list PIDs of processes hosting a JDWP transport'
-'keygen:generate adb public/private key'
-'kill-server:kill the server if it is running'
-'logcat:view device log'
-'pull:copy file/dir from device'
-'push:copy file/dir to device'
-'reboot:reboots the device, optionally into the bootloader or recovery program'
-'reboot-bootloader:reboots the device into the bootloader'
-'remount:remounts the partitions on the device read-write'
-'root:restarts the adbd daemon with root permissions'
-'sideload:push a ZIP to device and install it'
-'shell:run remote shell interactively'
-'sync:copy host->device only if changed (-l means list but dont copy)'
-'start-server:ensure that there is a server running'
-'tcpip:restart host adb in tcpip mode'
-'uninstall:remove this app package from the device'
-'usb:restart the adbd daemon listing on USB'
-'version:show version num'
-'wait-for-device:block until device is online'
-)
-
-local expl
-local -a pkgs installed_pkgs
-
-_arguments \
-	'-s[devices]:specify device:->specify_device' \
-	'*:: :->subcmds' && return 0
-
-case "$state" in
-	specify_device)
-	_values -C 'devices' ${$(adb devices -l|awk 'NR>1&& $1 \
-		{sub(/ +/," ",$0); \
-		gsub(":","\\:",$1); \
-		for(i=1;i<=NF;i++) {
-			if($i ~ /model:/) { split($i,m,":") } \
-			else if($i ~ /product:/) { split($i,p,":") } } \
-		printf "%s[%s(%s)] ",$1, p[2], m[2]}'):-""}
-	return
-	;;
-esac
-
-if (( CURRENT == 1 )); then
-	_describe -t commands "adb subcommand" _1st_arguments
-	return
-fi
-
-_files
diff --git a/zsh/plugins/ag/README.md b/zsh/plugins/ag/README.md
deleted file mode 100644
index 1983aaa..0000000
--- a/zsh/plugins/ag/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-# The Silver Searcher
-
-This plugin provides completion support for [`ag`](https://github.com/ggreer/the_silver_searcher).
-
-To use it, add ag to the plugins array in your zshrc file.
-
-```zsh
-plugins=(... ag)
-```
-
-## INSTALLATION NOTES
-
-Besides oh-my-zsh, `ag` needs to be installed by following these steps: https://github.com/ggreer/the_silver_searcher#installing.
diff --git a/zsh/plugins/ag/_ag b/zsh/plugins/ag/_ag
deleted file mode 100644
index 25b0c27..0000000
--- a/zsh/plugins/ag/_ag
+++ /dev/null
@@ -1,66 +0,0 @@
-#compdef ag
-#autoload
-
-typeset -A opt_args
-
-# Took the liberty of not listing every option… specially aliases and -D
-_ag () {
-  local -a _1st_arguments
-  _1st_arguments=(
-    '--ackmate:Print results in AckMate-parseable format'
-    {'-A','--after'}':[LINES] Print lines after match (Default: 2)'
-    {'-B','--before'}':[LINES] Print lines before match (Default: 2)'
-    '--break:Print newlines between matches in different files'
-    '--nobreak:Do not print newlines between matches in different files'
-    {'-c','--count'}':Only print the number of matches in each file'
-    '--color:Print color codes in results (Default: On)'
-    '--nocolor:Do not print color codes in results'
-    '--color-line-number:Color codes for line numbers (Default: 1;33)'
-    '--color-match:Color codes for result match numbers (Default: 30;43)'
-    '--color-path:Color codes for path names (Default: 1;32)'
-    '--column:Print column numbers in results'
-    {'-H','--heading'}':Print file names (On unless searching a single file)'
-    '--noheading:Do not print file names (On unless searching a single file)'
-    '--line-numbers:Print line numbers even for streams'
-    {'-C','--context'}':[LINES] Print lines before and after matches (Default: 2)'
-    '-g:[PATTERN] Print filenames matching PATTERN'
-    {'-l','--files-with-matches'}':Only print filenames that contain matches'
-    {'-L','--files-without-matches'}':Only print filenames that do not contain matches'
-    '--no-numbers:Do not print line numbers'
-    {'-o','--only-matching'}':Prints only the matching part of the lines'
-    '--print-long-lines:Print matches on very long lines (Default: 2k characters)'
-    '--passthrough:When searching a stream, print all lines even if they do not match'
-    '--silent:Suppress all log messages, including errors'
-    '--stats:Print stats (files scanned, time taken, etc.)'
-    '--vimgrep:Print results like vim :vimgrep /pattern/g would'
-    {'-0','--null'}':Separate filenames with null (for "xargs -0")'
-
-    {'-a','--all-types'}':Search all files (does not include hidden files / .gitignore)'
-    '--depth:[NUM] Search up to NUM directories deep (Default: 25)'
-    {'-f','--follow'}':Follow symlinks'
-    {'-G','--file-search-regex'}':[PATTERN] Limit search to filenames matching PATTERN'
-    '--hidden:Search hidden files (obeys .*ignore files)'
-    {'-i','--ignore-case'}':Match case insensitively'
-    '--ignore:[PATTERN] Ignore files/directories matching PATTERN'
-    {'-m','--max-count'}':[NUM] Skip the rest of a file after NUM matches (Default: 10k)'
-    {'-p','--path-to-agignore'}':[PATH] Use .agignore file at PATH'
-    {'-Q','--literal'}':Do not parse PATTERN as a regular expression'
-    {'-s','--case-sensitive'}':Match case'
-    {'-S','--smart-case'}':Insensitive match unless PATTERN has uppercase (Default: On)'
-    '--search-binary:Search binary files for matches'
-    {'-t','--all-text'}':Search all text files (Hidden files not included)'
-    {'-u','--unrestricted'}':Search all files (ignore .agignore and _all_)'
-    {'-U','--skip-vcs-ignores'}':Ignore VCS files (stil obey .agignore)'
-    {'-v','--invert-match'}':Invert match'
-    {'-w','--word-regexp'}':Only match whole words'
-    {'-z','--search-zip'}':Search contents of compressed (e.g., gzip) files'
-
-    '--list-file-types:list of supported file types'
-  )
-
-  if [[ $words[-1] =~ "^-" ]]; then
-    _describe -t commands "ag options" _1st_arguments && ret=0
-  else
-    _files && ret=0
-  fi
-}
diff --git a/zsh/plugins/alias-finder/.zunit.yml b/zsh/plugins/alias-finder/.zunit.yml
new file mode 100644
index 0000000..ae65f8e
--- /dev/null
+++ b/zsh/plugins/alias-finder/.zunit.yml
@@ -0,0 +1,9 @@
+tap: false
+directories:
+  tests: tests
+  output: tests/_output
+  support: tests/_support
+time_limit: 0
+fail_fast: false
+allow_risky: false
+verbose: true
diff --git a/zsh/plugins/alias-finder/README.md b/zsh/plugins/alias-finder/README.md
index 409f4b6..b24f8d4 100644
--- a/zsh/plugins/alias-finder/README.md
+++ b/zsh/plugins/alias-finder/README.md
@@ -2,45 +2,69 @@
 
 This plugin searches the defined aliases and outputs any that match the command inputted. This makes learning new aliases easier.
 
+## Setup
+
 To use it, add `alias-finder` to the `plugins` array of your zshrc file:
 ```
 plugins=(... alias-finder)
 ```
 
+To enable it for every single command, set zstyle in your `~/.zshrc`.
+
+If the user has installed `rg`([ripgrep](https://github.com/BurntSushi/ripgrep)), it will be used because it's faster. Otherwise, it will use the `grep` command.
+
+```zsh
+# ~/.zshrc
+
+zstyle ':omz:plugins:alias-finder' autoload yes # disabled by default
+zstyle ':omz:plugins:alias-finder' longer yes # disabled by default
+zstyle ':omz:plugins:alias-finder' exact yes # disabled by default
+zstyle ':omz:plugins:alias-finder' cheaper yes # disabled by default
+```
+
+As you can see, options are also available with zstyle.
+
 ## Usage
-To see if there is an alias defined for the command, pass it as an argument to `alias-finder`. This can also run automatically before each command you input - add `ZSH_ALIAS_FINDER_AUTOMATIC=true` to your zshrc if you want this.
 
-## Options
+When you execute a command alias finder will look at your defined aliases and suggest shorter aliases you could have used, for example:
 
-- Use `--longer` or `-l` to allow the aliases to be longer than the input (match aliases if they contain the input).
-- Use `--exact` or `-e` to avoid matching aliases that are shorter than the input.
+Running the un-aliased `git status` command:
+```sh
+╭─tim@fox ~/repo/gitopolis ‹main›
+╰─$ git status
 
-## Examples
+gst='git status'         # <=== shorter suggestion from alias-finder
+
+On branch main
+Your branch is up-to-date with 'origin/main'.
+nothing to commit, working tree clean
 ```
-$ alias-finder "git pull"
-gl='git pull'
-g=git
+
+Running a shorter `git st` alias from `.gitconfig` that it suggested :
+```sh
+╭─tim@fox ~/repo/gitopolis ‹main›
+╰─$ git st
+gs='git st'         # <=== shorter suggestion from alias-finder
+## main...origin/main
 ```
+
+Running the shortest `gs` shell alias that it found:
+```sh
+╭─tim@fox ~/repo/gitopolis ‹main›
+╰─$ gs
+         # <=== no suggestions alias-finder because this is the shortest
+## main...origin/main
 ```
-$ alias-finder "web_search google oh my zsh"
-google='web_search google'
-```
-```
-$ alias-finder "git commit -v"
-gc="git commit -v"
-g=git
-```
-```
-$ alias-finder -e "git commit -v"
-gc='git commit -v'
-```
-```
-$ alias-finder -l "git commit -v"
-gc='git commit -v'
-'gc!'='git commit -v --amend'
-gca='git commit -v -a'
-'gca!'='git commit -v -a --amend'
-'gcan!'='git commit -v -a --no-edit --amend'
-'gcans!'='git commit -v -a -s --no-edit --amend'
-'gcn!'='git commit -v --no-edit --amend'
-```
+
+![image](https://github.com/ohmyzsh/ohmyzsh/assets/19378/39642750-fb10-4f1a-b7f9-f36789eeb01b)
+
+
+### Options
+
+> In order to clarify, let's say `alias a=abc` has source 'abc' and destination 'a'.
+
+- Use `--longer` or `-l` to include aliases where the source is longer than the input (in other words, the source could contain the whole input).
+- Use `--exact` or `-e` to avoid aliases where the source is shorter than the input (in other words, the source must be the same with the input).
+- Use `--cheaper` or `-c` to avoid aliases where the destination is longer than the input (in other words, the destination must be the shorter than the input).
+
+
diff --git a/zsh/plugins/alias-finder/alias-finder.plugin.zsh b/zsh/plugins/alias-finder/alias-finder.plugin.zsh
index caee9b5..6f24c70 100644
--- a/zsh/plugins/alias-finder/alias-finder.plugin.zsh
+++ b/zsh/plugins/alias-finder/alias-finder.plugin.zsh
@@ -1,44 +1,67 @@
 alias-finder() {
-  local cmd="" exact="" longer="" wordStart="" wordEnd="" multiWordEnd=""
-  for i in $@; do
-    case $i in
+  local cmd=" " exact="" longer="" cheaper="" wordEnd="'{0,1}$" finder="" filter=""
+
+  # build command and options
+  for c in "$@"; do
+    case $c in
+      # TODO: Remove backward compatibility (other than zstyle form)
+      # set options if exist
       -e|--exact) exact=true;;
       -l|--longer) longer=true;;
-      *)
-        if [[ -z $cmd ]]; then
-          cmd=$i
-        else
-          cmd="$cmd $i"
-        fi
-        ;;
+      -c|--cheaper) cheaper=true;;
+      # concatenate cmd
+      *) cmd="$cmd$c " ;;
     esac
   done
-  cmd=$(sed 's/[].\|$(){}?+*^[]/\\&/g' <<< $cmd) # adds escaping for grep
-  if (( $(wc -l <<< $cmd) == 1 )); then
-    while [[ $cmd != "" ]]; do
-      if [[ $longer = true ]]; then
-        wordStart="'{0,1}"
-      else
-        wordEnd="$"
-        multiWordEnd="'$"
-      fi
-      if [[ $cmd == *" "* ]]; then
-        local finder="'$cmd$multiWordEnd"
-      else
-        local finder=$wordStart$cmd$wordEnd
-      fi
-      alias | grep -E "=$finder"
-      if [[ $exact = true || $longer = true ]]; then
-        break
-      else
-        cmd=$(sed -E 's/ {0,1}[^ ]*$//' <<< $cmd) # removes last word
-      fi
-    done
+
+  zstyle -t ':omz:plugins:alias-finder' longer && longer=true
+  zstyle -t ':omz:plugins:alias-finder' exact && exact=true
+  zstyle -t ':omz:plugins:alias-finder' cheaper && cheaper=true
+
+  # format cmd for grep
+  ## - replace newlines with spaces
+  ## - trim both ends
+  ## - replace multiple spaces with one space
+  ## - add escaping character to special characters
+  cmd=$(echo -n "$cmd" | tr '\n' ' ' | xargs | tr -s '[:space:]' | sed 's/[].\|$(){}?+*^[]/\\&/g')
+
+  if [[ $longer == true ]]; then
+    wordEnd="" # remove wordEnd to find longer aliases
   fi
+
+  # find with alias and grep, removing last word each time until no more words
+  while [[ $cmd != "" ]]; do
+    finder="'{0,1}$cmd$wordEnd"
+
+    # make filter to find only shorter results than current cmd
+    if [[ $cheaper == true ]]; then
+      cmdLen=$(echo -n "$cmd" | wc -c)
+      if [[ $cmdLen -le 1 ]]; then
+        return
+      fi
+
+      filter="^'?.{1,$((cmdLen - 1))}'?=" # some aliases is surrounded by single quotes
+    fi
+
+    if (( $+commands[rg] )); then
+      alias | rg "$filter" | rg "=$finder"
+    else
+      alias | grep -E "$filter" | grep -E "=$finder"
+    fi
+
+    if [[ $exact == true ]]; then
+      break # because exact case is only one
+    elif [[ $longer == true ]]; then
+      break # because above grep command already found every longer aliases during first cycle
+    fi
+
+    cmd=$(sed -E 's/ {0,}[^ ]*$//' <<< "$cmd") # remove last word
+  done
 }
 
 preexec_alias-finder() {
-  if [[ $ZSH_ALIAS_FINDER_AUTOMATIC = true ]]; then
+  # TODO: Remove backward compatibility (other than zstyle form)
+  zstyle -t ':omz:plugins:alias-finder' autoload && alias-finder $1 || if [[ $ZSH_ALIAS_FINDER_AUTOMATIC = true ]]; then
     alias-finder $1
   fi
 }
diff --git a/zsh/plugins/alias-finder/tests/_output/.gitkeep b/zsh/plugins/alias-finder/tests/_output/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/zsh/plugins/alias-finder/tests/_support/.gitkeep b/zsh/plugins/alias-finder/tests/_support/.gitkeep
new file mode 100644
index 0000000..e69de29
diff --git a/zsh/plugins/alias-finder/tests/_support/bootstrap b/zsh/plugins/alias-finder/tests/_support/bootstrap
new file mode 100644
index 0000000..0107661
--- /dev/null
+++ b/zsh/plugins/alias-finder/tests/_support/bootstrap
@@ -0,0 +1,2 @@
+#!/usr/bin/env zsh
+# Write your bootstrap code here
diff --git a/zsh/plugins/alias-finder/tests/test_run.sh b/zsh/plugins/alias-finder/tests/test_run.sh
new file mode 100644
index 0000000..6b7abeb
--- /dev/null
+++ b/zsh/plugins/alias-finder/tests/test_run.sh
@@ -0,0 +1,107 @@
+#!/usr/bin/env zunit
+
+@setup {
+  load ../alias-finder.plugin.zsh
+
+  set_git_aliases() {
+    unalias -a # all
+    alias g="git"
+    alias gc="git commit"
+    alias gcv="git commit -v"
+    alias gcvs="git commit -v -S"
+  }
+}
+
+@test 'find aliases that contain input' {
+  set_git_aliases
+
+  run alias-finder "git"
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "g=git"
+}
+
+@test 'find aliases that contain input with whitespaces at ends' {
+  set_git_aliases
+
+  run alias-finder "   git     "
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "g=git"
+}
+
+@test 'find aliases that contain multiple words' {
+  set_git_aliases
+
+  run alias-finder "git commit -v"
+
+  assert "${#lines[@]}" equals 3
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "gc='git commit'"
+  assert "${lines[3]}" same_as "g=git"
+}
+
+@test 'find alias that is the same with input when --exact option is set' {
+  set_git_aliases
+
+  run alias-finder -e "git"
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "g=git"
+}
+
+@test 'find alias that is the same with multiple words input when --exact option is set' {
+  set_git_aliases
+
+  run alias-finder -e "git commit -v"
+
+  assert "${#lines[@]}" equals 1
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+}
+
+@test 'find alias that is the same with or longer than input when --longer option is set' {
+  set_git_aliases
+
+  run alias-finder -l "git"
+
+  assert "${#lines[@]}" equals 4
+  assert "${lines[1]}" same_as "g=git"
+  assert "${lines[2]}" same_as "gc='git commit'"
+  assert "${lines[3]}" same_as "gcv='git commit -v'"
+  assert "${lines[4]}" same_as "gcvs='git commit -v -S'"
+}
+
+@test 'find alias that is the same with or longer than multiple words input when --longer option is set' {
+  set_git_aliases
+
+  run alias-finder -l "git commit -v"
+
+  assert "${#lines[@]}" equals 2
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "gcvs='git commit -v -S'"
+}
+
+@test 'find aliases including expensive (longer) than input' {
+  set_git_aliases
+  alias expensiveCommands="git commit"
+
+  run alias-finder "git commit -v"
+
+  assert "${#lines[@]}" equals 4
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "expensiveCommands='git commit'"
+  assert "${lines[3]}" same_as "gc='git commit'"
+  assert "${lines[4]}" same_as "g=git"
+}
+
+@test 'find aliases excluding expensive (longer) than input when --cheap option is set' {
+  set_git_aliases
+  alias expensiveCommands="git commit"
+
+  run alias-finder -c "git commit -v"
+
+  assert "${#lines[@]}" equals 3
+  assert "${lines[1]}" same_as "gcv='git commit -v'"
+  assert "${lines[2]}" same_as "gc='git commit'"
+  assert "${lines[3]}" same_as "g=git"
+}
diff --git a/zsh/plugins/aliases/README.md b/zsh/plugins/aliases/README.md
index 66fd845..5a7e7df 100644
--- a/zsh/plugins/aliases/README.md
+++ b/zsh/plugins/aliases/README.md
@@ -1,7 +1,5 @@
 # Aliases cheatsheet
 
-**Maintainer:** [@hqingyi](https://github.com/hqingyi)
-
 With lots of 3rd-party amazing aliases installed, this plugin helps list the shortcuts
 that are currently available based on the plugins you have enabled.
 
@@ -13,16 +11,18 @@ plugins=(aliases)
 
 Requirements: Python needs to be installed.
 
+**Maintainer:** [@hqingyi](https://github.com/hqingyi)
+
 ## Usage
 
-- `acs`: show all aliases by group.
+- `als`: show all aliases by group
 
-- `acs -h/--help`: print help mesage.
+- `als -h/--help`: print help message
 
-- `acs <keyword>`: filter aliases by `<keyword>` and highlight.
+- `als <keyword(s)>`: filter and highlight aliases by `<keyword>`
 
-- `acs -g <group>/--group <group`: show only aliases for group `<group>`. Multiple uses of the flag show all groups,
+- `als -g <group>/--group <group>`: show only aliases for group `<group>`. Multiple uses of the flag show all groups
 
-- `acs --groups-only`: show only group names
+- `als --groups`: show only group names
 
-  ![screenshot](https://cloud.githubusercontent.com/assets/3602957/11581913/cb54fb8a-9a82-11e5-846b-5a67f67ad9ad.png)
+  ![screenshot](https://github.com/ohmyzsh/ohmyzsh/assets/66907184/5bfa00ea-5fc3-4e97-8b22-2f74f6b948c7)
diff --git a/zsh/plugins/aliases/aliases.plugin.zsh b/zsh/plugins/aliases/aliases.plugin.zsh
index 9864de9..7f1ba83 100644
--- a/zsh/plugins/aliases/aliases.plugin.zsh
+++ b/zsh/plugins/aliases/aliases.plugin.zsh
@@ -4,7 +4,7 @@
 0="${${(M)0:#/*}:-$PWD/$0}"
 
 eval '
-  function acs(){
+  function als(){
     (( $+commands[python3] )) || {
       echo "[error] No python executable detected"
       return
diff --git a/zsh/plugins/aliases/cheatsheet.py b/zsh/plugins/aliases/cheatsheet.py
index 3362a6a..61bf5f9 100644
--- a/zsh/plugins/aliases/cheatsheet.py
+++ b/zsh/plugins/aliases/cheatsheet.py
@@ -15,6 +15,7 @@ def parse(line):
 
 def cheatsheet(lines):
     exps = [ parse(line) for line in lines ]
+    exps.sort(key=lambda exp:exp[2])
     cheatsheet = {'_default': []}
     for key, group in itertools.groupby(exps, lambda exp:exp[2]):
         group_list = [ item for item in group ]
@@ -56,8 +57,8 @@ def pretty_print(cheatsheet, wfilter, group_list=None, groups_only=False):
             pretty_print_group(key, [ alias for alias in aliases if alias[0].find(wfilter)>-1 or alias[1].find(wfilter)>-1], wfilter)
 
 if __name__ == '__main__':
-    parser = argparse.ArgumentParser(description="Pretty print aliases.")
-    parser.add_argument('filter', nargs="*", help="search aliases matching string")
+    parser = argparse.ArgumentParser(description="Pretty print aliases.", prog="als")
+    parser.add_argument('filter', nargs="*", metavar="<keyword>", help="search aliases matching keywords")
     parser.add_argument('-g', '--group', dest="group_list", action='append', help="only print aliases in given groups")
     parser.add_argument('--groups', dest='groups_only', action='store_true', help="only print alias groups")
     args = parser.parse_args()
diff --git a/zsh/plugins/ansible/README.md b/zsh/plugins/ansible/README.md
index e0e6a19..6a06962 100644
--- a/zsh/plugins/ansible/README.md
+++ b/zsh/plugins/ansible/README.md
@@ -1,7 +1,5 @@
 # ansible plugin
 
-## Introduction
-
 The `ansible plugin` adds several aliases for useful [ansible](https://docs.ansible.com/ansible/latest/index.html) commands and [aliases](#aliases).
 
 To use it, add `ansible` to the plugins array of your zshrc file:
@@ -21,7 +19,6 @@ plugins=(... ansible)
 | `acon`                                     | command `ansible-console`                                           |
 | `ainv`                                     | command `ansible-inventory`                                         |
 | `aplaybook`                                | command `ansible-playbook`                                          |
-| `ainv`                                     | command `ansible-inventory`                                         |
 | `adoc`                                     | command `ansible-doc`                                               |
 | `agal`                                     | command `ansible-galaxy`                                            |
 | `apull`                                    | command `ansible-pull`                                              |
@@ -29,6 +26,6 @@ plugins=(... ansible)
 
 ## Maintainer
 
-### [Deepankumar](https://github.com/deepan10) 
+### [Deepankumar](https://github.com/deepan10)
 
 [https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin](https://github.com/deepan10/oh-my-zsh/tree/features/ansible-plugin)
diff --git a/zsh/plugins/archlinux/README.md b/zsh/plugins/archlinux/README.md
index fd772c6..5e015db 100644
--- a/zsh/plugins/archlinux/README.md
+++ b/zsh/plugins/archlinux/README.md
@@ -181,3 +181,4 @@ whether the package manager is installed, checked in the following order:
 - Ybalrid (Arthur Brainville) - ybalrid@ybalrid.info
 - Jeff M. Hubbard - jeffmhubbard@gmail.com
 - K. Harishankar(harishnkr) - hari2menon1234@gmail.com
+- WH-2099 - wh2099@outlook.com
\ No newline at end of file
diff --git a/zsh/plugins/archlinux/archlinux.plugin.zsh b/zsh/plugins/archlinux/archlinux.plugin.zsh
index 4f13647..7abd7c2 100644
--- a/zsh/plugins/archlinux/archlinux.plugin.zsh
+++ b/zsh/plugins/archlinux/archlinux.plugin.zsh
@@ -23,30 +23,27 @@ alias pacfiles='pacman -F'
 alias pacls='pacman -Ql'
 alias pacown='pacman -Qo'
 alias pacupd="sudo pacman -Sy"
-alias upgrade='sudo pacman -Syu'
 
 function paclist() {
-  # Based on https://bbs.archlinux.org/viewtopic.php?id=93683
-  pacman -Qqe | \
-    xargs -I '{}' \
-      expac "${bold_color}% 20n ${fg_no_bold[white]}%d${reset_color}" '{}'
+  pacman -Qqe | xargs -I{} -P0 --no-run-if-empty pacman -Qs --color=auto "^{}\$"
 }
 
 function pacdisowned() {
-  local tmp db fs
-  tmp=${TMPDIR-/tmp}/pacman-disowned-$UID-$$
-  db=$tmp/db
-  fs=$tmp/fs
+  local tmp_dir db fs
+  tmp_dir=$(mktemp --directory)
+  db=$tmp_dir/db
+  fs=$tmp_dir/fs
 
-  mkdir "$tmp"
-  trap 'rm -rf "$tmp"' EXIT
+  trap "rm -rf $tmp_dir" EXIT
 
   pacman -Qlq | sort -u > "$db"
 
-  find /bin /etc /lib /sbin /usr ! -name lost+found \
+  find /etc /usr ! -name lost+found \
     \( -type d -printf '%p/\n' -o -print \) | sort > "$fs"
 
   comm -23 "$fs" "$db"
+
+  rm -rf $tmp_dir
 }
 
 alias pacmanallkeys='sudo pacman-key --refresh-keys'
@@ -109,7 +106,6 @@ if (( $+commands[aura] )); then
   alias auupd="sudo aura -Sy"
   alias auupg='sudo sh -c "aura -Syu              && aura -Au"'
   alias ausu='sudo sh -c "aura -Syu --no-confirm && aura -Au --no-confirm"'
-  alias upgrade='sudo aura -Syu'
 
   # extra bonus specially for aura
   alias auown="aura -Qqo"
@@ -136,7 +132,6 @@ if (( $+commands[pacaur] )); then
   alias painsd='pacaur -S --asdeps'
   alias pamir='pacaur -Syy'
   alias paupd="pacaur -Sy"
-  alias upgrade='pacaur -Syu'
 fi
 
 if (( $+commands[trizen] )); then
@@ -158,7 +153,6 @@ if (( $+commands[trizen] )); then
   alias trinsd='trizen -S --asdeps'
   alias trmir='trizen -Syy'
   alias trupd="trizen -Sy"
-  alias upgrade='trizen -Syu'
 fi
 
 if (( $+commands[yay] )); then
@@ -180,5 +174,31 @@ if (( $+commands[yay] )); then
   alias yainsd='yay -S --asdeps'
   alias yamir='yay -Syy'
   alias yaupd="yay -Sy"
-  alias upgrade='yay -Syu'
 fi
+
+# Check Arch Linux PGP Keyring before System Upgrade to prevent failure.
+function upgrade() {
+  sudo pacman -Sy
+  echo ":: Checking Arch Linux PGP Keyring..."
+  local installedver="$(LANG= sudo pacman -Qi archlinux-keyring | grep -Po '(?<=Version         : ).*')"
+  local currentver="$(LANG= sudo pacman -Si archlinux-keyring | grep -Po '(?<=Version         : ).*')"
+  if [ $installedver != $currentver ]; then
+    echo " Arch Linux PGP Keyring is out of date."
+    echo " Updating before full system upgrade."
+    sudo pacman -S --needed --noconfirm archlinux-keyring
+  else
+    echo " Arch Linux PGP Keyring is up to date."
+    echo " Proceeding with full system upgrade."
+  fi
+  if (( $+commands[yay] )); then
+    yay -Su
+  elif (( $+commands[trizen] )); then
+    trizen -Su
+  elif (( $+commands[pacaur] )); then
+    pacaur -Su
+  elif (( $+commands[aura] )); then
+    sudo aura -Su
+  else
+    sudo pacman -Su
+  fi
+}
diff --git a/zsh/plugins/arduino-cli/README.md b/zsh/plugins/arduino-cli/README.md
new file mode 100644
index 0000000..821d72b
--- /dev/null
+++ b/zsh/plugins/arduino-cli/README.md
@@ -0,0 +1,9 @@
+# Arduino CLI plugin
+
+This plugin adds completion for the [arduino-cli](https://github.com/arduino/arduino-cli) tool.
+
+To use it, add `arduino-cli` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... arduino-cli)
+```
diff --git a/zsh/plugins/arduino-cli/arduino-cli.plugin.zsh b/zsh/plugins/arduino-cli/arduino-cli.plugin.zsh
new file mode 100644
index 0000000..e4fdcf9
--- /dev/null
+++ b/zsh/plugins/arduino-cli/arduino-cli.plugin.zsh
@@ -0,0 +1,14 @@
+if (( ! $+commands[arduino-cli] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `arduino-cli`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_arduino-cli" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _arduino-cli
+  _comps[arduino-cli]=_arduino-cli
+fi
+
+# Generate and load arduino-cli completion
+arduino-cli completion zsh >! "$ZSH_CACHE_DIR/completions/_arduino-cli" &|
diff --git a/zsh/plugins/argocd/README.md b/zsh/plugins/argocd/README.md
new file mode 100644
index 0000000..0f900ff
--- /dev/null
+++ b/zsh/plugins/argocd/README.md
@@ -0,0 +1,20 @@
+# Argo CD plugin
+
+This plugin adds completion for the [Argo CD](https://argoproj.github.io/cd/) CLI.
+
+To use it, add `argocd` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... argocd)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated asynchronously when the plugin is
+loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH_CACHE/completions/_argocd` completions script
diff --git a/zsh/plugins/argocd/argocd.plugin.zsh b/zsh/plugins/argocd/argocd.plugin.zsh
new file mode 100644
index 0000000..8de7b02
--- /dev/null
+++ b/zsh/plugins/argocd/argocd.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for argocd.
+if (( ! $+commands[argocd] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `argocd`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_argocd" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _argocd
+  _comps[argocd]=_argocd
+fi
+
+argocd completion zsh >| "$ZSH_CACHE_DIR/completions/_argocd" &|
diff --git a/zsh/plugins/asdf/README.md b/zsh/plugins/asdf/README.md
index e8aa976..69db693 100644
--- a/zsh/plugins/asdf/README.md
+++ b/zsh/plugins/asdf/README.md
@@ -1,27 +1,48 @@
-## asdf
-
-**Maintainer:** [@RobLoach](https://github.com/RobLoach)
+# asdf
 
 Adds integration with [asdf](https://github.com/asdf-vm/asdf), the extendable version manager, with support for Ruby, Node.js, Elixir, Erlang and more.
 
-### Installation
+## Installation
 
-1. Enable the plugin by adding it to your `plugins` definition in `~/.zshrc`.
-
-  ```
-  plugins=(asdf)
-  ```
-
-2. [Install asdf](https://github.com/asdf-vm/asdf#setup) by running the following:
-  ```
-  git clone https://github.com/asdf-vm/asdf.git ~/.asdf
-  ```
-
-### Usage
-
-See the [asdf usage documentation](https://github.com/asdf-vm/asdf#usage) for information on how to use asdf:
+1. [Install](https://asdf-vm.com/guide/getting-started.html#_1-install-asdf) asdf and ensure that's it's discoverable on `$PATH`;
+2. Enable it by adding it to your `plugins` definition in `~/.zshrc`:
 
+```sh
+plugins=(asdf)
 ```
-asdf plugin-add nodejs git@github.com:asdf-vm/asdf-nodejs.git
-asdf install nodejs 5.9.1
+
+## Usage
+
+Refer to the [asdf plugin documentation](https://asdf-vm.com/guide/getting-started.html#_4-install-a-plugin) for information on how to add a plugin and install the many runtime versions for it.
+
+Example for installing the nodejs plugin and the many runtimes for it:
+
+```sh
+# Add plugin to asdf
+asdf plugin add nodejs
+
+# Install the latest available version
+asdf install nodejs latest
+
+# Uninstall the latest version
+asdf uninstall nodejs latest
+
+# Install a specific version
+asdf install nodejs 16.5.0
+
+# Set the latest version in .tool-versions of the `current directory`
+asdf set nodejs latest
+
+# Set a specific version in the `parent directory`
+asdf set -p nodejs 16.5.0   # -p is shorthand for --parent
+
+# Set a global version under `$HOME`
+asdf set -u nodejs 16.5.0   # -u is shorthand for --home
 ```
+
+For more commands, run `asdf help` or refer to the
+[asdf CLI documentation](https://asdf-vm.com/manage/commands.html#all-commands).
+
+## Maintainer
+
+- [@RobLoach](https://github.com/RobLoach)
diff --git a/zsh/plugins/asdf/asdf.plugin.zsh b/zsh/plugins/asdf/asdf.plugin.zsh
index 3016282..9139498 100644
--- a/zsh/plugins/asdf/asdf.plugin.zsh
+++ b/zsh/plugins/asdf/asdf.plugin.zsh
@@ -1,27 +1,15 @@
-# Find where asdf should be installed
-ASDF_DIR="${ASDF_DIR:-$HOME/.asdf}"
-ASDF_COMPLETIONS="$ASDF_DIR/completions"
+(( ! $+commands[asdf] )) && return
 
-# If not found, check for archlinux/AUR package (/opt/asdf-vm/)
-if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && [[ -f "/opt/asdf-vm/asdf.sh" ]]; then
-  ASDF_DIR="/opt/asdf-vm"
-  ASDF_COMPLETIONS="$ASDF_DIR"
-fi
-
-# If not found, check for Homebrew package
-if [[ ! -f "$ASDF_DIR/asdf.sh" || ! -f "$ASDF_COMPLETIONS/asdf.bash" ]] && (( $+commands[brew] )); then
-  brew_prefix="$(brew --prefix asdf)"
-  ASDF_DIR="${brew_prefix}/libexec"
-  ASDF_COMPLETIONS="${brew_prefix}/etc/bash_completion.d"
-  unset brew_prefix
-fi
-
-# Load command
-if [[ -f "$ASDF_DIR/asdf.sh" ]]; then
-  . "$ASDF_DIR/asdf.sh"
-
-  # Load completions
-  if [[ -f "$ASDF_COMPLETIONS/asdf.bash" ]]; then
-    . "$ASDF_COMPLETIONS/asdf.bash"
-  fi
+export ASDF_DATA_DIR="${ASDF_DATA_DIR:-$HOME/.asdf}"
+
+# Add shims to the front of the path, removing if already present.
+path=("$ASDF_DATA_DIR/shims" ${path:#$ASDF_DATA_DIR/shims})
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `asdf`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_asdf" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _asdf
+  _comps[asdf]=_asdf
 fi
+asdf completion zsh >| "$ZSH_CACHE_DIR/completions/_asdf" &|
diff --git a/zsh/plugins/autoenv/autoenv.plugin.zsh b/zsh/plugins/autoenv/autoenv.plugin.zsh
index 229a8a8..2f84f0a 100644
--- a/zsh/plugins/autoenv/autoenv.plugin.zsh
+++ b/zsh/plugins/autoenv/autoenv.plugin.zsh
@@ -17,9 +17,13 @@ if ! type autoenv_init >/dev/null; then
       /usr/local/bin
       /usr/share/autoenv-git
       ~/Library/Python/bin
+      .venv/bin
+      venv/bin
+      env/bin
+      .env/bin
     )
     for d ( $install_locations ); do
-      if [[ -e $d/activate.sh ]]; then
+      if [[ -e $d/activate || -e $d/activate.sh ]]; then
         autoenv_dir=$d
         break
       fi
@@ -29,13 +33,13 @@ if ! type autoenv_init >/dev/null; then
   # Look for Homebrew path as a last resort
   if [[ -z "$autoenv_dir" ]] && (( $+commands[brew] )); then
     d=$(brew --prefix)/opt/autoenv
-    if [[ -e $d/activate.sh ]]; then
+    if [[ -e $d/activate || -e $d/activate.sh ]]; then
       autoenv_dir=$d
     fi
   fi
 
   # Complain if autoenv is not installed
-  if [[ -z $autoenv_dir ]]; then 
+  if [[ -z $autoenv_dir ]]; then
     cat <<END >&2
 -------- AUTOENV ---------
 Could not locate autoenv installation.
@@ -46,7 +50,11 @@ END
     return 1
   fi
   # Load autoenv
-  source $autoenv_dir/activate.sh
+  if [[ -e $autoenv_dir/activate ]]; then
+    source $autoenv_dir/activate
+  else
+    source $autoenv_dir/activate.sh
+  fi
 fi
 }
 [[ $? != 0 ]] && return $?
diff --git a/zsh/plugins/autojump/autojump.plugin.zsh b/zsh/plugins/autojump/autojump.plugin.zsh
index 8593353..a0668a4 100644
--- a/zsh/plugins/autojump/autojump.plugin.zsh
+++ b/zsh/plugins/autojump/autojump.plugin.zsh
@@ -1,17 +1,22 @@
 declare -a autojump_paths
 autojump_paths=(
-  $HOME/.autojump/etc/profile.d/autojump.zsh         # manual installation
-  $HOME/.autojump/share/autojump/autojump.zsh        # manual installation
-  $HOME/.nix-profile/etc/profile.d/autojump.sh       # NixOS installation
-  /run/current-system/sw/share/autojump/autojump.zsh # NixOS installation
-  /usr/share/autojump/autojump.zsh                   # Debian and Ubuntu package
-  /etc/profile.d/autojump.zsh                        # manual installation
-  /etc/profile.d/autojump.sh                         # Gentoo installation
-  /usr/local/share/autojump/autojump.zsh             # FreeBSD installation
-  /usr/pkg/share/autojump/autojump.zsh               # NetBSD installation
-  /opt/local/etc/profile.d/autojump.sh               # macOS with MacPorts
-  /usr/local/etc/profile.d/autojump.sh               # macOS with Homebrew (default)
-  /opt/homebrew/etc/profile.d/autojump.sh            # macOS with Homebrew (default on M1 macs)
+  $HOME/.autojump/etc/profile.d/autojump.zsh               # manual installation
+  $HOME/.autojump/share/autojump/autojump.zsh              # manual installation
+  $HOME/.nix-profile/etc/profile.d/autojump.sh             # NixOS installation
+  /run/current-system/sw/share/autojump/autojump.zsh       # NixOS installation
+  /etc/profiles/per-user/$USER/share/autojump/autojump.zsh # Home Manager, NixOS with user-scoped packages
+  /usr/share/autojump/autojump.zsh                         # Debian and Ubuntu package
+  $PREFIX/share/autojump/autojump.zsh                      # Termux package
+  /etc/profile.d/autojump.zsh                              # manual installation
+  /etc/profile.d/autojump.sh                               # Gentoo installation
+  /usr/local/share/autojump/autojump.zsh                   # FreeBSD installation
+  /usr/pkg/share/autojump/autojump.zsh                     # NetBSD installation
+  /opt/local/etc/profile.d/autojump.sh                     # macOS with MacPorts
+  /usr/local/etc/profile.d/autojump.sh                     # macOS with Homebrew (default)
+  /opt/homebrew/etc/profile.d/autojump.sh                  # macOS with Homebrew (default on M1 macs)
+  /opt/pkg/share/autojump/autojump.zsh                     # macOS with pkgsrc
+  /etc/profiles/per-user/$USER/etc/profile.d/autojump.sh   # macOS Nix, Home Manager and flakes
+  /nix/var/nix/gcroots/current-system/sw/share/zsh/site-functions/autojump.zsh  # macOS Nix, nix-darwin
 )
 
 for file in $autojump_paths; do
diff --git a/zsh/plugins/aws/README.md b/zsh/plugins/aws/README.md
index d6f4f46..0d0773f 100644
--- a/zsh/plugins/aws/README.md
+++ b/zsh/plugins/aws/README.md
@@ -1,7 +1,8 @@
 # aws
 
-This plugin provides completion support for [awscli](https://docs.aws.amazon.com/cli/latest/reference/index.html)
-and a few utilities to manage AWS profiles and display them in the prompt.
+This plugin provides completion support for [awscli v2](https://awscli.amazonaws.com/v2/documentation/api/latest/reference/index.html)
+and a few utilities to manage AWS profiles/regions and display them in the prompt.
+[awscli v1](https://docs.aws.amazon.com/cli/latest/userguide/cliv2-migration.html) is no longer supported.
 
 To use it, add `aws` to the plugins array in your zshrc file.
 
@@ -12,9 +13,14 @@ plugins=(... aws)
 ## Plugin commands
 
 * `asp [<profile>]`: sets `$AWS_PROFILE` and `$AWS_DEFAULT_PROFILE` (legacy) to `<profile>`.
-  It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI.
+  It also sets `$AWS_EB_PROFILE` to `<profile>` for the Elastic Beanstalk CLI. It sets `$AWS_PROFILE_REGION` for display in `aws_prompt_info`.
   Run `asp` without arguments to clear the profile.
-* `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection. 
+* `asp [<profile>] login`: If AWS SSO has been configured in your aws profile, it will run the `aws sso login` command following profile selection.
+* `asp [<profile>] login [<sso_session>]`: In addition to `asp [<profile>] login`, if SSO session has been configured in your aws profile, it will run the `aws sso login --sso-session <sso_session>` command following profile selection.
+* `asp [<profile>] logout`: If AWS SSO has been configured in your aws profile, it will run the `aws sso logout` command following profile selection.
+
+* `asr [<region>]`: sets `$AWS_REGION` and `$AWS_DEFAULT_REGION` (legacy) to `<region>`.
+  Run `asr` without arguments to clear the profile.
 
 * `acp [<profile>] [<mfa_token>]`: in addition to `asp` functionality, it actually changes
    the profile by assuming the role specified in the `<profile>` configuration. It supports
@@ -25,25 +31,41 @@ plugins=(... aws)
 
 * `agp`: gets the current value of `$AWS_PROFILE`.
 
+* `agr`: gets the current value of `$AWS_REGION`.
+
 * `aws_change_access_key`: changes the AWS access key of a profile.
 
 * `aws_profiles`: lists the available profiles in the  `$AWS_CONFIG_FILE` (default: `~/.aws/config`).
   Used to provide completion for the `asp` function.
 
+* `aws_regions`: lists the available regions.
+  Used to provide completion for the `asr` function.
+
 ## Plugin options
 
 * Set `SHOW_AWS_PROMPT=false` in your zshrc file if you want to prevent the plugin from modifying your RPROMPT.
   Some themes might overwrite the value of RPROMPT instead of appending to it, so they'll need to be fixed to
-  see the AWS profile prompt.
+  see the AWS profile/region prompt.
+
+* Set `AWS_PROFILE_STATE_ENABLED=true` in your zshrc file if you want the aws profile to persist between shell sessions.
+  This option might slow down your shell startup time.
+  By default the state file path is `/tmp/.aws_current_profile`. This means that the state won't survive a reboot or otherwise GC.
+  You can control the state file path using the `AWS_STATE_FILE` environment variable.
 
 ## Theme
 
 The plugin creates an `aws_prompt_info` function that you can use in your theme, which displays
-the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
+the current `$AWS_PROFILE` and `$AWS_REGION`. It uses four variables to control how that is shown:
 
-* ZSH_THEME_AWS_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
+* ZSH_THEME_AWS_PROFILE_PREFIX: sets the prefix of the AWS_PROFILE. Defaults to `<aws:`.
 
-* ZSH_THEME_AWS_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+* ZSH_THEME_AWS_PROFILE_SUFFIX: sets the suffix of the AWS_PROFILE. Defaults to `>`.
+
+* ZSH_THEME_AWS_REGION_PREFIX: sets the prefix of the AWS_REGION. Defaults to `<region:`.
+
+* ZSH_THEME_AWS_REGION_SUFFIX: sets the suffix of the AWS_REGION. Defaults to `>`.
+
+* ZSH_THEME_AWS_DIVIDER: sets the divider between ZSH_THEME_AWS_PROFILE_SUFFIX and ZSH_THEME_AWS_REGION_PREFIX. Defaults to ` ` (single space).
 
 ## Configuration
 
@@ -53,7 +75,7 @@ the current `$AWS_PROFILE`. It uses two variables to control how that is shown:
 
 Source profile credentials in `~/.aws/credentials`:
 
-```
+```ini
 [source-profile-name]
 aws_access_key_id = ...
 aws_secret_access_key = ...
@@ -61,7 +83,7 @@ aws_secret_access_key = ...
 
 Role configuration in `~/.aws/config`:
 
-```
+```ini
 [profile source-profile-name]
 mfa_serial = arn:aws:iam::111111111111:mfa/myuser
 region = us-east-1
diff --git a/zsh/plugins/aws/aws.plugin.zsh b/zsh/plugins/aws/aws.plugin.zsh
index 2167f55..0c43031 100644
--- a/zsh/plugins/aws/aws.plugin.zsh
+++ b/zsh/plugins/aws/aws.plugin.zsh
@@ -2,10 +2,30 @@ function agp() {
   echo $AWS_PROFILE
 }
 
+function agr() {
+  echo $AWS_REGION
+}
+
+# Update state file if enabled
+function _aws_update_state() {
+  if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
+    test -d $(dirname ${AWS_STATE_FILE}) || exit 1
+    echo "${AWS_PROFILE} ${AWS_REGION}" > "${AWS_STATE_FILE}"
+  fi
+}
+
+function _aws_clear_state() {
+  if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
+    test -d $(dirname ${AWS_STATE_FILE}) || exit 1
+    echo -n > "${AWS_STATE_FILE}"
+  fi
+}
+
 # AWS profile selection
 function asp() {
   if [[ -z "$1" ]]; then
-    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE
+    unset AWS_DEFAULT_PROFILE AWS_PROFILE AWS_EB_PROFILE AWS_PROFILE_REGION
+    _aws_clear_state
     echo AWS profile cleared.
     return
   fi
@@ -22,11 +42,42 @@ function asp() {
   export AWS_PROFILE=$1
   export AWS_EB_PROFILE=$1
 
+  export AWS_PROFILE_REGION=$(aws configure get region)
+
+  _aws_update_state
+
   if [[ "$2" == "login" ]]; then
-    aws sso login
+    if [[ -n "$3" ]]; then
+      aws sso login --sso-session $3
+    else
+      aws sso login
+    fi
+  elif [[ "$2" == "logout" ]]; then
+    aws sso logout
   fi
 }
 
+# AWS region selection
+function asr() {
+  if [[ -z "$1" ]]; then
+    unset AWS_DEFAULT_REGION AWS_REGION
+    _aws_update_state
+    echo AWS region cleared.
+    return
+  fi
+
+  local -a available_regions
+  available_regions=($(aws_regions))
+  if [[ -z "${available_regions[(r)$1]}" ]]; then
+    echo "${fg[red]}Available regions: \n$(aws_regions)"
+    return 1
+  fi
+
+  export AWS_REGION=$1
+  export AWS_DEFAULT_REGION=$1
+  _aws_update_state
+}
+
 # AWS profile switch
 function acp() {
   if [[ -z "$1" ]]; then
@@ -135,21 +186,69 @@ function aws_change_access_key() {
     return 1
   fi
 
-  echo "Insert the credentials when asked."
-  asp "$1" || return 1
-  AWS_PAGER="" aws iam create-access-key
-  AWS_PAGER="" aws configure --profile "$1"
+  local profile="$1"
+  # Get current access key
+  local original_aws_access_key_id="$(aws configure get aws_access_key_id --profile $profile)"
 
-  echo "You can now safely delete the old access key running \`aws iam delete-access-key --access-key-id ID\`"
+  asp "$profile" || return 1
+  echo "Generating a new access key pair for you now."
+  if aws --no-cli-pager iam create-access-key; then
+    echo "Insert the newly generated credentials when asked."
+    aws --no-cli-pager configure --profile $profile
+  else
+    echo "Current access keys:"
+    aws --no-cli-pager iam list-access-keys
+    echo "Profile \"${profile}\" is currently using the $original_aws_access_key_id key. You can delete an old access key by running \`aws --profile $profile iam delete-access-key --access-key-id AccessKeyId\`"
+    return 1
+  fi
+
+  read -q "yn?Would you like to disable your previous access key (${original_aws_access_key_id}) now? "
+  case $yn in
+    [Yy]*)
+      echo -n "\nDisabling access key ${original_aws_access_key_id}..."
+      if aws --no-cli-pager iam update-access-key --access-key-id ${original_aws_access_key_id} --status Inactive; then
+        echo "done."
+      else
+        echo "\nFailed to disable ${original_aws_access_key_id} key."
+      fi
+      ;;
+    *)
+      echo ""
+      ;;
+  esac
+  echo "You can now safely delete the old access key by running \`aws --profile $profile iam delete-access-key --access-key-id ${original_aws_access_key_id}\`"
   echo "Your current keys are:"
-  AWS_PAGER="" aws iam list-access-keys
+  aws --no-cli-pager iam list-access-keys
+}
+
+function aws_regions() {
+  local region
+  if [[ $AWS_DEFAULT_REGION ]];then
+      region="$AWS_DEFAULT_REGION"
+  elif [[ $AWS_REGION ]];then
+      region="$AWS_REGION"
+  else
+      region="us-west-1"
+  fi
+
+  if [[ $AWS_DEFAULT_PROFILE || $AWS_PROFILE ]];then
+    aws ec2 describe-regions --region $region |grep RegionName | awk -F ':' '{gsub(/"/, "", $2);gsub(/,/, "", $2);gsub(/ /, "", $2);  print $2}'
+  else
+    echo "You must specify a AWS profile."
+  fi
 }
 
 function aws_profiles() {
+  aws --no-cli-pager configure list-profiles 2> /dev/null && return
   [[ -r "${AWS_CONFIG_FILE:-$HOME/.aws/config}" ]] || return 1
   grep --color=never -Eo '\[.*\]' "${AWS_CONFIG_FILE:-$HOME/.aws/config}" | sed -E 's/^[[:space:]]*\[(profile)?[[:space:]]*([^[:space:]]+)\][[:space:]]*$/\2/g'
 }
 
+function _aws_regions() {
+  reply=($(aws_regions))
+}
+compctl -K _aws_regions asr
+
 function _aws_profiles() {
   reply=($(aws_profiles))
 }
@@ -157,14 +256,40 @@ compctl -K _aws_profiles asp acp aws_change_access_key
 
 # AWS prompt
 function aws_prompt_info() {
-  [[ -n "$AWS_PROFILE" ]] || return
-  echo "${ZSH_THEME_AWS_PREFIX=<aws:}${AWS_PROFILE:gs/%/%%}${ZSH_THEME_AWS_SUFFIX=>}"
+  local _aws_to_show
+  local region="${AWS_REGION:-${AWS_DEFAULT_REGION:-$AWS_PROFILE_REGION}}"
+
+  if [[ -n "$AWS_PROFILE" ]];then
+    _aws_to_show+="${ZSH_THEME_AWS_PROFILE_PREFIX="<aws:"}${AWS_PROFILE}${ZSH_THEME_AWS_PROFILE_SUFFIX=">"}"
+  fi
+
+  if [[ -n "$region" ]]; then
+    [[ -n "$_aws_to_show" ]] && _aws_to_show+="${ZSH_THEME_AWS_DIVIDER=" "}"
+    _aws_to_show+="${ZSH_THEME_AWS_REGION_PREFIX="<region:"}${region}${ZSH_THEME_AWS_REGION_SUFFIX=">"}"
+  fi
+
+  echo "$_aws_to_show"
 }
 
 if [[ "$SHOW_AWS_PROMPT" != false && "$RPROMPT" != *'$(aws_prompt_info)'* ]]; then
   RPROMPT='$(aws_prompt_info)'"$RPROMPT"
 fi
 
+if [[ "$AWS_PROFILE_STATE_ENABLED" == true ]]; then
+  AWS_STATE_FILE="${AWS_STATE_FILE:-/tmp/.aws_current_profile}"
+  test -s "${AWS_STATE_FILE}" || return
+
+  aws_state=($(cat $AWS_STATE_FILE))
+
+  export AWS_DEFAULT_PROFILE="${aws_state[1]}"
+  export AWS_PROFILE="$AWS_DEFAULT_PROFILE"
+  export AWS_EB_PROFILE="$AWS_DEFAULT_PROFILE"
+
+  test -z "${aws_state[2]}" && AWS_REGION=$(aws configure get region)
+
+  export AWS_REGION=${AWS_REGION:-$aws_state[2]}
+  export AWS_DEFAULT_REGION="$AWS_REGION"
+fi
 
 # Load awscli completions
 
@@ -210,3 +335,4 @@ else
   [[ -r $_aws_zsh_completer_path ]] && source $_aws_zsh_completer_path
   unset _aws_zsh_completer_path _brew_prefix
 fi
+
diff --git a/zsh/plugins/azure/README.md b/zsh/plugins/azure/README.md
new file mode 100644
index 0000000..f399308
--- /dev/null
+++ b/zsh/plugins/azure/README.md
@@ -0,0 +1,49 @@
+# azure
+
+This plugin provides completion support for [azure cli](https://docs.microsoft.com/en-us/cli/azure/)
+and a few utilities to manage azure subscriptions and display them in the prompt.
+
+To use it, add `azure` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... azure)
+```
+
+## Plugin commands
+
+
+* `az_subscriptions`: lists the available subscriptions in the  `AZURE_CONFIG_DIR` (default: `~/.azure/`).
+  Used to provide completion for the `azss` function.
+
+* `azgs`: gets the current value of `$azure_subscription`.
+
+* `azss [<subscription>]`: sets the `$azure_subscription`.
+
+
+NOTE : because azure keeps the state of active subscription in ${AZURE_CONFIG_DIR:-$HOME/.azure/azureProfile.json}, the prompt command requires `jq` to be enabled to parse the file. If jq is not in the path the prompt will show nothing
+
+## Theme
+
+The plugin creates an `azure_prompt_info` function that you can use in your theme, which displays
+the current `$azure_subscription`. It uses two variables to control how that is shown:
+
+- ZSH_THEME_AZURE_PREFIX: sets the prefix of the azure_subscription. Defaults to `<az:`.
+
+- ZSH_THEME_azure_SUFFIX: sets the suffix of the azure_subscription. Defaults to `>`.
+
+
+```
+RPROMPT='$(azure_prompt_info)'
+```
+
+## Develop
+
+On ubuntu get a working environment with :
+
+` docker run -it -v $(pwd):/mnt -w /mnt ubuntu bash`
+
+```
+apt install -y curl jq zsh git vim
+sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
+curl -sL https://aka.ms/InstallAzureCLIDeb | bash
+```
\ No newline at end of file
diff --git a/zsh/plugins/azure/azure.plugin.zsh b/zsh/plugins/azure/azure.plugin.zsh
new file mode 100644
index 0000000..b33b0f8
--- /dev/null
+++ b/zsh/plugins/azure/azure.plugin.zsh
@@ -0,0 +1,60 @@
+# AZ Get Subscriptions
+function azgs() {
+  az account show --output tsv --query 'name' 2>/dev/null
+}
+
+# AZ Subscription Selection
+alias azss="az account set --subscription"
+
+
+function az_subscriptions() {
+  az account list  --all --output tsv --query '[*].name' 2> /dev/null
+}
+
+function _az_subscriptions() {
+  reply=($(az_subscriptions))
+}
+compctl -K _az_subscriptions azss
+
+# Azure prompt
+function azure_prompt_info() {
+  [[ ! -f "${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json" ]] && return
+  # azgs is too expensive, if we have jq, we enable the prompt
+  (( $+commands[jq] )) || return 1
+  azgs=$(jq -r '.subscriptions[] | select(.isDefault==true) .name' "${AZURE_CONFIG_DIR:-$HOME/.azure}/azureProfile.json")
+  echo "${ZSH_THEME_AZURE_PREFIX:=<az:}${azgs}${ZSH_THEME_AZURE_SUFFIX:=>}"
+}
+
+
+# Load az completions
+function _az-homebrew-installed() {
+  # check if Homebrew is installed
+  (( $+commands[brew] )) || return 1
+
+  # if so, we assume it's default way to install brew
+  if [[ ${commands[brew]:t2} == bin/brew ]]; then
+    _brew_prefix="${commands[brew]:h:h}" # remove trailing /bin/brew
+  else
+    # ok, it is not in the default prefix
+    # this call to brew is expensive (about 400 ms), so at least let's make it only once
+    _brew_prefix=$(brew --prefix)
+  fi
+}
+
+
+# get az.completion.sh location from $PATH
+_az_zsh_completer_path="$commands[az_zsh_completer.sh]"
+
+# otherwise check common locations
+if [[ -z $_az_zsh_completer_path ]]; then
+  # Homebrew
+  if _az-homebrew-installed; then
+    _az_zsh_completer_path=$_brew_prefix/etc/bash_completion.d/az
+  # Linux
+  else
+    _az_zsh_completer_path=/etc/bash_completion.d/azure-cli
+  fi
+fi
+
+[[ -r $_az_zsh_completer_path ]] && autoload -U +X bashcompinit && bashcompinit && source $_az_zsh_completer_path
+unset _az_zsh_completer_path _brew_prefix
diff --git a/zsh/plugins/battery/README.md b/zsh/plugins/battery/README.md
index 18e5bd8..07e4e0b 100644
--- a/zsh/plugins/battery/README.md
+++ b/zsh/plugins/battery/README.md
@@ -12,6 +12,19 @@ Then, add the `battery_pct_prompt` function to your custom theme. For example:
 RPROMPT='$(battery_pct_prompt) ...'
 ```
 
+Also, you set the `BATTERY_CHARGING` variable to your favor.
+For example:
+
+```zsh
+BATTERY_CHARGING="⚡️"
+```
+
+You can see the power of your charger using the following setting (MacOS only)
+
+```zsh
+BATTERY_SHOW_WATTS=true
+```
+
 ## Requirements
 
 - On Linux, you must have the `acpi` or `acpitool` commands installed on your operating system.
diff --git a/zsh/plugins/battery/battery.plugin.zsh b/zsh/plugins/battery/battery.plugin.zsh
index db5eeb9..c7618f6 100644
--- a/zsh/plugins/battery/battery.plugin.zsh
+++ b/zsh/plugins/battery/battery.plugin.zsh
@@ -13,8 +13,17 @@
 # Author: Avneet Singh (kalsi-avneet)     #
 # Modified to add support for Android     #
 ###########################################
+# Author: Not Pua (im-notpua)             #
+# Modified to add support for OpenBSD     #
+###########################################
+
+: ${BATTERY_SHOW_WATTS:=false}
+
 
 if [[ "$OSTYPE" = darwin* ]]; then
+  function get_charger_power() {
+    echo "$(ioreg -rc AppleSmartBattery | grep -o '"Watts"=[0-9]\+' | head -1 | grep -o '[0-9]\+')W "
+  }
   function battery_is_charging() {
     ioreg -rc AppleSmartBattery | command grep -q '^.*"ExternalConnected"\ =\ Yes'
   }
@@ -54,7 +63,10 @@ if [[ "$OSTYPE" = darwin* ]]; then
       fi
       echo "%{$fg[$color]%}[${battery_pct}%%]%{$reset_color%}"
     else
-      echo "∞"
+      if [[ "${BATTERY_SHOW_WATTS}" = "true" ]] ; then
+        watts=$(get_charger_power)
+      fi
+      echo "${watts}${BATTERY_CHARGING-⚡️}"
     fi
   }
 
@@ -139,6 +151,46 @@ elif [[ "$OSTYPE" = linux-android ]] && (( ${+commands[termux-battery-status]} )
       echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
     fi
   }
+elif [[ "$OSTYPE" = openbsd* ]]; then
+  function battery_is_charging() {
+    [[ $(apm -b) -eq 3 ]]
+  }
+  function battery_pct() {
+    apm -l
+  }
+  function battery_pct_remaining() {
+    if ! battery_is_charging; then
+      battery_pct
+    else
+      echo "External Power"
+    fi
+  }
+  function battery_time_remaining() {
+    local remaining_time
+    remaining_time=$(apm -m)
+    if [[ $remaining_time -ge 0 ]]; then
+      ((hour = $remaining_time / 60 ))
+      ((minute = $remaining_time % 60 ))
+      printf %02d:%02d $hour $minute
+    fi
+  }
+  function battery_pct_prompt() {
+    local battery_pct color
+    battery_pct=$(battery_pct_remaining)
+    if battery_is_charging; then
+      echo "∞"
+    else
+      if [[ $battery_pct -gt 50 ]]; then
+        color='green'
+      elif [[ $battery_pct -gt 20 ]]; then
+        color='yellow'
+      else
+        color='red'
+      fi
+      echo "%{$fg[$color]%}${battery_pct}%%%{$reset_color%}"
+    fi
+  }
+
 elif [[ "$OSTYPE" = linux*  ]]; then
   function battery_is_charging() {
     if (( $+commands[acpitool] )); then
diff --git a/zsh/plugins/bazel/README.md b/zsh/plugins/bazel/README.md
index fc375d2..b0c34a1 100644
--- a/zsh/plugins/bazel/README.md
+++ b/zsh/plugins/bazel/README.md
@@ -1,7 +1,7 @@
 # Bazel plugin
 
-This plugin adds completion for [bazel](https://bazel.build), an open-source build and
-test tool that scalably supports multi-language and multi-platform projects.
+This plugin adds completion and aliases for [bazel](https://bazel.build), an open-source build and test tool
+that scalably supports multi-language and multi-platform projects.
 
 To use it, add `bazel` to the plugins array in your zshrc file:
 
@@ -12,3 +12,18 @@ plugins=(... bazel)
 The plugin has a copy of [the completion script from the git repository][1].
 
 [1]: https://github.com/bazelbuild/bazel/blob/master/scripts/zsh_completion/_bazel
+
+## Aliases
+
+| Alias | Command       | Description               |
+| ----- | ------------- | ------------------------- |
+| bzb   | `bazel build` | The `bazel build` command |
+| bzt   | `bazel test`  | The `bazel test` command  |
+| bzr   | `bazel run`   | The `bazel run` command   |
+| bzq   | `bazel query` | The `bazel query` command |
+
+## Functions
+
+| Function | Description                      |
+| -------- | -------------------------------- |
+| sri-hash | Generate SRI hash used by bzlmod |
diff --git a/zsh/plugins/bazel/_bazel b/zsh/plugins/bazel/_bazel
index c34c572..ea1f4ca 100644
--- a/zsh/plugins/bazel/_bazel
+++ b/zsh/plugins/bazel/_bazel
@@ -1,4 +1,4 @@
-#compdef bazel
+#compdef bazel bazelisk
 
 # Copyright 2015 The Bazel Authors. All rights reserved.
 #
diff --git a/zsh/plugins/bazel/bazel.plugin.zsh b/zsh/plugins/bazel/bazel.plugin.zsh
new file mode 100644
index 0000000..818d565
--- /dev/null
+++ b/zsh/plugins/bazel/bazel.plugin.zsh
@@ -0,0 +1,9 @@
+# Aliases for bazel
+alias bzb='bazel build'
+alias bzt='bazel test'
+alias bzr='bazel run'
+alias bzq='bazel query'
+
+sri-hash() {
+    openssl dgst -sha256 -binary $1 | openssl base64 -A | sed 's/^/sha256-/'
+}
diff --git a/zsh/plugins/bedtools/_bedtools b/zsh/plugins/bedtools/_bedtools
index ef6c417..15e3dc2 100644
--- a/zsh/plugins/bedtools/_bedtools
+++ b/zsh/plugins/bedtools/_bedtools
@@ -47,7 +47,7 @@ case $state in
         "random[Generate random intervals in a genome.]" \
         "reldist[Calculate the distribution of relative distances b/w two files.]" \
         "sample[Sample random records from file using reservoir sampling.]" \
-        "shuffle[Randomly redistrubute intervals in a genome.]" \
+        "shuffle[Randomly redistribute intervals in a genome.]" \
         "slop[Adjust the size of intervals.]" \
         "sort[Order the intervals in a file.]" \
         "subtract[Remove intervals based on overlaps b/w two files.]" \
diff --git a/zsh/plugins/bgnotify/README.md b/zsh/plugins/bgnotify/README.md
index 1d8fac5..1389def 100644
--- a/zsh/plugins/bgnotify/README.md
+++ b/zsh/plugins/bgnotify/README.md
@@ -1,19 +1,19 @@
 # bgnotify zsh plugin
 
-cross-platform background notifications for long running commands! Supports OSX and Ubuntu linux.
+cross-platform background notifications for long running commands! Supports OSX and Linux.
 
 Standalone homepage: [t413/zsh-background-notify](https://github.com/t413/zsh-background-notify)
 
-----------------------------------
+---
 
-## How to use!
+## How to use
 
 Just add bgnotify to your plugins list in your `.zshrc`
 
 - On OS X you'll need [terminal-notifier](https://github.com/alloy/terminal-notifier)
   * `brew install terminal-notifier` (or `gem install terminal-notifier`)
-- On ubuntu you're already all set!
-- On windows you can use [notifu](https://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
+- On Linux, make sure you have `notify-send` or `kdialog` installed. If you're using Ubuntu you should already be all set!
+- On Windows you can use [notifu](https://www.paralint.com/projects/notifu/) or the Cygwin Ports libnotify package
 
 
 ## Screenshots
@@ -35,20 +35,30 @@ Just add bgnotify to your plugins list in your `.zshrc`
 
 One can configure a few things:
 
+- `bgnotify_bell` enabled or disables the terminal bell (default true)
 - `bgnotify_threshold` sets the notification threshold time (default 6 seconds)
-- `function bgnotify_formatted` lets you change the notification
+- `function bgnotify_formatted` lets you change the notification. You can for instance customize the message and pass in an icon.
+- `bgnotify_extraargs` appends extra args to notifier (e.g. `-e` for notify-send to create a transient notification)
 
 Use these by adding a function definition before the your call to source. Example:
 
-~~~ sh
+```sh
+bgnotify_bell=false   ## disable terminal bell
 bgnotify_threshold=4  ## set your own notification threshold
 
 function bgnotify_formatted {
   ## $1=exit_status, $2=command, $3=elapsed_time
-  [ $1 -eq 0 ] && title="Holy Smokes Batman!" || title="Holy Graf Zeppelin!"
-  bgnotify "$title -- after $3 s" "$2";
+
+  # Humanly readable elapsed time
+  local elapsed="$(( $3 % 60 ))s"
+  (( $3 < 60 ))   || elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
+  (( $3 < 3600 )) || elapsed="$((  $3 / 3600 ))h $elapsed"
+
+  [ $1 -eq 0 ] && title="Holy Smokes Batman" || title="Holy Graf Zeppelin"
+  [ $1 -eq 0 ] && icon="$HOME/icons/success.png" || icon="$HOME/icons/fail.png"
+  bgnotify "$title - took ${elapsed}" "$2" "$icon"
 }
 
 plugins=(git bgnotify)  ## add to plugins list
 source $ZSH/oh-my-zsh.sh  ## existing source call
-~~~
+```
diff --git a/zsh/plugins/bgnotify/bgnotify.plugin.zsh b/zsh/plugins/bgnotify/bgnotify.plugin.zsh
index 479796d..4c1613e 100644
--- a/zsh/plugins/bgnotify/bgnotify.plugin.zsh
+++ b/zsh/plugins/bgnotify/bgnotify.plugin.zsh
@@ -1,93 +1,144 @@
 #!/usr/bin/env zsh
 
-## setup ##
+## Setup
 
-[[ -o interactive ]] || return #interactive only!
-zmodload zsh/datetime || { print "can't load zsh/datetime"; return } # faster than date()
-autoload -Uz add-zsh-hook || { print "can't add zsh hook!"; return }
+[[ -o interactive ]] || return # don't load on non-interactive shells
+[[ -z "$SSH_CLIENT" && -z "$SSH_TTY" ]] || return # don't load on a SSH connection
 
-(( ${+bgnotify_threshold} )) || bgnotify_threshold=5 #default 10 seconds
+zmodload zsh/datetime # faster than `date`
 
 
-## definitions ##
+## Zsh Hooks
 
-if ! (type bgnotify_formatted | grep -q 'function'); then ## allow custom function override
-  function bgnotify_formatted { ## args: (exit_status, command, elapsed_seconds)
-    elapsed="$(( $3 % 60 ))s"
-    (( $3 >= 60 )) && elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
-    (( $3 >= 3600 )) && elapsed="$(( $3 / 3600 ))h $elapsed"
-    [ $1 -eq 0 ] && bgnotify "#win (took $elapsed)" "$2" || bgnotify "#fail (took $elapsed)" "$2"
-  }
-fi
-
-currentAppId () {
-  if (( $+commands[osascript] )); then
-    osascript -e 'tell application (path to frontmost application as text) to id' 2>/dev/null
-  fi
-}
-
-currentWindowId () {
-  if hash osascript 2>/dev/null; then #osx
-    osascript -e 'tell application (path to frontmost application as text) to id of front window' 2&> /dev/null || echo "0"
-  elif (hash notify-send 2>/dev/null || hash kdialog 2>/dev/null); then #ubuntu!
-    xprop -root 2> /dev/null | awk '/NET_ACTIVE_WINDOW/{print $5;exit} END{exit !$5}' || echo "0"
-  else
-    echo $EPOCHSECONDS #fallback for windows
-  fi
-}
-
-bgnotify () { ## args: (title, subtitle)
-  if hash terminal-notifier 2>/dev/null; then #osx
-    local term_id="$bgnotify_appid"
-    if [[ -z "$term_id" ]]; then
-      case "$TERM_PROGRAM" in
-      iTerm.app) term_id='com.googlecode.iterm2' ;;
-      Apple_Terminal) term_id='com.apple.terminal' ;;
-      esac
-    fi
-
-    ## now call terminal-notifier, (hopefully with $term_id!)
-    if [[ -z "$term_id" ]]; then
-      terminal-notifier -message "$2" -title "$1" >/dev/null
-    else
-      terminal-notifier -message "$2" -title "$1" -activate "$term_id" -sender "$term_id" >/dev/null
-    fi
-  elif hash growlnotify 2>/dev/null; then #osx growl
-    growlnotify -m "$1" "$2"
-  elif hash notify-send 2>/dev/null; then #ubuntu gnome!
-    notify-send "$1" "$2"
-  elif hash kdialog 2>/dev/null; then #ubuntu kde!
-    kdialog --title "$1" --passivepopup  "$2" 5
-  elif hash notifu 2>/dev/null; then #cygwyn support!
-    notifu /m "$2" /p "$1"
-  fi
-}
-
-
-## Zsh hooks ##
-
-bgnotify_begin() {
+function bgnotify_begin {
   bgnotify_timestamp=$EPOCHSECONDS
   bgnotify_lastcmd="${1:-$2}"
-  bgnotify_appid="$(currentAppId)"
-  bgnotify_windowid=$(currentWindowId)
 }
 
-bgnotify_end() {
-  didexit=$?
-  elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))
-  past_threshold=$(( elapsed >= bgnotify_threshold ))
-  if (( bgnotify_timestamp > 0 )) && (( past_threshold )); then
-    if [[ $(currentAppId) != "$bgnotify_appid" || $(currentWindowId) != "$bgnotify_windowid" ]]; then
-      print -n "\a"
-      bgnotify_formatted "$didexit" "$bgnotify_lastcmd" "$elapsed"
-    fi
+function bgnotify_end {
+  {
+    local exit_status=$?
+    local elapsed=$(( EPOCHSECONDS - bgnotify_timestamp ))
+
+    # check time elapsed
+    [[ $bgnotify_timestamp -gt 0 ]] || return 0
+    [[ $elapsed -ge $bgnotify_threshold ]] || return 0
+
+    # check if Terminal app is not active
+    [[ $(bgnotify_appid) != "$bgnotify_termid" ]] || return 0
+
+    bgnotify_formatted "$exit_status" "$bgnotify_lastcmd" "$elapsed"
+  } always {
+    bgnotify_timestamp=0
+  }
+}
+
+autoload -Uz add-zsh-hook
+add-zsh-hook preexec bgnotify_begin
+add-zsh-hook precmd bgnotify_end
+
+
+## Functions
+
+# allow custom function override
+(( ${+functions[bgnotify_formatted]} )) || \
+function bgnotify_formatted {
+  local exit_status=$1
+  local cmd="$2"
+
+  # humanly readable elapsed time
+  local elapsed="$(( $3 % 60 ))s"
+  (( $3 < 60 )) || elapsed="$((( $3 % 3600) / 60 ))m $elapsed"
+  (( $3 < 3600 )) || elapsed="$(( $3 / 3600 ))h $elapsed"
+
+  [[ $bgnotify_bell = true ]] && printf '\a' # beep sound
+  if [[ $exit_status -eq 0 ]]; then
+    bgnotify "#win (took $elapsed)" "$cmd"
+  else
+    bgnotify "#fail (took $elapsed)" "$cmd"
   fi
-  bgnotify_timestamp=0 #reset it to 0!
 }
 
-## only enable if a local (non-ssh) connection
-if [ -z "$SSH_CLIENT" ] && [ -z "$SSH_TTY" ]; then
-  add-zsh-hook preexec bgnotify_begin
-  add-zsh-hook precmd bgnotify_end
-fi
+function bgnotify_appid {
+  if (( ${+commands[lsappinfo]} )); then
+    lsappinfo info -only bundleid "$(lsappinfo front)" | awk -F= '{print $2}' | tr -d '"' 2>/dev/null
+  elif (( ${+commands[osascript]} )); then
+    osascript -e "tell application id \"$(bgnotify_programid)\" to get the {id, frontmost, id of front window, visible of front window}" 2>/dev/null
+  elif [[ -n $WAYLAND_DISPLAY ]] && ([[ -n $SWAYSOCK ]] || [[ -n $I3SOCK ]]) && (( ${+commands[swaymsg]} )); then # wayland+sway
+    local app_id=$(bgnotify_find_sway_appid)
+    [[ -n "$app_id" ]] && echo "$app_id" || echo $EPOCHSECONDS
+  elif [[ -z $WAYLAND_DISPLAY ]] && [[ -n $DISPLAY ]] && (( ${+commands[xprop]} )); then
+    xprop -root _NET_ACTIVE_WINDOW 2>/dev/null | cut -d' ' -f5
+  else
+    echo $EPOCHSECONDS
+  fi
+}
+
+
+function bgnotify_find_sway_appid {
+  # output is "app_id,container_id", for example "Alacritty,1694"
+  # see example swaymsg output: https://github.com/ohmyzsh/ohmyzsh/files/13463939/output.json
+  if (( ${+commands[jq]} )); then
+    swaymsg -t get_tree | jq '.. | select(.type?) | select(.focused==true) | {app_id, id} | join(",")'
+  else
+    swaymsg -t get_tree | awk '
+      BEGIN { Id = ""; Appid = ""; FocusNesting = -1; Nesting = 0 }
+      {
+        # Enter a block
+        if ($0 ~ /.*{$/) Nesting++
+
+        # Exit a block. If Nesting is now less than FocusNesting, we have the data we are looking for
+        if ($0 ~ /^[[:blank:]]*}.*/) { Nesting--; if (FocusNesting > 0 && Nesting < FocusNesting) exit 0 }
+
+        # Save the Id, it is potentially what we are looking for
+        if ($0 ~ /^[[:blank:]]*"id": [0-9]*,?$/)    { sub(/^[[:blank:]]*"id": /, "");      sub(/,$/,  ""); Id = $0 }
+
+        # Save the Appid, it is potentially what we are looking for
+        if ($0 ~ /^[[:blank:]]*"app_id": ".*",?$/)  { sub(/^[[:blank:]]*"app_id": "/, ""); sub(/",$/, ""); Appid = $0 }
+
+        # Window is focused, this nesting block contains the Id and Appid we want!
+        if ($0 ~ /^[[:blank:]]*"focused": true,?$/) { FocusNesting = Nesting }
+      }
+      END {
+        if (Appid != "" && Id != "" && FocusNesting != -1) print Appid "," Id
+        else print ""
+      }'
+  fi
+}
+
+function bgnotify_programid {
+  case "$TERM_PROGRAM" in
+    iTerm.app) echo 'com.googlecode.iterm2' ;;
+    Apple_Terminal) echo 'com.apple.terminal' ;;
+    ghostty) echo 'com.mitchellh.ghostty' ;;
+  esac
+}
+
+function bgnotify {
+  local title="$1"
+  local message="$2"
+  local icon="$3"
+  if (( ${+commands[terminal-notifier]} )); then # macOS
+    local term_id=$(bgnotify_programid)
+    terminal-notifier -message "$message" -title "$title" ${=icon:+-appIcon "$icon"} ${=term_id:+-activate "$term_id"} ${=bgnotify_extraargs:-} &>/dev/null
+  elif (( ${+commands[growlnotify]} )); then # macOS growl
+    growlnotify -m "$title" "$message" ${=bgnotify_extraargs:-}
+  elif (( ${+commands[notify-send]} )); then
+    notify-send "$title" "$message" ${=icon:+--icon "$icon"} ${=bgnotify_extraargs:-}
+  elif (( ${+commands[kdialog]} )); then # KDE
+    kdialog --title "$title" --passivepopup  "$message" 5 ${=bgnotify_extraargs:-}
+  elif (( ${+commands[notifu]} )); then # cygwin
+    notifu /m "$message" /p "$title" ${=icon:+/i "$icon"} ${=bgnotify_extraargs:-}
+  fi
+}
+
+## Defaults
+
+# enable terminal bell on notify by default
+bgnotify_bell=${bgnotify_bell:-true}
+
+# notify if command took longer than 5s by default
+bgnotify_threshold=${bgnotify_threshold:-5}
+
+# bgnotify_appid is slow in macOS and the terminal ID won't change, so cache it at startup
+bgnotify_termid="$(bgnotify_appid)"
diff --git a/zsh/plugins/branch/README.md b/zsh/plugins/branch/README.md
index a15dd22..2b6d12d 100644
--- a/zsh/plugins/branch/README.md
+++ b/zsh/plugins/branch/README.md
@@ -39,7 +39,7 @@ index 2fd5f2cd..9d89a464 100644
  PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
 -PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
 +PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(branch_prompt_info)'
- 
+
  ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
 ```
diff --git a/zsh/plugins/branch/branch.plugin.zsh b/zsh/plugins/branch/branch.plugin.zsh
index dd5871f..c24f909 100644
--- a/zsh/plugins/branch/branch.plugin.zsh
+++ b/zsh/plugins/branch/branch.plugin.zsh
@@ -8,7 +8,7 @@ function branch_prompt_info() {
   while [[ "$dir" != '/' ]]; do
     # Found .git directory
     if [[ -d "${dir}/.git" ]]; then
-      branch="${"$(<"${dir}/.git/HEAD")"##*/}"
+      branch="${"$(<"${dir}/.git/HEAD")"##ref: refs/heads/}"
       echo '±' "${branch:gs/%/%%}"
       return
     fi
diff --git a/zsh/plugins/brew/README.md b/zsh/plugins/brew/README.md
index 9ce2c5b..ab0b9cd 100644
--- a/zsh/plugins/brew/README.md
+++ b/zsh/plugins/brew/README.md
@@ -10,28 +10,59 @@ plugins=(... brew)
 
 ## Shellenv
 
-If `brew` is not found in the PATH, this plugin will attempt to find it in common
-locations, and execute `brew shellenv` to set the environment appropriately.
-This plugin will also export `HOMEBREW_PREFIX="$(brew --prefix)"` if not previously
-defined for convenience.
+If `brew` is not found in the PATH, this plugin will attempt to find it in common locations, and execute
+`brew shellenv` to set the environment appropriately. This plugin will also export
+`HOMEBREW_PREFIX="$(brew --prefix)"` if not previously defined for convenience.
+
+In case you installed `brew` in a non-common location, you can still set `BREW_LOCATION` variable pointing to
+the `brew` binary before sourcing `oh-my-zsh.sh` and it'll set up the environment.
 
 ## Aliases
 
-| Alias    | Command                               | Description                                                         |
-| -------- | ------------------------------------- | ------------------------------------------------------------------- |
-| `bcubc`  | `brew upgrade --cask && brew cleanup` | Update outdated casks, then run cleanup.                            |
-| `bcubo`  | `brew update && brew outdated --cask` | Update Homebrew data, then list outdated casks.                     |
-| `brewp`  | `brew pin`                            | Pin a specified formula so that it's not upgraded.                  |
-| `brews`  | `brew list -1`                        | List installed formulae or the installed files for a given formula. |
-| `brewsp` | `brew list --pinned`                  | List pinned formulae, or show the version of a given formula.       |
-| `bubc`   | `brew upgrade && brew cleanup`        | Upgrade outdated formulae and casks, then run cleanup.              |
-| `bubo`   | `brew update && brew outdated`        | Update Homebrew data, then list outdated formulae and casks.        |
-| `bubu`   | `bubo && bubc`                        | Do the last two operations above.                                   |
-| `buf`    | `brew upgrade --formula`              | Upgrade only formulas (not casks).                                  |
+| Alias    | Command                                 | Description                                                           |
+| -------- | --------------------------------------- | --------------------------------------------------------------------- |
+| `ba`     | `brew autoremove`                       | Uninstall unnecessary formulae.                                       |
+| `bcfg`   | `brew config`                           | Show Homebrew and system configuration info useful for debugging.     |
+| `bci`    | `brew info --cask`                      | Display information about the given cask.                             |
+| `bcin`   | `brew install --cask`                   | Install the given cask.                                               |
+| `bcl`    | `brew list --cask`                      | List installed casks.                                                 |
+| `bcn`    | `brew cleanup`                          | Run cleanup.                                                          |
+| `bco`    | `brew outdated --cask`                  | Report all outdated casks.                                            |
+| `bcrin`  | `brew reinstall --cask`                 | Reinstall the given cask.                                             |
+| `bcubc`  | `brew upgrade --cask && brew cleanup`   | Upgrade outdated casks, then run cleanup.                             |
+| `bcubo`  | `brew update && brew outdated --cask`   | Update Homebrew data, then list outdated casks.                       |
+| `bcup`   | `brew upgrade --cask`                   | Upgrade all outdated casks.                                           |
+| `bdr`    | `brew doctor`                           | Check your system for potential problems.                             |
+| `bfu`    | `brew upgrade --formula`                | Upgrade only formulae (not casks).                                    |
+| `bi`     | `brew install`                          | Install a formula.                                                    |
+| `bih`    | `brew install --HEAD`                   | Install a formula with --HEAD                                         |
+| `bl`     | `brew list`                             | List all installed formulae.                                          |
+| `bo`     | `brew outdated`                         | List installed formulae that have an updated version available.       |
+| `br`     | `brew reinstall`                        | Reinstall a formula.                                                  |
+| `brewp`  | `brew pin`                              | Pin a specified formula so that it's not upgraded.                    |
+| `brews`  | `brew list -1`                          | List installed formulae or the installed files for a given formula.   |
+| `brewsp` | `brew list --pinned`                    | List pinned formulae, or show the version of a given formula.         |
+| `brh`    | `brew reinstall --HEAD`                 | Reinstall a formula with --HEAD                                       |
+| `bs`     | `brew search`                           | Perform a substring search of cask tokens and formula names for text. |
+| `bsl`    | `brew services list`                    | List all running services.                                            |
+| `bsoff`  | `brew services stop`                    | Stop the service and unregister it from launching at login (or boot). |
+| `bsoffa` | `bsoff --all`                           | Stop all started services.                                            |
+| `bson`   | `brew services start`                   | Start the service and register it to launch at login (or boot).       |
+| `bsona`  | `bson --all`                            | Start all stopped services.                                           |
+| `bsr`    | `brew services run`                     | Run the service without registering to launch at login (or boot).     |
+| `bsra`   | `bsr --all`                             | Run all stopped services.                                             |
+| `bu`     | `brew update`                           | Update brew and all installed formulae.                               |
+| `bubo`   | `brew update && brew outdated`          | Update Homebrew data, then list outdated formulae and casks.          |
+| `bubu`   | `bubo && bup`                           | Do the last two operations above.                                     |
+| `bugbc`  | `brew upgrade --greedy && brew cleanup` | Upgrade outdated formulae and casks (greedy), then run cleanup.       |
+| `bup`    | `brew upgrade`                          | Upgrade outdated, unpinned brews.                                     |
+| `buz`    | `brew uninstall --zap`                  | Remove all files associated with a cask.                              |
 
 ## Completion
 
-With the release of Homebrew 1.0, they decided to bundle the zsh completion as part of the
-brew installation, so we no longer ship it with the brew plugin; now it only has brew
-aliases. If you find that brew completion no longer works, make sure you have your Homebrew
-installation fully up to date.
+This plugin configures paths with Homebrew's completion functions automatically, so you don't need to do it
+manually. See: https://docs.brew.sh/Shell-Completion#configuring-completions-in-zsh.
+
+With the release of Homebrew 1.0, they decided to bundle the zsh completion as part of the brew installation,
+so we no longer ship it with the brew plugin; now it only has brew aliases. If you find that brew completion
+no longer works, make sure you have your Homebrew installation fully up to date.
diff --git a/zsh/plugins/brew/brew.plugin.zsh b/zsh/plugins/brew/brew.plugin.zsh
index 41420b5..7d5db20 100644
--- a/zsh/plugins/brew/brew.plugin.zsh
+++ b/zsh/plugins/brew/brew.plugin.zsh
@@ -1,5 +1,10 @@
 if (( ! $+commands[brew] )); then
-  if [[ -x /opt/homebrew/bin/brew ]]; then
+  if [[ -n "$BREW_LOCATION" ]]; then
+    if [[ ! -x "$BREW_LOCATION" ]]; then
+      echo "[oh-my-zsh] $BREW_LOCATION is not executable"
+      return
+    fi
+  elif [[ -x /opt/homebrew/bin/brew ]]; then
     BREW_LOCATION="/opt/homebrew/bin/brew"
   elif [[ -x /usr/local/bin/brew ]]; then
     BREW_LOCATION="/usr/local/bin/brew"
@@ -19,24 +24,56 @@ if (( ! $+commands[brew] )); then
 fi
 
 if [[ -z "$HOMEBREW_PREFIX" ]]; then
-  # Maintain compatability with potential custom user profiles, where we had
+  # Maintain compatibility with potential custom user profiles, where we had
   # previously relied on always sourcing shellenv. OMZ plugins should not rely
   # on this to be defined due to out of order processing.
   export HOMEBREW_PREFIX="$(brew --prefix)"
 fi
 
+if [[ -d "$HOMEBREW_PREFIX/share/zsh/site-functions" ]]; then
+  fpath+=("$HOMEBREW_PREFIX/share/zsh/site-functions")
+fi
+
+alias ba='brew autoremove'
+alias bcfg='brew config'
+alias bci='brew info --cask'
+alias bcin='brew install --cask'
+alias bcl='brew list --cask'
+alias bcn='brew cleanup'
+alias bco='brew outdated --cask'
+alias bcrin='brew reinstall --cask'
 alias bcubc='brew upgrade --cask && brew cleanup'
 alias bcubo='brew update && brew outdated --cask'
+alias bcup='brew upgrade --cask'
+alias bdr='brew doctor'
+alias bfu='brew upgrade --formula'
+alias bi='brew install'
+alias bih='brew install --HEAD'
+alias bl='brew list'
+alias bo='brew outdated'
+alias br='brew reinstall'
 alias brewp='brew pin'
 alias brewsp='brew list --pinned'
-alias bubc='brew upgrade && brew cleanup'
+alias brh='brew reinstall --HEAD'
+alias bs='brew search'
+alias bsl='brew services list'
+alias bsoff='brew services stop'
+alias bsoffa='bsoff --all'
+alias bson='brew services start'
+alias bsona='bson --all'
+alias bsr='brew services run'
+alias bsra='bsr --all'
+alias bu='brew update'
 alias bubo='brew update && brew outdated'
-alias bubu='bubo && bubc'
-alias buf='brew upgrade --formula'
+alias bubu='bubo && bup'
+alias bubug='bubo && bugbc'
+alias bugbc='brew upgrade --greedy && brew cleanup'
+alias bup='brew upgrade'
+alias buz='brew uninstall --zap'
 
 function brews() {
   local formulae="$(brew leaves | xargs brew deps --installed --for-each)"
-  local casks="$(brew list --cask)"
+  local casks="$(brew list --cask 2>/dev/null)"
 
   local blue="$(tput setaf 4)"
   local bold="$(tput bold)"
diff --git a/zsh/plugins/bridgetown/README.md b/zsh/plugins/bridgetown/README.md
new file mode 100644
index 0000000..0a41814
--- /dev/null
+++ b/zsh/plugins/bridgetown/README.md
@@ -0,0 +1,26 @@
+# Bridgetown plugin
+
+This plugin adds some aliases and autocompletion for common [Bridgetown](https://bridgetownrb.com/) commands.
+
+To use it, add `bridgetown` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... bridgetown)
+```
+
+## Aliases
+
+| Alias | Command                    |
+|-------|----------------------------|
+| br      | `bridgetown`              |
+| bra     | `bin/bridgetown apply`    |
+| brb     | `bin/bridgetown build`    |
+| brc     | `bin/bridgetown console`  |
+| brclean | `bin/bridgetown clean`    |
+| brd     | `bin/bridgetown deploy`   |
+| brdoc   | `bin/bridgetown doctor`   |
+| brh     | `bin/bridgetown help`     |
+| brn     | `bridgetown new`          |
+| brp     | `bridgetown plugins`      |
+| brpl    | `bridgetown plugins list` |
+| brs     | `bin/bridgetown start`    |
diff --git a/zsh/plugins/bridgetown/bridgetown.plugin.zsh b/zsh/plugins/bridgetown/bridgetown.plugin.zsh
new file mode 100644
index 0000000..502e9df
--- /dev/null
+++ b/zsh/plugins/bridgetown/bridgetown.plugin.zsh
@@ -0,0 +1,12 @@
+alias br='bridgetown'
+alias bra='bin/bridgetown apply'
+alias brb='bin/bridgetown build'
+alias brc='bin/bridgetown console'
+alias brclean='bin/bridgetown clean'
+alias brd='bin/bridgetown deploy'
+alias brdoc='bin/bridgetown doctor'
+alias brh='bin/bridgetown help'
+alias brn='bridgetown new'
+alias brp='bridgetown plugins'
+alias brpl='bridgetown plugins list'
+alias brs='bin/bridgetown start'
diff --git a/zsh/plugins/buf/README.md b/zsh/plugins/buf/README.md
new file mode 100644
index 0000000..946cf38
--- /dev/null
+++ b/zsh/plugins/buf/README.md
@@ -0,0 +1,9 @@
+# Buf plugin
+
+This plugin adds completion for [Buf CLI](https://github.com/bufbuild/buf), a tool working with Protocol Buffers.
+
+To use it, add `buf` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... buf)
+```
\ No newline at end of file
diff --git a/zsh/plugins/buf/buf.plugin.zsh b/zsh/plugins/buf/buf.plugin.zsh
new file mode 100644
index 0000000..0b251ac
--- /dev/null
+++ b/zsh/plugins/buf/buf.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the Buf CLI (buf).
+if (( !$+commands[buf] )); then
+  return
+fi
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `buf`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_buf" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _buf
+  _comps[buf]=_buf
+fi
+
+# Generate and load buf completion
+buf completion zsh >! "$ZSH_CACHE_DIR/completions/_buf" &|
\ No newline at end of file
diff --git a/zsh/plugins/bun/README.md b/zsh/plugins/bun/README.md
new file mode 100644
index 0000000..5a31237
--- /dev/null
+++ b/zsh/plugins/bun/README.md
@@ -0,0 +1,20 @@
+# Bun Plugin
+
+This plugin sets up completion for [Bun](https://bun.sh).
+
+To use it, add `bun` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... bun)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated when the
+plugin is loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH_CACHE_DIR/completions/_bun_` completions script
diff --git a/zsh/plugins/bun/bun.plugin.zsh b/zsh/plugins/bun/bun.plugin.zsh
new file mode 100644
index 0000000..576dbbf
--- /dev/null
+++ b/zsh/plugins/bun/bun.plugin.zsh
@@ -0,0 +1,14 @@
+# If Bun is not found, don't do the rest of the script
+if (( ! $+commands[bun] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `bun`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_bun" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _bun
+  _comps[bun]=_bun
+fi
+
+SHELL=zsh bun completions >| "$ZSH_CACHE_DIR/completions/_bun" &|
diff --git a/zsh/plugins/bundler/README.md b/zsh/plugins/bundler/README.md
index 7b79cbc..ddf5472 100644
--- a/zsh/plugins/bundler/README.md
+++ b/zsh/plugins/bundler/README.md
@@ -11,18 +11,18 @@ plugins=(... bundler)
 
 ## Aliases
 
-| Alias  | Command                              | Description                                                                              |
-|--------|--------------------------------------|------------------------------------------------------------------------------------------|
-| `ba`   | `bundle add`                         | Add gem to the Gemfile and run bundle install                                            |
-| `bck`  | `bundle check`                       | Verifies if dependencies are satisfied by installed gems                                 |
-| `bcn`  | `bundle clean`                       | Cleans up unused gems in your bundler directory                                          |
-| `be`   | `bundle exec`                        | Execute a command in the context of the bundle                                           |
-| `bi`   | `bundle install --jobs=<core_count>` | Install the dependencies specified in your Gemfile (using all cores in bundler >= 1.4.0) |
-| `bl`   | `bundle list`                        | List all the gems in the bundle                                                          |
-| `bo`   | `bundle open`                        | Opens the source directory for a gem in your bundle                                      |
-| `bout` | `bundle outdated`                    | List installed gems with newer versions available                                        |
-| `bp`   | `bundle package`                     | Package your needed .gem files into your application                                     |
-| `bu`   | `bundle update`                      | Update your gems to the latest available versions                                        |
+| Alias  | Command           | Description                                              |
+| ------ | ----------------- | -------------------------------------------------------- |
+| `ba`   | `bundle add`      | Add gem to the Gemfile and run bundle install            |
+| `bck`  | `bundle check`    | Verifies if dependencies are satisfied by installed gems |
+| `bcn`  | `bundle clean`    | Cleans up unused gems in your bundler directory          |
+| `be`   | `bundle exec`     | Execute a command in the context of the bundle           |
+| `bi`   | `bundle install`  | Install the dependencies specified in your Gemfile       |
+| `bl`   | `bundle list`     | List all the gems in the bundle                          |
+| `bo`   | `bundle open`     | Opens the source directory for a gem in your bundle      |
+| `bout` | `bundle outdated` | List installed gems with newer versions available        |
+| `bp`   | `bundle package`  | Package your needed .gem files into your application     |
+| `bu`   | `bundle update`   | Update your gems to the latest available versions        |
 
 ## Gem wrapper
 
diff --git a/zsh/plugins/bundler/_bundler b/zsh/plugins/bundler/_bundler
index 51678dd..6613cc6 100644
--- a/zsh/plugins/bundler/_bundler
+++ b/zsh/plugins/bundler/_bundler
@@ -1,4 +1,4 @@
-#compdef bundle
+#compdef bundle bundler
 
 local curcontext="$curcontext" state line _gems _opts ret=1
 
diff --git a/zsh/plugins/bundler/bundler.plugin.zsh b/zsh/plugins/bundler/bundler.plugin.zsh
index c1cbb13..53b36f0 100644
--- a/zsh/plugins/bundler/bundler.plugin.zsh
+++ b/zsh/plugins/bundler/bundler.plugin.zsh
@@ -4,45 +4,13 @@ alias ba="bundle add"
 alias bck="bundle check"
 alias bcn="bundle clean"
 alias be="bundle exec"
-alias bi="bundle_install"
+alias bi="bundle install"
 alias bl="bundle list"
 alias bo="bundle open"
 alias bout="bundle outdated"
 alias bp="bundle package"
 alias bu="bundle update"
 
-## Functions
-
-bundle_install() {
-  # Bail out if bundler is not installed
-  if (( ! $+commands[bundle] )); then
-    echo "Bundler is not installed"
-    return 1
-  fi
-
-  # Bail out if not in a bundled project
-  if ! _within-bundled-project; then
-    echo "Can't 'bundle install' outside a bundled project"
-    return 1
-  fi
-
-  # Check the bundler version is at least 1.4.0
-  autoload -Uz is-at-least
-  local bundler_version=$(bundle version | cut -d' ' -f3)
-  if ! is-at-least 1.4.0 "$bundler_version"; then
-    bundle install "$@"
-    return $?
-  fi
-
-  # If bundler is at least 1.4.0, use all the CPU cores to bundle install
-  if [[ "$OSTYPE" = (darwin|freebsd)* ]]; then
-    local cores_num="$(sysctl -n hw.ncpu)"
-  else
-    local cores_num="$(nproc)"
-  fi
-  BUNDLE_JOBS="$cores_num" bundle install "$@"
-}
-
 ## Gem wrapper
 
 bundled_commands=(
diff --git a/zsh/plugins/cakephp3/cakephp3.plugin.zsh b/zsh/plugins/cakephp3/cakephp3.plugin.zsh
index dbfbeba..a1a289f 100644
--- a/zsh/plugins/cakephp3/cakephp3.plugin.zsh
+++ b/zsh/plugins/cakephp3/cakephp3.plugin.zsh
@@ -1,10 +1,10 @@
 # CakePHP 3 basic command completion
 _cakephp3_get_command_list () {
-	bin/cake Completion commands
+	bin/cake completion commands
 }
 
 _cakephp3_get_sub_command_list () {
-	bin/cake Completion subcommands ${words[2]}
+	bin/cake completion subcommands ${words[2]}
 }
 
 _cakephp3_get_3rd_argument () {
@@ -34,5 +34,5 @@ compdef _cakephp3 cake
 
 #Alias
 alias c3='bin/cake'
-alias c3cache='bin/cake orm_cache clear'
+alias c3cache='bin/cake schema_cache clear'
 alias c3migrate='bin/cake migrations migrate'
diff --git a/zsh/plugins/cargo/README.md b/zsh/plugins/cargo/README.md
deleted file mode 100644
index 93e69ae..0000000
--- a/zsh/plugins/cargo/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# cargo
-
-**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
diff --git a/zsh/plugins/cargo/cargo.plugin.zsh b/zsh/plugins/cargo/cargo.plugin.zsh
deleted file mode 100644
index 692025e..0000000
--- a/zsh/plugins/cargo/cargo.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-print ${(%):-'%F{yellow}The `cargo` plugin is deprecated and has been moved to the `rust` plugin.'}
-print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
-
-(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
-  fpath=("$ZSH/plugins/rust" $fpath)
-  source "$ZSH/plugins/rust/rust.plugin.zsh"
-}
diff --git a/zsh/plugins/catimg/README.md b/zsh/plugins/catimg/README.md
index 8f26880..4cfda0e 100644
--- a/zsh/plugins/catimg/README.md
+++ b/zsh/plugins/catimg/README.md
@@ -1,6 +1,7 @@
 # catimg
 
-Plugin for displaying images on the terminal using the the `catimg.sh` script provided by [posva](https://github.com/posva/catimg)
+Plugin for displaying images on the terminal using the `catimg.sh` script provided by
+[posva](https://github.com/posva/catimg)
 
 To use it, add `catimg` to the plugins array in your zshrc file:
 
@@ -10,7 +11,7 @@ plugins=(... catimg)
 
 ## Requirements
 
-- `convert` (ImageMagick)
+- `magick convert` (ImageMagick)
 
 ## Functions
 
diff --git a/zsh/plugins/catimg/catimg.plugin.zsh b/zsh/plugins/catimg/catimg.plugin.zsh
index f4ff6f8..ad10d85 100644
--- a/zsh/plugins/catimg/catimg.plugin.zsh
+++ b/zsh/plugins/catimg/catimg.plugin.zsh
@@ -9,9 +9,11 @@
 
 
 function catimg() {
-  if [[ -x  `which convert` ]]; then
-    zsh $ZSH/plugins/catimg/catimg.sh $@
+  if (( $+commands[magick] )); then
+    CONVERT_CMD="magick" zsh $ZSH/plugins/catimg/catimg.sh $@
+  elif (( $+commands[convert] )); then
+    CONVERT_CMD="convert" zsh $ZSH/plugins/catimg/catimg.sh $@
   else
-    echo "catimg need convert (ImageMagick) to work)"
+    echo "catimg need magick/convert (ImageMagick) to work)"
   fi
 }
diff --git a/zsh/plugins/catimg/catimg.sh b/zsh/plugins/catimg/catimg.sh
index f583924..7946ad1 100644
--- a/zsh/plugins/catimg/catimg.sh
+++ b/zsh/plugins/catimg/catimg.sh
@@ -7,6 +7,10 @@
 # GitHub: https://github.com/posva/catimg                                      #
 ################################################################################
 
+# this should come from outside, either `magick` or `convert`
+# from imagemagick v7 and ahead `convert` is deprecated
+: ${CONVERT_CMD:=convert}
+
 function help() {
   echo "Usage catimg [-h] [-w width] [-c char] img"
   echo "By default char is \"  \" and w is the terminal width"
@@ -43,23 +47,23 @@ if [ ! "$WIDTH" ]; then
 else
   COLS=$(expr $WIDTH "/" $(echo -n "$CHAR" | wc -c))
 fi
-WIDTH=$(convert "$IMG" -print "%w\n" /dev/null)
+WIDTH=$($CONVERT_CMD "$IMG" -print "%w\n" /dev/null)
 if [ "$WIDTH" -gt "$COLS" ]; then
   WIDTH=$COLS
 fi
 
 REMAP=""
-if convert "$IMG" -resize $COLS\> +dither -remap $COLOR_FILE /dev/null ; then
+if $CONVERT_CMD "$IMG" -resize $COLS\> +dither -remap $COLOR_FILE /dev/null ; then
   REMAP="-remap $COLOR_FILE"
 else
   echo "The version of convert is too old, don't expect good results :(" >&2
-  #convert "$IMG" -colors 256 PNG8:tmp.png
-  #IMG="tmp.png"
+  # $CONVERT_CMD "$IMG" -colors 256 PNG8:tmp.png
+  # IMG="tmp.png"
 fi
 
 # Display the image
 I=0
-convert "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
+$CONVERT_CMD "$IMG" -resize $COLS\> +dither `echo $REMAP` txt:- 2>/dev/null |
 sed -e 's/.*none.*/NO NO NO/g' -e '1d;s/^.*(\(.*\)[,)].*$/\1/g;y/,/ /' |
 while read R G B f; do
   if [ ! "$R" = "NO" ]; then
diff --git a/zsh/plugins/chezmoi/README.md b/zsh/plugins/chezmoi/README.md
new file mode 100644
index 0000000..32aee73
--- /dev/null
+++ b/zsh/plugins/chezmoi/README.md
@@ -0,0 +1,11 @@
+# chezmoi Plugin
+
+## Introduction
+
+This `chezmoi` plugin sets up completion for [chezmoi](https://chezmoi.io).
+
+To use it, add `chezmoi` to the plugins array of your zshrc file:
+
+```bash
+plugins=(... chezmoi)
+```
diff --git a/zsh/plugins/chezmoi/chezmoi.plugin.zsh b/zsh/plugins/chezmoi/chezmoi.plugin.zsh
new file mode 100644
index 0000000..80e19fe
--- /dev/null
+++ b/zsh/plugins/chezmoi/chezmoi.plugin.zsh
@@ -0,0 +1,14 @@
+# COMPLETION FUNCTION
+if (( ! $+commands[chezmoi] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `chezmoi`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_chezmoi" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _chezmoi
+  _comps[chezmoi]=_chezmoi
+fi
+
+chezmoi completion zsh >| "$ZSH_CACHE_DIR/completions/_chezmoi" &|
diff --git a/zsh/plugins/chruby/chruby.plugin.zsh b/zsh/plugins/chruby/chruby.plugin.zsh
index d7a28d4..1bcc6c6 100644
--- a/zsh/plugins/chruby/chruby.plugin.zsh
+++ b/zsh/plugins/chruby/chruby.plugin.zsh
@@ -2,7 +2,7 @@
 
 _source-from-omz-settings() {
   local _chruby_path _chruby_auto
-  
+
   zstyle -s :omz:plugins:chruby path _chruby_path || return 1
   zstyle -s :omz:plugins:chruby auto _chruby_auto || return 1
 
@@ -15,6 +15,13 @@ _source-from-omz-settings() {
   fi
 }
 
+_source-from-default-location() {
+  [[ -r /usr/local/share/chruby/chruby.sh ]] || return 1
+
+  source /usr/local/share/chruby/chruby.sh
+  source /usr/local/share/chruby/auto.sh
+}
+
 _source-from-homebrew() {
   (( $+commands[brew] )) || return 1
 
@@ -22,8 +29,10 @@ _source-from-homebrew() {
   # check default brew prefix
   if [[ -h /usr/local/opt/chruby ]];then
     _brew_prefix="/usr/local/opt/chruby"
+  elif [[ -h /opt/homebrew/opt/chruby ]]; then
+    _brew_prefix="/opt/homebrew/opt/chruby"
   else
-    # ok , it is not default prefix 
+    # ok , it is not default prefix
     # this call to brew is expensive ( about 400 ms ), so at least let's make it only once
     _brew_prefix=$(brew --prefix chruby)
   fi
@@ -34,27 +43,14 @@ _source-from-homebrew() {
   source $_brew_prefix/share/chruby/auto.sh
 }
 
-_load-chruby-dirs() {
-  local dir
-  for dir in "$HOME/.rubies" "$PREFIX/opt/rubies"; do
-    if [[ -d "$dir" ]]; then
-      RUBIES+=("$dir")
-    fi
-  done
-}
-
 # Load chruby
-if _source-from-omz-settings; then
-  _load-chruby-dirs
-elif [[ -r "/usr/local/share/chruby/chruby.sh" ]] ; then
-  source /usr/local/share/chruby/chruby.sh
-  source /usr/local/share/chruby/auto.sh
-  _load-chruby-dirs
-elif _source-from-homebrew; then
-  _load-chruby-dirs
-fi
+_source-from-omz-settings || \
+  _source-from-default-location || \
+  _source-from-homebrew
 
-unfunction _source-from-homebrew _source-from-omz-settings _load-chruby-dirs
+unfunction _source-from-homebrew \
+           _source-from-default-location \
+           _source-from-omz-settings
 
 
 ## chruby utility functions and aliases
diff --git a/zsh/plugins/chucknorris/README.md b/zsh/plugins/chucknorris/README.md
index b51875d..655e7cf 100644
--- a/zsh/plugins/chucknorris/README.md
+++ b/zsh/plugins/chucknorris/README.md
@@ -1,6 +1,6 @@
 # chucknorris
 
-Chuck Norris fortunes plugin for Oh My Zsh. Perfectly suitable as MOTD.
+Fortunes plugin for Chuck Norris for Oh My Zsh. Perfectly suitable as MOTD.
 
 To use it add `chucknorris` to the plugins array in you zshrc file.
 
@@ -36,3 +36,10 @@ Last login: Fri Jan 30 23:12:26 on ttys001
 - `cowsay` if using `chuck_cow`
 
 Available via homebrew, apt, ...
+
+> [!NOTE]  
+> In addition to installing `fortune`, it may be necessary to run:
+> 
+> `strfile $ZSH/plugins/chucknorris/fortunes/chucknorris\n`
+> 
+> (include the "\n" literally) to write the fortune data to the proper directory.
diff --git a/zsh/plugins/cloudfoundry/README.md b/zsh/plugins/cloudfoundry/README.md
index 89dd9d1..567a905 100644
--- a/zsh/plugins/cloudfoundry/README.md
+++ b/zsh/plugins/cloudfoundry/README.md
@@ -50,7 +50,7 @@ Alternatively, seek out the [online documentation][3]. And don't forget, there a
 
 ## Contributors
 
-Contributed to `oh_my_zsh` by [benwilcock][2].  
+Contributed to `oh_my_zsh` by [benwilcock][2].
 
 [1]: https://docs.cloudfoundry.org/cf-cli/install-go-cli.html
 [2]: https://github.com/benwilcock
diff --git a/zsh/plugins/coffee/README.md b/zsh/plugins/coffee/README.md
index 2baade8..c2ab192 100644
--- a/zsh/plugins/coffee/README.md
+++ b/zsh/plugins/coffee/README.md
@@ -24,7 +24,7 @@ Also provides the following aliases:
 * **cfc:** Copies the compiled JS to your clipboard. Very useful when you want
            to run the code in a JS console.
 
-* **cfp:** Compiles from your currently copied clipboard. Useful when you want 
+* **cfp:** Compiles from your currently copied clipboard. Useful when you want
            to compile large/multi-line snippets
 
 * **cfpc:** Paste coffeescript from clipboard, compile to JS, then copy the
diff --git a/zsh/plugins/coffee/_coffee b/zsh/plugins/coffee/_coffee
index e2814f7..a771f52 100644
--- a/zsh/plugins/coffee/_coffee
+++ b/zsh/plugins/coffee/_coffee
@@ -1,6 +1,6 @@
 #compdef coffee
 # ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - https://github.com/zsh-users
+# Copyright (c) 2011 GitHub zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh b/zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh
index 981992d..26a8b59 100644
--- a/zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh
+++ b/zsh/plugins/colored-man-pages/colored-man-pages.plugin.zsh
@@ -36,13 +36,14 @@ function colored() {
   # Prefer `less` whenever available, since we specifically configured
   # environment for it.
   environment+=( PAGER="${commands[less]:-$PAGER}" )
+  environment+=( GROFF_NO_SGR=1 )
 
   # See ./nroff script.
   if [[ "$OSTYPE" = solaris* ]]; then
     environment+=( PATH="${__colored_man_pages_dir}:$PATH" )
   fi
 
-  command env $environment "$@"
+  command env "${environment[@]}" "$@"
 }
 
 # Colorize man and dman/debman (from debian-goodies)
diff --git a/zsh/plugins/colorize/colorize.plugin.zsh b/zsh/plugins/colorize/colorize.plugin.zsh
index a9da6cf..c49acd8 100644
--- a/zsh/plugins/colorize/colorize.plugin.zsh
+++ b/zsh/plugins/colorize/colorize.plugin.zsh
@@ -23,7 +23,7 @@ colorize_check_requirements() {
     if [[ ${available_tools[(Ie)$ZSH_COLORIZE_TOOL]} -eq 0 ]]; then
         echo "ZSH_COLORIZE_TOOL '$ZSH_COLORIZE_TOOL' not recognized. Available options are 'pygmentize' and 'chroma'." >&2
         return 1
-    elif (( $+commands["$ZSH_COLORIZE_TOOL"] )); then
+    elif ! (( $+commands[$ZSH_COLORIZE_TOOL] )); then
         echo "Package '$ZSH_COLORIZE_TOOL' is not installed!" >&2
         return 1
     fi
@@ -42,12 +42,12 @@ colorize_cat() {
         ZSH_COLORIZE_STYLE="emacs"
     fi
 
-    # Use stdin if no arguments have been passed.
-    if [ $# -eq 0 ]; then
+    # Use stdin if stdin is not attached to a terminal.
+    if [ ! -t 0 ]; then
         if [[ "$ZSH_COLORIZE_TOOL" == "pygmentize" ]]; then
             pygmentize -O style="$ZSH_COLORIZE_STYLE" -g
         else
-            chroma --style="$ZSH_COLORIZE_STYLE" --formatter="${ZSH_COLORIZE_CHROMA_FORMATTER:-terminal}"
+            chroma --style="$ZSH_COLORIZE_STYLE" --formatter="${ZSH_COLORIZE_CHROMA_FORMATTER:-terminal}" "$@"
         fi
         return $?
     fi
diff --git a/zsh/plugins/command-not-found/README.md b/zsh/plugins/command-not-found/README.md
index 5a373c5..5079b1f 100644
--- a/zsh/plugins/command-not-found/README.md
+++ b/zsh/plugins/command-not-found/README.md
@@ -22,13 +22,15 @@ Try: sudo apt install <selected package>
 
 It works out of the box with the command-not-found packages for:
 
-- [Ubuntu](https://www.porcheron.info/command-not-found-for-zsh/)
+- [Ubuntu](https://launchpad.net/ubuntu/+source/command-not-found)
 - [Debian](https://packages.debian.org/search?keywords=command-not-found)
-- [Arch Linux](https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found)
-- [macOS (Homebrew)](https://github.com/Homebrew/homebrew-command-not-found)
+- [Arch Linux](https://wiki.archlinux.org/title/Zsh#pkgfile_"command_not_found"_handler)
+- [macOS (Homebrew)](https://github.com/Homebrew/brew/blob/main/docs/Command-Not-Found.md)
 - [Fedora](https://fedoraproject.org/wiki/Features/PackageKitCommandNotFound)
 - [NixOS](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/programs/command-not-found)
 - [Termux](https://github.com/termux/command-not-found)
 - [SUSE](https://www.unix.com/man-page/suse/1/command-not-found/)
+- [Gentoo](https://github.com/AndrewAmmerlaan/command-not-found-gentoo/tree/main)
+- [Void Linux](https://codeberg.org/classabbyamp/xbps-command-not-found)
 
 You can add support for other platforms by submitting a Pull Request.
diff --git a/zsh/plugins/command-not-found/command-not-found.plugin.zsh b/zsh/plugins/command-not-found/command-not-found.plugin.zsh
index cb8a898..a85dbfd 100644
--- a/zsh/plugins/command-not-found/command-not-found.plugin.zsh
+++ b/zsh/plugins/command-not-found/command-not-found.plugin.zsh
@@ -1,11 +1,18 @@
 ## Platforms with a built-in command-not-found handler init file
 
 for file (
-  # Arch Linux. Must have pkgfile installed: https://wiki.archlinux.org/index.php/Pkgfile#Command_not_found
+  # Arch Linux. Must have pkgfile installed: https://wiki.archlinux.org/title/Zsh#pkgfile_"command_not_found"_handler
   /usr/share/doc/pkgfile/command-not-found.zsh
-  # macOS (M1 and classic Homebrew): https://github.com/Homebrew/homebrew-command-not-found
+  # Void Linux: https://codeberg.org/classabbyamp/xbps-command-not-found
+  /usr/share/zsh/plugins/xbps-command-not-found/xbps-command-not-found.zsh
+  # Homebrew: https://github.com/Homebrew/brew/blob/main/docs/Command-Not-Found.md
+  /opt/homebrew/Library/Homebrew/command-not-found/handler.sh
+  /usr/local/Homebrew/Library/Homebrew/command-not-found/handler.sh
+  /home/linuxbrew/.linuxbrew/Homebrew/Library/Homebrew/command-not-found/handler.sh
+  # Old homebrew implementation
   /opt/homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
   /usr/local/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
+  /home/linuxbrew/.linuxbrew/Homebrew/Library/Taps/homebrew/homebrew-command-not-found/handler.sh
 ); do
   if [[ -r "$file" ]]; then
     source "$file"
diff --git a/zsh/plugins/common-aliases/README.md b/zsh/plugins/common-aliases/README.md
index 1417c30..79e3d0d 100644
--- a/zsh/plugins/common-aliases/README.md
+++ b/zsh/plugins/common-aliases/README.md
@@ -114,13 +114,13 @@ that file will be open with `acroread`.
 
 ### Listing files inside a packed file
 
-| Alias  | Command    | Description                       |
-| ------ | ---------- | --------------------------------- |
-| zip    | `unzip -l` | Lists files inside a .zip file    |
-| rar    | `unrar l`  | Lists files inside a .rar file    |
-| tar    | `tar tf`   | Lists files inside a .tar file    |
-| tar.gz | `echo`     | Lists files inside a .tar.gz file |
-| ace    | `unace l`  | Lists files inside a .ace file    |
+| Alias  | Command      | Description                       |
+| ------ | ------------ | --------------------------------- |
+| zip    | `unzip -l`   | Lists files inside a .zip file    |
+| rar    | `unrar l`    | Lists files inside a .rar file    |
+| tar    | `tar tf`     | Lists files inside a .tar file    |
+| tar.gz | `tar -ztf`   | Lists files inside a .tar.gz file |
+| ace    | `unace l`    | Lists files inside a .ace file    |
 
 ### Some other features
 
diff --git a/zsh/plugins/compleat/compleat.plugin.zsh b/zsh/plugins/compleat/compleat.plugin.zsh
index 38f1b39..7fbd2b9 100644
--- a/zsh/plugins/compleat/compleat.plugin.zsh
+++ b/zsh/plugins/compleat/compleat.plugin.zsh
@@ -7,7 +7,7 @@
 
 if (( ${+commands[compleat]} )); then
   local prefix="${commands[compleat]:h:h}"
-  local setup="${prefix}/share/compleat-1.0/compleat_setup" 
+  local setup="${prefix}/share/compleat-1.0/compleat_setup"
 
   if [[ -f "$setup" ]]; then
     if ! bashcompinit >/dev/null 2>&1; then
@@ -15,6 +15,6 @@ if (( ${+commands[compleat]} )); then
       bashcompinit -i
     fi
 
-    source "$setup" 
+    source "$setup"
   fi
 fi
diff --git a/zsh/plugins/conda-env/README.md b/zsh/plugins/conda-env/README.md
new file mode 100644
index 0000000..ccf48a3
--- /dev/null
+++ b/zsh/plugins/conda-env/README.md
@@ -0,0 +1,44 @@
+# conda-env
+
+The plugin displays information of the created virtual container of conda and allows background theming.
+
+To use it, add `conda-env` to the plugins array of your zshrc file:
+```
+plugins=(... conda-env)
+```
+
+The plugin creates a `conda_prompt_info` function that you can use in your theme, which displays the
+basename of the current `$CONDA_DEFAULT_ENV`.
+
+You can use this prompt function in your themes, by adding it to the `PROMPT` or `RPROMPT` variables. See [Example](#example) for more information.
+
+## Settings
+
+It uses two variables to control how the information is shown:
+
+- `ZSH_THEME_CONDA_PREFIX`: sets the prefix of the CONDA_DEFAULT_ENV.
+Defaults to `[`.
+
+- `ZSH_THEME_CONDA_SUFFIX`: sets the suffix of the CONDA_DEFAULT_ENV.
+Defaults to `]`.
+
+## Example
+
+```sh
+ZSH_THEME_CONDA_PREFIX='conda:%F{green}'
+ZSH_THEME_CONDA_SUFFIX='%f'
+RPROMPT='$(conda_prompt_info)'
+```
+
+## `CONDA_CHANGEPS1`
+
+This plugin also automatically sets the `CONDA_CHANGEPS1` variable to `false` to avoid conda changing the prompt
+automatically. This has the same effect as running `conda config --set changeps1 false`.
+
+You can override this behavior by adding `unset CONDA_CHANGEPS1` in your `.zshrc` file, after Oh My Zsh has been
+sourced.
+
+References:
+
+- https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#determining-your-current-environment
+- https://conda.io/projects/conda/en/latest/user-guide/configuration/use-condarc.html#precedence
diff --git a/zsh/plugins/conda-env/conda-env.plugin.zsh b/zsh/plugins/conda-env/conda-env.plugin.zsh
new file mode 100644
index 0000000..c710c95
--- /dev/null
+++ b/zsh/plugins/conda-env/conda-env.plugin.zsh
@@ -0,0 +1,9 @@
+function conda_prompt_info(){
+  [[ -n ${CONDA_DEFAULT_ENV} ]] || return
+  echo "${ZSH_THEME_CONDA_PREFIX=[}${CONDA_DEFAULT_ENV:t:gs/%/%%}${ZSH_THEME_CONDA_SUFFIX=]}"
+}
+
+# Has the same effect as `conda config --set changeps1 false`
+# - https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#determining-your-current-environment
+# - https://conda.io/projects/conda/en/latest/user-guide/configuration/use-condarc.html#precedence
+export CONDA_CHANGEPS1=false
diff --git a/zsh/plugins/conda/README.md b/zsh/plugins/conda/README.md
new file mode 100644
index 0000000..70530d0
--- /dev/null
+++ b/zsh/plugins/conda/README.md
@@ -0,0 +1,37 @@
+# conda plugin
+
+The conda plugin provides [aliases](#aliases) for `conda`, usually installed via [anaconda](https://www.anaconda.com/) or [miniconda](https://docs.conda.io/en/latest/miniconda.html).
+
+To use it, add `conda` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... conda)
+```
+
+## Aliases
+
+| Alias    | Command                                 | Description                                                                     |
+| :------- | :-------------------------------------- | :------------------------------------------------------------------------------ |
+| `cna`    | `conda activate`                        | Activate the specified conda environment                                        |
+| `cnab`   | `conda activate base`                   | Activate the base conda environment                                             |
+| `cncf`   | `conda env create -f`                   | Create a new conda environment from a YAML file                                 |
+| `cncn`   | `conda create -y -n`                    | Create a new conda environment with the given name                              |
+| `cnconf` | `conda config`                          | View or modify conda configuration                                              |
+| `cncp`   | `conda create -y -p`                    | Create a new conda environment with the given prefix                            |
+| `cncr`   | `conda create -n`                       | Create new virtual environment with given name                                  |
+| `cncss`  | `conda config --show-source`            | Show the locations of conda configuration sources                               |
+| `cnde`   | `conda deactivate`                      | Deactivate the current conda environment                                        |
+| `cnel`   | `conda env list`                        | List all available conda environments                                           |
+| `cni`    | `conda install`                         | Install given package                                                           |
+| `cniy`   | `conda install -y`                      | Install given package without confirmation                                      |
+| `cnl`    | `conda list`                            | List installed packages in the current environment                              |
+| `cnle`   | `conda list --export`                   | Export the list of installed packages in the current environment                |
+| `cnles`  | `conda list --explicit > spec-file.txt` | Export the list of installed packages in the current environment to a spec file |
+| `cnr`    | `conda remove`                          | Remove given package                                                            |
+| `cnrn`   | `conda remove -y -all -n`               | Remove all packages in the specified environment                                |
+| `cnrp`   | `conda remove -y -all -p`               | Remove all packages in the specified prefix                                     |
+| `cnry`   | `conda remove -y`                       | Remove given package without confirmation                                       |
+| `cnsr`   | `conda search`                          | Search conda repositories for package                                           |
+| `cnu`    | `conda update`                          | Update conda package manager                                                    |
+| `cnua`   | `conda update --all`                    | Update all installed packages                                                   |
+| `cnuc`   | `conda update conda`                    | Update conda package manager                                                    |
diff --git a/zsh/plugins/conda/conda.plugin.zsh b/zsh/plugins/conda/conda.plugin.zsh
new file mode 100644
index 0000000..7a130ba
--- /dev/null
+++ b/zsh/plugins/conda/conda.plugin.zsh
@@ -0,0 +1,23 @@
+alias cna='conda activate'
+alias cnab='conda activate base'
+alias cncf='conda env create -f'
+alias cncn='conda create -y -n'
+alias cnconf='conda config'
+alias cncp='conda create -y -p'
+alias cncr='conda create -n'
+alias cncss='conda config --show-source'
+alias cnde='conda deactivate'
+alias cnel='conda env list'
+alias cni='conda install'
+alias cniy='conda install -y'
+alias cnl='conda list'
+alias cnle='conda list --export'
+alias cnles='conda list --explicit > spec-file.txt'
+alias cnr='conda remove'
+alias cnrn='conda remove -y --all -n'
+alias cnrp='conda remove -y --all -p'
+alias cnry='conda remove -y'
+alias cnsr='conda search'
+alias cnu='conda update'
+alias cnua='conda update --all'
+alias cnuc='conda update conda'
diff --git a/zsh/plugins/copybuffer/copybuffer.plugin.zsh b/zsh/plugins/copybuffer/copybuffer.plugin.zsh
index e67f920..e636d97 100644
--- a/zsh/plugins/copybuffer/copybuffer.plugin.zsh
+++ b/zsh/plugins/copybuffer/copybuffer.plugin.zsh
@@ -1,8 +1,8 @@
-# copy the active line from the command line buffer 
+# copy the active line from the command line buffer
 # onto the system clipboard
 
 copybuffer () {
-  if which clipcopy &>/dev/null; then
+  if builtin which clipcopy &>/dev/null; then
     printf "%s" "$BUFFER" | clipcopy
   else
     zle -M "clipcopy not found. Please make sure you have Oh My Zsh installed correctly."
diff --git a/zsh/plugins/copydir/README.md b/zsh/plugins/copydir/README.md
deleted file mode 100644
index cf24b78..0000000
--- a/zsh/plugins/copydir/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# copydir plugin
-
-This plugin is deprecated. Use the [`copypath` plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/copypath) instead.
diff --git a/zsh/plugins/copydir/copydir.plugin.zsh b/zsh/plugins/copydir/copydir.plugin.zsh
deleted file mode 100644
index a2b489e..0000000
--- a/zsh/plugins/copydir/copydir.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-echo ${(%):-'%F{yellow}The `%Bcopydir%b` plugin is deprecated. Use the `%Bcopypath%b` plugin instead.%f'}
-source "$ZSH/plugins/copypath/copypath.plugin.zsh"
-
-# TODO: 2022-02-22: Remove deprecated copydir function.
-function copydir {
-  copypath
-}
diff --git a/zsh/plugins/copyfile/copyfile.plugin.zsh b/zsh/plugins/copyfile/copyfile.plugin.zsh
index f4eca5a..3281410 100644
--- a/zsh/plugins/copyfile/copyfile.plugin.zsh
+++ b/zsh/plugins/copyfile/copyfile.plugin.zsh
@@ -1,7 +1,19 @@
 # Copies the contents of a given file to the system or X Windows clipboard
 #
-# copyfile <file>
+# Usage: copyfile <file>
 function copyfile {
   emulate -L zsh
+
+  if [[ -z "$1" ]]; then
+    echo "Usage: copyfile <file>"
+    return 1
+  fi
+
+  if [[ ! -f "$1" ]]; then
+    echo "Error: '$1' is not a valid file."
+    return 1
+  fi
+
   clipcopy $1
+  echo ${(%):-"%B$1%b copied to clipboard."}
 }
diff --git a/zsh/plugins/dash/README.md b/zsh/plugins/dash/README.md
index 0ca3e4e..970c654 100644
--- a/zsh/plugins/dash/README.md
+++ b/zsh/plugins/dash/README.md
@@ -19,7 +19,7 @@ dash
 
 - Query for something in dash app: `dash query`
 ```
-dash golang 
+dash golang
 ```
 
 - You can optionally provide a keyword: `dash [keyword:]query`
diff --git a/zsh/plugins/dash/dash.plugin.zsh b/zsh/plugins/dash/dash.plugin.zsh
index f6801a8..9abd691 100644
--- a/zsh/plugins/dash/dash.plugin.zsh
+++ b/zsh/plugins/dash/dash.plugin.zsh
@@ -1,5 +1,5 @@
 # Usage: dash [keyword:]query
-dash() { open -a Dash.app dash://"$*" }
+dash() { open -a Dash.app "dash://$(omz_urlencode -r $*)" }
 compdef _dash dash
 
 _dash() {
diff --git a/zsh/plugins/dbt/README.md b/zsh/plugins/dbt/README.md
new file mode 100644
index 0000000..74ae631
--- /dev/null
+++ b/zsh/plugins/dbt/README.md
@@ -0,0 +1,27 @@
+# dbt plugin
+
+The `dbt plugin` adds several aliases for useful [dbt](https://docs.getdbt.com/) commands and
+[aliases](#aliases).
+
+To use it, add `dbt` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... dbt)
+```
+
+## Aliases
+
+| Alias  | Command                                          | Description                                          |
+| ------ | ------------------------------------------------ | ---------------------------------------------------- |
+| dbtlm  | `dbt ls -s state:modified`                       | List modified models only                            |
+| dbtrm  | `dbt run -s state:modified`                      | Run modified models only                             |
+| dbttm  | `dbt test -m state:modified`                     | Test modified models only                            |
+| dbtrtm | `dbtrm && dbttm`                                 | Run and test modified models only                    |
+| dbtrs  | `dbt clean; dbt deps; dbt seed`                  | Re-seed data                                         |
+| dbtfrt | `dbtrs; dbt run --full-refresh; dbt test`        | Perform a full fresh run with tests                  |
+| dbtcds | `dbt docs generate; dbt docs serve`              | Generate docs without compiling                      |
+| dbtds  | `dbt docs generate --no-compile; dbt docs serve` | Generate and serve docs skipping doc. re-compilation |
+
+## Maintainer
+
+- [msempere](https://github.com/msempere)
diff --git a/zsh/plugins/dbt/dbt.plugin.zsh b/zsh/plugins/dbt/dbt.plugin.zsh
new file mode 100644
index 0000000..6fcc2ee
--- /dev/null
+++ b/zsh/plugins/dbt/dbt.plugin.zsh
@@ -0,0 +1,23 @@
+# list modified models only
+alias dbtlm="dbt ls -s state:modified"
+
+# run modified models only
+alias dbtrm="dbt run -s state:modified"
+
+# test modified models only
+alias dbttm="dbt test -m state:modified"
+
+# run and test modified models only
+alias dbtrtm="dbtrm && dbttm"
+
+# re-seed data
+alias dbtrs="dbt clean; dbt deps; dbt seed"
+
+# perform a full fresh run with tests
+alias dbtfrt="dbtrs; dbt run --full-refresh; dbt test"
+
+# generate and serve docs
+alias dbtcds="dbt docs generate; dbt docs serve"
+
+# generate and serve docs skipping doc. re-compilation
+alias dbtds="dbt docs generate --no-compile; dbt docs serve"
diff --git a/zsh/plugins/debian/README.md b/zsh/plugins/debian/README.md
index 1db534f..6835ad6 100644
--- a/zsh/plugins/debian/README.md
+++ b/zsh/plugins/debian/README.md
@@ -13,7 +13,12 @@ plugins=(... debian)
 - `$apt_pref`: use aptitude or apt if installed, fallback is apt-get.
 - `$apt_upgr`: use upgrade or safe-upgrade (for aptitude).
 
-Set `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior.
+Set **both** `$apt_pref` and `$apt_upgr` to whatever command you want (before sourcing Oh My Zsh) to override this behavior, e.g.:
+
+```sh
+apt_pref='apt'
+apt_upgr='full-upgrade'
+```
 
 ## Common Aliases
 
diff --git a/zsh/plugins/debian/debian.plugin.zsh b/zsh/plugins/debian/debian.plugin.zsh
index 2d8c466..980440c 100644
--- a/zsh/plugins/debian/debian.plugin.zsh
+++ b/zsh/plugins/debian/debian.plugin.zsh
@@ -51,7 +51,7 @@ if [[ $use_sudo -eq 1 ]]; then
     alias au="sudo $apt_pref $apt_upgr"
     alias ai="sudo $apt_pref install"
     # Install all packages given on the command line while using only the first word of each line:
-    # acs ... | ail
+    # acse ... | ail
 
     alias ail="sed -e 's/  */ /g' -e 's/ *//' | cut -s -d ' ' -f 1 | xargs sudo $apt_pref install"
     alias ap="sudo $apt_pref purge"
@@ -83,9 +83,9 @@ else
     }
     alias ac="su -ls '$apt_pref clean' root"
     alias ad="su -lc '$apt_pref update' root"
-    alias adg="su -lc '$apt_pref update && aptitude $apt_upgr' root"
-    alias adu="su -lc '$apt_pref update && aptitude dist-upgrade' root"
-    alias afu="su -lc '$apt-file update'"
+    alias adg="su -lc '$apt_pref update && $apt_pref $apt_upgr' root"
+    alias adu="su -lc '$apt_pref update && $apt_pref dist-upgrade' root"
+    alias afu="su -lc 'apt-file update'"
     alias au="su -lc '$apt_pref $apt_upgr' root"
     function ai() {
         cmd="su -lc '$apt_pref install $@' root"
diff --git a/zsh/plugins/deno/README.md b/zsh/plugins/deno/README.md
index 6913183..38f9f20 100644
--- a/zsh/plugins/deno/README.md
+++ b/zsh/plugins/deno/README.md
@@ -4,16 +4,17 @@ This plugin sets up completion and aliases for [Deno](https://deno.land).
 
 ## Aliases
 
-| Alias | Full command     |
-| ----- | ---------------- |
-| db    | deno bundle      |
-| dc    | deno compile     |
-| dca   | deno cache       |
-| dfmt  | deno fmt         |
-| dh    | deno help        |
-| dli   | deno lint        |
-| drn   | deno run         |
-| drA   | deno run -A      |
-| drw   | deno run --watch |
-| dts   | deno test        |
-| dup   | deno upgrade     |
+| Alias | Full command        |
+| ----- | ------------------- |
+| db    | deno bundle         |
+| dc    | deno compile        |
+| dca   | deno cache          |
+| dfmt  | deno fmt            |
+| dh    | deno help           |
+| dli   | deno lint           |
+| drn   | deno run            |
+| drA   | deno run -A         |
+| drw   | deno run --watch    |
+| dru   | deno run --unstable |
+| dts   | deno test           |
+| dup   | deno upgrade        |
diff --git a/zsh/plugins/deno/deno.plugin.zsh b/zsh/plugins/deno/deno.plugin.zsh
index 7708f84..bf97d6f 100644
--- a/zsh/plugins/deno/deno.plugin.zsh
+++ b/zsh/plugins/deno/deno.plugin.zsh
@@ -8,6 +8,7 @@ alias dli='deno lint'
 alias drn='deno run'
 alias drA='deno run -A'
 alias drw='deno run --watch'
+alias dru='deno run --unstable'
 alias dts='deno test'
 alias dup='deno upgrade'
 
diff --git a/zsh/plugins/dircycle/README.md b/zsh/plugins/dircycle/README.md
index 3c9b3a9..c410555 100644
--- a/zsh/plugins/dircycle/README.md
+++ b/zsh/plugins/dircycle/README.md
@@ -37,13 +37,13 @@ Say you opened these directories on the terminal:
 3       ~
 ```
 
-By pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>, the current working directory or `$CWD` will be from `oh-my-zsh` to `Hacktoberfest`. Press it again and it will be at `Projects`.
+By pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>, the current working directory or `$PWD` will be from `oh-my-zsh` to `Hacktoberfest`. Press it again and it will be at `Projects`.
 
-And by pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>, the `$CWD` will be from `Projects` to `Hacktoberfest`. Press it again and it will be at `oh-my-zsh`.
+And by pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>, the `$PWD` will be from `Projects` to `Hacktoberfest`. Press it again and it will be at `oh-my-zsh`.
 
 Here's a example history table with the same accessed directories like above:
 
-| Current `$CWD`  | Key press                                             | New `$CWD`      |
+| Current `$PWD`  | Key press                                             | New `$PWD`      |
 | --------------- | ----------------------------------------------------- | --------------- |
 | `oh-my-zsh`     | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>  | `Hacktoberfest` |
 | `Hacktoberfest` | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>  | `Projects`      |
@@ -53,7 +53,7 @@ Here's a example history table with the same accessed directories like above:
 | `Hacktoberfest` | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> | `oh-my-zsh`     |
 | `oh-my-zsh`     | <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> | `~`             |
 
-Note the last traversal, when pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> on a last known `$CWD`, it will change back to the first known `$CWD`, which in the example is `~`.
+Note the last traversal, when pressing <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd> on a last known `$PWD`, it will change back to the first known `$PWD`, which in the example is `~`.
 
 Here's an asciinema cast demonstrating the example above:
 
@@ -61,18 +61,22 @@ Here's an asciinema cast demonstrating the example above:
 
 ## Functions
 
-| Function             | Description                                                                                               |
-| -------------------- | --------------------------------------------------------------------------------------------------------- |
-| `insert-cycledleft`  | Change `$CWD` to the previous known stack, binded on <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd> |
-| `insert-cycledright` | Change `$CWD` to the next known stack, binded on <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>    |
+| Function             | Description                                                                                                         |
+| -------------------- | ------------------------------------------------------------------------------------------------------------------- |
+| `insert-cycledleft`  | Change `$PWD` to the previous known stack, bound to <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd>            |
+| `insert-cycledright` | Change `$PWD` to the next known stack, bound to <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Right</kbd>               |
+| `insert-cycledup`    | Change `$PWD` to the parent folder, bound to <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Up</kbd>                     |
+| `insert-cycleddown`  | Change `$PWD` to the first alphabetical child folder, bound to <kbd>Ctrl</kbd> + <kbd>Shift</kbd> + <kbd>Down</kbd> |
 
 ## Rebinding keys
 
-You can bind these functions to other key sequences, as long as you know the bindkey sequence. For example, these commands bind to <kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>Left</kbd> / <kbd>Right</kbd> in `xterm-256color`:
+You can bind these functions to other key sequences, as long as you know the bindkey sequence. For example, these commands bind to <kbd>Alt</kbd> + <kbd>Shift</kbd> + <kbd>key</kbd> in `xterm-256color`:
 
 ```zsh
 bindkey '^[[1;4D' insert-cycledleft
 bindkey '^[[1;4C' insert-cycledright
+bindkey "\e[1;4A" insert-cycledup
+bindkey "\e[1;4B" insert-cycleddown
 ```
 
 You can get the bindkey sequence by pressing <kbd>Ctrl</kbd> + <kbd>V</kbd>, then pressing the keyboard shortcut you want to use.
diff --git a/zsh/plugins/dircycle/dircycle.plugin.zsh b/zsh/plugins/dircycle/dircycle.plugin.zsh
index bb69f6b..8c03594 100644
--- a/zsh/plugins/dircycle/dircycle.plugin.zsh
+++ b/zsh/plugins/dircycle/dircycle.plugin.zsh
@@ -8,7 +8,16 @@
 #  pushd +N: start counting from left of `dirs' output
 #  pushd -N: start counting from right of `dirs' output
 
+# Either switch to a directory from dirstack, using +N or -N syntax
+# or switch to a directory by path, using `switch-to-dir -- <path>`
 switch-to-dir () {
+	# If $1 is --, then treat $2 as a directory path
+	if [[ $1 == -- ]]; then
+		# We use `-q` because we don't want chpwd to run, we'll do it manually
+		[[ -d "$2" ]] && builtin pushd -q "$2" &>/dev/null
+		return $?
+	fi
+
 	setopt localoptions nopushdminus
 	[[ ${#dirstack} -eq 0 ]] && return 1
 
@@ -22,10 +31,10 @@ switch-to-dir () {
 }
 
 insert-cycledleft () {
-	switch-to-dir +1 || return
+	switch-to-dir +1 || return $?
 
 	local fn
-	for fn (chpwd $chpwd_functions precmd $precmd_functions); do
+	for fn in chpwd $chpwd_functions precmd $precmd_functions; do
 		(( $+functions[$fn] )) && $fn
 	done
 	zle reset-prompt
@@ -33,22 +42,46 @@ insert-cycledleft () {
 zle -N insert-cycledleft
 
 insert-cycledright () {
-	switch-to-dir -0 || return
+	switch-to-dir -0 || return $?
 
 	local fn
-	for fn (chpwd $chpwd_functions precmd $precmd_functions); do
+	for fn in chpwd $chpwd_functions precmd $precmd_functions; do
 		(( $+functions[$fn] )) && $fn
 	done
 	zle reset-prompt
 }
 zle -N insert-cycledright
 
+insert-cycledup () {
+	switch-to-dir -- .. || return $?
+
+	local fn
+	for fn in chpwd $chpwd_functions precmd $precmd_functions; do
+		(( $+functions[$fn] )) && $fn
+	done
+	zle reset-prompt
+}
+zle -N insert-cycledup
+
+insert-cycleddown () {
+	switch-to-dir -- "$(find . -mindepth 1 -maxdepth 1 -type d | sort -n | head -n 1)" || return $?
+
+	local fn
+	for fn in chpwd $chpwd_functions precmd $precmd_functions; do
+		(( $+functions[$fn] )) && $fn
+	done
+	zle reset-prompt
+}
+zle -N insert-cycleddown
 
 # These sequences work for xterm, Apple Terminal.app, and probably others.
 # Not for rxvt-unicode, but it doesn't seem differentiate Ctrl-Shift-Arrow
 # from plain Shift-Arrow, at least by default.
+#
 # iTerm2 does not have these key combinations defined by default; you will need
 # to add them under "Keys" in your profile if you want to use this. You can do
 # this conveniently by loading the "xterm with Numeric Keypad" preset.
-bindkey "\e[1;6D" insert-cycledleft
-bindkey "\e[1;6C" insert-cycledright
+bindkey "\e[1;6D" insert-cycledleft     # Ctrl+Shift+Left
+bindkey "\e[1;6C" insert-cycledright    # Ctrl+Shift+Right
+bindkey "\e[1;6A" insert-cycledup       # Ctrl+Shift+Up
+bindkey "\e[1;6B" insert-cycleddown     # Ctrl+Shift+Down
diff --git a/zsh/plugins/direnv/direnv.plugin.zsh b/zsh/plugins/direnv/direnv.plugin.zsh
index 5e32c4c..c026dbe 100644
--- a/zsh/plugins/direnv/direnv.plugin.zsh
+++ b/zsh/plugins/direnv/direnv.plugin.zsh
@@ -1,5 +1,8 @@
-# Don't continue if direnv is not found
-command -v direnv &>/dev/null || return
+# If direnv is not found, don't continue and print a warning
+if (( ! $+commands[direnv] )); then
+  echo "Warning: direnv not found. Please install direnv and ensure it's in your PATH before using this plugin."
+  return
+fi
 
 _direnv_hook() {
   trap -- '' SIGINT;
@@ -7,10 +10,10 @@ _direnv_hook() {
   trap - SIGINT;
 }
 typeset -ag precmd_functions;
-if [[ -z ${precmd_functions[(r)_direnv_hook]} ]]; then
+if [[ -z "${precmd_functions[(r)_direnv_hook]+1}" ]]; then
   precmd_functions=( _direnv_hook ${precmd_functions[@]} )
 fi
 typeset -ag chpwd_functions;
-if [[ -z ${chpwd_functions[(r)_direnv_hook]} ]]; then
+if [[ -z "${chpwd_functions[(r)_direnv_hook]+1}" ]]; then
   chpwd_functions=( _direnv_hook ${chpwd_functions[@]} )
 fi
diff --git a/zsh/plugins/dirhistory/README.md b/zsh/plugins/dirhistory/README.md
index ede9b54..66e3e04 100644
--- a/zsh/plugins/dirhistory/README.md
+++ b/zsh/plugins/dirhistory/README.md
@@ -60,3 +60,46 @@ to `/usr` again.
 After that, <kbd>Alt</kbd> + <kbd>Down</kbd> will probably go to `/usr/bin` if `bin` is the first directory in alphabetical
 order (depends on your `/usr` folder structure). <kbd>Alt</kbd> + <kbd>Up</kbd> will return to `/usr`, and once more will get
 you to the root folder (`/`).
+
+### cde
+
+This plugin also provides a `cde` alias that allows you to change to a directory without clearing the next directory stack.
+This changes the default behavior of `dirhistory`, which is to clear the next directory stack when changing directories.
+
+For example, if the shell was started, and the following commands were entered:
+
+```shell
+cd ~
+cd /usr
+cd share
+cd doc
+
+# <Alt + Left>
+# <Alt + Left>
+```
+
+The directory stack would look like this:
+
+```sh
+➜  /usr typeset -pm dirhistory_\*
+typeset -ax dirhistory_past=( /home/user /usr )
+typeset -ax dirhistory_future=( /usr/share/doc /usr/share )
+```
+
+This means that pressing <kbd>Alt</kbd> + <kbd>Right</kbd>, you'd go to `/usr/share` and `/usr/share/doc` (the "future" directories).
+
+If you run `cd /usr/bin`, the "future" directories will be removed, and you won't be able to access them with <kbd>Alt</kbd> + <kbd>Right</kbd>:
+
+```sh
+➜  /u/bin typeset -pm dirhistory_\*
+typeset -ax dirhistory_past=( /home/user /usr )
+typeset -ax dirhistory_future=( /usr/bin )
+```
+
+If you instead run `cde /usr/bin`, the "future" directories will be preserved:
+
+```sh
+➜  /u/bin typeset -pm dirhistory_\*
+typeset -ax dirhistory_past=( /home/user /usr /usr/bin )
+typeset -ax dirhistory_future=( /usr/share/doc /usr/share )
+```
diff --git a/zsh/plugins/dirhistory/dirhistory.plugin.zsh b/zsh/plugins/dirhistory/dirhistory.plugin.zsh
index 7021fc0..706bb6f 100644
--- a/zsh/plugins/dirhistory/dirhistory.plugin.zsh
+++ b/zsh/plugins/dirhistory/dirhistory.plugin.zsh
@@ -11,23 +11,26 @@ dirhistory_past=($PWD)
 dirhistory_future=()
 export dirhistory_past
 export dirhistory_future
-
 export DIRHISTORY_SIZE=30
 
+alias cde='dirhistory_cd'
+
 # Pop the last element of dirhistory_past.
 # Pass the name of the variable to return the result in.
 # Returns the element if the array was not empty,
 # otherwise returns empty string.
 function pop_past() {
-  typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
+  setopt localoptions no_ksh_arrays
   if [[ $#dirhistory_past -gt 0 ]]; then
+    typeset -g $1="${dirhistory_past[$#dirhistory_past]}"
     dirhistory_past[$#dirhistory_past]=()
   fi
 }
 
 function pop_future() {
-  typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
+  setopt localoptions no_ksh_arrays
   if [[ $#dirhistory_future -gt 0 ]]; then
+    typeset -g $1="${dirhistory_future[$#dirhistory_future]}"
     dirhistory_future[$#dirhistory_future]=()
   fi
 }
@@ -35,6 +38,7 @@ function pop_future() {
 # Push a new element onto the end of dirhistory_past. If the size of the array
 # is >= DIRHISTORY_SIZE, the array is shifted
 function push_past() {
+  setopt localoptions no_ksh_arrays
   if [[ $#dirhistory_past -ge $DIRHISTORY_SIZE ]]; then
     shift dirhistory_past
   fi
@@ -44,6 +48,7 @@ function push_past() {
 }
 
 function push_future() {
+  setopt localoptions no_ksh_arrays
   if [[ $#dirhistory_future -ge $DIRHISTORY_SIZE ]]; then
     shift dirhistory_future
   fi
@@ -132,7 +137,11 @@ for keymap in emacs vicmd viins; do
 
   case "$TERM_PROGRAM" in
   Apple_Terminal) bindkey -M $keymap "^[b" dirhistory_zle_dirhistory_back ;; # Terminal.app
-  iTerm.app) bindkey -M $keymap "^[^[[D" dirhistory_zle_dirhistory_back ;;   # iTerm2
+  ghostty) bindkey -M $keymap "^[b" dirhistory_zle_dirhistory_back ;;        # ghostty
+  iTerm.app)
+    bindkey -M $keymap "^[^[[D" dirhistory_zle_dirhistory_back
+    bindkey -M $keymap "^[b" dirhistory_zle_dirhistory_back
+    ;;
   esac
 
   if (( ${+terminfo[kcub1]} )); then
@@ -147,7 +156,11 @@ for keymap in emacs vicmd viins; do
 
   case "$TERM_PROGRAM" in
   Apple_Terminal) bindkey -M $keymap "^[f" dirhistory_zle_dirhistory_future ;; # Terminal.app
-  iTerm.app) bindkey -M $keymap "^[^[[C" dirhistory_zle_dirhistory_future ;;   # iTerm2
+  ghostty) bindkey -M $keymap "^[f" dirhistory_zle_dirhistory_future ;;        # ghostty
+  iTerm.app)
+    bindkey -M $keymap "^[^[[C" dirhistory_zle_dirhistory_future
+    bindkey -M $keymap "^[f" dirhistory_zle_dirhistory_future
+    ;;
   esac
 
   if (( ${+terminfo[kcuf1]} )); then
@@ -196,6 +209,7 @@ for keymap in emacs vicmd viins; do
   case "$TERM_PROGRAM" in
   Apple_Terminal) bindkey -M $keymap "^[[A" dirhistory_zle_dirhistory_up ;;  # Terminal.app
   iTerm.app) bindkey -M $keymap "^[^[[A" dirhistory_zle_dirhistory_up ;;     # iTerm2
+  ghostty) bindkey -M $keymap "^[[1;3A" dirhistory_zle_dirhistory_up ;;      # ghostty
   esac
 
   if (( ${+terminfo[kcuu1]} )); then
@@ -211,6 +225,7 @@ for keymap in emacs vicmd viins; do
   case "$TERM_PROGRAM" in
   Apple_Terminal) bindkey -M $keymap "^[[B" dirhistory_zle_dirhistory_down ;;  # Terminal.app
   iTerm.app) bindkey -M $keymap "^[^[[B" dirhistory_zle_dirhistory_down ;;     # iTerm2
+  ghostty) bindkey -M $keymap "^[[1;3B" dirhistory_zle_dirhistory_down ;;      # ghostty
   esac
 
   if (( ${+terminfo[kcud1]} )); then
diff --git a/zsh/plugins/dnf/README.md b/zsh/plugins/dnf/README.md
index dc0d1e0..f45c877 100644
--- a/zsh/plugins/dnf/README.md
+++ b/zsh/plugins/dnf/README.md
@@ -10,6 +10,9 @@ To use it, add `dnf` to the plugins array in your zshrc file:
 plugins=(... dnf)
 ```
 
+Classic `dnf` is getting superseded by `dnf5`; this plugin detects the presence
+of `dnf5` and uses it as drop-in alternative to the slower `dnf`.
+
 ## Aliases
 
 | Alias | Command                 | Description              |
diff --git a/zsh/plugins/dnf/_dnf5 b/zsh/plugins/dnf/_dnf5
new file mode 100644
index 0000000..3422fae
--- /dev/null
+++ b/zsh/plugins/dnf/_dnf5
@@ -0,0 +1,570 @@
+#compdef dnf5
+# based on dnf-5.2.6.2
+
+# utility functions
+
+_dnf5_helper() {
+  _call_program specs $service "${(q-)@}" "${(q-)PREFIX}\*" \
+        -qC --assumeno --nogpgcheck 2>/dev/null </dev/null
+}
+
+_dnf5_repositories() {
+  # required option: -T (all|disabled|enabled)
+  local selected expl
+  zparseopts -D -E - T:=selected
+  selected=$selected[2]
+  _wanted $selected-repositories expl "$selected repository" \
+    compadd "$@" - "${(@)${(f)$(_dnf5_helper repo list --$selected)}[2,-1]%% *}"
+}
+
+_dnf5_packages() {
+  # required option: -T (all|available|installed|upgradable)
+  local selected opt expl
+  zparseopts -D -E - T:=selected
+  selected=$selected[2]
+  case $selected in
+    all)        opt='' ;;   # option --all does not exist
+    upgradable) opt='--upgrades' ;;
+    *)          opt="--$selected" ;;
+  esac
+  _wanted $selected-packages expl "$selected package" \
+    compadd "$@" - $(_dnf5_helper repoquery $opt --qf='%{name} ')
+}
+
+_dnf5_rpm_files() {
+  local expl
+  _wanted rpm-files expl 'rpm file' _files -g '(#i)*.rpm(-.)'
+}
+
+_dnf5_packages_or_rpms() {
+  if [[ "$words[CURRENT]" = (*/*|\~*) ]]; then # if looks like a path name
+    _dnf5_rpm_files
+  else
+    _dnf5_packages "$@"
+  fi
+}
+
+_dnf5_groups() {
+  # optional option: -T (available|installed)
+  local update_policy selected line pat groups
+  zparseopts -D -E - T:=selected
+  selected=$selected[2]
+  if [[ -z $selected ]]; then
+    selected=all
+    opt=  # option --all does not exist
+  else
+    opt=--$selected
+  fi
+  # XXX hidden groups are not included
+  for line in ${${(f)"$(_dnf5_helper group list $opt)"}[2,-1]}; do
+    line=( ${(z)line} )
+    groups+=( "$line[1]:$line[2,-2]" )
+  done
+  _describe -t $selected-groups "$selected group" groups
+}
+
+_dnf5_environments() {
+  local line envs
+  for line in ${${(f)"$(_dnf5_helper environment list)"}[2,-1]}; do
+    line=( ${(z)line} )
+    envs+=( "$line[1]:$line[2,-2]" )
+  done
+  _describe -t environments 'environment' envs
+}
+
+# completers for (several) dnf commands
+
+_dnf5-advisory () {
+  _arguments : \
+    $advisory_opts \
+    '--contains-pkgs=[only show advisories containing specified packages]: : _sequence _dnf5_packages -T installed' \
+    + '(with)' \
+    '--with-cve[show only advisories referencing CVE ticket]' \
+    '--with-bz[show only advisories referencing Bugzilla ticket]' \
+    + '(type)' \
+    '--all[show all advisories]' \
+    '--available[show advisories containing newer versions of installed packages (default)]' \
+    '--installed[show advisories containing equal and older version of installed packages]' \
+    '--updates[show advisories containing upgradable packages]' \
+    + args \
+    ':subcommand:(list info summary)' '*:advisory spec:'
+}
+
+_dnf5-group() {
+  local -a tmp
+  if (( CURRENT == 2 )); then
+    tmp=(
+      'list:list all matching groups'
+      'info:print detailed information about groups'
+      'install:install packages from specified groups'
+      'remove:remove removable packages in specified groups'
+      'upgrade:upgrade specified groups and packages in them'
+    )
+    _describe -t subcommands 'subcommand' tmp
+  else
+    case $words[2] in
+      list|info)
+        tmp=(
+          '(--installed)--available[show only available groups]'
+          '(--available)--installed[show only installed groups]'
+          '--hidden[show also hidden groups]'
+          '--contains-pkgs=[show only groups containing specified packages]: : _sequence _dnf5_packages -T all'
+          '*: : _dnf5_groups'
+        )
+        ;;
+      install)
+        tmp=( $common_opts
+              '--with-optional[include optional packages from the groups]'
+              '*: : _dnf5_groups -T available' )
+        ;|
+      upgrade)
+        tmp=( ${common_opts:#--skip-broken*}
+              '*: : _dnf5_groups -T installed' )
+        ;|
+      remove)
+        tmp=( $offline_opts
+              '*: : _dnf5_groups -T installed' )
+        ;|
+      install|remove)
+        tmp+=( '--no-packages[operate on groups only, not manipulate any packages]' )
+        ;|
+      install|upgrade)
+        tmp+=( $downgrade_opts )
+        ;;
+    esac
+    _arguments : $tmp
+  fi
+}
+
+_dnf5-history() {
+  local -a tmp
+  if (( CURRENT == 2 )); then
+    tmp=(
+      'list:list info about recorded transactions'
+      'info:print detailed about specific transactions'
+      'undo:revert all actions from the specified transaction'
+      'redo:repeat the specified transaction'
+      'rollback:undo all transactions performed after the specified transaction'
+      'store:store the transaction into a directory'
+    )
+    _describe -t subcommands 'subcommand' tmp
+  else
+    case $words[2] in
+      list|info)
+        tmp=( '--reverse[reverse the order of transactions in output]' )
+        ;;
+      undo|rollback|redo)
+        tmp=( '--skip-unavailable[allow skipping impossible actions]' )
+        ;|
+      undo|rollback)
+        tmp+=( $replay_opts )
+        ;;
+      store)
+        tmp=( {-o,--output=}'[directory for storing the transaction (default ./transaction)]: : _directories')
+    esac
+    _arguments : $tmp '2:transaction:( )'
+  fi
+}
+
+_dnf5-mark() {
+  local -a tmp
+  if (( CURRENT == 2 )); then
+    tmp=(
+      'user:mark the package as user-installed'
+      'dependency:mark the package as a dependency'
+      'weak:mark the package as a weak dependency'
+      'group:mark the package as installed by the specified group'
+    )
+    _describe -t subcommands 'subcommand' tmp
+  else
+    tmp=(
+      '--skip-unavailable[skip packages not installed on the system]'
+      '--store=[store the transaction in specified directory]: : _directories'
+    )
+    if [[ $words[2] = group ]]; then
+        tmp+=( '2:group-id: _dnf5_groups -T installed' )
+    fi
+    _arguments : $tmp '*: : _dnf5_packages -T installed'
+  fi
+}
+
+_dnf5-module() {
+  local -a tmp
+  if (( CURRENT == 2 )); then
+    tmp=(
+      'list:list module streams'
+      'info:print details about module streams'
+      'enable:enable module streams'
+      'disable:disable modules including all their streams'
+      "reset:reset module state so it's no longer enabled or disabled"
+    )
+    _describe -t subcommands 'subcommand' tmp
+  elif (( CURRENT == 3 )) && [[ $cur = -* ]]; then
+    case $words[2] in
+      list|info) tmp=( --enabled --disabled ) ;;
+      enable)    tmp=( --skip-broken --skip-unavailable ) ;;
+      *)         tmp=( --skip-unavailable ) ;;
+    esac
+    _wanted options expl 'option' compadd -a tmp
+  else
+    _message 'module spec'
+  fi
+}
+
+_dnf5-offline() {  # also used by the 'system-upgrade' command
+  local -a tmp
+  if (( CURRENT == 2 )); then
+    tmp=(
+      'clean:remove any stored offline transactions and cached packages'
+      'log:list boots during which offline transaction was attempted'
+      'reboot:prepare the system for offline transaction and reboot'
+    )
+    if [[ $cmd = offline ]]; then
+      tmp+=( 'status:show status of the current offline transaction' )
+    else
+      tmp+=( 'download:download all packages needed for upgrade' )
+    fi
+    _describe -t subcommands 'subcommand' tmp && ret=0
+  else
+    case $words[2] in
+      download)
+        _arguments : \
+          '--releasever=[the version to upgrade to]:version number:' \
+          '--no-downgrade:do not install packages older than currently installed' '*: :' && ret=0
+        ;;
+      log)
+        _arguments : \
+          '--number=[show log of transaction specified by number]:transaction number:' '*: :' && ret=0
+        ;;
+      reboot)
+        _wanted options expl 'option' compadd -- --poweroff && ret=0
+        ;;
+    esac
+  fi
+}
+
+_dnf5-repoquery() {
+  local v
+  local -a opts=(
+    $advisory_opts
+    '--arch=[limit results to specified architectures]:list of archs: '
+    '--available[limit results to available packages]'
+    '--disable-modular-filtering[include packages of inactive module streams]'
+    '--duplicates[limit to installed duplicate packages]'
+    '--exactdeps[limit to packages that require capability specified by ==what{requires,depends}]'
+    '--extras[limit to installed packages that are not present in any available repository]'
+    '--file=[limit results to packages which own specified file]:list of files: _sequence _files'
+    '--installed[query installed packages]'
+    '--installonly[limit to installed installonly packages]'
+    '--latest-limit=[limit to latest packages of specified number]:number:'
+    '--leaves[limit to groups of installed packages not required by other installed packages]'
+    '--providers-of=[select packages that provide specified attribute]:attribute:(conflicts depends enhances obsoletes provides recommends requires requires_pre suggests supplement)'
+    '--recent[limit to only recently changed packages]'
+    '--recursive[make --whatrequires/--providers-of work recursively]'
+    '--security[limit to packages in security advisories]'
+    '--srpm[use the corresponding source RPM]'
+    '--unneeded[limit to unneeded installed packages]'
+    '--upgrades[limit to available packages that provide upgrade for installed packages]'
+    '--userinstalled[limit to packages that are not installed as dependencies]'
+    '--whatdepends=[limit to packages that require, enhance, recommend, suggest of supplement specified capability]:list of capability:'
+    '--whatconflicts=[limit to packages that conflicts with specified capabilities]:list of capability: '
+  )
+  for v in enhance obsolete provide recommend require suggest supplement; do
+    opts+=( "--what${v}s=[limit to packages that $v specified capabilities]:list of capability: ")
+  done
+  # mutually exclusive formatting options
+  opts+=(
+    + '(format)'
+    '--conflicts[display capabilities that the package conflicts with]'
+    '--depends[display capabilities that the package depends on, enables, recommends, suggests or supplements]'
+    '--files[show files in the package]'
+    '--requires-pre[display capabilities required to run pre/post scripts of the package]'
+    '--sourcerpm[display source RPM of the package]'
+    '--location[display location of the package]'
+    '--info[show detailed information about the package]'
+    '--changelogs[print the package changelogs]'
+    '(- *)--querytags[list tags recognized by --queryformat]'
+    '--queryformat=[specify output format]:format:'
+  )
+  for v in enhance obsolete provide recommend require suggest supplement; do
+    opts+=( "--${v}s[display capabilities ${v}ed by the package]" )
+  done
+
+  _arguments : '*: : _dnf5_packages -T all' $opts
+}
+
+# dnf commands
+
+_dnf5_commands() {
+  local -a dnf_cmds=(
+    'advisory:manage advisories'
+    'autoremove:remove unneeded packages'
+    'check:check for problems in package database'
+    'check-upgrade:check for available package upgrades'
+    'clean:remove or invalidate cached data'
+    'distro-sync:up/downgrade installed packages to the latest available'
+    'downgrade:downgrade packages'
+    'download:download packages'
+    'environment:manage comps environments'
+    'group:manage comps groups'
+    'history:manage transaction history'
+    'info:provide detailed information about packages'
+    'install:install packages'
+    'leaves:list groups of leaf packages'
+    'list:list installed or available packages'
+    'makecache:generate the metadata cache'
+    'mark:change the reason of an installed package'
+    'module:manage modules'
+    'offline:manage offline transactions'
+    'provides:find what package provides the given value'
+    'reinstall:reinstall packages'
+    'remove:remove packages'
+    'replay:replay stored transactions'
+    'repo:manage repositories'
+    'repoquery:search for packages in repositories'
+    'search:search for packages using keywords'
+    'swap:remove software and install another in the single transaction'
+    'system-upgrade:upgrade the system to a new major release'
+    'upgrade:upgrade packages'
+    'versionlock:protect packages from updates to newer versions'
+  )
+  _describe -t dnf-commands 'dnf command' dnf_cmds
+}
+
+# subcommands and options
+
+_dnf5_subcmds_opts() {
+  local cur=$words[CURRENT] cmd=$words[1] expl ret=1
+  local -a tmp
+  # common options
+  local -a offline_opts=(
+    '(--store)--offline[store the transaction to be performed offline]'
+    '(--offline)--store=[store the transaction in specified directory]: : _directories'
+  )
+  local -a common_opts=(
+    $offline_opts
+    '--allowerasing[allow erasing of installed packages]'
+    '--skip-broken[resolve dependency problems by skipping problematic packages]'
+    "--skip-unavailable[skip packages that can't be synchronized]"
+    '--downloadonly[download packages without executing transaction]'
+  )
+  local -a advisory_opts=(
+    '--advisories=[consider only specified advisories]:list of advisories:'
+    '--advisory-severities=[limit to advisories with specified severity]:severity:_sequence compadd - critical important moderate low none'
+    '--bzs=[limit to advisories that fix specified Bugzilla ID]:list of Bugzilla ID:'
+    '--cves=[limit to advisories that fix specified CVE ID]:list of CVD ID]:'
+    '--security[limit to security advisories]'
+    '--bugfix[limit to bugfix advisories]'
+    '--enhancement[limit to enhancement advisories]'
+    '--newpackage[limit to newpackage advisories]'
+  )
+  local -a downgrade_opts=(
+    '(--no-allow-downgrade)--allow-downgrade[enable downgrade of dependencies]'
+    '(--allow-downgrade)--no-allow-downgrade[disable downgrade of dependencies]'
+  )
+  local -a replay_opts=(
+    '--ignore-extras[not consider extra packages]'
+    '--ignore-installed[mismatches between installed and stored transaction are not errors]'
+  )
+  # Deal with some aliases (not comprehensive)
+  case $cmd in
+    check-updgrade) cmd=check-update;;
+    dg) cmd=downgrade;;
+    dsync) cmd=distro-sync;;
+    grp) cmd=group;;
+    if) cmd=info;;
+    in) cmd=install;;
+    ls) cmd=list;;
+    mc) cmd=makecache;;
+    rei) cmd=reinstall;;
+    rm) cmd=remove ;;
+    rq) cmd=repoquery;;
+    se) cmd=search;;
+    update|up) cmd=upgrade;;
+  esac
+  local curcontext="${curcontext%:*:*}:dnf-${cmd}:"
+
+  case $cmd in
+    advisory|group|history|mark|module|offline|repoquery)
+      _dnf5-$cmd && ret=0
+      ;;
+    system-upgrade)
+      _dnf5-offline && ret=0
+      ;;
+    autoremove)
+      _arguments : $offline_opts && ret=0
+      ;;
+    check)
+      _arguments : \
+        '--dependencies[show missing dependencies and conflicts]' \
+        '--duplicates[show duplicated packages]' \
+        '--obsoleted[show obsoleted packages]' && ret=0
+      ;;
+    check-upgrade)
+      _arguments : \
+        $advisory_opts \
+        '--changelogs[print package changelogs]' \
+        '--minimal[reports the lowest versions of packages that fix advisories]' \
+        '*: : _dnf5_packages -T installed' && ret=0
+      ;;
+    clean)
+      tmp=(
+        'dbcache:remove cache files generated from the repository metadata'
+        'expire-cache:mark the repository metadata expired'
+        'metadata:remove the repository metadata'
+        'packages:remove any cached packages'
+        'all:clean all'
+      )
+      _describe -t cache-types 'cache type' tmp && ret=0
+      ;;
+    distro-sync)
+      _arguments : $common_opts '*: : _dnf5_packages -T installed' && ret=0
+      ;;
+    downgrade)
+      _arguments : \
+        $common_opts $downgrade_opts \
+        '*: : _dnf5_packages -T installed' && ret=0
+      ;;
+    download)
+      _arguments : \
+        '--arch=[limit to packages of specified architecture]:list of architectures:' \
+        '--resolve[resolve and download needed dependencies]' \
+        '--alldeps[with --resolve, also download already installed dependencies]' \
+        '--destdir=[download to the specified directory]: : _directories' \
+        '--srpm[download the source rpm]' \
+        '--url[print the list of URLs where the rpms can be downloaded]' \
+        '*--urlprotocol=[with --url, limit to specified protocols]:protocol:_sequence compadd - http https ftp file' \
+        '*: : _dnf5_packages -T all' && ret=0
+      ;;
+    environment)
+      _arguments : \
+        '--available[show only available environments]' \
+        '--installed[show only installed environments]' \
+        ':subcommand:(list info)' \
+        '*: : _dnf5_environments' && ret=0
+      ;;
+    info|list)
+      _arguments : \
+        '--showduplicates[show all versions of the packages]' \
+        '*: : _dnf5_packages -T all' \
+        + '(type)' \
+        '--installed[list only installed packages]:*: : _dnf5_packages -T installed' \
+        '--available[list only available packages]:*: : _dnf5_packages -T available' \
+        '--extras[list only extras]' \
+        '--obsoletes[list only installed but obsoleted packages]:*: : _dnf5_packages -T installed' \
+        '--recent[list only recently added packages]' \
+        '--upgrades[list only available upgrades of installed packages]:*: : _dnf5_packages -T upgradable' \
+        '--autoremove[list only packages that will be autoremoved]:*: : _dnf5_packages -T installed' &&ret=0
+      ;;
+    install)
+      _arguments : \
+        $common_opts $downgrade_opts $advisory_opts \
+        '*: : _dnf5_packages_or_rpms -T available' && ret=0
+      ;;
+    leaves|makecache)
+      # nothing to complete
+      ;;
+    provides)
+      _files && ret=0
+      ;;
+    reinstall)
+      _arguments : \
+        $common_opts $downgrade_opts \
+        '*: : _dnf5_packages_or_rpms -T installed' && ret=0
+      ;;
+    remove)
+      _arguments : \
+        $offline_opts \
+        '--no-autoremove[not remove dependencies that are no longer used]' \
+        '*: : _dnf5_packages -T installed' && ret=0
+      ;;
+    replay)
+      _arguments : \
+        $replay_opts \
+        ':transaction path:_directories' && ret=0
+      ;;
+    repo)
+      _arguments : \
+        '--all[show info about all repositories]' \
+        '--enabled[show info only about enabled repositories]' \
+        '--disabled[show info only about disabled repositories]' \
+        ':subcommand:(list info)' && ret=0
+      ;;
+    search)
+      _arguments : \
+        '--all[search patterns also inside description and URL fields]' \
+        '--showduplicates[show all versions of packages, not only the latest ones]' \
+        '*:search pattern:' && ret=0
+      ;;
+    swap)
+      _arguments : \
+        $offline_opts \
+        '--allowerasing[allow erasing of installed packages]' \
+        ': : _dnf5_packages -T installed' \
+        ': : _dnf5_packages -T available' && ret=0
+      ;;
+    upgrade)
+      _arguments : \
+        ${common_opts:#--skip-broken*} $downgrade_opts $advisory_opts \
+        '--minimal[upgrade only to the lowest available versions that fix advisories]' \
+        '--destdir=[specify directory into which downloading packages]: : _directories' \
+      '*: : _dnf5_packages_or_rpms -T upgradable' && ret=0
+      ;;
+    versionlock)
+      _arguments : \
+        ':subcommand:(add exclude clear delete list)' \
+        '*: : _dnf5_packages -T all' && ret=0
+      ;;
+  esac
+  return ret
+}
+
+# main completer
+
+_dnf5() {
+  local curcontext="$curcontext" state state_descr line ret=1
+  typeset -A opt_args
+  local -a opts=(
+    '(-y --assumeyes)--assumeno[answer no for all questions]'
+    '--best[try the best available package version]'
+    '(-C --cacheonly)'{-C,--cacheonly}"[run entirely from system cache, don't update cache]"
+    '--comment=[add comment to transaction history]:comment:'
+    '(-c --config)'{-c+,--config=}'[specify configuration file]:config file:_files'
+    '--debugsolver[dump detailed solving results in file ./debugdata]'
+    '*--disable-plugin=[disable specified plugins]:list of plugin names:'
+    '(--repo)*--disable-repo=[disable specified repos]: : _sequence _dnf5_repositories -T enabled'
+    '--dump-main-config[print main configuration values to stdout]'
+    '*--dump-repo-config=[print repository configuration values to stdout]:repi id'
+    '--dump-variables[print variable values to stdout]'
+    '*--enable-plugin=[enable specified plugins]:list of plugin names:'
+    '*--enable-repo=[enable additional repos]: : _sequence _dnf5_repositories -T disabled'
+    '--forcearch=[force the use of the specified arch]:arch:'
+    '(-)'{-h,--help}'[show the help message]'
+    '--installroot=[set install root]: : _directories'
+    '--no-best[do not limit transactions to best candidates]'
+    '--no-docs[do not install documentation]'
+    '--no-gpgcheck[skip checking GPG signatures on packages]'
+    '--no-plugins[disable all plugins]'
+    '(-q --quiet)'{-q,--quiet}'[show just the relevant content]'
+    '--refresh[force refreshing metadata before running the command]'
+    '--releasever=[override distribution release in config files]:release ver:'
+    '(--disablerepo)*--repo=[enable just the specified repo]: : _sequence _dnf5_repositories -T all'
+    '*--repofrompath=[specify additional repos]:repository_label,path_or_url: '
+    '*--setopt=[override option in config file]:repoid.option=value:'
+    '*--setvar=[override DNF5 variable value]'
+    '--show-new-leaves[show newly installed leaf packages]'
+    '--use-host-config[use config files and variables from host system]'
+    '(- *)--version[show dnf version]'
+    '(-y --assumeyes --assumeno)'{-y,--assumeyes}'[answer yes for all questions]'
+    '*'{-x+,--exclude=}'[exclude specified packages from transaction]: : _sequence _dnf5_packages -T all'
+  )
+  _arguments -C -s : $opts ': :->command' '*:: :->cmd_args' && ret=0
+
+  case $state in
+    command) _dnf5_commands && ret=0 ;;
+    cmd_args) _dnf5_subcmds_opts && ret=0 ;;
+  esac
+  return ret
+}
+
+_dnf5 "$@"
diff --git a/zsh/plugins/dnf/dnf.plugin.zsh b/zsh/plugins/dnf/dnf.plugin.zsh
index 653ce7d..29bb64e 100644
--- a/zsh/plugins/dnf/dnf.plugin.zsh
+++ b/zsh/plugins/dnf/dnf.plugin.zsh
@@ -1,15 +1,27 @@
 ## Aliases
+local dnfprog="dnf"
 
-alias dnfl="dnf list"                       # List packages
-alias dnfli="dnf list installed"            # List installed packages
-alias dnfgl="dnf grouplist"                 # List package groups
-alias dnfmc="dnf makecache"                 # Generate metadata cache
-alias dnfp="dnf info"                       # Show package information
-alias dnfs="dnf search"                     # Search package
+# Prefer dnf5 if installed
+command -v dnf5 > /dev/null && dnfprog=dnf5
 
-alias dnfu="sudo dnf upgrade"               # Upgrade package
-alias dnfi="sudo dnf install"               # Install package
-alias dnfgi="sudo dnf groupinstall"         # Install package group
-alias dnfr="sudo dnf remove"                # Remove package
-alias dnfgr="sudo dnf groupremove"          # Remove package group
-alias dnfc="sudo dnf clean all"             # Clean cache
+alias dnfl="${dnfprog} list"                       # List packages
+alias dnfli="${dnfprog} list installed"            # List installed packages
+alias dnfmc="${dnfprog} makecache"                 # Generate metadata cache
+alias dnfp="${dnfprog} info"                       # Show package information
+alias dnfs="${dnfprog} search"                     # Search package
+
+alias dnfu="sudo ${dnfprog} upgrade"               # Upgrade package
+alias dnfi="sudo ${dnfprog} install"               # Install package
+alias dnfr="sudo ${dnfprog} remove"                # Remove package
+alias dnfc="sudo ${dnfprog} clean all"             # Clean cache
+
+# Conditional aliases based on dnfprog value
+if [[ "${dnfprog}" == "dnf5" ]]; then
+    alias dnfgl="${dnfprog} group list"            # List package groups (dnf5)
+    alias dnfgi="sudo ${dnfprog} group install"    # Install package group (dnf5)
+    alias dnfgr="sudo ${dnfprog} group remove"     # Remove package group (dnf5)
+else
+    alias dnfgl="${dnfprog} grouplist"             # List package groups (dnf)
+    alias dnfgi="sudo ${dnfprog} groupinstall"     # Install package group (dnf)
+    alias dnfgr="sudo ${dnfprog} groupremove"      # Remove package group (dnf)
+fi
diff --git a/zsh/plugins/docker-compose/README.md b/zsh/plugins/docker-compose/README.md
index 13f3c2c..5a02904 100644
--- a/zsh/plugins/docker-compose/README.md
+++ b/zsh/plugins/docker-compose/README.md
@@ -2,6 +2,8 @@
 
 This plugin provides completion for [docker-compose](https://docs.docker.com/compose/) as well as some
 aliases for frequent docker-compose commands.
+This plugin chooses automatically between the legacy `docker-compose` command and the modern 
+`docker compose` subcommand, preferring `docker-compose` when both are available.
 
 To use it, add docker-compose to the plugins array of your zshrc file:
 
@@ -11,22 +13,24 @@ plugins=(... docker-compose)
 
 ## Aliases
 
-| Alias     | Command                        | Description                                                      |
-|-----------|--------------------------------|------------------------------------------------------------------|
-| dco       | `docker-compose`               | Docker-compose main command                                      |
-| dcb       | `docker-compose build`         | Build containers                                                 |
-| dce       | `docker-compose exec`          | Execute command inside a container                               |
-| dcps      | `docker-compose ps`            | List containers                                                  |
-| dcrestart | `docker-compose restart`       | Restart container                                                |
-| dcrm      | `docker-compose rm`            | Remove container                                                 |
-| dcr       | `docker-compose run`           | Run a command in container                                       |
-| dcstop    | `docker-compose stop`          | Stop a container                                                 |
-| dcup      | `docker-compose up`            | Build, (re)create, start, and attach to containers for a service |
-| dcupb     | `docker-compose up --build`    | Same as `dcup`, but build images before starting containers      |
-| dcupd     | `docker-compose up -d`         | Same as `dcup`, but starts as daemon                             |
-| dcdn      | `docker-compose down`          | Stop and remove containers                                       |
-| dcl       | `docker-compose logs`          | Show logs of container                                           |
-| dclf      | `docker-compose logs -f`       | Show logs and follow output                                      |
-| dcpull    | `docker-compose pull`          | Pull image of a service                                          |
-| dcstart   | `docker-compose start`         | Start a container                                                |
-| dck       | `docker-compose kill`          | Kills containers                                                 |
+| Alias     | Command                          | Description                                                                      |
+|-----------|----------------------------------|----------------------------------------------------------------------------------|
+| dco       | `docker-compose`                 | Docker-compose main command                                                      |
+| dcb       | `docker-compose build`           | Build containers                                                                 |
+| dce       | `docker-compose exec`            | Execute command inside a container                                               |
+| dcps      | `docker-compose ps`              | List containers                                                                  |
+| dcrestart | `docker-compose restart`         | Restart container                                                                |
+| dcrm      | `docker-compose rm`              | Remove container                                                                 |
+| dcr       | `docker-compose run`             | Run a command in container                                                       |
+| dcstop    | `docker-compose stop`            | Stop a container                                                                 |
+| dcup      | `docker-compose up`              | Build, (re)create, start, and attach to containers for a service                 |
+| dcupb     | `docker-compose up --build`      | Same as `dcup`, but build images before starting containers                      |
+| dcupd     | `docker-compose up -d`           | Same as `dcup`, but starts as daemon                                             |
+| dcupdb    | `docker-compose up -d --build`   | Same as `dcup`, but build images before starting containers and starts as daemon |
+| dcdn      | `docker-compose down`            | Stop and remove containers                                                       |
+| dcl       | `docker-compose logs`            | Show logs of container                                                           |
+| dclf      | `docker-compose logs -f`         | Show logs and follow output                                                      |
+| dclF      | `docker-compose logs -f --tail0` | Just follow recent logs                                                          |
+| dcpull    | `docker-compose pull`            | Pull image of a service                                                          |
+| dcstart   | `docker-compose start`           | Start a container                                                                |
+| dck       | `docker-compose kill`            | Kills containers                                                                 |
diff --git a/zsh/plugins/docker-compose/_docker-compose b/zsh/plugins/docker-compose/_docker-compose
index c6b7335..d0ebfe5 100644
--- a/zsh/plugins/docker-compose/_docker-compose
+++ b/zsh/plugins/docker-compose/_docker-compose
@@ -128,7 +128,7 @@ __docker-compose_subcommand() {
                 '--resolve-image-digests[Pin image tags to digests.]' \
                 '--services[Print the service names, one per line.]' \
                 '--volumes[Print the volume names, one per line.]' \
-                '--hash[Print the service config hash, one per line. Set "service1,service2" for a list of specified services.]' \ && ret=0
+                '--hash[Print the service config hash, one per line. Set "service1,service2" for a list of specified services.]' && ret=0
             ;;
         (create)
             _arguments \
diff --git a/zsh/plugins/docker-compose/docker-compose.plugin.zsh b/zsh/plugins/docker-compose/docker-compose.plugin.zsh
index b8a4b06..7863c4f 100644
--- a/zsh/plugins/docker-compose/docker-compose.plugin.zsh
+++ b/zsh/plugins/docker-compose/docker-compose.plugin.zsh
@@ -1,5 +1,8 @@
-# support Compose v2 as docker CLI plugin
-(( ${+commands[docker-compose]} )) && dccmd='docker-compose' || dccmd='docker compose'
+# Support Compose v2 as docker CLI plugin
+#
+# This tests that the (old) docker-compose command is in $PATH and that
+# it resolves to an existing executable file if it's a symlink.
+[[ -x "${commands[docker-compose]:A}" ]] && dccmd='docker-compose' || dccmd='docker compose'
 
 alias dco="$dccmd"
 alias dcb="$dccmd build"
@@ -12,9 +15,11 @@ alias dcstop="$dccmd stop"
 alias dcup="$dccmd up"
 alias dcupb="$dccmd up --build"
 alias dcupd="$dccmd up -d"
+alias dcupdb="$dccmd up -d --build"
 alias dcdn="$dccmd down"
 alias dcl="$dccmd logs"
 alias dclf="$dccmd logs -f"
+alias dclF="$dccmd logs -f --tail 0"
 alias dcpull="$dccmd pull"
 alias dcstart="$dccmd start"
 alias dck="$dccmd kill"
diff --git a/zsh/plugins/docker-machine/README.md b/zsh/plugins/docker-machine/README.md
deleted file mode 100644
index 308a6cf..0000000
--- a/zsh/plugins/docker-machine/README.md
+++ /dev/null
@@ -1,19 +0,0 @@
-# docker-machine plugin for oh my zsh
-
-### Usage
-
-#### docker-vm
-Will create a docker-machine with the name "dev" (required only once)
-To create a second machine call "docker-vm foobar" or pass any other name
-
-#### docker-up
-This will start your "dev" docker-machine (if necessary) and set it as the active one
-To start a named machine use "docker-up foobar"
-
-#### docker-switch dev
-Use this to activate a running docker-machine (or to switch between multiple machines)
-You need to call either this or docker-up when opening a new terminal
-
-#### docker-stop
-This will stop your "dev" docker-machine
-To stop a named machine use "docker-stop foobar"
\ No newline at end of file
diff --git a/zsh/plugins/docker-machine/_docker-machine b/zsh/plugins/docker-machine/_docker-machine
deleted file mode 100644
index fbd36d7..0000000
--- a/zsh/plugins/docker-machine/_docker-machine
+++ /dev/null
@@ -1,359 +0,0 @@
-#compdef docker-machine
-# Description
-# -----------
-#  zsh completion for docker-machine
-#  https://github.com/leonhartX/docker-machine-zsh-completion
-# -------------------------------------------------------------------------
-# Version
-# -------
-#  0.1.1
-# -------------------------------------------------------------------------
-# Authors
-# -------
-#  * Ke Xu <leonhartx.k@gmail.com>
-# -------------------------------------------------------------------------
-# Inspiration
-# -----------
-#  * @sdurrheimer docker-compose-zsh-completion https://github.com/sdurrheimer/docker-compose-zsh-completion
-#  * @ilkka _docker-machine
-
-
-__docker-machine_get_hosts() {
-    [[ $PREFIX = -* ]] && return 1
-    local state
-    declare -a hosts
-    state=$1; shift
-    if [[ $state != all ]]; then
-        hosts=(${(f)"$(_call_program commands docker-machine ls -q --filter state=$state)"})
-    else
-        hosts=(${(f)"$(_call_program commands docker-machine ls -q)"})
-    fi
-    _describe 'host' hosts "$@" && ret=0
-    return ret
-}
-
-__docker-machine_hosts_with_state() {
-    declare -a hosts
-    hosts=(${(f)"$(_call_program commands docker-machine ls -f '{{.Name}}\:{{.DriverName}}\({{.State}}\)\ {{.URL}}')"})
-    _describe 'host' hosts
-}
-
-__docker-machine_hosts_all() {
-    __docker-machine_get_hosts all "$@"
-}
-
-__docker-machine_hosts_running() {
-    __docker-machine_get_hosts Running "$@"
-}
-
-__docker-machine_get_swarm() {
-    declare -a swarms
-    swarms=(${(f)"$(_call_program commands docker-machine ls -f {{.Swarm}} | awk '{print $1}')"})
-    _describe 'swarm' swarms
-}
-
-__docker-machine_hosts_and_files() {
-    _alternative "hosts:host:__docker-machine_hosts_all -qS ':'" 'files:files:_path_files'
-}
-
-__docker-machine_filters() {
-    [[ $PREFIX = -* ]] && return 1
-    integer ret=1
-
-    if compset -P '*='; then
-        case "${${words[-1]%=*}#*=}" in
-            (driver)
-                _describe -t driver-filter-opts "driver filter" opts_driver && ret=0
-                ;;
-            (swarm)
-                __docker-machine_get_swarm && ret=0
-                ;;
-            (state)
-                opts_state=('Running' 'Paused' 'Saved' 'Stopped' 'Stopping' 'Starting' 'Error')
-                _describe -t state-filter-opts "state filter" opts_state && ret=0
-                ;;
-            (name)
-                __docker-machine_hosts_all && ret=0
-                ;;
-            (label)
-                _message 'label' && ret=0
-                ;;
-            *)
-                _message 'value' && ret=0
-                ;;
-        esac
-    else
-        opts=('driver' 'swarm' 'state' 'name' 'label')
-        _describe -t filter-opts "filter" opts -qS "=" && ret=0
-    fi
-    return ret
-}
-
-__get_swarm_discovery() {
-    declare -a masters services
-    local service
-    services=()
-    masters=($(docker-machine ls -f {{.Swarm}} |grep '(master)' |awk '{print $1}'))
-    for master in $masters; do
-         service=${${${(f)"$(_call_program commands docker-machine inspect -f '{{.HostOptions.SwarmOptions.Discovery}}:{{.Name}}' $master)"}/:/\\:}}
-         services=($services $service)
-    done
-    _describe -t services "swarm service" services && ret=0
-    return ret
-}
-
-__get_create_argument() {
-    typeset -g docker_machine_driver
-    if [[ CURRENT -le 2 ]]; then
-        docker_machine_driver="none"
-    elif [[ CURRENT > 2 && $words[CURRENT-2] = '-d' || $words[CURRENT-2] = '--driver' ]]; then
-        docker_machine_driver=$words[CURRENT-1]
-    elif [[ $words[CURRENT-1] =~ '^(-d|--driver)=' ]]; then
-        docker_machine_driver=${${words[CURRENT-1]}/*=/}
-    fi
-    local driver_opt_cmd
-    local -a opts_provider opts_common opts_read_argument
-    opts_read_argument=(
-        ": :->argument"
-    )
-    opts_common=(
-        $opts_help \
-        '(--driver -d)'{--driver=,-d=}'[Driver to create machine with]:dirver:->driver-option' \
-        '--engine-install-url=[Custom URL to use for engine installation]:url' \
-        '*--engine-opt=[Specify arbitrary flags to include with the created engine in the form flag=value]:flag' \
-        '*--engine-insecure-registry=[Specify insecure registries to allow with the created engine]:registry' \
-        '*--engine-registry-mirror=[Specify registry mirrors to use]:mirror' \
-        '*--engine-label=[Specify labels for the created engine]:label' \
-        '--engine-storage-driver=[Specify a storage driver to use with the engine]:storage-driver:->storage-driver-option' \
-        '*--engine-env=[Specify environment variables to set in the engine]:environment' \
-        '--swarm[Configure Machine with Swarm]' \
-        '--swarm-image=[Specify Docker image to use for Swarm]:image' \
-        '--swarm-master[Configure Machine to be a Swarm master]' \
-        '--swarm-discovery=[Discovery service to use with Swarm]:service:->swarm-service' \
-        '--swarm-strategy=[Define a default scheduling strategy for Swarm]:strategy:(spread binpack random)' \
-        '*--swarm-opt=[Define arbitrary flags for swarm]:flag' \
-        '*--swarm-join-opt=[Define arbitrary flags for Swarm join]:flag' \
-        '--swarm-host=[ip/socket to listen on for Swarm master]:host' \
-        '--swarm-addr=[addr to advertise for Swarm (default: detect and use the machine IP)]:address' \
-        '--swarm-experimental[Enable Swarm experimental features]' \
-        '*--tls-san=[Support extra SANs for TLS certs]:option'
-    )
-    driver_opt_cmd="docker-machine create -d $docker_machine_driver | grep $docker_machine_driver | sed -e 's/\(--.*\)\ *\[\1[^]]*\]/*\1/g' -e 's/\(\[[^]]*\)/\\\\\\1\\\\/g' -e 's/\".*\"\(.*\)/\1/g' | awk '{printf \"%s[\", \$1; for(i=2;i<=NF;i++) {printf \"%s \", \$i}; print \"]\"}'"
-    if [[ $docker_machine_driver != "none" ]]; then
-        opts_provider=(${(f)"$(_call_program commands $driver_opt_cmd)"})
-        _arguments \
-            $opts_provider \
-            $opts_read_argument \
-            $opts_common && ret=0
-    else
-        _arguments $opts_common && ret=0
-    fi
-    case $state in
-        (driver-option)
-            _describe -t driver-option "driver" opts_driver && ret=0
-            ;;
-        (storage-driver-option)
-            _describe -t storage-driver-option "storage driver" opts_storage_driver && ret=0
-            ;;
-        (swarm-service)
-            __get_swarm_discovery && ret=0
-            ;;
-        (argument)
-            ret=0
-            ;;
-    esac
-    return ret
-}
-
-
-__docker-machine_subcommand() {
-    local -a opts_help
-    opts_help=("(- :)--help[Print usage]")
-    local -a opts_only_host opts_driver opts_storage_driver opts_state
-    opts_only_host=(
-        "$opts_help"
-        "*:host:__docker-machine_hosts_all"
-    )
-    opts_driver=('amazonec2' 'azure' 'digitalocean' 'exoscale' 'generic' 'google' 'hyperv' 'none' 'openstack' 'rackspace' 'softlayer' 'virtualbox' 'vmwarefusion' 'vmwarevcloudair' 'vmwarevsphere')
-    opts_storage_driver=('overlay' 'aufs' 'btrfs' 'devicemapper' 'vfs' 'zfs')
-    integer ret=1
-
-    case "$words[1]" in
-        (active)
-            _arguments \
-                $opts_help \
-                '(--timeout -t)'{--timeout=,-t=}'[Timeout in seconds, default to 10s]:seconds' && ret=0
-            ;;
-        (config)
-            _arguments \
-                $opts_help \
-                '--swarm[Display the Swarm config instead of the Docker daemon]' \
-                "*:host:__docker-machine_hosts_all" && ret=0
-            ;;
-        (create)
-            __get_create_argument
-           ;;
-        (env)
-            _arguments \
-                $opts_help \
-                '--swarm[Display the Swarm config instead of the Docker daemon]' \
-                '--shell=[Force environment to be configured for a specified shell: \[fish, cmd, powershell\], default is auto-detect]:shell' \
-                '(--unset -u)'{--unset,-u}'[Unset variables instead of setting them]' \
-                '--no-proxy[Add machine IP to NO_PROXY environment variable]' \
-                '*:host:__docker-machine_hosts_running' && ret=0
-            ;;
-        (help)
-            _arguments ':subcommand:__docker-machine_commands' && ret=0
-            ;;
-        (inspect)
-            _arguments \
-                $opts_help \
-                '(--format -f)'{--format=,-f=}'[Format the output using the given go template]:template' \
-                '*:host:__docker-machine_hosts_all' && ret=0
-            ;;
-        (ip)
-            _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_running' && ret=0
-            ;;
-        (kill)
-             _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_with_state' && ret=0
-            ;;
-        (ls)
-            _arguments \
-                $opts_help \
-                '(--quiet -q)'{--quiet,-q}'[Enable quiet mode]' \
-                '*--filter=[Filter output based on conditions provided]:filter:->filter-options' \
-                '(--timeout -t)'{--timeout=,-t=}'[Timeout in seconds, default to 10s]:seconds' \
-                '(--format -f)'{--format=,-f=}'[Pretty-print machines using a Go template]:template' && ret=0
-            case $state in
-                (filter-options)
-                    __docker-machine_filters && ret=0
-                    ;;
-            esac
-            ;;
-        (provision)
-            _arguments $opts_only_host && ret=0
-            ;;
-        (regenerate-certs)
-            _arguments \
-                $opts_help \
-                '(--force -f)'{--force,-f}'[Force rebuild and do not prompt]' \
-                '*:host:__docker-machine_hosts_all' && ret=0
-            ;;
-        (restart)
-            _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_with_state' && ret=0
-            ;;
-        (rm)
-            _arguments \
-                $opts_help \
-                '(--force -f)'{--force,-f}'[Remove local configuration even if machine cannot be removed, also implies an automatic yes (`-y`)]' \
-                '-y[Assumes automatic yes to proceed with remove, without prompting further user confirmation]' \
-                '*:host:__docker-machine_hosts_with_state' && ret=0
-            ;;
-        (scp)
-            _arguments \
-                $opts_help \
-                '(--recursive -r)'{--recursive,-r}'[Copy files recursively (required to copy directories))]' \
-                '*:files:__docker-machine_hosts_and_files' && ret=0
-            ;;
-        (ssh)
-            _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_running' && ret=0
-            ;;
-        (start)
-            _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_with_state' && ret=0
-            ;;
-        (status)
-            _arguments $opts_only_host && ret=0
-            ;;
-        (stop)
-            _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_with_state' && ret=0
-            ;;
-        (upgrade)
-            _arguments $opts_only_host && ret=0
-            ;;
-        (url)
-            _arguments \
-                $opts_help \
-                '*:host:__docker-machine_hosts_running' && ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-
-__docker-machine_commands() {
-    local cache_policy
-
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __docker-machine_caching_policy
-    fi
-
-    if ( [[ ${+_docker_machine_subcommands} -eq 0 ]] || _cache_invalid docker_machine_subcommands) \
-        && ! _retrieve_cache docker_machine_subcommands;
-    then
-        local -a lines
-        lines=(${(f)"$(_call_program commands docker-machine 2>&1)"})
-        _docker_machine_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)  *]}]}## #}/$'\t'##/:})
-        (( $#_docker_machine_subcommands > 0 )) && _store_cache docker_machine_subcommands _docker_machine_subcommands
-    fi
-    _describe -t docker-machine-commands "docker-machine command" _docker_machine_subcommands
-}
-
-__docker-machine_caching_policy() {
-    oldp=( "$1"(Nmh+1) )
-    (( $#oldp ))
-}
-
-_docker-machine() {
-    if [[ $service != docker-machine ]]; then
-        _call_function - _$service
-        return
-    fi
-
-    local curcontext="$curcontext" state line
-    integer ret=1
-    typeset -A opt_args
-
-    _arguments -C \
-        "(- :)"{-h,--help}"[Show help]" \
-        "(-D --debug)"{-D,--debug}"[Enable debug mode]" \
-        '(-s --storage-path)'{-s,--storage-path}'[Configures storage path]:file:_files' \
-        '--tls-ca-cert[CA to verify remotes against]:file:_files' \
-        '--tls-ca-key[Private key to generate certificates]:file:_files' \
-        '--tls-client-cert[Client cert to use for TLS]:file:_files' \
-        '--tls-client-key[Private key used in client TLS auth]:file:_files' \
-        '--github-api-token[Token to use for requests to the Github API]' \
-        '--native-ssh[Use the native (Go-based) SSH implementation.]' \
-        '--bugsnag-api-token[BugSnag API token for crash reporting]' \
-        '(- :)'{-v,--version}'[Print the version]' \
-        "(-): :->command" \
-        "(-)*:: :->option-or-argument" && ret=0
-
-    case $state in
-        (command)
-            __docker-machine_commands && ret=0
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*:*}:docker-machine-$words[1]:
-            __docker-machine_subcommand && ret=0
-            ret=0
-            ;;
-    esac
-
-    return ret
-}
-
-_docker-machine "$@"
diff --git a/zsh/plugins/docker-machine/docker-machine.plugin.zsh b/zsh/plugins/docker-machine/docker-machine.plugin.zsh
deleted file mode 100644
index 235d90e..0000000
--- a/zsh/plugins/docker-machine/docker-machine.plugin.zsh
+++ /dev/null
@@ -1,33 +0,0 @@
-DEFAULT_MACHINE="default"
-
-docker-up() {
-    if [ -z "$1" ]
-    then
-        docker-machine start "${DEFAULT_MACHINE}"
-        eval $(docker-machine env "${DEFAULT_MACHINE}")
-    else
-        docker-machine start $1
-        eval $(docker-machine env $1)
-    fi
-    echo $DOCKER_HOST
-}
-docker-stop() {
-    if [ -z "$1" ]
-    then
-        docker-machine stop "${DEFAULT_MACHINE}"
-    else
-        docker-machine stop $1
-    fi
-}
-docker-switch() {
-    eval $(docker-machine env $1)
-    echo $DOCKER_HOST
-}
-docker-vm() {
-    if [ -z "$1" ]
-    then
-        docker-machine create -d virtualbox --virtualbox-disk-size 20000 --virtualbox-memory 4096 --virtualbox-cpu-count 2 "${DEFAULT_MACHINE}"
-    else
-        docker-machine create -d virtualbox --virtualbox-disk-size 20000 --virtualbox-memory 4096 --virtualbox-cpu-count 2 $1
-    fi
-}
\ No newline at end of file
diff --git a/zsh/plugins/docker/README.md b/zsh/plugins/docker/README.md
index 606690f..79b42bd 100644
--- a/zsh/plugins/docker/README.md
+++ b/zsh/plugins/docker/README.md
@@ -13,18 +13,15 @@ https://github.com/docker/cli/blob/master/contrib/completion/zsh/_docker
 
 ## Settings
 
-By default, the completion doesn't allow option-stacking, meaning if you try to
-complete `docker run -it <TAB>` it won't work, because you're _stacking_ the
-`-i` and `-t` options.
+By default, the completion doesn't allow option-stacking, meaning if you try to complete
+`docker run -it <TAB>` it won't work, because you're _stacking_ the `-i` and `-t` options.
 
-[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding
-the lines below to your zshrc file**, but be aware of the side effects:
+[You can enable it](https://github.com/docker/cli/commit/b10fb43048) by **adding the lines below to your zshrc
+file**, but be aware of the side effects:
 
-> This enables Zsh to understand commands like `docker run -it
-> ubuntu`. However, by enabling this, this also makes Zsh complete
-> `docker run -u<tab>` with `docker run -uapprox` which is not valid. The
-> users have to put the space or the equal sign themselves before trying
-> to complete.
+> This enables Zsh to understand commands like `docker run -it ubuntu`. However, by enabling this, this also
+> makes Zsh complete `docker run -u<tab>` with `docker run -uapprox` which is not valid. The users have to put
+> the space or the equal sign themselves before trying to complete.
 >
 > Therefore, this behavior is disabled by default. To enable it:
 >
@@ -33,41 +30,60 @@ the lines below to your zshrc file**, but be aware of the side effects:
 > zstyle ':completion:*:*:docker-*:*' option-stacking yes
 > ```
 
+### Use old-style completion
+
+If the current completion does not work well for you, you can enable legacy completion instead with the
+following setting. See https://github.com/ohmyzsh/ohmyzsh/issues/11789 for more information.
+
+```zsh
+zstyle ':omz:plugins:docker' legacy-completion yes
+```
+
+### For Podman's Docker wrapper users
+
+If you use Podman's Docker wrapper, you need to enable legacy completion. See above section.
+
 ## Aliases
 
-| Alias   | Command                     | Description                                                                              |
-| :------ | :-------------------------- | :--------------------------------------------------------------------------------------- |
-| dbl     | `docker build`              | Build an image from a Dockerfile                                                         |
-| dcin    | `docker container inspect`  | Display detailed information on one or more containers                                   |
-| dlo     | `docker container logs`     | Fetch the logs of a docker container                                                     |
-| dcls     | `docker container ls`       | List all the running docker containers                                                   |
-| dclsa    | `docker container ls -a`    | List all running and stopped containers                                                  |
-| dpo     | `docker container port`     | List port mappings or a specific mapping for the container                               |
-| dpu     | `docker pull`               | Pull an image or a repository from a registry                                            |
-| dr      | `docker container run`      | Create a new container and start it using the specified command                          |
-| drit    | `docker container run -it`  | Create a new container and start it in an interactive shell                              |
-| drm     | `docker container rm`       | Remove the specified container(s)                                                        |
-| drm!    | `docker container rm -f`    | Force the removal of a running container (uses SIGKILL)                                  |
-| dst     | `docker container start`    | Start one or more stopped containers                                                     |
-| dstp    | `docker container stop`     | Stop one or more running containers                                                      |
-| dtop    | `docker top`                | Display the running processes of a container                                             |
-| dxc     | `docker container exec`     | Run a new command in a running container                                                 |
-| dxcit   | `docker container exec -it` | Run a new command in a running container in an interactive shell                         |
-|         |                             | **Docker Images**                                                                        |
-| dib     | `docker image build`        | Build an image from a Dockerfile (same as docker build)                                  |
-| dii     | `docker image inspect`      | Display detailed information on one or more images                                       |
-| dils    | `docker image ls`           | List docker images                                                                       |
-| dipu     | `docker image push`         | Push an image or repository to a remote registry                                         |
-| dirm    | `docker image rm`           | Remove one or more images                                                                |
-| dit     | `docker image tag`          | Add a name and tag to a particular image                                                 |
-|         |                             | **Docker Network**                                                                       |
-| dnc     | `docker network create`     | Create a new network                                                                     |
-| dncn    | `docker network connect`    | Connect a container to a network                                                         |
-| dndcn   | `docker network disconnect` | Disconnect a container from a network                                                    |
-| dni     | `docker network inspect`    | Return information about one or more networks                                            |
-| dnls    | `docker network ls`         | List all networks the engine daemon knows about, including those spanning multiple hosts |
-| dnrm    | `docker network rm`         | Remove one or more networks                                                              |
-|         |                             | **Docker Volume**                                                                        |
-| dvi     | `docker volume inspect`     | Display detailed information about one or more volumes                                   |
-| dvls    | `docker volume ls`          | List all the volumes known to  docker                                                    |
-| dvprune | `docker volume prune`       | Cleanup dangling volumes                                                                 |
+| Alias   | Command                       | Description                                                                              |
+| :------ | :---------------------------- | :--------------------------------------------------------------------------------------- |
+| dbl     | `docker build`                | Build an image from a Dockerfile                                                         |
+| dcin    | `docker container inspect`    | Display detailed information on one or more containers                                   |
+| dcls    | `docker container ls`         | List all the running docker containers                                                   |
+| dclsa   | `docker container ls -a`      | List all running and stopped containers                                                  |
+| dcprune | `docker container prune`      | Remove all stopped containers                                                            |
+| dib     | `docker image build`          | Build an image from a Dockerfile (same as docker build)                                  |
+| dii     | `docker image inspect`        | Display detailed information on one or more images                                       |
+| dils    | `docker image ls`             | List docker images                                                                       |
+| dipu    | `docker image push`           | Push an image or repository to a remote registry                                         |
+| dipru   | `docker image prune -a`       | Remove all images not referenced by any container                                        |
+| dirm    | `docker image rm`             | Remove one or more images                                                                |
+| dit     | `docker image tag`            | Add a name and tag to a particular image                                                 |
+| dlo     | `docker container logs`       | Fetch the logs of a docker container                                                     |
+| dnc     | `docker network create`       | Create a new network                                                                     |
+| dncn    | `docker network connect`      | Connect a container to a network                                                         |
+| dndcn   | `docker network disconnect`   | Disconnect a container from a network                                                    |
+| dni     | `docker network inspect`      | Return information about one or more networks                                            |
+| dnls    | `docker network ls`           | List all networks the engine daemon knows about, including those spanning multiple hosts |
+| dnprune | `docker network prune`        | Remove all unused networks                                                               |
+| dnrm    | `docker network rm`           | Remove one or more networks                                                              |
+| dpo     | `docker container port`       | List port mappings or a specific mapping for the container                               |
+| dps     | `docker ps`                   | List all the running docker containers                                                   |
+| dpsa    | `docker ps -a`                | List all running and stopped containers                                                  |
+| dpu     | `docker pull`                 | Pull an image or a repository from a registry                                            |
+| dr      | `docker container run`        | Create a new container and start it using the specified command                          |
+| drit    | `docker container run -it`    | Create a new container and start it in an interactive shell                              |
+| drm     | `docker container rm`         | Remove the specified container(s)                                                        |
+| drm!    | `docker container rm -f`      | Force the removal of a running container (uses SIGKILL)                                  |
+| dsprune | `docker system prune`         | Remove unused data                                                                       |
+| dst     | `docker container start`      | Start one or more stopped containers                                                     |
+| drs     | `docker container restart`    | Restart one or more containers                                                           |
+| dsta    | `docker stop $(docker ps -q)` | Stop all running containers                                                              |
+| dstp    | `docker container stop`       | Stop one or more running containers                                                      |
+| dsts    | `docker stats`                | Display real-time streaming statistics for containers                                                    |
+| dtop    | `docker top`                  | Display the running processes of a container                                             |
+| dvi     | `docker volume inspect`       | Display detailed information about one or more volumes                                   |
+| dvls    | `docker volume ls`            | List all the volumes known to docker                                                     |
+| dvprune | `docker volume prune`         | Cleanup dangling volumes                                                                 |
+| dxc     | `docker container exec`       | Run a new command in a running container                                                 |
+| dxcit   | `docker container exec -it`   | Run a new command in a running container in an interactive shell                         |
diff --git a/zsh/plugins/docker/_docker b/zsh/plugins/docker/completions/_docker
similarity index 97%
rename from zsh/plugins/docker/_docker
rename to zsh/plugins/docker/completions/_docker
index 8ee35ab..466b09d 100644
--- a/zsh/plugins/docker/_docker
+++ b/zsh/plugins/docker/completions/_docker
@@ -567,7 +567,7 @@ __docker_container_commands() {
         "cp:Copy files/folders between a container and the local filesystem"
         "create:Create a new container"
         "diff:Inspect changes on a container's filesystem"
-        "exec:Run a command in a running container"
+        "exec:Execute a command in a running container"
         "export:Export a container's filesystem as a tar archive"
         "inspect:Display detailed information on one or more containers"
         "kill:Kill one or more running containers"
@@ -579,7 +579,7 @@ __docker_container_commands() {
         "rename:Rename a container"
         "restart:Restart one or more containers"
         "rm:Remove one or more containers"
-        "run:Run a command in a new container"
+        "run:Create and run a new container from an image"
         "start:Start one or more stopped containers"
         "stats:Display a live stream of container(s) resource usage statistics"
         "stop:Stop one or more running containers"
@@ -602,6 +602,7 @@ __docker_container_subcommand() {
     opts_create_run=(
         "($help -a --attach)"{-a=,--attach=}"[Attach to stdin, stdout or stderr]:device:(STDIN STDOUT STDERR)"
         "($help)*--add-host=[Add a custom host-to-IP mapping]:host\:ip mapping: "
+        "($help)*--annotation=[Add an annotation to the container (passed through to the OCI runtime)]:annotations: "
         "($help)*--blkio-weight-device=[Block IO (relative device weight)]:device:Block IO weight: "
         "($help)*--cap-add=[Add Linux capabilities]:capability: "
         "($help)*--cap-drop=[Drop Linux capabilities]:capability: "
@@ -650,6 +651,7 @@ __docker_container_subcommand() {
         "($help)*"{-p=,--publish=}"[Expose a container's port to the host]:port:_ports"
         "($help)--pid=[PID namespace to use]:PID namespace:__docker_complete_pid"
         "($help)--privileged[Give extended privileges to this container]"
+        "($help -q --quiet)"{-q,--quiet}"[Suppress the pull output]"
         "($help)--read-only[Mount the container's root filesystem as read only]"
         "($help)*--security-opt=[Security options]:security option: "
         "($help)*--shm-size=[Size of '/dev/shm' (format is '<number><unit>')]:shm size: "
@@ -661,7 +663,7 @@ __docker_container_subcommand() {
         "($help)*--ulimit=[ulimit options]:ulimit: "
         "($help)--userns=[Container user namespace]:user namespace:(host)"
         "($help)--tmpfs[mount tmpfs]"
-        "($help)*-v[Bind mount a volume]:volume: "
+        "($help)*-v[Bind mount a volume]:volume:_directories -W / -P '/' -S '\:' -r '/ '"
         "($help)--volume-driver=[Optional volume driver for the container]:volume driver:(local)"
         "($help)*--volumes-from=[Mount volumes from the specified container]:volume: "
         "($help -w --workdir)"{-w=,--workdir=}"[Working directory inside the container]:directory:_directories"
@@ -802,7 +804,7 @@ __docker_container_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all containers]" \
                 "($help)--before=[Show only container created before...]:containers:__docker_complete_containers" \
                 "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_ps_filters" \
-                "($help)--format=[Pretty-print containers using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -l --latest)"{-l,--latest}"[Show only the latest created container]" \
                 "($help -n --last)"{-n=,--last=}"[Show n last created containers (includes all states)]:n:(1 5 10 25 50)" \
                 "($help)--no-trunc[Do not truncate output]" \
@@ -907,7 +909,7 @@ __docker_container_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help -a --all)"{-a,--all}"[Show all containers (default shows just running)]" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help)--no-stream[Disable streaming stats and only pull the first result]" \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -)*:containers:__docker_complete_running_containers" && ret=0
@@ -973,8 +975,8 @@ __docker_image_commands() {
         "load:Load an image from a tar archive or STDIN"
         "ls:List images"
         "prune:Remove unused images"
-        "pull:Pull an image or a repository from a registry"
-        "push:Push an image or a repository to a registry"
+        "pull:Download an image from a registry"
+        "push:Upload an image to a registry"
         "rm:Remove one or more images"
         "save:Save one or more images to a tar archive (streamed to STDOUT by default)"
         "tag:Tag an image into a repository"
@@ -1060,7 +1062,7 @@ __docker_image_subcommand() {
                 "($help -a --all)"{-a,--all}"[Show all images]" \
                 "($help)--digests[Show digests]" \
                 "($help)*"{-f=,--filter=}"[Filter values]:filter:__docker_complete_images_filters" \
-                "($help)--format=[Pretty-print images using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help)--no-trunc[Do not truncate output]" \
                 "($help -q --quiet)"{-q,--quiet}"[Only show image IDs]" \
                 "($help -): :__docker_complete_repositories" && ret=0
@@ -1082,7 +1084,7 @@ __docker_image_subcommand() {
         (push)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help -a --all-tags)"{-a,--all-tags}"[Push all tagged images in the repository]" \
+                "($help -a --all-tags)"{-a,--all-tags}"[Push all tags of an image to the repository]" \
                 "($help)--disable-content-trust[Skip image signing]" \
                 "($help -): :__docker_complete_images" && ret=0
             ;;
@@ -1292,7 +1294,7 @@ __docker_network_subcommand() {
                 $opts_help \
                 "($help)--no-trunc[Do not truncate the output]" \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_network_complete_ls_filters" \
-                "($help)--format=[Pretty-print networks using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display network IDs]" && ret=0
             ;;
         (prune)
@@ -2050,7 +2052,7 @@ __docker_service_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_service_complete_ls_filters" \
-                "($help)--format=[Pretty-print services using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" && ret=0
             ;;
         (rm|remove)
@@ -2253,7 +2255,7 @@ __docker_stack_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Filter output based on conditions provided]:filter:__docker_stack_complete_services_filters" \
-                "($help)--format=[Pretty-print services using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display IDs]" \
                 "($help -):stack:__docker_complete_stacks" && ret=0
             ;;
@@ -2520,12 +2522,14 @@ __docker_volume_subcommand() {
             _arguments $(__docker_arguments) \
                 $opts_help \
                 "($help)*"{-f=,--filter=}"[Provide filter values]:filter:__docker_volume_complete_ls_filters" \
-                "($help)--format=[Pretty-print volumes using a Go template]:template: " \
+                "($help)--format=[Format the output using the given Go template]:template: " \
                 "($help -q --quiet)"{-q,--quiet}"[Only display volume names]" && ret=0
             ;;
         (prune)
             _arguments $(__docker_arguments) \
                 $opts_help \
+                "($help -a --all)"{-a,--all}"[Remove all unused local volumes, not just anonymous ones]" \
+                "($help)*--filter=[Filter values]:filter:__docker_complete_prune_filters" \
                 "($help -f --force)"{-f,--force}"[Do not prompt for confirmation]" && ret=0
             ;;
         (rm)
@@ -2582,10 +2586,8 @@ __docker_context_subcommand() {
         (create)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)--default-stack-orchestrator=[Default orchestrator for stack operations to use with this context]:default-stack-orchestrator:(swarm kubernetes all)" \
                 "($help)--description=[Description of the context]:description:" \
                 "($help)--docker=[Set the docker endpoint]:docker:" \
-                "($help)--kubernetes=[Set the kubernetes endpoint]:kubernetes:" \
                 "($help)--from=[Create context from a named context]:from:__docker_complete_contexts" \
                 "($help -):name: " && ret=0
             ;;
@@ -2607,10 +2609,8 @@ __docker_context_subcommand() {
         (update)
             _arguments $(__docker_arguments) \
                 $opts_help \
-                "($help)--default-stack-orchestrator=[Default orchestrator for stack operations to use with this context]:default-stack-orchestrator:(swarm kubernetes all)" \
                 "($help)--description=[Description of the context]:description:" \
                 "($help)--docker=[Set the docker endpoint]:docker:" \
-                "($help)--kubernetes=[Set the kubernetes endpoint]:kubernetes:" \
                 "($help -):name:" && ret=0
             ;;
     esac
@@ -2734,9 +2734,6 @@ __docker_subcommand() {
                 "($help -b --bridge)"{-b=,--bridge=}"[Attach containers to a network bridge]:bridge:_net_interfaces" \
                 "($help)--bip=[Network bridge IP]:IP address: " \
                 "($help)--cgroup-parent=[Parent cgroup for all containers]:cgroup: " \
-                "($help)--cluster-advertise=[Address or interface name to advertise]:Instance to advertise (host\:port): " \
-                "($help)--cluster-store=[URL of the distributed storage backend]:Cluster Store:->cluster-store" \
-                "($help)*--cluster-store-opt=[Cluster store options]:Cluster options:->cluster-store-options" \
                 "($help)--config-file=[Path to daemon configuration file]:Config File:_files" \
                 "($help)--containerd=[Path to containerd socket]:socket:_files -g \"*.sock\"" \
                 "($help)--containerd-namespace=[Containerd namespace to use]:containerd namespace:" \
@@ -2771,16 +2768,16 @@ __docker_subcommand() {
                 "($help)--live-restore[Enable live restore of docker when containers are still running]" \
                 "($help)--log-driver=[Default driver for container logs]:logging driver:__docker_complete_log_drivers" \
                 "($help)*--log-opt=[Default log driver options for containers]:log driver options:__docker_complete_log_options" \
-                "($help)--max-concurrent-downloads[Set the max concurrent downloads for each pull]" \
-                "($help)--max-concurrent-uploads[Set the max concurrent uploads for each push]" \
+                "($help)--max-concurrent-downloads[Set the max concurrent downloads]" \
+                "($help)--max-concurrent-uploads[Set the max concurrent uploads]" \
                 "($help)--max-download-attempts[Set the max download attempts for each pull]" \
                 "($help)--mtu=[Network MTU]:mtu:(0 576 1420 1500 9000)" \
                 "($help)--oom-score-adjust=[Set the oom_score_adj for the daemon]:oom-score:(-500)" \
                 "($help -p --pidfile)"{-p=,--pidfile=}"[Path to use for daemon PID file]:PID file:_files" \
                 "($help)--raw-logs[Full timestamps without ANSI coloring]" \
-                "($help)*--registry-mirror=[Preferred Docker registry mirror]:registry mirror: " \
+                "($help)*--registry-mirror=[Preferred registry mirror]:registry mirror: " \
                 "($help)--seccomp-profile=[Path to seccomp profile]:path:_files -g \"*.json\"" \
-                "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(aufs btrfs devicemapper overlay overlay2 vfs zfs)" \
+                "($help -s --storage-driver)"{-s=,--storage-driver=}"[Storage driver to use]:driver:(btrfs devicemapper overlay2 vfs zfs)" \
                 "($help)--selinux-enabled[Enable selinux support]" \
                 "($help)--shutdown-timeout=[Set the shutdown timeout value in seconds]:time: " \
                 "($help)*--storage-opt=[Storage driver options]:storage driver options: " \
@@ -2795,22 +2792,6 @@ __docker_subcommand() {
                 "($help)--validate[Validate daemon configuration and exit]" && ret=0
 
             case $state in
-                (cluster-store)
-                    if compset -P '*://'; then
-                        _message 'host:port' && ret=0
-                    else
-                        store=('consul' 'etcd' 'zk')
-                        _describe -t cluster-store "Cluster Store" store -qS "://" && ret=0
-                    fi
-                    ;;
-                (cluster-store-options)
-                    if compset -P '*='; then
-                        _files && ret=0
-                    else
-                        opts=('discovery.heartbeat' 'discovery.ttl' 'kv.cacertfile' 'kv.certfile' 'kv.keyfile' 'kv.path')
-                        _describe -t cluster-store-opts "Cluster Store Options" opts -qS "=" && ret=0
-                    fi
-                    ;;
                 (users-groups)
                     if compset -P '*:'; then
                         _groups && ret=0
@@ -3095,6 +3076,7 @@ _docker() {
     _arguments $(__docker_arguments) -C \
         "(: -)"{-h,--help}"[Print usage]" \
         "($help)--config[Location of client config files]:path:_directories" \
+        "($help -c --context)"{-c=,--context=}"[Execute the command in a docker context]:context:__docker_complete_contexts" \
         "($help -D --debug)"{-D,--debug}"[Enable debug mode]" \
         "($help -H --host)"{-H=,--host=}"[tcp://host:port to bind/connect to]:host: " \
         "($help -l --log-level)"{-l=,--log-level=}"[Logging level]:level:(debug info warn error fatal)" \
@@ -3110,7 +3092,8 @@ _docker() {
 
     local host=${opt_args[-H]}${opt_args[--host]}
     local config=${opt_args[--config]}
-    local docker_options="${host:+--host $host} ${config:+--config $config}"
+    local context=${opt_args[-c]}${opt_args[--context]}
+    local docker_options="${host:+--host $host} ${config:+--config $config} ${context:+--context $context} "
 
     case $state in
         (command)
diff --git a/zsh/plugins/docker/docker.plugin.zsh b/zsh/plugins/docker/docker.plugin.zsh
index 9c8ad8a..9d7cf86 100644
--- a/zsh/plugins/docker/docker.plugin.zsh
+++ b/zsh/plugins/docker/docker.plugin.zsh
@@ -1,39 +1,69 @@
 alias dbl='docker build'
-alias dpu='docker pull'
-alias dtop='docker top'
-
-# docker containers
 alias dcin='docker container inspect'
-alias dlo='docker container logs'
 alias dcls='docker container ls'
 alias dclsa='docker container ls -a'
-alias dpo='docker container port'
-alias dr='docker container run'
-alias drit='docker container run -it'
-alias drm='docker container rm'
-alias 'drm!'='docker container rm -f'
-alias dst='docker container start'
-alias dstp='docker container stop'
-alias dxc='docker container exec'
-alias dxcit='docker container exec -it'
-
-# docker images
+alias dcprune='docker container prune'
 alias dib='docker image build'
 alias dii='docker image inspect'
 alias dils='docker image ls'
 alias dipu='docker image push'
+alias dipru='docker image prune -a'
 alias dirm='docker image rm'
 alias dit='docker image tag'
-
-# docker network
+alias dlo='docker container logs'
 alias dnc='docker network create'
 alias dncn='docker network connect'
 alias dndcn='docker network disconnect'
 alias dni='docker network inspect'
 alias dnls='docker network ls'
+alias dnprune='docker network prune'
 alias dnrm='docker network rm'
-
-# docker volume
+alias dpo='docker container port'
+alias dps='docker ps'
+alias dpsa='docker ps -a'
+alias dpu='docker pull'
+alias dr='docker container run'
+alias drit='docker container run -it'
+alias drm='docker container rm'
+alias 'drm!'='docker container rm -f'
+alias dsprune='docker system prune'
+alias dst='docker container start'
+alias drs='docker container restart'
+alias dsta='docker stop $(docker ps -q)'
+alias dstp='docker container stop'
+alias dsts='docker stats'
+alias dtop='docker top'
 alias dvi='docker volume inspect'
 alias dvls='docker volume ls'
 alias dvprune='docker volume prune'
+alias dxc='docker container exec'
+alias dxcit='docker container exec -it'
+
+if (( ! $+commands[docker] )); then
+  return
+fi
+
+# Standardized $0 handling
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `docker`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_docker" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _docker
+  _comps[docker]=_docker
+fi
+
+{
+  # `docker completion` is only available from 23.0.0 on
+  # docker version returns `Docker version 24.0.2, build cb74dfcd85`
+  # with `s:,:` remove the comma after the version, and select third word of it
+  if zstyle -t ':omz:plugins:docker' legacy-completion || \
+    ! is-at-least 23.0.0 ${${(s:,:z)"$(command docker --version)"}[3]}; then
+        command cp "${0:h}/completions/_docker" "$ZSH_CACHE_DIR/completions/_docker"
+      else
+        command docker completion zsh | tee "$ZSH_CACHE_DIR/completions/_docker" > /dev/null
+  fi
+} &|
diff --git a/zsh/plugins/doctl/doctl.plugin.zsh b/zsh/plugins/doctl/doctl.plugin.zsh
index d23ed08..7b3a384 100644
--- a/zsh/plugins/doctl/doctl.plugin.zsh
+++ b/zsh/plugins/doctl/doctl.plugin.zsh
@@ -4,6 +4,14 @@
 #
 # Author: https://github.com/HalisCz
 
-if [ $commands[doctl] ]; then
-  source <(doctl completion zsh)
+if (( ! $+commands[doctl] )); then
+  return
 fi
+
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_doctl" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _doctl
+  _comps[doctl]=_doctl
+fi
+
+doctl completion zsh >| "$ZSH_CACHE_DIR/completions/_doctl" &|
diff --git a/zsh/plugins/dotenv/README.md b/zsh/plugins/dotenv/README.md
index ab9d329..5dbcf0f 100644
--- a/zsh/plugins/dotenv/README.md
+++ b/zsh/plugins/dotenv/README.md
@@ -78,6 +78,14 @@ change.
 NOTE: if a directory is found in both the allowed and disallowed lists, the disallowed list
 takes preference, _i.e._ the .env file will never be sourced.
 
+## Named Pipe (FIFO) Support
+
+The plugin supports `.env` files provided as UNIX named pipes (FIFOs) in addition to regular files.
+This is useful when secrets managers like [1Password Environments](https://developer.1password.com/docs/environment/)
+mount `.env` files as named pipes to inject secrets on-the-fly without writing them to disk.
+
+No additional configuration is required — the plugin automatically detects and sources named pipes.
+
 ## Version Control
 
 **It's strongly recommended to add `.env` file to `.gitignore`**, because usually it contains sensitive information such as your credentials, secret keys, passwords etc. You don't want to commit this file, it's supposed to be local only.
diff --git a/zsh/plugins/dotenv/dotenv.plugin.zsh b/zsh/plugins/dotenv/dotenv.plugin.zsh
index 46cd4b1..c44c369 100644
--- a/zsh/plugins/dotenv/dotenv.plugin.zsh
+++ b/zsh/plugins/dotenv/dotenv.plugin.zsh
@@ -11,7 +11,7 @@
 ## Functions
 
 source_env() {
-  if [[ ! -f "$ZSH_DOTENV_FILE" ]]; then
+  if [[ ! -f "$ZSH_DOTENV_FILE" ]] && [[ ! -p "$ZSH_DOTENV_FILE" ]]; then
     return
   fi
 
diff --git a/zsh/plugins/dotnet/README.md b/zsh/plugins/dotnet/README.md
index 87dfd8f..2b06d88 100644
--- a/zsh/plugins/dotnet/README.md
+++ b/zsh/plugins/dotnet/README.md
@@ -1,6 +1,6 @@
-# .NET Core CLI plugin
+# .NET CLI plugin
 
-This plugin provides completion and useful aliases for [.NET Core CLI](https://dotnet.microsoft.com/).
+This plugin provides completion and useful aliases for [.NET CLI](https://dotnet.microsoft.com/).
 
 To use it, add `dotnet` to the plugins array in your zshrc file.
 
@@ -17,8 +17,10 @@ plugins=(... dotnet)
 | dt    | dotnet test      | Run unit tests using the test runner specified in a .NET project. |
 | dw    | dotnet watch     | Watch for source file changes and restart the dotnet command.     |
 | dwr   | dotnet watch run | Watch for source file changes and restart the `run` command.      |
+| dwt   | dotnet watch test| Watch for source file changes and restart the `test` command.     |
 | ds    | dotnet sln       | Modify Visual Studio solution files.                              |
 | da    | dotnet add       | Add a package or reference to a .NET project.                     |
 | dp    | dotnet pack      | Create a NuGet package.                                           |
 | dng   | dotnet nuget     | Provides additional NuGet commands.                               |
 | db    | dotnet build     | Build a .NET project                                              |
+| dres  | dotnet restore   | Restore dependencies and project-specific tools for a project.    |
diff --git a/zsh/plugins/dotnet/dotnet.plugin.zsh b/zsh/plugins/dotnet/dotnet.plugin.zsh
index 8ea31cd..2b77824 100644
--- a/zsh/plugins/dotnet/dotnet.plugin.zsh
+++ b/zsh/plugins/dotnet/dotnet.plugin.zsh
@@ -1,33 +1,27 @@
 # This scripts is copied from (MIT License):
-# https://github.com/dotnet/toolset/blob/master/scripts/register-completions.zsh
+# https://raw.githubusercontent.com/dotnet/sdk/main/scripts/register-completions.zsh
 
-_dotnet_zsh_complete() 
-{
-  local completions=("$(dotnet complete "$words")")
-
-  # If the completion list is empty, just continue with filename selection
-  if [ -z "$completions" ]
-  then
-    _arguments '*::arguments: _normal'
-    return
-  fi
-
-  # This is not a variable assignment, don't remove spaces!
-  _values = "${(ps:\n:)completions}"
+#compdef dotnet
+_dotnet_completion() {
+  local -a completions=("${(@f)$(dotnet complete "${words}")}")
+  compadd -a completions
+  _files
 }
 
-compdef _dotnet_zsh_complete dotnet
+compdef _dotnet_completion dotnet
 
-# Aliases bellow are here for backwards compatibility
-# added by Shaun Tabone (https://github.com/xontab) 
+# Aliases below are here for backwards compatibility
+# added by Shaun Tabone (https://github.com/xontab)
 
 alias dn='dotnet new'
 alias dr='dotnet run'
 alias dt='dotnet test'
 alias dw='dotnet watch'
 alias dwr='dotnet watch run'
+alias dwt='dotnet watch test'
 alias ds='dotnet sln'
 alias da='dotnet add'
 alias dp='dotnet pack'
 alias dng='dotnet nuget'
 alias db='dotnet build'
+alias dres='dotnet restore'
diff --git a/zsh/plugins/emacs/README.md b/zsh/plugins/emacs/README.md
index c8e33b5..47c7644 100644
--- a/zsh/plugins/emacs/README.md
+++ b/zsh/plugins/emacs/README.md
@@ -25,6 +25,6 @@ The plugin uses a custom launcher (which we'll call here `$EMACS_LAUNCHER`) that
 | e      | `emacs`                                            | Same as emacs alias                                            |
 | te     | `$EMACS_LAUNCHER -nw`                              | Open terminal emacsclient                                      |
 | eeval  | `$EMACS_LAUNCHER --eval`                           | Same as `M-x eval` but from outside Emacs                      |
-| eframe | `emacsclient --alternate-editor "" --create-frame` | Create new X frame                                             |
+| eframe | `emacsclient --alternate-editor="" --create-frame` | Create new X frame                                             |
 | efile  | -                                                  | Print the path to the file open in the current buffer          |
-| ecd    | -                                                  | Print the directory of the file open in the the current buffer |
+| ecd    | -                                                  | Print the directory of the file open in the current buffer |
diff --git a/zsh/plugins/emacs/emacs.plugin.zsh b/zsh/plugins/emacs/emacs.plugin.zsh
index fede5b0..3ed6cee 100644
--- a/zsh/plugins/emacs/emacs.plugin.zsh
+++ b/zsh/plugins/emacs/emacs.plugin.zsh
@@ -32,10 +32,10 @@ alias te="$EMACS_PLUGIN_LAUNCHER -nw"
 # same than M-x eval but from outside Emacs.
 alias eeval="$EMACS_PLUGIN_LAUNCHER --eval"
 # create a new X frame
-alias eframe='emacsclient --alternate-editor "" --create-frame'
+alias eframe='emacsclient --alternate-editor="" --create-frame'
 
 # Emacs ANSI Term tracking
-if [[ -n "$INSIDE_EMACS" ]]; then
+if [[ -n "$INSIDE_EMACS" ]] && [[ "$INSIDE_EMACS" != "vterm" ]]; then
   chpwd_emacs() { print -P "\033AnSiTc %d"; }
   print -P "\033AnSiTc %d"    # Track current working directory
   print -P "\033AnSiTu %n"    # Track username
@@ -60,7 +60,7 @@ function efile {
 }
 
 # Write to standard output the directory of the file
-# opened in the the current buffer
+# opened in the current buffer
 function ecd {
   local file
   file="$(efile)" || return $?
diff --git a/zsh/plugins/emacs/emacsclient.sh b/zsh/plugins/emacs/emacsclient.sh
index 96893c9..172c0ae 100755
--- a/zsh/plugins/emacs/emacsclient.sh
+++ b/zsh/plugins/emacs/emacsclient.sh
@@ -15,11 +15,11 @@ emacsfun() {
 
   # Only create another X frame if there isn't one present
   if [ -z "$frames" -o "$frames" = nil ]; then
-    emacsclient --alternate-editor "" --create-frame "$@"
+    emacsclient --alternate-editor="" --create-frame "$@"
     return $?
   fi
 
-  emacsclient --alternate-editor "" "$@"
+  emacsclient --alternate-editor="" "$@"
 }
 
 # Adapted from https://github.com/davidshepherd7/emacs-read-stdin/blob/master/emacs-read-stdin.sh
diff --git a/zsh/plugins/ember-cli/README.md b/zsh/plugins/ember-cli/README.md
index 419704a..1532eea 100644
--- a/zsh/plugins/ember-cli/README.md
+++ b/zsh/plugins/ember-cli/README.md
@@ -29,5 +29,5 @@ plugins=(... ember-cli)
 
 - [BilalBudhani](https://github.com/BilalBudhani)
 - [eubenesa](https://github.com/eubenesa)
-- [scottkidder](https://github.com/scottkidder]
+- [scottkidder](https://github.com/scottkidder)
 - [t-sauer](https://www.github.com/t-sauer)
diff --git a/zsh/plugins/emoji/emoji.plugin.zsh b/zsh/plugins/emoji/emoji.plugin.zsh
index f9e476e..f7be56c 100644
--- a/zsh/plugins/emoji/emoji.plugin.zsh
+++ b/zsh/plugins/emoji/emoji.plugin.zsh
@@ -24,7 +24,7 @@ unset _omz_emoji_plugin_dir
 
 # This is a combining character that can be placed after any other character to surround
 # it in a "keycap" symbol.
-# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc. 
+# The digits 0-9 are already in the emoji table as keycap_digit_<N>, keycap_ten, etc.
 # It's unclear whether this should be in the $emoji array, because those characters are all ones
 # which can be displayed on their own.
 
@@ -63,9 +63,9 @@ function random_emoji() {
   [[ $list_size -eq 0 ]] && return 1
   local random_index=$(( ( RANDOM % $list_size ) + 1 ))
   local name=${names[$random_index]}
-  if [[ "$group" == "flags" ]]; then 
+  if [[ "$group" == "flags" ]]; then
     echo ${emoji_flags[$name]}
-  else 
+  else
     echo ${emoji[$name]}
   fi
 }
@@ -86,22 +86,22 @@ function display_emoji() {
   # terminals treat these emoji chars as single-width.
   local counter=1
   for i in $names; do
-    if [[ "$group" == "flags" ]]; then 
+    if [[ "$group" == "flags" ]]; then
       printf '%s  ' "$emoji_flags[$i]"
-    else 
-      printf '%s  ' "$emoji[$i]" 
+    else
+      printf '%s  ' "$emoji[$i]"
     fi
     # New line every 20 emoji, to avoid weirdnesses
     if (($counter % 20 == 0)); then
-      printf "\n" 
+      printf "\n"
     fi
     let counter=$counter+1
   done
   print
   for i in $names; do
-    if [[ "$group" == "flags" ]]; then 
+    if [[ "$group" == "flags" ]]; then
       echo "${emoji_flags[$i]}  = $i"
-    else 
+    else
       echo "${emoji[$i]}  = $i"
     fi
   done
diff --git a/zsh/plugins/emoji/update_emoji.py b/zsh/plugins/emoji/update_emoji.py
index 18b3c06..9e115a7 100644
--- a/zsh/plugins/emoji/update_emoji.py
+++ b/zsh/plugins/emoji/update_emoji.py
@@ -1,6 +1,6 @@
 """
 Update Emoji.py
-Refeshes OMZ emoji database based on the latest Unicode spec
+Refreshes OMZ emoji database based on the latest Unicode spec
 """
 import re
 import json
@@ -95,7 +95,7 @@ def name_to_omz(_name, _group, _subgroup, _status):
         shortname = snake_case(_name)
     # Special treatment by status
     # Enables us to have every emoji combination,
-    # even the one that are not officially sanctionned
+    # even the one that are not officially sanctioned
     # and are implemented by, say, only one vendor
     if _status == "unqualified":
         shortname += "_unqualified"
diff --git a/zsh/plugins/emotty/emotty.plugin.zsh b/zsh/plugins/emotty/emotty.plugin.zsh
index 661169a..b48d121 100644
--- a/zsh/plugins/emotty/emotty.plugin.zsh
+++ b/zsh/plugins/emotty/emotty.plugin.zsh
@@ -4,7 +4,7 @@
 #        AUTHOR: Alexis Hildebrandt (afh[at]surryhill.net)
 #       VERSION: 1.0.0
 #       DEPENDS: emoji plugin
-#       
+#
 # There are different sets of emoji characters available, to choose a different
 # set export emotty_set to the name of the set you would like to use, e.g.:
 # % export emotty_set=nature
diff --git a/zsh/plugins/encode64/README.md b/zsh/plugins/encode64/README.md
index 86320cf..e3e25a7 100644
--- a/zsh/plugins/encode64/README.md
+++ b/zsh/plugins/encode64/README.md
@@ -10,10 +10,11 @@ plugins=(... encode64)
 
 ## Functions and Aliases
 
-| Function   | Alias | Description                    |
-| ---------- | ----- | ------------------------------ |
-| `encode64` | `e64` | Encodes given data to base64   |
-| `decode64` | `d64` | Decodes given data from base64 |
+| Function       | Alias  | Description                            |
+| -------------- | ------ | -------------------------------------- |
+| `encode64`     | `e64`  | Encodes given data to base64           |
+| `encodefile64` | `ef64` | Encodes given file's content to base64 |
+| `decode64`     | `d64`  | Decodes given data from base64         |
 
 ## Usage and examples
 
@@ -37,6 +38,20 @@ plugins=(... encode64)
   b2gtbXktenNo==
   ```
 
+### Encoding a file
+
+Encode a file's contents to base64 and save output to text file.
+**NOTE:** Takes provided file and saves encoded content as new file with `.txt` extension
+
+- From parameter
+
+  ```console
+  $ encodefile64 ohmyzsh.icn
+  ohmyzsh.icn's content encoded in base64 and saved as ohmyzsh.icn.txt
+  $ ef64 "oh-my-zsh"
+  ohmyzsh.icn's content encoded in base64 and saved as ohmyzsh.icn.txt
+  ```
+
 ### Decoding
 
 - From parameter
diff --git a/zsh/plugins/encode64/encode64.plugin.zsh b/zsh/plugins/encode64/encode64.plugin.zsh
index 979e067..8e6fdb1 100644
--- a/zsh/plugins/encode64/encode64.plugin.zsh
+++ b/zsh/plugins/encode64/encode64.plugin.zsh
@@ -6,6 +6,15 @@ encode64() {
     fi
 }
 
+encodefile64() {
+    if [[ $# -eq 0 ]]; then
+        echo "You must provide a filename"
+    else
+        base64 $1 > $1.txt
+        echo "${1}'s content encoded in base64 and saved as ${1}.txt"
+    fi
+}
+
 decode64() {
     if [[ $# -eq 0 ]]; then
         cat | base64 --decode
@@ -14,4 +23,5 @@ decode64() {
     fi
 }
 alias e64=encode64
+alias ef64=encodefile64
 alias d64=decode64
diff --git a/zsh/plugins/extract/README.md b/zsh/plugins/extract/README.md
index 44f0b05..7bedfb1 100644
--- a/zsh/plugins/extract/README.md
+++ b/zsh/plugins/extract/README.md
@@ -1,10 +1,10 @@
 # extract plugin
 
-This plugin defines a function called `extract` that extracts the archive file
-you pass it, and it supports a wide variety of archive filetypes.
+This plugin defines a function called `extract` that extracts the archive file you pass it, and it supports a
+wide variety of archive filetypes.
 
-This way you don't have to know what specific command extracts a file, you just
-do `extract <filename>` and the function takes care of the rest.
+This way you don't have to know what specific command extracts a file, you just do `extract <filename>` and
+the function takes care of the rest.
 
 To use it, add `extract` to the plugins array in your zshrc file:
 
@@ -14,47 +14,56 @@ plugins=(... extract)
 
 ## Supported file extensions
 
-| Extension         | Description                          |
-|:------------------|:-------------------------------------|
-| `7z`              | 7zip file                            |
-| `Z`               | Z archive (LZW)                      |
-| `apk`             | Android app file                     |
-| `aar`             | Android library file                 |
-| `bz2`             | Bzip2 file                           |
-| `cab`             | Microsoft cabinet archive            |
-| `cpio`            | Cpio archive                         |
-| `deb`             | Debian package                       |
-| `ear`             | Enterprise Application aRchive       |
-| `gz`              | Gzip file                            |
-| `ipa`             | iOS app package                      |
-| `ipsw`            | iOS firmware file                    |
-| `jar`             | Java Archive                         |
-| `lrz`             | LRZ archive                          |
-| `lz4`             | LZ4 archive                          |
-| `lzma`            | LZMA archive                         |
-| `rar`             | WinRAR archive                       |
-| `rpm`             | RPM package                          |
-| `sublime-package` | Sublime Text package                 |
-| `tar`             | Tarball                              |
-| `tar.bz2`         | Tarball with bzip2 compression       |
-| `tar.gz`          | Tarball with gzip compression        |
-| `tar.lrz`         | Tarball with lrzip compression       |
-| `tar.lz`          | Tarball with lzip compression        |
-| `tar.lz4`         | Tarball with lz4 compression         |
-| `tar.xz`          | Tarball with lzma2 compression       |
-| `tar.zma`         | Tarball with lzma compression        |
-| `tar.zst`         | Tarball with zstd compression        |
-| `tbz`             | Tarball with bzip compression        |
-| `tbz2`            | Tarball with bzip2 compression       |
-| `tgz`             | Tarball with gzip compression        |
-| `tlz`             | Tarball with lzma compression        |
-| `txz`             | Tarball with lzma2 compression       |
-| `tzst`            | Tarball with zstd compression        |
-| `war`             | Web Application archive (Java-based) |
-| `xpi`             | Mozilla XPI module file              |
-| `xz`              | LZMA2 archive                        |
-| `zip`             | Zip archive                          |
-| `zst`             | Zstandard file (zstd)                |
+| Extension         | Description                             |
+| :---------------- | :-------------------------------------- |
+| `7z`              | 7zip file                               |
+| `apk`             | Android app file                        |
+| `aar`             | Android library file                    |
+| `bz2`             | Bzip2 file                              |
+| `cab`             | Microsoft cabinet archive               |
+| `cpio`            | Cpio archive                            |
+| `deb`             | Debian package                          |
+| `ear`             | Enterprise Application aRchive          |
+| `exe`             | Windows executable file                 |
+| `gz`              | Gzip file                               |
+| `ipa`             | iOS app package                         |
+| `ipsw`            | iOS firmware file                       |
+| `jar`             | Java Archive                            |
+| `lrz`             | LRZ archive                             |
+| `lz4`             | LZ4 archive                             |
+| `lzma`            | LZMA archive                            |
+| `obscpio`         | cpio archive used on OBS                |
+| `pk3`             | Renamed Zip archive used by Quake games |
+| `pk4`             | Renamed Zip archive used by Quake games |
+| `pk7`             | Renamed 7zip file used by Quake games   |
+| `rar`             | WinRAR archive                          |
+| `rpm`             | RPM package                             |
+| `sublime-package` | Sublime Text package                    |
+| `tar`             | Tarball                                 |
+| `tar.bz2`         | Tarball with bzip2 compression          |
+| `tar.gz`          | Tarball with gzip compression           |
+| `tar.lrz`         | Tarball with lrzip compression          |
+| `tar.lz`          | Tarball with lzip compression           |
+| `tar.lz4`         | Tarball with lz4 compression            |
+| `tar.xz`          | Tarball with lzma2 compression          |
+| `tar.zma`         | Tarball with lzma compression           |
+| `tar.zst`         | Tarball with zstd compression           |
+| `tbz`             | Tarball with bzip compression           |
+| `tbz2`            | Tarball with bzip2 compression          |
+| `tgz`             | Tarball with gzip compression           |
+| `tlz`             | Tarball with lzma compression           |
+| `txz`             | Tarball with lzma2 compression          |
+| `tzst`            | Tarball with zstd compression           |
+| `vsix`            | VS Code extension zip file              |
+| `war`             | Web Application archive (Java-based)    |
+| `whl`             | Python wheel file                       |
+| `xpi`             | Mozilla XPI module file                 |
+| `xz`              | LZMA2 archive                           |
+| `Z`               | Z archive (LZW)                         |
+| `zip`             | Zip archive                             |
+| `zlib`            | zlib archive                            |
+| `zst`             | Zstandard file (zstd)                   |
+| `zpaq`            | Zpaq file                               |
 
-See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for
-more information regarding archive formats.
+See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for more information
+regarding archive formats.
diff --git a/zsh/plugins/extract/_extract b/zsh/plugins/extract/_extract
index 27b099c..6641443 100644
--- a/zsh/plugins/extract/_extract
+++ b/zsh/plugins/extract/_extract
@@ -1,7 +1,57 @@
 #compdef extract
 #autoload
 
+local -a exts=(
+  7z
+  aar
+  apk
+  bz2
+  cab
+  cpio
+  crx
+  deb
+  ear
+  gz
+  ipa
+  ipsw
+  jar
+  lrz
+  lz4
+  lzma
+  obscpio
+  pk3
+  pk4
+  pk7
+  rar
+  rpm
+  sublime-package
+  tar
+  tar.bz2
+  tar.gz
+  tar.lrz
+  tar.lz
+  tar.lz4
+  tar.xz
+  tar.zma
+  tar.zst
+  tbz
+  tbz2
+  tgz
+  tlz
+  txz
+  tzst
+  vsix
+  war
+  whl
+  xpi
+  xz
+  Z
+  zip
+  zpaq
+  zst
+)
+
 _arguments \
   '(-r --remove)'{-r,--remove}'[Remove archive.]' \
-  "*::archive file:_files -g '(#i)*.(7z|Z|apk|aar|bz2|cab|cpio|deb|ear|gz|ipa|ipsw|jar|lrz|lz4|lzma|rar|rpm|sublime-package|tar|tar.bz2|tar.gz|tar.lrz|tar.lz|tar.lz4|tar.xz|tar.zma|tar.zst|tbz|tbz2|tgz|tlz|txz|tzst|war|whl|xpi|xz|zip|zst)(-.)'" \
+  "*::archive file:_files -g '(#i)*.(${(j:|:)exts})(-.)'" \
     && return 0
diff --git a/zsh/plugins/extract/extract.plugin.zsh b/zsh/plugins/extract/extract.plugin.zsh
index 1112dd5..aed77e7 100644
--- a/zsh/plugins/extract/extract.plugin.zsh
+++ b/zsh/plugins/extract/extract.plugin.zsh
@@ -27,59 +27,119 @@ EOF
     fi
 
     local success=0
-    local extract_dir="${1:t:r}"
     local file="$1" full_path="${1:A}"
+    local extract_dir="${1:t:r}"
+
+    # Remove the .tar extension if the file name is .tar.*
+    if [[ $extract_dir =~ '\.tar$' ]]; then
+      extract_dir="${extract_dir:r}"
+    fi
+
+    # If there's a file or directory with the same name as the archive
+    # add a random string to the end of the extract directory
+    if [[ -e "$extract_dir" ]]; then
+      local rnd="${(L)"${$(( [##36]$RANDOM*$RANDOM ))}":1:5}"
+      extract_dir="${extract_dir}-${rnd}"
+    fi
+
+    # Create an extraction directory based on the file name
+    command mkdir -p "$extract_dir"
+    builtin cd -q "$extract_dir"
+    echo "extract: extracting to $extract_dir" >&2
+
     case "${file:l}" in
-      (*.tar.gz|*.tgz) (( $+commands[pigz] )) && { pigz -dc "$file" | tar xv } || tar zxvf "$file" ;;
-      (*.tar.bz2|*.tbz|*.tbz2) tar xvjf "$file" ;;
+      (*.tar.gz|*.tgz)
+        (( $+commands[pigz] )) && { tar -I pigz -xvf "$full_path" } || tar zxvf "$full_path" ;;
+      (*.tar.bz2|*.tbz|*.tbz2)
+        (( $+commands[pbzip2] )) && { tar -I pbzip2 -xvf "$full_path" } || tar xvjf "$full_path" ;;
       (*.tar.xz|*.txz)
+        (( $+commands[pixz] )) && { tar -I pixz -xvf "$full_path" } || {
         tar --xz --help &> /dev/null \
-        && tar --xz -xvf "$file" \
-        || xzcat "$file" | tar xvf - ;;
+        && tar --xz -xvf "$full_path" \
+        || xzcat "$full_path" | tar xvf - } ;;
       (*.tar.zma|*.tlz)
         tar --lzma --help &> /dev/null \
-        && tar --lzma -xvf "$file" \
-        || lzcat "$file" | tar xvf - ;;
+        && tar --lzma -xvf "$full_path" \
+        || lzcat "$full_path" | tar xvf - ;;
       (*.tar.zst|*.tzst)
         tar --zstd --help &> /dev/null \
-        && tar --zstd -xvf "$file" \
-        || zstdcat "$file" | tar xvf - ;;
-      (*.tar) tar xvf "$file" ;;
-      (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$file" ;;
-      (*.tar.lz4) lz4 -c -d "$file" | tar xvf - ;;
-      (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$file" ;;
-      (*.gz) (( $+commands[pigz] )) && pigz -dk "$file" || gunzip -k "$file" ;;
-      (*.bz2) bunzip2 "$file" ;;
-      (*.xz) unxz "$file" ;;
-      (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$file" ;;
-      (*.lz4) lz4 -d "$file" ;;
-      (*.lzma) unlzma "$file" ;;
-      (*.z) uncompress "$file" ;;
-      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl) unzip "$file" -d "$extract_dir" ;;
-      (*.rar) unrar x -ad "$file" ;;
+        && tar --zstd -xvf "$full_path" \
+        || zstdcat "$full_path" | tar xvf - ;;
+      (*.tar) tar xvf "$full_path" ;;
+      (*.tar.lz) (( $+commands[lzip] )) && tar xvf "$full_path" ;;
+      (*.tar.lz4) lz4 -c -d "$full_path" | tar xvf - ;;
+      (*.tar.lrz) (( $+commands[lrzuntar] )) && lrzuntar "$full_path" ;;
+      (*.gz) (( $+commands[pigz] )) && pigz -cdk "$full_path" > "${file:t:r}" || gunzip -ck "$full_path" > "${file:t:r}" ;;
+      (*.bz2) (( $+commands[pbzip2] )) && pbzip2 -d "$full_path" || bunzip2 "$full_path" ;;
+      (*.xz) unxz "$full_path" ;;
+      (*.lrz) (( $+commands[lrunzip] )) && lrunzip "$full_path" ;;
+      (*.lz4) lz4 -d "$full_path" ;;
+      (*.lzma) unlzma "$full_path" ;;
+      (*.z) uncompress "$full_path" ;;
+      (*.zip|*.war|*.jar|*.ear|*.sublime-package|*.ipa|*.ipsw|*.xpi|*.apk|*.aar|*.whl|*.vsix|*.crx|*.pk3|*.pk4) unzip "$full_path" ;;
+      (*.rar)
+        if (( $+commands[unrar] )); then
+          unrar x -ad "$full_path"
+        elif (( $+commands[unar] )); then
+          unar -o . "$full_path"
+        else
+          echo "extract: cannot extract RAR files: install unrar or unar" >&2
+          success=1
+        fi ;;
       (*.rpm)
-        command mkdir -p "$extract_dir" && builtin cd -q "$extract_dir" \
-        && rpm2cpio "$full_path" | cpio --quiet -id ;;
-      (*.7z) 7za x "$file" ;;
+        rpm2cpio "$full_path" | cpio --quiet -id ;;
+      (*.7z | *.7z.[0-9]* | *.pk7) 7za x "$full_path" ;;
       (*.deb)
-        command mkdir -p "$extract_dir/control" "$extract_dir/data"
-        builtin cd -q "$extract_dir"; ar vx "$full_path" > /dev/null
+        command mkdir -p "control" "data"
+        ar vx "$full_path" > /dev/null
         builtin cd -q control; extract ../control.tar.*
         builtin cd -q ../data; extract ../data.tar.*
         builtin cd -q ..; command rm *.tar.* debian-binary ;;
-      (*.zst) unzstd "$file" ;;
-      (*.cab) cabextract -d "$extract_dir" "$file" ;;
-      (*.cpio) cpio -idmvF "$file" ;;
+      (*.zst) unzstd --stdout "$full_path" > "${file:t:r}" ;;
+      (*.cab|*.exe) cabextract "$full_path" ;;
+      (*.cpio|*.obscpio) cpio -idmvF "$full_path" ;;
+      (*.zpaq) zpaq x "$full_path" ;;
+      (*.zlib) zlib-flate -uncompress < "$full_path" > "${file:r}" ;;
       (*)
         echo "extract: '$file' cannot be extracted" >&2
         success=1 ;;
     esac
 
     (( success = success > 0 ? success : $? ))
-    (( success == 0 && remove_archive == 0 )) && rm "$full_path"
+    (( success == 0 && remove_archive == 0 )) && command rm "$full_path"
     shift
 
-    # Go back to original working directory in case we ran cd previously
+    # Go back to original working directory
     builtin cd -q "$pwd"
+
+    # If content of extract dir is a single directory, move its contents up
+    # Glob flags:
+    # - D: include files starting with .
+    # - N: no error if directory is empty
+    # - Y2: at most give 2 files
+    local -a content
+    content=("${extract_dir}"/*(DNY2))
+    if [[ ${#content} -eq 1 && -e "${content[1]}" ]]; then
+      # The extracted file/folder (${content[1]}) may have the same name as $extract_dir
+      # If so, we need to rename it to avoid conflicts in a 3-step process
+      #
+      # 1. Move and rename the extracted file/folder to a temporary random name
+      # 2. Delete the empty folder
+      # 3. Rename the extracted file/folder to the original name
+      if [[ "${content[1]:t}" == "$extract_dir" ]]; then
+        # =(:) gives /tmp/zsh<random>, with :t it gives zsh<random>
+        local tmp_name==(:); tmp_name="${tmp_name:t}"
+        command mv "${content[1]}" "$tmp_name" \
+        && command rmdir "$extract_dir" \
+        && command mv "$tmp_name" "$extract_dir"
+      # Otherwise, if the extracted folder name already exists in the current
+      # directory (because of a previous file / folder), keep the extract_dir
+      elif [[ ! -e "${content[1]:t}" ]]; then
+        command mv "${content[1]}" . \
+        && command rmdir "$extract_dir"
+      fi
+    elif [[ ${#content} -eq 0 ]]; then
+      command rmdir "$extract_dir"
+    fi
   done
 }
diff --git a/zsh/plugins/eza/README.md b/zsh/plugins/eza/README.md
new file mode 100644
index 0000000..bec1f85
--- /dev/null
+++ b/zsh/plugins/eza/README.md
@@ -0,0 +1,144 @@
+# eza plugin
+
+This provides aliases that invoke the [`eza`](https://github.com/eza-community/eza) utility rather than `ls`
+
+To use it add `eza` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... eza)
+```
+
+## Configuration
+
+All configurations are done using the `zstyle` command in the `:omz:plugins:eza` namespace.
+
+**NOTE:** The configuring needs to be done prior to OMZ loading the plugins. When the plugin is loaded,
+changing the `zstyle` won't have any effect.
+
+### `dirs-first`
+
+```zsh
+zstyle ':omz:plugins:eza' 'dirs-first' yes|no
+```
+
+If `yes`, directories will be grouped first.
+
+Default: `no`
+
+### `git-status`
+
+```zsh
+zstyle ':omz:plugins:eza' 'git-status' yes|no
+```
+
+If `yes`, always add `--git` flag to indicate git status (if tracked / in a git repo).
+
+Default: `no`
+
+### `header`
+
+```zsh
+zstyle ':omz:plugins:eza' 'header' yes|no
+```
+
+If `yes`, always add `-h` flag to add a header row for each column.
+
+Default: `no`
+
+### `show-group`
+
+```zsh
+zstyle ':omz:plugins:eza' 'show-group' yes|no
+```
+
+If `yes` (default), always add `-g` flag to show the group ownership.
+
+Default: `yes`
+
+### `icons`
+
+```zsh
+zstyle ':omz:plugins:eza' 'icons' yes|no
+```
+
+If `yes`, sets the `--icons` option of `eza`, adding icons for files and folders.
+
+Default: `no`
+
+### `color-scale`
+
+```zsh
+zstyle ':omz:plugins:eza' 'color-scale' all|age|size
+```
+
+Highlight levels of field(s) distinctly. Use comma(,) separated list of `all`, `age`, `size`
+
+Default: `none`
+
+### `color-scale-mode`
+
+```zsh
+zstyle ':omz:plugins:eza' 'color-scale-mode' gradient|fixed
+```
+
+Choose the mode for highlighting:
+
+- `gradient` (default) -- gradient coloring
+- `fixed` -- fixed coloring
+
+Default: `gradient`
+
+### `size-prefix`
+
+```zsh
+zstyle ':omz:plugins:eza' 'size-prefix' (binary|none|si)
+```
+
+Choose the prefix to be used in displaying file size:
+
+- `binary` -- use [binary prefixes](https://en.wikipedia.org/wiki/Binary_prefix) such as "Ki", "Mi", "Gi" and
+  so on
+- `none` -- don't use any prefix, show size in bytes
+- `si` (default) -- use [Metric/S.I. prefixes](https://en.wikipedia.org/wiki/Metric_prefix)
+
+Default: `si`
+
+### `time-style`
+
+```zsh
+zstyle ':omz:plugins:eza' 'time-style' $TIME_STYLE
+```
+
+Sets the `--time-style` option of `eza`. (See `man eza` for the options)
+
+Default: Not set, which means the default behavior of `eza` will take place.
+
+### `hyperlink`
+
+```zsh
+zstyle ':omz:plugins:eza' 'hyperlink' yes|no
+```
+
+If `yes`, always add `--hyperlink` flag to create hyperlink with escape codes.
+
+Default: `no`
+
+## Aliases
+
+**Notes:**
+
+- Aliases may be modified by Configuration
+- The term "files" without "only" qualifier means both files & directories
+
+| Alias  | Command           | Description                                                                |
+| ------ | ----------------- | -------------------------------------------------------------------------- |
+| `la`   | `eza -la`         | List all files (except . and ..) as a long list                            |
+| `ldot` | `eza -ld .*`      | List dotfiles only (directories shown as entries instead of recursed into) |
+| `lD`   | `eza -lD`         | List only directories (excluding dotdirs) as a long list                   |
+| `lDD`  | `eza -laD`        | List only directories (including dotdirs) as a long list                   |
+| `ll`   | `eza -l`          | List files as a long list                                                  |
+| `ls`   | `eza`             | Plain eza call                                                             |
+| `lsd`  | `eza -d`          | List specified files with directories as entries, in a grid                |
+| `lsdl` | `eza -dl`         | List specified files with directories as entries, in a long list           |
+| `lS`   | `eza -l -ssize`   | List files as a long list, sorted by size                                  |
+| `lT`   | `eza -l -snewest` | List files as a long list, sorted by date (newest last)                    |
diff --git a/zsh/plugins/eza/eza.plugin.zsh b/zsh/plugins/eza/eza.plugin.zsh
new file mode 100644
index 0000000..60ed1eb
--- /dev/null
+++ b/zsh/plugins/eza/eza.plugin.zsh
@@ -0,0 +1,76 @@
+if ! (( $+commands[eza] )); then
+  print "zsh eza plugin: eza not found. Please install eza before using this plugin." >&2
+  return 1
+fi
+
+typeset -a _EZA_HEAD
+typeset -a _EZA_TAIL
+
+function _configure_eza() {
+  local _val
+  # Get the head flags
+  if zstyle -T ':omz:plugins:eza' 'show-group'; then
+    _EZA_HEAD+=("g")
+  fi
+  if zstyle -t ':omz:plugins:eza' 'header'; then
+    _EZA_HEAD+=("h")
+  fi
+  zstyle -s ':omz:plugins:eza' 'size-prefix' _val
+  case "${_val:l}" in
+    binary)
+      _EZA_HEAD+=("b")
+      ;;
+    none)
+      _EZA_HEAD+=("B")
+      ;;
+  esac
+  # Get the tail long-options
+  if zstyle -t ':omz:plugins:eza' 'dirs-first'; then
+    _EZA_TAIL+=("--group-directories-first")
+  fi
+  if zstyle -t ':omz:plugins:eza' 'git-status'; then
+    _EZA_TAIL+=("--git")
+  fi
+  if zstyle -t ':omz:plugins:eza' 'icons'; then
+    _EZA_TAIL+=("--icons=auto")
+  fi
+  zstyle -s ':omz:plugins:eza' 'color-scale' _val
+  if [[ $_val ]]; then
+    _EZA_TAIL+=("--color-scale=$_val")
+  fi
+  zstyle -s ':omz:plugins:eza' 'color-scale-mode' _val
+  if [[ $_val == (gradient|fixed) ]]; then
+    _EZA_TAIL+=("--color-scale-mode=$_val")
+  fi
+  zstyle -s ':omz:plugins:eza' 'time-style' _val
+  if [[ $_val ]]; then
+    _EZA_TAIL+=("--time-style='$_val'")
+  fi
+  if zstyle -t ":omz:plugins:eza" "hyperlink"; then
+    _EZA_TAIL+=("--hyperlink")
+  fi
+}
+
+_configure_eza
+
+function _alias_eza() {
+  local _head="${(j::)_EZA_HEAD}$2"
+  local _tail="${(j: :)_EZA_TAIL}"
+  alias "$1"="eza${_head:+ -}${_head}${_tail:+ }${_tail}${3:+ }$3"
+}
+
+_alias_eza la   la
+_alias_eza ldot ld ".*"
+_alias_eza lD   lD
+_alias_eza lDD  lDa
+_alias_eza ll   l
+_alias_eza ls
+_alias_eza lsd  d
+_alias_eza lsdl dl
+_alias_eza lS   "l -ssize"
+_alias_eza lT   "l -snewest"
+
+unfunction _alias_eza
+unfunction _configure_eza
+unset _EZA_HEAD
+unset _EZA_TAIL
diff --git a/zsh/plugins/fancy-ctrl-z/README.md b/zsh/plugins/fancy-ctrl-z/README.md
index f1b1dfa..7766c51 100644
--- a/zsh/plugins/fancy-ctrl-z/README.md
+++ b/zsh/plugins/fancy-ctrl-z/README.md
@@ -1,14 +1,24 @@
-# Use Ctrl-Z to switch back to Vim
+# fancy-ctrl-z
 
-I frequently need to execute random commands in my shell. To achieve it I pause 
+Allows pressing Ctrl-Z again to switch back to a background job.
+
+To use it, add `fancy-ctrl-z` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fancy-ctrl-z)
+```
+
+## Motivation
+
+I frequently need to execute random commands in my shell. To achieve it I pause
 Vim by pressing Ctrl-z, type command and press fg<Enter> to switch back to Vim.
-The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back 
-to Vim. I could not find a solution, so I developed one on my own that 
+The fg part really hurts me. I just wanted to hit Ctrl-z once again to get back
+to Vim. I could not find a solution, so I developed one on my own that
 works wonderfully with ZSH.
 
 Source: http://sheerun.net/2014/03/21/how-to-boost-your-vim-productivity/
 
-Credits: 
+Credits:
 - original idea by @sheerun
 - added to OMZ by @mbologna
 
diff --git a/zsh/plugins/fasd/README.md b/zsh/plugins/fasd/README.md
index a5c74e5..7c44ac8 100644
--- a/zsh/plugins/fasd/README.md
+++ b/zsh/plugins/fasd/README.md
@@ -10,7 +10,7 @@ plugins=(... fasd)
 
 ## Installation
 
-Please find detailed installation guide [`here`](https://github.com/clvv/fasd#install)
+Please find detailed installation guide [`here`](https://github.com/whjvenyl/fasd#install)
 
 ## Aliases
 
diff --git a/zsh/plugins/fastfile/README.md b/zsh/plugins/fastfile/README.md
index 32f619f..7291fde 100644
--- a/zsh/plugins/fastfile/README.md
+++ b/zsh/plugins/fastfile/README.md
@@ -71,13 +71,13 @@ them, add `<variable>=<value>` to your zshrc file, before Oh My Zsh is sourced.
 For example: `fastfile_var_prefix='@'`.
 
 - `fastfile_var_prefix`: prefix for the global aliases created. Controls the prefix of the
-  created global aliases.  
+  created global aliases.
   **Default:** `§` (section sign), easy to type in a german keyboard via the combination
   [`⇧ Shift`+`3`](https://en.wikipedia.org/wiki/German_keyboard_layout#/media/File:KB_Germany.svg),
   or using `⌥ Option`+`6` in macOS.
 
 - `fastfile_dir`: directory where the fastfile shortcuts are stored. Needs to end
-  with a trailing slash.  
+  with a trailing slash.
   **Default:** `$HOME/.fastfile/`.
 
 ## Author
diff --git a/zsh/plugins/fastfile/fastfile.plugin.zsh b/zsh/plugins/fastfile/fastfile.plugin.zsh
index 896fed5..86f224b 100644
--- a/zsh/plugins/fastfile/fastfile.plugin.zsh
+++ b/zsh/plugins/fastfile/fastfile.plugin.zsh
@@ -5,8 +5,8 @@
 # If they are not set yet, they will be
 # overwritten with their default values
 
-default fastfile_dir        "${HOME}/.fastfile"
-default fastfile_var_prefix "§"
+fastfile_dir="${fastfile_dir:-${HOME}/.fastfile}"
+fastfile_var_prefix="${fastfile_var_prefix:-§}"
 
 ###########################
 # Impl
diff --git a/zsh/plugins/fd/README.md b/zsh/plugins/fd/README.md
deleted file mode 100644
index f334161..0000000
--- a/zsh/plugins/fd/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# fd
-
-This plugin adds completion for the file search tool [`fd`](https://github.com/sharkdp/fd), also known as `fd-find`.
-
-To use it, add `fd` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... fd)
-```
diff --git a/zsh/plugins/fd/_fd b/zsh/plugins/fd/_fd
deleted file mode 100644
index 45b8ca4..0000000
--- a/zsh/plugins/fd/_fd
+++ /dev/null
@@ -1,273 +0,0 @@
-#compdef fd
-
-##
-# zsh completion function for fd
-#
-# Based on ripgrep completion function.
-# Originally based on code from the zsh-users project — see copyright notice
-# below.
-
-autoload -U is-at-least
-
-_fd() {
-  local curcontext="$curcontext" no='!' ret=1
-  local -a context line state state_descr _arguments_options fd_types fd_args
-  local -A opt_args
-
-  if is-at-least 5.2; then
-    _arguments_options=( -s -S )
-  else
-    _arguments_options=( -s )
-  fi
-
-  fd_types=(
-    {f,file}'\:"regular files"'
-    {d,directory}'\:"directories"'
-    {l,symlink}'\:"symbolic links"'
-    {e,empty}'\:"empty files or directories"'
-    {x,executable}'\:"executable (files)"'
-    {s,socket}'\:"sockets"'
-    {p,pipe}'\:"named pipes (FIFOs)"'
-  )
-
-  # Do not complete rare options unless either the current prefix
-  # matches one of those options or the user has the `complete-all`
-  # style set. Note that this prefix check has to be updated manually to account
-  # for all of the potential negation options listed below!
-  if
-    # (--[bpsu]* => match all options marked with '$no')
-    [[ $PREFIX$SUFFIX == --[bopsu]* ]] ||
-    zstyle -t ":complete:$curcontext:*" complete-all
-  then
-    no=
-  fi
-
-  # We make heavy use of argument groups here to prevent the option specs from
-  # growing unwieldy. These aren't supported in zsh <5.4, though, so we'll strip
-  # them out below if necessary. This makes the exclusions inaccurate on those
-  # older versions, but oh well — it's not that big a deal
-  fd_args=(
-    + '(hidden)' # hidden files
-    {-H,--hidden}'[search hidden files/directories]'
-
-    + '(no-ignore-full)' # all ignore files
-    '(no-ignore-partial)'{-I,--no-ignore}"[don't respect .(git|fd)ignore and global ignore files]"
-    $no'(no-ignore-partial)*'{-u,--unrestricted}'[alias for --no-ignore, when repeated also alias for --hidden]'
-
-    + no-ignore-partial # some ignore files
-    "(no-ignore-full --no-ignore-vcs)--no-ignore-vcs[don't respect .gitignore files]"
-    "!(no-ignore-full --no-global-ignore-file)--no-global-ignore-file[don't respect the global ignore file]"
-    $no'(no-ignore-full --no-ignore-parent)--no-ignore-parent[]'
-
-    + '(case)' # case-sensitivity
-    {-s,--case-sensitive}'[perform a case-sensitive search]'
-    {-i,--ignore-case}'[perform a case-insensitive search]'
-
-    + '(regex-pattern)' # regex-based search pattern
-    '(no-regex-pattern)--regex[perform a regex-based search (default)]'
-
-    + '(no-regex-pattern)' # non-regex-based search pattern
-    {-g,--glob}'[perform a glob-based search]'
-    {-F,--fixed-strings}'[treat pattern as literal string instead of a regex]'
-
-    + '(match-full)' # match against full path
-    {-p,--full-path}'[match the pattern against the full path instead of the basename]'
-
-    + '(follow)' # follow symlinks
-    {-L,--follow}'[follow symbolic links to directories]'
-
-    + '(abs-path)' # show absolute paths
-    '(long-listing)'{-a,--absolute-path}'[show absolute paths instead of relative paths]'
-
-    + '(null-sep)' # use null separator for output
-    '(long-listing)'{-0,--print0}'[separate search results by the null character]'
-
-    + '(long-listing)' # long-listing output
-    '(abs-path null-sep max-results exec-cmds)'{-l,--list-details}'[use a long listing format with file metadata]'
-
-    + '(max-results)' # max number of results
-    '(long-listing exec-cmds)--max-results=[limit number of search results to given count and quit]:count'
-    '(long-listing exec-cmds)-1[limit to a single search result and quit]'
-
-    + '(fs-errors)' # file-system errors
-    $no'--show-errors[enable the display of filesystem errors]'
-
-    + '(fs-traversal)' # file-system traversal
-    $no"--one-file-system[don't descend into directories on other file systems]"
-    '!--mount'
-    '!--xdev'
-
-    + dir-depth # directory depth
-    '(--exact-depth -d --max-depth)'{-d+,--max-depth=}'[set max directory depth to descend when searching]:depth'
-    '!(--exact-depth -d --max-depth)--maxdepth:depth'
-    '(--exact-depth --min-depth)--min-depth=[set directory depth to descend before start searching]:depth'
-    '(--exact-depth -d --max-depth --maxdepth --min-depth)--exact-depth=[only search at the exact given directory depth]:depth'
-
-    + prune # pruning
-    "--prune[don't traverse into matching directories]"
-
-    + filter-misc # filter search
-    '*'{-t+,--type=}"[filter search by type]:type:(($fd_types))"
-    '*'{-e+,--extension=}'[filter search by file extension]:extension'
-    '*'{-E+,--exclude=}'[exclude files/directories that match the given glob pattern]:glob pattern'
-    '*'{-S+,--size=}'[limit search by file size]:size limit:->size'
-    '(-o --owner)'{-o+,--owner=}'[filter by owning user and/or group]:owner and/or group:->owner'
-
-    + ignore-file # extra ignore files
-    '*--ignore-file=[add a custom, low-precedence ignore-file with .gitignore format]: :_files'
-
-    + '(filter-mtime-newer)' # filter by files modified after than
-    '--changed-within=[limit search to files/directories modified within the given date/duration]:date or duration'
-    '!--change-newer-than=:date/duration'
-    '!--newer=:date/duration'
-
-    + '(filter-mtime-older)' # filter by files modified before than
-    '--changed-before=[limit search to files/directories modified before the given date/duration]:date or duration'
-    '!--change-older-than=:date/duration'
-    '!--older=:date/duration'
-
-    + '(color)' # colorize output
-    {-c+,--color=}'[declare when to colorize search results]:when to colorize:((
-      auto\:"show colors if the output goes to an interactive console (default)"
-      never\:"do not use colorized output"
-      always\:"always use colorized output"
-    ))'
-
-    + '(threads)'
-    {-j+,--threads=}'[set the number of threads for searching and executing]:number of threads'
-
-    + '(exec-cmds)' # execute command
-    '(long-listing max-results)'{-x+,--exec=}'[execute command for each search result]:command: _command_names -e:*\;::program arguments: _normal'
-    '(long-listing max-results)'{-X+,--exec-batch=}'[execute command for all search results at once]:command: _command_names -e:*\;::program arguments: _normal'
-    '(long-listing max-results)--batch-size=[max number of args for each -X call]:size'
-
-    + other
-    '!(--max-buffer-time)--max-buffer-time=[set amount of time to buffer before showing output]:time (ms)'
-
-    + '(about)' # about flags
-    '(: * -)'{-h,--help}'[display help message]'
-    '(: * -)'{-v,--version}'[display version information]'
-
-    + path-sep # set path separator for output
-    $no'(--path-separator)--path-separator=[set the path separator to use when printing file paths]:path separator'
-
-    + search-path
-    $no'(--base-directory)--base-directory=[change the current working directory to the given path]:directory:_files -/'
-    $no'(*)*--search-path=[set search path (instead of positional <path> arguments)]:directory:_files -/'
-
-    + strip-cwd-prefix
-    $no'(strip-cwd-prefix exec-cmds)--strip-cwd-prefix[Strip ./ prefix when output is redirected]'
-
-    + args # positional arguments
-    '1: :_guard "^-*" pattern'
-    '(--search-path)*:directory:_files -/'
-  )
-
-  # Strip out argument groups where unsupported (see above)
-  is-at-least 5.4 ||
-  fd_args=( ${(@)args:#(#i)(+|[a-z0-9][a-z0-9_-]#|\([a-z0-9][a-z0-9_-]#\))} )
-
-  _arguments $_arguments_options : $fd_args && ret=0
-
-  case ${state} in
-    owner)
-      compset -P '(\\|)\!'
-      if compset -P '*:'; then
-        _groups && ret=0
-      else
-        if
-          compset -S ':*' ||
-          # Do not add the colon suffix when completing "!user<TAB>
-          # (with a starting double-quote) otherwise pressing tab again
-          # after the inserted colon "!user:<TAB> will complete history modifiers
-          [[ $IPREFIX == (\\|\!)*  && ($QIPREFIX == \"* && -z $QISUFFIX) ]]
-        then
-          _users && ret=0
-        else
-          local q
-          # Since quotes are needed when using the negation prefix !,
-          # automatically remove the colon suffix also when closing the quote
-          if [[ $QIPREFIX == [\'\"]* ]]; then
-            q=${QIPREFIX:0:1}
-          fi
-          _users -r ": \t\n\-$q" -S : && ret=0
-        fi
-      fi
-      ;;
-
-    size)
-      if compset -P '[-+][0-9]##'; then
-        local -a suff=(
-          'B:bytes'
-          'K:kilobytes  (10^3  = 1000   bytes)'
-          'M:megabytes  (10^6  = 1000^2 bytes)'
-          'G:gigabytes  (10^9  = 1000^3 bytes)'
-          'T:terabytes  (10^12 = 1000^4 bytes)'
-          'Ki:kibibytes  ( 2^10 = 1024   bytes)'
-          'Mi:mebibytes  ( 2^20 = 1024^2 bytes)'
-          'Gi:gigibytes  ( 2^30 = 1024^3 bytes)'
-          'Ti:tebibytes  ( 2^40 = 1024^4 bytes)'
-        )
-        _describe -t units 'size limit units' suff -V 'units'
-      elif compset -P '[-+]'; then
-        _message -e 'size limit number (full format: <+-><number><unit>)'
-      else
-        _values 'size limit prefix (full format: <prefix><number><unit>)' \
-          '\+[file size must be greater or equal to]'\
-          '-[file size must be less than or equal to]' && ret=0
-      fi
-      ;;
-  esac
-
-  return ret
-}
-
-_fd "$@"
-
-# ------------------------------------------------------------------------------
-# Copyright (c) 2011 GitHub zsh-users - http://github.com/zsh-users
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the zsh-users nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-#  Completion script for fd
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-#  * smancill (https://github.com/smancill)
-#
-# ------------------------------------------------------------------------------
-
-# Local Variables:
-# mode: shell-script
-# coding: utf-8-unix
-# indent-tabs-mode: nil
-# sh-indentation: 2
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/plugins/fig/README.md b/zsh/plugins/fig/README.md
deleted file mode 100644
index 3861958..0000000
--- a/zsh/plugins/fig/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# Fig plugin
-
-This plugin sets up completion for [Fig](https://fig.io/).
-
-To use it, add `fig` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... fig)
-```
diff --git a/zsh/plugins/fig/fig.plugin.zsh b/zsh/plugins/fig/fig.plugin.zsh
deleted file mode 100644
index cddb6c7..0000000
--- a/zsh/plugins/fig/fig.plugin.zsh
+++ /dev/null
@@ -1,13 +0,0 @@
-if ! (( $+commands[fig] )); then
-  return
-fi
-
-# If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `fig`. Otherwise, compinit will have already done that
-if [[ ! -f "$ZSH_CACHE_DIR/completions/_fig" ]]; then
-  autoload -Uz _fig
-  typeset -g -A _comps
-  _comps[fig]=_fig
-fi
-
-fig completion zsh >| "$ZSH_CACHE_DIR/completions/_fig" &|
diff --git a/zsh/plugins/firewalld/firewalld.plugin.zsh b/zsh/plugins/firewalld/firewalld.plugin.zsh
index 5b10906..b2c0f64 100644
--- a/zsh/plugins/firewalld/firewalld.plugin.zsh
+++ b/zsh/plugins/firewalld/firewalld.plugin.zsh
@@ -9,7 +9,7 @@ function fwl () {
   zones=("${(@f)$(sudo firewall-cmd --get-active-zones | grep -v 'interfaces\|sources')}")
 
   for i in $zones; do
-    sudo firewall-cmd --zone $i --list-all
+    sudo firewall-cmd --zone ${i/ \(default\)} --list-all
   done
 
   echo 'Direct Rules:'
diff --git a/zsh/plugins/flutter/_flutter b/zsh/plugins/flutter/_flutter
deleted file mode 100644
index ab6ce42..0000000
--- a/zsh/plugins/flutter/_flutter
+++ /dev/null
@@ -1,37 +0,0 @@
-#compdef flutter
-#autoload
-
-local -a _1st_arguments
-_1st_arguments=(
-  "analyze":"Analyze the project's Dart code."
-  "assemble":"Assemble and build flutter resources."
-  "attach":"Attach to a running application."
-  "build":"Flutter build commands."
-  "channel":"List or switch flutter channels."
-  "clean":"Delete the build/ and .dart_tool/ directories."
-  "config":"Configure Flutter settings."
-  "create":"Create a new Flutter project."
-  "devices":"List all connected devices."
-  "doctor":"Show information about the installed tooling."
-  "drive":"Runs Flutter Driver tests for the current project."
-  "emulators":"List, launch and create emulators."
-  "format":" Format one or more dart files."
-  "help":"Display help information for flutter."
-  "install":"Install a Flutter app on an attached device."
-  "logs":"Show log output for running Flutter apps."
-  "make-host-app-editable":"Moves host apps from generated directories to non-generated directories so that they can be edited by developers."
-  "precache":"Populates the Flutter tool's cache of binary artifacts."
-  "pub":"Commands for managing Flutter packages."
-  "run":"Run your Flutter app on an attached device."
-  "screenshot":"Take a screenshot from a connected device."
-  "test":"Run Flutter unit tests for the current project."
-  "upgrade":"Upgrade your copy of Flutter."
-  "version":"List or switch flutter versions."
-)
-
-_arguments -C '*:: :->subcmds'
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "flutter command" _1st_arguments
-  return
-fi
diff --git a/zsh/plugins/flutter/flutter.plugin.zsh b/zsh/plugins/flutter/flutter.plugin.zsh
index 44d196c..5e853b7 100644
--- a/zsh/plugins/flutter/flutter.plugin.zsh
+++ b/zsh/plugins/flutter/flutter.plugin.zsh
@@ -26,4 +26,4 @@ if [[ ! -f "$ZSH_CACHE_DIR/completions/_flutter" ]]; then
   _comps[flutter]=_flutter
 fi
 
-flutter zsh-completion >| "$ZSH_CACHE_DIR/completions/_flutter" &|
\ No newline at end of file
+flutter zsh-completion < /dev/null >| "$ZSH_CACHE_DIR/completions/_flutter" &|
\ No newline at end of file
diff --git a/zsh/plugins/fluxcd/README.md b/zsh/plugins/fluxcd/README.md
new file mode 100644
index 0000000..9723fcc
--- /dev/null
+++ b/zsh/plugins/fluxcd/README.md
@@ -0,0 +1,9 @@
+# FluxCD plugin
+
+This plugin adds completion for [FluxCD](https://fluxcd.io), an open and extensible continuous delivery solution for Kubernetes. Powered by GitOps Toolkit.
+
+To use it, add `fluxcd` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... fluxcd)
+```
diff --git a/zsh/plugins/fluxcd/fluxcd.plugin.zsh b/zsh/plugins/fluxcd/fluxcd.plugin.zsh
new file mode 100644
index 0000000..d30866a
--- /dev/null
+++ b/zsh/plugins/fluxcd/fluxcd.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the FluxCD CLI (flux).
+if (( ! $+commands[flux] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `flux`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_flux" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _flux
+  _comps[flux]=_flux
+fi
+
+flux completion zsh >| "$ZSH_CACHE_DIR/completions/_flux" &|
diff --git a/zsh/plugins/foot/README.md b/zsh/plugins/foot/README.md
new file mode 100644
index 0000000..67777d9
--- /dev/null
+++ b/zsh/plugins/foot/README.md
@@ -0,0 +1,35 @@
+# foot
+
+This plugin adds shell integration for [foot, a fast, lightweight and
+minimalistic Wayland terminal emulator](https://codeberg.org/dnkl/foot).
+
+To use, add `foot` to the list of plugins in your `.zshrc` file:
+
+```zsh
+plugins=(... foot)
+```
+
+## Spawning new terminal instances in the current working directory
+
+When spawning a new terminal instance (with `ctrl+shift+n` by default), the new
+instance will start in the current working directory.
+
+## Jumping between prompts
+
+Foot can move the current viewport to focus prompts of already executed
+commands (bound to ctrl+shift+z/x by default).
+
+## Piping last command's output
+
+The key binding `pipe-command-output` can pipe the last command's output to an
+application of your choice (similar to the other `pipe-*` key bindings):
+
+```
+[key-bindings]
+pipe-command-output=[sh -c "f=$(mktemp); cat - > $f; footclient emacsclient -nw $f; rm $f"] Control+Shift+g
+```
+
+When pressing ctrl+shift+g, the last command's output is written to a
+temporary file, then an emacsclient is started in a new footclient instance.
+The temporary file is removed after the footclient instance has closed.
+
diff --git a/zsh/plugins/foot/foot.plugin.zsh b/zsh/plugins/foot/foot.plugin.zsh
new file mode 100644
index 0000000..c1d077e
--- /dev/null
+++ b/zsh/plugins/foot/foot.plugin.zsh
@@ -0,0 +1,10 @@
+function precmd {
+  print -Pn "\e]133;A\e\\"
+  if ! builtin zle; then
+    print -n "\e]133;D\e\\"
+  fi
+}
+
+function preexec {
+  print -n "\e]133;C\e\\"
+}
diff --git a/zsh/plugins/forklift/forklift.plugin.zsh b/zsh/plugins/forklift/forklift.plugin.zsh
index 8588948..4bc7495 100644
--- a/zsh/plugins/forklift/forklift.plugin.zsh
+++ b/zsh/plugins/forklift/forklift.plugin.zsh
@@ -2,6 +2,7 @@
 # Author: Adam Strzelecki nanoant.com, modified by Bodo Tasche bitboxer.de
 #         Updated to support ForkLift 2 and ForkLift 3 by Johan Kaving
 #         Updated to support ForkLift from Setapp by Paul Rudkin
+#         Updated to support ForkLift 4 by Michal Szymanski (misiektoja)
 #
 # Usage:
 #   fl [<folder>]
@@ -58,7 +59,7 @@ function fl {
     tell application forkLiftSetapp
         activate
         set forkLiftVersion to version
-    end tell	
+    end tell
   else if forkLift3 is not null and application forkLift3 is running then
     tell application forkLift3
         activate
@@ -84,7 +85,7 @@ function fl {
     else if forkLift is not null then
         set appName to forkLift
     end if
-    
+
     tell application appName
         activate
         set forkLiftVersion to version
@@ -110,6 +111,11 @@ function fl {
             tell pop over of list of group of splitter group of splitter group of topWindow
                 set value of text field 1 to "$PWD"
             end tell
+        else if forkLiftVersion starts with "4" then
+            tell pop over of list of group of splitter group of splitter group of topWindow
+                keystroke "$PWD"
+                delay 0.1
+            end tell
         else
             tell sheet 1 of topWindow
                 set value of text field 1 to "$PWD"
diff --git a/zsh/plugins/frontend-search/README.md b/zsh/plugins/frontend-search/README.md
index 0500589..9207950 100644
--- a/zsh/plugins/frontend-search/README.md
+++ b/zsh/plugins/frontend-search/README.md
@@ -60,12 +60,22 @@ Available search contexts are:
 | typescript    | `https://google.com/search?as_sitesearch=www.typescriptlang.org/docs&as_q=` |
 | unheap        | `http://www.unheap.com/?s=`                                                 |
 | vuejs         | `https://www.google.com/search?as_sitesearch=vuejs.org&as_q=`               |
+| nextjs        | `https://www.google.com/search?as_sitesearch=nextjs.org&as_q=`              |
 
 If you want to have another context, open an Issue and tell us!
 
 ## Fallback search behaviour
 
-The plugin will use Google as a fallback if the docs site for a search context does not have a search function. You can set the fallback search engine to DuckDuckGo by setting  `FRONTEND_SEARCH_FALLBACK='duckduckgo'` in your `~/.zshrc` file before Oh My Zsh is sourced.
+The plugin will use Google as a fallback if the docs site for a search context does not have a search
+function. You can set the fallback search engine to DuckDuckGo by setting
+`FRONTEND_SEARCH_FALLBACK='duckduckgo'` in your `~/.zshrc` file before Oh My Zsh is sourced.
+
+## DuckDuckGo Lucky Search
+
+Enable DuckDuckGo's "ducky" (lucky) search feature to automatically access the top search result. This feature
+is optimized for DuckDuckGo, as Google redirects to an intermediate page. The FRONTEND_SEARCH_FALLBACK_LUCKY
+environment variable triggers the use of DuckDuckGo's lucky search, rendering the FRONTEND_SEARCH_FALLBACK
+setting unnecessary in this context.
 
 ## Author
 
diff --git a/zsh/plugins/frontend-search/_frontend b/zsh/plugins/frontend-search/_frontend
index 15f8d23..aca4920 100644
--- a/zsh/plugins/frontend-search/_frontend
+++ b/zsh/plugins/frontend-search/_frontend
@@ -37,7 +37,7 @@ function _frontend() {
     'lodash: Search in Lo-Dash website'
     'mdn: Search in MDN website'
     'nodejs: Search in NodeJS website'
-    'npmjs: Search in NPMJS website'
+    'npmjs: Search in npmjs website'
     'packagephobia: Search in Packagephobia website'
     'qunit: Search in Qunit website'
     'reactjs: Search in React website'
diff --git a/zsh/plugins/frontend-search/frontend-search.plugin.zsh b/zsh/plugins/frontend-search/frontend-search.plugin.zsh
index b9e2fe9..c96596e 100644
--- a/zsh/plugins/frontend-search/frontend-search.plugin.zsh
+++ b/zsh/plugins/frontend-search/frontend-search.plugin.zsh
@@ -27,12 +27,19 @@ alias stackoverflow='frontend stackoverflow'
 alias typescript='frontend typescript'
 alias unheap='frontend unheap'
 alias vuejs='frontend vuejs'
+alias nextjs='frontend nextjs'
 
 function _frontend_fallback() {
-  case "$FRONTEND_SEARCH_FALLBACK" in
-    duckduckgo) echo "https://duckduckgo.com/?sites=$1&q=" ;;
-    *) echo "https://google.com/search?as_sitesearch=$1&as_q=" ;;
-  esac
+  if [[ "$FRONTEND_SEARCH_FALLBACK_LUCKY" == "true" ]]; then
+    case true in
+      *) echo "https://duckduckgo.com/?q=!ducky+site%3A$1+" ;;
+    esac
+  else
+    case "$FRONTEND_SEARCH_FALLBACK" in
+      duckduckgo) echo "https://duckduckgo.com/?sites=$1&q=" ;;
+      *) echo "https://google.com/search?as_sitesearch=$1&as_q=" ;;
+    esac
+  fi
 }
 
 function frontend() {
@@ -70,6 +77,7 @@ function frontend() {
     typescript     $(_frontend_fallback 'www.typescriptlang.org/docs')
     unheap         'http://www.unheap.com/?s='
     vuejs          $(_frontend_fallback 'vuejs.org')
+    nextjs         $(_frontend_fallback 'nextjs.org')
   )
 
   # show help for command list
@@ -81,7 +89,7 @@ function frontend() {
     print -P ""
     print -P "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, packagephobia"
     print -P "  dartlang, emberjs, fontello, flowtype, github, html5please, jestjs, jquery, lodash,"
-    print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
+    print -P "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia, nextjs"
     print -P ""
     print -P "For example: frontend npmjs mocha (or just: npmjs mocha)."
     print -P ""
@@ -96,7 +104,7 @@ function frontend() {
     echo ""
     echo "  angular, angularjs, bem, bootsnipp, caniuse, codepen, compassdoc, cssflow, packagephobia"
     echo "  dartlang, emberjs, fontello, github, html5please, jest, jquery, lodash,"
-    echo "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia"
+    echo "  mdn, npmjs, nodejs, qunit, reactjs, smacss, stackoverflow, unheap, vuejs, bundlephobia, nextjs"
     echo ""
     return 1
   fi
diff --git a/zsh/plugins/fzf/fzf.plugin.zsh b/zsh/plugins/fzf/fzf.plugin.zsh
index a946cf7..e244b4c 100644
--- a/zsh/plugins/fzf/fzf.plugin.zsh
+++ b/zsh/plugins/fzf/fzf.plugin.zsh
@@ -1,3 +1,16 @@
+function fzf_setup_using_fzf() {
+  (( ${+commands[fzf]} )) || return 1
+
+  # we remove "fzf " prefix, this fixes really old fzf versions behaviour
+  # see https://github.com/ohmyzsh/ohmyzsh/issues/12387
+  local fzf_ver=${"$(fzf --version)"#fzf }
+
+  autoload -Uz is-at-least
+  is-at-least 0.48.0 ${${(s: :)fzf_ver}[1]} || return 1
+
+  eval "$(fzf --zsh)"
+}
+
 function fzf_setup_using_base_dir() {
   local fzf_base fzf_shell fzfdirs dir
 
@@ -8,7 +21,9 @@ function fzf_setup_using_base_dir() {
       "${HOME}/.fzf"
       "${HOME}/.nix-profile/share/fzf"
       "${XDG_DATA_HOME:-$HOME/.local/share}/fzf"
+      "${MSYSTEM_PREFIX}/share/fzf"
       "/usr/local/opt/fzf"
+      "/opt/homebrew/opt/fzf"
       "/usr/share/fzf"
       "/usr/local/share/examples/fzf"
     )
@@ -59,8 +74,8 @@ function fzf_setup_using_base_dir() {
 
 
 function fzf_setup_using_debian() {
-  if (( ! $+commands[dpkg] )) || ! dpkg -s fzf &>/dev/null; then
-    # Either not a debian based distro, or no fzf installed
+  if (( ! $+commands[apt] && ! $+commands[apt-get] )); then
+    # Not a debian based distro
     return 1
   fi
 
@@ -71,11 +86,19 @@ function fzf_setup_using_debian() {
 
   case $PREFIX in
     *com.termux*)
+      if [[ ! -f "${PREFIX}/bin/fzf" ]]; then
+        # fzf not installed
+        return 1
+      fi
       # Support Termux package
       completions="${PREFIX}/share/fzf/completion.zsh"
       key_bindings="${PREFIX}/share/fzf/key-bindings.zsh"
       ;;
     *)
+      if [[ ! -d /usr/share/doc/fzf/examples ]]; then
+        # fzf not installed
+        return 1
+      fi
       # Determine completion file path: first bullseye/sid, then buster/stretch
       completions="/usr/share/doc/fzf/examples/completion.zsh"
       [[ -f "$completions" ]] || completions="/usr/share/zsh/vendor-completions/_fzf"
@@ -125,6 +148,27 @@ function fzf_setup_using_opensuse() {
   return 0
 }
 
+function fzf_setup_using_fedora() {
+  (( $+commands[fzf] )) || return 1
+
+  local completions="/usr/share/zsh/site-functions/fzf"
+  local key_bindings="/usr/share/fzf/shell/key-bindings.zsh"
+
+  if [[ ! -f "$completions" || ! -f "$key_bindings" ]]; then
+    return 1
+  fi
+
+  if [[ -o interactive && "$DISABLE_FZF_AUTO_COMPLETION" != "true" ]]; then
+    source "$completions" 2>/dev/null
+  fi
+
+  if [[ "$DISABLE_FZF_KEY_BINDINGS" != "true" ]]; then
+    source "$key_bindings" 2>/dev/null
+  fi
+
+  return 0
+}
+
 function fzf_setup_using_openbsd() {
   # openBSD installs fzf in /usr/local/bin/fzf
   if [[ "$OSTYPE" != openbsd* ]] || (( ! $+commands[fzf] )); then
@@ -178,7 +222,7 @@ function fzf_setup_using_macports() {
   (( $+commands[fzf] )) || return 1
 
   # The fzf-zsh-completion package installs the auto-completion in
-  local completions="/opt/local/share/zsh/site-functions/fzf"
+  local completions="/opt/local/share/fzf/shell/completion.zsh"
   # The fzf-zsh-completion package installs the key-bindings file in
   local key_bindings="/opt/local/share/fzf/shell/key-bindings.zsh"
 
@@ -207,9 +251,11 @@ Please add `export FZF_BASE=/path/to/fzf/install/dir` to your .zshrc
 EOF
 }
 
-fzf_setup_using_openbsd \
+fzf_setup_using_fzf \
+  || fzf_setup_using_openbsd \
   || fzf_setup_using_debian \
   || fzf_setup_using_opensuse \
+  || fzf_setup_using_fedora \
   || fzf_setup_using_cygwin \
   || fzf_setup_using_macports \
   || fzf_setup_using_base_dir \
diff --git a/zsh/plugins/gas/README.md b/zsh/plugins/gas/README.md
index 47b3fb9..a0a7a56 100644
--- a/zsh/plugins/gas/README.md
+++ b/zsh/plugins/gas/README.md
@@ -1,6 +1,6 @@
 # Gas plugin
 
-This plugin adds autocompletion for the [gas](http://walle.github.com/gas) command,
+This plugin adds autocompletion for the [gas](http://ramblingsby.me/gas/) command,
 a utility to manage Git authors.
 
 To use it, add `gas` to the plugins array of your zshrc file:
diff --git a/zsh/plugins/gatsby/README.md b/zsh/plugins/gatsby/README.md
index 36846a2..cc1bd39 100644
--- a/zsh/plugins/gatsby/README.md
+++ b/zsh/plugins/gatsby/README.md
@@ -1,6 +1,6 @@
 # gatsby autocomplete plugin
 
-* Adds autocomplete options for all gatsby commands.
+Adds autocomplete options for all gatsby commands.
 
 ## Requirements
 
diff --git a/zsh/plugins/gb/README.md b/zsh/plugins/gb/README.md
deleted file mode 100644
index 822c29a..0000000
--- a/zsh/plugins/gb/README.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# `gb` plugin
-
-> A project based build tool for the Go programming language.
-
-See https://getgb.io for the full `gb` documentation
-
-* * * *
-
-- Adds completion support for all `gb` commands.
-- Also supports completion for the [`gb-vendor` plugin](https://godoc.org/github.com/constabulary/gb/cmd/gb-vendor).
-
-To use it, add `gb` to your plugins array:
-```sh
-plugins=(... gb)
-```
-
-## Caveats
-
-The `git` plugin defines an alias `gb` that usually conflicts with the `gb` program.
-If you're having trouble with it, remove it by adding `unalias gb` at the end of your
-zshrc file.
diff --git a/zsh/plugins/gb/_gb b/zsh/plugins/gb/_gb
deleted file mode 100644
index 8148adf..0000000
--- a/zsh/plugins/gb/_gb
+++ /dev/null
@@ -1,111 +0,0 @@
-#compdef gb
-#autoload
-
-_gb () {
-	local ret=1 state
-	_arguments -C ':command:->command' '*::options:->options' && ret=0
-
-	case $state in
-	(command)
-		local -a subcommands
-		subcommands=(
-			"build:build a package"
-			"doc:show documentation for a package or symbol"
-			"env:print project environment variables"
-			"generate:generate Go files by processing source"
-			"help:displays the help"
-			"info:info returns information about this project"
-			"list:list the packages named by the importpaths"
-			"test:test packages"
-			"vendor:manage your vendored dependencies"
-		)
-		_describe -t subcommands 'gb subcommands' subcommands && ret=0
-		;;
-	(options)
-		case $line[1] in
-		(build)
-			_arguments \
-				-f'[ignore cached packages]' \
-				-F'[do not cache packages]' \
-				-q'[decreases verbosity]' \
-				-P'[the number of build jobs to run in parallel]' \
-				-R'[sets the base of the project root search path]' \
-				-dotfile'[output a dot formatted file of the build steps]' \
-				-ldflags'["flag list" arguments to pass to the linker]' \
-				-gcflags'["arg list" arguments to pass to the compiler]' \
-				-race'[enable data race detection]' \
-				-tags'["tag list" additional build tags]'
-			;;
-		(list)
-			_arguments \
-				-f'[alternate format for the list, using the syntax of package template]' \
-				-s'[read format template from STDIN]' \
-				-json'[prints output in structured JSON format]'
-			;;
-		(test)
-			_arguments \
-				-v'[print output from test subprocess]' \
-				-ldflags'["flag list" arguments to pass to the linker]' \
-				-gcflags'["arg list" arguments to pass to the compiler]' \
-				-race'[enable data race detection]' \
-				-tags'["tag list" additional build tags]'
-			;;
-		(vendor)
-			_gb-vendor
-		esac
-		;;
-	esac
-
-	return ret
-}
-
-_gb-vendor () {
-	local curcontext="$curcontext" state line
-	_arguments -C ':command:->command' '*::options:->options'
-
-	case $state in
-	(command)
-		local -a subcommands
-		subcommands=(
-			'delete:deletes a local dependency'
-			'fetch:fetch a remote dependency'
-			'list:lists dependencies, one per line'
-			'purge:remove all unreferenced dependencies'
-			'restore:restore dependencies from the manifest'
-			'update:update a local dependency'
-		)
-		_describe -t subcommands 'gb vendor subcommands' subcommands && ret=0
-		;;
-	(options)
-		case $line[1] in
-			(delete)
-				_arguments \
-					-all'[remove all dependencies]'
-				;;
-			(fetch)
-				_arguments \
-					-branch'[fetch from a particular branch]' \
-					-no-recurse'[do not fetch recursively]' \
-					-tag'[fetch the specified tag]' \
-					-revision'[fetch the specific revision from the branch (if supplied)]' \
-					-precaire'[allow the use of insecure protocols]' \
-				;;
-			(list)
-				_arguments \
-					-f'[controls the template used for printing each manifest entry]'
-				;;
-			(restore)
-				_arguments \
-					-precaire'[allow the use of insecure protocols]'
-				;;
-			(update)
-				_arguments \
-					-all'[update all dependencies in the manifest or supply a given dependency]' \
-					-precaire'[allow the use of insecure protocols]'
-				;;
-		esac
-		;;
-	esac
-}
-
-_gb
diff --git a/zsh/plugins/gcloud/gcloud.plugin.zsh b/zsh/plugins/gcloud/gcloud.plugin.zsh
index 9be9d68..fa8f884 100644
--- a/zsh/plugins/gcloud/gcloud.plugin.zsh
+++ b/zsh/plugins/gcloud/gcloud.plugin.zsh
@@ -6,14 +6,19 @@
 if [[ -z "${CLOUDSDK_HOME}" ]]; then
   search_locations=(
     "$HOME/google-cloud-sdk"
+    "/usr/local/share/google-cloud-sdk"
     "/usr/local/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
     "/opt/homebrew/Caskroom/google-cloud-sdk/latest/google-cloud-sdk"
+    "/opt/homebrew/share/google-cloud-sdk"
     "/usr/share/google-cloud-sdk"
     "/snap/google-cloud-sdk/current"
+    "/snap/google-cloud-cli/current"
     "/usr/lib/google-cloud-sdk"
     "/usr/lib64/google-cloud-sdk"
     "/opt/google-cloud-sdk"
+    "/opt/google-cloud-cli"
     "/opt/local/libexec/google-cloud-sdk"
+    "$HOME/.asdf/installs/gcloud/*/"
   )
 
   for gcloud_sdk_location in $search_locations; do
@@ -26,11 +31,9 @@ if [[ -z "${CLOUDSDK_HOME}" ]]; then
 fi
 
 if (( ${+CLOUDSDK_HOME} )); then
-  # Only source this if gcloud isn't already on the path
-  if (( ! $+commands[gcloud] )); then
-    if [[ -f "${CLOUDSDK_HOME}/path.zsh.inc" ]]; then
-      source "${CLOUDSDK_HOME}/path.zsh.inc"
-    fi
+  # Source path file
+  if [[ -f "${CLOUDSDK_HOME}/path.zsh.inc" ]]; then
+    source "${CLOUDSDK_HOME}/path.zsh.inc"
   fi
 
   # Look for completion file in different paths
diff --git a/zsh/plugins/gem/_gem b/zsh/plugins/gem/completions/_gem
similarity index 100%
rename from zsh/plugins/gem/_gem
rename to zsh/plugins/gem/completions/_gem
diff --git a/zsh/plugins/gem/gem.plugin.zsh b/zsh/plugins/gem/gem.plugin.zsh
index 938f5c9..41c434a 100644
--- a/zsh/plugins/gem/gem.plugin.zsh
+++ b/zsh/plugins/gem/gem.plugin.zsh
@@ -4,4 +4,29 @@ alias gemp="gem push *.gem"
 # gemy GEM 0.0.0 = gem yank GEM -v 0.0.0
 function gemy {
 	gem yank $1 -v $2
-}
\ No newline at end of file
+}
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `gem`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_gem" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _gem
+  _comps[gem]=_gem
+fi
+
+# zsh 5.5 already provides completion for `_gem`. With this we ensure that
+# our provided completion (which is not optimal but is enough in most cases)
+# is used for older versions
+autoload -Uz is-at-least
+if is-at-least 5.5; then
+  return 0
+fi
+
+{
+  # Standardized $0 handling
+  # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+  0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+  0="${${(M)0:#/*}:-$PWD/$0}"
+
+  command cp -f "${0:h}/completions/_gem" "$ZSH_CACHE_DIR/completions/_gem"
+} &|
diff --git a/zsh/plugins/git-auto-fetch/README.md b/zsh/plugins/git-auto-fetch/README.md
index e96ab42..0d7431b 100644
--- a/zsh/plugins/git-auto-fetch/README.md
+++ b/zsh/plugins/git-auto-fetch/README.md
@@ -18,7 +18,7 @@ You can change the fetch interval in your .zshrc:
 GIT_AUTO_FETCH_INTERVAL=1200 # in seconds
 ```
 
-A log of `git fetch --all` will be saved in `.git/FETCH_LOG`.
+A log of `git-fetch-all` will be saved in `.git/FETCH_LOG`.
 
 ## Toggle auto-fetch per folder
 
diff --git a/zsh/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh b/zsh/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
index 2df34bb..f8dfec7 100644
--- a/zsh/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
+++ b/zsh/plugins/git-auto-fetch/git-auto-fetch.plugin.zsh
@@ -29,7 +29,7 @@ function git-fetch-all {
     date -R &>! "$gitdir/FETCH_LOG"
     GIT_SSH_COMMAND="command ssh -o BatchMode=yes" \
     GIT_TERMINAL_PROMPT=0 \
-      command git fetch --all 2>/dev/null &>> "$gitdir/FETCH_LOG"
+      command git fetch --all --recurse-submodules=yes 2>/dev/null &>> "$gitdir/FETCH_LOG"
   ) &|
 }
 
diff --git a/zsh/plugins/git-commit/README.md b/zsh/plugins/git-commit/README.md
new file mode 100644
index 0000000..f812ee2
--- /dev/null
+++ b/zsh/plugins/git-commit/README.md
@@ -0,0 +1,47 @@
+# git-commit plugin
+
+The git-commit plugin adds several
+[git aliases](https://www.git-scm.com/docs/git-config#Documentation/git-config.txt-alias) for
+[conventional commit](https://www.conventionalcommits.org/en/v1.0.0/#summary) messages.
+
+To use it, add `git-commit` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... git-commit)
+```
+
+## Syntax
+
+```zsh
+git <type> [(-s, --scope) "<scope>"] [(-a, --attention)] "<message>"
+```
+
+Where `type` is one of the following:
+
+- `build`
+- `chore`
+- `ci`
+- `docs`
+- `feat`
+- `fix`
+- `perf`
+- `refactor`
+- `rev`
+- `style`
+- `test`
+- `wip`
+
+> NOTE: the alias for `revert` type is `rev`, as otherwise it conflicts with the git command of the same name.
+> It will still generate a commit message in the format `revert: <message>`
+
+> ⚠️ Enabling this plugin will (potentially) overwrite all `alias.<type>` that you manually set. Use with
+> care!
+
+## Examples
+
+| Git alias                                     | Command                                              |
+| --------------------------------------------- | ---------------------------------------------------- |
+| `git style "remove trailing whitespace"`      | `git commit -m "style: remove trailing whitespace"`  |
+| `git wip "work in progress"`                  | `git commit -m "work in progress"`                   |
+| `git fix -s "router" "correct redirect link"` | `git commit -m "fix(router): correct redirect link"` |
+| `git rev -s "api" "rollback v2"`              | `git commit -m "revert(api): rollback v2"`           |
diff --git a/zsh/plugins/git-commit/git-commit.plugin.zsh b/zsh/plugins/git-commit/git-commit.plugin.zsh
new file mode 100644
index 0000000..c4df77c
--- /dev/null
+++ b/zsh/plugins/git-commit/git-commit.plugin.zsh
@@ -0,0 +1,58 @@
+local _rev="$(git -C $ZSH rev-parse HEAD 2> /dev/null)"
+if [[ $_rev == $(git config --global --get oh-my-zsh.git-commit-alias 2> /dev/null) ]]; then
+  return
+fi
+git config --global oh-my-zsh.git-commit-alias "$_rev"
+
+local -a _git_commit_aliases
+_git_commit_aliases=(
+  'build'
+  'chore'
+  'ci'
+  'docs'
+  'feat'
+  'fix'
+  'perf'
+  'refactor'
+  'revert'
+  'style'
+  'test'
+  'wip'
+)
+
+local _alias _type
+for _type in "${_git_commit_aliases[@]}"; do
+  # an alias can't be named "revert" because the git command takes precedence
+  # https://stackoverflow.com/a/3538791
+  case "$_type" in
+    revert) _alias=rev ;;
+    *) _alias=$_type ;;
+  esac
+
+  local _func='!a() {
+local _scope _attention _message
+while [ $# -ne 0 ]; do
+case $1 in
+  -s | --scope )
+    if [ -z $2 ]; then
+      echo "Missing scope!"
+      return 1
+    fi
+    _scope="$2"
+    shift 2
+    ;;
+  -a | --attention )
+    _attention="!"
+    shift 1
+    ;;
+  * )
+    _message="${_message} $1"
+    shift 1
+    ;;
+esac
+done
+git commit -m "'$_type'${_scope:+(${_scope})}${_attention}:${_message}"
+}; a'
+
+  git config --global alias.$_alias "$_func"
+done
diff --git a/zsh/plugins/git-extras/README.md b/zsh/plugins/git-extras/README.md
index 2adc9d4..7eb53fc 100644
--- a/zsh/plugins/git-extras/README.md
+++ b/zsh/plugins/git-extras/README.md
@@ -1,6 +1,6 @@
 # git-extras
 
-This plugin provides completion definitions for some of the commands defined by [git-extras](https://github.com/tj/git-extras).
+This plugin provides completion definitions for some of the commands defined by [git-extras](https://github.com/tj/git-extras), which must already be installed.
 
 To use it, add `git-extras` to the plugins array in your zshrc file:
 
diff --git a/zsh/plugins/git-extras/git-extras.plugin.zsh b/zsh/plugins/git-extras/git-extras.plugin.zsh
index b86d7c5..f5fd387 100644
--- a/zsh/plugins/git-extras/git-extras.plugin.zsh
+++ b/zsh/plugins/git-extras/git-extras.plugin.zsh
@@ -51,7 +51,7 @@ __gitex_remote_names() {
     local expl
     declare -a remote_names
     remote_names=(${(f)"$(_call_program remotes git remote 2>/dev/null)"})
-    __git_command_successful || return
+    __gitex_command_successful || return
     _wanted remote-names expl remote-name compadd $* - $remote_names
 }
 
@@ -59,7 +59,7 @@ __gitex_tag_names() {
     local expl
     declare -a tag_names
     tag_names=(${${(f)"$(_call_program tags git for-each-ref --format='"%(refname)"' refs/tags 2>/dev/null)"}#refs/tags/})
-    __git_command_successful || return
+    __gitex_command_successful || return
     _wanted tag-names expl tag-name compadd $* - $tag_names
 }
 
@@ -68,7 +68,7 @@ __gitex_branch_names() {
     local expl
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads 2>/dev/null)"}#refs/heads/})
-    __git_command_successful || return
+    __gitex_command_successful || return
     _wanted branch-names expl branch-name compadd $* - $branch_names
 }
 
@@ -76,31 +76,19 @@ __gitex_specific_branch_names() {
     local expl
     declare -a branch_names
     branch_names=(${${(f)"$(_call_program branchrefs git for-each-ref --format='"%(refname)"' refs/heads/"$1" 2>/dev/null)"}#refs/heads/$1/})
-    __git_command_successful || return
+    __gitex_command_successful || return
     _wanted branch-names expl branch-name compadd - $branch_names
 }
 
-__gitex_chore_branch_names() {
-    __gitex_specific_branch_names 'chore'
-}
-
 __gitex_feature_branch_names() {
     __gitex_specific_branch_names 'feature'
 }
 
-__gitex_refactor_branch_names() {
-    __gitex_specific_branch_names 'refactor'
-}
-
-__gitex_bug_branch_names() {
-    __gitex_specific_branch_names 'bug'
-}
-
 __gitex_submodule_names() {
     local expl
     declare -a submodule_names
     submodule_names=(${(f)"$(_call_program branchrefs git submodule status | awk '{print $2}')"})  # '
-    __git_command_successful || return
+    __gitex_command_successful || return
     _wanted submodule-names expl submodule-name compadd $* - $submodule_names
 }
 
@@ -109,93 +97,34 @@ __gitex_author_names() {
     local expl
     declare -a author_names
     author_names=(${(f)"$(_call_program branchrefs git log --format='%aN' | sort -u)"})
-    __git_command_successful || return
+    __gitex_command_successful || return
     _wanted author-names expl author-name compadd $* - $author_names
 }
 
 # subcommands
+# new subcommand should be added in alphabetical order
 _git-authors() {
     _arguments  -C \
         '(--list -l)'{--list,-l}'[show authors]' \
         '--no-email[without email]' \
 }
 
-_git-bug() {
-    local curcontext=$curcontext state line ret=1
-    declare -A opt_args
-
-    _arguments -C \
-        ': :->command' \
-        '*:: :->option-or-argument' && ret=0
-
-    case $state in
-        (command)
-            declare -a commands
-            commands=(
-                'finish:merge bug into the current branch'
-            )
-            _describe -t commands command commands && ret=0
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*}-$line[1]:
-            case $line[1] in
-                (finish)
-                    _arguments -C \
-                        ':branch-name:__gitex_bug_branch_names'
-                    ;;
-                -r|--remote )
-                    _arguments -C \
-                        ':remote-name:__gitex_remote_names'
-                    ;;
-            esac
-            return 0
-    esac
-
-    _arguments \
-        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
-}
-
-
 _git-changelog() {
     _arguments \
         '(-l --list)'{-l,--list}'[list commits]' \
 }
 
-_git-chore() {
-    local curcontext=$curcontext state line ret=1
-    declare -A opt_args
-
-    _arguments -C \
-        ': :->command' \
-        '*:: :->option-or-argument' && ret=0
-
-    case $state in
-        (command)
-            declare -a commands
-            commands=(
-                'finish:merge and delete the chore branch'
-            )
-            _describe -t commands command commands && ret=0
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*}-$line[1]:
-            case $line[1] in
-                (finish)
-                    _arguments -C \
-                        ':branch-name:__gitex_chore_branch_names'
-                    ;;
-                -r|--remote )
-                    _arguments -C \
-                        ':remote-name:__gitex_remote_names'
-                    ;;
-            esac
-            return 0
-    esac
-
+_git-clear() {
     _arguments \
-        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
+        '(-f --force)'{-f,--force}'[force clear]' \
+        '(-h --help)'{-h,--help}'[help message]' \
 }
 
+_git-coauthor() {
+    _arguments \
+        ':co-author[co-author to add]' \
+        ':co-author-email[email address of co-author to add]'
+}
 
 _git-contrib() {
     _arguments \
@@ -235,6 +164,11 @@ _git-delete-branch() {
         ':branch-name:__gitex_branch_names'
 }
 
+_git-delete-squashed-branches() {
+    _arguments \
+        ':branch-name:__gitex_branch_names'
+}
+
 
 _git-delete-submodule() {
     _arguments \
@@ -298,6 +232,7 @@ _git-feature() {
             case $line[1] in
                 (finish)
                     _arguments -C \
+                        '--squash[Use squash merge]' \
                         ':branch-name:__gitex_feature_branch_names'
                     ;;
                 -r|--remote )
@@ -327,20 +262,17 @@ _git-guilt() {
 }
 
 _git-ignore() {
-    _arguments  -C \
+    _arguments -C \
         '(--local -l)'{--local,-l}'[show local gitignore]' \
         '(--global -g)'{--global,-g}'[show global gitignore]' \
         '(--private -p)'{--private,-p}'[show repo gitignore]'
 }
 
 
-_git-ignore() {
-    _arguments  -C \
-        '(--append -a)'{--append,-a}'[append .gitignore]' \
-        '(--replace -r)'{--replace,-r}'[replace .gitignore]' \
-        '(--list-in-table -l)'{--list-in-table,-l}'[print available types in table format]' \
-        '(--list-alphabetically -L)'{--list-alphabetically,-L}'[print available types in alphabetical order]' \
-        '(--search -s)'{--search,-s}'[search word in available types]'
+_git-info() {
+    _arguments -C \
+        '(--color -c)'{--color,-c}'[use color for information titles]' \
+        '--no-config[do not show list all variables set in config file, along with their values]'
 }
 
 
@@ -357,50 +289,27 @@ _git-missing() {
         ':second-branch-name:__gitex_branch_names'
 }
 
-
-_git-refactor() {
-    local curcontext=$curcontext state line ret=1
-    declare -A opt_args
-
+_git-release() {
     _arguments -C \
-        ': :->command' \
-        '*:: :->option-or-argument' && ret=0
-
-    case $state in
-        (command)
-            declare -a commands
-            commands=(
-                'finish:merge refactor into the current branch'
-            )
-            _describe -t commands command commands && ret=0
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*}-$line[1]:
-            case $line[1] in
-                (finish)
-                    _arguments -C \
-                        ':branch-name:__gitex_refactor_branch_names'
-                    ;;
-                -r|--remote )
-                    _arguments -C \
-                        ':remote-name:__gitex_remote_names'
-                    ;;
-            esac
-            return 0
-    esac
-
-    _arguments \
-        '(--remote -r)'{--remote,-r}'[setup remote tracking branch]'
+        '-c[Generates/populates the changelog with all commit message since the last tag.]' \
+        '-r[The "remote" repository that is destination of a push operation.]' \
+        '-m[use the custom commit information instead of the default message.]' \
+        '-s[Create a signed and annotated tag.]' \
+        '-u[Create a tag, annotated and signed with the given key.]' \
+        '--semver[If the latest tag in your repo matches the semver format requirement, you could increase part of it as the new release tag.]' \
+        '--prefix[Add a prefix string to semver to allow more complex tags.]' \
+        '--no-empty-commit[Avoid creating empty commit if nothing could be committed.]' \
+        '--[The arguments listed after "--" separator will be passed to pre/post-release hook.]'
 }
 
-
 _git-squash() {
+    _arguments '--squash-msg[commit with the squashed commit messages]'
     _arguments \
         ':branch-name:__gitex_branch_names'
 }
 
 _git-stamp() {
-    _arguments  -C \
+    _arguments -C \
          '(--replace -r)'{--replace,-r}'[replace stamps with same id]'
 }
 
@@ -413,17 +322,19 @@ _git-standup() {
         '-g[Display GPG signed info]' \
         '-h[Display help message]' \
         '-L[Enable the inclusion of symbolic links]' \
-        '-m[The depth of recursive directory search]'
+        '-m[The depth of recursive directory search]' \
+        '-B[Display the commits in branch groups]'
 }
 
 _git-summary() {
     _arguments '--line[summarize with lines rather than commits]'
+    _arguments '--dedup-by-email[remove duplicate users by the email address]'
+    _arguments '--no-merges[exclude merge commits]'
     __gitex_commits
 }
 
-
 _git-undo(){
-    _arguments  -C \
+    _arguments -C \
         '(--soft -s)'{--soft,-s}'[only rolls back the commit but changes remain un-staged]' \
         '(--hard -h)'{--hard,-h}'[wipes your commit(s)]'
 }
@@ -432,21 +343,26 @@ zstyle -g existing_user_commands ':completion:*:*:git:*' user-commands
 
 zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
     alias:'define, search and show aliases' \
+    abort:'abort current revert, merge, rebase, or cherry-pick process' \
     archive-file:'export the current head of the git repository to an archive' \
     authors:'generate authors report' \
-    back:'undo and stage latest commits' \
+    browse:'open repo website in browser' \
+    browse-ci:'open repo CI page in browser' \
     bug:'create bug branch' \
     bulk:'run bulk commands' \
+    brv:'list branches sorted by their last commit date'\
     changelog:'generate a changelog report' \
     chore:'create chore branch' \
     clear-soft:'soft clean up a repository' \
     clear:'rigorously clean up a repository' \
+    coauthor:'add a co-author to the last commit' \
     commits-since:'show commit logs since some date' \
     contrib:'show user contributions' \
     count:'show commit count' \
     create-branch:'create branches' \
     delete-branch:'delete branches' \
     delete-merged-branches:'delete merged branches' \
+    delete-squashed-branches:'delete squashed branches' \
     delete-submodule:'delete submodules' \
     delete-tag:'delete tags' \
     delta:'lists changed files' \
@@ -465,11 +381,13 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
     local-commits:'list local commits' \
     lock:'lock a file excluded from version control' \
     locked:'ls files that have been locked' \
+    magic:'commits everything with a generated message' \
     merge-into:'merge one branch into another' \
     merge-repo:'merge two repo histories' \
     missing:'show commits missing from another branch' \
     mr:'checks out a merge request locally' \
     obliterate:'rewrite past commits to remove some files' \
+    paste:'send patches to pastebin sites' \
     pr:'checks out a pull request locally' \
     psykorebase:'rebase a branch with a merge commit' \
     pull-request:'create pull request to GitHub project' \
@@ -479,6 +397,7 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
     release:'commit, tag and push changes to the repository' \
     rename-branch:'rename a branch' \
     rename-tag:'rename a tag' \
+    rename-remote:'rename a remote' \
     repl:'git read-eval-print-loop' \
     reset-file:'reset one file' \
     root:'show path of root' \
@@ -495,4 +414,5 @@ zstyle ':completion:*:*:git:*' user-commands $existing_user_commands \
     sync:'sync local branch with remote branch' \
     touch:'touch and add file to the index' \
     undo:'remove latest commits' \
-    unlock:'unlock a file excluded from version control'
+    unlock:'unlock a file excluded from version control' \
+    utimes:'change files modification time to their last commit date'
diff --git a/zsh/plugins/git-prompt/README.md b/zsh/plugins/git-prompt/README.md
index 8775af8..8f42c68 100644
--- a/zsh/plugins/git-prompt/README.md
+++ b/zsh/plugins/git-prompt/README.md
@@ -9,6 +9,10 @@ To use it, add `git-prompt` to the plugins array in your zshrc file:
 plugins=(... git-prompt)
 ```
 
+You may also need to [customize your theme](https://github.com/ohmyzsh/ohmyzsh/issues/9395#issuecomment-1027130429) 
+to change the way the prompt is built. See the
+[OMZ wiki on customizing themes](https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#overriding-and-adding-themes).
+
 See the [original repository](https://github.com/olivierverdier/zsh-git-prompt).
 
 ## Requirements
@@ -45,6 +49,7 @@ The symbols are as follows:
 | ●n     | there are `n` staged files     |
 | ✖n     | there are `n` unmerged files   |
 | ✚n     | there are `n` unstaged files   |
+| -n     | there are `n` deleted files    |
 | ⚑n     | there are `n` stashed changes  |
 | …      | there are some untracked files |
 
@@ -59,6 +64,7 @@ The symbols are as follows:
 ## Customisation
 
 - Set the variable `ZSH_THEME_GIT_PROMPT_CACHE` to any value in order to enable caching.
+- Set the variable `ZSH_THEME_GIT_SHOW_UPSTREAM` to any value to display the upstream branch.
 - You may also change a number of variables (whose name start with `ZSH_THEME_GIT_PROMPT_`)
   to change the appearance of the prompt. Take a look at the bottom of the [plugin file](git-prompt.plugin.zsh)`
   to see what variables are available.
diff --git a/zsh/plugins/git-prompt/git-prompt.plugin.zsh b/zsh/plugins/git-prompt/git-prompt.plugin.zsh
index 0485e31..4873320 100644
--- a/zsh/plugins/git-prompt/git-prompt.plugin.zsh
+++ b/zsh/plugins/git-prompt/git-prompt.plugin.zsh
@@ -47,12 +47,19 @@ function update_current_git_vars() {
     GIT_UNTRACKED=$__CURRENT_GIT_STATUS[7]
     GIT_STASHED=$__CURRENT_GIT_STATUS[8]
     GIT_CLEAN=$__CURRENT_GIT_STATUS[9]
+    GIT_DELETED=$__CURRENT_GIT_STATUS[10]
+
+    if [ -z ${ZSH_THEME_GIT_SHOW_UPSTREAM+x} ]; then
+        GIT_UPSTREAM=
+    else
+        GIT_UPSTREAM=$(git rev-parse --abbrev-ref --symbolic-full-name "@{upstream}" 2>/dev/null) && GIT_UPSTREAM="${ZSH_THEME_GIT_PROMPT_UPSTREAM_SEPARATOR}${GIT_UPSTREAM}"
+    fi
 }
 
 git_super_status() {
     precmd_update_git_vars
     if [ -n "$__CURRENT_GIT_STATUS" ]; then
-      STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH%{${reset_color}%}"
+      STATUS="$ZSH_THEME_GIT_PROMPT_PREFIX$ZSH_THEME_GIT_PROMPT_BRANCH$GIT_BRANCH$GIT_UPSTREAM%{${reset_color}%}"
       if [ "$GIT_BEHIND" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_BEHIND$GIT_BEHIND%{${reset_color}%}"
       fi
@@ -69,6 +76,9 @@ git_super_status() {
       if [ "$GIT_CHANGED" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_CHANGED$GIT_CHANGED%{${reset_color}%}"
       fi
+      if [ "$GIT_DELETED" -ne "0" ]; then
+          STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_DELETED$GIT_DELETED%{${reset_color}%}"
+      fi
       if [ "$GIT_UNTRACKED" -ne "0" ]; then
           STATUS="$STATUS$ZSH_THEME_GIT_PROMPT_UNTRACKED$GIT_UNTRACKED%{${reset_color}%}"
       fi
@@ -91,11 +101,13 @@ ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}"
 ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[red]%}%{●%G%}"
 ZSH_THEME_GIT_PROMPT_CONFLICTS="%{$fg[red]%}%{✖%G%}"
 ZSH_THEME_GIT_PROMPT_CHANGED="%{$fg[blue]%}%{✚%G%}"
+ZSH_THEME_GIT_PROMPT_DELETED="%{$fg[blue]%}%{-%G%}"
 ZSH_THEME_GIT_PROMPT_BEHIND="%{↓%G%}"
 ZSH_THEME_GIT_PROMPT_AHEAD="%{↑%G%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg[cyan]%}%{…%G%}"
 ZSH_THEME_GIT_PROMPT_STASHED="%{$fg_bold[blue]%}%{⚑%G%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}%{✔%G%}"
+ZSH_THEME_GIT_PROMPT_UPSTREAM_SEPARATOR="->"
 
 # Set the prompt.
 RPROMPT='$(git_super_status)'
diff --git a/zsh/plugins/git-prompt/gitstatus.py b/zsh/plugins/git-prompt/gitstatus.py
index b5c3c9a..7cd8f54 100644
--- a/zsh/plugins/git-prompt/gitstatus.py
+++ b/zsh/plugins/git-prompt/gitstatus.py
@@ -23,9 +23,10 @@ def get_tagname_or_hash():
         return hash_
     return None
 
-# Re-use method from https://github.com/magicmonty/bash-git-prompt to get stashs count
+# Re-use method from https://github.com/magicmonty/bash-git-prompt to get stash count
+# Use `--git-common-dir` to avoid problems with git worktrees, which don't have individual stashes
 def get_stash():
-    cmd = Popen(['git', 'rev-parse', '--git-dir'], stdout=PIPE, stderr=PIPE)
+    cmd = Popen(['git', 'rev-parse', '--git-common-dir'], stdout=PIPE, stderr=PIPE)
     so, se = cmd.communicate()
     stash_file = '%s%s' % (so.decode('utf-8').rstrip(), '/logs/refs/stash')
 
@@ -35,7 +36,6 @@ def get_stash():
     except IOError:
         return 0
 
-
 # `git status --porcelain --branch` can collect all information
 # branch, remote_branch, untracked, staged, changed, conflicts, ahead, behind
 po = Popen(['git', 'status', '--porcelain', '--branch'], env=dict(os.environ, LANG="C"), stdout=PIPE, stderr=PIPE)
@@ -44,7 +44,7 @@ if po.returncode != 0:
     sys.exit(0)  # Not a git repository
 
 # collect git status information
-untracked, staged, changed, conflicts = [], [], [], []
+untracked, staged, changed, deleted, conflicts = [], [], [], [], []
 ahead, behind = 0, 0
 status = [(line[0], line[1], line[2:]) for line in stdout.decode('utf-8').splitlines()]
 for st in status:
@@ -75,13 +75,15 @@ for st in status:
     else:
         if st[1] == 'M':
             changed.append(st)
+        if st[1] == 'D':
+            deleted.append(st)
         if st[0] == 'U':
             conflicts.append(st)
         elif st[0] != ' ':
             staged.append(st)
 
 stashed = get_stash()
-if not changed and not staged and not conflicts and not untracked:
+if not changed and not deleted and not staged and not conflicts and not untracked:
     clean = 1
 else:
     clean = 0
@@ -95,6 +97,7 @@ out = ' '.join([
     str(len(changed)),
     str(len(untracked)),
     str(stashed),
-    str(clean)
+    str(clean),
+    str(len(deleted))
 ])
 print(out, end='')
diff --git a/zsh/plugins/git/README.md b/zsh/plugins/git/README.md
index 050c13d..0090fa6 100644
--- a/zsh/plugins/git/README.md
+++ b/zsh/plugins/git/README.md
@@ -10,239 +10,266 @@ plugins=(... git)
 
 ## Aliases
 
-| Alias                | Command                                                                                                                          |
-|:---------------------|:---------------------------------------------------------------------------------------------------------------------------------|
-| g                    | git                                                                                                                              |
-| ga                   | git add                                                                                                                          |
-| gaa                  | git add --all                                                                                                                    |
-| gapa                 | git add --patch                                                                                                                  |
-| gau                  | git add --update                                                                                                                 |
-| gav                  | git add --verbose                                                                                                                |
-| gap                  | git apply                                                                                                                        |
-| gapt                 | git apply --3way                                                                                                                 |
-| gb                   | git branch                                                                                                                       |
-| gba                  | git branch -a                                                                                                                    |
-| gbd                  | git branch -d                                                                                                                    |
-| gbda                 | git branch --no-color --merged \| grep -vE "^([+*]\|\s*(<span>$</span>(git_main_branch)\|<span>$</span>(git_develop_branch))\s*<span>$</span>)" \| xargs git branch -d 2>/dev/null |
-| gbD                  | git branch -D                                                                                                                    |
-| gbl                  | git blame -b -w                                                                                                                  |
-| gbnm                 | git branch --no-merged                                                                                                           |
-| gbr                  | git branch --remote                                                                                                              |
-| gbs                  | git bisect                                                                                                                       |
-| gbsb                 | git bisect bad                                                                                                                   |
-| gbsg                 | git bisect good                                                                                                                  |
-| gbsr                 | git bisect reset                                                                                                                 |
-| gbss                 | git bisect start                                                                                                                 |
-| gc                   | git commit -v                                                                                                                    |
-| gc!                  | git commit -v --amend                                                                                                            |
-| gcn!                 | git commit -v --no-edit --amend                                                                                                  |
-| gca                  | git commit -v -a                                                                                                                 |
-| gca!                 | git commit -v -a --amend                                                                                                         |
-| gcan!                | git commit -v -a --no-edit --amend                                                                                               |
-| gcans!               | git commit -v -a -s --no-edit --amend                                                                                            |
-| gcam                 | git commit -a -m                                                                                                                 |
-| gcas                 | git commit -a -s                                                                                                                 |
-| gcasm                | git commit -a -s -m                                                                                                              |
-| gcsm                 | git commit -s -m                                                                                                                 |
-| gcb                  | git checkout -b                                                                                                                  |
-| gcf                  | git config --list                                                                                                                |
-| gcl                  | git clone --recurse-submodules                                                                                                   |
-| gccd                 | git clone --recurse-submodules "<span>$</span>@" && cd "<span>$</span>(basename <span>$</span>_ .git)"                           |
-| gclean               | git clean -id                                                                                                                    |
-| gpristine            | git reset --hard && git clean -dffx                                                                                              |
-| gcm                  | git checkout $(git_main_branch)                                                                                                  |
-| gcd                  | git checkout $(git_develop_branch)                                                                                               |
-| gcmsg                | git commit -m                                                                                                                    |
-| gco                  | git checkout                                                                                                                     |
-| gcor                 | git checkout --recurse-submodules                                                                                                |
-| gcount               | git shortlog -sn                                                                                                                 |
-| gcp                  | git cherry-pick                                                                                                                  |
-| gcpa                 | git cherry-pick --abort                                                                                                          |
-| gcpc                 | git cherry-pick --continue                                                                                                       |
-| gcs                  | git commit -S                                                                                                                    |
-| gd                   | git diff                                                                                                                         |
-| gdca                 | git diff --cached                                                                                                                |
-| gdcw                 | git diff --cached --word-diff                                                                                                    |
-| gdct                 | git describe --tags $(git rev-list --tags --max-count=1)                                                                         |
-| gds                  | git diff --staged                                                                                                                |
-| gdt                  | git diff-tree --no-commit-id --name-only -r                                                                                      |
-| gdnolock             | git diff $@ ":(exclude)package-lock.json" ":(exclude)&ast;.lock"                                                                 |
-| gdup                 | git diff @{upstream}                                                                                                             |
-| gdv                  | git diff -w $@ \| view -                                                                                                         |
-| gdw                  | git diff --word-diff                                                                                                             |
-| gf                   | git fetch                                                                                                                        |
-| gfa                  | git fetch --all --prune                                                                                                          |
-| gfg                  | git ls-files \| grep                                                                                                             |
-| gfo                  | git fetch origin                                                                                                                 |
-| gg                   | git gui citool                                                                                                                   |
-| gga                  | git gui citool --amend                                                                                                           |
-| ggf                  | git push --force origin $(current_branch)                                                                                        |
-| ggfl                 | git push --force-with-lease origin $(current_branch)                                                                             |
-| ggl                  | git pull origin $(current_branch)                                                                                                |
-| ggp                  | git push origin $(current_branch)                                                                                                |
-| ggpnp                | ggl && ggp                                                                                                                       |
-| ggpull               | git pull origin "$(git_current_branch)"                                                                                          |
-| ggpur                | ggu                                                                                                                              |
-| ggpush               | git push origin "$(git_current_branch)"                                                                                          |
-| ggsup                | git branch --set-upstream-to=origin/$(git_current_branch)                                                                        |
-| ggu                  | git pull --rebase origin $(current_branch)                                                                                       |
-| gpsup                | git push --set-upstream origin $(git_current_branch)                                                                             |
-| ghh                  | git help                                                                                                                         |
-| gignore              | git update-index --assume-unchanged                                                                                              |
-| gignored             | git ls-files -v \| grep "^[[:lower:]]"                                                                                           |
-| git-svn-dcommit-push | git svn dcommit && git push github $(git_main_branch):svntrunk                                                                   |
-| gk                   | gitk --all --branches &!                                                                                                          |
-| gke                  | gitk --all $(git log -g --pretty=%h) &!                                                                                           |
-| gl                   | git pull                                                                                                                         |
-| glg                  | git log --stat                                                                                                                   |
-| glgp                 | git log --stat -p                                                                                                                |
-| glgg                 | git log --graph                                                                                                                  |
-| glgga                | git log --graph --decorate --all                                                                                                 |
-| glgm                 | git log --graph --max-count=10                                                                                                   |
-| glo                  | git log --oneline --decorate                                                                                                     |
-| glol                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'                           |
-| glols                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat                    |
-| glod                 | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'                           |
-| glods                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short              |
-| glola                | git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all                     |
-| glog                 | git log --oneline --decorate --graph                                                                                             |
-| gloga                | git log --oneline --decorate --graph --all                                                                                       |
-| glp                  | git log --pretty=\<format\>                                                                                                      |
-| gm                   | git merge                                                                                                                        |
-| gmom                 | git merge origin/$(git_main_branch)                                                                                              |
-| gmtl                 | git mergetool --no-prompt                                                                                                        |
-| gmtlvim              | git mergetool --no-prompt --tool=vimdiff                                                                                         |
-| gmum                 | git merge upstream/$(git_main_branch)                                                                                            |
-| gma                  | git merge --abort                                                                                                                |
-| gp                   | git push                                                                                                                         |
-| gpd                  | git push --dry-run                                                                                                               |
-| gpf                  | git push --force-with-lease                                                                                                      |
-| gpf!                 | git push --force                                                                                                                 |
-| gpoat                | git push origin --all && git push origin --tags                                                                                  |
-| gpr                  | git pull --rebase                                                                                                                |
-| gpu                  | git push upstream                                                                                                                |
-| gpv                  | git push -v                                                                                                                      |
-| gr                   | git remote                                                                                                                       |
-| gra                  | git remote add                                                                                                                   |
-| grb                  | git rebase                                                                                                                       |
-| grba                 | git rebase --abort                                                                                                               |
-| grbc                 | git rebase --continue                                                                                                            |
-| grbd                 | git rebase $(git_develop_branch)                                                                                                 |
-| grbi                 | git rebase -i                                                                                                                    |
-| grbm                 | git rebase $(git_main_branch)                                                                                                    |
-| grbom                | git rebase origin/$(git_main_branch)                                                                                             |
-| grbo                 | git rebase --onto                                                                                                                |
-| grbs                 | git rebase --skip                                                                                                                |
-| grev                 | git revert                                                                                                                       |
-| grh                  | git reset                                                                                                                        |
-| grhh                 | git reset --hard                                                                                                                 |
-| groh                 | git reset origin/$(git_current_branch) --hard                                                                                    |
-| grm                  | git rm                                                                                                                           |
-| grmc                 | git rm --cached                                                                                                                  |
-| grmv                 | git remote rename                                                                                                                |
-| grrm                 | git remote remove                                                                                                                |
-| grs                  | git restore                                                                                                                      |
-| grset                | git remote set-url                                                                                                               |
-| grss                 | git restore --source                                                                                                             |
-| grst                 | git restore --staged                                                                                                             |
-| grt                  | cd "$(git rev-parse --show-toplevel \|\| echo .)"                                                                                |
-| gru                  | git reset --                                                                                                                     |
-| grup                 | git remote update                                                                                                                |
-| grv                  | git remote -v                                                                                                                    |
-| gsb                  | git status -sb                                                                                                                   |
-| gsd                  | git svn dcommit                                                                                                                  |
-| gsh                  | git show                                                                                                                         |
-| gsi                  | git submodule init                                                                                                               |
-| gsps                 | git show --pretty=short --show-signature                                                                                         |
-| gsr                  | git svn rebase                                                                                                                   |
-| gss                  | git status -s                                                                                                                    |
-| gst                  | git status                                                                                                                       |
-| gsta                 | git stash push                                                                                                                   |
-| gsta                 | git stash save                                                                                                                   |
-| gstaa                | git stash apply                                                                                                                  |
-| gstc                 | git stash clear                                                                                                                  |
-| gstd                 | git stash drop                                                                                                                   |
-| gstl                 | git stash list                                                                                                                   |
-| gstp                 | git stash pop                                                                                                                    |
-| gsts                 | git stash show --text                                                                                                            |
-| gstu                 | git stash --include-untracked                                                                                                    |
-| gstall               | git stash --all                                                                                                                  |
-| gsu                  | git submodule update                                                                                                             |
-| gsw                  | git switch                                                                                                                       |
-| gswc                 | git switch -c                                                                                                                    |
-| gswm                 | git switch $(git_main_branch)                                                                                                    |
-| gswd                 | git switch $(git_develop_branch)                                                                                                 |
-| gts                  | git tag -s                                                                                                                       |
-| gtv                  | git tag \| sort -V                                                                                                               |
-| gtl                  | gtl(){ git tag --sort=-v:refname -n -l ${1}* }; noglob gtl                                                                       |
-| gunignore            | git update-index --no-assume-unchanged                                                                                           |
-| gunwip               | git log -n 1 \| grep -q -c "\-\-wip\-\-" && git reset HEAD~1                                                                     |
-| gup                  | git pull --rebase                                                                                                                |
-| gupv                 | git pull --rebase -v                                                                                                             |
-| gupa                 | git pull --rebase --autostash                                                                                                    |
-| gupav                | git pull --rebase --autostash -v                                                                                                 |
-| gupom                | git pull --rebase origin $(git_main_branch)                                                                                      |
-| gupomi               | git pull --rebase=interactive origin $(git_main_branch)                                                                          |
-| glum                 | git pull upstream $(git_main_branch)                                                                                             |
-| gluc                 | git pull upstream $(git_current_branch)                                                                                             |
-| gwch                 | git whatchanged -p --abbrev-commit --pretty=medium                                                                               |
-| gwip                 | git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"           |
-| gam                  | git am                                                                                                                           |
-| gamc                 | git am --continue                                                                                                                |
-| gams                 | git am --skip                                                                                                                    |
-| gama                 | git am --abort                                                                                                                   |
-| gamscp               | git am --show-current-patch                                                                                                      |
+| Alias                  | Command                                                                                                                         |
+| :--------------------- | :------------------------------------------------------------------------------------------------------------------------------ |
+| `grt`                  | `cd "$(git rev-parse --show-toplevel \|\| echo .)"`                                                                             |
+| `ggpnp`                | `ggl && ggp`                                                                                                                    |
+| `ggpur`                | `ggu`                                                                                                                           |
+| `g`                    | `git`                                                                                                                           |
+| `ga`                   | `git add`                                                                                                                       |
+| `gaa`                  | `git add --all`                                                                                                                 |
+| `gapa`                 | `git add --patch`                                                                                                               |
+| `gau`                  | `git add --update`                                                                                                              |
+| `gav`                  | `git add --verbose`                                                                                                             |
+| `gwip`                 | `git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"` |
+| `gam`                  | `git am`                                                                                                                        |
+| `gama`                 | `git am --abort`                                                                                                                |
+| `gamc`                 | `git am --continue`                                                                                                             |
+| `gamscp`               | `git am --show-current-patch`                                                                                                   |
+| `gams`                 | `git am --skip`                                                                                                                 |
+| `gap`                  | `git apply`                                                                                                                     |
+| `gapt`                 | `git apply --3way`                                                                                                              |
+| `gbs`                  | `git bisect`                                                                                                                    |
+| `gbsb`                 | `git bisect bad`                                                                                                                |
+| `gbsg`                 | `git bisect good`                                                                                                               |
+| `gbsn`                 | `git bisect new`                                                                                                                |
+| `gbso`                 | `git bisect old`                                                                                                                |
+| `gbsr`                 | `git bisect reset`                                                                                                              |
+| `gbss`                 | `git bisect start`                                                                                                              |
+| `gbl`                  | `git blame -w`                                                                                                                  |
+| `gb`                   | `git branch`                                                                                                                    |
+| `gba`                  | `git branch --all`                                                                                                              |
+| `gbd`                  | `git branch --delete`                                                                                                           |
+| `gbD`                  | `git branch --delete --force`                                                                                                   |
+| `gbgd`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -d`           |
+| `gbgD`                 | `LANG=C git branch --no-color -vv \| grep ": gone\]" \| cut -c 3- \| awk '"'"'{print $1}'"'"' \| xargs git branch -D`           |
+| `gbm`                  | `git branch --move`                                                                                                             |
+| `gbnm`                 | `git branch --no-merged`                                                                                                        |
+| `gbr`                  | `git branch --remote`                                                                                                           |
+| `ggsup`                | `git branch --set-upstream-to=origin/$(git_current_branch)`                                                                     |
+| `gbg`                  | `LANG=C git branch -vv \| grep ": gone\]"`                                                                                      |
+| `gco`                  | `git checkout`                                                                                                                  |
+| `gcor`                 | `git checkout --recurse-submodules`                                                                                             |
+| `gcb`                  | `git checkout -b`                                                                                                               |
+| `gcB`                  | `git checkout -B`                                                                                                               |
+| `gcd`                  | `git checkout $(git_develop_branch)`                                                                                            |
+| `gcm`                  | `git checkout $(git_main_branch)`                                                                                               |
+| `gcp`                  | `git cherry-pick`                                                                                                               |
+| `gcpa`                 | `git cherry-pick --abort`                                                                                                       |
+| `gcpc`                 | `git cherry-pick --continue`                                                                                                    |
+| `gclean`               | `git clean --interactive -d`                                                                                                    |
+| `gcl`                  | `git clone --recurse-submodules`                                                                                                |
+| `gclf`                 | `git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules`                                        |
+| `gccd`                 | `git clone --recurse-submodules "$@" && cd "$(basename $\_ .git)"`                                                              |
+| `gcam`                 | `git commit --all --message`                                                                                                    |
+| `gcas`                 | `git commit --all --signoff`                                                                                                    |
+| `gcasm`                | `git commit --all --signoff --message`                                                                                          |
+| `gcmsg`                | `git commit --message`                                                                                                          |
+| `gcsm`                 | `git commit --signoff --message`                                                                                                |
+| `gc`                   | `git commit --verbose`                                                                                                          |
+| `gca`                  | `git commit --verbose --all`                                                                                                    |
+| `gca!`                 | `git commit --verbose --all --amend`                                                                                            |
+| `gcan!`                | `git commit --verbose --all --no-edit --amend`                                                                                  |
+| `gcans!`               | `git commit --verbose --all --signoff --no-edit --amend`                                                                        |
+| `gcann!`               | `git commit --verbose --all --date=now --no-edit --amend`                                                                       |
+| `gc!`                  | `git commit --verbose --amend`                                                                                                  |
+| `gcn`                  | `git commit --verbose --no-edit`                                                                                                |
+| `gcn!`                 | `git commit --verbose --no-edit --amend`                                                                                        |
+| `gcs`                  | `git commit -S`                                                                                                                 |
+| `gcss`                 | `git commit -S -s`                                                                                                              |
+| `gcssm`                | `git commit -S -s -m`                                                                                                           |
+| `gcf`                  | `git config --list`                                                                                                             |
+| `gcfu`                 | `git commit --fixup`                                                                                                            |
+| `gdct`                 | `git describe --tags $(git rev-list --tags --max-count=1)`                                                                      |
+| `gd`                   | `git diff`                                                                                                                      |
+| `gdca`                 | `git diff --cached`                                                                                                             |
+| `gdcw`                 | `git diff --cached --word-diff`                                                                                                 |
+| `gds`                  | `git diff --staged`                                                                                                             |
+| `gdw`                  | `git diff --word-diff`                                                                                                          |
+| `gdv`                  | `git diff -w "$@" \| view -`                                                                                                    |
+| `gdup`                 | `git diff @{upstream}`                                                                                                          |
+| `gdnolock`             | `git diff $@ ":(exclude)package-lock.json" ":(exclude)\*.lock"`                                                                 |
+| `gdt`                  | `git diff-tree --no-commit-id --name-only -r`                                                                                   |
+| `gf`                   | `git fetch`                                                                                                                     |
+| `gfa`                  | `git fetch --all --tags --prune`                                                                                                |
+| `gfo`                  | `git fetch origin`                                                                                                              |
+| `gg`                   | `git gui citool`                                                                                                                |
+| `gga`                  | `git gui citool --amend`                                                                                                        |
+| `ghh`                  | `git help`                                                                                                                      |
+| `glgg`                 | `git log --graph`                                                                                                               |
+| `glgga`                | `git log --graph --decorate --all`                                                                                              |
+| `glgm`                 | `git log --graph --max-count=10`                                                                                                |
+| `glod`                 | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'`                        |
+| `glods`                | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short`           |
+| `glol`                 | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'`                        |
+| `glola`                | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all`                  |
+| `glols`                | `git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat`                 |
+| `glo`                  | `git log --oneline --decorate`                                                                                                  |
+| `glog`                 | `git log --oneline --decorate --graph`                                                                                          |
+| `gloga`                | `git log --oneline --decorate --graph --all`                                                                                    |
+| `glp`                  | `git log --pretty=<format>`                                                                                                     |
+| `glg`                  | `git log --stat`                                                                                                                |
+| `glgp`                 | `git log --stat --patch`                                                                                                        |
+| `gignored`             | `git ls-files -v \| grep "^[[:lower:]]"`                                                                                        |
+| `gfg`                  | `git ls-files \| grep`                                                                                                          |
+| `gm`                   | `git merge`                                                                                                                     |
+| `gma`                  | `git merge --abort`                                                                                                             |
+| `gmc`                  | `git merge --continue`                                                                                                          |
+| `gms`                  | `git merge --squash`                                                                                                            |
+| `gmff`                 | `git merge --ff-only`                                                                                                           |
+| `gmom`                 | `git merge origin/$(git_main_branch)`                                                                                           |
+| `gmum`                 | `git merge upstream/$(git_main_branch)`                                                                                         |
+| `gmtl`                 | `git mergetool --no-prompt`                                                                                                     |
+| `gmtlvim`              | `git mergetool --no-prompt --tool=vimdiff`                                                                                      |
+| `gl`                   | `git pull`                                                                                                                      |
+| `gpr`                  | `git pull --rebase`                                                                                                             |
+| `gprv`                 | `git pull --rebase -v`                                                                                                          |
+| `gpra`                 | `git pull --rebase --autostash`                                                                                                 |
+| `gprav`                | `git pull --rebase --autostash -v`                                                                                              |
+| `gprom`                | `git pull --rebase origin $(git_main_branch)`                                                                                   |
+| `gpromi`               | `git pull --rebase=interactive origin $(git_main_branch)`                                                                       |
+| `gprum`                | `git pull --rebase upstream $(git_main_branch)`                                                                                 |
+| `gprumi`               | `git pull --rebase=interactive upstream $(git_main_branch)`                                                                     |
+| `ggpull`               | `git pull origin "$(git_current_branch)"`                                                                                       |
+| `ggl`                  | `git pull origin $(current_branch)`                                                                                             |
+| `gluc`                 | `git pull upstream $(git_current_branch)`                                                                                       |
+| `glum`                 | `git pull upstream $(git_main_branch)`                                                                                          |
+| `gp`                   | `git push`                                                                                                                      |
+| `gpd`                  | `git push --dry-run`                                                                                                            |
+| `gpf!`                 | `git push --force`                                                                                                              |
+| `ggf`                  | `git push --force origin $(current_branch)`                                                                                     |
+| `gpf`                  | On Git >= 2.30: `git push --force-with-lease --force-if-includes`                                                               |
+| `gpf`                  | On Git < 2.30: `git push --force-with-lease`                                                                                    |
+| `ggfl`                 | `git push --force-with-lease origin $(current_branch)`                                                                          |
+| `gpsup`                | `git push --set-upstream origin $(git_current_branch)`                                                                          |
+| `gpsupf`               | On Git >= 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes`                   |
+| `gpsupf`               | On Git < 2.30: `git push --set-upstream origin $(git_current_branch) --force-with-lease`                                        |
+| `gpv`                  | `git push --verbose`                                                                                                            |
+| `gpoat`                | `git push origin --all && git push origin --tags`                                                                               |
+| `gpod`                 | `git push origin --delete`                                                                                                      |
+| `ggpush`               | `git push origin "$(git_current_branch)"`                                                                                       |
+| `ggp`                  | `git push origin $(current_branch)`                                                                                             |
+| `gpu`                  | `git push upstream`                                                                                                             |
+| `grb`                  | `git rebase`                                                                                                                    |
+| `grba`                 | `git rebase --abort`                                                                                                            |
+| `grbc`                 | `git rebase --continue`                                                                                                         |
+| `grbi`                 | `git rebase --interactive`                                                                                                      |
+| `grbo`                 | `git rebase --onto`                                                                                                             |
+| `grbs`                 | `git rebase --skip`                                                                                                             |
+| `grbd`                 | `git rebase $(git_develop_branch)`                                                                                              |
+| `grbm`                 | `git rebase $(git_main_branch)`                                                                                                 |
+| `grbom`                | `git rebase origin/$(git_main_branch)`                                                                                          |
+| `grbum`                | `git rebase upstream/$(git_main_branch)`                                                                                        |
+| `grf`                  | `git reflog`                                                                                                                    |
+| `gr`                   | `git remote`                                                                                                                    |
+| `grv`                  | `git remote --verbose`                                                                                                          |
+| `gra`                  | `git remote add`                                                                                                                |
+| `grrm`                 | `git remote remove`                                                                                                             |
+| `grmv`                 | `git remote rename`                                                                                                             |
+| `grset`                | `git remote set-url`                                                                                                            |
+| `grup`                 | `git remote update`                                                                                                             |
+| `grh`                  | `git reset`                                                                                                                     |
+| `gru`                  | `git reset --`                                                                                                                  |
+| `grhh`                 | `git reset --hard`                                                                                                              |
+| `grhk`                 | `git reset --keep`                                                                                                              |
+| `grhs`                 | `git reset --soft`                                                                                                              |
+| `gpristine`            | `git reset --hard && git clean --force -dfx`                                                                                    |
+| `gwipe`                | `git reset --hard && git clean --force -df`                                                                                     |
+| `groh`                 | `git reset origin/$(git_current_branch) --hard`                                                                                 |
+| `grs`                  | `git restore`                                                                                                                   |
+| `grss`                 | `git restore --source`                                                                                                          |
+| `grst`                 | `git restore --staged`                                                                                                          |
+| `gunwip`               | `git rev-list --max-count=1 --format="%s" HEAD \| grep -q "--wip--" && git reset HEAD~1`                                        |
+| `grev`                 | `git revert`                                                                                                                    |
+| `grm`                  | `git rm`                                                                                                                        |
+| `grmc`                 | `git rm --cached`                                                                                                               |
+| `gcount`               | `git shortlog --summary -n`                                                                                                     |
+| `gsh`                  | `git show`                                                                                                                      |
+| `gsps`                 | `git show --pretty=short --show-signature`                                                                                      |
+| `gstall`               | `git stash --all`                                                                                                               |
+| `gstu`                 | `git stash --include-untracked`                                                                                                 |
+| `gstaa`                | `git stash apply`                                                                                                               |
+| `gstc`                 | `git stash clear`                                                                                                               |
+| `gstd`                 | `git stash drop`                                                                                                                |
+| `gstl`                 | `git stash list`                                                                                                                |
+| `gstp`                 | `git stash pop`                                                                                                                 |
+| `gsta`                 | On Git >= 2.13: `git stash push`                                                                                                |
+| `gsta`                 | On Git < 2.13: `git stash save`                                                                                                 |
+| `gsts`                 | `git stash show --patch`                                                                                                        |
+| `gst`                  | `git status`                                                                                                                    |
+| `gss`                  | `git status --short`                                                                                                            |
+| `gsb`                  | `git status --short -b`                                                                                                         |
+| `gsi`                  | `git submodule init`                                                                                                            |
+| `gsu`                  | `git submodule update`                                                                                                          |
+| `gsd`                  | `git svn dcommit`                                                                                                               |
+| `git-svn-dcommit-push` | `git svn dcommit && git push github $(git_main_branch):svntrunk`                                                                |
+| `gsr`                  | `git svn rebase`                                                                                                                |
+| `gsw`                  | `git switch`                                                                                                                    |
+| `gswc`                 | `git switch -c`                                                                                                                 |
+| `gswd`                 | `git switch $(git_develop_branch)`                                                                                              |
+| `gswm`                 | `git switch $(git_main_branch)`                                                                                                 |
+| `gta`                  | `git tag --annotate`                                                                                                            |
+| `gts`                  | `git tag -s`                                                                                                                    |
+| `gtv`                  | `git tag \| sort -V`                                                                                                            |
+| `gignore`              | `git update-index --assume-unchanged`                                                                                           |
+| `gunignore`            | `git update-index --no-assume-unchanged`                                                                                        |
+| `gwch`                 | `git log --patch --abbrev-commit --pretty=medium --raw`                                                                         |
+| `gwt`                  | `git worktree`                                                                                                                  |
+| `gwtls`                | `git worktree list`                                                                                                             |
+| `gwtmv`                | `git worktree move`                                                                                                             |
+| `gwtrm`                | `git worktree remove`                                                                                                           |
+| `gk`                   | `gitk --all --branches &!`                                                                                                      |
+| `gke`                  | `gitk --all $(git log --walk-reflogs --pretty=%h) &!`                                                                           |
+| `gtl`                  | `gtl(){ git tag --sort=-v:refname -n --list ${1}\* }; noglob gtl`                                                               |
 
 ### Main branch preference
 
-Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin favors using
-a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive term `main`. This means
-that any aliases and functions that previously used `master`, will use `main` if that branch exists. We do this via the
-function `git_main_branch`.
+Following the recent push for removing racially-charged words from our technical vocabulary, the git plugin
+favors using a branch name other than `master`. In this case, we favor the shorter, neutral and descriptive
+term `main`. This means that any aliases and functions that previously used `master`, will use `main` if that
+branch exists. We do this via the function `git_main_branch`.
 
 ### Deprecated aliases
 
-These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not, receive further support.
+These are aliases that have been removed, renamed, or otherwise modified in a way that may, or may not,
+receive further support.
 
-| Alias  | Command                                                | Modification                                           |
-| :----- | :----------------------------------------------------- | :----------------------------------------------------- |
-| gap    | `git add --patch`                                      | new alias `gapa`                                       |
-| gcl    | `git config --list`                                    | new alias `gcf`                                        |
-| gdc    | `git diff --cached`                                    | new alias `gdca`                                       |
-| gdt    | `git difftool`                                         | no replacement                                         |
-| ggpull | `git pull origin $(current_branch)`                    | new alias `ggl` (`ggpull` still exists for now though) |
-| ggpur  | `git pull --rebase origin $(current_branch)`           | new alias `ggu` (`ggpur` still exists for now though)  |
-| ggpush | `git push origin $(current_branch)`                    | new alias `ggp` (`ggpush` still exists for now though) |
-| gk     | `gitk --all --branches`                                | now aliased to `gitk --all --branches`                 |
-| glg    | `git log --stat --max-count = 10`                      | now aliased to `git log --stat --color`                |
-| glgg   | `git log --graph --max-count = 10`                     | now aliased to `git log --graph --color`               |
-| gwc    | `git whatchanged -p --abbrev-commit --pretty = medium` | new alias `gwch`                                       |
+| Alias    | Command                                                   | Modification                                          |
+| :------- | :-------------------------------------------------------- | :-----------------------------------------------------|
+| `gap`    | `git add --patch`                                         | New alias: `gapa`                                     |
+| `gcl`    | `git config --list`                                       | New alias: `gcf`                                      |
+| `gdt`    | `git difftool`                                            | No replacement                                        |
 
 ## Functions
 
 ### Current
 
-| Command                | Description                                                                                              |
-|:-----------------------|:---------------------------------------------------------------------------------------------------------|
-| `grename <old> <new>`  | Rename `old` branch to `new`, including in origin remote                                                 |
-| current_branch         | Return the name of the current branch                                                                    |
-| git_current_user_name  | Returns the `user.name` config value                                                                     |
-| git_current_user_email | Returns the `user.email` config value                                                                    |
-| git_main_branch        | Returns the name of the main branch: `main` if it exists, `master` otherwise                             |
-| git_develop_branch     | Returns the name of the develop branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
+| Command                  | Description                                                                                                    |
+| :----------------------- | :------------------------------------------------------------------------------------------------------------- |
+| `git_current_branch`     | Returns the name of the current branch (Lives in `lib/git.zsh`)                                                |
+| `git_current_user_email` | Returns the `user.email` config value (Lives in `lib/git.zsh`)                                                 |
+| `git_current_user_name`  | Returns the `user.name` config value (Lives in `lib/git.zsh`)                                                  |
+| `git_develop_branch`     | Returns the name of the “development” branch: `dev`, `devel`, `development` if they exist, `develop` otherwise |
+| `git_main_branch`        | Returns the name of the main branch: `main` if it exists, `master` otherwise                                   |
+| `grename <old> <new>`    | Renames branch `<old>` to `<new>`, including on the origin remote                                              |
+| `gbda`                   | Deletes all merged branches                                                                                    |
+| `gbds`                   | Deletes all squash-merged branches (**Note: performance degrades with number of branches**)                    |
 
 ### Work in Progress (WIP)
 
-These features allow to pause a branch development and switch to another one (_"Work in Progress"_,  or wip). When you want to go back to work, just unwip it.
+These features allow you to pause developing one branch and switch to another one (_"Work in Progress"_, or
+“wip”). When you want to go back to work, just “unwip” it.
 
-| Command          | Description                                     |
-|:-----------------|:------------------------------------------------|
-| work_in_progress | Echoes a warning if the current branch is a wip |
-| gwip             | Commit wip branch                               |
-| gunwip           | Uncommit wip branch                             |
+| Command            | Description                                     |
+| :----------------- | :---------------------------------------------- |
+| `gwip`             | Commit wip branch                               |
+| `gunwip`           | Uncommit wip branch                             |
+| `gunwipall`        | Uncommit all recent `--wip--` commits           |
+| `work_in_progress` | Echoes a warning if the current branch is a wip |
+
+Note that `gwip` and `gunwip` are aliases, but are also documented here to group all related WIP features.
 
 ### Deprecated functions
 
-| Command                | Description                             | Reason                                                          |
-|:-----------------------|:----------------------------------------|:----------------------------------------------------------------|
-| current_repository     | Return the names of the current remotes | Didn't work properly. Use `git remote -v` instead (`grv` alias) |
+| Command              | Description                             | Reason                                                           |
+| :------------------- | :-------------------------------------- | :--------------------------------------------------------------- |
diff --git a/zsh/plugins/git/git.plugin.zsh b/zsh/plugins/git/git.plugin.zsh
index f25453b..9ef60d6 100644
--- a/zsh/plugins/git/git.plugin.zsh
+++ b/zsh/plugins/git/git.plugin.zsh
@@ -3,323 +3,51 @@ autoload -Uz is-at-least
 git_version="${${(As: :)$(git version 2>/dev/null)}[3]}"
 
 #
-# Functions
+# Functions Current
+# (sorted alphabetically by function name)
+# (order should follow README)
 #
 
-# The name of the current branch
-# Back-compatibility wrapper for when this function was defined here in
-# the plugin, before being pulled in to core lib/git.zsh as git_current_branch()
-# to fix the core -> git plugin dependency.
-function current_branch() {
-  git_current_branch
-}
-
-# Pretty log messages
-function _git_log_prettily(){
-  if ! [ -z $1 ]; then
-    git log --pretty=$1
-  fi
-}
-compdef _git _git_log_prettily=git-log
-
-# Warn if the current branch is a WIP
-function work_in_progress() {
-  command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
-}
-
-# Check if main exists and use instead of master
-function git_main_branch() {
-  command git rev-parse --git-dir &>/dev/null || return
-  local ref
-  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk}; do
-    if command git show-ref -q --verify $ref; then
-      echo ${ref:t}
-      return
-    fi
-  done
-  echo master
-}
-
 # Check for develop and similarly named branches
 function git_develop_branch() {
   command git rev-parse --git-dir &>/dev/null || return
   local branch
-  for branch in dev devel development; do
+  for branch in dev devel develop development; do
     if command git show-ref -q --verify refs/heads/$branch; then
       echo $branch
-      return
+      return 0
     fi
   done
+
   echo develop
+  return 1
 }
 
-#
-# Aliases
-# (sorted alphabetically)
-#
+# Get the default branch name from common branch names or fallback to remote HEAD
+function git_main_branch() {
+  command git rev-parse --git-dir &>/dev/null || return
+  
+  local remote ref
+  
+  for ref in refs/{heads,remotes/{origin,upstream}}/{main,trunk,mainline,default,stable,master}; do
+    if command git show-ref -q --verify $ref; then
+      echo ${ref:t}
+      return 0
+    fi
+  done
+  
+  # Fallback: try to get the default branch from remote HEAD symbolic refs
+  for remote in origin upstream; do
+    ref=$(command git rev-parse --abbrev-ref $remote/HEAD 2>/dev/null)
+    if [[ $ref == $remote/* ]]; then
+      echo ${ref#"$remote/"}; return 0
+    fi
+  done
 
-alias g='git'
-
-alias ga='git add'
-alias gaa='git add --all'
-alias gapa='git add --patch'
-alias gau='git add --update'
-alias gav='git add --verbose'
-alias gap='git apply'
-alias gapt='git apply --3way'
-
-alias gb='git branch'
-alias gba='git branch -a'
-alias gbd='git branch -d'
-alias gbda='git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch -d 2>/dev/null'
-alias gbD='git branch -D'
-alias gbl='git blame -b -w'
-alias gbnm='git branch --no-merged'
-alias gbr='git branch --remote'
-alias gbs='git bisect'
-alias gbsb='git bisect bad'
-alias gbsg='git bisect good'
-alias gbsr='git bisect reset'
-alias gbss='git bisect start'
-
-alias gc='git commit -v'
-alias gc!='git commit -v --amend'
-alias gcn!='git commit -v --no-edit --amend'
-alias gca='git commit -v -a'
-alias gca!='git commit -v -a --amend'
-alias gcan!='git commit -v -a --no-edit --amend'
-alias gcans!='git commit -v -a -s --no-edit --amend'
-alias gcam='git commit -a -m'
-alias gcsm='git commit -s -m'
-alias gcas='git commit -a -s'
-alias gcasm='git commit -a -s -m'
-alias gcb='git checkout -b'
-alias gcf='git config --list'
-
-function gccd() {
-  command git clone --recurse-submodules "$@"
-  [[ -d "$_" ]] && cd "$_" || cd "${${_:t}%.git}"
+  # If no main branch was found, fall back to master but return error
+  echo master
+  return 1
 }
-compdef _git gccd=git-clone
-
-alias gcl='git clone --recurse-submodules'
-alias gclean='git clean -id'
-alias gpristine='git reset --hard && git clean -dffx'
-alias gcm='git checkout $(git_main_branch)'
-alias gcd='git checkout $(git_develop_branch)'
-alias gcmsg='git commit -m'
-alias gco='git checkout'
-alias gcor='git checkout --recurse-submodules'
-alias gcount='git shortlog -sn'
-alias gcp='git cherry-pick'
-alias gcpa='git cherry-pick --abort'
-alias gcpc='git cherry-pick --continue'
-alias gcs='git commit -S'
-alias gcss='git commit -S -s'
-alias gcssm='git commit -S -s -m'
-
-alias gd='git diff'
-alias gdca='git diff --cached'
-alias gdcw='git diff --cached --word-diff'
-alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
-alias gds='git diff --staged'
-alias gdt='git diff-tree --no-commit-id --name-only -r'
-alias gdup='git diff @{upstream}'
-alias gdw='git diff --word-diff'
-
-function gdnolock() {
-  git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
-}
-compdef _git gdnolock=git-diff
-
-function gdv() { git diff -w "$@" | view - }
-compdef _git gdv=git-diff
-
-alias gf='git fetch'
-# --jobs=<n> was added in git 2.8
-is-at-least 2.8 "$git_version" \
-  && alias gfa='git fetch --all --prune --jobs=10' \
-  || alias gfa='git fetch --all --prune'
-alias gfo='git fetch origin'
-
-alias gfg='git ls-files | grep'
-
-alias gg='git gui citool'
-alias gga='git gui citool --amend'
-
-function ggf() {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  git push --force origin "${b:=$1}"
-}
-compdef _git ggf=git-checkout
-function ggfl() {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  git push --force-with-lease origin "${b:=$1}"
-}
-compdef _git ggfl=git-checkout
-
-function ggl() {
-  if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
-    git pull origin "${*}"
-  else
-    [[ "$#" == 0 ]] && local b="$(git_current_branch)"
-    git pull origin "${b:=$1}"
-  fi
-}
-compdef _git ggl=git-checkout
-
-function ggp() {
-  if [[ "$#" != 0 ]] && [[ "$#" != 1 ]]; then
-    git push origin "${*}"
-  else
-    [[ "$#" == 0 ]] && local b="$(git_current_branch)"
-    git push origin "${b:=$1}"
-  fi
-}
-compdef _git ggp=git-checkout
-
-function ggpnp() {
-  if [[ "$#" == 0 ]]; then
-    ggl && ggp
-  else
-    ggl "${*}" && ggp "${*}"
-  fi
-}
-compdef _git ggpnp=git-checkout
-
-function ggu() {
-  [[ "$#" != 1 ]] && local b="$(git_current_branch)"
-  git pull --rebase origin "${b:=$1}"
-}
-compdef _git ggu=git-checkout
-
-alias ggpur='ggu'
-alias ggpull='git pull origin "$(git_current_branch)"'
-alias ggpush='git push origin "$(git_current_branch)"'
-
-alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
-alias gpsup='git push --set-upstream origin $(git_current_branch)'
-
-alias ghh='git help'
-
-alias gignore='git update-index --assume-unchanged'
-alias gignored='git ls-files -v | grep "^[[:lower:]]"'
-alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
-
-alias gk='\gitk --all --branches &!'
-alias gke='\gitk --all $(git log -g --pretty=%h) &!'
-
-alias gl='git pull'
-alias glg='git log --stat'
-alias glgp='git log --stat -p'
-alias glgg='git log --graph'
-alias glgga='git log --graph --decorate --all'
-alias glgm='git log --graph --max-count=10'
-alias glo='git log --oneline --decorate'
-alias glol="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset'"
-alias glols="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --stat"
-alias glod="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset'"
-alias glods="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset' --date=short"
-alias glola="git log --graph --pretty='%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset' --all"
-alias glog='git log --oneline --decorate --graph'
-alias gloga='git log --oneline --decorate --graph --all'
-alias glp="_git_log_prettily"
-
-alias gm='git merge'
-alias gmom='git merge origin/$(git_main_branch)'
-alias gmtl='git mergetool --no-prompt'
-alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
-alias gmum='git merge upstream/$(git_main_branch)'
-alias gma='git merge --abort'
-
-alias gp='git push'
-alias gpd='git push --dry-run'
-alias gpf='git push --force-with-lease'
-alias gpf!='git push --force'
-alias gpoat='git push origin --all && git push origin --tags'
-alias gpr='git pull --rebase'
-alias gpu='git push upstream'
-alias gpv='git push -v'
-
-alias gr='git remote'
-alias gra='git remote add'
-alias grb='git rebase'
-alias grba='git rebase --abort'
-alias grbc='git rebase --continue'
-alias grbd='git rebase $(git_develop_branch)'
-alias grbi='git rebase -i'
-alias grbm='git rebase $(git_main_branch)'
-alias grbom='git rebase origin/$(git_main_branch)'
-alias grbo='git rebase --onto'
-alias grbs='git rebase --skip'
-alias grev='git revert'
-alias grh='git reset'
-alias grhh='git reset --hard'
-alias groh='git reset origin/$(git_current_branch) --hard'
-alias grm='git rm'
-alias grmc='git rm --cached'
-alias grmv='git remote rename'
-alias grrm='git remote remove'
-alias grs='git restore'
-alias grset='git remote set-url'
-alias grss='git restore --source'
-alias grst='git restore --staged'
-alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
-alias gru='git reset --'
-alias grup='git remote update'
-alias grv='git remote -v'
-
-alias gsb='git status -sb'
-alias gsd='git svn dcommit'
-alias gsh='git show'
-alias gsi='git submodule init'
-alias gsps='git show --pretty=short --show-signature'
-alias gsr='git svn rebase'
-alias gss='git status -s'
-alias gst='git status'
-
-# use the default stash push on git 2.13 and newer
-is-at-least 2.13 "$git_version" \
-  && alias gsta='git stash push' \
-  || alias gsta='git stash save'
-
-alias gstaa='git stash apply'
-alias gstc='git stash clear'
-alias gstd='git stash drop'
-alias gstl='git stash list'
-alias gstp='git stash pop'
-alias gsts='git stash show --text'
-alias gstu='gsta --include-untracked'
-alias gstall='git stash --all'
-alias gsu='git submodule update'
-alias gsw='git switch'
-alias gswc='git switch -c'
-alias gswm='git switch $(git_main_branch)'
-alias gswd='git switch $(git_develop_branch)'
-
-alias gts='git tag -s'
-alias gtv='git tag | sort -V'
-alias gtl='gtl(){ git tag --sort=-v:refname -n -l "${1}*" }; noglob gtl'
-
-alias gunignore='git update-index --no-assume-unchanged'
-alias gunwip='git log -n 1 | grep -q -c "\-\-wip\-\-" && git reset HEAD~1'
-alias gup='git pull --rebase'
-alias gupv='git pull --rebase -v'
-alias gupa='git pull --rebase --autostash'
-alias gupav='git pull --rebase --autostash -v'
-alias gupom='git pull --rebase origin $(git_main_branch)'
-alias gupomi='git pull --rebase=interactive origin $(git_main_branch)'
-alias glum='git pull upstream $(git_main_branch)'
-alias gluc='git pull upstream $(git_current_branch)'
-
-alias gwch='git whatchanged -p --abbrev-commit --pretty=medium'
-alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign -m "--wip-- [skip ci]"'
-
-alias gam='git am'
-alias gamc='git am --continue'
-alias gams='git am --skip'
-alias gama='git am --abort'
-alias gamscp='git am --show-current-patch'
 
 function grename() {
   if [[ -z "$1" || -z "$2" ]]; then
@@ -335,4 +63,369 @@ function grename() {
   fi
 }
 
+#
+# Functions Work in Progress (WIP)
+# (sorted alphabetically by function name)
+# (order should follow README)
+#
+
+# Similar to `gunwip` but recursive "Unwips" all recent `--wip--` commits not just the last one
+function gunwipall() {
+  local _commit=$(git log --grep='--wip--' --invert-grep --max-count=1 --format=format:%H)
+
+  # Check if a commit without "--wip--" was found and it's not the same as HEAD
+  if [[ "$_commit" != "$(git rev-parse HEAD)" ]]; then
+    git reset $_commit || return 1
+  fi
+}
+
+# Warn if the current branch is a WIP
+function work_in_progress() {
+  command git -c log.showSignature=false log -n 1 2>/dev/null | grep -q -- "--wip--" && echo "WIP!!"
+}
+
+#
+# Aliases
+# (sorted alphabetically by command)
+# (order should follow README)
+# (in some cases force the alias order to match README, like for example gke and gk)
+#
+
+alias grt='cd "$(git rev-parse --show-toplevel || echo .)"'
+
+function ggpnp() {
+  if [[ $# == 0 ]]; then
+    ggl && ggp
+  else
+    ggl "${*}" && ggp "${*}"
+  fi
+}
+compdef _git ggpnp=git-checkout
+
+alias ggpur='ggu'
+alias g='git'
+alias ga='git add'
+alias gaa='git add --all'
+alias gapa='git add --patch'
+alias gau='git add --update'
+alias gav='git add --verbose'
+alias gwip='git add -A; git rm $(git ls-files --deleted) 2> /dev/null; git commit --no-verify --no-gpg-sign --message "--wip-- [skip ci]"'
+alias gam='git am'
+alias gama='git am --abort'
+alias gamc='git am --continue'
+alias gamscp='git am --show-current-patch'
+alias gams='git am --skip'
+alias gap='git apply'
+alias gapt='git apply --3way'
+alias gbs='git bisect'
+alias gbsb='git bisect bad'
+alias gbsg='git bisect good'
+alias gbsn='git bisect new'
+alias gbso='git bisect old'
+alias gbsr='git bisect reset'
+alias gbss='git bisect start'
+alias gbl='git blame -w'
+alias gb='git branch'
+alias gba='git branch --all'
+alias gbd='git branch --delete'
+alias gbD='git branch --delete --force'
+
+function gbda() {
+  git branch --no-color --merged | command grep -vE "^([+*]|\s*($(git_main_branch)|$(git_develop_branch))\s*$)" | command xargs git branch --delete 2>/dev/null
+}
+
+# Copied and modified from James Roeder (jmaroeder) under MIT License
+# https://github.com/jmaroeder/plugin-git/blob/216723ef4f9e8dde399661c39c80bdf73f4076c4/functions/gbda.fish
+function gbds() {
+  local default_branch=$(git_main_branch)
+  (( ! $? )) || default_branch=$(git_develop_branch)
+
+  git for-each-ref refs/heads/ "--format=%(refname:short)" | \
+    while read branch; do
+      local merge_base=$(git merge-base $default_branch $branch)
+      if [[ $(git cherry $default_branch $(git commit-tree $(git rev-parse $branch\^{tree}) -p $merge_base -m _)) = -* ]]; then
+        git branch -D $branch
+      fi
+    done
+}
+
+alias gbgd='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -d'
+alias gbgD='LANG=C git branch --no-color -vv | grep ": gone\]" | cut -c 3- | awk '"'"'{print $1}'"'"' | xargs git branch -D'
+alias gbm='git branch --move'
+alias gbnm='git branch --no-merged'
+alias gbr='git branch --remote'
+alias ggsup='git branch --set-upstream-to=origin/$(git_current_branch)'
+alias gbg='LANG=C git branch -vv | grep ": gone\]"'
+alias gco='git checkout'
+alias gcor='git checkout --recurse-submodules'
+alias gcb='git checkout -b'
+alias gcB='git checkout -B'
+alias gcd='git checkout $(git_develop_branch)'
+alias gcm='git checkout $(git_main_branch)'
+alias gcp='git cherry-pick'
+alias gcpa='git cherry-pick --abort'
+alias gcpc='git cherry-pick --continue'
+alias gclean='git clean --interactive -d'
+alias gcl='git clone --recurse-submodules'
+alias gclf='git clone --recursive --shallow-submodules --filter=blob:none --also-filter-submodules'
+
+function gccd() {
+  setopt localoptions extendedglob
+
+  # get repo URI from args based on valid formats: https://git-scm.com/docs/git-clone#URLS
+  local repo="${${@[(r)(ssh://*|git://*|ftp(s)#://*|http(s)#://*|*@*)(.git/#)#]}:-$_}"
+
+  # clone repository and exit if it fails
+  command git clone --recurse-submodules "$@" || return
+
+  # if last arg passed was a directory, that's where the repo was cloned
+  # otherwise parse the repo URI and use the last part as the directory
+  [[ -d "$_" ]] && cd "$_" || cd "${${repo:t}%.git/#}"
+}
+compdef _git gccd=git-clone
+
+alias gcam='git commit --all --message'
+alias gcas='git commit --all --signoff'
+alias gcasm='git commit --all --signoff --message'
+alias gcs='git commit --gpg-sign'
+alias gcss='git commit --gpg-sign --signoff'
+alias gcssm='git commit --gpg-sign --signoff --message'
+alias gcmsg='git commit --message'
+alias gcsm='git commit --signoff --message'
+alias gc='git commit --verbose'
+alias gca='git commit --verbose --all'
+alias gca!='git commit --verbose --all --amend'
+alias gcan!='git commit --verbose --all --no-edit --amend'
+alias gcans!='git commit --verbose --all --signoff --no-edit --amend'
+alias gcann!='git commit --verbose --all --date=now --no-edit --amend'
+alias gc!='git commit --verbose --amend'
+alias gcn='git commit --verbose --no-edit'
+alias gcn!='git commit --verbose --no-edit --amend'
+alias gcf='git config --list'
+alias gcfu='git commit --fixup'
+alias gdct='git describe --tags $(git rev-list --tags --max-count=1)'
+alias gd='git diff'
+alias gdca='git diff --cached'
+alias gdcw='git diff --cached --word-diff'
+alias gds='git diff --staged'
+alias gdw='git diff --word-diff'
+
+function gdv() { git diff -w "$@" | view - }
+compdef _git gdv=git-diff
+
+alias gdup='git diff @{upstream}'
+
+function gdnolock() {
+  git diff "$@" ":(exclude)package-lock.json" ":(exclude)*.lock"
+}
+compdef _git gdnolock=git-diff
+
+alias gdt='git diff-tree --no-commit-id --name-only -r'
+alias gf='git fetch'
+# --jobs=<n> was added in git 2.8
+is-at-least 2.8 "$git_version" \
+  && alias gfa='git fetch --all --tags --prune --jobs=10' \
+  || alias gfa='git fetch --all --tags --prune'
+alias gfo='git fetch origin'
+alias gg='git gui citool'
+alias gga='git gui citool --amend'
+alias ghh='git help'
+alias glgg='git log --graph'
+alias glgga='git log --graph --decorate --all'
+alias glgm='git log --graph --max-count=10'
+alias glods='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset" --date=short'
+alias glod='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ad) %C(bold blue)<%an>%Creset"'
+alias glola='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --all'
+alias glols='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset" --stat'
+alias glol='git log --graph --pretty="%Cred%h%Creset -%C(auto)%d%Creset %s %Cgreen(%ar) %C(bold blue)<%an>%Creset"'
+alias glo='git log --oneline --decorate'
+alias glog='git log --oneline --decorate --graph'
+alias gloga='git log --oneline --decorate --graph --all'
+
+# Pretty log messages
+function _git_log_prettily(){
+  if ! [ -z $1 ]; then
+    git log --pretty=$1
+  fi
+}
+compdef _git _git_log_prettily=git-log
+
+alias glp='_git_log_prettily'
+alias glg='git log --stat'
+alias glgp='git log --stat --patch'
+alias gignored='git ls-files -v | grep "^[[:lower:]]"'
+alias gfg='git ls-files | grep'
+alias gm='git merge'
+alias gma='git merge --abort'
+alias gmc='git merge --continue'
+alias gms="git merge --squash"
+alias gmff="git merge --ff-only"
+alias gmom='git merge origin/$(git_main_branch)'
+alias gmum='git merge upstream/$(git_main_branch)'
+alias gmtl='git mergetool --no-prompt'
+alias gmtlvim='git mergetool --no-prompt --tool=vimdiff'
+
+alias gl='git pull'
+alias gpr='git pull --rebase'
+alias gprv='git pull --rebase -v'
+alias gpra='git pull --rebase --autostash'
+alias gprav='git pull --rebase --autostash -v'
+
+function ggu() {
+  local b
+  [[ $# != 1 ]] && b="$(git_current_branch)"
+  git pull --rebase origin "${b:-$1}"
+}
+compdef _git ggu=git-pull
+
+alias gprom='git pull --rebase origin $(git_main_branch)'
+alias gpromi='git pull --rebase=interactive origin $(git_main_branch)'
+alias gprum='git pull --rebase upstream $(git_main_branch)'
+alias gprumi='git pull --rebase=interactive upstream $(git_main_branch)'
+alias ggpull='git pull origin "$(git_current_branch)"'
+
+function ggl() {
+  if [[ $# != 0 ]] && [[ $# != 1 ]]; then
+    git pull origin "${*}"
+  else
+    local b
+    [[ $# == 0 ]] && b="$(git_current_branch)"
+    git pull origin "${b:-$1}"
+  fi
+}
+compdef _git ggl=git-pull
+
+alias gluc='git pull upstream $(git_current_branch)'
+alias glum='git pull upstream $(git_main_branch)'
+alias gp='git push'
+alias gpd='git push --dry-run'
+
+function ggf() {
+  local b
+  [[ $# != 1 ]] && b="$(git_current_branch)"
+  git push --force origin "${b:-$1}"
+}
+compdef _git ggf=git-push
+
+alias gpf!='git push --force'
+is-at-least 2.30 "$git_version" \
+  && alias gpf='git push --force-with-lease --force-if-includes' \
+  || alias gpf='git push --force-with-lease'
+
+function ggfl() {
+  local b
+  [[ $# != 1 ]] && b="$(git_current_branch)"
+  git push --force-with-lease origin "${b:-$1}"
+}
+compdef _git ggfl=git-push
+
+alias gpsup='git push --set-upstream origin $(git_current_branch)'
+is-at-least 2.30 "$git_version" \
+  && alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease --force-if-includes' \
+  || alias gpsupf='git push --set-upstream origin $(git_current_branch) --force-with-lease'
+alias gpv='git push --verbose'
+alias gpoat='git push origin --all && git push origin --tags'
+alias gpod='git push origin --delete'
+alias ggpush='git push origin "$(git_current_branch)"'
+
+function ggp() {
+  if [[ $# != 0 ]] && [[ $# != 1 ]]; then
+    git push origin "${*}"
+  else
+    local b
+    [[ $# == 0 ]] && b="$(git_current_branch)"
+    git push origin "${b:-$1}"
+  fi
+}
+compdef _git ggp=git-push
+
+alias gpu='git push upstream'
+alias grb='git rebase'
+alias grba='git rebase --abort'
+alias grbc='git rebase --continue'
+alias grbi='git rebase --interactive'
+alias grbo='git rebase --onto'
+alias grbs='git rebase --skip'
+alias grbd='git rebase $(git_develop_branch)'
+alias grbm='git rebase $(git_main_branch)'
+alias grbom='git rebase origin/$(git_main_branch)'
+alias grbum='git rebase upstream/$(git_main_branch)'
+alias grf='git reflog'
+alias gr='git remote'
+alias grv='git remote --verbose'
+alias gra='git remote add'
+alias grrm='git remote remove'
+alias grmv='git remote rename'
+alias grset='git remote set-url'
+alias grup='git remote update'
+alias grh='git reset'
+alias gru='git reset --'
+alias grhh='git reset --hard'
+alias grhk='git reset --keep'
+alias grhs='git reset --soft'
+alias gpristine='git reset --hard && git clean --force -dfx'
+alias gwipe='git reset --hard && git clean --force -df'
+alias groh='git reset origin/$(git_current_branch) --hard'
+alias grs='git restore'
+alias grss='git restore --source'
+alias grst='git restore --staged'
+alias gunwip='git rev-list --max-count=1 --format="%s" HEAD | grep -q "\--wip--" && git reset HEAD~1'
+alias grev='git revert'
+alias greva='git revert --abort'
+alias grevc='git revert --continue'
+alias grm='git rm'
+alias grmc='git rm --cached'
+alias gcount='git shortlog --summary --numbered'
+alias gsh='git show'
+alias gsps='git show --pretty=short --show-signature'
+alias gstall='git stash --all'
+alias gstaa='git stash apply'
+alias gstc='git stash clear'
+alias gstd='git stash drop'
+alias gstl='git stash list'
+alias gstp='git stash pop'
+# use the default stash push on git 2.13 and newer
+is-at-least 2.13 "$git_version" \
+  && alias gsta='git stash push' \
+  || alias gsta='git stash save'
+alias gsts='git stash show --patch'
+alias gst='git status'
+alias gss='git status --short'
+alias gsb='git status --short --branch'
+alias gsi='git submodule init'
+alias gsu='git submodule update'
+alias gsd='git svn dcommit'
+alias git-svn-dcommit-push='git svn dcommit && git push github $(git_main_branch):svntrunk'
+alias gsr='git svn rebase'
+alias gsw='git switch'
+alias gswc='git switch --create'
+alias gswd='git switch $(git_develop_branch)'
+alias gswm='git switch $(git_main_branch)'
+alias gta='git tag --annotate'
+alias gts='git tag --sign'
+alias gtv='git tag | sort -V'
+alias gignore='git update-index --assume-unchanged'
+alias gunignore='git update-index --no-assume-unchanged'
+alias gwch='git log --patch --abbrev-commit --pretty=medium --raw'
+alias gwt='git worktree'
+alias gwta='git worktree add'
+alias gwtls='git worktree list'
+alias gwtmv='git worktree move'
+alias gwtrm='git worktree remove'
+alias gstu='gsta --include-untracked'
+alias gtl='gtl(){ git tag --sort=-v:refname -n --list "${1}*" }; noglob gtl'
+alias gk='\gitk --all --branches &!'
+alias gke='\gitk --all $(git log --walk-reflogs --pretty=%h) &!'
+
 unset git_version
+
+# Logic for adding warnings on deprecated aliases or functions
+local old_name new_name
+for old_name new_name (
+  current_branch  git_current_branch
+); do
+  aliases[$old_name]="
+    print -Pu2 \"%F{yellow}[oh-my-zsh] '%F{red}${old_name}%F{yellow}' is deprecated, using '%F{green}${new_name}%F{yellow}' instead.%f\"
+    $new_name"
+done
+unset old_name new_name
diff --git a/zsh/plugins/gitfast/MANUAL.adoc b/zsh/plugins/gitfast/MANUAL.adoc
new file mode 100644
index 0000000..5333f5a
--- /dev/null
+++ b/zsh/plugins/gitfast/MANUAL.adoc
@@ -0,0 +1,40 @@
+This project is a friendly fork of the official Git completion
+(`contrib/completion`) and prompt scripts for Bash, Zsh, and possibly other
+shells.
+
+Most Git developers use the Bash shell, for which the completion scripts work
+rather well, however, Zsh is typically neglected. I've sent many patches to fix
+the issues, many have been merged, but many have been ignored, thus the need for
+a canonical location of a good, working Zsh completion.
+
+There are advantages for Bash users too. Currently the scripts under `contrib` are tied to the
+specific Git version, for example the completion scripts of version v2.40
+(https://git.kernel.org/pub/scm/git/git.git/plain/contrib/completion/git-completion.bash?h=v2.40.0[git-completion.bash])
+have issues with older versions of Git (e.g. v2.33); the ones in
+this project don't.
+
+With `git-completion` you can be sure you are using the latest completion that
+works in both shells, and any Git version.
+
+This is a sister project of the
+https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/gitfast[Oh My Zsh
+gitfast] plugin (that I also maintain), which has similar needs.
+
+== Installation ==
+
+* https://github.com/felipec/git-completion/wiki/Bash[Bash instructions]
+* https://github.com/felipec/git-completion/wiki/Zsh[Zsh instructions]
+
+== Improvements from upstream ==
+
+This is a short list of the benefits you get:
+
+* Easier installation
+* Tons of bug fixes
+* Works with older versions of git
+* Zsh: much more options
+* Zsh: quoting works properly
+* Zsh: automatic suffix removal
+
+For a full list of all the patches on top of upstream git check
+https://github.com/felipec/git-completion/wiki/Patches[Patches].
diff --git a/zsh/plugins/gitfast/README.md b/zsh/plugins/gitfast/README.md
index fed4b12..60b84a2 100644
--- a/zsh/plugins/gitfast/README.md
+++ b/zsh/plugins/gitfast/README.md
@@ -7,9 +7,3 @@ To use it, add `gitfast` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... gitfast)
 ```
-
-## Aliases
-
-An earlier version of the plugin also loaded the git plugin. If you want to keep those
-aliases enable the [git plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git)
-as well.
diff --git a/zsh/plugins/gitfast/_git b/zsh/plugins/gitfast/_git
index 31bf88c..1283c71 100644
--- a/zsh/plugins/gitfast/_git
+++ b/zsh/plugins/gitfast/_git
@@ -2,23 +2,11 @@
 
 # zsh completion wrapper for git
 #
-# Copyright (c) 2012-2020 Felipe Contreras <felipe.contreras@gmail.com>
+# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
 #
-# The recommended way to install this script is to make a copy of it as a
-# file named '_git' inside any directory in your fpath.
+# The recommended way to use this script is to prepend its location to your $fpath:
 #
-# For example, create a directory '~/.zsh/', copy this file to '~/.zsh/_git',
-# and then add the following to your ~/.zshrc file:
-#
-#  fpath=(~/.zsh $fpath)
-#
-# You need git's bash completion script installed. By default bash-completion's
-# location will be used (e.g. pkg-config --variable=completionsdir bash-completion).
-#
-# If your bash completion script is somewhere else, you can specify the
-# location in your ~/.zshrc:
-#
-#  zstyle ':completion:*:*:git:*' script ~/.git-completion.bash
+#  fpath=($git_completion_srcdir $fpath)
 #
 
 zstyle -T ':completion:*:*:git:*' tag-order && \
diff --git a/zsh/plugins/gitfast/git-completion.bash b/zsh/plugins/gitfast/git-completion.bash
index dd06b50..8a790ca 100644
--- a/zsh/plugins/gitfast/git-completion.bash
+++ b/zsh/plugins/gitfast/git-completion.bash
@@ -1,6 +1,8 @@
 # bash/zsh completion support for core Git.
 #
 # Copyright (C) 2006,2007 Shawn O. Pearce <spearce@spearce.org>
+# Copyright (c) 2012-2024 Felipe Contreras <felipe.contreras@gmail.com>
+#
 # Conceptually based on gitcompletion (http://gitweb.hawaga.org.uk/).
 # Distributed under the GNU General Public License, version 2.0.
 #
@@ -58,6 +60,12 @@
 #
 #     When set to "1" suggest all options, including options which are
 #     typically hidden (e.g. '--allow-empty' for 'git commit').
+#
+#   GIT_COMPLETION_IGNORE_CASE
+#
+#     When set, uses for-each-ref '--ignore-case' to find refs that match
+#     case insensitively, even on systems with case sensitive file systems
+#     (e.g., completing tag name "FOO" on "git checkout f<TAB>").
 
 # The following functions are meant to modify COMPREPLY, which should not be
 # modified directly.  The purpose is to localize the modifications so it's
@@ -320,116 +328,6 @@ else
 	unset $(compgen -v __gitcomp_builtin_)
 fi
 
-__gitcomp_builtin_add_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --sparse --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-sparse --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_am_default=" --interactive --3way --quiet --signoff --utf8 --keep --keep-non-patch --message-id --keep-cr --no-keep-cr --scissors --quoted-cr= --whitespace= --ignore-space-change --ignore-whitespace --directory= --exclude= --include= --patch-format= --reject --resolvemsg= --continue --resolved --skip --abort --quit --show-current-patch --allow-empty --committer-date-is-author-date --ignore-date --rerere-autoupdate --gpg-sign --empty= -- --no-interactive --no-3way --no-quiet --no-signoff --no-utf8 --no-keep --no-keep-non-patch --no-message-id --no-scissors --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-directory --no-exclude --no-include --no-patch-format --no-reject --no-resolvemsg --no-committer-date-is-author-date --no-ignore-date --no-rerere-autoupdate --no-gpg-sign"
-__gitcomp_builtin_apply_default=" --exclude= --include= --no-add --stat --numstat --summary --check --index --intent-to-add --cached --apply --3way --build-fake-ancestor= --whitespace= --ignore-space-change --ignore-whitespace --reverse --unidiff-zero --reject --allow-overlap --verbose --quiet --inaccurate-eof --recount --directory= --allow-empty --add -- --no-stat --no-numstat --no-summary --no-check --no-index --no-intent-to-add --no-cached --no-apply --no-3way --no-build-fake-ancestor --no-whitespace --no-ignore-space-change --no-ignore-whitespace --no-reverse --no-unidiff-zero --no-reject --no-allow-overlap --no-verbose --no-quiet --no-inaccurate-eof --no-recount --no-directory --no-allow-empty"
-__gitcomp_builtin_archive_default=" --output= --remote= --exec= --no-output -- --no-remote --no-exec"
-__gitcomp_builtin_bisect__helper_default=" --bisect-reset --bisect-next-check --bisect-terms --bisect-start --bisect-next --bisect-state --bisect-log --bisect-replay --bisect-skip --bisect-visualize --bisect-run --no-log --log"
-__gitcomp_builtin_blame_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
-__gitcomp_builtin_branch_default=" --verbose --quiet --track --set-upstream-to= --unset-upstream --color --remotes --contains --no-contains --abbrev --all --delete --move --copy --list --show-current --create-reflog --edit-description --merged --no-merged --column --sort= --points-at= --ignore-case --recurse-submodules --format= -- --no-verbose --no-quiet --no-track --no-set-upstream-to --no-unset-upstream --no-color --no-remotes --no-abbrev --no-all --no-delete --no-move --no-copy --no-list --no-show-current --no-create-reflog --no-edit-description --no-column --no-sort --no-points-at --no-ignore-case --no-recurse-submodules --no-format"
-__gitcomp_builtin_bugreport_default=" --output-directory= --suffix= --no-output-directory -- --no-suffix"
-__gitcomp_builtin_cat_file_default=" --allow-unknown-type --batch --batch-check --batch-command --batch-all-objects --buffer --follow-symlinks --unordered --textconv --filters --path= --no-allow-unknown-type -- --no-buffer --no-follow-symlinks --no-unordered --no-path"
-__gitcomp_builtin_check_attr_default=" --all --cached --stdin --no-all -- --no-cached --no-stdin"
-__gitcomp_builtin_check_ignore_default=" --quiet --verbose --stdin --non-matching --no-index --index -- --no-quiet --no-verbose --no-stdin --no-non-matching"
-__gitcomp_builtin_check_mailmap_default=" --stdin --no-stdin"
-__gitcomp_builtin_checkout_default=" --guess --overlay --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-guess -- --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_checkout__worker_default=" --prefix= --no-prefix"
-__gitcomp_builtin_checkout_index_default=" --all --ignore-skip-worktree-bits --force --quiet --no-create --index --stdin --temp --prefix= --stage= --create -- --no-all --no-ignore-skip-worktree-bits --no-force --no-quiet --no-index --no-stdin --no-temp --no-prefix"
-__gitcomp_builtin_cherry_default=" --abbrev --verbose --no-abbrev -- --no-verbose"
-__gitcomp_builtin_cherry_pick_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --ff --allow-empty --allow-empty-message --keep-redundant-commits --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign --no-ff --no-allow-empty --no-allow-empty-message --no-keep-redundant-commits"
-__gitcomp_builtin_clean_default=" --quiet --dry-run --interactive --exclude= --no-quiet -- --no-dry-run --no-interactive"
-__gitcomp_builtin_clone_default=" --verbose --quiet --progress --reject-shallow --no-checkout --bare --mirror --local --no-hardlinks --shared --recurse-submodules --jobs= --template= --reference= --reference-if-able= --dissociate --origin= --branch= --upload-pack= --depth= --shallow-since= --shallow-exclude= --single-branch --no-tags --shallow-submodules --separate-git-dir= --config= --server-option= --ipv4 --ipv6 --filter= --also-filter-submodules --remote-submodules --sparse --checkout --hardlinks --tags -- --no-verbose --no-quiet --no-progress --no-reject-shallow --no-bare --no-mirror --no-local --no-shared --no-recurse-submodules --no-recursive --no-jobs --no-template --no-reference --no-reference-if-able --no-dissociate --no-origin --no-branch --no-upload-pack --no-depth --no-shallow-since --no-shallow-exclude --no-single-branch --no-shallow-submodules --no-separate-git-dir --no-config --no-server-option --no-ipv4 --no-ipv6 --no-filter --no-also-filter-submodules --no-remote-submodules --no-sparse"
-__gitcomp_builtin_column_default=" --command= --mode --raw-mode= --width= --indent= --nl= --padding= --no-command -- --no-mode --no-raw-mode --no-width --no-indent --no-nl --no-padding"
-__gitcomp_builtin_commit_default=" --quiet --verbose --file= --author= --date= --message= --reedit-message= --reuse-message= --fixup= --squash= --reset-author --trailer= --signoff --template= --edit --cleanup= --status --gpg-sign --all --include --interactive --patch --only --no-verify --dry-run --short --branch --ahead-behind --porcelain --long --null --amend --no-post-rewrite --untracked-files --pathspec-from-file= --pathspec-file-nul --verify --post-rewrite -- --no-quiet --no-verbose --no-file --no-author --no-date --no-message --no-reedit-message --no-reuse-message --no-fixup --no-squash --no-reset-author --no-signoff --no-template --no-edit --no-cleanup --no-status --no-gpg-sign --no-all --no-include --no-interactive --no-patch --no-only --no-dry-run --no-short --no-branch --no-ahead-behind --no-porcelain --no-long --no-null --no-amend --no-untracked-files --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_commit_graph_default=" --object-dir= --no-object-dir"
-__gitcomp_builtin_config_default=" --global --system --local --worktree --file= --blob= --get --get-all --get-regexp --get-urlmatch --replace-all --add --unset --unset-all --rename-section --remove-section --list --fixed-value --edit --get-color --get-colorbool --type= --bool --int --bool-or-int --bool-or-str --path --expiry-date --null --name-only --includes --show-origin --show-scope --default= --no-global -- --no-system --no-local --no-worktree --no-file --no-blob --no-get --no-get-all --no-get-regexp --no-get-urlmatch --no-replace-all --no-add --no-unset --no-unset-all --no-rename-section --no-remove-section --no-list --no-fixed-value --no-edit --no-get-color --no-get-colorbool --no-type --no-null --no-name-only --no-includes --no-show-origin --no-show-scope --no-default"
-__gitcomp_builtin_count_objects_default=" --verbose --human-readable --no-verbose -- --no-human-readable"
-__gitcomp_builtin_credential_cache_default=" --timeout= --socket= --no-timeout -- --no-socket"
-__gitcomp_builtin_credential_cache__daemon_default=" --debug --no-debug"
-__gitcomp_builtin_credential_store_default=" --file= --no-file"
-__gitcomp_builtin_describe_default=" --contains --debug --all --tags --long --first-parent --abbrev --exact-match --candidates= --match= --exclude= --always --dirty --broken --no-contains -- --no-debug --no-all --no-tags --no-long --no-first-parent --no-abbrev --no-exact-match --no-candidates --no-match --no-exclude --no-always --no-dirty --no-broken"
-__gitcomp_builtin_difftool_default=" --gui --dir-diff --no-prompt --symlinks --tool= --tool-help --trust-exit-code --extcmd= --no-index --index -- --no-gui --no-dir-diff --no-symlinks --no-tool --no-tool-help --no-trust-exit-code --no-extcmd"
-__gitcomp_builtin_env__helper_default=" --type= --default= --exit-code --no-default -- --no-exit-code"
-__gitcomp_builtin_fast_export_default=" --progress= --signed-tags= --tag-of-filtered-object= --reencode= --export-marks= --import-marks= --import-marks-if-exists= --fake-missing-tagger --full-tree --use-done-feature --no-data --refspec= --anonymize --anonymize-map= --reference-excluded-parents --show-original-ids --mark-tags --data -- --no-progress --no-signed-tags --no-tag-of-filtered-object --no-reencode --no-export-marks --no-import-marks --no-import-marks-if-exists --no-fake-missing-tagger --no-full-tree --no-use-done-feature --no-refspec --no-anonymize --no-reference-excluded-parents --no-show-original-ids --no-mark-tags"
-__gitcomp_builtin_fetch_default=" --verbose --quiet --all --set-upstream --append --atomic --upload-pack= --force --multiple --tags --jobs= --prefetch --prune --prune-tags --recurse-submodules --dry-run --write-fetch-head --keep --update-head-ok --progress --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --refetch --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --negotiate-only --filter= --auto-maintenance --auto-gc --show-forced-updates --write-commit-graph --stdin --no-verbose -- --no-quiet --no-all --no-set-upstream --no-append --no-atomic --no-upload-pack --no-force --no-multiple --no-tags --no-jobs --no-prefetch --no-prune --no-prune-tags --no-recurse-submodules --no-dry-run --no-write-fetch-head --no-keep --no-update-head-ok --no-progress --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-negotiate-only --no-filter --no-auto-maintenance --no-auto-gc --no-show-forced-updates --no-write-commit-graph --no-stdin"
-__gitcomp_builtin_fmt_merge_msg_default=" --log --message= --into-name= --file= --no-log -- --no-message --no-into-name --no-file"
-__gitcomp_builtin_for_each_ref_default=" --shell --perl --python --tcl --count= --format= --color --sort= --points-at= --merged --no-merged --contains --no-contains --ignore-case -- --no-shell --no-perl --no-python --no-tcl --no-count --no-format --no-color --no-sort --no-points-at --no-ignore-case"
-__gitcomp_builtin_for_each_repo_default=" --config= --no-config"
-__gitcomp_builtin_format_patch_default=" --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --to= --cc= --from --in-reply-to= --attach --inline --thread --signature= --base= --signature-file= --quiet --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-numbered --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-to --no-cc --no-from --no-in-reply-to --no-attach --no-thread --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
-__gitcomp_builtin_fsck_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
-__gitcomp_builtin_fsck_objects_default=" --verbose --unreachable --dangling --tags --root --cache --reflogs --full --connectivity-only --strict --lost-found --progress --name-objects --no-verbose -- --no-unreachable --no-dangling --no-tags --no-root --no-cache --no-reflogs --no-full --no-connectivity-only --no-strict --no-lost-found --no-progress --no-name-objects"
-__gitcomp_builtin_fsmonitor__daemon_default=""
-__gitcomp_builtin_gc_default=" --quiet --prune --aggressive --keep-largest-pack --no-quiet -- --no-prune --no-aggressive --no-keep-largest-pack"
-__gitcomp_builtin_grep_default=" --cached --no-index --untracked --exclude-standard --recurse-submodules --invert-match --ignore-case --word-regexp --text --textconv --recursive --max-depth= --extended-regexp --basic-regexp --fixed-strings --perl-regexp --line-number --column --full-name --files-with-matches --name-only --files-without-match --only-matching --count --color --break --heading --context= --before-context= --after-context= --threads= --show-function --function-context --and --or --not --quiet --all-match --index -- --no-cached --no-untracked --no-exclude-standard --no-recurse-submodules --no-invert-match --no-ignore-case --no-word-regexp --no-text --no-textconv --no-recursive --no-extended-regexp --no-basic-regexp --no-fixed-strings --no-perl-regexp --no-line-number --no-column --no-full-name --no-files-with-matches --no-name-only --no-files-without-match --no-only-matching --no-count --no-color --no-break --no-heading --no-context --no-before-context --no-after-context --no-threads --no-show-function --no-function-context --no-or --no-quiet --no-all-match"
-__gitcomp_builtin_hash_object_default=" --stdin --stdin-paths --no-filters --literally --path= --filters -- --no-stdin --no-stdin-paths --no-literally --no-path"
-__gitcomp_builtin_help_default=" --all --external-commands --aliases --man --web --info --verbose --guides --config --no-external-commands -- --no-aliases --no-man --no-web --no-info --no-verbose"
-__gitcomp_builtin_hook_default=""
-__gitcomp_builtin_init_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
-__gitcomp_builtin_init_db_default=" --template= --bare --shared --quiet --separate-git-dir= --initial-branch= --object-format= --no-template -- --no-bare --no-quiet --no-separate-git-dir --no-initial-branch --no-object-format"
-__gitcomp_builtin_interpret_trailers_default=" --in-place --trim-empty --where= --if-exists= --if-missing= --only-trailers --only-input --unfold --parse --no-divider --trailer= --divider -- --no-in-place --no-trim-empty --no-where --no-if-exists --no-if-missing --no-only-trailers --no-only-input --no-unfold --no-trailer"
-__gitcomp_builtin_log_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
-__gitcomp_builtin_ls_files_default=" --cached --deleted --modified --others --ignored --stage --killed --directory --eol --empty-directory --unmerged --resolve-undo --exclude= --exclude-from= --exclude-per-directory= --exclude-standard --full-name --recurse-submodules --error-unmatch --with-tree= --abbrev --debug --deduplicate --sparse --no-cached -- --no-deleted --no-modified --no-others --no-ignored --no-stage --no-killed --no-directory --no-eol --no-empty-directory --no-unmerged --no-resolve-undo --no-exclude-per-directory --no-recurse-submodules --no-error-unmatch --no-with-tree --no-abbrev --no-debug --no-deduplicate --no-sparse"
-__gitcomp_builtin_ls_remote_default=" --quiet --upload-pack= --tags --heads --refs --get-url --sort= --symref --server-option= --no-quiet -- --no-upload-pack --no-tags --no-heads --no-refs --no-get-url --no-sort --no-symref --no-server-option"
-__gitcomp_builtin_ls_tree_default=" --long --name-only --name-status --object-only --full-name --full-tree --format= --abbrev --no-full-name -- --no-full-tree --no-abbrev"
-__gitcomp_builtin_merge_default=" --stat --summary --log --squash --commit --edit --cleanup= --ff --ff-only --rerere-autoupdate --verify-signatures --strategy= --strategy-option= --message= --file --into-name= --verbose --quiet --abort --quit --continue --allow-unrelated-histories --progress --gpg-sign --autostash --overwrite-ignore --signoff --no-verify --verify -- --no-stat --no-summary --no-log --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-rerere-autoupdate --no-verify-signatures --no-strategy --no-strategy-option --no-message --no-into-name --no-verbose --no-quiet --no-abort --no-quit --no-continue --no-allow-unrelated-histories --no-progress --no-gpg-sign --no-autostash --no-overwrite-ignore --no-signoff"
-__gitcomp_builtin_merge_base_default=" --all --octopus --independent --is-ancestor --fork-point --no-all"
-__gitcomp_builtin_merge_file_default=" --stdout --diff3 --zdiff3 --ours --theirs --union --marker-size= --quiet --no-stdout -- --no-diff3 --no-zdiff3 --no-ours --no-theirs --no-union --no-marker-size --no-quiet"
-__gitcomp_builtin_mktree_default=" --missing --batch --no-missing -- --no-batch"
-__gitcomp_builtin_multi_pack_index_default=" --object-dir= --no-object-dir"
-__gitcomp_builtin_mv_default=" --verbose --dry-run --sparse --no-verbose -- --no-dry-run --no-sparse"
-__gitcomp_builtin_name_rev_default=" --name-only --tags --refs= --exclude= --all --stdin --annotate-stdin --undefined --always --no-name-only -- --no-tags --no-refs --no-exclude --no-all --no-stdin --no-annotate-stdin --no-undefined --no-always"
-__gitcomp_builtin_notes_default=" --ref= --no-ref"
-__gitcomp_builtin_pack_objects_default=" --quiet --progress --all-progress --all-progress-implied --index-version= --max-pack-size= --local --incremental --window= --window-memory= --depth= --reuse-delta --reuse-object --delta-base-offset --threads= --non-empty --revs --unpacked --all --reflog --indexed-objects --stdin-packs --stdout --include-tag --keep-unreachable --pack-loose-unreachable --unpack-unreachable --sparse --thin --shallow --honor-pack-keep --keep-pack= --compression= --keep-true-parents --use-bitmap-index --write-bitmap-index --filter= --missing= --exclude-promisor-objects --delta-islands --uri-protocol= --no-quiet -- --no-progress --no-all-progress --no-all-progress-implied --no-local --no-incremental --no-window --no-depth --no-reuse-delta --no-reuse-object --no-delta-base-offset --no-threads --no-non-empty --no-revs --no-stdin-packs --no-stdout --no-include-tag --no-keep-unreachable --no-pack-loose-unreachable --no-unpack-unreachable --no-sparse --no-thin --no-shallow --no-honor-pack-keep --no-keep-pack --no-compression --no-keep-true-parents --no-use-bitmap-index --no-write-bitmap-index --no-filter --no-exclude-promisor-objects --no-delta-islands --no-uri-protocol"
-__gitcomp_builtin_pack_refs_default=" --all --prune --no-all -- --no-prune"
-__gitcomp_builtin_pickaxe_default=" --incremental --root --show-stats --progress --score-debug --show-name --show-number --porcelain --line-porcelain --show-email --ignore-rev= --ignore-revs-file= --color-lines --color-by-age --minimal --contents= --abbrev --no-incremental -- --no-root --no-show-stats --no-progress --no-score-debug --no-show-name --no-show-number --no-porcelain --no-line-porcelain --no-show-email --no-ignore-rev --no-ignore-revs-file --no-color-lines --no-color-by-age --no-minimal --no-contents --no-abbrev"
-__gitcomp_builtin_prune_default=" --dry-run --verbose --progress --expire= --exclude-promisor-objects --no-dry-run -- --no-verbose --no-progress --no-expire --no-exclude-promisor-objects"
-__gitcomp_builtin_prune_packed_default=" --dry-run --quiet --no-dry-run -- --no-quiet"
-__gitcomp_builtin_pull_default=" --verbose --quiet --progress --recurse-submodules --rebase --stat --log --signoff --squash --commit --edit --cleanup= --ff --ff-only --verify --verify-signatures --autostash --strategy= --strategy-option= --gpg-sign --allow-unrelated-histories --all --append --upload-pack= --force --tags --prune --jobs --dry-run --keep --depth= --shallow-since= --shallow-exclude= --deepen= --unshallow --update-shallow --refmap= --server-option= --ipv4 --ipv6 --negotiation-tip= --show-forced-updates --set-upstream --no-verbose -- --no-quiet --no-progress --no-recurse-submodules --no-rebase --no-stat --no-log --no-signoff --no-squash --no-commit --no-edit --no-cleanup --no-ff --no-verify --no-verify-signatures --no-autostash --no-strategy --no-strategy-option --no-gpg-sign --no-allow-unrelated-histories --no-all --no-append --no-upload-pack --no-force --no-tags --no-prune --no-jobs --no-dry-run --no-keep --no-depth --no-shallow-since --no-shallow-exclude --no-deepen --no-update-shallow --no-server-option --no-ipv4 --no-ipv6 --no-negotiation-tip --no-show-forced-updates --no-set-upstream"
-__gitcomp_builtin_push_default=" --verbose --quiet --repo= --all --mirror --delete --tags --dry-run --porcelain --force --force-with-lease --force-if-includes --recurse-submodules= --receive-pack= --exec= --set-upstream --progress --prune --no-verify --follow-tags --signed --atomic --push-option= --ipv4 --ipv6 --verify -- --no-verbose --no-quiet --no-repo --no-all --no-mirror --no-delete --no-tags --no-dry-run --no-porcelain --no-force --no-force-with-lease --no-force-if-includes --no-recurse-submodules --no-receive-pack --no-exec --no-set-upstream --no-progress --no-prune --no-follow-tags --no-signed --no-atomic --no-push-option --no-ipv4 --no-ipv6"
-__gitcomp_builtin_range_diff_default=" --creation-factor= --no-dual-color --notes --left-only --right-only --patch --no-patch --unified --function-context --raw --patch-with-raw --patch-with-stat --numstat --shortstat --dirstat --cumulative --dirstat-by-file --check --summary --name-only --name-status --stat --stat-width= --stat-name-width= --stat-graph-width= --stat-count= --compact-summary --binary --full-index --color --ws-error-highlight= --abbrev --src-prefix= --dst-prefix= --line-prefix= --no-prefix --inter-hunk-context= --output-indicator-new= --output-indicator-old= --output-indicator-context= --break-rewrites --find-renames --irreversible-delete --find-copies --find-copies-harder --no-renames --rename-empty --follow --minimal --ignore-all-space --ignore-space-change --ignore-space-at-eol --ignore-cr-at-eol --ignore-blank-lines --ignore-matching-lines= --indent-heuristic --patience --histogram --diff-algorithm= --anchored= --word-diff --word-diff-regex= --color-words --color-moved --color-moved-ws= --relative --text --exit-code --quiet --ext-diff --textconv --ignore-submodules --submodule --ita-invisible-in-index --ita-visible-in-index --pickaxe-all --pickaxe-regex --rotate-to= --skip-to= --find-object= --diff-filter= --output= --dual-color -- --no-creation-factor --no-notes --no-left-only --no-right-only --no-function-context --no-compact-summary --no-full-index --no-color --no-abbrev --no-find-copies-harder --no-rename-empty --no-follow --no-minimal --no-ignore-matching-lines --no-indent-heuristic --no-color-moved --no-color-moved-ws --no-relative --no-text --no-exit-code --no-quiet --no-ext-diff --no-textconv"
-__gitcomp_builtin_read_tree_default=" --index-output= --empty --verbose --trivial --aggressive --reset --prefix= --exclude-per-directory= --dry-run --no-sparse-checkout --debug-unpack --recurse-submodules --quiet --sparse-checkout -- --no-empty --no-verbose --no-trivial --no-aggressive --no-reset --no-dry-run --no-debug-unpack --no-recurse-submodules --no-quiet"
-__gitcomp_builtin_rebase_default=" --onto= --keep-base --no-verify --quiet --verbose --no-stat --signoff --committer-date-is-author-date --reset-author-date --ignore-whitespace --whitespace= --force-rebase --no-ff --continue --skip --abort --quit --edit-todo --show-current-patch --apply --merge --interactive --rerere-autoupdate --empty= --autosquash --gpg-sign --autostash --exec= --rebase-merges --fork-point --strategy= --strategy-option= --root --reschedule-failed-exec --reapply-cherry-picks --verify --stat --ff -- --no-onto --no-keep-base --no-quiet --no-verbose --no-signoff --no-committer-date-is-author-date --no-reset-author-date --no-ignore-whitespace --no-whitespace --no-force-rebase --no-rerere-autoupdate --no-autosquash --no-gpg-sign --no-autostash --no-exec --no-rebase-merges --no-fork-point --no-strategy --no-strategy-option --no-root --no-reschedule-failed-exec --no-reapply-cherry-picks"
-__gitcomp_builtin_receive_pack_default=" --quiet --no-quiet"
-__gitcomp_builtin_reflog_default=""
-__gitcomp_builtin_remote_default=" --verbose --no-verbose"
-__gitcomp_builtin_repack_default=" --quiet --local --write-bitmap-index --delta-islands --unpack-unreachable= --keep-unreachable --window= --window-memory= --depth= --threads= --max-pack-size= --pack-kept-objects --keep-pack= --geometric= --write-midx --no-quiet -- --no-local --no-write-bitmap-index --no-delta-islands --no-unpack-unreachable --no-keep-unreachable --no-window --no-window-memory --no-depth --no-threads --no-max-pack-size --no-pack-kept-objects --no-keep-pack --no-geometric --no-write-midx"
-__gitcomp_builtin_replace_default=" --list --delete --edit --graft --convert-graft-file --raw --format= --no-raw -- --no-format"
-__gitcomp_builtin_rerere_default=" --rerere-autoupdate --no-rerere-autoupdate"
-__gitcomp_builtin_reset_default=" --quiet --no-refresh --mixed --soft --hard --merge --keep --recurse-submodules --patch --intent-to-add --pathspec-from-file= --pathspec-file-nul --refresh -- --no-quiet --no-mixed --no-soft --no-hard --no-merge --no-keep --no-recurse-submodules --no-patch --no-intent-to-add --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_restore_default=" --source= --staged --worktree --ignore-unmerged --overlay --quiet --recurse-submodules --progress --merge --conflict= --ours --theirs --patch --ignore-skip-worktree-bits --pathspec-from-file= --pathspec-file-nul --no-source -- --no-staged --no-worktree --no-ignore-unmerged --no-overlay --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-patch --no-ignore-skip-worktree-bits --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_revert_default=" --quit --continue --abort --skip --cleanup= --no-commit --edit --signoff --mainline= --rerere-autoupdate --strategy= --strategy-option= --gpg-sign --commit -- --no-cleanup --no-edit --no-signoff --no-mainline --no-rerere-autoupdate --no-strategy --no-strategy-option --no-gpg-sign"
-__gitcomp_builtin_rm_default=" --dry-run --quiet --cached --ignore-unmatch --sparse --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-quiet --no-cached --no-ignore-unmatch --no-sparse --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_send_pack_default=" --verbose --quiet --receive-pack= --exec= --remote= --all --dry-run --mirror --force --signed --push-option= --progress --thin --atomic --stateless-rpc --stdin --helper-status --force-with-lease --force-if-includes --no-verbose -- --no-quiet --no-receive-pack --no-exec --no-remote --no-all --no-dry-run --no-mirror --no-force --no-signed --no-push-option --no-progress --no-thin --no-atomic --no-stateless-rpc --no-stdin --no-helper-status --no-force-with-lease --no-force-if-includes"
-__gitcomp_builtin_shortlog_default=" --committer --numbered --summary --email --group= --no-committer -- --no-numbered --no-summary --no-email --no-group"
-__gitcomp_builtin_show_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
-__gitcomp_builtin_show_branch_default=" --all --remotes --color --more --list --no-name --current --sha1-name --merge-base --independent --topo-order --topics --sparse --date-order --reflog --name -- --no-all --no-remotes --no-color --no-more --no-list --no-current --no-sha1-name --no-merge-base --no-independent --no-topo-order --no-topics --no-sparse --no-date-order"
-__gitcomp_builtin_show_index_default=" --object-format= --no-object-format"
-__gitcomp_builtin_show_ref_default=" --tags --heads --verify --head --dereference --hash --abbrev --quiet --exclude-existing --no-tags -- --no-heads --no-verify --no-head --no-dereference --no-hash --no-abbrev --no-quiet"
-__gitcomp_builtin_sparse_checkout_default=""
-__gitcomp_builtin_stage_default=" --dry-run --verbose --interactive --patch --edit --force --update --renormalize --intent-to-add --all --ignore-removal --refresh --ignore-errors --ignore-missing --sparse --chmod= --pathspec-from-file= --pathspec-file-nul --no-dry-run -- --no-verbose --no-interactive --no-patch --no-edit --no-force --no-update --no-renormalize --no-intent-to-add --no-all --no-ignore-removal --no-refresh --no-ignore-errors --no-ignore-missing --no-sparse --no-chmod --no-pathspec-from-file --no-pathspec-file-nul"
-__gitcomp_builtin_stash_default=""
-__gitcomp_builtin_status_default=" --verbose --short --branch --show-stash --ahead-behind --porcelain --long --null --untracked-files --ignored --ignore-submodules --column --no-renames --find-renames --renames -- --no-verbose --no-short --no-branch --no-show-stash --no-ahead-behind --no-porcelain --no-long --no-null --no-untracked-files --no-ignored --no-ignore-submodules --no-column"
-__gitcomp_builtin_stripspace_default=" --strip-comments --comment-lines"
-__gitcomp_builtin_switch_default=" --create= --force-create= --guess --discard-changes --quiet --recurse-submodules --progress --merge --conflict= --detach --track --orphan= --ignore-other-worktrees --no-create -- --no-force-create --no-guess --no-discard-changes --no-quiet --no-recurse-submodules --no-progress --no-merge --no-conflict --no-detach --no-track --no-orphan --no-ignore-other-worktrees"
-__gitcomp_builtin_symbolic_ref_default=" --quiet --delete --short --no-quiet -- --no-delete --no-short"
-__gitcomp_builtin_tag_default=" --list --delete --verify --annotate --message= --file= --edit --sign --cleanup= --local-user= --force --create-reflog --column --contains --no-contains --merged --no-merged --sort= --points-at --format= --color --ignore-case -- --no-annotate --no-file --no-edit --no-sign --no-cleanup --no-local-user --no-force --no-create-reflog --no-column --no-sort --no-points-at --no-format --no-color --no-ignore-case"
-__gitcomp_builtin_update_index_default=" --ignore-submodules --add --replace --remove --unmerged --refresh --really-refresh --cacheinfo --chmod= --assume-unchanged --no-assume-unchanged --skip-worktree --no-skip-worktree --ignore-skip-worktree-entries --info-only --force-remove --stdin --index-info --unresolve --again --ignore-missing --verbose --clear-resolve-undo --index-version= --split-index --untracked-cache --test-untracked-cache --force-untracked-cache --force-write-index --fsmonitor --fsmonitor-valid --no-fsmonitor-valid -- --no-ignore-submodules --no-add --no-replace --no-remove --no-unmerged --no-ignore-skip-worktree-entries --no-info-only --no-force-remove --no-ignore-missing --no-verbose --no-index-version --no-split-index --no-untracked-cache --no-test-untracked-cache --no-force-untracked-cache --no-force-write-index --no-fsmonitor"
-__gitcomp_builtin_update_ref_default=" --no-deref --stdin --create-reflog --deref -- --no-stdin --no-create-reflog"
-__gitcomp_builtin_update_server_info_default=" --force --no-force"
-__gitcomp_builtin_upload_pack_default=" --stateless-rpc --strict --timeout= --no-stateless-rpc -- --no-strict --no-timeout"
-__gitcomp_builtin_verify_commit_default=" --verbose --raw --no-verbose -- --no-raw"
-__gitcomp_builtin_verify_pack_default=" --verbose --stat-only --object-format= --no-verbose -- --no-stat-only --no-object-format"
-__gitcomp_builtin_verify_tag_default=" --verbose --raw --format= --no-verbose -- --no-raw --no-format"
-__gitcomp_builtin_version_default=" --build-options --no-build-options"
-__gitcomp_builtin_whatchanged_default=" --quiet --source --use-mailmap --decorate-refs= --decorate-refs-exclude= --decorate --no-quiet -- --no-source --no-use-mailmap --no-mailmap --no-decorate-refs --no-decorate-refs-exclude --no-decorate"
-__gitcomp_builtin_write_tree_default=" --missing-ok --prefix= --no-missing-ok -- --no-prefix"
-__gitcomp_builtin_send_email_default="--sender= --from= --smtp-auth= --8bit-encoding= --no-format-patch --no-bcc --no-suppress-from --no-annotate --relogin-delay= --no-cc --no-signed-off-cc --no-signed-off-by-cc --no-chain-reply-to --smtp-debug= --smtp-domain= --chain-reply-to --dry-run --compose --bcc= --smtp-user= --thread --cc-cover --identity= --to= --reply-to= --no-cc-cover --suppress-cc= --to-cmd= --smtp-server= --smtp-ssl-cert-path= --no-thread --smtp-server-option= --quiet --batch-size= --envelope-sender= --smtp-ssl --no-to --validate --format-patch --suppress-from --cc= --compose-encoding= --to-cover --in-reply-to= --annotate --smtp-encryption= --cc-cmd= --smtp-server-port= --smtp-pass= --signed-off-cc --signed-off-by-cc --no-xmailer --subject= --no-to-cover --confirm= --transfer-encoding= --no-smtp-auth --sendmail-cmd= --no-validate --no-identity --dump-aliases --xmailer --force --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --from --attach --inline --signature= --base= --signature-file= --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-from --no-in-reply-to --no-attach --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
-
-__gitcomp_builtin_get_default ()
-{
-	eval "test -n \"\$${1}_default\" && echo \"\$${1}_default\""
-}
-
 # This function is equivalent to
 #
 #    __gitcomp_opts "$(git xxx --git-completion-helper) ..."
@@ -457,11 +355,9 @@ __gitcomp_builtin ()
 		else
 			completion_helper="--git-completion-helper"
 		fi
-		completion="$(__git ${cmd/_/ } $completion_helper ||
-			__gitcomp_builtin_get_default $var)" || return
 		# leading and trailing spaces are significant to make
 		# option removal work correctly.
-		options=" $incl $completion "
+		options=" $incl $(__git ${cmd/_/ } $completion_helper) " || return
 
 		for i in $excl; do
 			options="${options/ $i / }"
@@ -604,6 +500,7 @@ __git_heads ()
 	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
 
 	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
 			"refs/heads/$cur_*" "refs/heads/$cur_*/**"
 }
 
@@ -617,6 +514,7 @@ __git_remote_heads ()
 	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
 
 	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
 			"refs/remotes/$cur_*" "refs/remotes/$cur_*/**"
 }
 
@@ -627,6 +525,7 @@ __git_tags ()
 	local pfx="${1-}" cur_="${2-}" sfx="${3-}"
 
 	__git for-each-ref --format="${pfx//\%/%%}%(refname:strip=2)$sfx" \
+			${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
 			"refs/tags/$cur_*" "refs/tags/$cur_*/**"
 }
 
@@ -646,6 +545,7 @@ __git_dwim_remote_heads ()
 	# but only output if the branch name is unique
 	__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
 		--sort="refname:strip=3" \
+		${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
 		"refs/remotes/*/$cur_*" "refs/remotes/*/$cur_*/**" | \
 	uniq -u
 }
@@ -670,6 +570,7 @@ __git_refs ()
 	local format refs
 	local pfx="${3-}" cur_="${4-$cur}" sfx="${5-}"
 	local match="${4-}"
+	local umatch="${4-}"
 	local fer_pfx="${pfx//\%/%%}" # "escape" for-each-ref format specifiers
 
 	__git_find_repo_path
@@ -693,12 +594,19 @@ __git_refs ()
 		fi
 	fi
 
+	if test "${GIT_COMPLETION_IGNORE_CASE:+1}" = "1"
+	then
+		# uppercase with tr instead of ${match,^^} for bash 3.2 compatibility
+		umatch=$(echo "$match" | tr a-z A-Z 2>/dev/null || echo "$match")
+	fi
+
 	if [ "$list_refs_from" = path ]; then
 		if [[ "$cur_" == ^* ]]; then
 			pfx="$pfx^"
 			fer_pfx="$fer_pfx^"
 			cur_=${cur_#^}
 			match=${match#^}
+			umatch=${umatch#^}
 		fi
 		case "$cur_" in
 		refs|refs/*)
@@ -709,7 +617,7 @@ __git_refs ()
 		*)
 			for i in HEAD FETCH_HEAD ORIG_HEAD MERGE_HEAD REBASE_HEAD CHERRY_PICK_HEAD; do
 				case "$i" in
-				$match*)
+				$match*|$umatch*)
 					if [ -e "$dir/$i" ]; then
 						echo "$pfx$i$sfx"
 					fi
@@ -723,6 +631,7 @@ __git_refs ()
 			;;
 		esac
 		__git_dir="$dir" __git for-each-ref --format="$fer_pfx%($format)$sfx" \
+			${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
 			"${refs[@]}"
 		if [ -n "$track" ]; then
 			__git_dwim_remote_heads "$pfx" "$match" "$sfx"
@@ -742,15 +651,16 @@ __git_refs ()
 	*)
 		if [ "$list_refs_from" = remote ]; then
 			case "HEAD" in
-			$match*)	echo "${pfx}HEAD$sfx" ;;
+			$match*|$umatch*)	echo "${pfx}HEAD$sfx" ;;
 			esac
 			__git for-each-ref --format="$fer_pfx%(refname:strip=3)$sfx" \
+				${GIT_COMPLETION_IGNORE_CASE+--ignore-case} \
 				"refs/remotes/$remote/$match*" \
 				"refs/remotes/$remote/$match*/**"
 		else
 			local query_symref
 			case "HEAD" in
-			$match*)	query_symref="HEAD" ;;
+			$match*|$umatch*)	query_symref="HEAD" ;;
 			esac
 			__git ls-remote "$remote" $query_symref \
 				"refs/tags/$match*" "refs/heads/$match*" \
@@ -888,7 +798,6 @@ __git_list_merge_strategies ()
 	}'
 }
 
-__git_merge_strategies_default='octopus ours recursive resolve subtree'
 __git_merge_strategies=
 # 'git merge -s help' (and thus detection of the merge strategy
 # list) fails, unfortunately, if run outside of any git working
@@ -898,8 +807,7 @@ __git_merge_strategies=
 __git_compute_merge_strategies ()
 {
 	test -n "$__git_merge_strategies" ||
-	{ __git_merge_strategies=$(__git_list_merge_strategies);
-		__git_merge_strategies="${__git_merge_strategies:-__git_merge_strategies_default}"; }
+	__git_merge_strategies=$(__git_list_merge_strategies)
 }
 
 __git_merge_strategy_options="ours theirs subtree subtree= patience
@@ -2281,7 +2189,7 @@ _git_reflog ()
 	fi
 }
 
-__git_send_email_options="--no-cc-cover --cc= --no-bcc --force --relogin-delay= --to= --suppress-cc= --no-annotate --no-chain-reply-to --sendmail-cmd= --no-identity --transfer-encoding= --validate --no-smtp-auth --confirm= --no-format-patch --reply-to= --smtp-pass= --smtp-server= --annotate --envelope-sender= --no-validate --dry-run --no-thread --smtp-debug= --no-to --thread --no-xmailer --identity= --no-signed-off-cc --no-signed-off-by-cc --smtp-domain= --to-cover --8bit-encoding= --bcc= --smtp-ssl-cert-path= --smtp-user= --cc-cmd= --to-cmd= --no-cc --smtp-server-option= --in-reply-to= --subject= --batch-size= --smtp-auth= --compose --smtp-server-port= --xmailer --no-to-cover --chain-reply-to --smtp-encryption= --dump-aliases --quiet --smtp-ssl --signed-off-cc --signed-off-by-cc --suppress-from --compose-encoding= --no-suppress-from --sender= --from= --format-patch --cc-cover --numbered --no-numbered --signoff --stdout --cover-letter --numbered-files --suffix= --start-number= --reroll-count= --filename-max-length= --rfc --cover-from-description= --subject-prefix= --output-directory= --keep-subject --no-binary --zero-commit --ignore-if-in-upstream --no-stat --add-header= --from --attach --inline --signature= --base= --signature-file= --progress --interdiff= --range-diff= --creation-factor= --binary -- --no-signoff --no-stdout --no-cover-letter --no-numbered-files --no-suffix --no-start-number --no-reroll-count --no-filename-max-length --no-cover-from-description --no-zero-commit --no-ignore-if-in-upstream --no-add-header --no-from --no-in-reply-to --no-attach --no-signature --no-base --no-signature-file --no-quiet --no-progress --no-interdiff --no-range-diff --no-creation-factor"
+__gitcomp_builtin_send_email_default="--8bit-encoding= --add-header= --annotate --attach --base= --batch-size= --bcc= --binary --cc-cmd= --cc-cover --cc= --chain-reply-to --compose --compose-encoding= --confirm= --cover-from-description= --cover-letter --creation-factor= --dry-run --dump-aliases --envelope-sender= --filename-max-length= --force --force-in-body-from --format-patch --from --from= --identity= --ignore-if-in-upstream --in-reply-to= --inline --interdiff= --keep-subject --numbered --numbered-files --output-directory= --progress --quiet --range-diff= --relogin-delay= --reply-to= --reroll-count= --rfc --sender= --sendmail-cmd= --signature-file= --signature= --signed-off-by-cc --signed-off-cc --signoff --smtp-auth= --smtp-debug= --smtp-domain= --smtp-encryption= --smtp-pass= --smtp-server-option= --smtp-server-port= --smtp-server= --smtp-ssl --smtp-ssl-cert-path= --smtp-user= --start-number= --stdout --subject-prefix= --subject= --suffix= --suppress-cc= --suppress-from --thread --to-cmd= --to-cover --to= --transfer-encoding= --v= --validate --xmailer --zero-commit -- --no-add-header --no-annotate --no-attach --no-base --no-bcc --no-binary --no-cc --no-cc-cover --no-chain-reply-to --no-cover-from-description --no-cover-letter --no-creation-factor --no-filename-max-length --no-force-in-body-from --no-format-patch --no-from --no-identity --no-ignore-if-in-upstream --no-in-reply-to --no-interdiff --no-numbered --no-numbered-files --no-progress --no-quiet --no-range-diff --no-reroll-count --no-signature --no-signature-file --no-signed-off-by-cc --no-signed-off-cc --no-signoff --no-smtp-auth --no-start-number --no-stat --no-stdout --no-suffix --no-suppress-from --no-thread --no-to --no-to-cover --no-validate --no-xmailer --no-zero-commit"
 __git_send_email_confirm_options="always never auto cc compose"
 __git_send_email_suppresscc_options="author self cc bodycc sob cccmd body all"
 
@@ -2321,7 +2229,11 @@ _git_send_email ()
 		return
 		;;
 	--*)
-		__gitcomp_builtin send-email "$__git_send_email_options $__git_format_patch_extra_options"
+		# Older versions of git send-email don't have all the options
+		git send-email --git-completion-helper | grep -q annotate ||
+		__gitcomp_builtin_send_email=$__gitcomp_builtin_send_email_default
+
+		__gitcomp_builtin send-email "$__git_format_patch_extra_options"
 		return
 		;;
 	esac
@@ -2456,7 +2368,25 @@ __git_config_vars=
 __git_compute_config_vars ()
 {
 	test -n "$__git_config_vars" ||
-	__git_config_vars="$(git help --config-for-completion | sort -u)"
+	__git_config_vars="$(git help --config-for-completion)"
+}
+
+__git_compute_config_sections_old ()
+{
+	__git_compute_config_vars
+	echo "$__git_config_vars" |
+		awk -F . '{ dict[$1] = 1 } END { for (e in dict) print e }'
+}
+
+__git_config_sections=
+__git_compute_config_sections ()
+{
+	test -n "$__git_config_sections" ||
+	__git_config_sections="$(
+		git help --config-sections-for-completion > /dev/null 2>&1 &&
+		git help --config-sections-for-completion ||
+		__git_compute_config_sections_old
+	)"
 }
 
 # Completes possible values of various configuration variables.
@@ -2670,16 +2600,8 @@ __git_complete_config_variable_name ()
 		__gitcomp "$__git_config_vars" "" "$cur_" "$sfx"
 		;;
 	*)
-		__git_compute_config_vars
-		__gitcomp_nl "$(echo "$__git_config_vars" |
-				awk -F . '{
-					sections[$1] = 1
-				}
-				END {
-					for (s in sections)
-						print s "."
-				}
-				')" "" "$cur_" ""
+		__git_compute_config_sections
+		__gitcomp_nl "$__git_config_sections" "" "$cur_" "."
 		;;
 	esac
 }
@@ -3628,43 +3550,6 @@ __git_complete ()
 	___git_complete $1 $func
 }
 
-if ! git --list-cmds=main >/dev/null 2>&1; then
-
-	declare -A __git_cmds
-	__git_cmds[list-complete]="apply blame cherry config difftool fsck help instaweb mergetool prune reflog remote repack replace request-pull send-email show-branch stage whatchanged"
-	__git_cmds[list-guide]="attributes cli core-tutorial credentials cvs-migration diffcore everyday faq glossary hooks ignore mailmap modules namespaces remote-helpers repository-layout revisions submodules tutorial tutorial-2 workflows"
-	__git_cmds[list-mainporcelain]="add am archive bisect branch bundle checkout cherry-pick citool clean clone commit describe diff fetch format-patch gc grep gui init log maintenance merge mv notes pull push range-diff rebase reset restore revert rm shortlog show sparse-checkout stash status submodule switch tag worktree gitk"
-	__git_cmds[main]="add add--interactive am annotate apply archimport archive bisect bisect--helper blame branch bugreport bundle cat-file check-attr check-ignore check-mailmap check-ref-format checkout checkout--worker checkout-index cherry cherry-pick citool clean clone column commit commit-graph commit-tree config count-objects credential credential-cache credential-cache--daemon credential-store cvsexportcommit cvsimport cvsserver daemon describe diff diff-files diff-index diff-tree difftool difftool--helper env--helper fast-export fast-import fetch fetch-pack filter-branch fmt-merge-msg for-each-ref for-each-repo format-patch fsck fsck-objects fsmonitor--daemon gc get-tar-commit-id grep gui gui--askpass hash-object help hook http-backend http-fetch http-push imap-send index-pack init init-db instaweb interpret-trailers legacy-rebase legacy-stash log ls-files ls-remote ls-tree mailinfo mailsplit maintenance merge merge-base merge-file merge-index merge-octopus merge-one-file merge-ours merge-recursive merge-recursive-ours merge-recursive-theirs merge-resolve merge-subtree merge-tree mergetool mktag mktree multi-pack-index mv name-rev notes p4 pack-objects pack-redundant pack-refs patch-id pickaxe prune prune-packed pull push quiltimport range-diff read-tree rebase rebase--helper receive-pack reflog relink remote remote-ext remote-fd remote-ftp remote-ftps remote-http remote-https remote-testsvn repack replace request-pull rerere reset restore rev-list rev-parse revert rm send-email send-pack serve sh-i18n--envsubst shell shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace submodule submodule--helper svn switch symbolic-ref tag unpack-file unpack-objects update-index update-ref update-server-info upload-archive upload-archive--writer upload-pack var verify-commit verify-pack verify-tag version web--browse whatchanged worktree write-tree"
-	__git_cmds[others]=""
-	__git_cmds[parseopt]="add am apply archive bisect--helper blame branch bugreport cat-file check-attr check-ignore check-mailmap checkout checkout--worker checkout-index cherry cherry-pick clean clone column commit commit-graph config count-objects credential-cache credential-cache--daemon credential-store describe difftool env--helper fast-export fetch fmt-merge-msg for-each-ref for-each-repo format-patch fsck fsck-objects fsmonitor--daemon gc grep hash-object help hook init init-db interpret-trailers log ls-files ls-remote ls-tree merge merge-base merge-file mktree multi-pack-index mv name-rev notes pack-objects pack-refs pickaxe prune prune-packed pull push range-diff read-tree rebase receive-pack reflog remote repack replace rerere reset restore revert rm send-pack shortlog show show-branch show-index show-ref sparse-checkout stage stash status stripspace switch symbolic-ref tag update-index update-ref update-server-info upload-pack verify-commit verify-pack verify-tag version whatchanged write-tree "
-
-	# Override __git
-	__git ()
-	{
-		case "$1" in
-		--list-cmds=*)
-			while read -r -d ',' x; do
-				case "$x" in
-				nohelpers)
-					;;
-				alias)
-					;;
-				config)
-					;;
-				*)
-					echo ${__git_cmds[$x]}
-					;;
-				esac
-			done <<< "${1##--list-cmds=},"
-			return
-			;;
-		esac
-		git ${__git_C_args:+"${__git_C_args[@]}"} \
-			${__git_dir:+--git-dir="$__git_dir"} "$@" 2>/dev/null
-	}
-
-fi
-
 ___git_complete git __git_main
 ___git_complete gitk __gitk_main
 
diff --git a/zsh/plugins/gitfast/git-prompt.sh b/zsh/plugins/gitfast/git-prompt.sh
index 1435548..76ee4ab 100644
--- a/zsh/plugins/gitfast/git-prompt.sh
+++ b/zsh/plugins/gitfast/git-prompt.sh
@@ -84,6 +84,10 @@
 # single '?' character by setting GIT_PS1_COMPRESSSPARSESTATE, or omitted
 # by setting GIT_PS1_OMITSPARSESTATE.
 #
+# If you would like to see a notification on the prompt when there are
+# unresolved conflicts, set GIT_PS1_SHOWCONFLICTSTATE to "yes". The
+# prompt will include "|CONFLICT".
+#
 # If you would like to see more information about the identity of
 # commits checked out as a detached HEAD, set GIT_PS1_DESCRIBE_STYLE
 # to one of these values:
@@ -96,9 +100,7 @@
 #
 # If you would like a colored hint about the current dirty state, set
 # GIT_PS1_SHOWCOLORHINTS to a nonempty value. The colors are based on
-# the colored output of "git status -sb" and are available only when
-# using __git_ps1 for PROMPT_COMMAND or precmd in Bash,
-# but always available in Zsh.
+# the colored output of "git status -sb".
 #
 # If you would like __git_ps1 to do nothing in the case when the current
 # directory is set up to be ignored by git, then set
@@ -255,12 +257,12 @@ __git_ps1_colorize_gitstring ()
 		local c_lblue='%F{blue}'
 		local c_clear='%f'
 	else
-		# Using \[ and \] around colors is necessary to prevent
+		# Using \001 and \002 around colors is necessary to prevent
 		# issues with command line editing/browsing/completion!
-		local c_red='\[\e[31m\]'
-		local c_green='\[\e[32m\]'
-		local c_lblue='\[\e[1;34m\]'
-		local c_clear='\[\e[0m\]'
+		local c_red=$'\001\e[31m\002'
+		local c_green=$'\001\e[32m\002'
+		local c_lblue=$'\001\e[1;34m\002'
+		local c_clear=$'\001\e[0m\002'
 	fi
 	local bad_color=$c_red
 	local ok_color=$c_green
@@ -508,6 +510,12 @@ __git_ps1 ()
 		r="$r $step/$total"
 	fi
 
+	local conflict="" # state indicator for unresolved conflicts
+	if [[ "${GIT_PS1_SHOWCONFLICTSTATE}" == "yes" ]] &&
+	   [[ $(git ls-files --unmerged 2>/dev/null) ]]; then
+		conflict="|CONFLICT"
+	fi
+
 	local w=""
 	local i=""
 	local s=""
@@ -564,15 +572,12 @@ __git_ps1 ()
 		b="\${__git_ps1_branch_name}"
 	fi
 
-	# NO color option unless in PROMPT_COMMAND mode or it's Zsh
 	if [ -n "${GIT_PS1_SHOWCOLORHINTS-}" ]; then
-		if [ $pcmode = yes ] || [ -n "${ZSH_VERSION-}" ]; then
-			__git_ps1_colorize_gitstring
-		fi
+		__git_ps1_colorize_gitstring
 	fi
 
 	local f="$h$w$i$s$u$p"
-	local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}"
+	local gitstring="$c$b${f:+$z$f}${sparse}$r${upstream}${conflict}"
 
 	if [ $pcmode = yes ]; then
 		if [ "${__git_printf_supports_v-}" != yes ]; then
diff --git a/zsh/plugins/gitfast/gitfast.plugin.zsh b/zsh/plugins/gitfast/gitfast.plugin.zsh
index a6db0c6..c456eff 100644
--- a/zsh/plugins/gitfast/gitfast.plugin.zsh
+++ b/zsh/plugins/gitfast/gitfast.plugin.zsh
@@ -1,6 +1,6 @@
 # Handle $0 according to the standard:
 # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
-0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${ZERO:-${${0:#$ZSH_ARGZERO}:-${(%):-%N}}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
 source "${0:A:h}/git-prompt.sh"
diff --git a/zsh/plugins/gitfast/update b/zsh/plugins/gitfast/update
deleted file mode 100755
index feb13ff..0000000
--- a/zsh/plugins/gitfast/update
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/sh
-
-url="https://raw.githubusercontent.com/felipec/git-completion"
-version="1.3.7"
-
-curl -s -o _git "${url}/v${version}/git-completion.zsh" &&
-curl -s -o git-completion.bash "${url}/v${version}/git-completion.bash" &&
-curl -s -o git-prompt.sh "${url}/v${version}/git-prompt.sh"
diff --git a/zsh/plugins/gitignore/README.md b/zsh/plugins/gitignore/README.md
index 753dd31..ea991a9 100644
--- a/zsh/plugins/gitignore/README.md
+++ b/zsh/plugins/gitignore/README.md
@@ -1,6 +1,6 @@
 # gitignore
 
-This plugin enables you the use of [gitignore.io](https://www.gitignore.io/) from the command line. You need an active internet connection.
+This plugin enables you to use [gitignore.io](https://www.gitignore.io) from the command line. You need an active internet connection to fetch templates. The plugin uses the gitignore.io CDN endpoint to simplify access and improve reliability.
 
 To use it, add `gitignore` to the plugins array in your zshrc file:
 
@@ -14,4 +14,4 @@ plugins=(... gitignore)
 
 * `gi [TEMPLATENAME]`: Show git-ignore output on the command line, e.g. `gi java` to exclude class and package files.
 
-* `gi [TEMPLATENAME] >> .gitignore`: Appending programming language settings to your projects .gitignore.
+* `gi [TEMPLATENAME] >> .gitignore`: Append the template rules to your project's `.gitignore` file.
diff --git a/zsh/plugins/gitignore/gitignore.plugin.zsh b/zsh/plugins/gitignore/gitignore.plugin.zsh
index a687f5c..a9f3f64 100644
--- a/zsh/plugins/gitignore/gitignore.plugin.zsh
+++ b/zsh/plugins/gitignore/gitignore.plugin.zsh
@@ -1,12 +1,21 @@
-function gi() { curl -fLw '\n' https://www.gitignore.io/api/"${(j:,:)@}" }
+# gitignore plugin for oh-my-zsh
+# Uses gitignore.io CDN endpoint
+function _gi_curl() {
+  curl -sfL "https://www.gitignore.io/api/$1"
+}
+
+function gi() {
+  local query="${(j:,:)@}"
+  _gi_curl "$query" || return 1
+}
 
 _gitignoreio_get_command_list() {
-  curl -sfL https://www.gitignore.io/api/list | tr "," "\n"
+  _gi_curl "list" | tr "," "\n"
 }
 
 _gitignoreio () {
   compset -P '*,'
-  compadd -S '' `_gitignoreio_get_command_list`
+  compadd -S '' $(_gitignoreio_get_command_list)
 }
 
-compdef _gitignoreio gi
+compdef _gitignoreio gi
\ No newline at end of file
diff --git a/zsh/plugins/gnu-utils/gnu-utils.plugin.zsh b/zsh/plugins/gnu-utils/gnu-utils.plugin.zsh
index 9419127..adc2bd3 100644
--- a/zsh/plugins/gnu-utils/gnu-utils.plugin.zsh
+++ b/zsh/plugins/gnu-utils/gnu-utils.plugin.zsh
@@ -14,12 +14,12 @@ __gnu_utils() {
   local -a gcmds
   local gcmd
 
-  # coreutils 
+  # coreutils
   gcmds=('g[' 'gbase64' 'gbasename' 'gcat' 'gchcon' 'gchgrp' 'gchmod'
   'gchown' 'gchroot' 'gcksum' 'gcomm' 'gcp' 'gcsplit' 'gcut' 'gdate'
   'gdd' 'gdf' 'gdir' 'gdircolors' 'gdirname' 'gdu' 'gecho' 'genv' 'gexpand'
   'gexpr' 'gfactor' 'gfalse' 'gfmt' 'gfold' 'ggroups' 'ghead' 'ghostid'
-  'gid' 'ginstall' 'gjoin' 'gkill' 'glink' 'gln' 'glogname' 'gls' 'gmd5sum'
+  'gid' 'gindent' 'ginstall' 'gjoin' 'gkill' 'glink' 'gln' 'glogname' 'gls' 'gmd5sum'
   'gmkdir' 'gmkfifo' 'gmknod' 'gmktemp' 'gmv' 'gnice' 'gnl' 'gnohup' 'gnproc'
   'god' 'gpaste' 'gpathchk' 'gpinky' 'gpr' 'gprintenv' 'gprintf' 'gptx' 'gpwd'
   'greadlink' 'grm' 'grmdir' 'gruncon' 'gseq' 'gsha1sum' 'gsha224sum'
@@ -41,7 +41,7 @@ __gnu_utils() {
   for gcmd in "${gcmds[@]}"; do
     # Do nothing if the command isn't found
     (( ${+commands[$gcmd]} )) || continue
-    
+
     # This method allows for builtin commands to be primary but it's
     # lost if hash -r or rehash is executed, or if $PATH is updated.
     # Thus, a preexec hook is needed, which will only run if whoami
@@ -61,3 +61,14 @@ __gnu_utils_preexec() {
 
 autoload -Uz add-zsh-hook
 add-zsh-hook preexec __gnu_utils_preexec
+
+# lib/theme-and-appearance.zsh sets the alias for ls not knowing that
+# we'll be using GNU ls. We'll reset this to use GNU ls --color.
+# See https://github.com/ohmyzsh/ohmyzsh/issues/11503
+#
+# The ls alias might look like:
+# - ls='ls -G'
+# - ls='gls --color=tty'
+if [[ -x "${commands[gls]}" && "${aliases[ls]}" = (*-G*|gls*) ]]; then
+  alias ls='ls --color=tty'
+fi
diff --git a/zsh/plugins/golang/README.md b/zsh/plugins/golang/README.md
index 3b7d1e1..80f8cf3 100644
--- a/zsh/plugins/golang/README.md
+++ b/zsh/plugins/golang/README.md
@@ -16,14 +16,16 @@ plugins=(... golang)
 | gob    | `go build`        | Build your code                                               |
 | goc    | `go clean`        | Removes object files from package source directories          |
 | god    | `go doc`          | Prints documentation comments                                 |
+| goe    | `go env`          | Prints Go environment information                             |
 | gof    | `go fmt`          | Gofmt formats (aligns and indents) Go programs.               |
 | gofa   | `go fmt ./...`    | Run go fmt for all packages in current directory, recursively |
 | gofx   | `go fix`          | Update packages to use a new API                              |
 | gog    | `go get`          | Downloads packages and then installs them to $GOPATH          |
-| gog    | `go get ./...`    | Installs all dependencies in current directory, recursively   |
+| goga   | `go get ./...`    | Installs all dependencies in current directory, recursively   |
 | goi    | `go install`      | Compiles and installs packages to $GOPATH                     |
 | gol    | `go list`         | Lists Go packages                                             |
 | gom    | `go mod`          | Access to operations on modules                               |
+| gomt   | `go mod tidy`     | Tidies up the go.mod file                                     |
 | gopa   | `cd $GOPATH`      | Takes you to `$GOPATH`                                        |
 | gopb   | `cd $GOPATH/bin`  | Takes you to `$GOPATH/bin`                                    |
 | gops   | `cd $GOPATH/src`  | Takes you to `$GOPATH/src`                                    |
@@ -35,4 +37,5 @@ plugins=(... golang)
 | gotod  | `go tool dist`    | Utility to bootstrap, build and test go runtime               |
 | gotofx | `go tool fix`     | Fixes an application to use newer features                    |
 | gov    | `go vet`          | Vet examines Go source code and reports suspicious constructs |
+| gove   | `go version`      | Prints Go version                                             |
 | gow    | `go work`         | Work provides access to operations on workspaces              |
diff --git a/zsh/plugins/golang/golang.plugin.zsh b/zsh/plugins/golang/golang.plugin.zsh
index 0dbaab0..dc4d918 100644
--- a/zsh/plugins/golang/golang.plugin.zsh
+++ b/zsh/plugins/golang/golang.plugin.zsh
@@ -13,6 +13,7 @@ unset p
 alias gob='go build'
 alias goc='go clean'
 alias god='go doc'
+alias goe='go env'
 alias gof='go fmt'
 alias gofa='go fmt ./...'
 alias gofx='go fix'
@@ -21,6 +22,7 @@ alias goga='go get ./...'
 alias goi='go install'
 alias gol='go list'
 alias gom='go mod'
+alias gomt='go mod tidy'
 alias gopa='cd $GOPATH'
 alias gopb='cd $GOPATH/bin'
 alias gops='cd $GOPATH/src'
@@ -32,4 +34,5 @@ alias gotoc='go tool compile'
 alias gotod='go tool dist'
 alias gotofx='go tool fix'
 alias gov='go vet'
+alias gove='go version'
 alias gow='go work'
diff --git a/zsh/plugins/gpg-agent/README.md b/zsh/plugins/gpg-agent/README.md
index 8eeb94f..d66c37a 100644
--- a/zsh/plugins/gpg-agent/README.md
+++ b/zsh/plugins/gpg-agent/README.md
@@ -1,6 +1,11 @@
 # gpg-agent
 
-Enables [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/) if it is not running.
+Applies some fixes for some common issues encountered with [GPG's gpg-agent](https://www.gnupg.org/documentation/manuals/gnupg/).
+
+More specifically, this plugin:
+
+- Updates the `GPG_TTY` environment variable before each shell execution. 
+- Updates the `SSH_AUTH_SOCK` environment variable if `enable-ssh-support` is turned on.
 
 To use it, add `gpg-agent` to the plugins array of your zshrc file:
 
diff --git a/tmux/plugins/tmux-prefix-highlight/LICENSE b/zsh/plugins/gradle/LICENSE
similarity index 60%
rename from tmux/plugins/tmux-prefix-highlight/LICENSE
rename to zsh/plugins/gradle/LICENSE
index 98da78e..06edf4a 100644
--- a/tmux/plugins/tmux-prefix-highlight/LICENSE
+++ b/zsh/plugins/gradle/LICENSE
@@ -1,13 +1,11 @@
-The MIT License (MIT)
+Copyright (c) 2017 Eric Wendelin
 
-Copyright (c) 2015 Erick Pintor
-
-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:
+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.
@@ -19,4 +17,3 @@ 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/zsh/plugins/gradle/_gradle b/zsh/plugins/gradle/_gradle
index 770723d..588f330 100644
--- a/zsh/plugins/gradle/_gradle
+++ b/zsh/plugins/gradle/_gradle
@@ -1,26 +1,4 @@
 #compdef gradle gradlew gw
-#
-# Taken from https://github.com/gradle/gradle-completion
-# Copyright (c) 2017 Eric Wendelin
-#
-# 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.
-# Terms
 
 __gradle-set-project-root-dir() {
     local dir=`pwd`
@@ -36,23 +14,23 @@ __gradle-set-project-root-dir() {
 }
 
 __gradle-init-cache-dir() {
-    cache_dir="$HOME/.gradle/completion"
+    cache_dir="${GRADLE_USER_HOME:-$HOME/.gradle}/completion"
     mkdir -p $cache_dir
 }
 
 __gradle-set-settings-file() {
-    # In order of precedence: --settings-file=filename, settings.gradle, settings.gradle.kts
+    # In order of precedence: settings.gradle, settings.gradle.kts
 
     local default_gradle_settings_file="$project_root_dir/settings.gradle"
     if [[ ! -f $default_gradle_settings_file ]]; then
       default_gradle_settings_file="$project_root_dir/settings.gradle.kts"
     fi
-    gradle_settings_file=${${(v)opt_args[(i)-c|--settings-file]}:-$default_gradle_settings_file}
+    gradle_settings_file=$default_gradle_settings_file
 }
 
 __gradle-set-build-file() {
     __gradle-set-settings-file
-    # In order of precedence: --build-file=filename, rootProject.buildFileName, build.gradle, build.gradle.kts
+    # In order of precedence: rootProject.buildFileName, build.gradle, build.gradle.kts
 
     local default_gradle_build_file_name="build.gradle"
     if [[ -r $gradle_settings_file ]]; then
@@ -67,8 +45,7 @@ __gradle-set-build-file() {
         default_gradle_build_file="$project_root_dir/build.gradle.kts"
     fi
 
-    # If a build file is specified after '-b' or '--build-file', use this file.
-    gradle_build_file=${${(v)opt_args[(i)-b|--build-file]}:-$default_gradle_build_file}
+    gradle_build_file=$default_gradle_build_file
 }
 
 __gradle-set-cache-name() {
@@ -116,14 +93,15 @@ __gradle-generate-tasks-cache() {
     # Reuse Gradle Daemon if IDLE but don't start a new one.
     local gradle_tasks_output
     if [[ ! -z "$($gradle_cmd --status 2>/dev/null | grep IDLE)" ]]; then
-        gradle_tasks_output="$($gradle_cmd --daemon --build-file $gradle_build_file --console plain -q tasks --all 2>/dev/null)"
+        gradle_tasks_output="$(cd "$project_root_dir" && "$gradle_cmd" --daemon --no-scan --console=plain -q tasks --all 2>/dev/null)"
     else
-        gradle_tasks_output="$($gradle_cmd --no-daemon --build-file $gradle_build_file --console plain -q tasks --all 2>/dev/null)"
+        gradle_tasks_output="$(cd "$project_root_dir" && "$gradle_cmd" --no-daemon --no-scan --console=plain -q tasks --all 2>/dev/null)"
     fi
+
     local gradle_all_tasks="" root_tasks="" subproject_tasks="" output_line
     local -a match
     for output_line in ${(f)"$(printf "%s\n" "${gradle_tasks_output[@]}")"}; do
-        if [[ $output_line =~ ^([[:lower:]][[:alnum:][:punct:]]*)([[:space:]]-[[:space:]]([[:print:]]*))? ]]; then
+        if [[ $output_line =~ ^([[:alpha:]][[:alnum:][:punct:]]*)([[:space:]]-[[:space:]]([[:print:]]*))? ]]; then
             local task_name="${match[1]}"
             local task_description="${match[3]}"
             # Completion for subproject tasks with ':' prefix
@@ -180,7 +158,7 @@ __gradle_tasks() {
             local cached_checksum="$(cat $cache_dir/$cache_name.md5)"
             local -a cached_tasks
             if [[ -z $cur ]]; then
-                cached_tasks=(${(f)"$(cat $cache_dir/$cached_checksum)"})
+                cached_tasks=(${(f)"$(grep -v "^\\\:" $cache_dir/$cached_checksum)"})
             else
                 cached_tasks=(${(f)"$(grep "^${cur//:/\\\\:}" $cache_dir/$cached_checksum)"})
             fi
@@ -191,7 +169,7 @@ __gradle_tasks() {
 
         # Regenerate tasks cache in the background
         if [[ $gradle_files_checksum != "$(cat $cache_dir/$cache_name.md5)" || ! -f $cache_dir/$gradle_files_checksum || $(wc -c < $cache_dir/$gradle_files_checksum) -le 1 ]]; then
-            $(__gradle-generate-tasks-cache 1>&2 2>/dev/null &)
+            $(__gradle-generate-tasks-cache &> /dev/null &)
         fi
     else
         _describe 'built-in tasks' '(
@@ -221,101 +199,161 @@ __gradle_subcommand() {
             ;;
         (dependencyInsight)
             _arguments \
+                '--all-variants[Show all variants of each dependency]' \
+                '--configuration=[Looks for the dependency in given configuration.]:dependency configuration:_gradle_dependency_configurations' \
                 '--dependency=[Shows the details of given dependency.]' \
-                '--configuration=[Looks for the dependency in given configuration.]:dependency configuration:_gradle_dependency_configurations' && ret=0
+                '--single-path[Show at most one path to each dependency]' && ret=0
             ;;
         (help)
             _arguments \
-                '--task[The task to show help for.]' && ret=0
+                '--task=[The task to show help for.]' && ret=0
             ;;
         (init)
             _arguments \
-                '--dsl=[DSL to be used in generated scripts.]:dsl:(groovy kotlin)' \
-                '--package=[Package for the generated source.]' \
-                '--project-name=[Name of the generated project.]' \
-                '--test-framework=[Test framework to be used.]:test framework:(junit kotlintest scalatest spock testng)' \
-                '--type=[Project type to generate.]:project type:(basic cpp-application cpp-library groovy-application groovy-library java-application java-library kotlin-application kotlin-library pom scala-library)' && ret=0
+                '--comments[Include clarifying comments in files.]' \
+                '--dsl=[Set the build script DSL to be used in generated scripts.]' \
+                '--incubating[Allow the generated build to use new features and APIs.]' \
+                '--insecure-protocol=[How to handle insecure URLs used for Maven Repositories.]' \
+                '--java-version=[Provides java version to use in the project.]' \
+                '--overwrite[Allow existing files in the build directory to be overwritten?]' \
+                '--package=[Set the package for source files.]' \
+                '--project-name=[Set the project name.]' \
+                '--split-project[Split functionality across multiple subprojects?]' \
+                '--test-framework=[Set the test framework to be used.]' \
+                '--type=[Set the type of project to generate.]' \
+                '--use-defaults[Use default values for options not configured explicitly]' && ret=0
             ;;
         (tasks)
             _arguments \
-                '--all[List all tasks, including subproject tasks.]' \
-                '--group=[Show tasks only from given task group.]' && ret=0
+                '--all[Show additional tasks and detail.]' \
+                '--group=[Show tasks for a specific group.]' \
+                '--groups=[Show tasks for specific groups (can be used multiple times to specify multiple groups).]' \
+                '--types[Show task class types]' && ret=0
             ;;
         (test)
             _arguments -C \
-                '--debug-jvm[Enable debugging for the test process. The process is started suspended and listening on port 5005. Requires the "java" plugin.]' \
-                '--fail-fast[Stops test execution after the first failed test. Requires the "java" plugin.]' \
-                '--tests=[Sets test class or method name to be included, * is supported. Requires the "java" plugin.]' \
+                '--debug-jvm[Enable debugging for the test process. The process is started suspended and listening on port 5005.]' \
+                '--fail-fast[Stops test execution after the first failed test.]' \
+                '--test-dry-run[Simulate test execution.]' \
+                '--tests=[Sets test class or method name to be included (in addition to the test task filters), '*' is supported.]' \
                 '(-)*:: :->task-or-option' && ret=0
             ;;
         (wrapper)
             _arguments \
-                '--distribution-type=[Binary-only or all with docs and sources]:*:distribution type:(bin all)' \
-                '--gradle-version=[Set Gradle version for wrapper]' \
-                '--gradle-distribution-sha256-sum=[SHA-256 checksum]' \
-                '--gradle-distribution-url=[Set Gradle distribution URL]' && ret=0
+                '--distribution-type=[The type of the Gradle distribution to be used by the wrapper.]:*:distribution type:(bin all)' \
+                '--gradle-distribution-sha256-sum=[The SHA-256 hash sum of the gradle distribution.]' \
+                '--gradle-distribution-url=[The URL to download the Gradle distribution from.]' \
+                '--gradle-version=[The version of the Gradle distribution required by the wrapper. The following labels are allowed: latest, release-candidate, release-milestone, release-nightly, and nightly.]' \
+                '--network-timeout=[Timeout in ms to use when the wrapper is performing network operations.]' \
+                '--validate-url[Sets task to validate the configured distribution url.]' && ret=0
             ;;
         (*)
             _arguments -C \
-                {-a,--no-rebuild}'[Do not rebuild project dependencies.]' \
-                '(--no-build-cache)--build-cache[Enable the Gradle build cache.]' \
-                {-b,--build-file}'[Specifies the build file.]:build script:_files -g \*.gradle' \
-                {-C,--cache}'[Specifies how compiled build scripts should be cached.]:cache policy:(on rebuild)' \
-                {-c,--settings-file}'[Specifies the settings file.]:settings file:_files -g \*.gradle' \
-                '(--no-configure-on-demand)--configure-on-demand[Only relevant projects are configured in this build run.]' \
-                '--console=[Specifies which type of console output to generate.]:console output type:(plain auto rich verbose)' \
-                '--continue[Continues task execution after a task failure.]' \
-                '-Dorg.gradle.cache.reserved.mb=[Reserve Gradle Daemon memory for operations.]' \
-                '-Dorg.gradle.caching=[Set true to enable Gradle build cache.]:enable build cache:(true false)' \
-                '-Dorg.gradle.console=[Set type of console output to generate.]:console output type:(plain auto rich verbose)' \
-                '-Dorg.gradle.daemon.debug=[Set true to debug Gradle Daemon.]:enable daemon debug:(true false)' \
-                '-Dorg.gradle.daemon.idletimeout=[Kill Gradle Daemon after # idle millis.]' \
-                '-Dorg.gradle.debug=[Set true to debug Gradle Client.]' \
-                '-Dorg.gradle.jvmargs=[Set JVM arguments.]' \
-                '-Dorg.gradle.java.home=[Set JDK home dir.]' \
-                '-Dorg.gradle.logging.level=[Set default Gradle log level.]:log level:(quiet warn lifecycle info debug)' \
-                '-Dorg.gradle.parallel=[Set true to enable parallel project builds.]:enable parallel build:(true false)' \
-                '-Dorg.gradle.priority=[Set priority for Gradle worker processes.]:priority:(low normal)' \
-                '-Dorg.gradle.warning.mode=[Set types of warnings to log.]:warning level:(all summary none)' \
-                '-Dorg.gradle.workers.max=[Set the number of workers Gradle is allowed to use.]' \
-                '(-i --info -w --warn -q --quiet)'{-d,--debug}'[Log in debug mode (includes normal stacktrace).]' \
-                '(--no-daemon)--daemon[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \
-                '--foreground[Starts the Gradle daemon in the foreground.]' \
-                {-g,--gradle-user-home}'[Specifies the gradle user home directory.]:file:_directories' \
-                \*--include-build'[Includes the specified build in the composite.]:file:_directories' \
-                \*{-I,--init-script}'[Specifies an initialization script.]:init script:_files -g \*.gradle' \
-                '(-d --debug -w --warn -q --quiet)'{-i,--info}'[Set log level to info.]' \
-                '--max-workers[Set the maximum number of concurrent workers that Gradle may use.]:number workers' \
-                {-m,--dry-run}'[Runs the builds with all task actions disabled.]' \
-                '--no-color[Do not use color in the console output. (Removed in Gradle 3.0)]' \
-                '(--build-cache)--no-build-cache[Do not use the Gradle build cache.]' \
-                '(--configure-on-demand)--no-configure-on-demand[Disables configuration on demand.]' \
-                '(--daemon)--no-daemon[Do not use the Gradle daemon to run the build.]' \
-                '(--parallel)--no-parallel[Disables parallel execution to build projects.]' \
-                '(--scan)--no-scan[Do not create a build scan.]' \
-                '--offline[The build should operate without accessing network resources.]' \
-                \*{-P+,--project-prop}'[Set project property for the build script (e.g. -Pmyprop=myvalue).]:project property (prop=val):' \
-                {-p,--project-dir}'[Specifies the start directory for Gradle.]:start directory:_directories' \
-                '(--no-parallel)--parallel[Build projects in parallel. Gradle will attempt to determine the optimal number of executor threads to use.]' \
-                '--profile[Profiles build execution time and generates a report in the <build_dir>/reports/profile directory.]' \
-                '--priority[Set priority for Gradle worker processes.]:priority:(low normal)' \
-                '--project-cache-dir[Specifies the project-specific cache directory.]:cache directory:_directories' \
-                '(-d --debug -w --warn -i --info)'{-q,--quiet}'[Log errors only.]' \
-                '--recompile-scripts[Force build script recompiling.]' \
-                '--refresh[Refresh the state of resources of the type(s) specified.]:refresh policy:(dependencies)' \
-                '--refresh-dependencies[Refresh the state of dependencies.]' \
-                '--rerun-tasks[Ignore previously cached task results.]' \
-                '(--no-scan)--scan[Create a build scan.]' \
-                '(-S --full-stacktrace)'{-s,--stacktrace}'[Print out the stacktrace for all exceptions.]' \
-                '(-s --stacktrace)'{-S,--full-stacktrace}'[Print out the full (very verbose) stacktrace for all exceptions.]' \
-                '--system-prop[system property (prop=val)]' \
+                '-Dgradle.user.home=[Specifies the Gradle user home directory. Defaults to ~/.gradle]:gradle.user.home:_directories' \
+                '-Dorg.gradle.caching.debug=[]' \
+                '-Dorg.gradle.caching=[Enables the Gradle build cache. Gradle will try to reuse outputs from previous builds.]:org.gradle.caching:(true false)' \
+                '-Dorg.gradle.configuration-cache.entries-per-key=[]' \
+                '-Dorg.gradle.configuration-cache.fine-grained-property-tracking=[]' \
+                '-Dorg.gradle.configuration-cache.heap-dump-dir=[]:org.gradle.configuration cache.heap dump dir:_directories' \
+                '-Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=[]' \
+                '-Dorg.gradle.configuration-cache.inputs.unsafe.ignore.in-serialization=[]' \
+                '-Dorg.gradle.configuration-cache.integrity-check=[]' \
+                '-Dorg.gradle.configuration-cache.max-problems=[]' \
+                '-Dorg.gradle.configuration-cache.parallel=[]' \
+                '-Dorg.gradle.configuration-cache.problems=[Configures how the configuration cache handles problems (fail or warn). Defaults to fail.]:org.gradle.configuration cache.problems:(fail warn)' \
+                '-Dorg.gradle.configuration-cache.read-only=[]' \
+                '-Dorg.gradle.configuration-cache.unsafe.ignore.unsupported-build-events-listeners=[]' \
+                '-Dorg.gradle.configuration-cache=[Enables the configuration cache. Gradle will try to reuse the build configuration from previous builds.]' \
+                '-Dorg.gradle.configureondemand=[Configure necessary projects only. Gradle will attempt to reduce configuration time for large multi-project builds.]' \
+                '-Dorg.gradle.console.unicode=[Specifies which character types are allowed in console output to generate. Values are 'auto' (default), 'disable' or 'enable'.]' \
+                '-Dorg.gradle.console=[Specifies which type of console output to generate. Values are 'plain', 'colored', 'auto' (default), 'rich' or 'verbose'.]:org.gradle.console:(plain auto rich verbose)' \
+                '-Dorg.gradle.continue=[Continue task execution after a task failure.]' \
+                '-Dorg.gradle.continuous.quietperiod=[]' \
+                '-Dorg.gradle.daemon.healthcheckinterval=[]' \
+                '-Dorg.gradle.daemon.idletimeout=[]' \
+                '-Dorg.gradle.daemon.registry.base=[]:org.gradle.daemon.registry.base:_directories' \
+                '-Dorg.gradle.daemon=[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \
+                '-Dorg.gradle.debug.host=[]' \
+                '-Dorg.gradle.debug.port=[]' \
+                '-Dorg.gradle.debug.server=[]' \
+                '-Dorg.gradle.debug.suspend=[]' \
+                '-Dorg.gradle.debug=[]:org.gradle.debug:(true false)' \
+                '-Dorg.gradle.dependency.verification=[Configures the dependency verification mode. Values are 'strict', 'lenient' or 'off'.]:org.gradle.dependency.verification:(strict lenient off)' \
+                '-Dorg.gradle.java.home=[]:org.gradle.java.home:_directories' \
+                '-Dorg.gradle.java.installations.auto-detect=[]' \
+                '-Dorg.gradle.java.installations.auto-download=[]' \
+                '-Dorg.gradle.java.installations.fromEnv=[]' \
+                '-Dorg.gradle.java.installations.idea-jdks-directory=[]:org.gradle.java.installations.idea jdks directory:_directories' \
+                '-Dorg.gradle.java.installations.paths=[]:org.gradle.java.installations.paths:_directories' \
+                '-Dorg.gradle.jvmargs=[]' \
+                '-Dorg.gradle.logging.level=[]:org.gradle.logging.level:(quiet warn info debug)' \
+                '-Dorg.gradle.logging.stacktrace=[]' \
+                '-Dorg.gradle.native=[]' \
+                '-Dorg.gradle.parallel=[Build projects in parallel. Gradle will attempt to determine the optimal number of executor threads to use.]:org.gradle.parallel:(true false)' \
+                '-Dorg.gradle.priority=[Specifies the scheduling priority for the Gradle daemon and all processes launched by it. Values are 'normal' (default) or 'low']:org.gradle.priority:(normal low)' \
+                '-Dorg.gradle.problems.report=[(Experimental) enables HTML problems report]' \
+                '-Dorg.gradle.projectcachedir=[Specify the project-specific cache directory. Defaults to .gradle in the root project directory.]:org.gradle.projectcachedir:_directories' \
+                '-Dorg.gradle.tooling.parallel=[]' \
+                '-Dorg.gradle.unsafe.isolated-projects=[]' \
+                '-Dorg.gradle.vfs.verbose=[]' \
+                '-Dorg.gradle.vfs.watch=[Enables watching the file system for changes, allowing data about the file system to be re-used for the next build.]:org.gradle.vfs.watch:(true false)' \
+                '-Dorg.gradle.warning.mode=[Specifies which mode of warnings to generate. Values are 'all', 'fail', 'summary'(default) or 'none']' \
+                '-Dorg.gradle.welcome=[]:org.gradle.welcome:(once never)' \
+                '-Dorg.gradle.workers.max=[Configure the number of concurrent workers Gradle is allowed to use.]' \
+                (--no-build-cache)'--build-cache[Enables the Gradle build cache. Gradle will try to reuse outputs from previous builds.]' \
+                (--no-configuration-cache)'--configuration-cache[Enables the configuration cache. Gradle will try to reuse the build configuration from previous builds.]' \
+                '--configuration-cache-problems[Configures how the configuration cache handles problems (fail or warn). Defaults to fail.]:configuration cache problems:(fail warn)' \
+                (--no-configure-on-demand)'--configure-on-demand[Configure necessary projects only. Gradle will attempt to reduce configuration time for large multi-project builds. (incubating)]' \
+                '--console[Specifies which type of console output to generate. Values are 'plain', 'colored', 'auto' (default), 'rich' or 'verbose'.]:console:(plain auto rich verbose)' \
+                '--console-unicode[Specifies which character types are allowed in console output to generate. Values are 'auto' (default), 'disable' or 'enable'.]' \
+                (--no-continue)'--continue[Continue task execution after a task failure.]' \
                 {-t,--continuous}'[Enables continuous build. Gradle does not exit and will re-execute tasks when task file inputs change.]' \
-                {-u,--no-search-upward}"[Don't search in parent folders for a settings.gradle file.]" \
-                '(--write-locks)--update-locks[Perform a partial update of the dependency lock.]' \
-                '(-d --debug -q --quiet -i --info)'{-w,--warn}'[Log warnings and errors only.]' \
-                '--warning-mode=[Set types of warnings to log.]:warning mode:(all summary none)' \
-                '(--update-locks)--write-locks[Persists dependency resolution for locked configurations.]' \
-                {-x,--exclude-task}'[Specify a task to be excluded from execution.]' && ret=0
+                (--no-daemon)'--daemon[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \
+                (--quiet,-q,--warn,-w,--info,-i){-d,--debug}'[Log in debug mode (includes normal stacktrace).]' \
+                {-F,--dependency-verification}'[Configures the dependency verification mode. Values are 'strict', 'lenient' or 'off'.]:dependency verification:(strict lenient off)' \
+                {-m,--dry-run}'[Run the builds with all task actions disabled.]' \
+                \*{-x,--exclude-task}'[Specify a task to be excluded from execution.]' \
+                '--export-keys[Exports the public keys used for dependency verification.]' \
+                '--foreground[Starts the Gradle daemon in the foreground.]' \
+                (--stacktrace,-s){-S,--full-stacktrace}'[Print out the full (very verbose) stacktrace for all exceptions.]' \
+                {-g,--gradle-user-home}'[Specifies the Gradle user home directory. Defaults to ~/.gradle]:gradle user home:_directories' \
+                \*'--include-build[Include the specified build in the composite.]:include build:_directories' \
+                (--quiet,-q,--warn,-w,--debug,-d){-i,--info}'[Set log level to info.]' \
+                \*{-I,--init-script}'[Specify an initialization script.]:init script:_files -g \*.gradle(|.kts)' \
+                '--max-workers[Configure the number of concurrent workers Gradle is allowed to use.]' \
+                (--build-cache)'--no-build-cache[Disables the Gradle build cache.]' \
+                (--configuration-cache)'--no-configuration-cache[Disables the configuration cache.]' \
+                (--configure-on-demand)'--no-configure-on-demand[Disables the use of configuration on demand. (incubating)]' \
+                (--continue)'--no-continue[Stop task execution after a task failure.]' \
+                (--daemon)'--no-daemon[Do not use the Gradle daemon to run the build. Useful occasionally if you have configured Gradle to always run with the daemon by default.]' \
+                (--parallel)'--no-parallel[Disables parallel execution to build projects.]' \
+                (--problems-report)'--no-problems-report[(Experimental) disables HTML problems report]' \
+                {-a,--no-rebuild}'[Do not rebuild project dependencies.]' \
+                (--scan)'--no-scan[Disables the creation of a Build Scan.]' \
+                (--watch-fs)'--no-watch-fs[Disables watching the file system.]' \
+                '--offline[Execute the build without accessing network resources.]' \
+                (--no-parallel)'--parallel[Build projects in parallel. Gradle will attempt to determine the optimal number of executor threads to use.]' \
+                '--priority[Specifies the scheduling priority for the Gradle daemon and all processes launched by it. Values are 'normal' (default) or 'low']' \
+                (--no-problems-report)'--problems-report[(Experimental) enables HTML problems report]' \
+                '--profile[Profile build execution time and generates a report in the <build_dir>/reports/profile directory.]' \
+                '--project-cache-dir[Specify the project-specific cache directory. Defaults to .gradle in the root project directory.]:project cache dir:_directories' \
+                {-p,--project-dir}'[Specifies the start directory for Gradle. Defaults to current directory.]:project dir:_directories' \
+                '--property-upgrade-report[(Experimental) Runs build with experimental property upgrade report.]' \
+                (--warn,-w,--info,-i,--debug,-d){-q,--quiet}'[Log errors only.]' \
+                {-U,--refresh-dependencies}'[Refresh the state of dependencies.]' \
+                '--refresh-keys[Refresh the public keys used for dependency verification.]' \
+                '--rerun[Causes the task to be re-run even if up-to-date.]' \
+                '--rerun-tasks[Ignore previously cached task results.]' \
+                (--no-scan)'--scan[Generate a Build Scan (powered by Develocity).]' \
+                {-V,--show-version}'[Print version info and continue.]' \
+                (--full-stacktrace,-S){-s,--stacktrace}'[Print out the stacktrace for all exceptions.]' \
+                '--task-graph[Print task graph instead of executing tasks.]' \
+                \*'--update-locks[Perform a partial update of the dependency lock, letting passed in module notations change version. (incubating)]' \
+                (--quiet,-q,--info,-i,--debug,-d){-w,--warn}'[Set log level to warn.]' \
+                '--warning-mode[Specifies which mode of warnings to generate. Values are 'all', 'fail', 'summary'(default) or 'none']:warning mode:(all summary none)' \
+                (--no-watch-fs)'--watch-fs[Enables watching the file system for changes, allowing data about the file system to be re-used for the next build.]' \
+                '--write-locks[Persists dependency resolution for locked configurations, ignoring existing locking information if it exists]' \
+                {-M,--write-verification-metadata}'[Generates checksums for dependencies used in the project (comma-separated list)]' && ret=0
             ;;
     esac
 
@@ -341,71 +379,116 @@ _gradle() {
     typeset -A opt_args
 
     _arguments -C \
-        '(-)'{-\?,-h,--help}'[Shows a help message.]' \
-        {-a,--no-rebuild}'[Do not rebuild project dependencies.]' \
-        '(--no-build-cache)--build-cache[Enable the Gradle build cache.]' \
-        {-b,--build-file}'[Specifies the build file.]:build script:_files -g \*.gradle' \
-        {-C,--cache}'[Specifies how compiled build scripts should be cached.]:cache policy:(on rebuild)' \
-        {-c,--settings-file}'[Specifies the settings file.]:settings file:_files -g \*.gradle:->argument-expected' \
-        '(--no-configure-on-demand)--configure-on-demand[Only relevant projects are configured in this build run.]' \
-        '--console=[Specifies which type of console output to generate.]:console output type:(plain auto rich verbose)' \
-        '--continue[Continues task execution after a task failure.]' \
-        '-Dorg.gradle.cache.reserved.mb=[Reserve Gradle Daemon memory for operations.]' \
-        '-Dorg.gradle.caching=[Set true to enable Gradle build cache.]' \
-        '-Dorg.gradle.console=[Set type of console output to generate.]:console output type:(plain auto rich verbose)' \
-        '-Dorg.gradle.daemon.debug=[Set true to debug Gradle Daemon.]' \
-        '-Dorg.gradle.daemon.idletimeout=[Kill Gradle Daemon after # idle millis.]' \
-        '-Dorg.gradle.debug=[Set true to debug Gradle Client.]' \
-        '-Dorg.gradle.jvmargs=[Set JVM arguments.]' \
-        '-Dorg.gradle.java.home=[Set JDK home dir.]' \
-        '-Dorg.gradle.logging.level=[Set default Gradle log level.]:log level:(quiet warn lifecycle info debug)' \
-        '-Dorg.gradle.parallel=[Set true to enable parallel project builds.]:(true false)' \
-        '-Dorg.gradle.priority=[Set priority for Gradle worker processes.]:priority:(low normal)' \
-        '-Dorg.gradle.warning.mode=[Set types of warnings to log.]:warning level:(all summary none)' \
-        '-Dorg.gradle.workers.max=[Set the number of workers Gradle is allowed to use.]' \
-        '(-i --info -w --warn -q --quiet)'{-d,--debug}'[Log in debug mode (includes normal stacktrace).]' \
-        '(--no-daemon)--daemon[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \
-        '--foreground[Starts the Gradle daemon in the foreground.]' \
-        {-g,--gradle-user-home}'[Specifies the gradle user home directory.]:home directory:_directories:->argument-expected' \
-        '(-)--gui[Launches the Gradle GUI. (Removed in Gradle 4.0)]' \
-        \*--include-build'[Includes the specified build in the composite.]:file:_directories:->argument-expected' \
-        \*{-I,--init-script}'[Specifies an initialization script.]:init script:_files -g \*.gradle:->argument-expected' \
-        '(-d --debug -w --warn -q --quiet)'{-i,--info}'[Set log level to info.]' \
-        '--max-workers[Set the maximum number of concurrent workers that Gradle may use.]:number workers:->argument-expected' \
-        {-m,--dry-run}'[Runs the builds with all task actions disabled.]' \
-        '--no-color[Do not use color in the console output. (Removed in Gradle 3.0)]' \
-        '(--build-cache)--no-build-cache[Do not use the Gradle build cache.]' \
-        '(--configure-on-demand)--no-configure-on-demand[Disables configuration on demand.]' \
-        '(--daemon)--no-daemon[Do not use the Gradle daemon to run the build.]' \
-        '(--parallel)--no-parallel[Disables parallel execution to build projects.]' \
-        '(--scan)--no-scan[Do not create a build scan.]' \
-        '--offline[The build should operate without accessing network resources.]' \
-        \*{-P+,--project-prop}'[Set project property for the build script (e.g. -Pmyprop=myvalue).]:project property (prop=val):->argument-expected' \
-        {-p,--project-dir}'[Specifies the start directory for Gradle.]:start directory:_directories:->argument-expected' \
-        '(--no-parallel)--parallel[Build projects in parallel. Gradle will attempt to determine the optimal number of executor threads to use.]' \
-        '--priority=[Set priority for Gradle worker processes.]:priority:(low normal)' \
-        '--profile[Profiles build execution time and generates a report in the <build_dir>/reports/profile directory.]' \
-        '--project-cache-dir=[Specifies the project-specific cache directory.]:cache directory:_directories:->argument-expected' \
-        '(-d --debug -w --warn -i --info)'{-q,--quiet}'[Log errors only.]' \
-        '--recompile-scripts[Force build script recompiling.]' \
-        '--refresh[Refresh the state of resources of the type(s) specified.]:refresh policy:(dependencies)' \
-        '--refresh-dependencies[Refresh the state of dependencies.]' \
-        '--rerun-tasks[Ignore previously cached task results.]' \
-        '(--no-scan)--scan[Create a build scan.]' \
-        '(-S --full-stacktrace)'{-s,--stacktrace}'[Print out the stacktrace for all exceptions.]' \
-        '(-s --stacktrace)'{-S,--full-stacktrace}'[Print out the full (very verbose) stacktrace for all exceptions.]' \
-        '(-)--status[Shows status of running and recently stopped Gradle Daemons.]' \
-        '(-)--stop[Stops all Gradle daemons.]' \
-        '--system-prop[system property (prop=val)]' \
+'-Dgradle.user.home=[Specifies the Gradle user home directory. Defaults to ~/.gradle]:gradle.user.home:_directories:->argument-expected' \
+        '-Dorg.gradle.caching.debug=[]:->argument-expected' \
+        '-Dorg.gradle.caching=[Enables the Gradle build cache. Gradle will try to reuse outputs from previous builds.]:org.gradle.caching:(true false):->argument-expected' \
+        '-Dorg.gradle.configuration-cache.entries-per-key=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.fine-grained-property-tracking=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.heap-dump-dir=[]:org.gradle.configuration cache.heap dump dir:_directories:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.inputs.unsafe.ignore.file-system-checks=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.inputs.unsafe.ignore.in-serialization=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.integrity-check=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.max-problems=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.parallel=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.problems=[Configures how the configuration cache handles problems (fail or warn). Defaults to fail.]:org.gradle.configuration cache.problems:(fail warn):->argument-expected' \
+        '-Dorg.gradle.configuration-cache.read-only=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache.unsafe.ignore.unsupported-build-events-listeners=[]:->argument-expected' \
+        '-Dorg.gradle.configuration-cache=[Enables the configuration cache. Gradle will try to reuse the build configuration from previous builds.]:->argument-expected' \
+        '-Dorg.gradle.configureondemand=[Configure necessary projects only. Gradle will attempt to reduce configuration time for large multi-project builds.]:->argument-expected' \
+        '-Dorg.gradle.console.unicode=[Specifies which character types are allowed in console output to generate. Values are 'auto' (default), 'disable' or 'enable'.]:->argument-expected' \
+        '-Dorg.gradle.console=[Specifies which type of console output to generate. Values are 'plain', 'colored', 'auto' (default), 'rich' or 'verbose'.]:org.gradle.console:(plain auto rich verbose):->argument-expected' \
+        '-Dorg.gradle.continue=[Continue task execution after a task failure.]:->argument-expected' \
+        '-Dorg.gradle.continuous.quietperiod=[]:->argument-expected' \
+        '-Dorg.gradle.daemon.healthcheckinterval=[]:->argument-expected' \
+        '-Dorg.gradle.daemon.idletimeout=[]:->argument-expected' \
+        '-Dorg.gradle.daemon.registry.base=[]:org.gradle.daemon.registry.base:_directories:->argument-expected' \
+        '-Dorg.gradle.daemon=[Uses the Gradle daemon to run the build. Starts the daemon if not running.]:->argument-expected' \
+        '-Dorg.gradle.debug.host=[]:->argument-expected' \
+        '-Dorg.gradle.debug.port=[]:->argument-expected' \
+        '-Dorg.gradle.debug.server=[]:->argument-expected' \
+        '-Dorg.gradle.debug.suspend=[]:->argument-expected' \
+        '-Dorg.gradle.debug=[]:org.gradle.debug:(true false):->argument-expected' \
+        '-Dorg.gradle.dependency.verification=[Configures the dependency verification mode. Values are 'strict', 'lenient' or 'off'.]:org.gradle.dependency.verification:(strict lenient off):->argument-expected' \
+        '-Dorg.gradle.java.home=[]:org.gradle.java.home:_directories:->argument-expected' \
+        '-Dorg.gradle.java.installations.auto-detect=[]:->argument-expected' \
+        '-Dorg.gradle.java.installations.auto-download=[]:->argument-expected' \
+        '-Dorg.gradle.java.installations.fromEnv=[]:->argument-expected' \
+        '-Dorg.gradle.java.installations.idea-jdks-directory=[]:org.gradle.java.installations.idea jdks directory:_directories:->argument-expected' \
+        '-Dorg.gradle.java.installations.paths=[]:org.gradle.java.installations.paths:_directories:->argument-expected' \
+        '-Dorg.gradle.jvmargs=[]:->argument-expected' \
+        '-Dorg.gradle.logging.level=[]:org.gradle.logging.level:(quiet warn info debug):->argument-expected' \
+        '-Dorg.gradle.logging.stacktrace=[]:->argument-expected' \
+        '-Dorg.gradle.native=[]:->argument-expected' \
+        '-Dorg.gradle.parallel=[Build projects in parallel. Gradle will attempt to determine the optimal number of executor threads to use.]:org.gradle.parallel:(true false):->argument-expected' \
+        '-Dorg.gradle.priority=[Specifies the scheduling priority for the Gradle daemon and all processes launched by it. Values are 'normal' (default) or 'low']:org.gradle.priority:(normal low):->argument-expected' \
+        '-Dorg.gradle.problems.report=[(Experimental) enables HTML problems report]:->argument-expected' \
+        '-Dorg.gradle.projectcachedir=[Specify the project-specific cache directory. Defaults to .gradle in the root project directory.]:org.gradle.projectcachedir:_directories:->argument-expected' \
+        '-Dorg.gradle.tooling.parallel=[]:->argument-expected' \
+        '-Dorg.gradle.unsafe.isolated-projects=[]:->argument-expected' \
+        '-Dorg.gradle.vfs.verbose=[]:->argument-expected' \
+        '-Dorg.gradle.vfs.watch=[Enables watching the file system for changes, allowing data about the file system to be re-used for the next build.]:org.gradle.vfs.watch:(true false):->argument-expected' \
+        '-Dorg.gradle.warning.mode=[Specifies which mode of warnings to generate. Values are 'all', 'fail', 'summary'(default) or 'none']:->argument-expected' \
+        '-Dorg.gradle.welcome=[]:org.gradle.welcome:(once never):->argument-expected' \
+        '-Dorg.gradle.workers.max=[Configure the number of concurrent workers Gradle is allowed to use.]:->argument-expected' \
+        (--no-build-cache)'--build-cache[Enables the Gradle build cache. Gradle will try to reuse outputs from previous builds.]' \
+        (--no-configuration-cache)'--configuration-cache[Enables the configuration cache. Gradle will try to reuse the build configuration from previous builds.]' \
+        '--configuration-cache-problems[Configures how the configuration cache handles problems (fail or warn). Defaults to fail.]:configuration cache problems:(fail warn):->argument-expected' \
+        (--no-configure-on-demand)'--configure-on-demand[Configure necessary projects only. Gradle will attempt to reduce configuration time for large multi-project builds. (incubating)]' \
+        '--console[Specifies which type of console output to generate. Values are 'plain', 'colored', 'auto' (default), 'rich' or 'verbose'.]:console:(plain auto rich verbose):->argument-expected' \
+        '--console-unicode[Specifies which character types are allowed in console output to generate. Values are 'auto' (default), 'disable' or 'enable'.]:->argument-expected' \
+        (--no-continue)'--continue[Continue task execution after a task failure.]' \
         {-t,--continuous}'[Enables continuous build. Gradle does not exit and will re-execute tasks when task file inputs change.]' \
-        {-u,--no-search-upward}"[Don't search in parent folders for a settings.gradle file.]" \
-        '(--write-locks)--update-locks[Perform a partial update of the dependency lock.]' \
-        '(-)'{-v,--version}'[Print version info.]' \
-        '(-d --debug -q --quiet -i --info)'{-w,--warn}'[Log warnings and errors only.]' \
-        '--warning-mode=[Set types of warnings to log.]:warning mode:(all summary none)' \
-        '(--update-locks)--write-locks[Persists dependency resolution for locked configurations.]' \
-        {-x,--exclude-task}'[Specify a task to be excluded from execution.]' \
-        '(-)*:: :->task-or-option' && ret=0
+        (--no-daemon)'--daemon[Uses the Gradle daemon to run the build. Starts the daemon if not running.]' \
+        (--quiet,-q,--warn,-w,--info,-i){-d,--debug}'[Log in debug mode (includes normal stacktrace).]' \
+        {-F,--dependency-verification}'[Configures the dependency verification mode. Values are 'strict', 'lenient' or 'off'.]:dependency verification:(strict lenient off):->argument-expected' \
+        {-m,--dry-run}'[Run the builds with all task actions disabled.]' \
+        \*{-x,--exclude-task}'[Specify a task to be excluded from execution.]' \
+        '--export-keys[Exports the public keys used for dependency verification.]' \
+        '--foreground[Starts the Gradle daemon in the foreground.]' \
+        (--stacktrace,-s){-S,--full-stacktrace}'[Print out the full (very verbose) stacktrace for all exceptions.]' \
+        {-g,--gradle-user-home}'[Specifies the Gradle user home directory. Defaults to ~/.gradle]:gradle user home:_directories:->argument-expected' \
+        {-h,--help}'[Shows a help message.]' \
+        \*'--include-build[Include the specified build in the composite.]:include build:_directories:->argument-expected' \
+        (--quiet,-q,--warn,-w,--debug,-d){-i,--info}'[Set log level to info.]' \
+        \*{-I,--init-script}'[Specify an initialization script.]:init script:_files -g \*.gradle(|.kts):->argument-expected' \
+        '--max-workers[Configure the number of concurrent workers Gradle is allowed to use.]:->argument-expected' \
+        (--build-cache)'--no-build-cache[Disables the Gradle build cache.]' \
+        (--configuration-cache)'--no-configuration-cache[Disables the configuration cache.]' \
+        (--configure-on-demand)'--no-configure-on-demand[Disables the use of configuration on demand. (incubating)]' \
+        (--continue)'--no-continue[Stop task execution after a task failure.]' \
+        (--daemon)'--no-daemon[Do not use the Gradle daemon to run the build. Useful occasionally if you have configured Gradle to always run with the daemon by default.]' \
+        (--parallel)'--no-parallel[Disables parallel execution to build projects.]' \
+        (--problems-report)'--no-problems-report[(Experimental) disables HTML problems report]' \
+        {-a,--no-rebuild}'[Do not rebuild project dependencies.]' \
+        (--scan)'--no-scan[Disables the creation of a Build Scan.]' \
+        (--watch-fs)'--no-watch-fs[Disables watching the file system.]' \
+        '--offline[Execute the build without accessing network resources.]' \
+        (--no-parallel)'--parallel[Build projects in parallel. Gradle will attempt to determine the optimal number of executor threads to use.]' \
+        '--priority[Specifies the scheduling priority for the Gradle daemon and all processes launched by it. Values are 'normal' (default) or 'low']:->argument-expected' \
+        (--no-problems-report)'--problems-report[(Experimental) enables HTML problems report]' \
+        '--profile[Profile build execution time and generates a report in the <build_dir>/reports/profile directory.]' \
+        '--project-cache-dir[Specify the project-specific cache directory. Defaults to .gradle in the root project directory.]:project cache dir:_directories:->argument-expected' \
+        {-p,--project-dir}'[Specifies the start directory for Gradle. Defaults to current directory.]:project dir:_directories:->argument-expected' \
+        '--property-upgrade-report[(Experimental) Runs build with experimental property upgrade report.]' \
+        (--warn,-w,--info,-i,--debug,-d){-q,--quiet}'[Log errors only.]' \
+        {-U,--refresh-dependencies}'[Refresh the state of dependencies.]' \
+        '--refresh-keys[Refresh the public keys used for dependency verification.]' \
+        '--rerun[Causes the task to be re-run even if up-to-date.]' \
+        '--rerun-tasks[Ignore previously cached task results.]' \
+        (--no-scan)'--scan[Generate a Build Scan (powered by Develocity).]' \
+        {-V,--show-version}'[Print version info and continue.]' \
+        (--full-stacktrace,-S){-s,--stacktrace}'[Print out the stacktrace for all exceptions.]' \
+        '--status[Shows status of running and recently stopped Gradle daemon(s).]' \
+        '--stop[Stops the Gradle daemon if it is running.]' \
+        '--task-graph[Print task graph instead of executing tasks.]' \
+        \*'--update-locks[Perform a partial update of the dependency lock, letting passed in module notations change version. (incubating)]' \
+        {-v,--version}'[Print version info and exit.]' \
+        (--quiet,-q,--info,-i,--debug,-d){-w,--warn}'[Set log level to warn.]' \
+        '--warning-mode[Specifies which mode of warnings to generate. Values are 'all', 'fail', 'summary'(default) or 'none']:warning mode:(all summary none):->argument-expected' \
+        (--no-watch-fs)'--watch-fs[Enables watching the file system for changes, allowing data about the file system to be re-used for the next build.]' \
+        '--write-locks[Persists dependency resolution for locked configurations, ignoring existing locking information if it exists]' \
+        {-M,--write-verification-metadata}'[Generates checksums for dependencies used in the project (comma-separated list)]:->argument-expected' \
+'(-)*:: :->task-or-option' && ret=0
 
     if [[ $words[CURRENT] != -* && $state != "argument-expected" ]]; then
         __gradle_tasks && ret=0
diff --git a/zsh/plugins/gradle/gradle.plugin.zsh b/zsh/plugins/gradle/gradle.plugin.zsh
index 5bca364..dacc464 100644
--- a/zsh/plugins/gradle/gradle.plugin.zsh
+++ b/zsh/plugins/gradle/gradle.plugin.zsh
@@ -6,7 +6,7 @@ function gradle-or-gradlew() {
   # taken from https://github.com/gradle/gradle-completion
   local dir="$PWD" project_root="$PWD"
   while [[ "$dir" != / ]]; do
-    if [[ -f "$dir/settings.gradle" || -f "$dir/settings.gradle.kts" || -f "$dir/gradlew" ]]; then
+    if [[ -x "$dir/gradlew" ]]; then
       project_root="$dir"
       break
     fi
diff --git a/zsh/plugins/grails/grails.plugin.zsh b/zsh/plugins/grails/grails.plugin.zsh
index ddc2574..e5dceb5 100644
--- a/zsh/plugins/grails/grails.plugin.zsh
+++ b/zsh/plugins/grails/grails.plugin.zsh
@@ -7,7 +7,7 @@ _enumerateGrailsScripts() {
     then
         directories+=(plugins/*/scripts)
     fi
-    
+
     # Enumerate all of the Groovy files
     files=()
     for dir in $directories;
@@ -17,13 +17,13 @@ _enumerateGrailsScripts() {
             files+=($dir/[^_]*.groovy)
         fi
     done
-    
+
     # Don't try to basename ()
     if [ ${#files} -eq 0 ];
     then
         return
     fi
-    
+
     scripts=()
     for file in $files
     do
@@ -42,19 +42,19 @@ _enumerateGrailsScripts() {
     done
     echo $scripts
 }
- 
+
 _grails() {
     if (( CURRENT == 2 )); then
         scripts=( $(_enumerateGrailsScripts) )
-        
+
         if [ ${#scripts} -ne 0 ];
         then
             _multi_parts / scripts
             return
         fi
     fi
-    
+
     _files
 }
- 
+
 compdef _grails grails
diff --git a/zsh/plugins/grc/grc.plugin.zsh b/zsh/plugins/grc/grc.plugin.zsh
index b709b9e..fc6ecc8 100644
--- a/zsh/plugins/grc/grc.plugin.zsh
+++ b/zsh/plugins/grc/grc.plugin.zsh
@@ -2,8 +2,11 @@
 
 # common grc.zsh paths
 files=(
-  /etc/grc.zsh            # default
-  /usr/local/etc/grc.zsh  # homebrew
+  /etc/grc.zsh               # default
+  /usr/local/etc/grc.zsh     # homebrew darwin-x64
+  /opt/homebrew/etc/grc.zsh  # homebrew darwin-arm64
+  /home/linuxbrew/.linuxbrew/etc/grc.zsh # linuxbrew 
+  /usr/share/grc/grc.zsh     # Gentoo Linux (app-misc/grc)
 )
 
 # verify the file is readable and source it
diff --git a/zsh/plugins/hasura/README.md b/zsh/plugins/hasura/README.md
new file mode 100644
index 0000000..d7db9ed
--- /dev/null
+++ b/zsh/plugins/hasura/README.md
@@ -0,0 +1,9 @@
+# Hasura plugin
+
+This plugin adds completion for [the Hasura CLI](https://hasura.io/docs/latest/hasura-cli/index/).
+
+To use it, add `hasura` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... hasura)
+```
diff --git a/zsh/plugins/hasura/hasura.plugin.zsh b/zsh/plugins/hasura/hasura.plugin.zsh
new file mode 100644
index 0000000..18254c4
--- /dev/null
+++ b/zsh/plugins/hasura/hasura.plugin.zsh
@@ -0,0 +1,13 @@
+if (( ! $+commands[hasura] )); then
+  return
+fi
+
+# If the completion file does not exist, generate it and then source it
+# Otherwise, source it and regenerate in the background
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_hasura" ]]; then
+  hasura completion zsh --file "$ZSH_CACHE_DIR/completions/_hasura" >/dev/null
+  source "$ZSH_CACHE_DIR/completions/_hasura"
+else
+  source "$ZSH_CACHE_DIR/completions/_hasura"
+  hasura completion zsh --file "$ZSH_CACHE_DIR/completions/_hasura" >/dev/null &|
+fi
diff --git a/zsh/plugins/hcloud/README.md b/zsh/plugins/hcloud/README.md
new file mode 100644
index 0000000..6cac675
--- /dev/null
+++ b/zsh/plugins/hcloud/README.md
@@ -0,0 +1,143 @@
+# hcloud plugin
+
+This plugin adds completion for the [Hetzner Cloud CLI](https://github.com/hetznercloud/cli),
+as well as some aliases for common hcloud commands.
+
+To use it, add `hcloud` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... hcloud)
+```
+
+## Aliases
+
+| Alias      | Command                                   | Description                                                   |
+| :--------- | :---------------------------------------- | :------------------------------------------------------------ |
+| hc         | `hcloud`                                  | The hcloud command                                            |
+|            |                                           | **Context Management**                                        |
+| hcctx      | `hcloud context`                          | Manage contexts                                               |
+| hcctxls    | `hcloud context list`                     | List all contexts                                             |
+| hcctxu     | `hcloud context use`                      | Use a context                                                 |
+| hcctxc     | `hcloud context create`                   | Create a new context                                          |
+| hcctxd     | `hcloud context delete`                   | Delete a context                                              |
+| hcctxa     | `hcloud context active`                   | Show active context                                           |
+|            |                                           | **Server Management**                                         |
+| hcs        | `hcloud server`                           | Manage servers                                                |
+| hcsl       | `hcloud server list`                      | List all servers                                              |
+| hcsc       | `hcloud server create`                    | Create a server                                               |
+| hcsd       | `hcloud server delete`                    | Delete a server                                               |
+| hcsdesc    | `hcloud server describe`                  | Describe a server                                             |
+| hcspoff    | `hcloud server poweroff`                  | Power off a server                                            |
+| hcspon     | `hcloud server poweron`                   | Power on a server                                             |
+| hcsr       | `hcloud server reboot`                    | Reboot a server                                               |
+| hcsreset   | `hcloud server reset`                     | Reset a server                                                |
+| hcssh      | `hcloud server ssh`                       | SSH into a server                                             |
+| hcse       | `hcloud server enable-rescue`             | Enable rescue mode for a server                               |
+| hcsdr      | `hcloud server disable-rescue`            | Disable rescue mode for a server                              |
+| hcsip      | `hcloud server ip`                        | Manage server IPs                                             |
+| hcsa       | `hcloud server attach-iso`                | Attach an ISO to a server                                     |
+| hcsda      | `hcloud server detach-iso`                | Detach an ISO from a server                                   |
+| hcscip     | `hcloud server change-type`               | Change server type                                            |
+|            |                                           | **Volume Management**                                         |
+| hcv        | `hcloud volume`                           | Manage volumes                                                |
+| hcvl       | `hcloud volume list`                      | List all volumes                                              |
+| hcvc       | `hcloud volume create`                    | Create a volume                                               |
+| hcvd       | `hcloud volume delete`                    | Delete a volume                                               |
+| hcvdesc    | `hcloud volume describe`                  | Describe a volume                                             |
+| hcva       | `hcloud volume attach`                    | Attach a volume to a server                                   |
+| hcvda      | `hcloud volume detach`                    | Detach a volume from a server                                 |
+| hcvr       | `hcloud volume resize`                    | Resize a volume                                               |
+|            |                                           | **Network Management**                                        |
+| hcn        | `hcloud network`                          | Manage networks                                               |
+| hcnl       | `hcloud network list`                     | List all networks                                             |
+| hcnc       | `hcloud network create`                   | Create a network                                              |
+| hcnd       | `hcloud network delete`                   | Delete a network                                              |
+| hcndesc    | `hcloud network describe`                 | Describe a network                                            |
+| hcnas      | `hcloud network add-subnet`               | Add a subnet to a network                                     |
+| hcnds      | `hcloud network delete-subnet`            | Delete a subnet from a network                                |
+| hcnar      | `hcloud network add-route`                | Add a route to a network                                      |
+| hcndr      | `hcloud network delete-route`             | Delete a route from a network                                 |
+|            |                                           | **Floating IP Management**                                    |
+| hcfip      | `hcloud floating-ip`                      | Manage floating IPs                                           |
+| hcfipl     | `hcloud floating-ip list`                 | List all floating IPs                                         |
+| hcfipc     | `hcloud floating-ip create`               | Create a floating IP                                          |
+| hcfipd     | `hcloud floating-ip delete`               | Delete a floating IP                                          |
+| hcfipdesc  | `hcloud floating-ip describe`             | Describe a floating IP                                        |
+| hcfipa     | `hcloud floating-ip assign`               | Assign a floating IP to a server                              |
+| hcfipua    | `hcloud floating-ip unassign`             | Unassign a floating IP from a server                          |
+|            |                                           | **SSH Key Management**                                        |
+| hcsk       | `hcloud ssh-key`                          | Manage SSH keys                                               |
+| hcskl      | `hcloud ssh-key list`                     | List all SSH keys                                             |
+| hcskc      | `hcloud ssh-key create`                   | Create an SSH key                                             |
+| hcskd      | `hcloud ssh-key delete`                   | Delete an SSH key                                             |
+| hcskdesc   | `hcloud ssh-key describe`                 | Describe an SSH key                                           |
+| hcsku      | `hcloud ssh-key update`                   | Update an SSH key                                             |
+|            |                                           | **Image Management**                                          |
+| hci        | `hcloud image`                            | Manage images                                                 |
+| hcil       | `hcloud image list`                       | List all images                                               |
+| hcid       | `hcloud image delete`                     | Delete an image                                               |
+| hcidesc    | `hcloud image describe`                   | Describe an image                                             |
+| hciu       | `hcloud image update`                     | Update an image                                               |
+|            |                                           | **Firewall Management**                                       |
+| hcfw       | `hcloud firewall`                         | Manage firewalls                                              |
+| hcfwl      | `hcloud firewall list`                    | List all firewalls                                            |
+| hcfwc      | `hcloud firewall create`                  | Create a firewall                                             |
+| hcfwd      | `hcloud firewall delete`                  | Delete a firewall                                             |
+| hcfwdesc   | `hcloud firewall describe`                | Describe a firewall                                           |
+| hcfwar     | `hcloud firewall add-rule`                | Add a rule to a firewall                                      |
+| hcfwdr     | `hcloud firewall delete-rule`             | Delete a rule from a firewall                                 |
+| hcfwas     | `hcloud firewall apply-to-resource`       | Apply a firewall to a resource                                |
+| hcfwrs     | `hcloud firewall remove-from-resource`    | Remove a firewall from a resource                             |
+|            |                                           | **Load Balancer Management**                                  |
+| hclb       | `hcloud load-balancer`                    | Manage load balancers                                         |
+| hclbl      | `hcloud load-balancer list`               | List all load balancers                                       |
+| hclbc      | `hcloud load-balancer create`             | Create a load balancer                                        |
+| hclbd      | `hcloud load-balancer delete`             | Delete a load balancer                                        |
+| hclbdesc   | `hcloud load-balancer describe`           | Describe a load balancer                                      |
+| hclbu      | `hcloud load-balancer update`             | Update a load balancer                                        |
+| hclbas     | `hcloud load-balancer add-service`        | Add a service to a load balancer                              |
+| hclbds     | `hcloud load-balancer delete-service`     | Delete a service from a load balancer                         |
+| hclbat     | `hcloud load-balancer add-target`         | Add a target to a load balancer                               |
+| hclbdt     | `hcloud load-balancer delete-target`      | Delete a target from a load balancer                          |
+|            |                                           | **Certificate Management**                                    |
+| hccert     | `hcloud certificate`                      | Manage certificates                                           |
+| hccertl    | `hcloud certificate list`                 | List all certificates                                         |
+| hccertc    | `hcloud certificate create`               | Create a certificate                                          |
+| hccertd    | `hcloud certificate delete`               | Delete a certificate                                          |
+| hccertdesc | `hcloud certificate describe`             | Describe a certificate                                        |
+| hccertu    | `hcloud certificate update`               | Update a certificate                                          |
+|            |                                           | **Datacenter and Location Info**                              |
+| hcdc       | `hcloud datacenter list`                  | List all datacenters                                          |
+| hcloc      | `hcloud location list`                    | List all locations                                            |
+| hcst       | `hcloud server-type list`                 | List all server types                                         |
+| hcit       | `hcloud image list --type system`         | List all system images                                        |
+
+## Requirements
+
+This plugin requires the [Hetzner Cloud CLI](https://github.com/hetznercloud/cli) to be installed.
+
+### Installation
+
+Install the Hetzner Cloud CLI using one of the following methods:
+
+**macOS (Homebrew):**
+```bash
+brew install hcloud
+```
+
+**Linux (from source):**
+```bash
+go install github.com/hetznercloud/cli/cmd/hcloud@latest
+```
+
+**Or download a prebuilt binary from the [releases page](https://github.com/hetznercloud/cli/releases).**
+
+### Setup
+
+After installation, create a context and authenticate:
+
+```bash
+hcloud context create my-project
+```
+
+You'll be prompted to enter your Hetzner Cloud API token, which you can generate in the [Hetzner Cloud Console](https://console.hetzner.cloud/).
diff --git a/zsh/plugins/hcloud/hcloud.plugin.zsh b/zsh/plugins/hcloud/hcloud.plugin.zsh
new file mode 100644
index 0000000..3b1d432
--- /dev/null
+++ b/zsh/plugins/hcloud/hcloud.plugin.zsh
@@ -0,0 +1,129 @@
+# hcloud plugin for oh-my-zsh
+# Hetzner Cloud CLI: https://github.com/hetznercloud/cli
+
+if (( ! $+commands[hcloud] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `hcloud`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_hcloud" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _hcloud
+  _comps[hcloud]=_hcloud
+fi
+
+hcloud completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_hcloud" &|
+
+# Main alias
+alias hc='hcloud'
+
+# Context management
+alias hcctx='hcloud context'
+alias hcctxls='hcloud context list'
+alias hcctxu='hcloud context use'
+alias hcctxc='hcloud context create'
+alias hcctxd='hcloud context delete'
+alias hcctxa='hcloud context active'
+
+# Server management
+alias hcs='hcloud server'
+alias hcsl='hcloud server list'
+alias hcsc='hcloud server create'
+alias hcsd='hcloud server delete'
+alias hcsdesc='hcloud server describe'
+alias hcspoff='hcloud server poweroff'
+alias hcspon='hcloud server poweron'
+alias hcsr='hcloud server reboot'
+alias hcsreset='hcloud server reset'
+alias hcssh='hcloud server ssh'
+alias hcse='hcloud server enable-rescue'
+alias hcsdr='hcloud server disable-rescue'
+alias hcsip='hcloud server ip'
+
+# Server actions
+alias hcsa='hcloud server attach-iso'
+alias hcsda='hcloud server detach-iso'
+alias hcscip='hcloud server change-type'
+
+# Volume management
+alias hcv='hcloud volume'
+alias hcvl='hcloud volume list'
+alias hcvc='hcloud volume create'
+alias hcvd='hcloud volume delete'
+alias hcvdesc='hcloud volume describe'
+alias hcva='hcloud volume attach'
+alias hcvda='hcloud volume detach'
+alias hcvr='hcloud volume resize'
+
+# Network management
+alias hcn='hcloud network'
+alias hcnl='hcloud network list'
+alias hcnc='hcloud network create'
+alias hcnd='hcloud network delete'
+alias hcndesc='hcloud network describe'
+alias hcnas='hcloud network add-subnet'
+alias hcnds='hcloud network delete-subnet'
+alias hcnar='hcloud network add-route'
+alias hcndr='hcloud network delete-route'
+
+# Floating IP management
+alias hcfip='hcloud floating-ip'
+alias hcfipl='hcloud floating-ip list'
+alias hcfipc='hcloud floating-ip create'
+alias hcfipd='hcloud floating-ip delete'
+alias hcfipdesc='hcloud floating-ip describe'
+alias hcfipa='hcloud floating-ip assign'
+alias hcfipua='hcloud floating-ip unassign'
+
+# SSH key management
+alias hcsk='hcloud ssh-key'
+alias hcskl='hcloud ssh-key list'
+alias hcskc='hcloud ssh-key create'
+alias hcskd='hcloud ssh-key delete'
+alias hcskdesc='hcloud ssh-key describe'
+alias hcsku='hcloud ssh-key update'
+
+# Image management
+alias hci='hcloud image'
+alias hcil='hcloud image list'
+alias hcid='hcloud image delete'
+alias hcidesc='hcloud image describe'
+alias hciu='hcloud image update'
+
+# Firewall management
+alias hcfw='hcloud firewall'
+alias hcfwl='hcloud firewall list'
+alias hcfwc='hcloud firewall create'
+alias hcfwd='hcloud firewall delete'
+alias hcfwdesc='hcloud firewall describe'
+alias hcfwar='hcloud firewall add-rule'
+alias hcfwdr='hcloud firewall delete-rule'
+alias hcfwas='hcloud firewall apply-to-resource'
+alias hcfwrs='hcloud firewall remove-from-resource'
+
+# Load balancer management
+alias hclb='hcloud load-balancer'
+alias hclbl='hcloud load-balancer list'
+alias hclbc='hcloud load-balancer create'
+alias hclbd='hcloud load-balancer delete'
+alias hclbdesc='hcloud load-balancer describe'
+alias hclbu='hcloud load-balancer update'
+alias hclbas='hcloud load-balancer add-service'
+alias hclbds='hcloud load-balancer delete-service'
+alias hclbat='hcloud load-balancer add-target'
+alias hclbdt='hcloud load-balancer delete-target'
+
+# Certificate management
+alias hccert='hcloud certificate'
+alias hccertl='hcloud certificate list'
+alias hccertc='hcloud certificate create'
+alias hccertd='hcloud certificate delete'
+alias hccertdesc='hcloud certificate describe'
+alias hccertu='hcloud certificate update'
+
+# Datacenter and location info
+alias hcdc='hcloud datacenter list'
+alias hcloc='hcloud location list'
+alias hcst='hcloud server-type list'
+alias hcit='hcloud image list --type system'
diff --git a/zsh/plugins/helm/README.md b/zsh/plugins/helm/README.md
index 49844c7..dcbb30b 100644
--- a/zsh/plugins/helm/README.md
+++ b/zsh/plugins/helm/README.md
@@ -1,9 +1,19 @@
 # Helm plugin
 
-This plugin adds completion for [Helm](https://helm.sh/), the Kubernetes package manager.
+This plugin adds completion and aliases for [Helm](https://helm.sh/), the Kubernetes package manager.
 
 To use it, add `helm` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... helm)
 ```
+
+## Aliases
+
+| Alias |  Full command  |
+| ----- | -------------- |
+| h     | helm           |
+| hin   | helm install   |
+| hun   | helm uninstall |
+| hse   | helm search    |
+| hup   | helm upgrade   |
diff --git a/zsh/plugins/helm/helm.plugin.zsh b/zsh/plugins/helm/helm.plugin.zsh
index 151c43d..e754a65 100644
--- a/zsh/plugins/helm/helm.plugin.zsh
+++ b/zsh/plugins/helm/helm.plugin.zsh
@@ -11,3 +11,9 @@ else
   source "$ZSH_CACHE_DIR/completions/_helm"
   helm completion zsh | tee "$ZSH_CACHE_DIR/completions/_helm" >/dev/null &|
 fi
+
+alias h='helm'
+alias hin='helm install'
+alias hun='helm uninstall'
+alias hse='helm search'
+alias hup='helm upgrade'
diff --git a/zsh/plugins/heroku-alias/README.md b/zsh/plugins/heroku-alias/README.md
new file mode 100644
index 0000000..4ecb07a
--- /dev/null
+++ b/zsh/plugins/heroku-alias/README.md
@@ -0,0 +1,140 @@
+# heroku-alias
+
+Full alias list for Heroku CLI.
+
+To use it, add `heroku-alias` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... heroku-alias)
+```
+
+## Requirements
+
+- [Heroku CLI](https://devcenter.heroku.com/articles/heroku-cli)
+
+| 🚀 last maj | 📡 source                                                                    |
+| ---------- | --------------------------------------------------------------------------- |
+| 02/06/2020 | [heroku cli doc](https://devcenter.heroku.com/articles/heroku-cli-commands) |
+
+## Aliases
+
+### general
+
+| Alias | Command                            |
+| ----- | ---------------------------------- |
+| h     | heroku                             |
+| hauto | heroku autocomplete $(echo $SHELL) |
+| hl    | heroku local                       |
+
+### config
+
+| Alias  | Command                |
+| ------ | ---------------------- |
+| hc     | heroku config          |
+| hca    | heroku config -a       |
+| hcr    | heroku config -r       |
+| hcs    | heroku config:set      |
+| hcu    | heroku config:unset    |
+
+Also, you can use the `hcfile` function to set multiple config variables from a file,
+which asks you for a platform and a config file to read the configuration from.
+
+### apps and favorites
+
+| Alias | Command                      |
+| ----- | ---------------------------- |
+| ha    | heroku apps                  |
+| hpop  | heroku create                |
+| hkill | heroku apps:destroy          |
+| hlog  | heroku apps:errors           |
+| hfav  | heroku apps:favorites        |
+| hfava | heroku apps:favorites:add    |
+| hfavr | heroku apps:favorites:remove |
+| hai   | heroku apps:info             |
+| hair  | heroku apps:info -r          |
+| haia  | heroku apps:info -a          |
+
+## auth
+
+| Alias | Command                 |
+| ----- | ----------------------- |
+| h2fa  | heroku auth:2fa         |
+| h2far | heroku auth:2fa:disable |
+
+## access
+
+| Alias | Command              |
+| ----- | -------------------- |
+| hac   | heroku access        |
+| hacr  | heroku access -r     |
+| haca  | heroku access -a     |
+| hadd  | heroku access:add    |
+| hdel  | heroku access:remove |
+| hup   | heroku access:update |
+
+### addons
+
+| Alias | Command               |
+| ----- | --------------------- |
+| hads  | heroku addons -A      |
+| hada  | heroku addons -a      |
+| hadr  | heroku addons -r      |
+| hadat | heroku addons:attach  |
+| hadc  | heroku addons:create  |
+| hadel | heroku addons:destroy |
+| hadde | heroku addons:detach  |
+| hadoc | heroku addons:docs    |
+
+### login
+
+| Alias | Command            |
+| ----- | ------------------ |
+| hin   | heroku login       |
+| hout  | heroku logout      |
+| hi    | heroku login -i    |
+| hwho  | heroku auth:whoami |
+
+### authorizations
+
+| Alias  | Command                      |
+| ------ | ---------------------------- |
+| hth    | heroku authorizations        |
+| hthadd | heroku authorizations:create |
+| hthif  | heroku authorizations:info   |
+| hthdel | heroku authorizations:revoke |
+| hthrot | heroku authorizations:rotate |
+| hthup  | heroku authorizations:update |
+
+### plugins
+
+| Alias | Command        |
+| ----- | -------------- |
+| hp    | heroku plugins |
+
+### log
+
+| Alias | Command         |
+| ----- | --------------- |
+| hg    | heroku logs     |
+| hgt   | heroku log tail |
+
+### database
+
+| Alias | Command                    |
+| ----- | -------------------------- |
+| hpg   | heroku pg                  |
+| hpsql | heroku pg:psql             |
+| hpb   | heroku pg:backups          |
+| hpbc  | heroku pg:backups:capture  |
+| hpbd  | heroku pg:backups:download |
+| hpbr  | heroku pg:backups:restore  |
+
+### certs
+
+| Alias | Command             |
+| ----- | ------------------- |
+| hssl  | heroku certs        |
+| hssli | heroku certs:info   |
+| hssla | heroku certs:add    |
+| hsslu | heroku certs:update |
+| hsslr | heroku certs:remove |
diff --git a/zsh/plugins/heroku-alias/heroku-alias.plugin.zsh b/zsh/plugins/heroku-alias/heroku-alias.plugin.zsh
new file mode 100644
index 0000000..7daf715
--- /dev/null
+++ b/zsh/plugins/heroku-alias/heroku-alias.plugin.zsh
@@ -0,0 +1,92 @@
+# general
+alias h='heroku'
+alias hauto='heroku autocomplete $(echo $SHELL)'
+alias hl='heroku local'
+
+# log
+alias hg='heroku logs'
+alias hgt='heroku log tail'
+
+# database
+alias hpg='heroku pg'
+alias hpsql='heroku pg:psql'
+alias hpb='heroku pg:backups'
+alias hpbc='heroku pg:backups:capture'
+alias hpbd='heroku pg:backups:download'
+alias hpbr='heroku pg:backups:restore'
+
+# config
+alias hc='heroku config'
+alias hca='heroku config -a'
+alias hcr='heroku config -r'
+alias hcs='heroku config:set'
+alias hcu='heroku config:unset'
+
+# this function allow to load multi env set in a file
+hcfile() {
+  echo 'Which platform [-r/a name] ?'
+  read platform
+  echo 'Which file ?'
+  read file
+  while read line;
+    do heroku config:set "$platform" "$line";
+  done < "$file"
+}
+
+# apps and favorites
+alias ha='heroku apps'
+alias hpop='heroku create'
+alias hkill='heroku apps:destroy'
+alias hlog='heroku apps:errors'
+alias hfav='heroku apps:favorites'
+alias hfava='heroku apps:favorites:add'
+alias hfavr='heroku apps:favorites:remove'
+alias hai='heroku apps:info'
+alias hair='heroku apps:info -r'
+alias haia='heroku apps:info -a'
+
+# auth
+alias h2fa='heroku auth:2fa'
+alias h2far='heroku auth:2fa:disable'
+
+# access
+alias hac='heroku access'
+alias hacr='heroku access -r'
+alias haca='heroku access -a'
+alias hadd='heroku access:add'
+alias hdel='heroku access:remove'
+alias hup='heroku access:update'
+
+# addons
+alias hads='heroku addons -A'
+alias hada='heroku addons -a'
+alias hadr='heroku addons -r'
+alias hadat='heroku addons:attach'
+alias hadc='heroku addons:create'
+alias hadel='heroku addons:destroy'
+alias hadde='heroku addons:detach'
+alias hadoc='heroku addons:docs'
+
+# login
+alias hin='heroku login'
+alias hout='heroku logout'
+alias hi='heroku login -i'
+alias hwho='heroku auth:whoami'
+
+# authorizations
+alias hth='heroku authorizations'
+alias hthadd='heroku authorizations:create'
+alias hthif='heroku authorizations:info'
+alias hthdel='heroku authorizations:revoke'
+alias hthrot='heroku authorizations:rotate'
+alias hthup='heroku authorizations:update'
+
+# plugins
+alias hp='heroku plugins'
+
+# cert
+alias hssl='heroku certs'
+alias hssli='heroku certs:info'
+alias hssla='heroku certs:add'
+alias hsslu='heroku certs:update'
+alias hsslr='heroku certs:remove'
diff --git a/zsh/plugins/history-substring-search/README.md b/zsh/plugins/history-substring-search/README.md
index 6d8b564..49bed52 100644
--- a/zsh/plugins/history-substring-search/README.md
+++ b/zsh/plugins/history-substring-search/README.md
@@ -23,7 +23,15 @@ Install
 Using the [Homebrew]( https://brew.sh ) package manager:
 
     brew install zsh-history-substring-search
-    echo 'source /usr/local/share/zsh-history-substring-search/zsh-history-substring-search.zsh' >> ~/.zshrc
+    echo 'source $(brew --prefix)/share/zsh-history-substring-search/zsh-history-substring-search.zsh' >> ~/.zshrc
+
+Using [Fig](https://fig.io):
+
+Fig adds apps, shortcuts, and autocomplete to your existing terminal.
+
+Install `zsh-history-substring-search` in just one click.
+
+<a href="https://fig.io/plugins/other/zsh-history-substring-search" target="_blank"><img src="https://fig.io/badges/install-with-fig.svg" /></a>
 
 Using [Oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh):
 
@@ -33,24 +41,63 @@ Using [Oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh):
 
 2. Activate the plugin in `~/.zshrc`:
 
-        plugins=( [plugins...] history-substring-search)
+        plugins=( [plugins...] zsh-history-substring-search)
 
-3. Source `~/.zshrc`  to take changes into account:
+3. Run `exec zsh`  to take changes into account:
 
-        source ~/.zshrc
+        exec zsh
+
+Using [zplug](https://github.com/zplug/zplug):
+
+1. Add this repo to `~/.zshrc`:
+
+        zplug "zsh-users/zsh-history-substring-search", as: plugin
+
+Using [antigen](https://github.com/zsh-users/antigen):
+
+1. Add the `antigen bundle` command just before `antigen apply`, like this:
+
+``` 
+antigen bundle zsh-users/zsh-history-substring-search
+antigen apply
+```
+ 
+2. Then, **after** `antigen apply`, add the key binding configurations, like this:
+ 
+```
+# zsh-history-substring-search configuration
+bindkey '^[[A' history-substring-search-up # or '\eOA'
+bindkey '^[[B' history-substring-search-down # or '\eOB'
+HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=1
+```
+
+Using [Zinit](https://github.com/zdharma-continuum/zinit):
+
+1. Use the `Oh-my-zsh` Zinit snippet in `~/.zshrc`:
+
+        zinit snippet OMZ::plugins/git/git.plugin.zsh`
+
+2. Load the plugin in `~/.zshrc`:
+
+        zinit load 'zsh-users/zsh-history-substring-search'
+        zinit ice wait atload'_history_substring_search_config'
+
+3. Run `exec zsh` to take changes into account:
+
+        exec zsh
 
 Usage
 ------------------------------------------------------------------------------
 
 1.  Load this script into your interactive ZSH session:
 
-        % source zsh-history-substring-search.zsh
+        source zsh-history-substring-search.zsh
 
     If you want to use [zsh-syntax-highlighting][6] along with this script,
     then make sure that you load it *before* you load this script:
 
-        % source zsh-syntax-highlighting.zsh
-        % source zsh-history-substring-search.zsh
+        source zsh-syntax-highlighting.zsh
+        source zsh-history-substring-search.zsh
 
 2.  Bind keyboard shortcuts to this script's functions.
 
@@ -73,6 +120,10 @@ Usage
           bindkey "$terminfo[kcuu1]" history-substring-search-up
           bindkey "$terminfo[kcud1]" history-substring-search-down
 
+      Users have also observed that `[OA` and `[OB` are correct values, 
+      _even if_ these were not the observed values. If you are having trouble
+      with the observed values, give these a try.
+
       You might also want to bind the Control-P/N keys for use in EMACS mode:
 
           bindkey -M emacs '^P' history-substring-search-up
@@ -115,7 +166,7 @@ Configuration
 ------------------------------------------------------------------------------
 
 This script defines the following global variables. You may override their
-default values only after having loaded this script into your ZSH session.
+default values.
 
 * `HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND` is a global variable that defines
   how the query should be highlighted inside a matching command. Its default
@@ -141,6 +192,12 @@ default values only after having loaded this script into your ZSH session.
   value, causes this script to perform a fuzzy search by words, matching in
   given order e.g. `ab c` will match `*ab*c*`
 
+* `HISTORY_SUBSTRING_SEARCH_PREFIXED` is a global variable that defines how
+  the command history will be searched for your query. If set to a non-empty
+  value, your query will be matched against the start of each history entry.
+  For example, if this variable is empty, `ls` will match `ls -l` and `echo
+  ls`; if it is non-empty, `ls` will only match `ls -l`.
+
 * `HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE` is a global variable that defines
   whether all search results returned are _unique_. If set to a non-empty
   value, then only unique search results are presented. This behaviour is off
@@ -155,6 +212,9 @@ default values only after having loaded this script into your ZSH session.
   receive globally unique search results only once, then use this
   configuration variable, or use `setopt HIST_IGNORE_ALL_DUPS`.
 
+* `HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT` is a global variable that
+  defines a timeout in seconds for clearing the search highlight.
+
 
 History
 ------------------------------------------------------------------------------
@@ -175,24 +235,17 @@ History
 
 * March 2016: Geza Lore (@gezalore) greatly refactored it in pull request #55.
 
-------------------------------------------------------------------------------
-Oh My Zsh Distribution Notes
-------------------------------------------------------------------------------
+---
 
-What you are looking at now is Oh My Zsh's repackaging of zsh-history-substring-search 
-as an OMZ module inside the Oh My Zsh distribution.
+## Oh My Zsh Distribution Notes
 
-The upstream repo, zsh-users/zsh-history-substring-search, can be found on GitHub at 
+What you are looking at now is Oh My Zsh's repackaging of zsh-history-substring-search as an OMZ module inside
+the Oh My Zsh distribution.
+
+The upstream repo, zsh-users/zsh-history-substring-search, can be found on GitHub at
 https://github.com/zsh-users/zsh-history-substring-search.
 
-This downstream copy was last updated from the following upstream commit:
-
-  SHA:          0f80b8eb3368b46e5e573c1d91ae69eb095db3fb
-  Commit date:  2019-05-12 17:35:54 -0700
-
-Everything above this section is a copy of the original upstream's README, so things
-may differ slightly when you're using this inside OMZ. In particular, you do not
-need to set up key bindings for the up and down arrows yourself in `~/.zshrc`; the OMZ 
-plugin does that for you. You may still want to set up additional emacs- or vi-specific
-bindings as mentioned above.
-
+Everything above this section is a copy of the original upstream's README, so things may differ slightly when
+you're using this inside OMZ. In particular, you do not need to set up key bindings for the up and down arrows
+yourself in `~/.zshrc`; the OMZ plugin does that for you. You may still want to set up additional emacs- or
+vi-specific bindings as mentioned above.
diff --git a/zsh/plugins/history-substring-search/dependencies/OMZ-README.md b/zsh/plugins/history-substring-search/dependencies/OMZ-README.md
new file mode 100644
index 0000000..c5967bb
--- /dev/null
+++ b/zsh/plugins/history-substring-search/dependencies/OMZ-README.md
@@ -0,0 +1,15 @@
+
+---
+
+## Oh My Zsh Distribution Notes
+
+What you are looking at now is Oh My Zsh's repackaging of zsh-history-substring-search as an OMZ module inside
+the Oh My Zsh distribution.
+
+The upstream repo, zsh-users/zsh-history-substring-search, can be found on GitHub at
+https://github.com/zsh-users/zsh-history-substring-search.
+
+Everything above this section is a copy of the original upstream's README, so things may differ slightly when
+you're using this inside OMZ. In particular, you do not need to set up key bindings for the up and down arrows
+yourself in `~/.zshrc`; the OMZ plugin does that for you. You may still want to set up additional emacs- or
+vi-specific bindings as mentioned above.
diff --git a/zsh/plugins/history-substring-search/history-substring-search.plugin.zsh b/zsh/plugins/history-substring-search/history-substring-search.plugin.zsh
index 63f0bdd..c7c4235 100644
--- a/zsh/plugins/history-substring-search/history-substring-search.plugin.zsh
+++ b/zsh/plugins/history-substring-search/history-substring-search.plugin.zsh
@@ -3,6 +3,13 @@
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
+# Respect case sensitivity settings for globbing in history search
+if [[ "$CASE_SENSITIVE" = true ]]; then
+  : ${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS=''}
+else
+  : ${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'}
+fi
+
 source ${0:A:h}/history-substring-search.zsh
 
 
@@ -16,4 +23,3 @@ if [[ -n "$terminfo[kcud1]" ]]; then
   bindkey -M emacs "$terminfo[kcud1]" history-substring-search-down
   bindkey -M viins "$terminfo[kcud1]" history-substring-search-down
 fi
-
diff --git a/zsh/plugins/history-substring-search/history-substring-search.zsh b/zsh/plugins/history-substring-search/history-substring-search.zsh
index c326778..2137b79 100644
--- a/zsh/plugins/history-substring-search/history-substring-search.zsh
+++ b/zsh/plugins/history-substring-search/history-substring-search.zsh
@@ -43,11 +43,12 @@
 # declare global configuration variables
 #-----------------------------------------------------------------------------
 
-typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'
-typeset -g HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'
-typeset -g HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'
-typeset -g HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=''
-typeset -g HISTORY_SUBSTRING_SEARCH_FUZZY=''
+: ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_FOUND='bg=magenta,fg=white,bold'}
+: ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_NOT_FOUND='bg=red,fg=white,bold'}
+: ${HISTORY_SUBSTRING_SEARCH_GLOBBING_FLAGS='i'}
+: ${HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=''}
+: ${HISTORY_SUBSTRING_SEARCH_FUZZY=''}
+: ${HISTORY_SUBSTRING_SEARCH_PREFIXED=''}
 
 #-----------------------------------------------------------------------------
 # declare internal global variables
@@ -64,6 +65,7 @@ typeset -g -i _history_substring_search_raw_match_index
 typeset -g -a _history_substring_search_matches
 typeset -g -i _history_substring_search_match_index
 typeset -g -A _history_substring_search_unique_filter
+typeset -g -i _history_substring_search_zsh_5_9
 
 #-----------------------------------------------------------------------------
 # the main ZLE widgets
@@ -97,6 +99,11 @@ zle -N history-substring-search-down
 #-----------------------------------------------------------------------------
 
 zmodload -F zsh/parameter
+autoload -Uz is-at-least
+
+if is-at-least 5.9 $ZSH_VERSION; then
+  _history_substring_search_zsh_5_9=1
+fi
 
 #
 # We have to "override" some keys and widgets if the
@@ -117,80 +124,125 @@ if [[ $+functions[_zsh_highlight] -eq 0 ]]; then
   }
 
   #
-  # The following snippet was taken from the zsh-syntax-highlighting project:
+  # Check if $1 denotes the name of a callable function, i.e. it is fully
+  # defined or it is marked for autoloading and autoloading it at the first
+  # call to it will succeed. In particular, if $1 has been marked for
+  # autoloading but is not available in $fpath, then it will return 1 (false).
   #
-  # https://github.com/zsh-users/zsh-syntax-highlighting/blob/56b134f5d62ae3d4e66c7f52bd0cc2595f9b305b/zsh-syntax-highlighting.zsh#L126-161
+  # This is based on the zsh-syntax-highlighting plugin.
   #
-  # Copyright (c) 2010-2011 zsh-syntax-highlighting contributors
-  # All rights reserved.
+  _history-substring-search-function-callable() {
+    if (( ${+functions[$1]} )) && ! [[ "$functions[$1]" == *"builtin autoload -X"* ]]; then
+      return 0 # already fully loaded
+    else
+      # "$1" is either an autoload stub, or not a function at all.
+      # 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
+  }
+
   #
-  # Redistribution and use in source and binary forms, with or without
-  # modification, are permitted provided that the following conditions are
-  # met:
+  # The zsh-syntax-highlighting plugin uses zle-line-pre-redraw hook instead
+  # of the legacy "bind all widgets" if 1) zsh has the memo= feature (added in
+  # version 5.9) and 2) add-zle-hook-widget is available.
   #
-  #  * Redistributions of source code must retain the above copyright
-  #    notice, this list of conditions and the following disclaimer.
-  #
-  #  * Redistributions in binary form must reproduce the above copyright
-  #    notice, this list of conditions and the following disclaimer in the
-  #    documentation and/or other materials provided with the distribution.
-  #
-  #  * Neither the name of the zsh-syntax-highlighting contributors nor the
-  #    names of its contributors may be used to endorse or promote products
-  #    derived from this software without specific prior written permission.
-  #
-  # THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS
-  # IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO,
-  # THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-  # PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR
-  # CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
-  # EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
-  # PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
-  # PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
-  # LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
-  # NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-  # SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-  #
-  #--------------8<-------------------8<-------------------8<-----------------
-  # Rebind all ZLE widgets to make them invoke _zsh_highlights.
-  _zsh_highlight_bind_widgets()
-  {
-    # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
-    zmodload zsh/zleparameter 2>/dev/null || {
-      echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2
-      return 1
+  if [[ $_history_substring_search_zsh_5_9 -eq 1 ]] && _history-substring-search-function-callable add-zle-hook-widget; then
+    #
+    # The following code is based on the zsh-syntax-highlighting plugin.
+    #
+    autoload -U add-zle-hook-widget
+
+    _history-substring-search-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
+      }
     }
 
-    # Override ZLE widgets to make them invoke _zsh_highlight.
-    local cur_widget
-    for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do
-      case $widgets[$cur_widget] in
+    _history-substring-search-zle-line-pre-redraw() {
+      #
+      # If the zsh-syntax-highlighting plugin has been loaded (after our plugin
+      # plugin, otherwise this hook wouldn't be called), remove our hooks.
+      #
+      if [[ $+ZSH_HIGHLIGHT_VERSION -eq 1 ]]; then
+        autoload -U add-zle-hook-widget
+        add-zle-hook-widget -d zle-line-pre-redraw _history-substring-search-zle-line-pre-redraw
+        add-zle-hook-widget -d zle-line-finish _history-substring-search-zle-line-finish
+        return 0
+      fi
+      #
+      # 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 "$@"
+    }
 
-        # Already rebound event: do nothing.
-        user:$cur_widget|user:_zsh_highlight_widget_*);;
+    if [[ -o zle ]]; then
+      add-zle-hook-widget zle-line-pre-redraw _history-substring-search-zle-line-pre-redraw
+      add-zle-hook-widget zle-line-finish _history-substring-search-zle-line-finish
+    fi
+  else
+    #
+    # The following snippet was taken from the zsh-syntax-highlighting project:
+    # https://github.com/zsh-users/zsh-syntax-highlighting/blob/56b134f5d62ae3d4e66c7f52bd0cc2595f9b305b/zsh-syntax-highlighting.zsh#L126-161
+    #
+    # SPDX-SnippetBegin
+    # SPDX-License-Identifier: BSD-3-Clause
+    # SPDX-SnippetCopyrightText: 2010-2011 zsh-syntax-highlighting contributors
+    #--------------8<-------------------8<-------------------8<-----------------
+    # Rebind all ZLE widgets to make them invoke _zsh_highlights.
+    _zsh_highlight_bind_widgets()
+    {
+      # Load ZSH module zsh/zleparameter, needed to override user defined widgets.
+      zmodload zsh/zleparameter 2>/dev/null || {
+        echo 'zsh-syntax-highlighting: failed loading zsh/zleparameter.' >&2
+        return 1
+      }
 
-        # User defined widget: override and rebind old one with prefix "orig-".
-        user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
-                      _zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
-                      zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+      # Override ZLE widgets to make them invoke _zsh_highlight.
+      local cur_widget
+      for cur_widget in ${${(f)"$(builtin zle -la)"}:#(.*|_*|orig-*|run-help|which-command|beep|yank*)}; do
+        case $widgets[$cur_widget] in
 
-        # Completion widget: override and rebind old one with prefix "orig-".
-        completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \
-                            _zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
-                            zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+          # Already rebound event: do nothing.
+          user:$cur_widget|user:_zsh_highlight_widget_*);;
 
-        # Builtin widget: override and make it call the builtin ".widget".
-        builtin) eval "_zsh_highlight_widget_$cur_widget() { builtin zle .$cur_widget -- \"\$@\" && _zsh_highlight }; \
-                       zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+          # User defined widget: override and rebind old one with prefix "orig-".
+          user:*) eval "zle -N orig-$cur_widget ${widgets[$cur_widget]#*:}; \
+                        _zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
+                        zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
 
-        # Default: unhandled case.
-        *) echo "zsh-syntax-highlighting: unhandled ZLE widget '$cur_widget'" >&2 ;;
-      esac
-    done
-  }
-  #-------------->8------------------->8------------------->8-----------------
+          # Completion widget: override and rebind old one with prefix "orig-".
+          completion:*) eval "zle -C orig-$cur_widget ${${widgets[$cur_widget]#*:}/:/ }; \
+                              _zsh_highlight_widget_$cur_widget() { builtin zle orig-$cur_widget -- \"\$@\" && _zsh_highlight }; \
+                              zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
 
-  _zsh_highlight_bind_widgets
+          # Builtin widget: override and make it call the builtin ".widget".
+          builtin) eval "_zsh_highlight_widget_$cur_widget() { builtin zle .$cur_widget -- \"\$@\" && _zsh_highlight }; \
+                         zle -N $cur_widget _zsh_highlight_widget_$cur_widget";;
+
+          # Default: unhandled case.
+          *) echo "zsh-syntax-highlighting: unhandled ZLE widget '$cur_widget'" >&2 ;;
+        esac
+      done
+    }
+    #-------------->8------------------->8------------------->8-----------------
+    # SPDX-SnippetEnd
+
+    _zsh_highlight_bind_widgets
+  fi
+
+  unfunction _history-substring-search-function-callable
 fi
 
 _history-substring-search-begin() {
@@ -243,10 +295,17 @@ _history-substring-search-begin() {
     fi
 
     #
-    # Escape and join query parts with wildcard character '*' as separator
-    # `(j:CHAR:)` join array to string with CHAR as separator
+    # Escape and join query parts with wildcard character '*' as seperator
+    # `(j:CHAR:)` join array to string with CHAR as seperator
     #
-    local search_pattern="*${(j:*:)_history_substring_search_query_parts[@]//(#m)[\][()|\\*?#<>~^]/\\$MATCH}*"
+    local search_pattern="${(j:*:)_history_substring_search_query_parts[@]//(#m)[\][()|\\*?#<>~^]/\\$MATCH}*"
+
+    #
+    # Support anchoring history search to the beginning of the command
+    #
+    if [[ -z $HISTORY_SUBSTRING_SEARCH_PREFIXED ]]; then
+      search_pattern="*${search_pattern}"
+    fi
 
     #
     # Find all occurrences of the search pattern in the history file.
@@ -304,12 +363,21 @@ _history-substring-search-begin() {
 _history-substring-search-end() {
   setopt localoptions extendedglob
 
+  local highlight_memo=
   _history_substring_search_result=$BUFFER
 
+  if [[ $_history_substring_search_zsh_5_9 -eq 1 ]]; then
+    highlight_memo='memo=history-substring-search'
+  fi
+
   # the search was successful so display the result properly by clearing away
   # existing highlights and moving the cursor to the end of the result buffer
   if [[ $_history_substring_search_refresh_display -eq 1 ]]; then
-    region_highlight=()
+    if [[ -n $highlight_memo ]]; then
+      region_highlight=( "${(@)region_highlight:#*${highlight_memo}*}" )
+    else
+      region_highlight=()
+    fi
     CURSOR=${#BUFFER}
   fi
 
@@ -329,14 +397,33 @@ _history-substring-search-end() {
       if [[ $query_part_match_index -le ${#BUFFER:$highlight_start_index} ]]; then
         highlight_start_index=$(( $highlight_start_index + $query_part_match_index ))
         highlight_end_index=$(( $highlight_start_index + ${#query_part} ))
-        region_highlight+=("$(($highlight_start_index - 1)) $(($highlight_end_index - 1)) $_history_substring_search_query_highlight")
+        region_highlight+=(
+          "$(($highlight_start_index - 1)) $(($highlight_end_index - 1)) ${_history_substring_search_query_highlight}${highlight_memo:+,$highlight_memo}"
+        )
       fi
     done
   fi
 
   # For debugging purposes:
   # zle -R "mn: "$_history_substring_search_match_index" m#: "${#_history_substring_search_matches}
-  # read -k -t 200 && zle -U $REPLY
+  # read -k -t 200 && zle -U -- "$REPLY"
+
+  #
+  # When this function returns, z-sy-h runs its line-pre-redraw hook. It has no
+  # logic for determining highlight priority, when two different memo= marked
+  # region highlights overlap; instead, it always prioritises itself. Below is
+  # a workaround for dealing with it.
+  #
+  if [[ $_history_substring_search_zsh_5_9 -eq 1 ]]; then
+    zle -R
+    #
+    # After line redraw with desired highlight, wait for timeout or user input
+    # before removing search highlight and exiting. This ensures no highlights
+    # are left lingering after search is finished.
+    #
+    read -k -t ${HISTORY_SUBSTRING_SEARCH_HIGHLIGHT_TIMEOUT:-1} && zle -U -- "$REPLY"
+    region_highlight=( "${(@)region_highlight:#*${highlight_memo}*}" )
+  fi
 
   # Exit successfully from the history-substring-search-* widgets.
   return 0
diff --git a/zsh/plugins/history-substring-search/update-from-upstream.zsh b/zsh/plugins/history-substring-search/update-from-upstream.zsh
deleted file mode 100755
index 81e1942..0000000
--- a/zsh/plugins/history-substring-search/update-from-upstream.zsh
+++ /dev/null
@@ -1,129 +0,0 @@
-#!/usr/bin/env zsh
-#
-# update-from-upstream.zsh
-#
-# This script updates the Oh My Zsh version of the zsh-history-substring-search
-# plugin from the independent upstream repo. This is to be run by OMZ developers
-# when they want to pull in new changes from upstream to OMZ. It is not run
-# during normal use of the plugin.
-#
-# The official upstream repo is zsh-users/zsh-history-substring-search
-# https://github.com/zsh-users/zsh-history-substring-search
-#
-# This is a zsh script, not a function. Call it with `zsh update-from-upstream.zsh`
-# from the command line, running it from within the plugin directory.
-#
-# You can set the environment variable REPO_PATH to point it at an upstream
-# repo you have already prepared. Otherwise, it will do a clean checkout of
-# upstream's HEAD to a temporary local repo and use that.
-
-
-# Just bail on any error so we don't have to do extra checking.
-# This is a developer-use script, so terse output like that should
-# be fine.
-set -e
-
-
-upstream_basename=zsh-history-substring-search
-plugin_basename=history-substring-search
-UPSTREAM_REPO=zsh-users/$upstream_basename
-need_repo_cleanup=false
-upstream_github_url="https://github.com/$UPSTREAM_REPO"
-
-if [[ -z "$UPSTREAM_REPO_PATH" ]]; then
-  # Do a clean checkout
-  my_tempdir=$(mktemp -d -t omz-update-histsubstrsrch)
-  UPSTREAM_REPO_PATH="$my_tempdir/$upstream_basename"
-  git clone "$upstream_github_url" "$UPSTREAM_REPO_PATH"
-  need_repo_cleanup=true
-  print "Checked out upstream repo to $UPSTREAM_REPO_PATH"
-else
-	print "Using existing $upstream_basename repo at $UPSTREAM_REPO_PATH"
-fi
-
-upstream="$UPSTREAM_REPO_PATH"
-
-# Figure out what we're pulling in
-upstream_sha=$(cd $upstream && git rev-parse HEAD)
-upstream_commit_date=$(cd $upstream && git log  -1 --pretty=format:%ci)
-upstream_just_date=${${=upstream_commit_date}[1]}
-print "upstream SHA:         $upstream_sha"
-print "upstream commit time: $upstream_commit_date"
-print "upstream commit date: $upstream_just_date"
-print
-
-# Copy the files over, using the OMZ plugin's names where needed
-cp -v "$upstream"/* .
-mv -v zsh-history-substring-search.zsh $plugin_basename.zsh
-mv -v zsh-history-substring-search.plugin.zsh $plugin_basename.plugin.zsh
-
-if [[ $need_repo_cleanup == true ]]; then
-	print "Removing temporary repo at $my_tempdir"
-	rm -rf "$my_tempdir"
-fi
-
-# Do OMZ-specific edits
-
-print
-print "Updating files with OMZ-specific stuff"
-print
-
-# OMZ binds the keys as part of the plugin loading
-
-cat >> $plugin_basename.plugin.zsh <<EOF
-
-
-# Bind terminal-specific up and down keys
-
-if [[ -n "\$terminfo[kcuu1]" ]]; then
-  bindkey -M emacs "\$terminfo[kcuu1]" history-substring-search-up
-  bindkey -M viins "\$terminfo[kcuu1]" history-substring-search-up
-fi
-if [[ -n "\$terminfo[kcud1]" ]]; then
-  bindkey -M emacs "\$terminfo[kcud1]" history-substring-search-down
-  bindkey -M viins "\$terminfo[kcud1]" history-substring-search-down
-fi
-
-EOF
-
-# Tack OMZ-specific notes on to readme
-
-thin_line="------------------------------------------------------------------------------"
-cat >> README.md <<EOF
-
-$thin_line
-Oh My Zsh Distribution Notes
-$thin_line
-
-What you are looking at now is Oh My Zsh's repackaging of zsh-history-substring-search 
-as an OMZ module inside the Oh My Zsh distribution.
-
-The upstream repo, $UPSTREAM_REPO, can be found on GitHub at 
-$upstream_github_url.
-
-This downstream copy was last updated from the following upstream commit:
-
-  SHA:          $upstream_sha
-  Commit date:  $upstream_commit_date
-
-Everything above this section is a copy of the original upstream's README, so things
-may differ slightly when you're using this inside OMZ. In particular, you do not
-need to set up key bindings for the up and down arrows yourself in \`~/.zshrc\`; the OMZ 
-plugin does that for you. You may still want to set up additional emacs- or vi-specific
-bindings as mentioned above.
-
-EOF
-
-# Announce success and generate git commit messages
-
-cat <<EOF
-Done OK
-
-Now you can check the results and commit like this:
-
-  git add *
-  git commit -m "history-substring-search: update to upstream version $upstream_just_date" \\
-      -m "Updates OMZ's copy to commit $upstream_sha from $UPSTREAM_REPO"
-
-EOF
-
diff --git a/zsh/plugins/history/README.md b/zsh/plugins/history/README.md
index a9d480f..73d6a50 100644
--- a/zsh/plugins/history/README.md
+++ b/zsh/plugins/history/README.md
@@ -13,5 +13,6 @@ plugins=(... history)
 | Alias | Command              | Description                                                      |
 |-------|----------------------|------------------------------------------------------------------|
 | `h`   | `history`            | Prints your command history                                      |
+| `hl`  | `history \| less`    | Pipe history output to less to search and navigate it easily     |
 | `hs`  | `history \| grep`    | Use grep to search your command history                          |
 | `hsi` | `history \| grep -i` | Use grep to do a case-insensitive search of your command history |
diff --git a/zsh/plugins/history/history.plugin.zsh b/zsh/plugins/history/history.plugin.zsh
index 9cee48f..fb3e313 100644
--- a/zsh/plugins/history/history.plugin.zsh
+++ b/zsh/plugins/history/history.plugin.zsh
@@ -1,3 +1,4 @@
 alias h='history'
+alias hl='history | less'
 alias hs='history | grep'
 alias hsi='history | grep -i'
diff --git a/zsh/plugins/hitchhiker/fortunes/hitchhiker b/zsh/plugins/hitchhiker/fortunes/hitchhiker
index 825b86c..6620a2a 100644
--- a/zsh/plugins/hitchhiker/fortunes/hitchhiker
+++ b/zsh/plugins/hitchhiker/fortunes/hitchhiker
@@ -42,7 +42,7 @@
 
 - Zaphod.
 %
-"`In those days spirits were brave, the stakes were high, men were REAL men, women were REAL women, and small furry creatures from Alpha Centauri were REAL small furry creatures from Aplha Centauri.'"
+"`In those days spirits were brave, the stakes were high, men were REAL men, women were REAL women, and small furry creatures from Alpha Centauri were REAL small furry creatures from Alpha Centauri.'"
 
 - The Book getting all nostalgic.
 %
@@ -80,7 +80,7 @@
 %
 "The fronting for the eighty-yard-long marble-topped bar had been made by stitching together nearly twenty thousand Antarean Mosaic Lizard skins, despite the fact that the twenty thousand lizards concerned had needed them to keep their insides in."
 
-- The Book decribing Milliways' politically incorrect decor.
+- The Book describing Milliways' politically incorrect decor.
 %
 "`...and the Universe,' continued the waiter, determined not to be deflected on his home stretch, `will explode later for your pleasure.' Ford's head swivelled slowly towards him. He spoke with feeling. `Wow,' he said, `What sort of drinks do you serve in this place?' The waiter laughed a polite little waiter's laugh. `Ah,' he said, `I think sir has perhaps misunderstood me.' `Oh, I hope not,' breathed Ford."
 
@@ -104,7 +104,7 @@
 %
 "`The first ten million years were the worst,' said Marvin, `and the second ten million, they were the worst too. The third ten million I didn't enjoy at all. After that I went into a bit of a decline.'"
 
-- Marvin reflecting back on his 576,000,003,579 year career as Milliways' car park attendent.
+- Marvin reflecting back on his 576,000,003,579 year career as Milliways' car park attendant.
 %
 "`Incidentally,' he said, `what does teleport mean?' Another moment passed. Slowly, the others turned to face him. `Probably the wrong moment to ask,' said Arthur, `It's just I remember you use the word a short while ago and I only bring it up because...' `Where,' said Ford quietly, `does it say teleport?' `Well, just over here in fact,' said Arthur, pointing at a dark control box in the rear of the cabin, `Just under the word "emergency", above the word "system" and beside the sign saying "out of order".'"
 
@@ -122,7 +122,7 @@
 
 - Ford "debating" what to do with fire with a marketing girl.
 %
-"The story goes that I first had the idea for THHGTTG while lying drunk in a field in Innsbruck (or `Spain' as the BBC TV publicity department authoritatively has it, probably because it's easier to spell)." - Foreward by DNA.
+"The story goes that I first had the idea for THHGTTG while lying drunk in a field in Innsbruck (or `Spain' as the BBC TV publicity department authoritatively has it, probably because it's easier to spell)." - Foreword by DNA.
 
 FORD 	Six pints of bitter. And quickly please, the world's about to 	end. BARMAN	Oh yes, sir? Nice weather for it.
 %
@@ -162,7 +162,7 @@ ARTHUR	It probably seems a terrible thing to say, but you 	know what I sometimes
 
 - Arthur discovering a way of coping with life on Prehistoric Earth.
 %
-"`... then I decided that I was a lemon for a couple of weeks. I kept myself amused all that time jumping in and out of a gin and tonic.' Arthur cleared his throat, and then did it again. `Where,' he said, `did you...?' `Find a gin and tonic?' said Ford brightly. `I found a small lake that thought it was a gin and tonic, and jumped in and out of that. At least, I think it thought it was a gin and tonic.' `I may,' he addded with a grin which would have sent sane men scampering into the trees, `have been imagining it.'"
+"`... then I decided that I was a lemon for a couple of weeks. I kept myself amused all that time jumping in and out of a gin and tonic.' Arthur cleared his throat, and then did it again. `Where,' he said, `did you...?' `Find a gin and tonic?' said Ford brightly. `I found a small lake that thought it was a gin and tonic, and jumped in and out of that. At least, I think it thought it was a gin and tonic.' `I may,' he added with a grin which would have sent sane men scampering into the trees, `have been imagining it.'"
 
 - Ford updating Arthur about what he's been doing for the past four years.
 %
@@ -194,31 +194,31 @@ ARTHUR	It probably seems a terrible thing to say, but you 	know what I sometimes
 
 - One of the more preferable pieces of advice contained in the Guide.
 %
-"His eyes seemed to be popping out of his head. He wasn't certain if this was because they were trying to see more clearly, or if they simply wanted to leave at this point."QUOTEHERESTRINGMAGIC1234- Arthur trying to see who had diverted him from going to a party.
+"His eyes seemed to be popping out of his head. He wasn't certain if this was because they were trying to see more clearly, or if they simply wanted to leave at this point." - Arthur trying to see who had diverted him from going to a party.
 %
-"Arthur yawed wildly as his skin tried to jump one way and his skeleton the other, whilst his brain tried to work out which of his ears it most wanted to crawl out of. `Bet you weren't expecting to see me again,' said the monster, which Arthur couldn't help thinking was a strange remark for it to make, seeing as he had never met the creature before. He could tell that he hadn't met the creature before from the simple fact that he was able to sleep at nights."QUOTEHERESTRINGMAGIC1234- Arthur discovering who had diverted him from going to a party.
+"Arthur yawed wildly as his skin tried to jump one way and his skeleton the other, whilst his brain tried to work out which of his ears it most wanted to crawl out of. `Bet you weren't expecting to see me again,' said the monster, which Arthur couldn't help thinking was a strange remark for it to make, seeing as he had never met the creature before. He could tell that he hadn't met the creature before from the simple fact that he was able to sleep at nights." - Arthur discovering who had diverted him from going to a party.
 %
-"`That young girl is one of the least benightedly unintelligent organic life forms it has been my profound lack of pleasure not to be able to avoid meeting.'"QUOTEHERESTRINGMAGIC1234- Marvin's first ever compliment about anybody.
+"`That young girl is one of the least benightedly unintelligent organic life forms it has been my profound lack of pleasure not to be able to avoid meeting.'" - Marvin's first ever compliment about anybody.
 %
-"Arthur hoped and prayed that there wasn't an afterlife. Then he realised there was a contradiction there and merely hoped that there wasn't an afterlife."QUOTEHERESTRINGMAGIC1234- Arthur realising that he's in a certain death situation with a supernova bomb that is shaped like a cricket ball.
+"Arthur hoped and prayed that there wasn't an afterlife. Then he realised there was a contradiction there and merely hoped that there wasn't an afterlife." - Arthur realising that he's in a certain death situation with a supernova bomb that is shaped like a cricket ball.
 %
-"`Credit?' he said. `Aaaargggh...' These two words are usually coupled together in the Old Pink Dog Bar."QUOTEHERESTRINGMAGIC1234- Ford in a spot of bother.
+"`Credit?' he said. `Aaaargggh...' These two words are usually coupled together in the Old Pink Dog Bar." - Ford in a spot of bother.
 %
-"`...we might as well start with where your hand is now.' Arthur said, `So which way do I go?' `Down,' said Fenchurch, `on this occasion.' He moved his hand. `Down,' she said, `is in fact the other way.' `Oh yes.'"QUOTEHERESTRINGMAGIC1234- Arthur trying to discover which part of Fenchurch is wrong.
+"`...we might as well start with where your hand is now.' Arthur said, `So which way do I go?' `Down,' said Fenchurch, `on this occasion.' He moved his hand. `Down,' she said, `is in fact the other way.' `Oh yes.'" - Arthur trying to discover which part of Fenchurch is wrong.
 %
-"There was a point to this story, but it has temporarily escaped the chronicler's mind."QUOTEHERESTRINGMAGIC1234- This line perhaps best sums up the whole book.
+"There was a point to this story, but it has temporarily escaped the chronicler's mind." - This line perhaps best sums up the whole book.
 %
-"The last time anybody made a list of the top hundred character attributes of New Yorkers, common sense snuck in at number 79. .... When it's fall in New York, the air smells as if someone's been frying goats in it, and if you are keen to breathe the best plan is to open a window and stick your head in a building."QUOTEHERESTRINGMAGIC1234- Nuff said??
+"The last time anybody made a list of the top hundred character attributes of New Yorkers, common sense snuck in at number 79. .... When it's fall in New York, the air smells as if someone's been frying goats in it, and if you are keen to breathe the best plan is to open a window and stick your head in a building." - Nuff said??
 %
-"`What's been happening here?' he demanded. `Oh just the nicest things, sir, just the nicest things. can I sit on your lap please?'" "`Colin, I am going to abandon you to your fate.' `I'm so happy.'" "`It will be very, very nasty for you, and that's just too bad. Got it?' `I gurgle with pleasure.'"QUOTEHERESTRINGMAGIC1234- Ford and Colin the robot.
+"`What's been happening here?' he demanded. `Oh just the nicest things, sir, just the nicest things. can I sit on your lap please?'" "`Colin, I am going to abandon you to your fate.' `I'm so happy.'" "`It will be very, very nasty for you, and that's just too bad. Got it?' `I gurgle with pleasure.'" - Ford and Colin the robot.
 %
-"What the hell, he thought, you're only young once, and threw himself out of the window. That would at least keep the element of surprise on his side."QUOTEHERESTRINGMAGIC1234- Ford outwitting a Vogon with a rocket launcher by going into another certain death situation.
+"What the hell, he thought, you're only young once, and threw himself out of the window. That would at least keep the element of surprise on his side." - Ford outwitting a Vogon with a rocket launcher by going into another certain death situation.
 %
-"The major difference between a thing that might go wrong and a thing that cannot possibly go wrong is that when a thing that cannot possibly go wrong goes wrong it usually turns out to be impossible to get at or repair."QUOTEHERESTRINGMAGIC1234- One of the laws of computers and programming revealed.
+"The major difference between a thing that might go wrong and a thing that cannot possibly go wrong is that when a thing that cannot possibly go wrong goes wrong it usually turns out to be impossible to get at or repair." - One of the laws of computers and programming revealed.
 %
-"`You know they've reintroduced the death penalty for insurance company directors?' `Really?' said Arthur. `No I didn't. For what offence?' Trillian frowned. `What do you mean, offence?' `I see.'"QUOTEHERESTRINGMAGIC1234- Evidence that there will be some justice in the Universe eventually.
+"`You know they've reintroduced the death penalty for insurance company directors?' `Really?' said Arthur. `No I didn't. For what offence?' Trillian frowned. `What do you mean, offence?' `I see.'" - Evidence that there will be some justice in the Universe eventually.
 %
-"`She hit me on the head with the rock again.' `I think I can confirm that that was my daughter.' `Sweet kid.' `You have to get to know her,' said Arthur. `She eases up does she?' `No,' said Arthur, `but you get a better sense of when to duck.'"QUOTEHERESTRINGMAGIC1234- Ford and Arthur on Random.
+"`She hit me on the head with the rock again.' `I think I can confirm that that was my daughter.' `Sweet kid.' `You have to get to know her,' said Arthur. `She eases up does she?' `No,' said Arthur, `but you get a better sense of when to duck.'" - Ford and Arthur on Random.
 %
 "Far out in the uncharted backwaters of the unfashionable end of the western spiral arm of the Galaxy lies a small unregarded yellow sun. "
 %
diff --git a/zsh/plugins/httpie/_httpie b/zsh/plugins/httpie/_httpie
index 4d702ef..2c0db22 100644
--- a/zsh/plugins/httpie/_httpie
+++ b/zsh/plugins/httpie/_httpie
@@ -1,6 +1,6 @@
-#compdef http
+#compdef http https
 # ------------------------------------------------------------------------------
-# Copyright (c) 2015 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2015 GitHub zsh-users - http://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/zsh/plugins/ionic/ionic.plugin.zsh b/zsh/plugins/ionic/ionic.plugin.zsh
index cf388af..e3913b5 100644
--- a/zsh/plugins/ionic/ionic.plugin.zsh
+++ b/zsh/plugins/ionic/ionic.plugin.zsh
@@ -3,13 +3,13 @@ alias ih="ionic --help"
 alias ist="ionic start"
 alias ii="ionic info"
 alias is="ionic serve"
-alias icba="ionic cordova build android" 
-alias icbi="ionic cordova build ios" 
-alias icra="ionic cordova run android" 
-alias icri="ionic cordova run ios" 
-alias icrsa="ionic cordova resources android" 
+alias icba="ionic cordova build android"
+alias icbi="ionic cordova build ios"
+alias icra="ionic cordova run android"
+alias icri="ionic cordova run ios"
+alias icrsa="ionic cordova resources android"
 alias icrsi="ionic cordova resources ios"
-alias icpaa="ionic cordova platform add android" 
+alias icpaa="ionic cordova platform add android"
 alias icpai="ionic cordova platform add ios"
 alias icpra="ionic cordova platform rm android"
 alias icpri="ionic cordova platform rm ios"
diff --git a/zsh/plugins/ipfs/_ipfs b/zsh/plugins/ipfs/_ipfs
index 8771bc4..5b8b05b 100644
--- a/zsh/plugins/ipfs/_ipfs
+++ b/zsh/plugins/ipfs/_ipfs
@@ -202,7 +202,7 @@ _ipfs_subcommand(){
               _arguments \
                 '--resolve[Check if the given path can be resolved before publishing. Default: true.]' \
                 '(-t --lifetime)'{-t,--lifetime}'[Time duration that the record will be valid for. Default: 24h.]' \
-                '--allow-offline[When offline, save the IPNS record to the the local datastore without broadcasting to the network instead of simply failing.]' \
+                '--allow-offline[When offline, save the IPNS record to the local datastore without broadcasting to the network instead of simply failing.]' \
                 '--ttl[Time duration this record should be cached for. Uses the same syntax as the lifetime option. (caution: experimental).]' \
                 '(-k --key)'{-k,--key}"[Name of the key to be used or a valid PeerID, as listed by 'ipfs key list -l'. Default: self.]" \
                 '(-Q --quieter)'{-Q,--quieter}'[Write only final hash.]' \
diff --git a/zsh/plugins/isodate/README.md b/zsh/plugins/isodate/README.md
index 1ec75b2..5329310 100644
--- a/zsh/plugins/isodate/README.md
+++ b/zsh/plugins/isodate/README.md
@@ -1,7 +1,5 @@
 # Isodate plugin
 
-**Maintainer:** [@Frani](https://github.com/frani)
-
 This plugin adds completion for the [ISO 8601](https://en.wikipedia.org/wiki/ISO_8601),
 as well as some aliases for common Date commands.
 
@@ -11,6 +9,8 @@ To use it, add `isodate` to the plugins array in your zshrc file:
 plugins=(... isodate)
 ```
 
+**Maintainer:** [@Frani](https://github.com/frani)
+
 ## Aliases
 
 | Alias         | Command                              | Description                                                                |
diff --git a/zsh/plugins/iterm2/README.md b/zsh/plugins/iterm2/README.md
index 50cdebf..86bd77f 100644
--- a/zsh/plugins/iterm2/README.md
+++ b/zsh/plugins/iterm2/README.md
@@ -2,11 +2,20 @@
 
 This plugin adds a few functions that are useful when using [iTerm2](https://www.iterm2.com/).
 
+
 To use it, add _iterm2_ to the plugins array of your zshrc file:
 ```
 plugins=(... iterm2)
 ```
 
+Optionally, the plugin also applies the [Shell Integration Script for iTerm2](https://iterm2.com/documentation-shell-integration.html).
+You can enable the integration with zstyle. It's important to add this line
+before the line sourcing oh-my-zsh:
+
+```
+zstyle :omz:plugins:iterm2 shell-integration yes
+```
+
 ## Plugin commands
 
 * `_iterm2_command <iterm2-command>`
@@ -24,6 +33,9 @@ plugins=(... iterm2)
 * `iterm2_tab_color_reset`
   resets the color of iTerm2's current tab back to default.
 
+
+For shell integration features see the [official documentation](https://iterm2.com/documentation-shell-integration.html).
+
 ## Contributors
 
 - [Aviv Rosenberg](https://github.com/avivrosenberg)
diff --git a/zsh/plugins/iterm2/iterm2.plugin.zsh b/zsh/plugins/iterm2/iterm2.plugin.zsh
index 9d8e40b..03a63a7 100644
--- a/zsh/plugins/iterm2/iterm2.plugin.zsh
+++ b/zsh/plugins/iterm2/iterm2.plugin.zsh
@@ -7,6 +7,17 @@
 # This plugin is only relevant if the terminal is iTerm2 on OSX.
 if [[ "$OSTYPE" == darwin* ]] && [[ -n "$ITERM_SESSION_ID" ]] ; then
 
+  # maybe make it the default in the future and allow opting out?
+  if zstyle -t ':omz:plugins:iterm2' shell-integration; then
+    # Handle $0 according to the standard:
+    # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+    0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+    0="${${(M)0:#/*}:-$PWD/$0}"
+
+    # See official docs: https://iterm2.com/documentation-shell-integration.html
+    source "${0:A:h}/iterm2_shell_integration.zsh"
+  fi
+
   ###
   # Executes an arbitrary iTerm2 command via an escape code sequence.
   # See https://iterm2.com/documentation-escape-codes.html for all supported commands.
diff --git a/zsh/plugins/iterm2/iterm2_shell_integration.zsh b/zsh/plugins/iterm2/iterm2_shell_integration.zsh
new file mode 100644
index 0000000..281332e
--- /dev/null
+++ b/zsh/plugins/iterm2/iterm2_shell_integration.zsh
@@ -0,0 +1,178 @@
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+
+if [[ -o interactive ]]; then
+  if [ "${ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX-}""$TERM" != "tmux-256color" -a "${ITERM_ENABLE_SHELL_INTEGRATION_WITH_TMUX-}""$TERM" != "screen" -a "${ITERM_SHELL_INTEGRATION_INSTALLED-}" = "" -a "$TERM" != linux -a "$TERM" != dumb ]; then
+    ITERM_SHELL_INTEGRATION_INSTALLED=Yes
+    ITERM2_SHOULD_DECORATE_PROMPT="1"
+    # Indicates start of command output. Runs just before command executes.
+    iterm2_before_cmd_executes() {
+      if [ "$TERM_PROGRAM" = "iTerm.app" ]; then
+        printf "\033]133;C;\r\007"
+      else
+        printf "\033]133;C;\007"
+      fi
+    }
+
+    iterm2_set_user_var() {
+      printf "\033]1337;SetUserVar=%s=%s\007" "$1" $(printf "%s" "$2" | base64 | tr -d '\n')
+    }
+
+    # Users can write their own version of this method. It should call
+    # iterm2_set_user_var but not produce any other output.
+    # e.g., iterm2_set_user_var currentDirectory $PWD
+    # Accessible in iTerm2 (in a badge now, elsewhere in the future) as
+    # \(user.currentDirectory).
+    whence -v iterm2_print_user_vars > /dev/null 2>&1
+    if [ $? -ne 0 ]; then
+      iterm2_print_user_vars() {
+          true
+      }
+    fi
+
+    iterm2_print_state_data() {
+      local _iterm2_hostname="${iterm2_hostname-}"
+      if [ -z "${iterm2_hostname:-}" ]; then
+        _iterm2_hostname=$(hostname -f 2>/dev/null)
+      fi
+      printf "\033]1337;RemoteHost=%s@%s\007" "$USER" "${_iterm2_hostname-}"
+      printf "\033]1337;CurrentDir=%s\007" "$PWD"
+      iterm2_print_user_vars
+    }
+
+    # Report return code of command; runs after command finishes but before prompt
+    iterm2_after_cmd_executes() {
+      printf "\033]133;D;%s\007" "$STATUS"
+      iterm2_print_state_data
+    }
+
+    # Mark start of prompt
+    iterm2_prompt_mark() {
+      printf "\033]133;A\007"
+    }
+
+    # Mark end of prompt
+    iterm2_prompt_end() {
+      printf "\033]133;B\007"
+    }
+
+    # There are three possible paths in life.
+    #
+    # 1) A command is entered at the prompt and you press return.
+    #    The following steps happen:
+    #    * iterm2_preexec is invoked
+    #      * PS1 is set to ITERM2_PRECMD_PS1
+    #      * ITERM2_SHOULD_DECORATE_PROMPT is set to 1
+    #    * The command executes (possibly reading or modifying PS1)
+    #    * iterm2_precmd is invoked
+    #      * ITERM2_PRECMD_PS1 is set to PS1 (as modified by command execution)
+    #      * PS1 gets our escape sequences added to it
+    #    * zsh displays your prompt
+    #    * You start entering a command
+    #
+    # 2) You press ^C while entering a command at the prompt.
+    #    The following steps happen:
+    #    * (iterm2_preexec is NOT invoked)
+    #    * iterm2_precmd is invoked
+    #      * iterm2_before_cmd_executes is called since we detected that iterm2_preexec was not run
+    #      * (ITERM2_PRECMD_PS1 and PS1 are not messed with, since PS1 already has our escape
+    #        sequences and ITERM2_PRECMD_PS1 already has PS1's original value)
+    #    * zsh displays your prompt
+    #    * You start entering a command
+    #
+    # 3) A new shell is born.
+    #    * PS1 has some initial value, either zsh's default or a value set before this script is sourced.
+    #    * iterm2_precmd is invoked
+    #      * ITERM2_SHOULD_DECORATE_PROMPT is initialized to 1
+    #      * ITERM2_PRECMD_PS1 is set to the initial value of PS1
+    #      * PS1 gets our escape sequences added to it
+    #    * Your prompt is shown and you may begin entering a command.
+    #
+    # Invariants:
+    # * ITERM2_SHOULD_DECORATE_PROMPT is 1 during and just after command execution, and "" while the prompt is
+    #   shown and until you enter a command and press return.
+    # * PS1 does not have our escape sequences during command execution
+    # * After the command executes but before a new one begins, PS1 has escape sequences and
+    #   ITERM2_PRECMD_PS1 has PS1's original value.
+    iterm2_decorate_prompt() {
+      # This should be a raw PS1 without iTerm2's stuff. It could be changed during command
+      # execution.
+      ITERM2_PRECMD_PS1="$PS1"
+      ITERM2_SHOULD_DECORATE_PROMPT=""
+
+      # Add our escape sequences just before the prompt is shown.
+      # Use ITERM2_SQUELCH_MARK for people who can't mdoify PS1 directly, like powerlevel9k users.
+      # This is gross but I had a heck of a time writing a correct if statetment for zsh 5.0.2.
+      local PREFIX=""
+      if [[ $PS1 == *"$(iterm2_prompt_mark)"* ]]; then
+        PREFIX=""
+      elif [[ "${ITERM2_SQUELCH_MARK-}" != "" ]]; then
+        PREFIX=""
+      else
+        PREFIX="%{$(iterm2_prompt_mark)%}"
+      fi
+      PS1="$PREFIX$PS1%{$(iterm2_prompt_end)%}"
+      ITERM2_DECORATED_PS1="$PS1"
+    }
+
+    iterm2_precmd() {
+      local STATUS="$?"
+      if [ -z "${ITERM2_SHOULD_DECORATE_PROMPT-}" ]; then
+        # You pressed ^C while entering a command (iterm2_preexec did not run)
+        iterm2_before_cmd_executes
+        if [ "$PS1" != "${ITERM2_DECORATED_PS1-}" ]; then
+          # PS1 changed, perhaps in another precmd. See issue 9938.
+          ITERM2_SHOULD_DECORATE_PROMPT="1"
+        fi
+      fi
+
+      iterm2_after_cmd_executes "$STATUS"
+
+      if [ -n "$ITERM2_SHOULD_DECORATE_PROMPT" ]; then
+        iterm2_decorate_prompt
+      fi
+    }
+
+    # This is not run if you press ^C while entering a command.
+    iterm2_preexec() {
+      # Set PS1 back to its raw value prior to executing the command.
+      PS1="$ITERM2_PRECMD_PS1"
+      ITERM2_SHOULD_DECORATE_PROMPT="1"
+      iterm2_before_cmd_executes
+    }
+
+    # If hostname -f is slow on your system set iterm2_hostname prior to
+    # sourcing this script. We know it is fast on macOS so we don't cache
+    # it. That lets us handle the hostname changing like when you attach
+    # to a VPN.
+    if [ -z "${iterm2_hostname-}" ]; then
+      if [ "$(uname)" != "Darwin" ]; then
+        iterm2_hostname=`hostname -f 2>/dev/null`
+        # Some flavors of BSD (i.e. NetBSD and OpenBSD) don't have the -f option.
+        if [ $? -ne 0 ]; then
+          iterm2_hostname=`hostname`
+        fi
+      fi
+    fi
+
+    [[ -z ${precmd_functions-} ]] && precmd_functions=()
+    precmd_functions=($precmd_functions iterm2_precmd)
+
+    [[ -z ${preexec_functions-} ]] && preexec_functions=()
+    preexec_functions=($preexec_functions iterm2_preexec)
+
+    iterm2_print_state_data
+    printf "\033]1337;ShellIntegrationVersion=14;shell=zsh\007"
+  fi
+fi
diff --git a/zsh/plugins/iterm2/update b/zsh/plugins/iterm2/update
new file mode 100755
index 0000000..da8dae6
--- /dev/null
+++ b/zsh/plugins/iterm2/update
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+curl -s -L https://iterm2.com/shell_integration/zsh \
+  -o iterm2_shell_integration.zsh
diff --git a/zsh/plugins/jira/README.md b/zsh/plugins/jira/README.md
index a5633af..f6e2e26 100644
--- a/zsh/plugins/jira/README.md
+++ b/zsh/plugins/jira/README.md
@@ -1,37 +1,68 @@
-#  Jira plugin  #
-
-CLI support for JIRA interaction
-
-##  Description  ##
+# Jira plugin
 
 This plugin provides command line tools for interacting with Atlassian's [JIRA](https://www.atlassian.com/software/jira) bug tracking software.
 
+To use it, add `jira` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... jira)
+```
+
 The interaction is all done through the web. No local installation of JIRA is necessary.
 
 In this document, "JIRA" refers to the JIRA issue tracking server, and `jira` refers to the command this plugin supplies.
 
-##  Usage  ##
+## Usage
 
 This plugin supplies one command, `jira`, through which all its features are exposed. Most forms of this command open a JIRA page in your web browser.
 
-```
-jira            # performs the default action
+## Commands
 
-jira new        # opens a new issue
-jira dashboard  # opens your JIRA dashboard
-jira tempo      # opens your JIRA Tempo
-jira reported [username]  # queries for issues reported by a user
-jira assigned [username]  # queries for issues assigned to a user
-jira myissues   # queries for you own issues
-jira branch     # opens an existing issue matching the current branch name
-                # The branch name may have prefixes ending in "/": "feature/MP-1234",
-                # and also suffixes starting with "_": "MP-1234_fix_dashboard"
-                # In both these cases, the issue opened will be "MP-1234"
-jira ABC-123    # opens an existing issue
-jira ABC-123 m  # opens an existing issue for adding a comment
+`jira help` or `jira usage` will print the below usage instructions
+
+| Command                       | Description                                              |
+| :---------------------------- | :------------------------------------------------------- |
+| `jira`                        | Performs the default action                              |
+| `jira new`                    | Opens a new Jira issue dialogue                          |
+| `jira ABC-123`                | Opens an existing issue                                  |
+| `jira ABC-123 m`              | Opens an existing issue for adding a comment             |
+| `jira project ABC`            | Opens JIRA project summary                               |
+| `jira dashboard [rapid_view]` | Opens your JIRA dashboard                                |
+| `jira mine`                   | Queries for your own issues                              |
+| `jira tempo`                  | Opens your JIRA Tempo                                    |
+| `jira reported [username]`    | Queries for issues reported by a user                    |
+| `jira assigned [username]`    | Queries for issues assigned to a user                    |
+| `jira branch`                 | Opens an existing issue matching the current branch name |
+| `jira help`                   | Prints usage instructions                                |
+
+
+### Jira Branch usage notes
+
+The branch name may have prefixes ending in "/": "feature/MP-1234", and also suffixes
+starting with "_": "MP-1234_fix_dashboard". In both these cases, the issue opened will be "MP-1234"
+
+This is also checks if the prefix is in the name, and adds it if not, so: "MP-1234" opens the issue "MP-1234",
+"mp-1234" opens the issue "mp-1234", and "1234" opens the issue "MP-1234".
+
+If your branch naming convention deviates, you can overwrite the jira_branch function to determine and echo the Jira issue key yourself.
+Define a function `jira_branch` after sourcing `oh-my-zsh.sh` in your `.zshrc`.
+Example:
+```zsh
+# Determine branch name from naming convention 'type/KEY-123/description'.
+function jira_branch() {
+  # Get name of the branch
+  issue_arg=$(git rev-parse --abbrev-ref HEAD)
+  # Strip prefixes like feature/ or bugfix/
+  issue_arg=${issue_arg#*/}
+  # Strip suffixes like /some-branch-description
+  issue_arg=${issue_arg%%/*}
+  # Return the value
+  echo $issue_arg
+}
 ```
 
-#### Debugging usage  ####
+
+#### Debugging usage
 
 These calling forms are for developers' use, and may change at any time.
 
@@ -39,7 +70,7 @@ These calling forms are for developers' use, and may change at any time.
 jira dumpconfig   # displays the effective configuration
 ```
 
-##  Setup  ##
+## Setup
 
 The URL for your JIRA instance is set by `$JIRA_URL` or a `.jira_url` file.
 
@@ -56,15 +87,17 @@ echo "https://jira.atlassian.com" >> .jira-url
 
 (Note: The current implementation only looks in the current directory for `.jira-url` and `.jira-prefix`, not up the path, so if you are in a subdirectory of your project, it will fall back to your default JIRA URL. This will probably change in the future though.)
 
-###  Variables  ###
+### Variables
 
 * `$JIRA_URL` - Your JIRA instance's URL
 * `$JIRA_NAME` - Your JIRA username; used as the default user for `assigned`/`reported` searches
 * `$JIRA_PREFIX` - Prefix added to issue ID arguments
 * `$JIRA_RAPID_BOARD` - Set to `true` if you use Rapid Board
+* `$JIRA_RAPID_VIEW` - Set the default rapid view; it doesn't work if `$JIRA_RAPID_BOARD` is set to false
 * `$JIRA_DEFAULT_ACTION` - Action to do when `jira` is called with no arguments; defaults to "new"
+* `$JIRA_TEMPO_PATH` - Your JIRA tempo url path; defaults to "/secure/Tempo.jspa"
 
 
-### Browser ###
+### Browser
 
 Your default web browser, as determined by how `open_command` handles `http://` URLs, is used for interacting with the JIRA instance. If you change your system's URL handler associations, it will change the browser that `jira` uses.
diff --git a/zsh/plugins/jira/_jira b/zsh/plugins/jira/_jira
index 1ac3eed..617a3e5 100644
--- a/zsh/plugins/jira/_jira
+++ b/zsh/plugins/jira/_jira
@@ -4,12 +4,15 @@
 local -a _1st_arguments
 _1st_arguments=(
   'new:create a new issue'
+  'mine:open my issues'
+  'project:open the project'
   'dashboard:open the dashboard'
   'tempo:open the tempo'
   'reported:search for issues reported by a user'
   'assigned:search for issues assigned to a user'
   'branch:open the issue named after the git branch of the current directory'
   'dumpconfig:display effective jira configuration'
+  'help:print usage help to stdout'
 )
 
 _arguments -C \
diff --git a/zsh/plugins/jira/jira.plugin.zsh b/zsh/plugins/jira/jira.plugin.zsh
index 22807e0..0c90544 100644
--- a/zsh/plugins/jira/jira.plugin.zsh
+++ b/zsh/plugins/jira/jira.plugin.zsh
@@ -2,6 +2,46 @@
 #
 # See README.md for details
 
+function _jira_usage() {
+cat <<EOF
+jira                            Performs the default action
+jira new                        Opens a new Jira issue dialogue
+jira ABC-123                    Opens an existing issue
+jira ABC-123 m                  Opens an existing issue for adding a comment
+jira project ABC                Opens JIRA project summary
+jira dashboard [rapid_view]     Opens your JIRA dashboard
+jira mine                       Queries for your own issues
+jira tempo                      Opens your JIRA Tempo
+jira reported [username]        Queries for issues reported by a user
+jira assigned [username]        Queries for issues assigned to a user
+jira branch                     Opens an existing issue matching the current branch name
+EOF
+}
+
+# If your branch naming convention deviates, you can partially override this plugin function
+# to determine the jira issue key based on your formatting.
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Customization#partially-overriding-an-existing-plugin
+function jira_branch() {
+  # Get name of the branch
+  issue_arg=$(git rev-parse --abbrev-ref HEAD)
+  # Strip prefixes like feature/ or bugfix/
+  issue_arg=${issue_arg##*/}
+  # Strip suffixes starting with _
+  issue_arg=(${(s:_:)issue_arg})
+  # If there is only one part, it means that there is a different delimiter. Try with -
+  if [[ ${#issue_arg[@]} = 1 && ${issue_arg} == *-* ]]; then
+    issue_arg=(${(s:-:)issue_arg})
+    issue_arg="${issue_arg[1]}-${issue_arg[2]}"
+  else
+    issue_arg=${issue_arg[1]}
+  fi
+  if [[ "${issue_arg:l}" = ${jira_prefix:l}* ]]; then
+    echo "${issue_arg}"
+  else
+    echo "${jira_prefix}${issue_arg}"
+  fi
+}
+
 function jira() {
   emulate -L zsh
   local action jira_url jira_prefix
@@ -44,42 +84,42 @@ function jira() {
     open_command "${jira_url}/secure/CreateIssue!default.jspa"
   elif [[ "$action" == "assigned" || "$action" == "reported" ]]; then
     _jira_query ${@:-$action}
-  elif [[ "$action" == "myissues" ]]; then
+  elif [[ "$action" == "help" || "$action" == "usage" ]]; then
+    _jira_usage
+  elif [[ "$action" == "mine" ]]; then
     echo "Opening my issues"
     open_command "${jira_url}/issues/?filter=-1"
+  elif [[ "$action" == "project" ]]; then
+    echo "Opening project"
+    open_command "${jira_url}/jira/software/c/projects/${2}/summary"
   elif [[ "$action" == "dashboard" ]]; then
     echo "Opening dashboard"
     if [[ "$JIRA_RAPID_BOARD" == "true" ]]; then
-      open_command "${jira_url}/secure/RapidBoard.jspa"
+      _jira_rapid_board ${@}
     else
       open_command "${jira_url}/secure/Dashboard.jspa"
     fi
   elif [[ "$action" == "tempo" ]]; then
     echo "Opening tempo"
-    open_command "${jira_url}/secure/Tempo.jspa"
+    if [[ -n "$JIRA_TEMPO_PATH" ]]; then
+      open_command "${jira_url}${JIRA_TEMPO_PATH}"
+    else
+      open_command "${jira_url}/secure/Tempo.jspa"
+    fi
   elif [[ "$action" == "dumpconfig" ]]; then
     echo "JIRA_URL=$jira_url"
     echo "JIRA_PREFIX=$jira_prefix"
     echo "JIRA_NAME=$JIRA_NAME"
+    echo "JIRA_RAPID_VIEW=$JIRA_RAPID_VIEW"
     echo "JIRA_RAPID_BOARD=$JIRA_RAPID_BOARD"
     echo "JIRA_DEFAULT_ACTION=$JIRA_DEFAULT_ACTION"
+    echo "JIRA_TEMPO_PATH=$JIRA_TEMPO_PATH"
   else
     # Anything that doesn't match a special action is considered an issue name
     # but `branch` is a special case that will parse the current git branch
     local issue_arg issue
     if [[ "$action" == "branch" ]]; then
-      # Get name of the branch
-      issue_arg=$(git rev-parse --abbrev-ref HEAD)
-      # Strip prefixes like feature/ or bugfix/
-      issue_arg=${issue_arg##*/}
-      # Strip suffixes starting with _
-      issue_arg=(${(s:_:)issue_arg})
-      issue_arg=${issue_arg[1]}
-      if [[ "$issue_arg" = ${jira_prefix}* ]]; then
-        issue="${issue_arg}"
-      else
-        issue="${jira_prefix}${issue_arg}"
-      fi
+      issue=$(jira_branch)
     else
       issue_arg=${(U)action}
       issue="${jira_prefix}${issue_arg}"
@@ -107,6 +147,16 @@ Valid options, in order of precedence:
 EOF
 }
 
+function _jira_rapid_board() {
+  rapid_view=${2:=$JIRA_RAPID_VIEW}
+
+  if [[ -z $rapid_view ]]; then
+    open_command "${jira_url}/secure/RapidBoard.jspa"
+  else
+    open_command "${jira_url}/secure/RapidBoard.jspa?rapidView=$rapid_view"
+  fi
+}
+
 function _jira_query() {
   emulate -L zsh
   local verb="$1"
diff --git a/zsh/plugins/jj/README.md b/zsh/plugins/jj/README.md
new file mode 100644
index 0000000..6f10b5b
--- /dev/null
+++ b/zsh/plugins/jj/README.md
@@ -0,0 +1,127 @@
+# jj - Jujutsu CLI
+
+This plugin provides autocompletion for [jj](https://martinvonz.github.io/jj).
+
+To use it, add `jj` to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... jj)
+```
+
+## Aliases
+
+| Alias  | Command                       |
+| ------ | ----------------------------- |
+| jja    | `jj abandon`                  |
+| jjb    | `jj bookmark`                 |
+| jjbc   | `jj bookmark create`          |
+| jjbd   | `jj bookmark delete`          |
+| jjbf   | `jj bookmark forget`          |
+| jjbl   | `jj bookmark list`            |
+| jjbm   | `jj bookmark move`            |
+| jjbr   | `jj bookmark rename`          |
+| jjbs   | `jj bookmark set`             |
+| jjbt   | `jj bookmark track`           |
+| jjbu   | `jj bookmark untrack`         |
+| jjc    | `jj commit`                   |
+| jjcmsg | `jj commit --message`         |
+| jjd    | `jj diff`                     |
+| jjdmsg | `jj desc --message`           |
+| jjds   | `jj desc`                     |
+| jje    | `jj edit`                     |
+| jjgcl  | `jj git clone`                |
+| jjgf   | `jj git fetch`                |
+| jjgfa  | `jj git fetch --all-remotes`  |
+| jjgp   | `jj git push`                 |
+| jjgpa  | `jj git push --all`           |
+| jjgpd  | `jj git push --deleted`       |
+| jjgpt  | `jj git push --tracked`       |
+| jjl    | `jj log`                      |
+| jjla   | `jj log -r "all()"`           |
+| jjn    | `jj new`                      |
+| jjnt   | `jj new "trunk()"`            |
+| jjrb   | `jj rebase`                   |
+| jjrbm  | `jj rebase -d "trunk()"`      |
+| jjrs   | `jj restore`                  |
+| jjrt   | `cd "$(jj root \|\| echo .)"` |
+| jjsp   | `jj split`                    |
+| jjsq   | `jj squash`                   |
+| jjst   | `jj status`                   |
+
+## Prompt usage
+
+Because `jj` has a very powerful [template syntax](https://martinvonz.github.io/jj/latest/templates/), this
+plugin only exposes a convenience function `jj_prompt_template` to read information from the current change.
+It is basically the same as `jj log --no-graph -r @ -T $1`:
+
+```sh
+_my_theme_jj_info() {
+  jj_prompt_template 'self.change_id().shortest(3)'
+}
+
+PROMPT='$(_my_theme_jj_info) $'
+```
+
+`jj_prompt_template` escapes `%` signs in the output. Use `jj_prompt_template_raw` if you don't want that
+(e.g. to colorize the output).
+
+However, because `jj` can be used inside a Git repository, some themes might clash with it. Generally, you can
+fix it with a wrapper function that tries `jj` first and then falls back to `git` if it didn't work:
+
+```sh
+_my_theme_vcs_info() {
+  jj_prompt_template 'self.change_id().shortest(3)' \
+  || git_prompt_info
+}
+
+PROMPT='$(_my_theme_vcs_info) $'
+```
+
+You can find an example
+[here](https://github.com/nasso/omzsh/blob/e439e494f22f4fd4ef1b6cb64626255f4b341c1b/themes/sunakayu.zsh-theme).
+
+### Performance
+
+Sometimes `jj` can be slower than `git`.
+
+If you feel slowdowns, consider using the following:
+
+```
+zstyle :omz:plugins:jj ignore-working-copy yes
+```
+
+This will add `--ignore-working-copy` to all `jj` commands executed by your prompt. The downside here is that
+your prompt might be out-of-sync until the next time `jj` gets a chance to _not_ ignore the working copy (i.e.
+you manually run a `jj` command).
+
+If you prefer to keep your prompt always up-to-date but still don't want to _feel_ the slowdown, you can make
+your prompt asynchronous. This plugin doesn't do this automatically so you'd have to hack your theme a bit for
+that.
+
+### Git async-prompt compatibility
+
+If you use a wrapper function that calls `git_prompt_info` (as shown above), it won't work with
+the default git async-prompt mode. This is because async-prompt only registers its background worker
+when it detects `$(git_prompt_info)` literally in your prompt variables. A wrapper like
+`$(_my_theme_vcs_info)` won't match, so the async output stays empty.
+
+To fix this, add one of the following to your `.zshrc` **before** Oh My Zsh is sourced:
+
+```zsh
+# Option 1: force async handlers to always register (recommended, keeps async behavior)
+zstyle ':omz:alpha:lib:git' async-prompt force
+
+# Option 2: disable async-prompt entirely (simpler, but prompt may feel slower in large repos)
+zstyle ':omz:alpha:lib:git' async-prompt no
+```
+
+See [#13555](https://github.com/ohmyzsh/ohmyzsh/issues/13555) for details.
+
+## See Also
+
+- [martinvonz/jj](https://github.com/martinvonz/jj)
+
+## Contributors
+
+- [nasso](https://github.com/nasso) - Plugin Author
+- [imp](https://github.com/imp) - Occasional Alias Contributor
diff --git a/zsh/plugins/jj/jj.plugin.zsh b/zsh/plugins/jj/jj.plugin.zsh
new file mode 100644
index 0000000..4b0400f
--- /dev/null
+++ b/zsh/plugins/jj/jj.plugin.zsh
@@ -0,0 +1,71 @@
+# if jj is not found, don't do the rest of the script
+if (( ! $+commands[jj] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `jj`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_jj" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _jj
+  _comps[jj]=_jj
+fi
+
+COMPLETE=zsh jj >| "$ZSH_CACHE_DIR/completions/_jj" &|
+
+function __jj_prompt_jj() {
+  local -a flags
+  flags=("--no-pager")
+  if zstyle -t ':omz:plugins:jj' ignore-working-copy; then
+    flags+=("--ignore-working-copy")
+  fi
+  command jj $flags "$@"
+}
+
+# convenience functions for themes
+function jj_prompt_template_raw() {
+  __jj_prompt_jj log --no-graph -r @ -T "$@" 2> /dev/null
+}
+
+function jj_prompt_template() {
+  local out
+  out=$(jj_prompt_template_raw "$@") || return 1
+  echo "${out:gs/%/%%}"
+}
+
+# Aliases (sorted alphabetically)
+alias jja='jj abandon'
+alias jjb='jj bookmark'
+alias jjbc='jj bookmark create'
+alias jjbd='jj bookmark delete'
+alias jjbf='jj bookmark forget'
+alias jjbl='jj bookmark list'
+alias jjbm='jj bookmark move'
+alias jjbr='jj bookmark rename'
+alias jjbs='jj bookmark set'
+alias jjbt='jj bookmark track'
+alias jjbu='jj bookmark untrack'
+alias jjc='jj commit'
+alias jjcmsg='jj commit --message'
+alias jjd='jj diff'
+alias jjdmsg='jj desc --message'
+alias jjds='jj desc'
+alias jje='jj edit'
+alias jjgcl='jj git clone'
+alias jjgf='jj git fetch'
+alias jjgfa='jj git fetch --all-remotes'
+alias jjgp='jj git push'
+alias jjgpa='jj git push --all'
+alias jjgpd='jj git push --deleted'
+alias jjgpt='jj git push --tracked'
+alias jjl='jj log'
+alias jjla='jj log -r "all()"'
+alias jjn='jj new'
+alias jjnt='jj new "trunk()"'
+alias jjrb='jj rebase'
+alias jjrbm='jj rebase -d "trunk()"'
+alias jjrs='jj restore'
+alias jjrt='cd "$(jj root || echo .)"'
+alias jjsp='jj split'
+alias jjsq='jj squash'
+alias jjst='jj status'
diff --git a/zsh/plugins/jsontools/README.md b/zsh/plugins/jsontools/README.md
index 6a27400..804edba 100644
--- a/zsh/plugins/jsontools/README.md
+++ b/zsh/plugins/jsontools/README.md
@@ -8,6 +8,17 @@ To use it, add `jsontools` to the plugins array in your zshrc file:
 plugins=(... jsontools)
 ```
 
+## Requirements
+
+The plugin uses one of these tools to process JSON data, in the following order:
+
+- `node`
+- `python3`
+- `ruby`
+
+Any of these must be in `$PATH` before the plugin is loaded, otherwise the plugin exits
+prematurely and the functions will not be available.
+
 ## Usage
 
 Usage is simple... just take your json data and pipe it into the appropriate jsontool:
@@ -19,7 +30,7 @@ Usage is simple... just take your json data and pipe it into the appropriate jso
 
 ### Supports NDJSON (Newline Delimited JSON)
 
-The plugin also supports [NDJSON](http://ndjson.org/) input, which means all functions
+The plugin also supports [NDJSON](https://github.com/ndjson/ndjson-spec) input, which means all functions
 have an alternative function that reads and processes the input line by line. These
 functions have the same name except using `ndjson` instead of `json`:
 
diff --git a/zsh/plugins/juju/README.md b/zsh/plugins/juju/README.md
index f0c6530..6ee333f 100644
--- a/zsh/plugins/juju/README.md
+++ b/zsh/plugins/juju/README.md
@@ -126,5 +126,7 @@ Naming convention:
 - `jaddr <app_name> [unit_num]`: display app or unit IP address.
 - `jreld <relation_name> <app_name> <unit_num>`: display app and unit relation data.
 - `jclean`: destroy all controllers
+- `jcontroller`: display the controller your are connected to.
+- `jmodel`: display the model your are connected to.
 - `wjst [interval_secs] [args_for_watch]`: watch juju status, with optional interval
   (default: 5s); you may pass additional arguments to `watch`.
diff --git a/zsh/plugins/juju/juju.plugin.zsh b/zsh/plugins/juju/juju.plugin.zsh
index be8a2c7..3c159da 100644
--- a/zsh/plugins/juju/juju.plugin.zsh
+++ b/zsh/plugins/juju/juju.plugin.zsh
@@ -98,7 +98,7 @@ jaddr() {
   elif [[ $# -eq 2 ]]; then
     # Get unit address
     juju status "$1/$2" --format=json \
-      | jq -r ".applications.\"$1\".units.\"$1/$2\".address"
+      | jq -r ".applications.\"$1\".units.\"$1/$2\" | .address // .\"public-address\""
   else
     echo "Invalid number of arguments."
     echo "Usage:   jaddr <app-name> [<unit-number>]"
@@ -163,10 +163,40 @@ jreld() {
   juju run "relation-get -r $relid - $2" --unit $2/$3
 }
 
+# Return Juju current controller
+jcontroller() {
+  local controller="$(awk '/current-controller/ {print $2}' ~/.local/share/juju/controllers.yaml)"
+  if [[ -z "$controller" ]]; then
+    return 1
+  fi
+
+  echo $controller
+  return 0
+}
+
+# Return Juju current model
+jmodel() {
+  local yqbin="$(whereis yq | awk '{print $2}')"
+
+  if [[ -z "$yqbin" ]]; then
+    echo "--"
+    return 1
+  fi
+
+  local model="$(yq e ".controllers.$(jcontroller).current-model" < ~/.local/share/juju/models.yaml | cut -d/ -f2)"
+
+  if [[ -z "$model" ]]; then
+    echo "--"
+    return 1
+  fi
+
+  echo $model
+  return 0
+}
+
 # Watch juju status, with optional interval (default: 5 sec)
 wjst() {
   local interval="${1:-5}"
   shift $(( $# > 0 ))
   watch -n "$interval" --color juju status --relations --color "$@"
 }
-
diff --git a/zsh/plugins/jump/jump.plugin.zsh b/zsh/plugins/jump/jump.plugin.zsh
index c2da114..c2b21e9 100644
--- a/zsh/plugins/jump/jump.plugin.zsh
+++ b/zsh/plugins/jump/jump.plugin.zsh
@@ -8,8 +8,10 @@
 #
 export MARKPATH=$HOME/.marks
 
+
 jump() {
-	builtin cd -P "$MARKPATH/$1" 2>/dev/null || {echo "No such mark: $1"; return 1}
+	local markpath="$(readlink $MARKPATH/$1)" || {echo "No such mark: $1"; return 1}
+	builtin cd "$markpath" 2>/dev/null || {echo "Destination does not exist for mark [$1]: $markpath"; return 2}
 }
 
 mark() {
@@ -35,12 +37,11 @@ marks() {
 			max=${#link:t}
 		fi
 	done
-	local printf_markname_template="$(printf -- "%%%us " "$max")"
+	local printf_markname_template="$(printf -- "%%%us" "$max")"
 	for link in $MARKPATH/{,.}*(@N); do
-		local markname="$fg[cyan]${link:t}$reset_color"
+		local markname="$fg[cyan]$(printf -- "$printf_markname_template" "${link:t}")$reset_color"
 		local markpath="$fg[blue]$(readlink $link)$reset_color"
-		printf -- "$printf_markname_template" "$markname"
-		printf -- "-> %s\n" "$markpath"
+		printf -- "%s -> %s\n" "$markname" "$markpath"
 	done
 }
 
diff --git a/zsh/plugins/k9s/README.md b/zsh/plugins/k9s/README.md
new file mode 100644
index 0000000..275048c
--- /dev/null
+++ b/zsh/plugins/k9s/README.md
@@ -0,0 +1,9 @@
+# k9s plugin
+
+This plugin adds completion support for the [k9s](https://k9scli.io).
+
+To use it, add `k9s` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... k9s)
+```
diff --git a/zsh/plugins/k9s/k9s.plugin.zsh b/zsh/plugins/k9s/k9s.plugin.zsh
new file mode 100644
index 0000000..630d4f7
--- /dev/null
+++ b/zsh/plugins/k9s/k9s.plugin.zsh
@@ -0,0 +1,14 @@
+if (( ! $+commands[k9s] )); then
+  return
+fi
+
+# If the completion file does not exist, fake it and load it
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_k9s" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _k9s
+  _comps[k9s]=_k9s
+fi
+
+# and then generate it in the background. On first completion,
+# the actual completion file will be loaded.
+k9s completion zsh >| "$ZSH_CACHE_DIR/completions/_k9s" &|
diff --git a/zsh/plugins/kamal/README.md b/zsh/plugins/kamal/README.md
new file mode 100644
index 0000000..af57168
--- /dev/null
+++ b/zsh/plugins/kamal/README.md
@@ -0,0 +1,16 @@
+# Kamal
+
+This plugin provides completion for [Kamal](https://kamal-deploy.org/) as well as some
+aliases for frequent Kamal commands.
+
+To use it, add kamal to the plugins array of your zshrc file:
+
+```zsh
+plugins=(... kamal)
+```
+
+## Aliase
+
+| Alias     | Command                          | Description                                                                      |
+|-----------|----------------------------------|----------------------------------------------------------------------------------|
+| kad       | `kamal deploy`                   | Deploy app to servers                                                            |
diff --git a/zsh/plugins/kamal/_kamal b/zsh/plugins/kamal/_kamal
new file mode 100644
index 0000000..52b29e8
--- /dev/null
+++ b/zsh/plugins/kamal/_kamal
@@ -0,0 +1,691 @@
+#compdef kamal
+
+# Description
+# -----------
+#  zsh completion for Kamal (https://kamal-deploy.org/)
+# -------------------------------------------------------------------------
+# Authors
+# -------
+#  * Igor Aleksandrov <igor.alexandrov@gmail.com>
+# -------------------------------------------------------------------------
+# Inspiration
+# -----------
+#  * docker-compose ohmyzsh completion script by @sdurrheimer Steve Durrheimer
+# -------------------------------------------------------------------------
+
+# _kamal_commands() {
+#   # Only initialize if empty
+#   if (( ${#kamal_commands} == 0 )); then
+#     kamal_commands=(
+#       accessory
+#       app
+#       audit
+#       build
+#       config
+#       deploy
+#       details
+#       docs
+#       help
+#       init
+#       lock
+#       proxy
+#       prune
+#       redeploy
+#       registry
+#       remove
+#       rollback
+#       secrets
+#       server
+#       setup
+#       upgrade
+#       version
+#     )
+#   fi
+
+#   _values 'Kamal commands' $kamal_commands
+# }
+
+typeset -gr _kamal_commands=(
+  'accessory:Control accessory services'
+  'app:Control application deployment'
+  'audit:Audit security of deployment'
+  'build:Build and manage app images'
+  'config:Show effective configuration'
+  'deploy:Deploy app to servers'
+  'details:Show details about deployment'
+  'docs:Open documentation in browser'
+  'help:Show command help'
+  'init:Initialize new Kamal project'
+  'lock:Manage deployment locks'
+  'proxy:Control reverse proxy'
+  'prune:Clean up containers and images'
+  'redeploy:Redeploy current version'
+  'registry:Manage Docker registry access'
+  'remove:Remove app from servers'
+  'rollback:Rollback to a previous version'
+  'secrets:Manage deployment secrets'
+  'server:Control server configuration'
+  'setup:Setup initial deployment'
+  'upgrade:Upgrade deployment'
+  'version:Show Kamal version'
+)
+
+# Helper function to display messages
+_kamal_message() {
+  local msg="$1"
+  _kamal_message "==> $msg"
+}
+
+# Helper function to extract destination names from ./config/deploy.*.yml
+_kamal_destinations() {
+  local -a dests
+  local file
+
+  # Check if config directory exists
+  if [[ ! -d "config" ]]; then
+    _kamal_message "Cannot find Kamal configuration directory at ./config" && return 1
+  fi
+
+  for file in config/deploy.*.yml(N); do
+    [[ $file =~ config/deploy\.(.+)\.yml ]] && dests+=("${match[1]}")
+  done
+
+  _values 'Destination' $dests
+}
+
+# Define global _kamal_flags array
+typeset -ga _kamal_flags
+_kamal_flags=(
+  '(-v --verbose )'{-v,--verbose}'[Detailed logging]'
+  '(--no-verbose --skip-verbose)'{--no-verbose,--skip-verbose}'[No detailed logging]'
+  '(-q --quiet --no-quiet --skip-quiet)'{-q,--quiet}'[Minimal logging]'
+  '(-q --quiet --no-quiet --skip-quiet)'{--no-quiet,--skip-quiet}'[No minimal logging]'
+  '--version=[Run commands against a specific app version]:version'
+  '(-p --primary --no-primary --skip-primary)'{-p,--primary}'[Run commands only on primary host instead of all]'
+  '(-p --primary --no-primary --skip-primary)'{--no-primary,--skip-primary}'[Do not run commands only on primary host]'
+  '(-h --hosts)'{-h,--hosts=}'[Run commands on these hosts instead of all]:hosts'
+  '(-r --roles)'{-r,--roles=}'[Run commands on these roles instead of all]:roles'
+  '(-c --config-file)'{-c,--config-file=}'[Path to config file]:config file:_files'
+  '(-d --destination)'{-d,--destination=}'[Specify destination to be used for config file]:destination:_kamal_destinations'
+  '(-H --skip-hooks)'{-H,--skip-hooks}'[Do not run hooks]'
+)
+
+_kamal() {
+  local context state state_descr line curcontext="$curcontext"
+  typeset -A opt_args
+
+  local ret=1
+
+  _arguments -C \
+    $_kamal_flags \
+    '1: :->command' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (command)
+      # First argument - show available commands
+      _describe -t kamal-commands "Kamal commands" _kamal_commands && ret=0
+      ;;
+    (args)
+      # Subsequent arguments - handle based on the command
+      case $words[1] in
+        (accessory)
+          _kamal_accessory && ret=0
+          ;;
+        (app)
+          _kamal_app && ret=0
+          ;;
+        (audit)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (build)
+          _kamal_build && ret=0
+          ;;
+        (config)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (deploy)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (details)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (docs)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (help)
+          _kamal_help && ret=0
+          ;;
+        (init)
+          local -a init_flags
+          init_flags=(
+            $_kamal_flags
+            '(--bundle --no-bundle --skip-bundle)--bundle[Add Kamal to the Gemfile and create a bin/kamal binstub]'
+            '(--bundle --no-bundle --skip-bundle)--no-bundle[Do not add Kamal to the Gemfile and create a bin/kamal binstub]'
+            '(--bundle --no-bundle --skip-bundle)--skip-bundle[Skip add Kamal to the Gemfile and create a bin/kamal binstub]'
+          )
+          _arguments $init_flags && ret=0
+          ;;
+        (lock)
+          _kamal_lock && ret=0
+          ;;
+        (proxy)
+          _kamal_proxy && ret=0
+          ;;
+        (prune)
+          _kamal_prune && ret=0
+          ;;
+        (redeploy)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (registry)
+          _kamal_registry && ret=0
+          ;;
+        (remove)
+          local -a remove_flags
+          remove_flags=(
+            $_kamal_flags
+            '(-y --confirmed --no-confirmed --skip-confirmed)'{-y,--confirmed}'[Proceed without confirmation question]'
+            '(-y --confirmed --no-confirmed --skip-confirmed)--no-confirmed[Proceed without confirmation question]'
+            '(-y --confirmed --no-confirmed --skip-confirmed)--skip-confirmed[Proceed without confirmation question]'
+          )
+          _arguments $remove_flags && ret=0
+          ;;
+        (rollback)
+          if (( CURRENT == 2 )); then
+            _kamal_message "Enter the version to rollback to" && ret=0
+          else
+            _values $_kamal_flags && ret=0
+          fi
+          ;;
+        (secrets)
+          _kamal_secrets && ret=0
+          ;;
+        (server)
+          _kamal_server && ret=0
+          ;;
+        (setup)
+          local -a setup_flags
+          setup_flags=(
+            $_kamal_flags
+            '(-P --skip-push)'{-P,--skip-push}'[Skip image build and push]'
+          )
+          _arguments $setup_flags && ret=0
+          ;;
+        (upgrade)
+          local -a upgrade_flags
+          upgrade_flags=(
+            $_kamal_flags
+            '(-y --confirmed --no-confirmed --skip-confirmed)'{-y,--confirmed}'[Proceed without confirmation question]'
+            '(-y --confirmed --no-confirmed --skip-confirmed)--no-confirmed[Do not proceed without confirmation question]'
+            '(-y --confirmed --no-confirmed --skip-confirmed)--skip-confirmed[Skip confirmation question]'
+            '(--rolling --no-rolling --skip-rolling)--rolling[Upgrade one host at a time]'
+            '(--rolling --no-rolling --skip-rolling)--no-rolling[Do not upgrade one host at a time]'
+            '(--rolling --no-rolling --skip-rolling)--skip-rolling[Skip rolling upgrade]'
+          )
+          _arguments $upgrade_flags && ret=0
+          ;;
+        (version)
+          _arguments $_kamal_flags && ret=0
+      esac
+    ;;
+  esac
+
+  return ret
+}
+
+_kamal_accessory() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  # Define accessory subcommands
+  local -a accessory_subcommands
+  accessory_subcommands=(
+    "boot:Boot new accessory service on host (use NAME=all to boot all accessories)"
+    "details:Show details about accessory on host (use NAME=all to show all accessories)"
+    "exec:Execute a custom command on servers within the accessory container (use --help to show options)"
+    "help:Describe subcommands or one specific subcommand"
+    "logs:Show log lines from accessory on host (use --help to show options)"
+    "reboot:Reboot existing accessory on host (stop container, remove container, start new container; use NAME=all to boot all accessories)"
+    "remove:Remove accessory container, image and data directory from host (use NAME=all to remove all accessories)"
+    "restart:Restart existing accessory container on host"
+    "start:Start existing accessory container on host"
+    "stop:Stop existing accessory container on host"
+    "upgrade:Upgrade accessories from Kamal 1.x to 2.0 (restart them in 'kamal' network)"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t accessory-commands "Kamal accessory commands" accessory_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (boot|details|exec|logs|reboot|remove|restart|start|stop)
+          # These commands require a NAME parameter
+          if (( CURRENT == 2 )); then
+            # At the NAME position - we could add accessory name completion here
+            # if we had a way to list available accessories
+            _kamal_message "Specify an accessory name (or 'all' for all accessories)" && ret=0
+          elif [[ "$words[1]" == "exec" && CURRENT == 3 ]]; then
+            # For exec, the 3rd argument is a command
+            _kamal_message "Enter a command to execute" && ret=0
+          elif (( CURRENT > 2 )) && [[ "$words[1]" != "exec" || CURRENT > 3 ]]; then
+            _values $_kamal_flags && ret=0
+          fi
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          accessory_subcommands=("${(@)accessory_subcommands:#help*}")
+          _describe -t accessory-help-commands "Kamal accessory help commands" accessory_subcommands
+          ;;
+        (upgrade)
+          # For upgrade, show flags immediately
+          _arguments $_kamal_flags && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_app() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a app_subcommands
+  app_subcommands=(
+    "boot:Boot app on servers (or reboot app if already running)"
+    "containers:Show app containers on servers"
+    "details:Show details about app containers"
+    "exec:Execute a custom command on servers within the app container (use --help to show options)"
+    "help:Describe subcommands or one specific subcommand"
+    "images:Show app images on servers"
+    "logs:Show log lines from app on servers (use --help to show options)"
+    "remove:Remove app containers and images from servers"
+    "stale_containers:Detect app stale containers"
+    "start:Start existing app container on servers"
+    "stop:Stop app container on servers"
+    "version:Show app version currently running on servers"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t app-commands "Kamal app commands" app_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (boot|containers|details|images|logs|remove|stale_containers|start|stop)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (exec)
+          # For exec, the next argument is a command
+          if (( CURRENT == 2 )); then
+            _kamal_message "Enter a command to execute" && ret=0
+          else
+            _values $_kamal_flags && ret=0
+          fi
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          app_subcommands=("${(@)app_subcommands:#help*}")
+          _describe -t app-help-commands "Kamal app help commands" app_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_build() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a build_subcommands
+  build_subcommands=(
+    "create:Create a build setup"
+    "deliver:Build app and push app image to registry then pull image on servers"
+    "details:Show build setup"
+    "dev:Build using the working directory, tag it as dirty, and push to local image store."
+    "help:Describe subcommands or one specific subcommand"
+    "pull:Pull app image from registry onto servers"
+    "push:Build and push app image to registry"
+    "remove:Remove build setup"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t build-commands "Kamal build commands" build_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (create|deliver|details|dev|pull|push|remove)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          build_subcommands=("${(@)build_subcommands:#help*}")
+          _describe -t build-help-commands "Kamal build help commands" build_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_help() {
+  local ret=1
+
+  # Make sure kamal_commands is initialized properly
+  # if (( ${#kamal_commands} == 0 )); then
+  #   _kamal_commands >/dev/null
+  # fi
+
+  # If we already have a command after "help", return without suggestions
+  if (( CURRENT > 2 )); then
+    ret=0
+  else
+    local -a help_commands
+    # Filter out help from the list of commands
+    help_commands=("${(@)_kamal_commands:#help}")
+
+    _values 'Kamal help' $help_commands && ret=0
+  fi
+
+  return ret
+}
+
+_kamal_lock() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a lock_subcommands
+  lock_subcommands=(
+    "acquire:Acquire the deploy lock"
+    "help:Describe subcommands or one specific subcommand"
+    "release:Release the deploy lock"
+    "status:Report lock status"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t lock-commands "Kamal lock commands" lock_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (acquire)
+          local -a acquire_flags
+          acquire_flags=(
+            $_kamal_flags
+            '(-m --message)'{-m,--message=}'[A lock message]:message:' # Required flag
+          )
+          _arguments $acquire_flags && ret=0
+          ;;
+        (release|status)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          lock_subcommands=("${(@)lock_subcommands:#help*}")
+          _describe -t lock-help-commands "Kamal lock help commands" lock_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_proxy() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a proxy_subcommands
+  proxy_subcommands=(
+    "boot:Boot proxy on servers"
+    "boot_config:Manage kamal-proxy boot configuration"
+    "details:Show details about proxy container from servers"
+    "help:Describe subcommands or one specific subcommand"
+    "logs:Show log lines from proxy on servers"
+    "reboot:Reboot proxy on servers (stop container, remove container, start new container)"
+    "remove:Remove proxy container and image from servers"
+    "restart:Restart existing proxy container on servers"
+    "start:Start existing proxy container on servers"
+    "stop:Stop existing proxy container on servers"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t proxy-commands "Kamal proxy commands" proxy_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (boot|details|logs|reboot|remove|restart|start|stop)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (boot_config)
+          if (( CURRENT == 2 )); then
+            local -a boot_config_commands=(
+              "set:Set boot configuration"
+              "get:Get boot configuration"
+              "reset:Reset boot configuration"
+            )
+            _describe -t boot-config-commands "Boot config commands" boot_config_commands && ret=0
+          else
+            _values $_kamal_flags && ret=0
+          fi
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          proxy_subcommands=("${(@)proxy_subcommands:#help*}")
+          _describe -t proxy-help-commands "Kamal proxy help commands" proxy_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_prune() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a prune_subcommands
+  prune_subcommands=(
+    "all:Prune unused images and stopped containers"
+    "containers:Prune all stopped containers, except the last n (default 5)"
+    "help:Describe subcommands or one specific subcommand"
+    "images:Prune unused images"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t prune-commands "Kamal prune commands" prune_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (all|containers|images)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          prune_subcommands=("${(@)prune_subcommands:#help*}")
+          _describe -t prune-help-commands "Kamal prune help commands" prune_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_registry() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a registry_subcommands
+  registry_subcommands=(
+    "help:Describe subcommands or one specific subcommand"
+    "login:Log in to registry locally and remotely"
+    "logout:Log out of registry locally and remotely"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t registry-commands "Kamal registry commands" registry_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (help)
+          # Remove help itself from the list of commands
+          registry_subcommands=("${(@)registry_subcommands:#help*}")
+          _describe -t registry-help-commands "Kamal registry help commands" registry_subcommands
+          ;;
+        (login|logout)
+          _arguments $_kamal_flags && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_secrets() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a secrets_subcommands
+  secrets_subcommands=(
+    "extract:Extract a single secret from the results of a fetch call"
+    "fetch:Fetch secrets from a vault"
+    "help:Describe subcommands or one specific subcommand"
+    "print:Print the secrets (for debugging)"
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t secrets-commands "Kamal secrets commands" secrets_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (fetch)
+          local -a fetch_flags
+          fetch_flags=(
+            $_kamal_flags
+            '(-a --adapter)'{-a,--adapter=}'[Secret storage adapter]:adapter:(aws-parameter-store)'
+          )
+          _arguments $fetch_flags && ret=0
+          ;;
+        (extract|print)
+          _arguments $_kamal_flags && ret=0
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          secrets_subcommands=("${(@)secrets_subcommands:#help*}")
+          _describe -t secrets-help-commands "Kamal secrets help commands" secrets_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal_server() {
+  local context state line
+  typeset -A opt_args
+  local ret=1
+
+  local -a server_subcommands
+  server_subcommands=(
+    "bootstrap:Set up Docker to run Kamal apps"
+    "exec:Run a custom command on the server (use --help to show options)"
+    "help:Describe subcommands or one specific subcommand"
+  )
+
+  local -a server_flags
+  server_flags=(
+    $_kamal_flags
+    '(-i --interactive --no-interactive --skip-interactive)'{-i,--interactive}'[Run the command interactively]'
+    '(-i --interactive --no-interactive --skip-interactive)--no-interactive[Do not run the command interactively]'
+    '(-i --interactive --no-interactive --skip-interactive)--skip-interactive[Skip interactive mode]'
+  )
+
+  _arguments -C \
+    '1: :->subcmd' \
+    '*:: :->args' && ret=0
+
+  case $state in
+    (subcmd)
+      _describe -t server-commands "Kamal server commands" server_subcommands && ret=0
+      ;;
+    (args)
+      case $words[1] in
+        (bootstrap)
+          _arguments $server_flags && ret=0
+          ;;
+        (exec)
+          if (( CURRENT == 2 )); then
+            # For exec, the next argument is a command
+            _kamal_message "Enter a command to execute" && ret=0
+          else
+            _values $server_flags && ret=0
+          fi
+          ;;
+        (help)
+          # Remove help itself from the list of commands
+          server_subcommands=("${(@)server_subcommands:#help*}")
+          _describe -t server-help-commands "Kamal server help commands" server_subcommands
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+_kamal "$@"
\ No newline at end of file
diff --git a/zsh/plugins/kamal/kamal.plugin.zsh b/zsh/plugins/kamal/kamal.plugin.zsh
new file mode 100644
index 0000000..e21ab4f
--- /dev/null
+++ b/zsh/plugins/kamal/kamal.plugin.zsh
@@ -0,0 +1,25 @@
+# Find kamal binary (local ./bin/kamal or global)
+function _kamal_command () {
+  if [ -x "./bin/kamal" ]; then
+    ./bin/kamal "$@"
+  else
+    command kamal "$@"
+  fi
+}
+
+function which-kamal() {
+  if [ -x "./bin/kamal" ]; then
+    echo "Using local ./bin/kamal"
+  else
+    echo "Using global $(command -v kamal)"
+  fi
+}
+
+# Use `_kamal_command`` function for `kamal` command
+alias kamal='_kamal_command'
+
+# Aliases
+alias kad='kamal deploy'
+
+# Hook up completion
+compdef _kamal_command=kamal
diff --git a/zsh/plugins/keychain/keychain.plugin.zsh b/zsh/plugins/keychain/keychain.plugin.zsh
index f122f79..23cf1af 100644
--- a/zsh/plugins/keychain/keychain.plugin.zsh
+++ b/zsh/plugins/keychain/keychain.plugin.zsh
@@ -19,8 +19,16 @@ function {
 	# load additional options
 	zstyle -a :omz:plugins:keychain options options
 
-	# start keychain...
-	keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST
+	# Check keychain version to decide whether to use --agents
+	local version_string=$(keychain --version 2>&1)
+  # start keychain, only use --agents for versions below 2.9.0
+	autoload -Uz is-at-least
+	if [[ "$version_string" =~ 'keychain ([0-9]+\.[0-9]+)' ]] && \
+      is-at-least 2.9 "$match[1]"; then
+		keychain ${^options:-} ${^identities} --host $SHORT_HOST
+	else
+		keychain ${^options:-} --agents ${agents:-gpg} ${^identities} --host $SHORT_HOST
+	fi
 
 	# Get the filenames to store/lookup the environment from
 	_keychain_env_sh="$HOME/.keychain/$SHORT_HOST-sh"
diff --git a/zsh/plugins/kind/README.md b/zsh/plugins/kind/README.md
new file mode 100644
index 0000000..4902464
--- /dev/null
+++ b/zsh/plugins/kind/README.md
@@ -0,0 +1,22 @@
+# Kind plugin
+
+This plugin adds completion for the [Kind](https://kind.sigs.k8s.io/) tool, as well
+as a few aliases for easier use.
+
+To use it, add `kind` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... kind)
+```
+
+## Aliases
+
+| Alias   | Command                      |
+| ------- | ---------------------------- |
+| `kicc`  | `kind create cluster`        |
+| `kiccn` | `kind create cluster --name` |
+| `kigc`  | `kind get clusters`          |
+| `kidc`  | `kind delete cluster`        |
+| `kidcn` | `kind delete cluster --name` |
+| `kidca` | `kind delete clusters -A`    |
+| `kigk`  | `kind get kubeconfig`        |
diff --git a/zsh/plugins/kind/kind.plugin.zsh b/zsh/plugins/kind/kind.plugin.zsh
new file mode 100644
index 0000000..183eb7b
--- /dev/null
+++ b/zsh/plugins/kind/kind.plugin.zsh
@@ -0,0 +1,23 @@
+if (( ! $+commands[kind] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `kind`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_kind" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _kind
+  _comps[kind]=_kind
+fi
+
+# Generate and load kind completion
+kind completion zsh >! "$ZSH_CACHE_DIR/completions/_kind" &|
+
+# Register aliases
+alias kicc="kind create cluster"
+alias kiccn="kind create cluster --name"
+alias kigc="kind get clusters"
+alias kidc="kind delete cluster"
+alias kidcn="kind delete cluster --name"
+alias kidca="kind delete clusters -A"
+alias kigk="kind get kubeconfig"
diff --git a/zsh/plugins/kitchen/_kitchen b/zsh/plugins/kitchen/_kitchen
index d93d93d..64c01e3 100644
--- a/zsh/plugins/kitchen/_kitchen
+++ b/zsh/plugins/kitchen/_kitchen
@@ -1,6 +1,6 @@
 #compdef kitchen
 # ------------------------------------------------------------------------------
-# Copyright (c) 2014 Github zsh-users - https://github.com/zsh-users
+# Copyright (c) 2014 GitHub zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/zsh/plugins/kitty/README.md b/zsh/plugins/kitty/README.md
new file mode 100644
index 0000000..ec9e375
--- /dev/null
+++ b/zsh/plugins/kitty/README.md
@@ -0,0 +1,23 @@
+# Kitty plugin
+
+This plugin adds a few aliases and functions that are useful for users of the [Kitty](https://sw.kovidgoyal.net/kitty/) terminal.
+
+To use it, add _kitty_ to the plugins array of your zshrc file:
+```
+plugins=(... kitty)
+```
+
+## Plugin commands
+
+* `kssh`
+  Runs a kitten ssh session that ensures your terminfo settings are copied
+  correctly to the remote hose.
+* `kssh-slow`
+  A slower form of `kssh` that should always work. Use this if `kssh` fails
+  to set terminfo correctly for you on the remote host.
+* `kitty-theme`
+  Browse and change the theme of your Kitty terminal.
+
+## Contributors
+
+- [Ian Chesal](https://github.com/ianchesal)
diff --git a/zsh/plugins/kitty/kitty.plugin.zsh b/zsh/plugins/kitty/kitty.plugin.zsh
new file mode 100644
index 0000000..1094236
--- /dev/null
+++ b/zsh/plugins/kitty/kitty.plugin.zsh
@@ -0,0 +1,16 @@
+#####################################################
+# Kitty plugin for oh-my-zsh                        #
+#####################################################
+
+if [[ "$TERM" == 'xterm-kitty' ]]; then
+  ## kssh
+  # Use this when your terminfo isn't recognized on remote hosts.
+  # See: https://sw.kovidgoyal.net/kitty/faq/#i-get-errors-about-the-terminal-being-unknown-or-opening-the-terminal-failing-when-sshing-into-a-different-computer
+  alias kssh="kitty +kitten ssh"
+  compdef kssh='ssh'
+  # Use this if kssh fails
+  alias kssh-slow="infocmp -a xterm-kitty | ssh myserver tic -x -o \~/.terminfo /dev/stdin"
+
+  # Change the colour theme
+  alias kitty-theme="kitty +kitten themes"
+fi
diff --git a/zsh/plugins/kn/kn.plugin.zsh b/zsh/plugins/kn/kn.plugin.zsh
index f60177d..483d1d6 100644
--- a/zsh/plugins/kn/kn.plugin.zsh
+++ b/zsh/plugins/kn/kn.plugin.zsh
@@ -4,5 +4,5 @@
 
 if [ $commands[kn] ]; then
   source <(kn completion zsh)
-  compdef _kn kn 
+  compdef _kn kn
 fi
diff --git a/zsh/plugins/kompose/README.md b/zsh/plugins/kompose/README.md
new file mode 100644
index 0000000..e86d926
--- /dev/null
+++ b/zsh/plugins/kompose/README.md
@@ -0,0 +1,12 @@
+# kompose
+
+This plugin provides completion for [kompose](https://github.com/kubernetes/kompose),
+to migrate from docker compose to Kubernetes resource definitions.
+
+To use it, add `kompose` to the plugins array in your zshrc file.
+
+```
+plugins=(... kompose)
+```
+
+**Author:** [@kevinkirkup](https://github.com/kevinkirkup)
diff --git a/zsh/plugins/kompose/kompose.plugin.zsh b/zsh/plugins/kompose/kompose.plugin.zsh
new file mode 100644
index 0000000..764e724
--- /dev/null
+++ b/zsh/plugins/kompose/kompose.plugin.zsh
@@ -0,0 +1,3 @@
+if [ $commands[kompose] ]; then
+  source <(kompose completion zsh)
+fi
diff --git a/zsh/plugins/kube-ps1/LICENSE b/zsh/plugins/kube-ps1/LICENSE
new file mode 100644
index 0000000..261eeb9
--- /dev/null
+++ b/zsh/plugins/kube-ps1/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
diff --git a/zsh/plugins/kube-ps1/README.md b/zsh/plugins/kube-ps1/README.md
index 1ed3e44..ef6d781 100644
--- a/zsh/plugins/kube-ps1/README.md
+++ b/zsh/plugins/kube-ps1/README.md
@@ -1,50 +1,82 @@
-kube-ps1: Kubernetes prompt for bash and zsh
-============================================
+# kube-ps1: Kubernetes prompt for bash and zsh
+
+![GitHub Release](https://img.shields.io/github/v/release/jonmosco/kube-ps1)
+[![CI](https://github.com/jonmosco/kube-ps1/actions/workflows/ci.yml/badge.svg)](https://github.com/jonmosco/kube-ps1/actions/workflows/ci.yml)
 
 A script that lets you add the current Kubernetes context and namespace
 configured on `kubectl` to your Bash/Zsh prompt strings (i.e. the `$PS1`).
 
 Inspired by several tools used to simplify usage of `kubectl`.
 
+![prompt demo](img/kube-ps1-demo.gif)
+
 ## Installing
 
-### MacOS
+### Packages
+
+### MacOS Brew Ports
 
 Homebrew package manager:
 
+```sh
+brew update
+brew install kube-ps1
 ```
-$ brew update
-$ brew install kube-ps1
+
+### Arch Linux
+
+AUR Package available at [https://aur.archlinux.org/packages/kube-ps1/](https://aur.archlinux.org/packages/kube-ps1/).
+
+### Oh My Zsh
+
+https://github.com/ohmyzsh/ohmyzsh
+
+kube-ps1 is included as a plugin in the oh-my-zsh project.  To enable it, edit your `~/.zshrc` and
+add the plugin:
+
+```bash
+plugins=(
+  kube-ps1
+)
+PROMPT='$(kube_ps1)'$PROMPT # or RPROMPT='$(kube_ps1)'
 ```
-### From Source
+
+## Zsh zinit plugin
+
+### Using [zinit](https://github.com/zdharma-continuum/zinit)
+
+Update `.zshrc` with:
+
+```sh
+zinit light jonmosco/kube-ps1
+PROMPT='$(kube_ps1)'$PROMPT # or RPROMPT='$(kube_ps1)'
+```
+
+### Fig
+
+Install `kube-ps1` in zsh, bash, or fish with one click.
+
+<a href="https://fig.io/plugins/other/kube-ps1" target="_blank"><img src="https://fig.io/badges/install-with-fig.svg" width="120" /></a>
+
+### From Source (git clone)
 
 1. Clone this repository
 2. Source the kube-ps1.sh in your `~/.zshrc` or your `~/.bashrc`
 
-### Arch Linux
-AUR Package available at [https://aur.archlinux.org/packages/kube-ps1/](https://aur.archlinux.org/packages/kube-ps1/).
-
 #### Zsh
+
 ```sh
 source /path/to/kube-ps1.sh
-PROMPT='$(kube_ps1)'$PROMPT
+PROMPT='$(kube_ps1)'$PROMPT # or RPROMPT='$(kube_ps1)'
 ```
+
 #### Bash
+
 ```sh
 source /path/to/kube-ps1.sh
 PS1='[\u@\h \W $(kube_ps1)]\$ '
 ```
 
-### Zsh Plugin Managers
-
-#### Using [zplugin](https://github.com/zdharma/zplugin)
-
-Update `.zshrc` with:
-```sh
-zplugin light jonmosco/kube-ps1
-PROMPT='$(kube_ps1)'$PROMPT
-```
-
 ## Requirements
 
 The default prompt assumes you have the `kubectl` command line utility installed.
@@ -55,22 +87,23 @@ Official installation instructions and binaries are available:
 If using this with OpenShift, the `oc` tool needs installed.  It can be obtained
 from brew ports:
 
-```
+```sh
 brew install openshift-cli
 ```
+
 or the source can be downloaded:
 
-[OC Client Tools](https://www.openshift.org/download.html)
+[OC Client Tools](https://github.com/okd-project/okd/releases)
 
-Set the binary to `oc` with the following environment variable:
+Set the binary to `oc` with the following variable:
 
-```
+```sh
 KUBE_PS1_BINARY=oc
 ```
 
 If neither binary is available, the prompt will print the following:
 
-```
+```sh
 (<symbol>|BINARY-N/A:N/A)
 ```
 
@@ -91,13 +124,13 @@ tmux, and like the functionality provided by kube-ps1, checkout the
 
 The default prompt layout is:
 
-```
+```sh
 (<symbol>|<context>:<namespace>)
 ```
 
 If the current-context is not set, kube-ps1 will return the following:
 
-```
+```sh
 (<symbol>|N/A:N/A)
 ```
 
@@ -108,7 +141,7 @@ run `kubeoff`. To disable the prompt for all shell sessions, run `kubeoff -g`.
 You can enable it again in the current shell by running `kubeon`, and globally
 with `kubeon -g`.
 
-```
+```sh
 kubeon     : turn on kube-ps1 status for this shell.  Takes precedence over
              global setting for current session
 kubeon -g  : turn on kube-ps1 status globally
@@ -117,38 +150,69 @@ kubeoff    : turn off kube-ps1 status for this shell. Takes precedence over
 kubeoff -g : turn off kube-ps1 status globally
 ```
 
+## Symbol
+
+The default symbols are UTF8 and should work with most fonts. If you want to use the Kubernetes and OpenShift
+glyphs, you need to install a patched font that contains the glyph. [Nerd Fonts](https://www.nerdfonts.com/) provides both glyphs. Follow their installation instructions to install the patched font.
+
+`KUBE_PS1_SYMBOL_CUSTOM` options
+
+| Options | Symbol | Description |
+| ------------- | ------ | ----------- |
+| default (empty string) | ⎈ | Default symbol (Unicode `\u2388`) |
+| img | ☸️ | Symbol often used to represent Kubernetes (Unicode `\u2638`) |
+| oc | ![openshift-glyph](img/openshift-glyph.png) | Symbol representing OpenShift (Unicode `\ue7b7`) |
+| k8s | ![k8s-glyph](img/k8s-glyph.png) | Symbol representing Kubernetes (Unicode `\ue7b7`) |
+
+To set the symbol to one of the custom glyphs, add the following to your `~/.bashrc` or `~/.zshrc`:
+
+```sh
+KUBE_PS1_SYMBOL_CUSTOM=img
+```
+
+To set the symbol to the default, set the `KUBE_PS1_SYMBOL` to an empty string.
+
+Heres a demo of the symbols in action:
+![kube-ps1-symbols](img/kube-ps1-symbol-demo.gif)
+
+If the font is not properly installed, and the glyph is not available, it will display an empty set of brackets or similar:
+
+```sh
+ echo -n "\ue7b7"
+ 
+```
+
 ## Customization
 
 The default settings can be overridden in `~/.bashrc` or `~/.zshrc` by setting
-the following environment variables:
+the following variables:
 
 | Variable | Default | Meaning |
 | :------- | :-----: | ------- |
 | `KUBE_PS1_BINARY` | `kubectl` | Default Kubernetes binary |
 | `KUBE_PS1_NS_ENABLE` | `true` | Display the namespace. If set to `false`, this will also disable `KUBE_PS1_DIVIDER` |
-| `KUBE_PS1_PREFIX` | `(` | Prompt opening character  |
-| `KUBE_PS1_SYMBOL_ENABLE` | `true ` | Display the prompt Symbol. If set to `false`, this will also disable `KUBE_PS1_SEPARATOR` |
+| `KUBE_PS1_PREFIX` | `(` | Prompt opening character |
+| `KUBE_PS1_SYMBOL_ENABLE` | `true` | Display the prompt Symbol. If set to `false`, this will also disable `KUBE_PS1_SEPARATOR` |
 | `KUBE_PS1_SYMBOL_PADDING` | `false` | Adds a space (padding) after the symbol to prevent clobbering prompt characters |
-| `KUBE_PS1_SYMBOL_DEFAULT` | `⎈ ` | Default prompt symbol. Unicode `\u2388` |
-| `KUBE_PS1_SYMBOL_USE_IMG` | `false` | ☸️  ,  Unicode `\u2638` as the prompt symbol |
+| `KUBE_PS1_SYMBOL_CUSTOM` | `⎈` | Change the Default prompt symbol. Unicode `\u2388`.  Options are `k8s`, `img`, `oc` |
+| `KUBE_PS1_SYMBOL_COLOR` | `blue` | Change the Default symbol color. |
 | `KUBE_PS1_SEPARATOR` | &#124; | Separator between symbol and context name |
 | `KUBE_PS1_DIVIDER` | `:` | Separator between context and namespace |
 | `KUBE_PS1_SUFFIX` | `)` | Prompt closing character |
 | `KUBE_PS1_CLUSTER_FUNCTION` | No default, must be user supplied | Function to customize how cluster is displayed |
 | `KUBE_PS1_NAMESPACE_FUNCTION` | No default, must be user supplied | Function to customize how namespace is displayed |
-
-For terminals that do not support UTF-8, the symbol will be replaced with the
-string `k8s`.
+| `KUBE_PS1_CTX_COLOR_FUNCTION` | No default, must be user supplied | Function to customize context color based on context name |
+| `KUBE_PS1_HIDE_IF_NOCONTEXT` | `false` | Hide the kube-ps1 prompt if no context is set |
 
 To disable a feature, set it to an empty string:
 
-```
+```sh
 KUBE_PS1_SEPARATOR=''
 ```
 
 ## Colors
 
-The default colors are set with the following environment variables:
+The default colors are set with the following variables:
 
 | Variable | Default | Meaning |
 | :------- | :-----: | ------- |
@@ -166,13 +230,13 @@ namespace.
 Set the variable to an empty string if you do not want color for each
 prompt section:
 
-```
+```sh
 KUBE_PS1_CTX_COLOR=''
 ```
 
 Names are usable for the following colors:
 
-```
+```text
 black, red, green, yellow, blue, magenta, cyan
 ```
 
@@ -216,6 +280,45 @@ export KUBE_PS1_NAMESPACE_FUNCTION=get_namespace_upper
 
 In both cases, the variable is set to the name of the function, and you must have defined the function in your shell configuration before kube_ps1 is called. The function must accept a single parameter and echo out the final value.
 
+## Dynamic Context Colors
+
+You can set different colors for different contexts using the
+`KUBE_PS1_CTX_COLOR_FUNCTION` variable. This is useful for color-coding
+contexts to make production environments stand out visually.
+
+For example, to make production contexts red and development contexts green:
+
+```sh
+function kube_ps1_ctx_color() {
+  local context="$1"
+
+  case "$context" in
+    *prod*)
+      echo "red"
+      ;;
+    *dev*)
+      echo "green"
+      ;;
+    *staging*|*stg*)
+      echo "yellow"
+      ;;
+    *)
+      echo "cyan"  # default color for other contexts
+      ;;
+  esac
+}
+
+export KUBE_PS1_CTX_COLOR_FUNCTION=kube_ps1_ctx_color
+```
+
+The function receives the context name as the first parameter and should echo
+the desired color name. All color options supported by `KUBE_PS1_CTX_COLOR` are
+available, including named colors (black, red, green, yellow, blue, magenta,
+cyan, white) and 256-color codes (0-256).
+
+If `KUBE_PS1_CTX_COLOR_FUNCTION` is not set, kube-ps1 will use the value of
+`KUBE_PS1_CTX_COLOR` (default: red).
+
 ### Bug Reports and shell configuration
 
 Due to the vast ways of customizing the shell, please try the prompt with a
@@ -224,18 +327,28 @@ minimal configuration before submitting a bug report.
 This can be done as follows for each shell before loading kube-ps1:
 
 Bash:
-```bash
+
+```sh
 bash --norc
 ```
 
 Zsh:
-```bash
+
+```sh
 zsh -f
 or
 zsh --no-rcs
 ```
 
-## Contributors
+For the prompt symbol, a patched font that contains the glyphs must be installed.
+[Nerd Fonts Downloads](https://www.nerdfonts.com/font-downloads) provides patched
+fonts containing the glyphs.  Please consult their documentation for this, support
+is out of scope for this project.
 
-* [Ahmet Alp Balkan](https://github.com/ahmetb)
-* Jared Yanovich
+### Contributors
+
+Thank you to everyone in the community for their contributions to kube-ps1!
+
+<a href="https://github.com/jonmosco/kube-ps1/graphs/contributors">
+  <img src="https://contrib.rocks/image?repo=jonmosco/kube-ps1" />
+</a>
diff --git a/zsh/plugins/kube-ps1/kube-ps1.plugin.zsh b/zsh/plugins/kube-ps1/kube-ps1.plugin.zsh
index 894e0f7..9dcd6da 100644
--- a/zsh/plugins/kube-ps1/kube-ps1.plugin.zsh
+++ b/zsh/plugins/kube-ps1/kube-ps1.plugin.zsh
@@ -3,7 +3,7 @@
 # Kubernetes prompt helper for bash/zsh
 # Displays current context and namespace
 
-# Copyright 2021 Jon Mosco
+# Copyright 2026 Jon Mosco
 #
 #  Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -24,9 +24,9 @@
 # Override these values in ~/.zshrc or ~/.bashrc
 KUBE_PS1_BINARY="${KUBE_PS1_BINARY:-kubectl}"
 KUBE_PS1_SYMBOL_ENABLE="${KUBE_PS1_SYMBOL_ENABLE:-true}"
-KUBE_PS1_SYMBOL_DEFAULT=${KUBE_PS1_SYMBOL_DEFAULT:-$'\u2388'}
 KUBE_PS1_SYMBOL_PADDING="${KUBE_PS1_SYMBOL_PADDING:-false}"
-KUBE_PS1_SYMBOL_USE_IMG="${KUBE_PS1_SYMBOL_USE_IMG:-false}"
+KUBE_PS1_SYMBOL_COLOR="${KUBE_PS1_SYMBOL_COLOR:-}"
+
 KUBE_PS1_NS_ENABLE="${KUBE_PS1_NS_ENABLE:-true}"
 KUBE_PS1_CONTEXT_ENABLE="${KUBE_PS1_CONTEXT_ENABLE:-true}"
 KUBE_PS1_PREFIX="${KUBE_PS1_PREFIX-(}"
@@ -34,28 +34,28 @@ KUBE_PS1_SEPARATOR="${KUBE_PS1_SEPARATOR-|}"
 KUBE_PS1_DIVIDER="${KUBE_PS1_DIVIDER-:}"
 KUBE_PS1_SUFFIX="${KUBE_PS1_SUFFIX-)}"
 
-KUBE_PS1_SYMBOL_COLOR="${KUBE_PS1_SYMBOL_COLOR-blue}"
-KUBE_PS1_CTX_COLOR="${KUBE_PS1_CTX_COLOR-red}"
-KUBE_PS1_NS_COLOR="${KUBE_PS1_NS_COLOR-cyan}"
-KUBE_PS1_BG_COLOR="${KUBE_PS1_BG_COLOR}"
+KUBE_PS1_HIDE_IF_NOCONTEXT="${KUBE_PS1_HIDE_IF_NOCONTEXT:-false}"
 
-KUBE_PS1_KUBECONFIG_CACHE="${KUBECONFIG}"
-KUBE_PS1_DISABLE_PATH="${HOME}/.kube/kube-ps1/disabled"
-KUBE_PS1_LAST_TIME=0
-KUBE_PS1_CLUSTER_FUNCTION="${KUBE_PS1_CLUSTER_FUNCTION}"
-KUBE_PS1_NAMESPACE_FUNCTION="${KUBE_PS1_NAMESPACE_FUNCTION}"
+_KUBE_PS1_KUBECONFIG_CACHE="${KUBECONFIG}"
+_KUBE_PS1_DISABLE_PATH="${HOME}/.kube/kube-ps1/disabled"
+_KUBE_PS1_LAST_TIME=0
 
 # Determine our shell
-if [ "${ZSH_VERSION-}" ]; then
-  KUBE_PS1_SHELL="zsh"
-elif [ "${BASH_VERSION-}" ]; then
-  KUBE_PS1_SHELL="bash"
-fi
+_kube_ps1_shell_type() {
+  local _KUBE_PS1_SHELL_TYPE
+
+  if [ "${ZSH_VERSION-}" ]; then
+    _KUBE_PS1_SHELL_TYPE="zsh"
+  elif [ "${BASH_VERSION-}" ]; then
+    _KUBE_PS1_SHELL_TYPE="bash"
+  fi
+  echo $_KUBE_PS1_SHELL_TYPE
+}
 
 _kube_ps1_init() {
-  [[ -f "${KUBE_PS1_DISABLE_PATH}" ]] && KUBE_PS1_ENABLED=off
+  [[ -f "${_KUBE_PS1_DISABLE_PATH}" ]] && KUBE_PS1_ENABLED=off
 
-  case "${KUBE_PS1_SHELL}" in
+  case "$(_kube_ps1_shell_type)" in
     "zsh")
       _KUBE_PS1_OPEN_ESC="%{"
       _KUBE_PS1_CLOSE_ESC="%}"
@@ -63,7 +63,7 @@ _kube_ps1_init() {
       _KUBE_PS1_DEFAULT_FG="%f"
       setopt PROMPT_SUBST
       autoload -U add-zsh-hook
-      add-zsh-hook precmd _kube_ps1_update_cache
+      add-zsh-hook precmd _kube_ps1_prompt_update
       zmodload -F zsh/stat b:zstat
       zmodload zsh/datetime
       ;;
@@ -72,75 +72,75 @@ _kube_ps1_init() {
       _KUBE_PS1_CLOSE_ESC=$'\002'
       _KUBE_PS1_DEFAULT_BG=$'\033[49m'
       _KUBE_PS1_DEFAULT_FG=$'\033[39m'
-      [[ $PROMPT_COMMAND =~ _kube_ps1_update_cache ]] || PROMPT_COMMAND="_kube_ps1_update_cache;${PROMPT_COMMAND:-:}"
+      [[ $PROMPT_COMMAND =~ _kube_ps1_prompt_update ]] || PROMPT_COMMAND="_kube_ps1_prompt_update;${PROMPT_COMMAND:-:}"
       ;;
   esac
 }
 
 _kube_ps1_color_fg() {
-  local KUBE_PS1_FG_CODE
+  local _KUBE_PS1_FG_CODE
   case "${1}" in
-    black) KUBE_PS1_FG_CODE=0;;
-    red) KUBE_PS1_FG_CODE=1;;
-    green) KUBE_PS1_FG_CODE=2;;
-    yellow) KUBE_PS1_FG_CODE=3;;
-    blue) KUBE_PS1_FG_CODE=4;;
-    magenta) KUBE_PS1_FG_CODE=5;;
-    cyan) KUBE_PS1_FG_CODE=6;;
-    white) KUBE_PS1_FG_CODE=7;;
+    black) _KUBE_PS1_FG_CODE=0;;
+    red) _KUBE_PS1_FG_CODE=1;;
+    green) _KUBE_PS1_FG_CODE=2;;
+    yellow) _KUBE_PS1_FG_CODE=3;;
+    blue) _KUBE_PS1_FG_CODE=4;;
+    magenta) _KUBE_PS1_FG_CODE=5;;
+    cyan) _KUBE_PS1_FG_CODE=6;;
+    white) _KUBE_PS1_FG_CODE=7;;
     # 256
-    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-6]) KUBE_PS1_FG_CODE="${1}";;
-    *) KUBE_PS1_FG_CODE=default
+    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-6]) _KUBE_PS1_FG_CODE="${1}";;
+    *) _KUBE_PS1_FG_CODE=default
   esac
 
-  if [[ "${KUBE_PS1_FG_CODE}" == "default" ]]; then
-    KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_FG}"
+  if [[ "${_KUBE_PS1_FG_CODE}" == "default" ]]; then
+    _KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_FG}"
     return
-  elif [[ "${KUBE_PS1_SHELL}" == "zsh" ]]; then
-    KUBE_PS1_FG_CODE="%F{$KUBE_PS1_FG_CODE}"
-  elif [[ "${KUBE_PS1_SHELL}" == "bash" ]]; then
+  elif [[ "$(_kube_ps1_shell_type)" == "zsh" ]]; then
+    _KUBE_PS1_FG_CODE="%F{$_KUBE_PS1_FG_CODE}"
+  elif [[ "$(_kube_ps1_shell_type)" == "bash" ]]; then
     if tput setaf 1 &> /dev/null; then
-      KUBE_PS1_FG_CODE="$(tput setaf ${KUBE_PS1_FG_CODE})"
-    elif [[ $KUBE_PS1_FG_CODE -ge 0 ]] && [[ $KUBE_PS1_FG_CODE -le 256 ]]; then
-      KUBE_PS1_FG_CODE="\033[38;5;${KUBE_PS1_FG_CODE}m"
+      _KUBE_PS1_FG_CODE="$(tput setaf "${_KUBE_PS1_FG_CODE}")"
+    elif [[ $_KUBE_PS1_FG_CODE -ge 0 ]] && [[ $_KUBE_PS1_FG_CODE -le 256 ]]; then
+      _KUBE_PS1_FG_CODE="\033[38;5;${_KUBE_PS1_FG_CODE}m"
     else
-      KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_FG}"
+      _KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_FG}"
     fi
   fi
-  echo ${_KUBE_PS1_OPEN_ESC}${KUBE_PS1_FG_CODE}${_KUBE_PS1_CLOSE_ESC}
+  echo "${_KUBE_PS1_OPEN_ESC}${_KUBE_PS1_FG_CODE}${_KUBE_PS1_CLOSE_ESC}"
 }
 
 _kube_ps1_color_bg() {
-  local KUBE_PS1_BG_CODE
+  local _KUBE_PS1_BG_CODE
   case "${1}" in
-    black) KUBE_PS1_BG_CODE=0;;
-    red) KUBE_PS1_BG_CODE=1;;
-    green) KUBE_PS1_BG_CODE=2;;
-    yellow) KUBE_PS1_BG_CODE=3;;
-    blue) KUBE_PS1_BG_CODE=4;;
-    magenta) KUBE_PS1_BG_CODE=5;;
-    cyan) KUBE_PS1_BG_CODE=6;;
-    white) KUBE_PS1_BG_CODE=7;;
+    black) _KUBE_PS1_BG_CODE=0;;
+    red) _KUBE_PS1_BG_CODE=1;;
+    green) _KUBE_PS1_BG_CODE=2;;
+    yellow) _KUBE_PS1_BG_CODE=3;;
+    blue) _KUBE_PS1_BG_CODE=4;;
+    magenta) _KUBE_PS1_BG_CODE=5;;
+    cyan) _KUBE_PS1_BG_CODE=6;;
+    white) _KUBE_PS1_BG_CODE=7;;
     # 256
-    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-6]) KUBE_PS1_BG_CODE="${1}";;
-    *) KUBE_PS1_BG_CODE=$'\033[0m';;
+    [0-9]|[1-9][0-9]|[1][0-9][0-9]|[2][0-4][0-9]|[2][5][0-6]) _KUBE_PS1_BG_CODE="${1}";;
+    *) _KUBE_PS1_BG_CODE=$'\033[0m';;
   esac
 
-  if [[ "${KUBE_PS1_BG_CODE}" == "default" ]]; then
-    KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_BG}"
+  if [[ "${_KUBE_PS1_BG_CODE}" == "default" ]]; then
+    _KUBE_PS1_FG_CODE="${_KUBE_PS1_DEFAULT_BG}"
     return
-  elif [[ "${KUBE_PS1_SHELL}" == "zsh" ]]; then
-    KUBE_PS1_BG_CODE="%K{$KUBE_PS1_BG_CODE}"
-  elif [[ "${KUBE_PS1_SHELL}" == "bash" ]]; then
+  elif [[ "$(_kube_ps1_shell_type)" == "zsh" ]]; then
+    _KUBE_PS1_BG_CODE="%K{$_KUBE_PS1_BG_CODE}"
+  elif [[ "$(_kube_ps1_shell_type)" == "bash" ]]; then
     if tput setaf 1 &> /dev/null; then
-      KUBE_PS1_BG_CODE="$(tput setab ${KUBE_PS1_BG_CODE})"
-    elif [[ $KUBE_PS1_BG_CODE -ge 0 ]] && [[ $KUBE_PS1_BG_CODE -le 256 ]]; then
-      KUBE_PS1_BG_CODE="\033[48;5;${KUBE_PS1_BG_CODE}m"
+      _KUBE_PS1_BG_CODE="$(tput setab "${_KUBE_PS1_BG_CODE}")"
+    elif [[ $_KUBE_PS1_BG_CODE -ge 0 ]] && [[ $_KUBE_PS1_BG_CODE -le 256 ]]; then
+      _KUBE_PS1_BG_CODE="\033[48;5;${_KUBE_PS1_BG_CODE}m"
     else
-      KUBE_PS1_BG_CODE="${DEFAULT_BG}"
+      _KUBE_PS1_BG_CODE="${DEFAULT_BG}"
     fi
   fi
-  echo ${OPEN_ESC}${KUBE_PS1_BG_CODE}${CLOSE_ESC}
+  echo "${_KUBE_PS1_OPEN_ESC}${_KUBE_PS1_BG_CODE}${_KUBE_PS1_CLOSE_ESC}"
 }
 
 _kube_ps1_binary_check() {
@@ -148,38 +148,60 @@ _kube_ps1_binary_check() {
 }
 
 _kube_ps1_symbol() {
+  # Exit early if symbol display is disabled
   [[ "${KUBE_PS1_SYMBOL_ENABLE}" == false ]] && return
 
-  case "${KUBE_PS1_SHELL}" in
-    bash)
-      if ((BASH_VERSINFO[0] >= 4)) && [[ $'\u2388' != "\\u2388" ]]; then
-        KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_DEFAULT}"
-        KUBE_PS1_SYMBOL_IMG=$'\u2638\ufe0f'
-      else
-        KUBE_PS1_SYMBOL=$'\xE2\x8E\x88'
-        KUBE_PS1_SYMBOL_IMG=$'\xE2\x98\xB8'
-      fi
+  local symbol_arg="${KUBE_PS1_SYMBOL_CUSTOM}"
+
+  local symbol=""
+  local symbol_default=$'\u2388'
+  local symbol_img="☸️" 
+  local k8s_glyph=$'\Uf10fe'
+  local k8s_symbol_color=blue
+  local oc_glyph=$'\ue7b7'
+  local oc_symbol_color=red
+  local custom_symbol_color="${KUBE_PS1_SYMBOL_COLOR:-$k8s_symbol_color}"
+
+  # Choose the symbol based on the provided argument or environment variable
+  case "${symbol_arg}" in
+    "img")
+      symbol="${symbol_img}"
+      ;;
+    "k8s")
+      symbol="$(_kube_ps1_color_fg "${custom_symbol_color}")${k8s_glyph}${KUBE_PS1_RESET_COLOR}"
+      ;;
+    "oc")
+      symbol="$(_kube_ps1_color_fg ${oc_symbol_color})${oc_glyph}${KUBE_PS1_RESET_COLOR}"
       ;;
-    zsh)
-      KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_DEFAULT}"
-      KUBE_PS1_SYMBOL_IMG="\u2638";;
     *)
-      KUBE_PS1_SYMBOL="k8s"
+      case "$(_kube_ps1_shell_type)" in
+        bash)
+          if ((BASH_VERSINFO[0] >= 4)) && [[ $'\u2388' != "\\u2388" ]]; then
+            symbol="$(_kube_ps1_color_fg $custom_symbol_color)${symbol_default}${KUBE_PS1_RESET_COLOR}"
+            symbol_img=$'\u2638\ufe0f'
+          else
+            symbol=$'\xE2\x8E\x88'
+            symbol_img=$'\xE2\x98\xB8'
+          fi
+          ;;
+        zsh)
+          symbol="$(_kube_ps1_color_fg $custom_symbol_color)${symbol_default}${KUBE_PS1_RESET_COLOR}"
+          symbol_img="☸️"
+          ;;
+        *)
+          symbol="k8s"
+      esac
   esac
 
-  if [[ "${KUBE_PS1_SYMBOL_USE_IMG}" == true ]]; then
-    KUBE_PS1_SYMBOL="${KUBE_PS1_SYMBOL_IMG}"
-  fi
-
+  # Append padding if enabled
   if [[ "${KUBE_PS1_SYMBOL_PADDING}" == true ]]; then
-    echo "${KUBE_PS1_SYMBOL} "
+    echo "${symbol} "
   else
-    echo "${KUBE_PS1_SYMBOL}"
+    echo "${symbol}"
   fi
-
 }
 
-_kube_ps1_split() {
+_kube_ps1_split_config() {
   type setopt >/dev/null 2>&1 && setopt SH_WORD_SPLIT
   local IFS=$1
   echo $2
@@ -190,8 +212,9 @@ _kube_ps1_file_newer_than() {
   local file=$1
   local check_time=$2
 
-  if [[ "${KUBE_PS1_SHELL}" == "zsh" ]]; then
-    mtime=$(zstat +mtime "${file}")
+  if [[ "$(_kube_ps1_shell_type)" == "zsh" ]]; then
+    # Use zstat '-F %s.%s' to make it compatible with low zsh version (eg: 5.0.2)
+    mtime=$(zstat -L +mtime -F %s.%s "${file}")
   elif stat -c "%s" /dev/null &> /dev/null; then
     # GNU stat
     mtime=$(stat -L -c %Y "${file}")
@@ -203,7 +226,7 @@ _kube_ps1_file_newer_than() {
   [[ "${mtime}" -gt "${check_time}" ]]
 }
 
-_kube_ps1_update_cache() {
+_kube_ps1_prompt_update() {
   local return_code=$?
 
   [[ "${KUBE_PS1_ENABLED}" == "off" ]] && return $return_code
@@ -212,27 +235,35 @@ _kube_ps1_update_cache() {
     # No ability to fetch context/namespace; display N/A.
     KUBE_PS1_CONTEXT="BINARY-N/A"
     KUBE_PS1_NAMESPACE="N/A"
-    return
+    return $return_code
   fi
 
-  if [[ "${KUBECONFIG}" != "${KUBE_PS1_KUBECONFIG_CACHE}" ]]; then
+  if [[ "${KUBECONFIG}" != "${_KUBE_PS1_KUBECONFIG_CACHE}" ]]; then
     # User changed KUBECONFIG; unconditionally refetch.
-    KUBE_PS1_KUBECONFIG_CACHE=${KUBECONFIG}
+    _KUBE_PS1_KUBECONFIG_CACHE=${KUBECONFIG}
     _kube_ps1_get_context_ns
-    return
+    return $return_code
   fi
 
   # kubectl will read the environment variable $KUBECONFIG
   # otherwise set it to ~/.kube/config
   local conf
-  for conf in $(_kube_ps1_split : "${KUBECONFIG:-${HOME}/.kube/config}"); do
+  local config_file_cache
+
+  for conf in $(_kube_ps1_split_config : "${KUBECONFIG:-${HOME}/.kube/config}"); do
     [[ -r "${conf}" ]] || continue
-    if _kube_ps1_file_newer_than "${conf}" "${KUBE_PS1_LAST_TIME}"; then
+    config_file_cache+=":${conf}"
+    if _kube_ps1_file_newer_than "${conf}" "${_KUBE_PS1_LAST_TIME}"; then
       _kube_ps1_get_context_ns
-      return
+      return $return_code
     fi
   done
 
+  if [[ "${config_file_cache}" != "${_KUBE_PS1_CFGFILES_READ_CACHE}" ]]; then
+    _kube_ps1_get_context_ns
+    return $return_code
+  fi
+
   return $return_code
 }
 
@@ -242,8 +273,8 @@ _kube_ps1_get_context() {
     # Set namespace to 'N/A' if it is not defined
     KUBE_PS1_CONTEXT="${KUBE_PS1_CONTEXT:-N/A}"
 
-    if [[ ! -z "${KUBE_PS1_CLUSTER_FUNCTION}" ]]; then
-      KUBE_PS1_CONTEXT=$($KUBE_PS1_CLUSTER_FUNCTION $KUBE_PS1_CONTEXT)
+    if [[ -n "${KUBE_PS1_CLUSTER_FUNCTION}" ]]; then
+      KUBE_PS1_CONTEXT="$("${KUBE_PS1_CLUSTER_FUNCTION}" "${KUBE_PS1_CONTEXT}")"
     fi
   fi
 }
@@ -251,27 +282,36 @@ _kube_ps1_get_context() {
 _kube_ps1_get_ns() {
   if [[ "${KUBE_PS1_NS_ENABLE}" == true ]]; then
     KUBE_PS1_NAMESPACE="$(${KUBE_PS1_BINARY} config view --minify --output 'jsonpath={..namespace}' 2>/dev/null)"
-    # Set namespace to 'default' if it is not defined
-    KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-default}"
+    KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-N/A}"
 
-    if [[ ! -z "${KUBE_PS1_NAMESPACE_FUNCTION}" ]]; then
-        KUBE_PS1_NAMESPACE=$($KUBE_PS1_NAMESPACE_FUNCTION $KUBE_PS1_NAMESPACE)
+    if [[ -n "${KUBE_PS1_NAMESPACE_FUNCTION}" ]]; then
+        KUBE_PS1_NAMESPACE="$("${KUBE_PS1_NAMESPACE_FUNCTION}" "${KUBE_PS1_NAMESPACE}")"
     fi
   fi
 }
 
 _kube_ps1_get_context_ns() {
   # Set the command time
-  if [[ "${KUBE_PS1_SHELL}" == "bash" ]]; then
+  if [[ "$(_kube_ps1_shell_type)" == "bash" ]]; then
     if ((BASH_VERSINFO[0] >= 4 && BASH_VERSINFO[1] >= 2)); then
-      KUBE_PS1_LAST_TIME=$(printf '%(%s)T')
+      _KUBE_PS1_LAST_TIME=$(printf '%(%s)T')
     else
-      KUBE_PS1_LAST_TIME=$(date +%s)
+      _KUBE_PS1_LAST_TIME=$(date +%s)
     fi
-  elif [[ "${KUBE_PS1_SHELL}" == "zsh" ]]; then
-    KUBE_PS1_LAST_TIME=$EPOCHSECONDS
+  elif [[ "$(_kube_ps1_shell_type)" == "zsh" ]]; then
+    _KUBE_PS1_LAST_TIME=$EPOCHREALTIME
   fi
 
+  KUBE_PS1_CONTEXT="${KUBE_PS1_CONTEXT:-N/A}"
+  KUBE_PS1_NAMESPACE="${KUBE_PS1_NAMESPACE:-N/A}"
+
+  # Cache which cfgfiles we can read in case they change.
+  local conf
+  _KUBE_PS1_CFGFILES_READ_CACHE=
+  for conf in $(_kube_ps1_split_config : "${KUBECONFIG:-${HOME}/.kube/config}"); do
+    [[ -r $conf ]] && _KUBE_PS1_CFGFILES_READ_CACHE+=":$conf"
+  done
+
   _kube_ps1_get_context
   _kube_ps1_get_ns
 }
@@ -285,7 +325,7 @@ Toggle kube-ps1 prompt on
 
 Usage: kubeon [-g | --global] [-h | --help]
 
-With no arguments, turn off kube-ps1 status for this shell instance (default).
+With no arguments, turn oon kube-ps1 status for this shell instance (default).
 
   -g --global  turn on kube-ps1 status globally
   -h --help    print this message
@@ -309,7 +349,7 @@ kubeon() {
   if [[ "${1}" == '-h' || "${1}" == '--help' ]]; then
     _kubeon_usage
   elif [[ "${1}" == '-g' || "${1}" == '--global' ]]; then
-    rm -f -- "${KUBE_PS1_DISABLE_PATH}"
+    rm -f -- "${_KUBE_PS1_DISABLE_PATH}"
   elif [[ "$#" -ne 0 ]]; then
     echo -e "error: unrecognized flag ${1}\\n"
     _kubeon_usage
@@ -323,8 +363,8 @@ kubeoff() {
   if [[ "${1}" == '-h' || "${1}" == '--help' ]]; then
     _kubeoff_usage
   elif [[ "${1}" == '-g' || "${1}" == '--global' ]]; then
-    mkdir -p -- "$(dirname "${KUBE_PS1_DISABLE_PATH}")"
-    touch -- "${KUBE_PS1_DISABLE_PATH}"
+    mkdir -p -- "$(dirname "${_KUBE_PS1_DISABLE_PATH}")"
+    touch -- "${_KUBE_PS1_DISABLE_PATH}"
   elif [[ $# -ne 0 ]]; then
     echo "error: unrecognized flag ${1}" >&2
     _kubeoff_usage
@@ -338,22 +378,29 @@ kubeoff() {
 kube_ps1() {
   [[ "${KUBE_PS1_ENABLED}" == "off" ]] && return
   [[ -z "${KUBE_PS1_CONTEXT}" ]] && [[ "${KUBE_PS1_CONTEXT_ENABLE}" == true ]] && return
+  [[ "${KUBE_PS1_CONTEXT}" == "N/A" ]] && [[ ${KUBE_PS1_HIDE_IF_NOCONTEXT} == true ]] && return
+
 
   local KUBE_PS1
   local KUBE_PS1_RESET_COLOR="${_KUBE_PS1_OPEN_ESC}${_KUBE_PS1_DEFAULT_FG}${_KUBE_PS1_CLOSE_ESC}"
 
+  # If background color is set, reset color should also reset the background
+  # if [[ -n "${KUBE_PS1_BG_COLOR}" ]]; then
+  #   KUBE_PS1_RESET_COLOR="${_KUBE_PS1_OPEN_ESC}${_KUBE_PS1_DEFAULT_FG}${_KUBE_PS1_DEFAULT_BG}${_KUBE_PS1_CLOSE_ESC}"
+  # fi
+
   # Background Color
-  [[ -n "${KUBE_PS1_BG_COLOR}" ]] && KUBE_PS1+="$(_kube_ps1_color_bg ${KUBE_PS1_BG_COLOR})"
+  [[ -n "${KUBE_PS1_BG_COLOR}" ]] && KUBE_PS1+="$(_kube_ps1_color_bg "${KUBE_PS1_BG_COLOR}")"
 
   # Prefix
   if [[ -z "${KUBE_PS1_PREFIX_COLOR:-}" ]] && [[ -n "${KUBE_PS1_PREFIX}" ]]; then
       KUBE_PS1+="${KUBE_PS1_PREFIX}"
   else
-      KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_PREFIX_COLOR)${KUBE_PS1_PREFIX}${KUBE_PS1_RESET_COLOR}"
+      KUBE_PS1+="$(_kube_ps1_color_fg "${KUBE_PS1_PREFIX_COLOR}")${KUBE_PS1_PREFIX}${KUBE_PS1_RESET_COLOR}"
   fi
 
   # Symbol
-  KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_SYMBOL_COLOR)$(_kube_ps1_symbol)${KUBE_PS1_RESET_COLOR}"
+  KUBE_PS1+="$(_kube_ps1_symbol)"
 
   if [[ -n "${KUBE_PS1_SEPARATOR}" ]] && [[ "${KUBE_PS1_SYMBOL_ENABLE}" == true ]]; then
     KUBE_PS1+="${KUBE_PS1_SEPARATOR}"
@@ -361,7 +408,14 @@ kube_ps1() {
 
   # Context
   if [[ "${KUBE_PS1_CONTEXT_ENABLE}" == true ]]; then
-    KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_CTX_COLOR)${KUBE_PS1_CONTEXT}${KUBE_PS1_RESET_COLOR}"
+    local ctx_color="${KUBE_PS1_CTX_COLOR:-red}"
+
+    # Allow custom function to override color based on context
+    if [[ -n "${KUBE_PS1_CTX_COLOR_FUNCTION}" ]]; then
+      ctx_color="$("${KUBE_PS1_CTX_COLOR_FUNCTION}" "${KUBE_PS1_CONTEXT}")"
+    fi
+
+    KUBE_PS1+="$(_kube_ps1_color_fg "${ctx_color}")${KUBE_PS1_CONTEXT}${KUBE_PS1_RESET_COLOR}"
   fi
 
   # Namespace
@@ -369,14 +423,14 @@ kube_ps1() {
     if [[ -n "${KUBE_PS1_DIVIDER}" ]] && [[ "${KUBE_PS1_CONTEXT_ENABLE}" == true ]]; then
       KUBE_PS1+="${KUBE_PS1_DIVIDER}"
     fi
-    KUBE_PS1+="$(_kube_ps1_color_fg ${KUBE_PS1_NS_COLOR})${KUBE_PS1_NAMESPACE}${KUBE_PS1_RESET_COLOR}"
+    KUBE_PS1+="$(_kube_ps1_color_fg "${KUBE_PS1_NS_COLOR:-cyan}")${KUBE_PS1_NAMESPACE}${KUBE_PS1_RESET_COLOR}"
   fi
 
   # Suffix
   if [[ -z "${KUBE_PS1_SUFFIX_COLOR:-}" ]] && [[ -n "${KUBE_PS1_SUFFIX}" ]]; then
       KUBE_PS1+="${KUBE_PS1_SUFFIX}"
   else
-      KUBE_PS1+="$(_kube_ps1_color_fg $KUBE_PS1_SUFFIX_COLOR)${KUBE_PS1_SUFFIX}${KUBE_PS1_RESET_COLOR}"
+      KUBE_PS1+="$(_kube_ps1_color_fg "${KUBE_PS1_SUFFIX_COLOR}")${KUBE_PS1_SUFFIX}${KUBE_PS1_RESET_COLOR}"
   fi
 
   # Close Background color if defined
diff --git a/zsh/plugins/kubectl/README.md b/zsh/plugins/kubectl/README.md
index 579a90b..5e4ae7e 100644
--- a/zsh/plugins/kubectl/README.md
+++ b/zsh/plugins/kubectl/README.md
@@ -11,122 +11,130 @@ plugins=(... kubectl)
 
 ## Aliases
 
-| Alias   | Command                             | Description                                                                                      |
-|:--------|:------------------------------------|:-------------------------------------------------------------------------------------------------|
-| k       | `kubectl`                           | The kubectl command                                                                              |
-| kca     | `kubectl --all-namespaces`          | The kubectl command targeting all namespaces                                                     |
-| kaf     | `kubectl apply -f`                  | Apply a YML file                                                                                 |
-| keti    | `kubectl exec -ti`                  | Drop into an interactive terminal on a container                                                 |
-|         |                                     | **Manage configuration quickly to switch contexts between local, dev and staging**               |
-| kcuc    | `kubectl config use-context`        | Set the current-context in a kubeconfig file                                                     |
-| kcsc    | `kubectl config set-context`        | Set a context entry in kubeconfig                                                                |
-| kcdc    | `kubectl config delete-context`     | Delete the specified context from the kubeconfig                                                 |
-| kccc    | `kubectl config current-context`    | Display the current-context                                                                      |
-| kcgc    | `kubectl config get-contexts`       | List of contexts available                                                                       |
-|         |                                     | **General aliases**                                                                              |
-| kdel    | `kubectl delete`                    | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
-| kdelf   | `kubectl delete -f`                 | Delete a pod using the type and name specified in -f argument                                    |
-|         |                                     | **Pod management**                                                                               |
-| kgp     | `kubectl get pods`                  | List all pods in ps output format                                                                |
-| kgpw    | `kgp --watch`                       | After listing/getting the requested object, watch for changes                                    |
-| kgpwide | `kgp -o wide`                       | Output in plain-text format with any additional information. For pods, the node name is included |
-| kep     | `kubectl edit pods`                 | Edit pods from the default editor                                                                |
-| kdp     | `kubectl describe pods`             | Describe all pods                                                                                |
-| kdelp   | `kubectl delete pods`               | Delete all pods matching passed arguments                                                        |
-| kgpl    | `kgp -l`                            | Get pods by label. Example: `kgpl "app=myapp" -n myns`                                           |
-| kgpn    | `kgp -n`                            | Get pods by namespace. Example: `kgpn kube-system`                                               |
-|         |                                     | **Service management**                                                                           |
-| kgs     | `kubectl get svc`                   | List all services in ps output format                                                            |
-| kgsw    | `kgs --watch`                       | After listing all services, watch for changes                                                    |
-| kgswide | `kgs -o wide`                       | After listing all services, output in plain-text format with any additional information          |
-| kes     | `kubectl edit svc`                  | Edit services(svc) from the default editor                                                       |
-| kds     | `kubectl describe svc`              | Describe all services in detail                                                                  |
-| kdels   | `kubectl delete svc`                | Delete all services matching passed argument                                                     |
-|         |                                     | **Ingress management**                                                                           |
-| kgi     | `kubectl get ingress`               | List ingress resources in ps output format                                                       |
-| kei     | `kubectl edit ingress`              | Edit ingress resource from the default editor                                                    |
-| kdi     | `kubectl describe ingress`          | Describe ingress resource in detail                                                              |
-| kdeli   | `kubectl delete ingress`            | Delete ingress resources matching passed argument                                                |
-|         |                                     | **Namespace management**                                                                         |
-| kgns    | `kubectl get namespaces`            | List the current namespaces in a cluster                                                         |
-| kcn     | `kubectl config set-context --current --namespace` | Change current namespace |
-| kens    | `kubectl edit namespace`            | Edit namespace resource from the default editor                                                  |
-| kdns    | `kubectl describe namespace`        | Describe namespace resource in detail                                                            |
-| kdelns  | `kubectl delete namespace`          | Delete the namespace. WARNING! This deletes everything in the namespace                          |
-|         |                                     | **ConfigMap management**                                                                         |
-| kgcm    | `kubectl get configmaps`            | List the configmaps in ps output format                                                          |
-| kecm    | `kubectl edit configmap`            | Edit configmap resource from the default editor                                                  |
-| kdcm    | `kubectl describe configmap`        | Describe configmap resource in detail                                                            |
-| kdelcm  | `kubectl delete configmap`          | Delete the configmap                                                                             |
-|         |                                     | **Secret management**                                                                            |
-| kgsec   | `kubectl get secret`                | Get secret for decoding                                                                          |
-| kdsec   | `kubectl describe secret`           | Describe secret resource in detail                                                               |
-| kdelsec | `kubectl delete secret`             | Delete the secret                                                                                |
-|         |                                     | **Deployment management**                                                                        |
-| kgd     | `kubectl get deployment`            | Get the deployment                                                                               |
-| kgdw    | `kgd --watch`                       | After getting the deployment, watch for changes                                                  |
-| kgdwide | `kgd -o wide`                       | After getting the deployment, output in plain-text format with any additional information        |
-| ked     | `kubectl edit deployment`           | Edit deployment resource from the default editor                                                 |
-| kdd     | `kubectl describe deployment`       | Describe deployment resource in detail                                                           |
-| kdeld   | `kubectl delete deployment`         | Delete the deployment                                                                            |
-| ksd     | `kubectl scale deployment`          | Scale a deployment                                                                               |
-| krsd    | `kubectl rollout status deployment` | Check the rollout status of a deployment                                                         |
-| kres    | `kubectl set env $@ REFRESHED_AT=...` | Recreate all pods in deployment with zero-downtime                                             |
-|         |                                     | **Rollout management**                                                                           |
-| kgrs    | `kubectl get replicaset`            | List all ReplicaSets `rs` created by the deployment                                              |
-| kdrs    | `kubectl describe replicaset`       | Describe ReplicaSet in detail                                                                    |
-| kers    | `kubectl edit replicaset`           | Edit ReplicaSet from the default editor                                                          |
-| krh     | `kubectl rollout history`           | Check the revisions of this deployment                                                           |
-| kru     | `kubectl rollout undo`              | Rollback to the previous revision                                                                |
-|         |                                     | **Port forwarding**                                                                              |
-| kpf     | `kubectl port-forward`              | Forward one or more local ports to a pod                                                         |
-|         |                                     | **Tools for accessing all information**                                                          |
-| kga     | `kubectl get all`                   | List all resources in ps format                                                                  |
-| kgaa    | `kubectl get all --all-namespaces`  | List the requested object(s) across all namespaces                                               |
-|         |                                     | **Logs**                                                                                         |
-| kl      | `kubectl logs`                      | Print the logs for a container or resource                                                       |
-| klf     | `kubectl logs -f`                   | Stream the logs for a container or resource (follow)                                             |
-|         |                                     | **File copy**                                                                                    |
-| kcp     | `kubectl cp`                        | Copy files and directories to and from containers                                                |
-|         |                                     | **Node management**                                                                              |
-| kgno    | `kubectl get nodes`                 | List the nodes in ps output format                                                               |
-| keno    | `kubectl edit node`                 | Edit nodes resource from the default editor                                                      |
-| kdno    | `kubectl describe node`             | Describe node resource in detail                                                                 |
-| kdelno  | `kubectl delete node`               | Delete the node                                                                                  |
-|         |                                     | **Persistent Volume Claim management**                                                           |
-| kgpvc   | `kubectl get pvc`                   | List all PVCs                                                                                    |
-| kgpvcw  | `kgpvc --watch`                     | After listing/getting the requested object, watch for changes                                    |
-| kepvc   | `kubectl edit pvc`                  | Edit pvcs from the default editor                                                                |
-| kdpvc   | `kubectl describe pvc`              | Describe all pvcs                                                                                |
-| kdelpvc | `kubectl delete pvc`                | Delete all pvcs matching passed arguments                                                        |
-|         |                                     | **StatefulSets management**                                                                      |
-| kgss    | `kubectl get statefulset`           | List the statefulsets in ps format                                                               |
-| kgssw   | `kgss --watch`                      | After getting the list of statefulsets, watch for changes                                        |
-| kgsswide| `kgss -o wide`                      | After getting the statefulsets, output in plain-text format with any additional information      |
-| kess    | `kubectl edit statefulset`          | Edit statefulset resource from the default editor                                                |
-| kdss    | `kubectl describe statefulset`      | Describe statefulset resource in detail                                                          |
-| kdelss  | `kubectl delete statefulset`        | Delete the statefulset                                                                           |
-| ksss    | `kubectl scale statefulset`         | Scale a statefulset                                                                              |
-| krsss   | `kubectl rollout status statefulset`| Check the rollout status of a deployment                                                         |
-|         |                                     | **Service Accounts management**                                                                  |
-| kdsa    | `kubectl describe sa`               | Describe a service account in details                                                            |
-| kdelsa  | `kubectl delete sa`                 | Delete the service account                                                                       |
-|         |                                     | **DaemonSet management**                                                                         |
-| kgds    | `kubectl get daemonset`             | List all DaemonSets in ps output format                                                          |
-| kgdsw   | `kgds --watch`                      | After listing all DaemonSets, watch for changes                                                  |
-| keds    | `kubectl edit daemonset`            | Edit DaemonSets from the default editor                                                          |
-| kdds    | `kubectl describe daemonset`        | Describe all DaemonSets in detail                                                                |
-| kdelds  | `kubectl delete daemonset`          | Delete all DaemonSets matching passed argument                                                   |
-|         |                                     | **CronJob management**                                                                           |
-| kgcj    | `kubectl get cronjob`               | List all CronJobs in ps output format                                                            |
-| kecj    | `kubectl edit cronjob`              | Edit CronJob from the default editor                                                             |
-| kdcj    | `kubectl describe cronjob`          | Describe a CronJob in details                                                                    |
-| kdelcj  | `kubectl delete cronjob`            | Delete the CronJob                                                                               |
-|         |                                     | **Job management**                                                                               |
-| kgj     | `kubectl get job`                   | List all Job in ps output format                                                                 |
-| kej     | `kubectl edit job`                  | Edit a Job in details                                                                            |
-| kdj     | `kubectl describe job`              | Describe the Job                                                                                 |
-| kdelj   | `kubectl delete job`                | Delete the Job                                                                                   |
+| Alias    | Command                                                 | Description                                                                                      |
+| :------- | :------------------------------------------------------ | :----------------------------------------------------------------------------------------------- |
+| k        | `kubectl`                                               | The kubectl command                                                                              |
+| kca      | `kubectl --all-namespaces`                              | The kubectl command targeting all namespaces                                                     |
+| kaf      | `kubectl apply -f`                                      | Apply a YML file                                                                                 |
+| kapk     | `kubectl apply -k`                                      | Apply a kustomization directory                                                                  |
+| keti     | `kubectl exec -ti`                                      | Drop into an interactive terminal on a container                                                 |
+|          |                                                         | **Manage configuration quickly to switch contexts between local, dev and staging**               |
+| kcuc     | `kubectl config use-context`                            | Set the current-context in a kubeconfig file                                                     |
+| kcsc     | `kubectl config set-context`                            | Set a context entry in kubeconfig                                                                |
+| kcdc     | `kubectl config delete-context`                         | Delete the specified context from the kubeconfig                                                 |
+| kccc     | `kubectl config current-context`                        | Display the current-context                                                                      |
+| kcgc     | `kubectl config get-contexts`                           | List of contexts available                                                                       |
+|          |                                                         | **General aliases**                                                                              |
+| kdel     | `kubectl delete`                                        | Delete resources by filenames, stdin, resources and names, or by resources and label selector    |
+| kdelf    | `kubectl delete -f`                                     | Delete a pod using the type and name specified in -f argument                                    |
+| kdelk    | `kubectl delete -k`                                     | Delete all resources defined in a kustomization directory                                        |
+| kge      | `kubectl get events --sort-by=".lastTimestamp"`         | Get events (sorted by timestamp)                                                                 |
+| kgew     | `kubectl get events --watch --sort-by=".lastTimestamp"` | Get events and watch as they occur (sorted by timestamp)                                         |
+|          |                                                         | **Pod management**                                                                               |
+| kgp      | `kubectl get pods`                                      | List all pods in ps output format                                                                |
+| kgpl     | `kgp -l`                                                | Get pods by label. Example: `kgpl "app=myapp" -n myns`                                           |
+| kgpn     | `kgp -n`                                                | Get pods by namespace. Example: `kgpn kube-system`                                               |
+| kgpsl    | `kubectl get pods --show-labels`                        | List all pods in ps output format with labels                                                    |
+| kgpw     | `kgp --watch`                                           | After listing/getting the requested object, watch for changes                                    |
+| kgpwide  | `kgp -o wide`                                           | Output in plain-text format with any additional information. For pods, the node name is included |
+| kep      | `kubectl edit pods`                                     | Edit pods from the default editor                                                                |
+| kdp      | `kubectl describe pods`                                 | Describe all pods                                                                                |
+| kdelp    | `kubectl delete pods`                                   | Delete all pods matching passed arguments                                                        |
+|          |                                                         | **Service management**                                                                           |
+| kgs      | `kubectl get svc`                                       | List all services in ps output format                                                            |
+| kgsw     | `kgs --watch`                                           | After listing all services, watch for changes                                                    |
+| kgswide  | `kgs -o wide`                                           | After listing all services, output in plain-text format with any additional information          |
+| kes      | `kubectl edit svc`                                      | Edit services(svc) from the default editor                                                       |
+| kds      | `kubectl describe svc`                                  | Describe all services in detail                                                                  |
+| kdels    | `kubectl delete svc`                                    | Delete all services matching passed argument                                                     |
+|          |                                                         | **Ingress management**                                                                           |
+| kgi      | `kubectl get ingress`                                   | List ingress resources in ps output format                                                       |
+| kei      | `kubectl edit ingress`                                  | Edit ingress resource from the default editor                                                    |
+| kdi      | `kubectl describe ingress`                              | Describe ingress resource in detail                                                              |
+| kdeli    | `kubectl delete ingress`                                | Delete ingress resources matching passed argument                                                |
+|          |                                                         | **Namespace management**                                                                         |
+| kgns     | `kubectl get namespaces`                                | List the current namespaces in a cluster                                                         |
+| kcn      | `kubectl config set-context --current --namespace`      | Change current namespace                                                                         |
+| kens     | `kubectl edit namespace`                                | Edit namespace resource from the default editor                                                  |
+| kdns     | `kubectl describe namespace`                            | Describe namespace resource in detail                                                            |
+| kdelns   | `kubectl delete namespace`                              | Delete the namespace. WARNING! This deletes everything in the namespace                          |
+|          |                                                         | **ConfigMap management**                                                                         |
+| kgcm     | `kubectl get configmaps`                                | List the configmaps in ps output format                                                          |
+| kecm     | `kubectl edit configmap`                                | Edit configmap resource from the default editor                                                  |
+| kdcm     | `kubectl describe configmap`                            | Describe configmap resource in detail                                                            |
+| kdelcm   | `kubectl delete configmap`                              | Delete the configmap                                                                             |
+|          |                                                         | **Secret management**                                                                            |
+| kgsec    | `kubectl get secret`                                    | Get secret for decoding                                                                          |
+| kdsec    | `kubectl describe secret`                               | Describe secret resource in detail                                                               |
+| kdelsec  | `kubectl delete secret`                                 | Delete the secret                                                                                |
+|          |                                                         | **Deployment management**                                                                        |
+| kgd      | `kubectl get deployment`                                | Get the deployment                                                                               |
+| kgdw     | `kgd --watch`                                           | After getting the deployment, watch for changes                                                  |
+| kgdwide  | `kgd -o wide`                                           | After getting the deployment, output in plain-text format with any additional information        |
+| ked      | `kubectl edit deployment`                               | Edit deployment resource from the default editor                                                 |
+| kdd      | `kubectl describe deployment`                           | Describe deployment resource in detail                                                           |
+| kdeld    | `kubectl delete deployment`                             | Delete the deployment                                                                            |
+| ksd      | `kubectl scale deployment`                              | Scale a deployment                                                                               |
+| krsd     | `kubectl rollout status deployment`                     | Check the rollout status of a deployment                                                         |
+| krrd     | `kubectl rollout restart deployment`                    | Rollout restart a deployment                                                                     |
+| kres     | `kubectl set env $@ REFRESHED_AT=...`                   | Recreate all pods in deployment with zero-downtime                                               |
+|          |                                                         | **Rollout management**                                                                           |
+| kgrs     | `kubectl get replicaset`                                | List all ReplicaSets `rs` created by the deployment                                              |
+| kdrs     | `kubectl describe replicaset`                           | Describe ReplicaSet in detail                                                                    |
+| kers     | `kubectl edit replicaset`                               | Edit ReplicaSet from the default editor                                                          |
+| krh      | `kubectl rollout history`                               | Check the revisions of this deployment                                                           |
+| kru      | `kubectl rollout undo`                                  | Rollback to the previous revision                                                                |
+|          |                                                         | **Port forwarding**                                                                              |
+| kpf      | `kubectl port-forward`                                  | Forward one or more local ports to a pod                                                         |
+|          |                                                         | **Tools for accessing all information**                                                          |
+| kga      | `kubectl get all`                                       | List all resources in ps format                                                                  |
+| kgaa     | `kubectl get all --all-namespaces`                      | List the requested object(s) across all namespaces                                               |
+|          |                                                         | **Logs**                                                                                         |
+| kl       | `kubectl logs`                                          | Print the logs for a container or resource                                                       |
+| klf      | `kubectl logs -f`                                       | Stream the logs for a container or resource (follow)                                             |
+|          |                                                         | **File copy**                                                                                    |
+| kcp      | `kubectl cp`                                            | Copy files and directories to and from containers                                                |
+|          |                                                         | **Node management**                                                                              |
+| kgno     | `kubectl get nodes`                                     | List the nodes in ps output format                                                               |
+| kgnosl   | `kubectl get nodes --show-labels`                       | List the nodes in ps output format with labels                                                   |
+| keno     | `kubectl edit node`                                     | Edit nodes resource from the default editor                                                      |
+| kdno     | `kubectl describe node`                                 | Describe node resource in detail                                                                 |
+| kdelno   | `kubectl delete node`                                   | Delete the node                                                                                  |
+|          |                                                         | **Persistent Volume Claim management**                                                           |
+| kgpvc    | `kubectl get pvc`                                       | List all PVCs                                                                                    |
+| kgpvcw   | `kgpvc --watch`                                         | After listing/getting the requested object, watch for changes                                    |
+| kepvc    | `kubectl edit pvc`                                      | Edit pvcs from the default editor                                                                |
+| kdpvc    | `kubectl describe pvc`                                  | Describe all pvcs                                                                                |
+| kdelpvc  | `kubectl delete pvc`                                    | Delete all pvcs matching passed arguments                                                        |
+|          |                                                         | **StatefulSets management**                                                                      |
+| kgss     | `kubectl get statefulset`                               | List the statefulsets in ps format                                                               |
+| kgssw    | `kgss --watch`                                          | After getting the list of statefulsets, watch for changes                                        |
+| kgsswide | `kgss -o wide`                                          | After getting the statefulsets, output in plain-text format with any additional information      |
+| kess     | `kubectl edit statefulset`                              | Edit statefulset resource from the default editor                                                |
+| kdss     | `kubectl describe statefulset`                          | Describe statefulset resource in detail                                                          |
+| kdelss   | `kubectl delete statefulset`                            | Delete the statefulset                                                                           |
+| ksss     | `kubectl scale statefulset`                             | Scale a statefulset                                                                              |
+| krsss    | `kubectl rollout status statefulset`                    | Check the rollout status of a deployment                                                         |
+| krrss    | `kubectl rollout restart statefulset`                   | Rollout restart a statefulset                                                                    |
+|          |                                                         | **Service Accounts management**                                                                  |
+| kdsa     | `kubectl describe sa`                                   | Describe a service account in details                                                            |
+| kdelsa   | `kubectl delete sa`                                     | Delete the service account                                                                       |
+|          |                                                         | **DaemonSet management**                                                                         |
+| kgds     | `kubectl get daemonset`                                 | List all DaemonSets in ps output format                                                          |
+| kgdsw    | `kgds --watch`                                          | After listing all DaemonSets, watch for changes                                                  |
+| keds     | `kubectl edit daemonset`                                | Edit DaemonSets from the default editor                                                          |
+| kdds     | `kubectl describe daemonset`                            | Describe all DaemonSets in detail                                                                |
+| kdelds   | `kubectl delete daemonset`                              | Delete all DaemonSets matching passed argument                                                   |
+|          |                                                         | **CronJob management**                                                                           |
+| kgcj     | `kubectl get cronjob`                                   | List all CronJobs in ps output format                                                            |
+| kecj     | `kubectl edit cronjob`                                  | Edit CronJob from the default editor                                                             |
+| kdcj     | `kubectl describe cronjob`                              | Describe a CronJob in details                                                                    |
+| kdelcj   | `kubectl delete cronjob`                                | Delete the CronJob                                                                               |
+|          |                                                         | **Job management**                                                                               |
+| kgj      | `kubectl get job`                                       | List all Job in ps output format                                                                 |
+| kej      | `kubectl edit job`                                      | Edit a Job in details                                                                            |
+| kdj      | `kubectl describe job`                                  | Describe the Job                                                                                 |
+| kdelj    | `kubectl delete job`                                    | Delete the Job                                                                                   |
 
 ## Wrappers
 
diff --git a/zsh/plugins/kubectl/kubectl.plugin.zsh b/zsh/plugins/kubectl/kubectl.plugin.zsh
index 095d2b3..ba371cd 100644
--- a/zsh/plugins/kubectl/kubectl.plugin.zsh
+++ b/zsh/plugins/kubectl/kubectl.plugin.zsh
@@ -1,15 +1,17 @@
-if (( $+commands[kubectl] )); then
-  # If the completion file does not exist, generate it and then source it
-  # Otherwise, source it and regenerate in the background
-  if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
-    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null
-    source "$ZSH_CACHE_DIR/completions/_kubectl"
-  else
-    source "$ZSH_CACHE_DIR/completions/_kubectl"
-    kubectl completion zsh | tee "$ZSH_CACHE_DIR/completions/_kubectl" >/dev/null &|
-  fi
+if (( ! $+commands[kubectl] )); then
+  return
 fi
 
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `kubectl`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_kubectl" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _kubectl
+  _comps[kubectl]=_kubectl
+fi
+
+kubectl completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_kubectl" &|
+
 # This command is used a LOT both below and in daily life
 alias k=kubectl
 
@@ -19,6 +21,9 @@ alias kca='_kca(){ kubectl "$@" --all-namespaces;  unset -f _kca; }; _kca'
 # Apply a YML file
 alias kaf='kubectl apply -f'
 
+# Apply a kustomization directory
+alias kapk='kubectl apply -k'
+
 # Drop into an interactive terminal on a container
 alias keti='kubectl exec -t -i'
 
@@ -34,9 +39,15 @@ alias kcgc='kubectl config get-contexts'
 # General aliases
 alias kdel='kubectl delete'
 alias kdelf='kubectl delete -f'
+alias kdelk='kubectl delete -k'
+alias kge='kubectl get events --sort-by=".lastTimestamp"'
+alias kgew='kubectl get events --sort-by=".lastTimestamp" --watch'
 
 # Pod management.
 alias kgp='kubectl get pods'
+alias kgpl='kgp -l'
+alias kgpn='kgp -n'
+alias kgpsl='kubectl get pods --show-labels'
 alias kgpa='kubectl get pods --all-namespaces'
 alias kgpw='kgp --watch'
 alias kgpwide='kgp -o wide'
@@ -45,12 +56,6 @@ alias kdp='kubectl describe pods'
 alias kdelp='kubectl delete pods'
 alias kgpall='kubectl get pods --all-namespaces -o wide'
 
-# get pod by label: kgpl "app=myapp" -n myns
-alias kgpl='kgp -l'
-
-# get pod by namespace: kgpn kube-system"
-alias kgpn='kgp -n'
-
 # Service management.
 alias kgs='kubectl get svc'
 alias kgsa='kubectl get svc --all-namespaces'
@@ -97,6 +102,7 @@ alias kdd='kubectl describe deployment'
 alias kdeld='kubectl delete deployment'
 alias ksd='kubectl scale deployment'
 alias krsd='kubectl rollout status deployment'
+alias krrd='kubectl rollout restart deployment'
 
 function kres(){
   kubectl set env $@ REFRESHED_AT=$(date +%Y%m%d%H%M%S)
@@ -119,6 +125,7 @@ alias kdss='kubectl describe statefulset'
 alias kdelss='kubectl delete statefulset'
 alias ksss='kubectl scale statefulset'
 alias krsss='kubectl rollout status statefulset'
+alias krrss='kubectl rollout restart statefulset'
 
 # Port forwarding
 alias kpf="kubectl port-forward"
@@ -142,6 +149,7 @@ alias kcp='kubectl cp'
 
 # Node Management
 alias kgno='kubectl get nodes'
+alias kgnosl='kubectl get nodes --show-labels'
 alias keno='kubectl edit node'
 alias kdno='kubectl describe node'
 alias kdelno='kubectl delete node'
@@ -160,6 +168,7 @@ alias kdelsa="kubectl delete sa"
 
 # DaemonSet management.
 alias kgds='kubectl get daemonset'
+alias kgdsa='kubectl get daemonset --all-namespaces'
 alias kgdsw='kgds --watch'
 alias keds='kubectl edit daemonset'
 alias kdds='kubectl describe daemonset'
@@ -177,13 +186,23 @@ alias kej='kubectl edit job'
 alias kdj='kubectl describe job'
 alias kdelj='kubectl delete job'
 
-# Only run if the user actually has kubectl installed
-if (( ${+_comps[kubectl]} )); then
-  function kj() { kubectl "$@" -o json | jq; }
-  function kjx() { kubectl "$@" -o json | fx; }
-  function ky() { kubectl "$@" -o yaml | yh; }
+# Utility print functions (json / yaml)
+function _build_kubectl_out_alias {
+  setopt localoptions norcexpandparam
 
-  compdef kj=kubectl
-  compdef kjx=kubectl
-  compdef ky=kubectl
-fi
+  # alias function
+  eval "function $1 { $2 }"
+
+  # completion function
+  eval "function _$1 {
+    words=(kubectl \"\${words[@]:1}\")
+    _kubectl
+  }"
+
+  compdef _$1 $1
+}
+
+_build_kubectl_out_alias "kj"  'kubectl "$@" -o json | jq'
+_build_kubectl_out_alias "kjx" 'kubectl "$@" -o json | fx'
+_build_kubectl_out_alias "ky"  'kubectl "$@" -o yaml | yh'
+unfunction _build_kubectl_out_alias
diff --git a/zsh/plugins/kubectx/README.md b/zsh/plugins/kubectx/README.md
index 98f1cf0..e3987b4 100644
--- a/zsh/plugins/kubectx/README.md
+++ b/zsh/plugins/kubectx/README.md
@@ -1,25 +1,55 @@
 # kubectx - show active kubectl context
 
-This plugins adds ```kubectx_prompt_info()``` function. It shows name of the
-active kubectl context (```kubectl config current-context```).
+This plugins adds `kubectx_prompt_info()` function. It shows name of the active
+kubectl context (`kubectl config current-context`).
 
 You can use it to customize prompt and know if You are on prod cluster ;)
 
-_Example_. Add to **.zshrc**:
+To use this plugin, add `kubectx` to the plugins array in your zshrc file:
 
+```zsh
+plugins=(... kubectx)
 ```
+
+### Usage
+
+Add to **.zshrc**:
+
+```zsh
+# right prompt
 RPS1='$(kubectx_prompt_info)'
+# left prompt
+PROMPT="$PROMPT"'$(kubectx_prompt_info)'
 ```
 
-### custom ctx names
+### Custom context names
 
-One can rename default context name for better readability.
+You can rename the default context name for better readability or additional formatting.
+These values accept [prompt expansion sequences](http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html)
+such as `%F{color}`, `%f`, `%K{color}`, `%k`, `%B`, `%b`, `%U`, `%u`, `%S`, `%s`, `%{...%}`.
 
-_Example_. Add to **.zshrc**:
-```
+**Example**: add this to your .zshrc file:
+
+```zsh
 kubectx_mapping[minikube]="mini"
 kubectx_mapping[context_name_from_kubeconfig]="$emoji[wolf_face]"
 kubectx_mapping[production_cluster]="%{$fg[yellow]%}prod!%{$reset_color%}"
+# contexts with spaces
+kubectx_mapping[context\ with\ spaces]="%F{red}spaces%f"
+# don't use quotes as it will break the prompt
+kubectx_mapping["context with spaces"]="%F{red}spaces%f" # ti
+```
+
+You can also define the whole mapping array at once:
+
+```zsh
+typeset -A kubectx_mapping
+kubectx_mapping=(
+  minikube                      "mini"
+  context_name_from_kubeconfig  "$emoji[wolf_face]"
+  production_cluster            "%{$fg[yellow]%}prod!%{$reset_color%}"
+  "context with spaces"         "%F{red}spaces%f"
+)
 ```
 
 ![staging](stage.png)
diff --git a/zsh/plugins/kubectx/kubectx.plugin.zsh b/zsh/plugins/kubectx/kubectx.plugin.zsh
index 6096fee..f1ca990 100644
--- a/zsh/plugins/kubectx/kubectx.plugin.zsh
+++ b/zsh/plugins/kubectx/kubectx.plugin.zsh
@@ -7,7 +7,9 @@ function kubectx_prompt_info() {
 
   [[ -n "$current_ctx" ]] || return
 
-  # use value in associative array if it exists
-  # otherwise fall back to the context name
+  # Use value in associative array if it exists, otherwise fall back to the context name
+  #
+  # Note: we need to escape the % character in the prompt string when coming directly from
+  # the context name, as it could contain a % character.
   echo "${kubectx_mapping[$current_ctx]:-${current_ctx:gs/%/%%}}"
 }
diff --git a/zsh/plugins/lando/README.md b/zsh/plugins/lando/README.md
index 928a42b..2f881cf 100644
--- a/zsh/plugins/lando/README.md
+++ b/zsh/plugins/lando/README.md
@@ -8,7 +8,7 @@ To use it, add `lando` to the plugins array in your zshrc file:
 plugins=(... lando)
 ```
 
-## ALIASES:
+## Wrapped Commands
 
 | Alias      | Description      |
 |:----------:|:----------------:|
@@ -17,19 +17,38 @@ plugins=(... lando)
 | `drush`    | `lando drush`    |
 | `gulp`     | `lando gulp`     |
 | `npm`      | `lando npm`      |
+| `php`      | `lando php`      |
 | `wp`       | `lando wp`       |
 | `yarn`     | `lando yarn`     |
 
+More or different commands can be wrapped by setting the `LANDO_ZSH_WRAPPED_COMMANDS` setting, see [Settings](#settings) below.
+
 ## How It Works:
 
 This plugin removes the requirement to type `lando` before a command. It utilizes the lando version of supported commands run within directories with the following criteria:
+
 - The `.lando.yml` file is found in the current directory or any parent directory within `$LANDO_ZSH_SITES_DIRECTORY`.
 - The current directory is within `$LANDO_ZSH_SITES_DIRECTORY` but is not `$LANDO_ZSH_SITES_DIRECTORY` itself.
+- If the command is not a part of the commands available in the lando environment, it will run the command without `lando`.
 
 ## Settings:
 
-- `LANDO_ZSH_SITES_DIRECTORY`: The plugin will stop searching through parents for `CONFIG_FILE` once it hits this directory.
-- `LANDO_ZSH_CONFIG_FILE`: The plugin will check to see if this provided file exists to check for presence of Lando.
+> NOTE: these settings must be set *before* the plugin is loaded, and any changes require a restart of the shell to be applied.
+
+- `LANDO_ZSH_SITES_DIRECTORY`: The plugin will stop searching through parents for `CONFIG_FILE` once it hits this directory:
+  ```sh
+  LANDO_ZSH_SITES_DIRECTORY="$HOME/Code"
+  ```
+
+- `LANDO_ZSH_CONFIG_FILE`: The plugin will check to see if this provided file exists to check for presence of Lando:
+  ```sh
+  LANDO_ZSH_CONFIG_FILE=".lando.dev.yml"
+  ```
+
+- `LANDO_ZSH_WRAPPED_COMMANDS`: The list of commands to wrap, as a string of commands separated by whitespace:
+  ```sh
+  LANDO_ZSH_WRAPPED_COMMANDS="mysql php composer test artisan"
+  ```
 
 ## Author:
 
diff --git a/zsh/plugins/lando/lando.plugin.zsh b/zsh/plugins/lando/lando.plugin.zsh
index af53e7e..ee796d2 100644
--- a/zsh/plugins/lando/lando.plugin.zsh
+++ b/zsh/plugins/lando/lando.plugin.zsh
@@ -1,25 +1,36 @@
 # Settings
 : ${LANDO_ZSH_SITES_DIRECTORY:="$HOME/Sites"}
 : ${LANDO_ZSH_CONFIG_FILE:=.lando.yml}
+: ${LANDO_ZSH_WRAPPED_COMMANDS:="
+  artisan
+  composer
+  drush
+  gulp
+  npm
+  php
+  wp
+  yarn
+"}
 
 # Enable multiple commands with lando.
-function artisan \
-         composer \
-         drush \
-         gulp \
-         npm \
-         php \
-         wp \
-         yarn {
-  if checkForLandoFile; then
-    lando "$0" "$@"
+function ${=LANDO_ZSH_WRAPPED_COMMANDS} {
+  # If the lando task is available in `lando --help`, then it means:
+  #
+  # 1. `lando` is in a project with a `.lando.yml` file.
+  # 2. The lando task is available for lando, based on the .lando.yml config file.
+  #
+  # This has a penalty of about 250ms, so we still want to check if the lando file
+  # exists before, which is the fast path. If it exists, checking help output is
+  # still faster than running the command and failing.
+  if _lando_file_exists && lando --help 2>&1 | command grep -Eq "^ +lando $0 "; then
+    command lando "$0" "$@"
   else
     command "$0" "$@"
   fi
 }
 
 # Check for the file in the current and parent directories.
-checkForLandoFile() {
+_lando_file_exists() {
   # Only bother checking for lando within the Sites directory.
   if [[ "$PWD/" != "$LANDO_ZSH_SITES_DIRECTORY"/* ]]; then
     # Not within $LANDO_ZSH_SITES_DIRECTORY
@@ -38,4 +49,4 @@ checkForLandoFile() {
   # Could not find $LANDO_ZSH_CONFIG_FILE in the current directory
   # or in any of its parents up to $LANDO_ZSH_SITES_DIRECTORY.
   return 1
-}
\ No newline at end of file
+}
diff --git a/zsh/plugins/laravel/README.md b/zsh/plugins/laravel/README.md
index 95f5901..c5375f2 100644
--- a/zsh/plugins/laravel/README.md
+++ b/zsh/plugins/laravel/README.md
@@ -10,6 +10,7 @@ plugins=(... laravel)
 |:-:|:-:|
 | `artisan`  | `php artisan`  |
 | `pas`  | `php artisan serve` |
+| `pats`  | `php artisan test` |
 
 ## Database
 
@@ -20,6 +21,7 @@ plugins=(... laravel)
 | `pamfs`  |  `php artisan migrate:fresh --seed` |
 | `pamr`  |  `php artisan migrate:rollback` |
 | `pads`  |  `php artisan db:seed` |
+| `padw`  |  `php artisan db:wipe` |
 
 ## Makers
 
@@ -35,6 +37,10 @@ plugins=(... laravel)
 | `pamj`  |  `php artisan make:job` |
 | `paml`  |  `php artisan make:listener` |
 | `pamn`  |  `php artisan make:notification` |
+| `pamcl` | `php artisan make:class` |
+| `pamen` | `php artisan make:enum` |
+| `pami`  | `php artisan make:interface` |
+| `pamtr` | `php artisan make:trait` |
 
 ## Clears
 
@@ -44,6 +50,7 @@ plugins=(... laravel)
 | `pacoc`  |  `php artisan config:clear` |
 | `pavic`  |  `php artisan view:clear` |
 | `paroc`  |  `php artisan route:clear` |
+| `paopc`  |  `php artisan optimize:clear` |
 
 ## Queues
 
diff --git a/zsh/plugins/laravel/laravel.plugin.zsh b/zsh/plugins/laravel/laravel.plugin.zsh
index a8382d3..20a1c47 100644
--- a/zsh/plugins/laravel/laravel.plugin.zsh
+++ b/zsh/plugins/laravel/laravel.plugin.zsh
@@ -4,6 +4,7 @@ alias bob='php artisan bob::build'
 
 # Development
 alias pas='php artisan serve'
+alias pats='php artisan test'
 
 # Database
 alias pam='php artisan migrate'
@@ -11,6 +12,7 @@ alias pamf='php artisan migrate:fresh'
 alias pamfs='php artisan migrate:fresh --seed'
 alias pamr='php artisan migrate:rollback'
 alias pads='php artisan db:seed'
+alias padw='php artisan db:wipe'
 
 # Makers
 alias pamm='php artisan make:model'
@@ -24,6 +26,10 @@ alias pamj='php artisan make:job'
 alias paml='php artisan make:listener'
 alias pamn='php artisan make:notification'
 alias pampp='php artisan make:provider'
+alias pamcl='php artisan make:class'
+alias pamen='php artisan make:enum'
+alias pami='php artisan make:interface'
+alias pamtr='php artisan make:trait'
 
 
 # Clears
@@ -31,6 +37,7 @@ alias pacac='php artisan cache:clear'
 alias pacoc='php artisan config:clear'
 alias pavic='php artisan view:clear'
 alias paroc='php artisan route:clear'
+alias paopc='php artisan optimize:clear'
 
 # queues
 alias paqf='php artisan queue:failed'
diff --git a/zsh/plugins/last-working-dir/last-working-dir.plugin.zsh b/zsh/plugins/last-working-dir/last-working-dir.plugin.zsh
index 905a02a..951ebff 100644
--- a/zsh/plugins/last-working-dir/last-working-dir.plugin.zsh
+++ b/zsh/plugins/last-working-dir/last-working-dir.plugin.zsh
@@ -9,20 +9,23 @@ chpwd_last_working_dir() {
   [[ "$ZSH_SUBSHELL" -eq 0 ]] || return 0
   # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
   local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
-  pwd >| "$cache_file"
+  'builtin' 'echo' '-E' "$PWD" >| "$cache_file"
 }
 
 # Changes directory to the last working directory
 lwd() {
   # Add ".$SSH_USER" suffix to cache file if $SSH_USER is set and non-empty
   local cache_file="$ZSH_CACHE_DIR/last-working-dir${SSH_USER:+.$SSH_USER}"
-  [[ -r "$cache_file" ]] && cd "$(cat "$cache_file")"
+  [[ -r "$cache_file" ]] && cd "$(<"$cache_file")"
 }
 
 # Jump to last directory automatically unless:
-# - this isn't the first time the plugin is loaded
-# - it's not in $HOME directory
-[[ -n "$ZSH_LAST_WORKING_DIRECTORY" ]] && return
-[[ "$PWD" != "$HOME" ]] && return
+#
+# - This isn't the first time the plugin is loaded
+# - We're not in the $HOME directory (e.g. if terminal opened a different folder)
+[[ -z "$ZSH_LAST_WORKING_DIRECTORY" ]] || return 0
+[[ "$PWD" == "$HOME" ]] || return 0
 
-lwd 2>/dev/null && ZSH_LAST_WORKING_DIRECTORY=1 || true
+if lwd 2>/dev/null; then
+  ZSH_LAST_WORKING_DIRECTORY=1
+fi
diff --git a/zsh/plugins/localstack/README.md b/zsh/plugins/localstack/README.md
new file mode 100644
index 0000000..2c71e9e
--- /dev/null
+++ b/zsh/plugins/localstack/README.md
@@ -0,0 +1,24 @@
+#  Localstack plugin  #
+
+CLI support for LOCALSTACK interaction
+
+##  Description  ##
+To use it, add `localstack` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... localstack)
+```
+
+##  Usage  ##
+
+This plugin supplies one command, `lsk`, through which all its features are exposed.
+
+## Commands
+
+| Command       | Description                                                           |
+| :------------ | :-------------------------------------------------------------------- |
+| `lsk sqs-send <queue> <message.json>` | sends a given message in sqs to a given queue |
+
+## Examples
+
+![staging](sqs-send-result.png)
diff --git a/zsh/plugins/localstack/localstack.plugin.zsh b/zsh/plugins/localstack/localstack.plugin.zsh
new file mode 100644
index 0000000..080b14a
--- /dev/null
+++ b/zsh/plugins/localstack/localstack.plugin.zsh
@@ -0,0 +1,37 @@
+# CLI support for LOCALSTACK interaction
+#
+# See README.md for details
+lsk() {
+  case $1 in
+    sqs-send)
+      shift
+      sqs-send "$@"
+      ;;
+    *)
+      echo "Command not found: $1"
+      return 1
+      ;;
+  esac
+}
+
+# Send SQS function
+#
+# This function sends a given message in sqs to a given queue, when used Localstack
+#
+# Use:
+#   sqs-send <queue> <message>
+#
+# Parameters
+#   <queue> A given queue
+#   <message> A content of message em json archive
+#
+# Example
+#   sqs-send user user.json
+sqs-send(){
+  if [ -z "$1" ]; then
+	  echo "Use: sqs-send <queue> <payload>"
+	  return 1
+  fi
+
+  curl -X POST "http://localhost:4566/000000000000/$1" -d "Action=SendMessage" -d "MessageBody=$(cat $2)"
+}
\ No newline at end of file
diff --git a/zsh/plugins/localstack/sqs-send-result.png b/zsh/plugins/localstack/sqs-send-result.png
new file mode 100644
index 0000000..69eb2a6
Binary files /dev/null and b/zsh/plugins/localstack/sqs-send-result.png differ
diff --git a/zsh/plugins/lol/README.md b/zsh/plugins/lol/README.md
index ea6b0c3..b45513b 100644
--- a/zsh/plugins/lol/README.md
+++ b/zsh/plugins/lol/README.md
@@ -49,7 +49,7 @@ plugins=(... lol)
 | `violenz`    | `git rebase`                                                    |
 | `visible`    | `echo`                                                          |
 | `wtf`        | `dmesg`                                                         |
-| `yolo`       | `git commit -m "$(curl -s http://whatthecommit.com/index.txt)"` |
+| `yolo`       | `git commit -m "$(curl -s https://whatthecommit.com/index.txt)"` |
 
 ## Usage Examples
 
@@ -66,6 +66,6 @@ nowai u=r,go= some.file
 # ssh root@catserver.org
 pwned root@catserver.org
 
-# git commit -m "$(curl -s http://whatthecommit.com/index.txt)"
+# git commit -m "$(curl -s https://whatthecommit.com/index.txt)"
 yolo
 ```
diff --git a/zsh/plugins/lol/lol.plugin.zsh b/zsh/plugins/lol/lol.plugin.zsh
index 3c30259..585f96e 100644
--- a/zsh/plugins/lol/lol.plugin.zsh
+++ b/zsh/plugins/lol/lol.plugin.zsh
@@ -45,7 +45,7 @@ alias bringz='git pull'
 alias chicken='git add'
 alias oanward='git commit -m'
 alias ooanward='git commit -am'
-alias yolo='git commit -m "$(curl -s http://whatthecommit.com/index.txt)"'
+alias yolo='git commit -m "$(curl -s https://whatthecommit.com/index.txt)"'
 alias letcat='git checkout'
 alias violenz='git rebase'
 
diff --git a/zsh/plugins/lpass/_lpass b/zsh/plugins/lpass/_lpass
index 621a7bc..e312fb9 100644
--- a/zsh/plugins/lpass/_lpass
+++ b/zsh/plugins/lpass/_lpass
@@ -78,7 +78,7 @@ _lpass() {
                 has_sync=1
             ;;
             status)
-               _arguments : '(-q --quiet)'{-q,--quiet}'[Supress output to stdout]'
+               _arguments : '(-q --quiet)'{-q,--quiet}'[Suppress output to stdout]'
                 has_color=1
             ;;
             sync)
diff --git a/zsh/plugins/macos/README.md b/zsh/plugins/macos/README.md
index 1bc4244..ccc4331 100644
--- a/zsh/plugins/macos/README.md
+++ b/zsh/plugins/macos/README.md
@@ -8,7 +8,12 @@ To start using it, add the `macos` plugin to your plugins array in `~/.zshrc`:
 plugins=(... macos)
 ```
 
-Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
+## Supported Terminals
+- [iTerm](https://iterm.sourceforge.net/)
+- [iTerm2](https://iterm2.com/)
+- [Hyper](https://hyper.is/)
+- [Tabby](https://tabby.sh/)
+- [Ghostty](https://ghostty.org)
 
 ## Commands
 
@@ -17,7 +22,7 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 | `tab`         | Open the current directory in a new tab                  |
 | `split_tab`   | Split the current terminal tab horizontally              |
 | `vsplit_tab`  | Split the current terminal tab vertically                |
-| `ofd`         | Open the current directory in a Finder window            |
+| `ofd`         | Open passed directories (or $PWD by default) in Finder   |
 | `pfd`         | Return the path of the frontmost Finder window           |
 | `pfs`         | Return the current Finder selection                      |
 | `cdf`         | `cd` to the current Finder directory                     |
@@ -25,7 +30,7 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 | `pxd`         | Return the current Xcode project directory               |
 | `cdx`         | `cd` to the current Xcode project directory              |
 | `quick-look`  | Quick-Look a specified file                              |
-| `man-preview` | Open a specified man page in Preview app                 |
+| `man-preview` | Open man pages in Preview app                            |
 | `showfiles`   | Show hidden files in Finder                              |
 | `hidefiles`   | Hide the hidden files in Finder                          |
 | `itunes`      | _DEPRECATED_. Use `music` from macOS Catalina on         |
@@ -37,7 +42,9 @@ Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
 
 ## Acknowledgements
 
-This application makes use of the following third party scripts:
+Original author: [Sorin Ionescu](https://github.com/sorin-ionescu)
+
+This application makes use of the following third-party scripts:
 
 [shpotify](https://github.com/hnarayanan/shpotify)
 
diff --git a/zsh/plugins/macos/macos.plugin.zsh b/zsh/plugins/macos/macos.plugin.zsh
index b540eec..4d73d22 100644
--- a/zsh/plugins/macos/macos.plugin.zsh
+++ b/zsh/plugins/macos/macos.plugin.zsh
@@ -3,8 +3,15 @@
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
-# Open the current directory in a Finder window
-alias ofd='open_command $PWD'
+# Open in Finder the directories passed as arguments, or the current directory if
+# no directories are passed
+function ofd {
+  if (( ! $# )); then
+    open_command $PWD
+  else
+    open_command $@
+  fi
+}
 
 # Show/hide hidden files in the Finder
 alias showfiles="defaults write com.apple.finder AppleShowAllFiles -bool true && killall Finder"
@@ -72,6 +79,19 @@ EOF
         key code 36  #(presses enter)
       end tell
 EOF
+
+  elif [[ "$the_app" == 'Tabby' ]]; then
+    osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Tabby" to keystroke "t" using command down
+      end tell
+EOF
+  elif [[ "$the_app" == 'ghostty' ]]; then
+    osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Ghostty" to keystroke "t" using command down
+      end tell
+EOF
   else
     echo "$0: unsupported terminal app: $the_app" >&2
     return 1
@@ -119,6 +139,18 @@ EOF
       delay 1
       keystroke "${command} \n"
     end tell
+EOF
+  elif [[ "$the_app" == 'Tabby' ]]; then
+    osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Tabby" to keystroke "D" using command down
+      end tell
+EOF
+  elif [[ "$the_app" == 'ghostty' ]]; then
+    osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Ghostty" to keystroke "D" using command down
+      end tell
 EOF
   else
     echo "$0: unsupported terminal app: $the_app" >&2
@@ -168,6 +200,18 @@ EOF
       delay 1
       keystroke "${command} \n"
     end tell
+EOF
+  elif [[ "$the_app" == 'Tabby' ]]; then
+    osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Tabby" to keystroke "d" using command down
+      end tell
+EOF
+  elif [[ "$the_app" == 'ghostty' ]]; then
+    osascript >/dev/null <<EOF
+      tell application "System Events"
+        tell process "Ghostty" to keystroke "d" using command down
+      end tell
 EOF
   else
     echo "$0: unsupported terminal app: $the_app" >&2
@@ -224,8 +268,12 @@ function quick-look() {
 }
 
 function man-preview() {
-  # Don't let Preview.app steal focus if the man page doesn't exist
-  man -w "$@" &>/dev/null && man -t "$@" | open -f -a Preview || man "$@"
+  [[ $# -eq 0 ]] && >&2 echo "Usage: $0 command1 [command2 ...]" && return 1
+
+  local page
+  for page in "${(@f)"$(command man -w $@)"}"; do
+    command mandoc -Tpdf $page | open -f -a Preview
+  done
 }
 compdef _man man-preview
 
diff --git a/zsh/plugins/macos/spotify b/zsh/plugins/macos/spotify
index 491a606..ae42db4 100644
--- a/zsh/plugins/macos/spotify
+++ b/zsh/plugins/macos/spotify
@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
 function spotify() {
-# Copyright (c) 2012--2019 Harish Narayanan <mail@harishnarayanan.org>
+# Copyright (c) 2012--2023 Harish Narayanan <mail@harishnarayanan.org>
 #
 # Contains numerous helpful contributions from Jorge Colindres, Thomas
 # Pritchard, iLan Epstein, Gabriele Bonetti, Sean Heller, Eric Martin
@@ -35,6 +35,9 @@ if ! [[ -f "${USER_CONFIG_FILE}" ]]; then
 fi
 source "${USER_CONFIG_FILE}";
 
+# Set the percent change in volume for vol up and vol down
+VOL_INCREMENT=10
+
 showAPIHelp() {
     echo;
     echo "Connecting to Spotify's API:";
@@ -43,7 +46,7 @@ showAPIHelp() {
     echo "  find music by name. It is very likely you want this feature!";
     echo;
     echo "  To get this to work, you need to sign up (or in) and create an 'Application' at:";
-    echo "  https://developer.spotify.com/my-applications/#!/applications/create";
+    echo "  https://developer.spotify.com/dashboard/create";
     echo;
     echo "  Once you've created an application, find the 'Client ID' and 'Client Secret'";
     echo "  values, and enter them into your shpotify config file at '${USER_CONFIG_FILE}'";
@@ -170,12 +173,12 @@ while [ $# -gt 0 ]; do
                 if [ -z "${CLIENT_ID}" ]; then
                     cecho "Invalid Client ID, please update ${USER_CONFIG_FILE}";
                     showAPIHelp;
-                    return 1
+                    return 1;
                 fi
                 if [ -z "${CLIENT_SECRET}" ]; then
                     cecho "Invalid Client Secret, please update ${USER_CONFIG_FILE}";
                     showAPIHelp;
-                    return 1
+                    return 1;
                 fi
                 SHPOTIFY_CREDENTIALS=$(printf "${CLIENT_ID}:${CLIENT_SECRET}" | base64 | tr -d "\n"|tr -d '\r');
                 SPOTIFY_PLAY_URI="";
@@ -198,7 +201,7 @@ while [ $# -gt 0 ]; do
                     fi
                     SPOTIFY_ACCESS_TOKEN=$( \
                         printf "${SPOTIFY_TOKEN_RESPONSE_DATA}" \
-                        | grep -E -o '"access_token":".*",' \
+                        | command grep -E -o '"access_token":".*",' \
                         | sed 's/"access_token"://g' \
                         | sed 's/"//g' \
                         | sed 's/,.*//g' \
@@ -219,9 +222,8 @@ while [ $# -gt 0 ]; do
                             -H "Accept: application/json" \
                             --data-urlencode "q=$Q" \
                             -d "type=$type&limit=1&offset=0" \
-                        | grep -E -o "spotify:$type:[a-zA-Z0-9]+" -m 1
+                        | command grep -E -o "spotify:$type:[a-zA-Z0-9]+" -m 1
                     )
-                    echo "play uri: ${SPOTIFY_PLAY_URI}"
                 }
 
                 case $2 in
@@ -235,11 +237,11 @@ while [ $# -gt 0 ]; do
 
                         results=$( \
                             curl -s -G $SPOTIFY_SEARCH_API --data-urlencode "q=$Q" -d "type=playlist&limit=10&offset=0" -H "Accept: application/json" -H "Authorization: Bearer ${SPOTIFY_ACCESS_TOKEN}" \
-                            | grep -E -o "spotify:playlist:[a-zA-Z0-9]+" -m 10 \
+                            | command grep -E -o "spotify:playlist:[a-zA-Z0-9]+" -m 10 \
                         )
 
                         count=$( \
-                            echo "$results" | grep -c "spotify:playlist" \
+                            echo "$results" | command grep -c "spotify:playlist" \
                         )
 
                         if [ "$count" -gt 0 ]; then
@@ -333,16 +335,16 @@ while [ $# -gt 0 ]; do
                 cecho "Current Spotify volume level is $vol.";
                 break ;
             elif [ "$2" = "up" ]; then
-                if [ $vol -le 90 ]; then
-                    newvol=$(( vol+10 ));
+              if [ $vol -le $(( 100-$VOL_INCREMENT )) ]; then
+                    newvol=$(( vol+$VOL_INCREMENT ));
                     cecho "Increasing Spotify volume to $newvol.";
                 else
                     newvol=100;
                     cecho "Spotify volume level is at max.";
                 fi
             elif [ "$2" = "down" ]; then
-                if [ $vol -ge 10 ]; then
-                    newvol=$(( vol-10 ));
+                if [ $vol -ge $(( $VOL_INCREMENT )) ]; then
+                    newvol=$(( vol-$VOL_INCREMENT ));
                     cecho "Reducing Spotify volume to $newvol.";
                 else
                     newvol=0;
@@ -354,11 +356,11 @@ while [ $# -gt 0 ]; do
             else
                 echo "Improper use of 'vol' command"
                 echo "The 'vol' command should be used as follows:"
-                echo "  vol up                       # Increases the volume by 10%.";
-                echo "  vol down                     # Decreases the volume by 10%.";
+                echo "  vol up                       # Increases the volume by $VOL_INCREMENT%.";
+                echo "  vol down                     # Decreases the volume by $VOL_INCREMENT%.";
                 echo "  vol [amount]                 # Sets the volume to an amount between 0 and 100.";
                 echo "  vol                          # Shows the current Spotify volume.";
-                return 1
+                return 1;
             fi
 
             osascript -e "tell application \"Spotify\" to set sound volume to $newvol";
@@ -468,10 +470,9 @@ while [ $# -gt 0 ]; do
         "help" )
             showHelp;
             break ;;
-
         * )
             showHelp;
-            return 1 ;;
+            return 1;
 
     esac
 done
diff --git a/zsh/plugins/macports/README.md b/zsh/plugins/macports/README.md
index 09bd42d..ffe3f97 100644
--- a/zsh/plugins/macports/README.md
+++ b/zsh/plugins/macports/README.md
@@ -16,7 +16,7 @@ plugins=(... macports)
 | pc    | `sudo port clean --all installed`  | Clean up intermediate installation files for installed ports |
 | pi    | `sudo port install`                | Install package given as argument                            |
 | pli   | `port livecheck installed`         | Check for updates for installed ports                        |
-| plm   | `port-livecheck-maintainer`        | Check for updates of ports mainained by the specified users  |
+| plm   | `port-livecheck-maintainer`        | Check for updates of ports maintained by the specified users  |
 | psu   | `sudo port selfupdate`             | Update ports tree with MacPorts repository                   |
 | puni  | `sudo port uninstall inactive`     | Uninstall inactive ports                                     |
 | puo   | `sudo port upgrade outdated`       | Upgrade ports with newer versions available                  |
diff --git a/zsh/plugins/macports/_port b/zsh/plugins/macports/_port
index 897598a..f40f655 100644
--- a/zsh/plugins/macports/_port
+++ b/zsh/plugins/macports/_port
@@ -1,6 +1,6 @@
 #compdef port
 
-local subcmds 
+local subcmds
 
 # we cache the list of ports
 # we shall use some cache policy to avoid problems with new ports
@@ -31,8 +31,8 @@ subcmds=(
 'file'
 'help'
 'info'
-'install' 
-'installed' 
+'install'
+'installed'
 'list'
 'livecheck'
 'location'
@@ -51,7 +51,7 @@ subcmds=(
 'test'
 'unarchive'
 'uninstall'
-'upgrade' 
+'upgrade'
 'variants'
 'version'
 )
diff --git a/zsh/plugins/magic-enter/magic-enter.plugin.zsh b/zsh/plugins/magic-enter/magic-enter.plugin.zsh
index 55b8935..722d747 100644
--- a/zsh/plugins/magic-enter/magic-enter.plugin.zsh
+++ b/zsh/plugins/magic-enter/magic-enter.plugin.zsh
@@ -1,5 +1,6 @@
 # Default commands
 : ${MAGIC_ENTER_GIT_COMMAND:="git status -u ."} # run when in a git repository
+: ${MAGIC_ENTER_JJ_COMMAND:="jj st --no-pager ."} # run when in a jj repository
 : ${MAGIC_ENTER_OTHER_COMMAND:="ls -lh ."}      # run anywhere else
 
 magic-enter() {
@@ -9,7 +10,10 @@ magic-enter() {
     return
   fi
 
-  if command git rev-parse --is-inside-work-tree &>/dev/null; then
+  # needs to be before git to handle colocated repositories
+  if (( $+commands[jj] )) && command jj st >/dev/null 2>&1; then
+    BUFFER="$MAGIC_ENTER_JJ_COMMAND"
+  elif (( $+commands[git] )) && command git rev-parse --is-inside-work-tree >/dev/null 2>&1; then
     BUFFER="$MAGIC_ENTER_GIT_COMMAND"
   else
     BUFFER="$MAGIC_ENTER_OTHER_COMMAND"
diff --git a/zsh/plugins/marked2/README.md b/zsh/plugins/marked2/README.md
index 101343a..2f825bc 100644
--- a/zsh/plugins/marked2/README.md
+++ b/zsh/plugins/marked2/README.md
@@ -1,6 +1,6 @@
 ## marked2
 
-Plugin for Marked 2, a previewer for Markdown files on Mac OS X 
+Plugin for Marked 2, a previewer for Markdown files on Mac OS X
 
 ### Requirements
 
diff --git a/zsh/plugins/marked2/marked2.plugin.zsh b/zsh/plugins/marked2/marked2.plugin.zsh
index 56863ad..45f4b65 100644
--- a/zsh/plugins/marked2/marked2.plugin.zsh
+++ b/zsh/plugins/marked2/marked2.plugin.zsh
@@ -3,10 +3,5 @@
 # If marked is passed a file, open it in Marked
 #
 function marked() {
-    if [ "$1" ]
-    then
-        open -a "marked 2.app" "$1"
-    else
-        open -a "marked 2.app"
-    fi
+    open -a "marked 2.app" "$1"
 }
diff --git a/zsh/plugins/marktext/README.md b/zsh/plugins/marktext/README.md
new file mode 100644
index 0000000..254e4e7
--- /dev/null
+++ b/zsh/plugins/marktext/README.md
@@ -0,0 +1,17 @@
+## marktext
+
+Plugin for MarkText, a previewer for Markdown files on Mac OS X
+
+### Requirements
+
+ * [MarkText](https://github.com/marktext/marktext)
+
+### Usage
+
+ * If `marktext` is called without an argument, open MarkText
+
+ * If `marktext` is passed a file, open it in MarkText
+
+### Credits
+
+ * just copied from plugins/marked2, all credits to marked2 plugin author
diff --git a/zsh/plugins/marktext/marktext.plugin.zsh b/zsh/plugins/marktext/marktext.plugin.zsh
new file mode 100644
index 0000000..1da85bc
--- /dev/null
+++ b/zsh/plugins/marktext/marktext.plugin.zsh
@@ -0,0 +1,7 @@
+#
+# If marktext is called without an argument, open MarkText
+# If marktext is passed a file, open it in MarkText
+#
+function marktext() {
+    open -a "MarkText.app" "$1"
+}
diff --git a/zsh/plugins/minikube/minikube.plugin.zsh b/zsh/plugins/minikube/minikube.plugin.zsh
index e87abce..0d27370 100644
--- a/zsh/plugins/minikube/minikube.plugin.zsh
+++ b/zsh/plugins/minikube/minikube.plugin.zsh
@@ -1,13 +1,13 @@
-# Autocompletion for Minikube.
-#
-if (( $+commands[minikube] )); then
-    __MINIKUBE_COMPLETION_FILE="${ZSH_CACHE_DIR}/minikube_completion"
-
-    if [[ ! -f $__MINIKUBE_COMPLETION_FILE ]]; then
-        minikube completion zsh >! $__MINIKUBE_COMPLETION_FILE
-    fi
-
-    [[ -f $__MINIKUBE_COMPLETION_FILE ]] && source $__MINIKUBE_COMPLETION_FILE
-
-    unset __MINIKUBE_COMPLETION_FILE
+if (( ! $+commands[minikube] )); then
+  return
 fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `minikube`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_minikube" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _minikube
+  _comps[minikube]=_minikube
+fi
+
+minikube completion zsh >| "$ZSH_CACHE_DIR/completions/_minikube" &|
diff --git a/zsh/plugins/mise/README.md b/zsh/plugins/mise/README.md
new file mode 100644
index 0000000..8ec05aa
--- /dev/null
+++ b/zsh/plugins/mise/README.md
@@ -0,0 +1,32 @@
+# mise
+
+Adds integration with [mise](https://github.com/jdx/mise) (formerly `rtx`), a runtime executor compatible with
+npm, nodenv, pyenv, etc. mise is written in rust and is very fast. 20x-200x faster than asdf. With that being
+said, mise is compatible with asdf plugins and .tool-versions files. It can be used as a drop-in replacement.
+
+## Installation
+
+1. [Download & install mise](https://github.com/jdx/mise#installation) by running the following:
+
+```bash
+curl https://mise.jdx.dev/install.sh | sh
+```
+
+2. [Enable mise](https://github.com/jdx/mise#quickstart) by adding it to your `plugins` definition in
+   `~/.zshrc`.
+
+```bash
+plugins=(mise)
+```
+
+## Usage
+
+See the [mise readme](https://github.com/jdx/mise#table-of-contents) for information on how to use mise. Here
+are a few examples:
+
+```bash
+mise install node         Install the current version specified in .tool-versions/.mise.toml
+mise use -g node@system   Use system node as global default
+mise install node@20.0.0  Install a specific version number
+mise use -g node@20       Use node-20.x as global default
+```
diff --git a/zsh/plugins/mise/mise.plugin.zsh b/zsh/plugins/mise/mise.plugin.zsh
new file mode 100644
index 0000000..96373f5
--- /dev/null
+++ b/zsh/plugins/mise/mise.plugin.zsh
@@ -0,0 +1,17 @@
+if (( ! $+commands[mise] )); then
+  return
+fi
+
+# Load mise hooks
+eval "$(mise activate zsh)"
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `mise`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_mise" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _mise
+  _comps[mise]=_mise
+fi
+
+# Generate and load mise completion
+mise completion zsh >| "$ZSH_CACHE_DIR/completions/_mise" &|
diff --git a/zsh/plugins/mix/README.md b/zsh/plugins/mix/README.md
index f0258fe..9bbe53a 100644
--- a/zsh/plugins/mix/README.md
+++ b/zsh/plugins/mix/README.md
@@ -17,3 +17,4 @@ plugins=(... mix)
 | Ecto                     | [Ecto](https://hexdocs.pm/ecto/Ecto.html)                |
 | Hex                      | [Hex](https://hex.pm/)                                   |
 | Nerves                   | [Nerves](https://nerves-project.org/)                    |
+| mix_test_watch           | [mix_test_watch](https://hex.pm/packages/mix_test_watch) |
diff --git a/zsh/plugins/mix/_mix b/zsh/plugins/mix/_mix
index 7940ff1..346fc8c 100644
--- a/zsh/plugins/mix/_mix
+++ b/zsh/plugins/mix/_mix
@@ -109,6 +109,7 @@ _1st_arguments=(
     'release.init:Generates sample files for releases'
     'run:Run the given file or expression'
     "test:Run a project's tests"
+    "test.watch:Run a project's tests continuously using hex package mix_test_watch"
     'test.coverage:Build report from exported test coverage'
     'xref:Prints cross reference information'
     '--help:Describe available tasks'
@@ -120,7 +121,7 @@ __task_list ()
     local expl
     declare -a tasks
 
-    tasks=(app.config app.start app.tree archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.tree deps.unlock deps.update do ecto.create ecto.drop ecto.dump ecto.gen.migration ecto.gen.repo ecto.load ecto.migrate ecto.migrations ecto.rollback escript escript.build escript.install escript.uninstall firmware firmware.burn firmware.image format help hex hex.audit hex.build hex.config hex.docs hex.info hex.organization hex.key hex.outdated hex.owner hex.package hex.publish hex.registry hex.repo hex.retire hex.search hex.sponsor hex.user loadconfig local local.hex local.phoenix local.phx local.public_keys local.rebar nerves.artifact nerves.artifact.get nerves.info nerves.new nerves.release.init new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.auth phx.gen.cert phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.live phx.gen.notifier phx.gen.presence phx.gen.schema phx.gen.secret phx.gen.socket phx.new phx.new.ecto phx.new.web phx.routes phx.server profile.cprof profile.eprof profile.fprof release release.init run test test.coverage xref)
+    tasks=(app.config app.start app.tree archive archive.build archive.install archive.uninstall clean cmd compile compile.protocols deps deps.clean deps.compile deps.get deps.tree deps.unlock deps.update do ecto.create ecto.drop ecto.dump ecto.gen.migration ecto.gen.repo ecto.load ecto.migrate ecto.migrations ecto.rollback escript escript.build escript.install escript.uninstall firmware firmware.burn firmware.image format help hex hex.audit hex.build hex.config hex.docs hex.info hex.organization hex.key hex.outdated hex.owner hex.package hex.publish hex.registry hex.repo hex.retire hex.search hex.sponsor hex.user loadconfig local local.hex local.phoenix local.phx local.public_keys local.rebar nerves.artifact nerves.artifact.get nerves.info nerves.new nerves.release.init new phoenix.digest phoenix.gen.channel phoenix.gen.html phoenix.gen.json phoenix.gen.model phoenix.gen.secret phoenix.new phoenix.routes phoenix.server phx.digest phx.digest.clean phx.gen.auth phx.gen.cert phx.gen.channel phx.gen.context phx.gen.embedded phx.gen.html phx.gen.json phx.gen.live phx.gen.notifier phx.gen.presence phx.gen.schema phx.gen.secret phx.gen.socket phx.new phx.new.ecto phx.new.web phx.routes phx.server profile.cprof profile.eprof profile.fprof release release.init run test test.watch test.coverage xref)
 
     _wanted tasks expl 'help' compadd $tasks
 }
@@ -145,9 +146,22 @@ case $state in
       (help)
          _arguments ':feature:__task_list'
          ;;
+      (format)
+        _arguments -C \
+          '--check-formatted' \
+          '--dot-formatter' \
+          '--dry-run' \
+          '--force' \
+          '--migrate' \
+          '--no-exit' \
+          '*::file:_files'
+          ;;
       (test)
          _files
          ;;
+      (test.watch)
+         _files
+         ;;
       (run)
          _files
          ;;
diff --git a/zsh/plugins/molecule/README.md b/zsh/plugins/molecule/README.md
new file mode 100644
index 0000000..5c44766
--- /dev/null
+++ b/zsh/plugins/molecule/README.md
@@ -0,0 +1,20 @@
+# Molecule plugin
+
+This plugin adds aliases and completion for [Molecule](https://ansible.readthedocs.io/projects/molecule/), the
+project designed to aid in the development and testing of Ansible roles..
+
+To use it, add `molecule` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... molecule)
+```
+
+## Aliases
+
+| Alias | Command           | Description                                                                        |
+| :---- | :---------------- | ---------------------------------------------------------------------------------- |
+| mol   | molecule          | Molecule aids in the development and testing of Ansible roles.                     |
+| mcr   | molecule create   | Use the provisioner to start the instances.                                        |
+| mcon  | molecule converge | Use the provisioner to configure instances (dependency, create, prepare converge). |
+| mls   | molecule list     | List status of instances.                                                          |
+| mvf   | molecule verify   | Run automated tests against instances.                                             |
diff --git a/zsh/plugins/molecule/molecule.plugin.zsh b/zsh/plugins/molecule/molecule.plugin.zsh
new file mode 100644
index 0000000..cee25ab
--- /dev/null
+++ b/zsh/plugins/molecule/molecule.plugin.zsh
@@ -0,0 +1,22 @@
+# Completion
+if (( ! $+commands[molecule] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `molecule`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_molecule" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _molecule
+  _comps[molecule]=_molecule
+fi
+
+_MOLECULE_COMPLETE=zsh_source molecule >| "$ZSH_CACHE_DIR/completions/_molecule" &|
+
+# Alias
+# molecule: https://docs.ansible.com/projects/molecule/
+alias mol='molecule'
+alias mcr='molecule create'
+alias mcon='molecule converge'
+alias mls='molecule list'
+alias mvf='molecule verify'
diff --git a/zsh/plugins/mongo-atlas/README.md b/zsh/plugins/mongo-atlas/README.md
new file mode 100644
index 0000000..94183c5
--- /dev/null
+++ b/zsh/plugins/mongo-atlas/README.md
@@ -0,0 +1,10 @@
+# MongoDB Atlas plugin
+
+This plugin adds completion for [Atlas](https://www.mongodb.com/docs/atlas/cli/stable/) a command line interface built specifically for
+MongoDB Atlas.
+
+To use it, add `mongo-atlas` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... mongo-atlas)
+```
diff --git a/zsh/plugins/mongo-atlas/mongo-atlas.plugin.zsh b/zsh/plugins/mongo-atlas/mongo-atlas.plugin.zsh
new file mode 100644
index 0000000..6762c90
--- /dev/null
+++ b/zsh/plugins/mongo-atlas/mongo-atlas.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the Mongo Atlas CLI (atlas).
+if (( ! $+commands[atlas] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `atlas`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_atlas" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _atlas
+  _comps[atlas]=_atlas
+fi
+
+atlas completion zsh >| "$ZSH_CACHE_DIR/completions/atlas" &|
diff --git a/zsh/plugins/mvn/README.md b/zsh/plugins/mvn/README.md
index 815dfd5..bcb2648 100644
--- a/zsh/plugins/mvn/README.md
+++ b/zsh/plugins/mvn/README.md
@@ -33,7 +33,9 @@ if it's found, or the mvn command otherwise.
 | `mvnct`              | `mvn clean test`                                |
 | `mvncv`              | `mvn clean verify`                              |
 | `mvncvst`            | `mvn clean verify -DskipTests`                  |
-| `mvnd`               | `mvn deploy`                                    |
+| `mvnv`               | `mvn verify`                                    |
+| `mvnvst`             | `mvn verify -DskipTests`                        |
+| `mvndp`              | `mvn deploy`                                    |
 | `mvndocs`            | `mvn dependency:resolve -Dclassifier=javadoc`   |
 | `mvndt`              | `mvn dependency:tree`                           |
 | `mvne`               | `mvn eclipse:eclipse`                           |
diff --git a/zsh/plugins/mvn/mvn.plugin.zsh b/zsh/plugins/mvn/mvn.plugin.zsh
index 1b9141f..8477722 100644
--- a/zsh/plugins/mvn/mvn.plugin.zsh
+++ b/zsh/plugins/mvn/mvn.plugin.zsh
@@ -62,7 +62,9 @@ alias mvncp='mvn clean package'
 alias mvnct='mvn clean test'
 alias mvncv='mvn clean verify'
 alias mvncvst='mvn clean verify -DskipTests'
-alias mvnd='mvn deploy'
+alias mvnv='mvn verify'
+alias mvnvst='mvn verify -DskipTests'
+alias mvndp='mvn deploy'
 alias mvndocs='mvn dependency:resolve -Dclassifier=javadoc'
 alias mvndt='mvn dependency:tree'
 alias mvne='mvn eclipse:eclipse'
@@ -101,8 +103,14 @@ function listMavenCompletions {
       new_file="../pom.xml"
     fi
 
-    # if file doesn't exist break
     file="${file:h}/${new_file}"
+
+    # if the file points to a directory, assume it is a pom.xml in that directory
+    if [[ -d "$file" ]]; then
+      file="${file}/pom.xml"
+    fi
+
+    # if file doesn't exist break
     if ! [[ -e "$file" ]]; then
       break
     fi
@@ -196,7 +204,7 @@ function listMavenCompletions {
     # spring-boot
     spring-boot:run spring-boot:repackage
     # quarkus
-    quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:generate-config quarkus:help
+    quarkus:dev quarkus:list-extensions quarkus:add-extension quarkus:add-extensions quarkus:remove-extension quarkus:remove-extensions quarkus:generate-config quarkus:help
     # exec
     exec:exec exec:java
     # versions
@@ -283,9 +291,11 @@ function listMavenCompletions {
     toolchain:toolchain
     #liberty
     liberty:clean-server liberty:compile-jsp liberty:configure-arquillian liberty:create-server liberty:debug liberty:debug-server liberty:deploy liberty:dev liberty:display-url liberty:dump-server liberty:install-apps liberty:install-feature liberty:install-server liberty:java-dump-server liberty:package-server liberty:run liberty:run-server liberty:server-status liberty:start liberty:start-server liberty:status liberty:stop liberty:stop-server liberty:test-start-server liberty:test-stop-server liberty:undeploy liberty:uninstall-feature
+    # vaadin
+    vaadin:prepare-frontend vaadin:build-frontend vaadin:clean-frontend vaadin:dance
 
     # options
-    "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile="
+    "-Dmaven.test.skip=true" -DskipTests -DskipITs -Dmaven.surefire.debug -DenableCiProfile "-Dpmd.skip=true" "-Dcheckstyle.skip=true" "-Dtycho.mode=maven" "-Dmaven.test.failure.ignore=true" "-DgroupId=" "-DartifactId=" "-Dversion=" "-Dpackaging=jar" "-Dfile=" "-Dextensions="
 
     # arguments
     -am --also-make
diff --git a/zsh/plugins/n98-magerun/n98-magerun.plugin.zsh b/zsh/plugins/n98-magerun/n98-magerun.plugin.zsh
index d79aee7..2744ad9 100644
--- a/zsh/plugins/n98-magerun/n98-magerun.plugin.zsh
+++ b/zsh/plugins/n98-magerun/n98-magerun.plugin.zsh
@@ -1,6 +1,6 @@
 # ------------------------------------------------------------------------------
 # FILE: n98-magerun.plugin.zsh
-# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin 
+# DESCRIPTION: oh-my-zsh n98-magerun plugin file. Adapted from composer plugin
 # AUTHOR: Andrew Dwyer (andrewrdwyer at gmail dot com)
 # AUTHOR: Jisse Reitsma (jisse at yireo dot com)
 # VERSION: 1.1.0
diff --git a/zsh/plugins/nats/README.md b/zsh/plugins/nats/README.md
new file mode 100644
index 0000000..0ea26fc
--- /dev/null
+++ b/zsh/plugins/nats/README.md
@@ -0,0 +1,14 @@
+# NATS plugin
+
+This plugin adds completion for several tools from [NATS](https://nats.io/).
+
+- [`nsc`](https://github.com/nats-io/nsc)
+- [`natscli`](https://github.com/nats-io/natscli)
+
+To use it, add `nats` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... nats)
+```
+
+This plugin does not add any aliases.
diff --git a/zsh/plugins/nats/nats.plugin.zsh b/zsh/plugins/nats/nats.plugin.zsh
new file mode 100644
index 0000000..8b95b07
--- /dev/null
+++ b/zsh/plugins/nats/nats.plugin.zsh
@@ -0,0 +1,23 @@
+if (( $+commands[nsc] )); then
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `nsc`. Otherwise, compinit will have already done that.
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_nsc" ]]; then
+    typeset -g -A _comps
+    autoload -Uz _nsc
+    _comps[nsc]=_nsc
+  fi
+
+  nsc completion zsh >| "$ZSH_CACHE_DIR/completions/_nsc" &|
+fi
+
+if (( $+commands[nats] )); then
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `nats`. Otherwise, compinit will have already done that.
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_nats" ]]; then
+    typeset -g -A _comps
+    autoload -Uz _nats
+    _comps[nats]=_nats
+  fi
+
+  nats --completion-script-zsh >| "$ZSH_CACHE_DIR/completions/_nats" &|
+fi
diff --git a/zsh/plugins/nestjs/README.md b/zsh/plugins/nestjs/README.md
new file mode 100644
index 0000000..2956182
--- /dev/null
+++ b/zsh/plugins/nestjs/README.md
@@ -0,0 +1,52 @@
+# NestJS Plugin for Oh My Zsh
+
+This plugin provides aliases for common [NestJS CLI](https://docs.nestjs.com/cli/overview) commands.
+
+## Requirements
+
+- [NestJS CLI](https://docs.nestjs.com/cli/overview#installation) installed globally:
+  `npm install -g @nestjs/cli`
+
+## Aliases
+
+| Alias   | Command                      | Description                                 |
+| :------ | :--------------------------- | :------------------------------------------ |
+| `nnew`  | `nest new`                   | Create a new NestJS project                 |
+| `nb`    | `nest build`                 | Build the NestJS application                |
+| `ns`    | `nest start`                 | Start the application                       |
+| `nsw`   | `nest start --watch`         | Start the application in watch mode         |
+| `nsd`   | `nest start --dev`           | Start the application in dev mode           |
+| `nsdbg` | `nest start --debug --watch` | Start the application in debug & watch mode |
+| `ng`    | `nest generate`              | Generate a NestJS element                   |
+| `ngm`   | `nest generate module`       | Generate a module                           |
+| `ngc`   | `nest generate controller`   | Generate a controller                       |
+| `ngs`   | `nest generate service`      | Generate a service                          |
+| `ngg`   | `nest generate guard`        | Generate a guard                            |
+| `ngp`   | `nest generate pipe`         | Generate a pipe                             |
+| `ngf`   | `nest generate filter`       | Generate a filter                           |
+| `ngr`   | `nest generate resolver`     | Generate a GraphQL resolver                 |
+| `ngcl`  | `nest generate class`        | Generate a class                            |
+| `ngi`   | `nest generate interface`    | Generate an interface                       |
+| `ngit`  | `nest generate interceptor`  | Generate an interceptor                     |
+| `ngmi`  | `nest generate middleware`   | Generate a middleware                       |
+| `ngd`   | `nest generate decorator`    | Generate a custom decorator                 |
+| `ngres` | `nest generate resource`     | Generate a CRUD resource                    |
+| `nglib` | `nest generate library`      | Generate a new library                      |
+| `ngsub` | `nest generate sub-app`      | Generate a new sub-application (monorepo)   |
+| `na`    | `nest add`                   | Add a library to the project                |
+| `ni`    | `nest info`                  | Display NestJS project information          |
+| `nu`    | `nest update`                | Update NestJS dependencies                  |
+
+## Usage
+
+1. Add `nestjs` to the `plugins` array in your `~/.zshrc` file:
+
+```zsh
+plugins=(... nestjs)
+```
+
+2. Restart your terminal or source your `~/.zshrc` file:
+
+```zsh
+source ~/.zshrc
+```
diff --git a/zsh/plugins/nestjs/nestjs.plugin.zsh b/zsh/plugins/nestjs/nestjs.plugin.zsh
new file mode 100644
index 0000000..9496abd
--- /dev/null
+++ b/zsh/plugins/nestjs/nestjs.plugin.zsh
@@ -0,0 +1,41 @@
+# Oh My Zsh plugin for NestJS CLI
+
+# Check if nest command exists
+if ! command -v nest &>/dev/null; then
+  return
+fi
+
+# Project creation
+alias nnew='nest new'
+
+# Basic development
+alias nb='nest build'
+alias ns='nest start'
+alias nsw='nest start --watch'
+alias nsd='nest start --dev' # Alias for start --watch
+alias nsdbg='nest start --debug --watch'
+
+# Code generation (short aliases)
+alias ng='nest generate'
+alias ngm='nest generate module'
+alias ngc='nest generate controller'
+alias ngs='nest generate service'
+alias ngg='nest generate guard'
+alias ngp='nest generate pipe'
+alias ngf='nest generate filter'
+alias ngr='nest generate resolver'
+alias ngcl='nest generate class'
+alias ngi='nest generate interface'
+alias ngit='nest generate interceptor'
+alias ngmi='nest generate middleware'
+alias ngd='nest generate decorator'
+alias ngres='nest generate resource'
+alias nglib='nest generate library'
+alias ngsub='nest generate sub-app'
+
+# Other commands
+alias na='nest add'
+alias ni='nest info'
+alias nu='nest update'
+
+# You can add more aliases or functions here as needed.
diff --git a/zsh/plugins/ngrok/README.md b/zsh/plugins/ngrok/README.md
new file mode 100644
index 0000000..6c37b19
--- /dev/null
+++ b/zsh/plugins/ngrok/README.md
@@ -0,0 +1,20 @@
+# ngrok plugin
+
+This plugin adds completion for the [ngrok](https://ngrok.com) CLI.
+
+To use it, add `ngrok` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... ngrok)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated asynchronously when the plugin is
+loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH_CACHE/completions/_ngrok` completions script
diff --git a/zsh/plugins/ngrok/ngrok.plugin.zsh b/zsh/plugins/ngrok/ngrok.plugin.zsh
new file mode 100644
index 0000000..ca3c82d
--- /dev/null
+++ b/zsh/plugins/ngrok/ngrok.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for ngrok
+if (( ! $+commands[ngrok] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `ngrok`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_ngrok" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _ngrok
+  _comps[ngrok]=_ngrok
+fi
+
+ngrok completion zsh >| "$ZSH_CACHE_DIR/completions/_ngrok" &|
diff --git a/zsh/plugins/nmap/nmap.plugin.zsh b/zsh/plugins/nmap/nmap.plugin.zsh
index 406870f..f649daf 100644
--- a/zsh/plugins/nmap/nmap.plugin.zsh
+++ b/zsh/plugins/nmap/nmap.plugin.zsh
@@ -27,6 +27,6 @@ alias nmap_detect_versions="sudo nmap -sV -p1-65535 -O --osscan-guess -T4 -Pn"
 alias nmap_check_for_vulns="nmap --script=vuln"
 alias nmap_full_udp="sudo nmap -sS -sU -T4 -A -v -PE -PS22,25,80 -PA21,23,80,443,3389 "
 alias nmap_traceroute="sudo nmap -sP -PE -PS22,25,80 -PA21,23,80,3389 -PU -PO --traceroute "
-alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all " 
+alias nmap_full_with_scripts="sudo nmap -sS -sU -T4 -A -v -PE -PP -PS21,22,23,25,80,113,31339 -PA80,113,443,10042 -PO --script all "
 alias nmap_web_safe_osscan="sudo nmap -p 80,443 -O -v --osscan-guess --fuzzy "
 alias nmap_ping_scan="nmap -n -sP"
diff --git a/zsh/plugins/nodenv/README.md b/zsh/plugins/nodenv/README.md
new file mode 100644
index 0000000..5505970
--- /dev/null
+++ b/zsh/plugins/nodenv/README.md
@@ -0,0 +1,20 @@
+# nodenv plugin
+
+The primary job of this plugin is to provide `nodenv_prompt_info` which can be added to your theme to include Node
+version information into your prompt.
+
+To use it, add `nodenv` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... nodenv)
+```
+
+## Functions
+
+* `nodenv_prompt_info`: displays the Node version in use by nodenv; or the global Node
+  version, if nodenv wasn't found. You can use this function in your prompt by adding
+  `$(nodenv_prompt_info)` to PROMPT or RPROMPT:
+
+  ```zsh
+  RPROMPT='$(nodenv_prompt_info)'
+  ```
diff --git a/zsh/plugins/nodenv/nodenv.plugin.zsh b/zsh/plugins/nodenv/nodenv.plugin.zsh
new file mode 100644
index 0000000..79a4ffb
--- /dev/null
+++ b/zsh/plugins/nodenv/nodenv.plugin.zsh
@@ -0,0 +1,43 @@
+# This plugin loads nodenv into the current shell and provides prompt info via
+# the 'nodenv_prompt_info' function.
+
+FOUND_NODENV=${+commands[nodenv]}
+
+if [[ $FOUND_NODENV -ne 1 ]]; then
+  nodenvdirs=(
+    "$HOME/.nodenv"
+    "/usr/local/nodenv"
+    "/opt/nodenv"
+    "/usr/local/opt/nodenv"
+  )
+  for dir in $nodenvdirs; do
+    if [[ -d "${dir}/bin" ]]; then
+      export PATH="$PATH:${dir}/bin"
+      FOUND_NODENV=1
+      break
+    fi
+  done
+
+  if [[ $FOUND_NODENV -ne 1 ]]; then
+    if (( $+commands[brew] )) && dir=$(brew --prefix nodenv 2>/dev/null); then
+      if [[ -d "${dir}/bin" ]]; then
+        export PATH="$PATH:${dir}/bin"
+        FOUND_NODENV=1
+      fi
+    fi
+  fi
+fi
+
+if [[ $FOUND_NODENV -eq 1 ]]; then
+  eval "$(nodenv init --no-rehash - zsh)"
+  function nodenv_prompt_info() {
+    nodenv version-name 2>/dev/null
+  }
+else
+  # fallback to system node
+  function nodenv_prompt_info() {
+    echo "system: $(node -v 2>&1 | cut -c 2-)"
+  }
+fi
+
+unset FOUND_NODENV nodenvdirs dir
diff --git a/zsh/plugins/nomad/_nomad b/zsh/plugins/nomad/_nomad
index 1c935a0..87f80aa 100644
--- a/zsh/plugins/nomad/_nomad
+++ b/zsh/plugins/nomad/_nomad
@@ -89,7 +89,7 @@ __plan() {
     '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
     '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
     '-no-color[Disables colored command output.]' \
-    '-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]' 
+    '-diff[Determines whether the diff between the remote job and planned job is shown. Defaults to true.]'
 }
 
 __run() {
@@ -97,7 +97,7 @@ __run() {
     '-address=[(addr) The address of the Nomad server. Overrides the NOMAD_ADDR environment variable if set. Default = http://127.0.0.1:4646]' \
     '-region=[(region) The region of the Nomad servers to forward commands to. Overrides the NOMAD_REGION environment variable if set. Defaults to the Agent s local region.]' \
     '-no-color[Disables colored command output.]' \
-    '-check-index[If set, the job is only registered or updated if the the passed job modify index matches the server side version. If a check-index value of zero is passed, the job is only registered if it does not yet exist. If a non-zero value is passed, it ensures that the job is being updated from a known state. The use of this flag is most common in conjunction with plan command.]' \
+    '-check-index[If set, the job is only registered or updated if the passed job modify index matches the server side version. If a check-index value of zero is passed, the job is only registered if it does not yet exist. If a non-zero value is passed, it ensures that the job is being updated from a known state. The use of this flag is most common in conjunction with plan command.]' \
     '-detach[Return immediately instead of entering monitor mode. After job submission, the evaluation ID will be printed to the screen, which can be used to examine the evaluation using the eval-status command.]' \
     '-output[Output the JSON that would be submitted to the HTTP API without submitting the job.]' \
     '-verbose[Show full information.]'
diff --git a/zsh/plugins/npm/README.md b/zsh/plugins/npm/README.md
index 8eafc6d..7848a12 100644
--- a/zsh/plugins/npm/README.md
+++ b/zsh/plugins/npm/README.md
@@ -29,6 +29,8 @@ plugins=(... npm)
 | `npmI`  | `npm init`                   | Run npm init                                                    |
 | `npmi`  | `npm info`                   | Run npm info                                                    |
 | `npmSe` | `npm search`                 | Run npm search                                                  |
+| `npmrd` | `npm run dev`                | Run npm run dev                                                 |
+| `npmrb` | `npm run build`              | Run npm run build                                               |
 
 ## `npm install` / `npm uninstall` toggle
 
diff --git a/zsh/plugins/npm/npm.plugin.zsh b/zsh/plugins/npm/npm.plugin.zsh
index 6c768d6..c333f76 100644
--- a/zsh/plugins/npm/npm.plugin.zsh
+++ b/zsh/plugins/npm/npm.plugin.zsh
@@ -1,5 +1,5 @@
 (( $+commands[npm] )) && {
-  rm -f "${ZSH_CACHE_DIR:-$ZSH/cache}/npm_completion"
+  command rm -f "${ZSH_CACHE_DIR:-$ZSH/cache}/npm_completion"
 
   _npm_completion() {
     local si=$IFS
@@ -58,7 +58,7 @@ alias npmt="npm test"
 # Run npm scripts
 alias npmR="npm run"
 
-# Run npm publish 
+# Run npm publish
 alias npmP="npm publish"
 
 # Run npm init
@@ -70,6 +70,12 @@ alias npmi="npm info"
 # Run npm search
 alias npmSe="npm search"
 
+# Run npm run dev
+alias npmrd="npm run dev"
+
+# Run npm run build
+alias npmrb="npm run build"
+
 npm_toggle_install_uninstall() {
   # Look up to the previous 2 history commands
   local line
diff --git a/zsh/plugins/npx/README.md b/zsh/plugins/npx/README.md
deleted file mode 100644
index 4b2aba8..0000000
--- a/zsh/plugins/npx/README.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# npx plugin
-
-## Deprecation
-
-Since npm v7, `npx` has been moved to `npm exec`. With the move, [the `--shell-auto-fallback` argument
-for `npx` has been removed](https://github.com/npm/cli/blob/v7.0.0/docs/content/cli-commands/npm-exec.md#compatibility-with-older-npx-versions):
-
-> Shell fallback functionality is removed, as it is not advisable.
-
-When using npm v7, you'll get this error:
-
-> npx: the --shell-auto-fallback argument has been removed
-
-If you get this error, just disable the plugin by removing it from the plugins array in your zshrc file.
-This plugin will no longer be maintained and will be removed in the future, when the older `npx` versions
-are no longer available.
diff --git a/zsh/plugins/npx/npx.plugin.zsh b/zsh/plugins/npx/npx.plugin.zsh
deleted file mode 100644
index c1e2eca..0000000
--- a/zsh/plugins/npx/npx.plugin.zsh
+++ /dev/null
@@ -1,12 +0,0 @@
-if (( ! $+commands[npx] )); then
-  return
-fi
-
-if ! npx_fallback_script="$(npx --shell-auto-fallback zsh 2>/dev/null)"; then
-  print -u2 ${(%):-"%F{yellow}This \`npx\` version ($(npx --version)) is not supported.%f"}
-else
-  source <(<<< "$npx_fallback_script")
-fi
-
-print -u2 ${(%):-"%F{yellow}The \`npx\` plugin is deprecated and will be removed soon. %BPlease disable it%b.%f"}
-unset npx_fallback_script
diff --git a/zsh/plugins/nvm/README.md b/zsh/plugins/nvm/README.md
index 1acf120..1245f66 100644
--- a/zsh/plugins/nvm/README.md
+++ b/zsh/plugins/nvm/README.md
@@ -1,7 +1,7 @@
 # nvm plugin
 
-This plugin adds autocompletions for [nvm](https://github.com/nvm-sh/nvm) — a Node.js version manager.
-It also automatically sources nvm, so you don't need to do it manually in your `.zshrc`.
+This plugin adds autocompletions for [nvm](https://github.com/nvm-sh/nvm) — a Node.js version manager. It also
+automatically sources nvm, so you don't need to do it manually in your `.zshrc`.
 
 To use it, add `nvm` to the plugins array of your zshrc file:
 
@@ -21,14 +21,40 @@ These settings should go in your zshrc file, before Oh My Zsh is sourced:
   [Homebrew is installed in `/opt/homebrew`](https://docs.brew.sh/Installation). To get the directory where
   nvm has been installed, regardless of chip architecture, use `NVM_HOMEBREW=$(brew --prefix nvm)`.
 
-- **`NVM_LAZY`**: if you want the plugin to defer the load of nvm to speed-up the start of your zsh session,
-  set `NVM_LAZY` to `1`. This will source nvm script only when using it, and will create a function for `node`,
-  `npm`, `pnpm`, `yarn`, and the command(s) specified by `NVM_LAZY_CMD`, so when you call either of them,
-  nvm will be loaded and run with default version.
+## Customization
 
-- **`NVM_LAZY_CMD`**: if you want additional command(s) to trigger lazy loading of nvm, set `NVM_LAZY_CMD` to
-  the command or an array of the commands.
+#### Lazy startup
 
-- **`NVM_AUTOLOAD`**: if `NVM_AUTOLOAD` is set to `1`, the plugin will automatically load a node version when
-  if finds a [`.nvmrc` file](https://github.com/nvm-sh/nvm#nvmrc) in the current working directory indicating
-  which node version to load.
+This option will help you to defer nvm's load until you use it to speed-up your zsh startup. This will source
+nvm script only when using it, and will create a function for `node`, `npm`, `npx`, `pnpm`, `pnpx`, `yarn`,
+`corepack` and the command(s) specified by `lazy-cmd` option, so when you call either of them, nvm will be
+loaded and run with default version. To enable it, you can add this snippet to your zshrc, before Oh My Zsh is
+sourced:
+
+```zsh
+zstyle ':omz:plugins:nvm' lazy yes
+```
+
+Then, to define extra commands that will also trigger nvm load, you can use a similar syntax, adding as many
+as you want:
+
+```zsh
+zstyle ':omz:plugins:nvm' lazy-cmd eslint prettier typescript ...
+```
+
+There will be a function `_omz_nvm_load` available to load `nvm` without executing any other trigger command.
+
+#### `.nvmrc` autoload
+
+Note: _if used at the same time as `lazy`, `autoload` will start working only after nvm has been lazy-loaded_
+
+If set, the plugin will automatically load a node version when if finds a
+[`.nvmrc` file](https://github.com/nvm-sh/nvm#nvmrc) in the current working directory indicating which node
+version to load. This can be done, similar as previous options, adding:
+
+```zsh
+zstyle ':omz:plugins:nvm' autoload yes
+zstyle ':omz:plugins:nvm' silent-autoload yes # optionally remove the output generated by NVM when autoloading
+```
+
+Note: _this will not remove regular `nvm` output_
diff --git a/zsh/plugins/nvm/_nvm b/zsh/plugins/nvm/_nvm
deleted file mode 100644
index e292a8d..0000000
--- a/zsh/plugins/nvm/_nvm
+++ /dev/null
@@ -1,34 +0,0 @@
-#compdef nvm
-#autoload
-
-[[ -f "$NVM_DIR/nvm.sh" ]] || return 0
-
-local -a _1st_arguments
-_1st_arguments=(
-  'help:show help'
-  '--version:print out the latest released version of nvm'
-  'install:download and install a version in <node|iojs|node version number>'
-  'install-latest-npm:download and install the latest npm version'
-  'uninstall:uninstall a version'
-  'use:modify PATH to use <version>. Uses .nvmrc if available'
-  'exec:run <command> on <version>. Uses .nvmrc if available'
-  'run:run `node` on <version> with <args> as arguments. Uses .nvmrc if available'
-  'current:list installed versions'
-  'ls:list installed versions or versions matching a given description'
-  'version:resolve the given description to a single local version'
-  'version-remote:resolve the given description to a single remote version'
-  'ls-remote:list remote versions available for install'
-  'deactivate:undo effects of `nvm` on current shell'
-  'alias:show or set aliases'
-  'unalias:deletes an alias'
-  'reinstall-packages:reinstall global `npm` packages contained in <version> to current version'
-  'unload:unload `nvm` from shell'
-  'which:display path to installed node version. Uses .nvmrc if available'
-)
-
-_arguments -C '*:: :->subcmds' && return 0
-
-if (( CURRENT == 1 )); then
-  _describe -t commands "nvm subcommand" _1st_arguments
-  return
-fi
diff --git a/zsh/plugins/nvm/nvm.plugin.zsh b/zsh/plugins/nvm/nvm.plugin.zsh
index 1fb4d23..682bddc 100644
--- a/zsh/plugins/nvm/nvm.plugin.zsh
+++ b/zsh/plugins/nvm/nvm.plugin.zsh
@@ -1,3 +1,7 @@
+# Don't try to load nvm if command already available
+# Note: nvm is a function so we need to use `which`
+which nvm &>/dev/null && return
+
 # See https://github.com/nvm-sh/nvm#installation-and-update
 if [[ -z "$NVM_DIR" ]]; then
   if [[ -d "$HOME/.nvm" ]]; then
@@ -12,43 +16,51 @@ if [[ -z "$NVM_DIR" ]]; then
   fi
 fi
 
-# Don't try to load nvm if command already available
-# Note: nvm is a function so we need to use `which`
-which nvm &>/dev/null && return
-
-if (( $+NVM_LAZY )); then
-  # Call nvm when first using nvm, node, npm, pnpm, yarn or $NVM_LAZY_CMD
-  function nvm node npm pnpm yarn $NVM_LAZY_CMD {
-    unfunction nvm node npm pnpm yarn $NVM_LAZY_CMD
-    # Load nvm if it exists in $NVM_DIR
-    [[ -f "$NVM_DIR/nvm.sh" ]] && source "$NVM_DIR/nvm.sh"
-    "$0" "$@"
-  }
-elif [[ -f "$NVM_DIR/nvm.sh" ]]; then
-  # Load nvm if it exists in $NVM_DIR
-  source "$NVM_DIR/nvm.sh"
-else
+if [[ -z "$NVM_DIR" ]] || [[ ! -f "$NVM_DIR/nvm.sh" ]]; then
   return
 fi
 
-# Autoload nvm when finding a .nvmrc file in the current directory
-# Adapted from: https://github.com/nvm-sh/nvm#zsh
-if (( $+NVM_AUTOLOAD )); then
-  load-nvmrc() {
-    local node_version="$(nvm version)"
+function _omz_nvm_setup_completion {
+  local _nvm_completion
+  # Load nvm bash completion
+  for _nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
+    if [[ -f "$_nvm_completion" ]]; then
+      # Load bashcompinit
+      autoload -U +X bashcompinit && bashcompinit
+      # Bypass compinit call in nvm bash completion script. See:
+      # https://github.com/nvm-sh/nvm/blob/4436638/bash_completion#L86-L93
+      ZSH_VERSION= source "$_nvm_completion"
+      break
+    fi
+  done
+  unfunction _omz_nvm_setup_completion
+}
+
+function _omz_nvm_setup_autoload {
+  if ! zstyle -t ':omz:plugins:nvm' autoload; then
+    unfunction _omz_nvm_setup_autoload
+    return
+  fi
+
+  # Autoload nvm when finding a .nvmrc file in the current directory
+  # Adapted from: https://github.com/nvm-sh/nvm#zsh
+  function load-nvmrc {
     local nvmrc_path="$(nvm_find_nvmrc)"
+    local nvm_silent=""
+    zstyle -t ':omz:plugins:nvm' silent-autoload && nvm_silent="--silent"
 
     if [[ -n "$nvmrc_path" ]]; then
-      local nvmrc_node_version=$(nvm version "$(cat "${nvmrc_path}")")
+      local nvmrc_node_version=$(nvm version $(command cat "$nvmrc_path" | tr -dc '[:print:]'))
 
       if [[ "$nvmrc_node_version" = "N/A" ]]; then
         nvm install
-      elif [[ "$nvmrc_node_version" != "$node_version" ]]; then
-        nvm use
+      elif [[ "$nvmrc_node_version" != "$(nvm version)" ]]; then
+        nvm use $nvm_silent
       fi
-    elif [[ "$node_version" != "$(nvm version default)" ]]; then
-      echo "Reverting to nvm default version"
-      nvm use default
+    elif [[ -n "$(PWD=$OLDPWD nvm_find_nvmrc)" ]] && [[ "$(nvm version)" != "$(nvm version default)" ]]; then
+      [[ -z $nvm_silent ]] && echo "Reverting to nvm default version"
+
+      nvm use default $nvm_silent
     fi
   }
 
@@ -56,18 +68,32 @@ if (( $+NVM_AUTOLOAD )); then
   add-zsh-hook chpwd load-nvmrc
 
   load-nvmrc
+  unfunction _omz_nvm_setup_autoload
+}
+
+if zstyle -t ':omz:plugins:nvm' lazy; then
+  # Call nvm when first using nvm, node, npm, pnpm, yarn, corepack or other commands in lazy-cmd
+  zstyle -a ':omz:plugins:nvm' lazy-cmd nvm_lazy_cmd
+  nvm_lazy_cmd=(_omz_nvm_load nvm node npm npx pnpm pnpx yarn corepack $nvm_lazy_cmd) # default values
+  eval "
+    function $nvm_lazy_cmd {
+      for func in $nvm_lazy_cmd; do
+        if (( \$+functions[\$func] )); then
+          unfunction \$func
+        fi
+      done
+      # Load nvm if it exists in \$NVM_DIR
+      [[ -f \"\$NVM_DIR/nvm.sh\" ]] && source \"\$NVM_DIR/nvm.sh\"
+      _omz_nvm_setup_completion
+      _omz_nvm_setup_autoload
+      if [[ \"\$0\" != _omz_nvm_load ]]; then
+        \"\$0\" \"\$@\"
+      fi
+    }
+  "
+  unset nvm_lazy_cmd
+else
+  source "$NVM_DIR/nvm.sh"
+  _omz_nvm_setup_completion
+  _omz_nvm_setup_autoload
 fi
-
-# Load nvm bash completion
-for nvm_completion in "$NVM_DIR/bash_completion" "$NVM_HOMEBREW/etc/bash_completion.d/nvm"; do
-  if [[ -f "$nvm_completion" ]]; then
-    # Load bashcompinit
-    autoload -U +X bashcompinit && bashcompinit
-    # Bypass compinit call in nvm bash completion script. See:
-    # https://github.com/nvm-sh/nvm/blob/4436638/bash_completion#L86-L93
-    ZSH_VERSION= source "$nvm_completion"
-    break
-  fi
-done
-
-unset NVM_HOMEBREW NVM_LAZY NVM_AUTOLOAD nvm_completion
diff --git a/zsh/plugins/opentofu/README.md b/zsh/plugins/opentofu/README.md
new file mode 100644
index 0000000..059664d
--- /dev/null
+++ b/zsh/plugins/opentofu/README.md
@@ -0,0 +1,61 @@
+# OpenTofu plugin
+
+Plugin for OpenTofu, a fork of Terraform that is open-source, community-driven, and managed by the Linux Foundation. It adds
+completion for `tofu` command, as well as aliases and a prompt function.
+
+To use it, add `opentofu` to the plugins array of your `~/.zshrc` file:
+
+```shell
+plugins=(... opentofu)
+```
+
+## Requirements
+
+- [OpenTofu](https://opentofu.org/)
+
+## Aliases
+
+| Alias  | Command                      |
+|--------|------------------------------|
+| `tt`   | `tofu`                       |
+| `tta`  | `tofu apply`                 |
+| `tta!` | `tofu apply -auto-approve`   |
+| `ttc`  | `tofu console`               |
+| `ttd`  | `tofu destroy`               |
+| `ttd!` | `tofu destroy -auto-approve` |
+| `ttf`  | `tofu fmt`                   |
+| `ttfr` | `tofu fmt -recursive`        |
+| `tti`  | `tofu init`                  |
+| `tto`  | `tofu output`                |
+| `ttp`  | `tofu plan`                  |
+| `ttv`  | `tofu validate`              |
+| `tts`  | `tofu state`                 |
+| `ttsh` | `tofu show`                  |
+| `ttr`  | `tofu refresh`               |
+| `ttt`  | `tofu test`                  |
+| `ttws` | `tofu workspace`             |
+
+
+## Prompt functions
+
+- `tofu_prompt_info`: shows the current workspace when in an OpenTofu project directory.
+
+- `tofu_version_prompt_info`: shows the current version of the `tofu` command.
+
+To use them, add them to a `PROMPT` variable in your theme or `.zshrc` file:
+
+```sh
+PROMPT='$(tofu_prompt_info)'
+RPROMPT='$(tofu_version_prompt_info)'
+```
+
+You can also specify the PREFIX and SUFFIX strings for both functions, with the following variables:
+
+```sh
+# for tofu_prompt_info
+ZSH_THEME_TOFU_PROMPT_PREFIX="%{$fg[white]%}"
+ZSH_THEME_TOFU_PROMPT_SUFFIX="%{$reset_color%}"
+# for tofu_version_prompt_info
+ZSH_THEME_TOFU_VERSION_PROMPT_PREFIX="%{$fg[white]%}"
+ZSH_THEME_TOFU_VERSION_PROMPT_SUFFIX="%{$reset_color%}"
+```
diff --git a/zsh/plugins/opentofu/opentofu.plugin.zsh b/zsh/plugins/opentofu/opentofu.plugin.zsh
new file mode 100644
index 0000000..b7a3ba3
--- /dev/null
+++ b/zsh/plugins/opentofu/opentofu.plugin.zsh
@@ -0,0 +1,46 @@
+# set up the tofu completion (compatible for zsh)
+autoload -Uz bashcompinit && bashcompinit
+complete -C tofu tofu
+
+# tofu workspace prompt function
+function tofu_prompt_info() {
+  # only show the workspace name if we're in an opentofu project
+  # i.e. if a .terraform directory exists within the hierarchy
+  local dir="$PWD"
+  while [[ ! -d "${dir}/.terraform" ]]; do
+    [[ "$dir" != / ]] || return 0 # stop at the root directory
+    dir="${dir:h}"                # get the parent directory
+  done
+
+  # workspace might be different than the .terraform/environment file
+  # for example, if set with the TF_WORKSPACE environment variable
+  local workspace="$(tofu workspace show)"
+  # make sure to escape % signs in the workspace name to prevent command injection
+  echo "${ZSH_THEME_TOFU_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TOFU_PROMPT_SUFFIX-]}"
+}
+
+# tofu version prompt function
+function tofu_version_prompt_info() {
+  # get the output of `tofu --version` in a single line, and get the second word after splitting by a space
+  local tofu_version=${${(s: :)$(tofu --version)}[2]}
+  # make sure to escape % signs in the version string to prevent command injection
+  echo "${ZSH_THEME_TOFU_VERSION_PROMPT_PREFIX-[}${tofu_version:gs/%/%%}${ZSH_THEME_TOFU_VERSION_PROMPT_SUFFIX-]}"
+}
+
+alias tt='tofu'
+alias tta='tofu apply'
+alias tta!='tofu apply -auto-approve'
+alias ttc='tofu console'
+alias ttd='tofu destroy'
+alias ttd!='tofu destroy -auto-approve'
+alias ttf='tofu fmt'
+alias ttfr='tofu fmt -recursive'
+alias tti='tofu init'
+alias tto='tofu output'
+alias ttp='tofu plan'
+alias ttv='tofu validate'
+alias tts='tofu state'
+alias ttsh='tofu show'
+alias ttr='tofu refresh'
+alias ttt='tofu test'
+alias ttws='tofu workspace'
diff --git a/zsh/plugins/osx/README.md b/zsh/plugins/osx/README.md
deleted file mode 100644
index 98d8595..0000000
--- a/zsh/plugins/osx/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# osx plugin
-
-**Deprecated: use the [`macos`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos) plugin instead.**
diff --git a/zsh/plugins/osx/osx.plugin.zsh b/zsh/plugins/osx/osx.plugin.zsh
deleted file mode 100644
index 3b09359..0000000
--- a/zsh/plugins/osx/osx.plugin.zsh
+++ /dev/null
@@ -1,5 +0,0 @@
-print -u2 ${(%):-'%F{yellow}The `osx` plugin is deprecated and has been renamed to `macos`.'}
-print -u2 ${(%):-'Please update your .zshrc to use the `%Bmacos%b` plugin instead.%f'}
-
-(( ${fpath[(Ie)$ZSH/plugins/macos]} )) || fpath=("$ZSH/plugins/macos" $fpath)
-source "$ZSH/plugins/macos/macos.plugin.zsh"
diff --git a/zsh/plugins/otp/README.md b/zsh/plugins/otp/README.md
index 8331fd0..52ad952 100644
--- a/zsh/plugins/otp/README.md
+++ b/zsh/plugins/otp/README.md
@@ -16,7 +16,7 @@ Provided aliases:
   email address). Then the OTP key needs to be pasted, followed by a CTRL+D character
   inserted on an empty line.
 
-- `ot`: generates a MFA code based on the given key and copies it to the clipboard 
+- `ot`: generates a MFA code based on the given key and copies it to the clipboard
   (on Linux it relies on xsel, on MacOS X it uses pbcopy instead).
 
 The plugin uses `$HOME/.otp` to store its internal files.
diff --git a/zsh/plugins/pass/_pass b/zsh/plugins/pass/_pass
index d911e12..c66d993 100644
--- a/zsh/plugins/pass/_pass
+++ b/zsh/plugins/pass/_pass
@@ -20,6 +20,8 @@
 
 _pass () {
 	local cmd
+  local rootcontext
+  rootcontext=$curcontext
 	if (( CURRENT > 2)); then
 		cmd=${words[2]}
 		# Set the context for the subcommand.
@@ -123,8 +125,9 @@ _pass_cmd_show () {
 _pass_complete_entries_helper () {
 	local IFS=$'\n'
 	local prefix
-	zstyle -s ":completion:${curcontext}:" prefix prefix || prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
-	_values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#g' -e 's#:#\\:#g' | sort):-""}
+	zstyle -s ":completion:${rootcontext}:" prefix prefix ||
+prefix="${PASSWORD_STORE_DIR:-$HOME/.password-store}"
+  _values -C 'passwords' ${$(find -L "$prefix" \( -name .git -o -name .gpg-id \) -prune -o $@ -print 2>/dev/null | sed -e "s#${prefix}/\{0,1\}##" -e 's#\.gpg##' -e 's#\\#\\\\#g' -e 's#:#\\:#g' | sort):-""}
 }
 
 _pass_complete_entries_with_subdirs () {
diff --git a/zsh/plugins/per-directory-history/README.md b/zsh/plugins/per-directory-history/README.md
index 69854aa..c7d062a 100644
--- a/zsh/plugins/per-directory-history/README.md
+++ b/zsh/plugins/per-directory-history/README.md
@@ -1,5 +1,4 @@
-per-directory-history plugin
-----------------------------
+# per-directory-history plugin
 
 This plugin adds per-directory history for zsh, as well as a global history,
 and the ability to toggle between them with a keyboard shortcut. This is a
@@ -34,6 +33,9 @@ toggle set the `PER_DIRECTORY_HISTORY_TOGGLE` environment variable.
   and global histories.
 * `PER_DIRECTORY_HISTORY_TOGGLE` is the key binding used to run the toggle-history
   function above (default `^G`)
+* `PER_DIRECTORY_HISTORY_PRINT_MODE_CHANGE` is a variable which toggles whether
+  the current mode is printed to the screen following a mode change (default `true`)
+* `HISTORY_START_WITH_GLOBAL` is a global variable that defines how to start the plugin: global or local (default `false`)
 
 ## History
 
diff --git a/zsh/plugins/per-directory-history/per-directory-history.zsh b/zsh/plugins/per-directory-history/per-directory-history.zsh
index 7cd673c..926373a 100644
--- a/zsh/plugins/per-directory-history/per-directory-history.zsh
+++ b/zsh/plugins/per-directory-history/per-directory-history.zsh
@@ -21,7 +21,7 @@
 #-------------------------------------------------------------------------------
 #
 # The idea/inspiration for a per directory history is from Stewart MacArthur[1]
-# and Dieter[2], the implementation idea is from Bart Schaefer on the the zsh
+# and Dieter[2], the implementation idea is from Bart Schaefer on the zsh
 # mailing list[3].  The implementation is by Jim Hester in September 2012.
 #
 # [1]: http://www.compbiome.com/2010/07/bash-per-directory-bash-history.html
@@ -59,6 +59,7 @@
 [[ -z $HISTORY_BASE ]] && HISTORY_BASE="$HOME/.directory_history"
 [[ -z $HISTORY_START_WITH_GLOBAL ]] && HISTORY_START_WITH_GLOBAL=false
 [[ -z $PER_DIRECTORY_HISTORY_TOGGLE ]] && PER_DIRECTORY_HISTORY_TOGGLE='^G'
+[[ -z $PER_DIRECTORY_HISTORY_PRINT_MODE_CHANGE ]] && PER_DIRECTORY_HISTORY_PRINT_MODE_CHANGE=true
 
 #-------------------------------------------------------------------------------
 # toggle global/directory history used for searching - ctrl-G by default
@@ -68,19 +69,22 @@ function per-directory-history-toggle-history() {
   if [[ $_per_directory_history_is_global == true ]]; then
     _per-directory-history-set-directory-history
     _per_directory_history_is_global=false
-    print -n "\nusing local history"
+    if [[ $PER_DIRECTORY_HISTORY_PRINT_MODE_CHANGE == true ]]; then
+      zle -M "using local history"
+    fi
   else
     _per-directory-history-set-global-history
     _per_directory_history_is_global=true
-    print -n "\nusing global history"
+    if [[ $PER_DIRECTORY_HISTORY_PRINT_MODE_CHANGE == true ]]; then
+      zle -M "using global history"
+    fi
   fi
-  zle .push-line
-  zle .accept-line
 }
 
 autoload per-directory-history-toggle-history
 zle -N per-directory-history-toggle-history
 bindkey $PER_DIRECTORY_HISTORY_TOGGLE per-directory-history-toggle-history
+bindkey -M vicmd $PER_DIRECTORY_HISTORY_TOGGLE per-directory-history-toggle-history
 
 #-------------------------------------------------------------------------------
 # implementation details
diff --git a/zsh/plugins/perl/README.md b/zsh/plugins/perl/README.md
index dd9b7dc..a387455 100644
--- a/zsh/plugins/perl/README.md
+++ b/zsh/plugins/perl/README.md
@@ -8,30 +8,36 @@ To use it, add `perl` to the plugins array in your zshrc file:
 plugins=(... perl)
 ```
 
+## Perlbrew activation
+
+If the plugin detects that `perlbrew` hasn't been activated, yet there is an installation of it in
+`$PERLBREW_ROOT`, it'll initialize by default. To avoid this behaviour, set `ZSH_PERLBREW_ACTIVATE=false`
+before `source oh-my-zsh.sh` in your zshrc.
+
 ## Aliases
 
-| Aliases       | Command            |  Description                           |
-| :------------ | :----------------- | :------------------------------------- |
-| pbi           | `perlbrew install` | Install specific perl version          |
-| pbl           | `perlbrew list`    | List all perl version installed        |
-| pbo           | `perlbrew off`     | Go back to the system perl             |
-| pbs           | `perlbrew switch`  | Turn it back on                        |
-| pbu           | `perlbrew use`     | Use specific version of perl           |
-| pd            | `perldoc`          | Show the perl documentation            |
-| ple           | `perl -wlne`       | Use perl like awk/sed                  |
-| latest-perl   | `curl ...`         | Show the latest stable release of Perl |
+| Aliases     | Command            | Description                            |
+| :---------- | :----------------- | :------------------------------------- |
+| pbi         | `perlbrew install` | Install specific perl version          |
+| pbl         | `perlbrew list`    | List all perl version installed        |
+| pbo         | `perlbrew off`     | Go back to the system perl             |
+| pbs         | `perlbrew switch`  | Turn it back on                        |
+| pbu         | `perlbrew use`     | Use specific version of perl           |
+| pd          | `perldoc`          | Show the perl documentation            |
+| ple         | `perl -wlne`       | Use perl like awk/sed                  |
+| latest-perl | `curl ...`         | Show the latest stable release of Perl |
 
 ## Functions
 
-* `newpl`: creates a basic Perl script file and opens it with $EDITOR.
+- `newpl`: creates a basic Perl script file and opens it with $EDITOR.
 
-* `pgs`: Perl Global Substitution: `pgs <find_pattern> <replace_pattern> <filename>`
-  Looks for `<find_pattern>` and replaces it with `<replace_pattern>` in `<filename>`.
+- `pgs`: Perl Global Substitution: `pgs <find_pattern> <replace_pattern> <filename>` Looks for
+  `<find_pattern>` and replaces it with `<replace_pattern>` in `<filename>`.
 
-* `prep`: Perl grep, because 'grep -P' is terrible: `prep <pattern> [<filename>]`
-  Lets you work with pipes or files (if no `<filename>` provided, use stdin).
+- `prep`: Perl grep, because 'grep -P' is terrible: `prep <pattern> [<filename>]` Lets you work with pipes or
+  files (if no `<filename>` provided, use stdin).
 
 ## Requirements
 
-In order to make this work, you will need to have perl installed.
-More info on the usage and install: https://www.perl.org/get.html
+In order to make this work, you will need to have perl installed. More info on the usage and install:
+https://www.perl.org/get.html
diff --git a/zsh/plugins/perl/perl.plugin.zsh b/zsh/plugins/perl/perl.plugin.zsh
index 678e88d..137fa25 100644
--- a/zsh/plugins/perl/perl.plugin.zsh
+++ b/zsh/plugins/perl/perl.plugin.zsh
@@ -54,3 +54,12 @@ pgs() { # [find] [replace] [filename]
 prep() { # [pattern] [filename unless STDOUT]
     perl -nle 'print if /'"$1"'/;' $2
 }
+
+# If the 'perlbrew' function isn't defined, perlbrew isn't setup.
+if [[ $ZSH_PERLBREW_ACTIVATE != false ]] && (( ! $+functions[perlbrew] )); then
+  local _perlbrew="${PERLBREW_ROOT:-${HOME}/perl5/perlbrew}"
+  if [[ -f "${_perlbrew}/etc/bashrc" ]]; then
+    source "${_perlbrew}/etc/bashrc"
+  fi
+  unset _perlbrew
+fi
diff --git a/zsh/plugins/perms/README.md b/zsh/plugins/perms/README.md
index ae7a36b..ae10fa6 100644
--- a/zsh/plugins/perms/README.md
+++ b/zsh/plugins/perms/README.md
@@ -10,6 +10,16 @@ plugins=(... perms)
 
 ## Usage
 
-* `set755` recursively sets all given directories (default to .) to octal 755.
-* `set644` recursively sets all given files (default to .) to octal 644.
-* `fixperms` is a wrapper around `set755` and `set644` applied to a specified directory or the current directory otherwise. It also prompts prior to execution unlike the other two aliases.
+> **CAUTION:** these functions are harmful if you don't know what they do.
+
+- `set755`: sets the permission to octal 755 for all given directories and their child directories (by default, starting from the current directory).
+
+- `set644`: sets the permission to octal 644 for all files of the given directory (by default, the current directory), recursively. It will only affect regular files (no symlinks).
+
+- `resetperms` is a wrapper around `set755` and `set644` applied to a specified directory or the current directory otherwise.
+  It will set the permissions to 755 for directories, and 644 for files.
+
+## Reference
+
+- octal 644: _read and write_ for the owner, _read_ for the group and others users.
+- octal 755: _read, write and execute_ permissions for the owner, and _read and execute_ for the group and others users.
diff --git a/zsh/plugins/perms/perms.plugin.zsh b/zsh/plugins/perms/perms.plugin.zsh
index 1a7472c..353b584 100644
--- a/zsh/plugins/perms/perms.plugin.zsh
+++ b/zsh/plugins/perms/perms.plugin.zsh
@@ -6,25 +6,25 @@
 ### Aliases
 
 # Set all files' permissions to 644 recursively in a directory
-set644() {
+function set644 {
 	find "${@:-.}" -type f ! -perm 644 -print0 | xargs -0 chmod 644
 }
 
 # Set all directories' permissions to 755 recursively in a directory
-set755() {
+function set755 {
 	find "${@:-.}" -type d ! -perm 755 -print0 | xargs -0 chmod 755
 }
 
 ### Functions
 
-# fixperms - fix permissions on files and directories, with confirmation
+# resetperms - fix permissions on files and directories, with confirmation
 # Returns 0 on success, nonzero if any errors occurred
-fixperms () {
+function resetperms {
   local opts confirm target exit_status chmod_opts use_slow_mode
   zparseopts -E -D -a opts -help -slow v+=chmod_opts
   if [[ $# > 1 || -n "${opts[(r)--help]}" ]]; then
     cat <<EOF
-Usage: fixperms [-v] [--help] [--slow] [target]
+Usage: resetperms [-v] [--help] [--slow] [target]
 
   target  is the file or directory to change permissions on. If omitted,
           the current directory is taken to be the target.
@@ -40,7 +40,7 @@ EOF
     return $exit_status
   fi
 
-  if [[ $# == 0 ]]; then
+  if [[ $# -eq 0 ]]; then
     target="."
   else
     target="$1"
@@ -49,7 +49,7 @@ EOF
 
   # Because this requires confirmation, bail in noninteractive shells
   if [[ ! -o interactive ]]; then
-    echo "fixperms: cannot run in noninteractive shell"
+    echo "resetperms: cannot run in noninteractive shell"
     return 1
   fi
 
@@ -68,15 +68,20 @@ EOF
   if [[ $use_slow == true ]]; then
     # Process directories first so non-traversable ones are fixed as we go
     find "$target" -type d ! -perm 755 -exec chmod $chmod_opts 755 {} \;
-    if [[ $? != 0 ]]; then exit_status=$?; fi
+    if [[ $? -ne 0 ]]; then exit_status=$?; fi
     find "$target" -type f ! -perm 644 -exec chmod $chmod_opts 644 {} \;
-    if [[ $? != 0 ]]; then exit_status=$?; fi
+    if [[ $? -ne 0 ]]; then exit_status=$?; fi
   else
     find "$target" -type d ! -perm 755 -print0 | xargs -0 chmod $chmod_opts 755
-    if [[ $? != 0 ]]; then exit_status=$?; fi
+    if [[ $? -ne 0 ]]; then exit_status=$?; fi
     find "$target" -type f ! -perm 644 -print0 | xargs -0 chmod $chmod_opts 644
-    if [[ $? != 0 ]]; then exit_status=$?; fi
+    if [[ $? -ne 0 ]]; then exit_status=$?; fi
   fi
   echo "Complete"
   return $exit_status
 }
+
+function fixperms {
+  print -ru2 "fixperms has been deprecated. Use resetperms instead"
+  return 1
+}
diff --git a/zsh/plugins/pip/README.md b/zsh/plugins/pip/README.md
index 88d8822..9d1daca 100644
--- a/zsh/plugins/pip/README.md
+++ b/zsh/plugins/pip/README.md
@@ -20,9 +20,17 @@ the next time you autocomplete `pip install`.
 
 ## Aliases
 
-| Alias    | Description                                   |
-| :------- | :-------------------------------------------- |
-| pipreq   | Create requirements file                      |
-| pipir    | Install packages from `requirements.txt` file |
-| pipupall | Update all installed packages                 |
-| pipunall | Uninstall all installed packages              |
+| Alias    | Command                                                                           | Description                                   |
+| :--------|:----------------------------------------------------------------------------------|:--------------------------------------------- |
+| pipi     | `pip install`                                                                     | Install packages                              |
+| pipig    | `pip install "git+https://github.com/user/repo.git"`                              | Install package from GitHub repository        |
+| pipigb   | `pip install "git+https://github.com/user/repo.git@branch"`                       | Install package from GitHub branch            |
+| pipigp   | `pip install "git+https://github.com/user/repo.git@refs/pull/PR_NUMBER/head"`     | Install package from GitHub pull request      |
+| pipu     | `pip install --upgrade`                                                           | Upgrade packages                              |
+| pipun    | `pip uninstall`                                                                   | Uninstall packages                            |
+| pipgi    | `pip freeze \| grep`                                                              | Grep through installed packages               |
+| piplo    | `pip list --outdated`                                                             | List outdated packages                        |
+| pipreq   | `pip freeze > requirements.txt`                                                   | Create requirements file                      |
+| pipir    | `pip install -r requirements.txt`                                                 | Install packages from `requirements.txt` file |
+| pipupall | `pip list --outdated \| awk 'NR > 2 { print $1 }' \| xargs pip install --upgrade` | Update all installed packages                 |
+| pipunall | `pip list --format freeze \| cut -d= -f1 \| xargs pip uninstall`                  | Uninstall all installed packages              |
diff --git a/zsh/plugins/pip/pip.plugin.zsh b/zsh/plugins/pip/pip.plugin.zsh
index 7eb2d2a..bf1aafd 100644
--- a/zsh/plugins/pip/pip.plugin.zsh
+++ b/zsh/plugins/pip/pip.plugin.zsh
@@ -88,24 +88,48 @@ else
   alias pip="noglob pip"
 fi
 
+alias pipi="pip install"
+alias pipu="pip install --upgrade"
+alias pipun="pip uninstall"
+alias pipgi="pip freeze | grep"
+alias piplo="pip list -o"
+
 # Create requirements file
 alias pipreq="pip freeze > requirements.txt"
 
 # Install packages from requirements file
 alias pipir="pip install -r requirements.txt"
 
-# Update all installed packages
+# Upgrade all installed packages
 function pipupall {
   # non-GNU xargs does not support nor need `--no-run-if-empty`
   local xargs="xargs --no-run-if-empty"
   xargs --version 2>/dev/null | grep -q GNU || xargs="xargs"
-  pip list --outdated --format freeze | cut -d= -f1 | ${=xargs} pip install --upgrade
+  pip list --outdated | awk 'NR > 2 { print $1 }' | ${=xargs} pip install --upgrade
 }
 
-# Uninstalled all installed packages
+# Uninstall all installed packages
 function pipunall {
   # non-GNU xargs does not support nor need `--no-run-if-empty`
   local xargs="xargs --no-run-if-empty"
   xargs --version 2>/dev/null | grep -q GNU || xargs="xargs"
   pip list --format freeze | cut -d= -f1 | ${=xargs} pip uninstall
 }
+
+# Install from GitHub repository
+function pipig {
+  pip install "git+https://github.com/$1.git"
+}
+compdef _pip pipig
+
+# Install from GitHub branch
+function pipigb {
+  pip install "git+https://github.com/$1.git@$2"
+}
+compdef _pip pipigb
+
+# Install from GitHub pull request
+function pipigp {
+  pip install "git+https://github.com/$1.git@refs/pull/$2/head"
+}
+compdef _pip pipigp
diff --git a/zsh/plugins/pipenv/README.md b/zsh/plugins/pipenv/README.md
index ab1c1e4..429b6f1 100644
--- a/zsh/plugins/pipenv/README.md
+++ b/zsh/plugins/pipenv/README.md
@@ -1,6 +1,7 @@
 # Pipenv
 
-## Installation
+This plugin provides some features to simplify the use of [Pipenv](https://pipenv.pypa.io/) while working on ZSH.
+
 In your `.zshrc` file, add `pipenv` to the plugins section
 
 ```
@@ -8,7 +9,7 @@ plugins=(... pipenv ...)
 ```
 
 ## Features
-This plugin provides some features to simplify the use of Pipenv while working on ZSH. 
+
 - Adds completion for pipenv
 - Auto activates and deactivates pipenv shell
 - Adds short aliases for common pipenv commands
@@ -23,6 +24,17 @@ This plugin provides some features to simplify the use of Pipenv while working o
   - `psh` is aliased to `pipenv shell`
   - `psy` is aliased to `pipenv sync`
   - `pu` is aliased to `pipenv uninstall`
+  - `pupd` is aliased to `pipenv update`
   - `pwh` is aliased to `pipenv --where`
   - `pvenv` is aliased to `pipenv --venv`
   - `ppy` is aliased to `pipenv --py`
+
+## Configuration
+
+### Shell activation
+
+If you want to disable the shell activation and deactivation feature, add the following style to your `.zshrc` before sourcing `oh-my-zsh.sh`:
+
+```zsh
+zstyle ':omz:plugins:pipenv' auto-shell no
+```
diff --git a/zsh/plugins/pipenv/pipenv.plugin.zsh b/zsh/plugins/pipenv/pipenv.plugin.zsh
index 4be61a9..76d66b3 100644
--- a/zsh/plugins/pipenv/pipenv.plugin.zsh
+++ b/zsh/plugins/pipenv/pipenv.plugin.zsh
@@ -1,31 +1,43 @@
-# Pipenv completion
-_pipenv() {
-  eval $(env COMMANDLINE="${words[1,$CURRENT]}" _PIPENV_COMPLETE=complete-zsh pipenv)
-}
-compdef _pipenv pipenv
+if (( ! $+commands[pipenv] )); then
+  return
+fi
 
-# Automatic pipenv shell activation/deactivation
-_togglePipenvShell() {
-  # deactivate shell if Pipfile doesn't exist and not in a subdir
-  if [[ ! -f "$PWD/Pipfile" ]]; then
-    if [[ "$PIPENV_ACTIVE" == 1 ]]; then
-      if [[ "$PWD" != "$pipfile_dir"* ]]; then
-        exit
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `pipenv`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_pipenv" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _pipenv
+  _comps[pipenv]=_pipenv
+fi
+
+_PIPENV_COMPLETE=zsh_source pipenv >| "$ZSH_CACHE_DIR/completions/_pipenv" &|
+
+if zstyle -T ':omz:plugins:pipenv' auto-shell; then
+  # Automatic pipenv shell activation/deactivation
+  _togglePipenvShell() {
+    # deactivate shell if Pipfile doesn't exist and not in a subdir
+    if [[ ! -f "$PWD/Pipfile" ]]; then
+      if [[ "$PIPENV_ACTIVE" == 1 ]]; then
+        if [[ "$PWD" != "$pipfile_dir"* ]]; then
+          unset PIPENV_ACTIVE pipfile_dir
+          deactivate
+        fi
       fi
     fi
-  fi
 
-  # activate the shell if Pipfile exists
-  if [[ "$PIPENV_ACTIVE" != 1 ]]; then
-    if [[ -f "$PWD/Pipfile" ]]; then
-      export pipfile_dir="$PWD"
-      pipenv shell
+    # activate the shell if Pipfile exists
+    if [[ "$PIPENV_ACTIVE" != 1 ]]; then
+      if [[ -f "$PWD/Pipfile" ]]; then
+        export pipfile_dir="$PWD"
+        source "$(pipenv --venv)/bin/activate"
+        export PIPENV_ACTIVE=1
+      fi
     fi
-  fi
-}
-autoload -U add-zsh-hook
-add-zsh-hook chpwd _togglePipenvShell
-_togglePipenvShell
+  }
+  autoload -U add-zsh-hook
+  add-zsh-hook chpwd _togglePipenvShell
+  _togglePipenvShell
+fi
 
 # Aliases
 alias pch="pipenv check"
@@ -39,6 +51,7 @@ alias prun="pipenv run"
 alias psh="pipenv shell"
 alias psy="pipenv sync"
 alias pu="pipenv uninstall"
+alias pupd="pipenv update"
 alias pwh="pipenv --where"
 alias pvenv="pipenv --venv"
 alias ppy="pipenv --py"
diff --git a/zsh/plugins/pm2/_pm2 b/zsh/plugins/pm2/_pm2
index faa6a34..afe4ae0 100644
--- a/zsh/plugins/pm2/_pm2
+++ b/zsh/plugins/pm2/_pm2
@@ -1,16 +1,233 @@
-#!/bin/zsh -f
 #compdef pm2
-#autoload
+# ------------------------------------------------------------------------------
+# Description
+# -----------
+#
+#  Completion script for pm2 5.2.2 (https://pm2.keymetrics.io/).
+#
+# ------------------------------------------------------------------------------
+# Authors
+# -------
+#
+#  * Myoungdo Park <mdo.park@gmail.com>
+#  * Shohei Yoshida <https://github.com/syohex>
+#
+# ------------------------------------------------------------------------------
 
-local -a _1st_arguments
+_pm2() {
+  typeset -A opt_args
+  local context state line
 
-_1st_arguments=(
+  local curcontext="$curcontext"
+
+  local ret=1
+
+  _arguments -C \
+    '(- *)'{-v,-V,--version}'[print pm2 version]' \
+    '(-s --silent)'{-s,--silent}'[hide all messages]' \
+    '--ext[watch only this file extension]:extension' \
+    '(-n --name)'{-n,--name}'[set a name for the process in the process list]:name' \
+    '(-m --mini-list)'{-m,--mini-list}'[display a compacted list without formatting]' \
+    '--interpreter[set a specific interpreter to use for executing app(default: node)]:prog' \
+    '(--interpreter-args --node-args)'{--interpreter-args,--node-args}'[set arguments to pass to the interpreter]:args' \
+    '(-o --output)'{-o,--output}'[specify log file for stdout]: :_files' \
+    '(-e --error)'{-e,--error}'[specify log file for stderr]: :_files' \
+    '(-l --log)'{-l,--log}'[specify log file which gathers both stdout and stderr]' \
+    '--filter-env[filter out outgoing global values that contain provided strings]:envs' \
+    '--log-type[specify log output style]: :(raw json)' \
+    '--log-date-format[specify log output style]:format' \
+    '--time[enable time logging]' \
+    '--disable-logs[disable all logs storage]' \
+    '*--env[specify which set of environment variables from ecosystem file must be injected]:env' \
+    '(-a --update-env)'{-a,--update-env}'[force and update of the environment with restart/reload]' \
+    '(-f --force)'{-f,--force}'[force actions]' \
+    '(-i --instances)'{-i,--instances}'[launch number instances]:num' \
+    '--parallel[number of parallel actions]:num' \
+    '--shutdown-with-message[shutdown an application with process.send("shutdown") instead of process.kill(pid, SIGINT)]' \
+    '(-p --pid)'{-p,--pid}'[specify pid file]: :_files' \
+    '(-k --kill-timeout)'{-k,--kill-timeout}'[delay before sending final SIGKILL signal to process]:delay' \
+    '--listen-timeout[listen timeout an application reload]:delay' \
+    '--max-memory-restart[restart the app if an amount of memory is exceeded (in bytes)]:bytes' \
+    '--restart-delay[specify a delay between restarts(in milliseconds)]:delay' \
+    '--exp-backoff-restart-delay[specify a delay between restarts(in milliseconds)]:delay' \
+    '(-x --execute-command)'{-e,--execute-command}'[execute a program using fork system]' \
+    '--max-restarts[only start the script COUNT times]:count' \
+    '(-u --user)'{-u,--user}'[define user when generating startup script]:username' \
+    '--uid[run target script with <uid> rights]:uid' \
+    '--gid[run target script with <gid> rights]:gui' \
+    '--namespace[start application within specified namespace]:namespace' \
+    '--cwd[run target script from path <cwd>]:cwd:_paths -/' \
+    '--hp[define home path when generating startup script]: :_paths -/' \
+    '--wait-ip[override systemd script to wait for full internet connectivity to launch pm2]' \
+    '--service-name[define service name when generating startup script]' \
+    '(-c --cron --cron-restart)'{-c,--cron,--cron-restart}'[restart a running process based on a cron pattern]:pattern' \
+    '(-w --write)'{-w,--write}'[write configuration in local folder]' \
+    '--no-daemon[run pm2 daemon in the foreground if it does not exist already]' \
+    '(--disable-source-map-support --source-map-support)--source-map-support[force source map support]' \
+    '--only[with json declaration, allow to only act on one application]:app' \
+    '(--disable-source-map-support --source-map-support)--disable-source-map-support[force disable source map support]' \
+    '--wait-ready[ask pm2 to wait for ready event from your app]' \
+    '--merge-logs[merge logs from different instances but keep error and out separated]' \
+    '*--watch[watch application folder for changes]: :_files -/' \
+    '*--ignore-watch[list of paths to ignore]: :_files' \
+    '--no-color[skip colors]' \
+    '--no-vizion[start an app without vizion feature]' \
+    '--np-autorestart[start an app without automatic restart]' \
+    '--no-treekill[Only kill the main process, not detached children]' \
+    '--no-pmx[start an app without pmx]' \
+    '--no-automation[start an app without automation]' \
+    '(--disable-trace --trace)--trace[enable transaction tracing with km]' \
+    '(--disable-trace --trace)--disable-trace[disable transaction tracing with km]' \
+    "--sort[sort process according to field's]:field_name" \
+    '--attach[attach logging after your start/restart/stop/reload]' \
+    '--v8[enable v8 data collecting]' \
+    '--event-loop-inspector[enable event-loop-inspector dump in pmx]' \
+    '--deep-monitoring[enable all monitoring tools]' \
+    '(- *)'{-h,--help}'[output usage information]' \
+    '1: :_pm2_subcommands' \
+    '*:: :->subcmds' && return 0
+
+  case "$state" in
+    (subcmds)
+      case $words[1] in
+        (start)
+          _arguments \
+            '--watch[watch folder for changes]' \
+            '--fresh[Rebuild Dockerfile]' \
+            '--daemon[Run container in Daemon mode(debug purposes)]' \
+            '--container[Start application in container mode]' \
+            '--dist[--with-container; change local Dockerfile to containerize all files in current directory]' \
+            '--image-name[with --dist; set the exported image name]:name' \
+            '--node-version[with --container, set a specific major Node.js version]:version' \
+            '--dockerdaemon[for debugging purpose]' \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '*: :_pm2_id_namespace_file' \
+            && ret=0
+          ;;
+        (trigger)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '1: :_pm2_id_names' \
+            && ret=0
+          ;;
+        (deploy|startOrRestart|startOrReload|startOrGracefulReload)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '1: :_files -g "*.json"' \
+            && ret=0
+          ;;
+        (stop|restart)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--watch[Stop watching folder for changes]' \
+            '*: :_pm2_id_namespace_all' \
+            && ret=0
+          ;;
+        (reload|delete|reset)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '*: :_pm2_id_namespace_all' \
+            && ret=0
+          ;;
+        (module:install)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--tarball[is local tarball]' \
+            '--install[run yarn install before starting module]' \
+            '--docker[is docker container]' \
+            '--v1[install module in v1 manner(do not use it)]' \
+            '--safe[keep module backup, if new module fail = restore with previous]:time' \
+            && ret=0
+          ;;
+        (publish|module:publish)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--npm[publish on npm]' \
+            '*: :_files -/' \
+            && ret=0
+          ;;
+        (link)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--info-node[set url info node]:url' \
+            && ret=0
+          ;;
+        (plus)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--info-node[set url info node]:url' \
+            '(-d --discrete)'{-d,--discrete}'[silent mode]' \
+            '(-a --install-all)'{-a,--install-all}'[install all modules (force yes)]' \
+            && ret=0
+          ;;
+        (dump|save)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--force[force deletion of dump file even if empty]' \
+            && ret=0
+          ;;
+        (send|attach|describe|env)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '1: :_pm2_id_names' \
+            && ret=0
+          ;;
+        (slist|sysinfos)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--tree[show as tree]' \
+            && ret=0
+          ;;
+        (logs)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--json[json log output]' \
+            '--format[formatted log output]' \
+            '--raw[raw output]' \
+            '--err[only shows error output]' \
+            '--out[only shows standard output]' \
+            '--line[output the last N lines, instead of the last 15 by default]:lines' \
+            '--timestamp[add timestamps(default format YYYY-MM-DD-HH:mm:ss)]:format' \
+            '--nostream[print logs without launching the log stream]' \
+            '*--highlight[highlights the given value]' \
+            '1: :_pm2_id_namespace' \
+            && ret=0
+          ;;
+        (serve)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '--port[specify port to listen to]:port' \
+            '--spa[always serving index.html on inexistent sub path]' \
+            '--basic-auth-username[set basic auth username]:username' \
+            '--basic-auth-password[set basic auth password]:password' \
+            '--monitor[frontend app monitoring]:app' \
+            '*: :_files -/' \
+            && ret=0
+          ;;
+        (*)
+          _arguments \
+            '(- *)'{-h,--help}'[output usage information]' \
+            '*: :_files' \
+            && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
+}
+
+(( $+functions[_pm2_subcommands] )) ||
+_pm2_subcommands() {
+  local -a subcommands=(
     "start:start and daemonize an app"
     "trigger:trigger process action"
     "deploy:deploy your json"
     "startOrRestart:start or restart JSON file"
     "startOrReload:start or gracefully reload JSON file"
     "pid:return pid of [app_name] or all"
+    "create:return pid of [app_name] or all"
+    "startOrGracefulReload:start or gracefully reload JSON file"
     "stop:stop a process"
     "restart:restart a process"
     "scale:scale up/down a process in cluster mode depending on total_number param"
@@ -23,18 +240,23 @@ _1st_arguments=(
     "sendSignal:send a system signal to the target process"
     "ping:ping pm2 daemon - if not up it will launch it"
     "updatePM2:update in-memory PM2 with local PM2"
+    "update:update in-memory PM2 with local PM2"
     "install:install or update a module and run it forever"
+    "module\:install:install or update a module and run it forever"
     "module\:update:update a module and run it forever"
     "module\:generate:Generate a sample module in current folder"
     "uninstall:stop and uninstall a module"
+    "module\:uninstall:stop and uninstall a module"
     "package:Check & Package TAR type module"
     "publish:Publish the module you are currently on"
+    "module\:publish:Publish the module you are currently on"
     "set:sets the specified config <key> <value>"
     "multiset:multiset eg \"key1 val1 key2 val2\""
     "get:get value for <key>"
+    "conf:get / set module config values"
     "config:get / set module config values"
     "unset:clears the specified config <key>"
-    "report:give a full pm2 report for https\://github.com/Unitech/pm2/issues"
+    "report:give a full pm2 report for https://github.com/Unitech/pm2/issues"
     "link:link with the pm2 monitoring dashboard"
     "unlink:unlink with the pm2 monitoring dashboard"
     "monitor:monitor target process"
@@ -43,8 +265,8 @@ _1st_arguments=(
     "plus:enable pm2 plus"
     "login:Login to pm2 plus"
     "logout:Logout from pm2 plus"
-    "web:launch a health API on 0.0.0.0\:9615"
     "dump:dump all processes for resurrecting them later"
+    "save:dump all processes for resurrecting them later"
     "cleardump:Create empty dump file"
     "send:send stdin to <pm_id>"
     "attach:attach stdin/stdout to application identified by <pm_id>"
@@ -52,15 +274,27 @@ _1st_arguments=(
     "unstartup:disable the pm2 startup hook"
     "startup:enable the pm2 startup hook"
     "logrotate:copy default logrotate configuration"
-    "ecosystem:generate a process conf file. (mode = null or simple)"
+    "ecosystem:generate a process conf file"
+    "init:generate a process conf file"
     "reset:reset counters for process"
-    "describe:describe all parameters of a process id"
+    "describe:describe all parameters of a process"
+    "desc:describe all parameters of a process"
+    "info:describe all parameters of a process"
+    "show:describe all parameters of a process"
+    "env:list all environment variables of a process id"
     "list:list all processes"
+    "l:list all processes"
+    "ps:list all processes"
+    "status:list all processes"
     "jlist:list all processes in JSON format"
+    "sysmonit:start system monitoring daemon"
+    "slist:list system infos in JSON"
+    "sysinfos:list system infos in JSON"
     "prettylist:print json in a prettified JSON"
     "monit:launch termcaps monitoring"
     "imonit:launch legacy termcaps monitoring"
     "dashboard:launch dashboard with monitoring and logs"
+    "dash:launch dashboard with monitoring and logs"
     "flush:flush logs"
     "reloadLogs:reload all logs"
     "logs:stream logs file. Default stream all logs"
@@ -70,99 +304,71 @@ _1st_arguments=(
     "backward:downgrades repository to the previous commit for a given app"
     "deepUpdate:performs a deep update of PM2"
     "serve:serve a directory over http via port"
+    "autoinstall:auto install"
     "examples:display pm2 usage examples"
-)
+  )
 
-local -a id_names
-
-_id_names() {
-    local app_list
-    app_list=`pm2 list -m`
-
-    local -a names ids 
-    names=(`echo $app_list | grep '+---' | awk '{print $2}'`)
-    ids=(`echo $app_list | grep 'pm2 id' | awk '{print $4}'`)
-
-    if (( ${#ids} > 0 )); then
-        for i in {1..${#ids}}; do
-            id_names+=( "${ids[i]}:${names[i]}" )
-        done
-    fi
+  _describe -t subcommands 'subcommand' subcommands "$@"
 }
 
-_arguments \
-    '(-v --version)'{-v,--version}'[output version]' \
-    '(-h --help)'{-h,--help}'[output usage information]' \
-    '*:: :->subcmds' && return 0
+(( $+functions[_pm2_id_names] )) ||
+_pm2_id_names() {
+  local app_list=$(pm2 list -m)
+  local -a names=(${(@f)"$(echo $app_list | awk '/^\+---/{sub("+--- ", ""); print}')"})
+  local -a ids=(${(@f)"$(echo $app_list | awk '/^pm2 id/{sub("pm2 id :", ""); print}')"})
 
-if (( CURRENT == 1 )); then
-    _describe "command" _1st_arguments
-    return
+  if (( ${#ids} > 0 )); then
+    local -a id_names
+    for i in {1..${#ids}}; do
+      id_names+=( "${ids[i]}:${names[i]}" )
+    done
+
+    _describe 'id' id_names
+  fi
+}
+
+(( $+functions[_pm2_namespaces] )) ||
+_pm2_namespaces() {
+  local -a namespaces=(${(@f)"$(pm2 list -m | awk '/^namespace :/{ print $3 }')"})
+  if (( ${#namespaces} > 0 )); then
+    _values 'namespace' $namespaces
+  fi
+}
+
+(( $+functions[_pm2_id_namespace] )) ||
+_pm2_id_namespace() {
+  _alternative \
+    'ids:id:_pm2_id_names' \
+    'namespaces:namespace:_pm2_namespaces'
+}
+
+(( $+functions[_pm2_id_namespace_all] )) ||
+_pm2_id_namespace_all() {
+  _alternative \
+    'ids:id:_pm2_id_names' \
+    'namespaces:namespace:_pm2_namespaces' \
+    'all:all:(all)'
+}
+
+(( $+functions[_pm2_id_namespace_file] )) ||
+_pm2_id_namespace_file() {
+  _alternative \
+    'ids:id:_pm2_id_names' \
+    'namespaces:namespace:_pm2_namespaces' \
+    'files:file:_files'
+}
+
+if [ "$funcstack[1]" = "_pm2" ]; then
+    _pm2 "$@"
+else
+    compdef _pm2 pm2
 fi
 
-local -a id_comp id_all_comp id_all_files_comp start_options logs_options
-id_comp=('1: :->id_comp')
-id_all_comp=('1: :->id_all_comp')
-id_all_files_comp=('1: :->id_all_files_comp')
-start_options=(
-    '--watch[Watch folder for changes]'
-    '--fresh[Rebuild Dockerfile]'
-    '--daemon[Run container in Daemon mode (debug purposes)]'
-    '--container[Start application in container mode]'
-    '--dist[with --container; change local Dockerfile to containerize all files in current directory]'
-    '--image-name[with --dist; set the exported image name]'
-    '--node-version[with --container, set a specific major Node.js version]'
-    '--dockerdaemon[for debugging purpose]'
-    '(-h --help)'{-h,--help}'[output usage information]'
-    $id_all_files_comp
-)
-logs_options=(
-    '--json[json log output]'
-    '--format[formatted log output]'
-    '--raw[raw output]'
-    '--err[only shows error output]'
-    '--out[only shows standard output]'
-    '--lines[output the last N lines, instead of the last 15 by default]'
-    '--timestamp[add timestamps (default format YYYY-MM-DD-HH:mm:ss)]'
-    '--nostream[print logs without launching the log stream]'
-    '(-h --help)'{-h,--help}'[output usage information]'
-    $id_all_comp
-)
+# Local Variables:
+# mode: Shell-Script
+# sh-indentation: 2
+# indent-tabs-mode: nil
+# sh-basic-offset: 2
+# End:
 
-case "$words[1]" in
-    start)
-        _arguments $start_options && return 0
-        ;;
-    logs)
-        _arguments $logs_options && return 0
-        ;;
-    stop|restart|delete|reload|reset)
-        _arguments $id_all_comp && return 0
-        ;;
-    env|inspect|monitor|unmonitor|describe)
-        _arguments $id_comp && return 0
-        ;;
-    deploy|startOrRestart|startOrReload)
-        _files ;;
-esac
-
-case "$state" in
-    id_comp)
-        _id_names
-        _alternative \
-            'args:app args:(($id_names))'
-        ;;
-    id_all_comp)
-        _id_names
-        id_names+=(all)
-        _alternative \
-            'args:app args:(($id_names))'
-        ;;
-    id_all_files_comp)
-        _id_names
-        id_names+=(all)
-        _alternative \
-            'args:app args:(($id_names))' \
-            'files:filename:_files'
-        ;;
-esac
+# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/plugins/pod/_pod b/zsh/plugins/pod/_pod
index 80d23da..d560129 100644
--- a/zsh/plugins/pod/_pod
+++ b/zsh/plugins/pod/_pod
@@ -6,7 +6,7 @@
 
 # -----------------------------------------------------------------------------
 #          FILE:  _pod
-#   DESCRIPTION:  Cocoapods (0.33.1) autocomplete plugin for Oh-My-Zsh
+#   DESCRIPTION:  CocoaPods (0.33.1) autocomplete plugin for Oh-My-Zsh
 #                 https://cocoapods.org
 #                 Generated with `pod --completion-script
 #        AUTHOR:  Alexandre Joly (alexandre.joly@mekanics.ch)
diff --git a/zsh/plugins/podman/README.md b/zsh/plugins/podman/README.md
new file mode 100644
index 0000000..99daa28
--- /dev/null
+++ b/zsh/plugins/podman/README.md
@@ -0,0 +1,47 @@
+# Podman plugin
+
+This plugin adds auto-completion and aliases for [podman](https://podman.io/).
+
+To use it add `podman` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... podman)
+```
+
+## Aliases
+
+| Alias   | Command                                       | Description                                                                              |
+| :------ | :-------------------------------------------- | :--------------------------------------------------------------------------------------- |
+| pbl     | `podman build`                                | Build an image from a Dockerfile                                                         |
+| pcin    | `podman container inspect`                    | Display detailed information on one or more containers                                   |
+| pcls    | `podman container ls`                         | List all the running podman containers                                                   |
+| pclsa   | `podman container ls --all`                   | List all running and stopped containers                                                  |
+| pib     | `podman image build`                          | Build an image from a Dockerfile (same as podman build)                                  |
+| pii     | `podman image inspect`                        | Display detailed information on one or more images                                       |
+| pils    | `podman image ls`                             | List podman images                                                                       |
+| pipu    | `podman image push`                           | Push an image or repository to a remote registry                                         |
+| pirm    | `podman image rm`                             | Remove one or more images                                                                |
+| pit     | `podman image tag`                            | Add a name and tag to a particular image                                                 |
+| plo     | `podman container logs`                       | Fetch the logs of a podman container                                                     |
+| pnc     | `podman network create`                       | Create a new network                                                                     |
+| pncn    | `podman network connect`                      | Connect a container to a network                                                         |
+| pndcn   | `podman network disconnect`                   | Disconnect a container from a network                                                    |
+| pni     | `podman network inspect`                      | Return information about one or more networks                                            |
+| pnls    | `podman network ls`                           | List all networks the engine daemon knows about, including those spanning multiple hosts |
+| pnrm    | `podman network rm`                           | Remove one or more networks                                                              |
+| ppo     | `podman container port`                       | List port mappings or a specific mapping for the container                               |
+| ppu     | `podman pull`                                 | Pull an image or a repository from a registry                                            |
+| pr      | `podman container run`                        | Create a new container and start it using the specified command                          |
+| prit    | `podman container run --interactive --tty`    | Create a new container and start it in an interactive shell                              |
+| prm     | `podman container rm`                         | Remove the specified container(s)                                                        |
+| prm!    | `podman container rm --force`                 | Force the removal of a running container (uses SIGKILL)                                  |
+| pst     | `podman container start`                      | Start one or more stopped containers                                                     |
+| prs     | `podman container restart`                    | Restart one or more containers                                                           |
+| psta    | `podman stop $(podman ps -q)`                 | Stop all running containers                                                              |
+| pstp    | `podman container stop`                       | Stop one or more running containers                                                      |
+| ptop    | `podman top`                                  | Display the running processes of a container                                             |
+| pvi     | `podman volume inspect`                       | Display detailed information about one or more volumes                                   |
+| pvls    | `podman volume ls`                            | List all the volumes known to podman                                                     |
+| pvprune | `podman volume prune`                         | Cleanup dangling volumes                                                                 |
+| pxc     | `podman container exec`                       | Run a new command in a running container                                                 |
+| pxcit   | `podman container exec --interactive --tty`   | Run a new command in a running container in an interactive shell                         |
diff --git a/zsh/plugins/podman/podman.plugin.zsh b/zsh/plugins/podman/podman.plugin.zsh
new file mode 100644
index 0000000..97cf92b
--- /dev/null
+++ b/zsh/plugins/podman/podman.plugin.zsh
@@ -0,0 +1,47 @@
+if (( ! $+commands[podman] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `podman`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_podman" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _podman
+  _comps[podman]=_podman
+fi
+
+podman completion zsh 2> /dev/null >| "$ZSH_CACHE_DIR/completions/_podman" &|
+
+alias pbl='podman build'
+alias pcin='podman container inspect'
+alias pcls='podman container ls'
+alias pclsa='podman container ls --all'
+alias pib='podman image build'
+alias pii='podman image inspect'
+alias pils='podman image ls'
+alias pipu='podman image push'
+alias pirm='podman image rm'
+alias pit='podman image tag'
+alias plo='podman container logs'
+alias pnc='podman network create'
+alias pncn='podman network connect'
+alias pndcn='podman network disconnect'
+alias pni='podman network inspect'
+alias pnls='podman network ls'
+alias pnrm='podman network rm'
+alias ppo='podman container port'
+alias ppu='podman pull'
+alias pr='podman container run'
+alias prit='podman container run --interactive --tty'
+alias prm='podman container rm'
+alias 'prm!'='podman container rm --force'
+alias pst='podman container start'
+alias prs='podman container restart'
+alias psta='podman stop $(podman ps --quiet)'
+alias pstp='podman container stop'
+alias ptop='podman top'
+alias pvi='podman volume inspect'
+alias pvls='podman volume ls'
+alias pvprune='podman volume prune'
+alias pxc='podman container exec'
+alias pxcit='podman container exec --interactive --tty'
diff --git a/zsh/plugins/poetry-env/README.md b/zsh/plugins/poetry-env/README.md
new file mode 100644
index 0000000..bd99d2a
--- /dev/null
+++ b/zsh/plugins/poetry-env/README.md
@@ -0,0 +1,10 @@
+# Poetry Environment Plugin
+
+This plugin automatically changes poetry environment when you cd into or out of the project directory.
+Note: Script looks for pyproject.toml file to determine poetry if its a poetry environment
+
+To use it, add `poetry-env` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... poetry-env)
+```
diff --git a/zsh/plugins/poetry-env/poetry-env.plugin.zsh b/zsh/plugins/poetry-env/poetry-env.plugin.zsh
new file mode 100644
index 0000000..d2d571d
--- /dev/null
+++ b/zsh/plugins/poetry-env/poetry-env.plugin.zsh
@@ -0,0 +1,27 @@
+_togglePoetryShell() {
+  # Determine if currently in a Poetry-managed directory
+  local in_poetry_dir=0
+  if [[ -f "$PWD/pyproject.toml" && -f "$PWD/poetry.lock" ]]; then
+    in_poetry_dir=1
+  fi
+
+  # Deactivate the current environment if moving out of a Poetry directory or into a different Poetry directory
+  if [[ $poetry_active -eq 1 ]] && { [[ $in_poetry_dir -eq 0 ]] || [[ "$PWD" != "$poetry_dir"* ]]; }; then
+    export poetry_active=0
+    unset poetry_dir
+    (( $+functions[deactivate] )) && deactivate
+  fi
+
+  # Activate the environment if in a Poetry directory and no environment is currently active
+  if [[ $in_poetry_dir -eq 1 ]] && [[ $poetry_active -ne 1 ]]; then
+    venv_dir=$(poetry env info --path 2>/dev/null)
+    if [[ -n "$venv_dir" ]]; then
+      export poetry_active=1
+      export poetry_dir="$PWD"
+      source "${venv_dir}/bin/activate"
+    fi
+  fi
+}
+autoload -U add-zsh-hook
+add-zsh-hook chpwd _togglePoetryShell
+_togglePoetryShell # Initial call to check the current directory at shell startup
diff --git a/zsh/plugins/poetry/README.md b/zsh/plugins/poetry/README.md
index 51780cb..3e7ada4 100644
--- a/zsh/plugins/poetry/README.md
+++ b/zsh/plugins/poetry/README.md
@@ -7,3 +7,36 @@ To use it, add `poetry` to the plugins array in your zshrc file:
 ```zsh
 plugins=(... poetry)
 ```
+
+## Aliases
+
+| Alias | Command                                            | Description                                                                             |
+|:----- |--------------------------------------------------- |:--------------------------------------------------------------------------------------- |
+| pad   | `poetry add`                                       | Add packages to `pyproject.toml` and install them                                       |
+| pbld  | `poetry build`                                     | Build the source and wheels archives                                                    |
+| pch   | `poetry check`                                     | Validate the content of the `pyproject.toml` and its consistency with the `poetry.lock` |
+| pcmd  | `poetry list`                                      | Display all the available Poetry commands                                               |
+| pconf | `poetry config --list`                             | Allow you to edit poetry config settings and repositories                               |
+| pexp  | `poetry export --without-hashes > requirements.txt` | Export the lock file to `requirements.txt`                                              |
+| pin   | `poetry init`                                      | Create a `pyproject.toml` interactively                                                 |
+| pinst | `poetry install`                                   | Read the `pyproject.toml`, resolve the dependencies, and install them                   |
+| plck  | `poetry lock`                                      | Lock the dependencies in `pyproject.toml` without installing                            |
+| pnew  | `poetry new`                                       | Create a directory structure suitable for most Python projects                          |
+| ppath | `poetry env info --path`                           | Get the path of the currently activated virtualenv                                     |
+| pplug | `poetry self show plugins`                         | List all the installed Poetry plugins                                                   |
+| ppub  | `poetry publish`                                   | Publish the built (`poetry build` command) package to the remote repository           |
+| prm   | `poetry remove`                                    | Remove packages from `pyproject.toml` and uninstall them                                |
+| prun  | `poetry run`                                       | Executes the given command inside the project’s virtualenv                              |
+| psad  | `poetry self add`                                  | Add the Poetry plugin and install dependencies to make it work                          |
+| psh   | `poetry shell`                                     | Spawns a shell within the virtual environment. If one doesn’t exist, it will be created |
+| pshw  | `poetry show`                                      | List all the available dependencies                                                     |
+| pslt  | `poetry show --latest`                             | List latest version of the dependencies                                                |
+| psup  | `poetry self update`                               | Update Poetry to the latest version (default) or to the specified version               |
+| psync | `poetry install --sync`                            | Synchronize your environment with the `poetry.lock`                                     |
+| ptree | `poetry show --tree`                               | List the dependencies as tree                                                           |
+| pup   | `poetry update`                                    | Get the latest versions of the dependencies and to update the `poetry.lock`             |
+| pvinf | `poetry env info`                                  | Get basic information about the currently activated virtualenv                          |
+| pvoff | `poetry config virtualenvs.create false`           | Disable automatic virtualenv creation                                                   |
+| pvrm  | `poetry env remove`                                | Delete existing virtualenvs                                                             |
+| pvrma | `poetry env remove --all`                          | Delete all existing virtualenvs                                                         |
+| pvu   | `poetry env use`                                   | Switch between existing virtualenvs                                                     |
diff --git a/zsh/plugins/poetry/poetry.plugin.zsh b/zsh/plugins/poetry/poetry.plugin.zsh
index cebcb46..fe6a0f7 100644
--- a/zsh/plugins/poetry/poetry.plugin.zsh
+++ b/zsh/plugins/poetry/poetry.plugin.zsh
@@ -1,3 +1,31 @@
+alias pad='poetry add'
+alias pbld='poetry build'
+alias pch='poetry check'
+alias pcmd='poetry list'
+alias pconf='poetry config --list'
+alias pexp='poetry export --without-hashes > requirements.txt'
+alias pin='poetry init'
+alias pinst='poetry install'
+alias plck='poetry lock'
+alias pnew='poetry new'
+alias ppath='poetry env info --path'
+alias pplug='poetry self show plugins'
+alias ppub='poetry publish'
+alias prm='poetry remove'
+alias prun='poetry run'
+alias psad='poetry self add'
+alias psh='poetry shell'
+alias pshw='poetry show'
+alias pslt='poetry show --latest'
+alias psup='poetry self update'
+alias psync='poetry install --sync'
+alias ptree='poetry show --tree'
+alias pup='poetry update'
+alias pvinf='poetry env info'
+alias pvoff='poetry config virtualenvs.create false'
+alias pvrm='poetry env remove'
+alias pvu='poetry env use'
+
 # Return immediately if poetry is not found
 if (( ! $+commands[poetry] )); then
   return
diff --git a/zsh/plugins/postgres/README.md b/zsh/plugins/postgres/README.md
index 59445f3..3f59a8f 100644
--- a/zsh/plugins/postgres/README.md
+++ b/zsh/plugins/postgres/README.md
@@ -19,4 +19,4 @@ plugins=(... postgres)
 | stoppost    | `pg_ctl -D /usr/local/var/postgres stop -s -m fast`                             | Stop postgres server                                        |
 | restartpost | `stoppost && sleep 1 && startpost`                                              | Restart (calls stop, then start)                            |
 | reloadpost  | `pg_ctl reload -D /usr/local/var/postgres -s`                                   | Reload postgres configuration (some setting require restart)|
-| statuspost  | `pg_ctl status -D /usr/local/var/postgres -s`                                   | Check startus of postgres server (running, stopped)         |
+| statuspost  | `pg_ctl status -D /usr/local/var/postgres -s`                                   | Check status of postgres server (running, stopped)          |
diff --git a/zsh/plugins/pre-commit/README.md b/zsh/plugins/pre-commit/README.md
new file mode 100644
index 0000000..e098ea2
--- /dev/null
+++ b/zsh/plugins/pre-commit/README.md
@@ -0,0 +1,22 @@
+# Pre-commit plugin
+
+This plugin adds aliases for common commands of [pre-commit](https://pre-commit.com/).
+It also supports [prek](https://github.com/prek/prek) as a drop-in replacement.
+If `prek` is available, it will be used; otherwise, `pre-commit` is used as fallback.
+
+To use this plugin, add it to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... pre-commit)
+```
+
+## Aliases
+
+| Alias | Command                                                | Description                                   |
+| ----- | ------------------------------------------------------ | --------------------------------------------- |
+| prc   | `prek` or `pre-commit`                                 | The pre-commit command                        |
+| prcau | `prek auto-update` or `pre-commit autoupdate`          | Update hooks automatically                    |
+| prcr  | `prek run` or `pre-commit run`                         | The pre-commit run command                    |
+| prcra | `prek run --all-files` or `pre-commit run --all-files` | Run pre-commit hooks on all files             |
+| prcrf | `prek run --files` or `pre-commit run --files`         | Run pre-commit hooks on a given list of files |
+
diff --git a/zsh/plugins/pre-commit/pre-commit.plugin.zsh b/zsh/plugins/pre-commit/pre-commit.plugin.zsh
new file mode 100644
index 0000000..11219fe
--- /dev/null
+++ b/zsh/plugins/pre-commit/pre-commit.plugin.zsh
@@ -0,0 +1,17 @@
+# Aliases for pre-commit (uses prek if available, else pre-commit)
+if command -v prek &> /dev/null; then
+    _prc_cmd='prek'
+    _prc_autoupdate='auto-update'
+else
+    _prc_cmd='pre-commit'
+    _prc_autoupdate='autoupdate'
+fi
+
+alias prc="$_prc_cmd"
+
+alias prcau="$_prc_cmd $_prc_autoupdate"
+
+alias prcr="$_prc_cmd run"
+alias prcra="$_prc_cmd run --all-files"
+alias prcrf="$_prc_cmd run --files"
+
diff --git a/zsh/plugins/procs/README.md b/zsh/plugins/procs/README.md
new file mode 100644
index 0000000..f1e663d
--- /dev/null
+++ b/zsh/plugins/procs/README.md
@@ -0,0 +1,9 @@
+# procs
+
+This plugin provides completion for [procs](https://github.com/dalance/procs).
+
+To use it, add `procs` to the plugins array in your zshrc file.
+
+```
+plugins=(... procs)
+```
diff --git a/zsh/plugins/procs/procs.plugin.zsh b/zsh/plugins/procs/procs.plugin.zsh
new file mode 100644
index 0000000..8b15f1d
--- /dev/null
+++ b/zsh/plugins/procs/procs.plugin.zsh
@@ -0,0 +1,21 @@
+if (( ! $+commands[procs] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `procs`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_procs" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _procs
+  _comps[procs]=_procs
+fi
+
+{
+  autoload -Uz is-at-least
+  local _version=$(procs --version)
+  if is-at-least "0.14" "${_version#procs }"; then
+    procs --gen-completion-out zsh >| "$ZSH_CACHE_DIR/completions/_procs"
+  else
+    procs --completion-out zsh >| "$ZSH_CACHE_DIR/completions/_procs"
+  fi
+} &|
diff --git a/zsh/plugins/pulumi/README.md b/zsh/plugins/pulumi/README.md
new file mode 100644
index 0000000..4c77196
--- /dev/null
+++ b/zsh/plugins/pulumi/README.md
@@ -0,0 +1,41 @@
+# Pulumi
+
+This is an **Oh My Zsh plugin** for the [**Pulumi CLI**](https://www.pulumi.com/docs/iac/cli/),
+an Infrastructure as Code (IaC) tool for building, deploying and managing cloud infrastucture.
+
+This plugin provides:
+
+- 🚀 Short, intuitive aliases for common Pulumi commands
+- 🎯 Auto-completion support for Pulumi
+
+To use it, add `pulumi` to the plugins array in your `.zshrc` file:  
+
+```zsh
+plugins=(... pulumi)
+```
+
+## ⚡ Aliases
+
+| Alias    | Command                | Description                   |
+| -------- | ---------------------- | ----------------------------- |
+| `pul`    | `pulumi`               | Shortcut for Pulumi CLI       |
+| `pulcs`  | `pulumi config set`    | Set Pulumi configuration      |
+| `puld`   | `pulumi destroy`       | Destroy all resources         |
+| `pullog` | `pulumi logs -f`       | Tail Pulumi logs in real-time |
+| `pulp`   | `pulumi preview`       | Show planned changes          |
+| `pulr`   | `pulumi refresh`       | Refresh state from cloud      |
+| `puls`   | `pulumi stack`         | Show stack details            |
+| `pulsh`  | `pulumi stack history` | Show stack history            |
+| `pulsi`  | `pulumi stack init`    | Initialize a new stack        |
+| `pulsl`  | `pulumi stack ls`      | List available stacks         |
+| `pulso`  | `pulumi stack output`  | Show stack outputs            |
+| `pulss`  | `pulumi stack select`  | Switch stack                  |
+| `pulu`   | `pulumi up`            | Deploy infrastructure         |
+
+## 🎯 Autocompletion
+
+If `pulumi gen-completion zsh` is available, this plugin **automatically loads Pulumi auto-completion**.
+
+## 🛠️ Contribution
+
+Feel free to open an issue or PR for improvements! 🚀
diff --git a/zsh/plugins/pulumi/pulumi.plugin.zsh b/zsh/plugins/pulumi/pulumi.plugin.zsh
new file mode 100644
index 0000000..7068601
--- /dev/null
+++ b/zsh/plugins/pulumi/pulumi.plugin.zsh
@@ -0,0 +1,28 @@
+if (( ! $+commands[pulumi] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `pulumi`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_pulumi" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _pulumi
+  _comps[pulumi]=_pulumi
+fi
+
+pulumi gen-completion zsh >| "$ZSH_CACHE_DIR/completions/_pulumi" &|
+
+# Aliases
+alias pul='pulumi'
+alias pulcs='pulumi config set'
+alias puld='pulumi destroy'
+alias pullog='pulumi logs -f'
+alias pulp='pulumi preview'
+alias pulr='pulumi refresh'
+alias puls='pulumi stack'
+alias pulsh='pulumi stack history'
+alias pulsi='pulumi stack init'
+alias pulsl='pulumi stack ls'
+alias pulso='pulumi stack output'
+alias pulss='pulumi stack select'
+alias pulu='pulumi up'
diff --git a/zsh/plugins/pyenv/README.md b/zsh/plugins/pyenv/README.md
index b9ee937..2476bbd 100644
--- a/zsh/plugins/pyenv/README.md
+++ b/zsh/plugins/pyenv/README.md
@@ -2,7 +2,7 @@
 
 This plugin looks for [pyenv](https://github.com/pyenv/pyenv), a Simple Python version
 management system, and loads it if it's found. It also loads pyenv-virtualenv, a pyenv
-plugin to manage virtualenv, if it's found.
+plugin to manage virtualenv, if it's found. If a venv is found pyenv won't load.
 
 To use it, add `pyenv` to the plugins array in your zshrc file:
 
@@ -10,6 +10,14 @@ To use it, add `pyenv` to the plugins array in your zshrc file:
 plugins=(... pyenv)
 ```
 
+If you receive a `Found pyenv, but it is badly configured.` error on startup, you may need to ensure that `pyenv` is initialized before the oh-my-zsh pyenv plugin is loaded. This can be achieved by adding the following earlier in the `.zshrc` file than the `plugins=(...)` line:
+
+```zsh
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init --path)"
+```
+
 ## Settings
 
 - `ZSH_PYENV_QUIET`: if set to `true`, the plugin will not print any messages if it
@@ -18,6 +26,14 @@ plugins=(... pyenv)
 - `ZSH_PYENV_VIRTUALENV`: if set to `false`, the plugin will not load pyenv-virtualenv
   when it finds it.
 
+- `ZSH_THEME_PYENV_NO_SYSTEM`: if set to `true`, the plugin will not show the system or
+  default Python version when it finds it.
+- `ZSH_THEME_PYENV_PREFIX`: the prefix to display before the Python version in
+  the prompt.
+
+- `ZSH_THEME_PYENV_SUFFIX`: the prefix to display after the Python version in
+  the prompt.
+
 ## Functions
 
 - `pyenv_prompt_info`: displays the Python version in use by pyenv; or the global Python
diff --git a/zsh/plugins/pyenv/pyenv.plugin.zsh b/zsh/plugins/pyenv/pyenv.plugin.zsh
index 7fbd158..cd2a9e0 100644
--- a/zsh/plugins/pyenv/pyenv.plugin.zsh
+++ b/zsh/plugins/pyenv/pyenv.plugin.zsh
@@ -1,3 +1,7 @@
+# if there is a virtualenv already loaded pyenv should not be loaded
+# see https://github.com/ohmyzsh/ohmyzsh/issues/12589
+[[ -n ${VIRTUAL_ENV:-} ]] && return
+
 pyenv_config_warning() {
   [[ "$ZSH_PYENV_QUIET" != true ]] || return 0
 
@@ -78,19 +82,25 @@ if [[ $FOUND_PYENV -eq 1 ]]; then
   eval "$(pyenv init - --no-rehash zsh)"
 
   # If pyenv-virtualenv exists, load it
-  if [[ "$(pyenv commands)" =~ "virtualenv-init" && "$ZSH_PYENV_VIRTUALENV" != false ]]; then
+  if [[ "$ZSH_PYENV_VIRTUALENV" != false && "$(pyenv commands)" =~ "virtualenv-init" ]]; then
     eval "$(pyenv virtualenv-init - zsh)"
   fi
 
   function pyenv_prompt_info() {
     local version="$(pyenv version-name)"
-    echo "${version:gs/%/%%}"
+    if [[ "$ZSH_THEME_PYENV_NO_SYSTEM" == "true" ]] && [[ "${version}" == "system" ]]; then
+      return
+    fi
+    echo "${ZSH_THEME_PYENV_PREFIX=}${version:gs/%/%%}${ZSH_THEME_PYENV_SUFFIX=}"
   }
 else
   # Fall back to system python
   function pyenv_prompt_info() {
+    if [[ "$ZSH_THEME_PYENV_NO_SYSTEM" == "true" ]]; then
+      return
+    fi
     local version="$(python3 -V 2>&1 | cut -d' ' -f2)"
-    echo "system: ${version:gs/%/%%}"
+    echo "${ZSH_THEME_PYENV_PREFIX=}system: ${version:gs/%/%%}${ZSH_THEME_PYENV_SUFFIX=}"
   }
 fi
 
diff --git a/zsh/plugins/python/README.md b/zsh/plugins/python/README.md
index 97c1a34..ca424ea 100644
--- a/zsh/plugins/python/README.md
+++ b/zsh/plugins/python/README.md
@@ -12,8 +12,7 @@ plugins=(... python)
 
 | Command          | Description                                                                            |
 | ---------------- | -------------------------------------------------------------------------------------- |
-| `py`             | Runs `python3`                                                                         |
-| `ipython`        | Runs the appropriate `ipython` version according to the activated virtualenv           |
+| `py`             | Runs `python3`. Only set if `py` is not installed.                                     |
 | `pyfind`         | Finds .py files recursively in the current directory                                   |
 | `pyclean [dirs]` | Deletes byte-code and cache files from a list of directories or the current one        |
 | `pygrep <text>`  | Looks for `text` in `*.py` files in the current directory, recursively                 |
@@ -22,8 +21,48 @@ plugins=(... python)
 
 ## Virtual environments
 
-The plugin provides two utilities to manage Python venvs:
+The plugin provides three utilities to manage Python 3.3+ [venv](https://docs.python.org/3/library/venv.html)
+virtual environments:
 
-- `mkv [name]`: make a new virtual environment called `name` (default: `venv`) in current directory.
+- `mkv [name]`: make a new virtual environment called `name` in the current directory.
+  **Default**: `$PYTHON_VENV_NAME` if set, otherwise `venv`.
+
+- `vrun [name]`: activate the virtual environment called `name` in the current directory.
+  **Default**: the first existing in `$PYTHON_VENV_NAMES`.
+
+- `auto_vrun`: automatically activate the venv virtual environment when entering a directory containing
+  `<venv-name>/bin/activate`, and automatically deactivate it when navigating out of it (keeps venv activated
+  in subdirectories).
+  - To enable the feature, set `PYTHON_AUTO_VRUN=true` before sourcing oh-my-zsh.
+  - The plugin activates the first existing virtual environment, in order, appearing in `$PYTHON_VENV_NAMES`.
+    The default virtual environment name is `venv`. To use a different name, set
+    `PYTHON_VENV_NAME=<venv-name>`. For example: `PYTHON_VENV_NAME=".venv"`
+
+### Settings
+
+You can set these variables in your `.zshrc` file, before Oh My Zsh is sourced.
+For example:
+
+```sh
+PYTHON_VENV_NAME=".venv"
+PYTHON_VENV_NAMES=($PYTHON_VENV_NAME venv)
+...
+plugins=(... python)
+source "$ZSH/oh-my-zsh.sh"
+```
+
+
+## `$PYTHON_VENV_NAME`
+
+**Default**: `venv`.
+
+Preferred name for virtual environments, for example when creating via `mkv`.
+
+## `$PYTHON_VENV_NAMES`
+
+**Default**: `$PYTHON_VENV_NAME venv .venv`.
+
+Array of virtual environment names to be checked, in order, by `vrun` and `auto_vrun`.
+This means these functions will load the first existing virtual environment in this list.
+Duplicate names are ignored.
 
-- `vrun [name]`: activate virtual environment called `name` (default: `venv`) in current directory.
diff --git a/zsh/plugins/python/python.plugin.zsh b/zsh/plugins/python/python.plugin.zsh
index 2fbb595..2b139dd 100644
--- a/zsh/plugins/python/python.plugin.zsh
+++ b/zsh/plugins/python/python.plugin.zsh
@@ -1,5 +1,5 @@
-# python command
-alias py='python3'
+# set python command if 'py' not installed
+builtin which py > /dev/null || alias py='python3'
 
 # Find python file
 alias pyfind='find . -name "*.py"'
@@ -43,19 +43,34 @@ function pyuserpaths() {
 # Grep among .py files
 alias pygrep='grep -nr --include="*.py"'
 
-# Run proper IPython regarding current virtualenv (if any)
-alias ipython="python3 -c 'import IPython; IPython.terminal.ipapp.launch_new_instance()'"
-
 # Share local directory as a HTTP server
 alias pyserver="python3 -m http.server"
 
 
-## venv utilities
+## venv settings
+: ${PYTHON_VENV_NAME:=venv}
+
+# Array of possible virtual environment names to look for, in order
+# -U for removing duplicates
+typeset -gaU PYTHON_VENV_NAMES
+[[ -n "$PYTHON_VENV_NAMES" ]] || PYTHON_VENV_NAMES=($PYTHON_VENV_NAME venv .venv)
 
 # Activate a the python virtual environment specified.
-# If none specified, use 'venv'.
+# If none specified, use the first existing in $PYTHON_VENV_NAMES.
 function vrun() {
-  local name="${1:-venv}"
+  if [[ -z "$1" ]]; then
+    local name
+    for name in $PYTHON_VENV_NAMES; do
+      local venvpath="${name:P}"
+      if [[ -d "$venvpath" ]]; then
+        vrun "$name"
+        return $?
+      fi
+    done
+    echo >&2 "Error: no virtual environment found in current directory"
+  fi
+
+  local name="${1:-$PYTHON_VENV_NAME}"
   local venvpath="${name:P}"
 
   if [[ ! -d "$venvpath" ]]; then
@@ -72,12 +87,36 @@ function vrun() {
   echo "Activated virtual environment ${name}"
 }
 
-# Create a new virtual environment, with default name 'venv'.
+# Create a new virtual environment using the specified name.
+# If none specified, use $PYTHON_VENV_NAME
 function mkv() {
-  local name="${1:-venv}"
+  local name="${1:-$PYTHON_VENV_NAME}"
   local venvpath="${name:P}"
 
   python3 -m venv "${name}" || return
   echo >&2 "Created venv in '${venvpath}'"
   vrun "${name}"
 }
+
+if [[ "$PYTHON_AUTO_VRUN" == "true" ]]; then
+  # Automatically activate venv when changing dir
+  function auto_vrun() {
+    # deactivate if we're on a different dir than VIRTUAL_ENV states
+    # we don't deactivate subdirectories!
+    if (( $+functions[deactivate] )) && [[ $PWD != ${VIRTUAL_ENV:h}* ]]; then
+      deactivate > /dev/null 2>&1
+    fi
+
+    if [[ $PWD != ${VIRTUAL_ENV:h} ]]; then
+      local file
+      for file in "${^PYTHON_VENV_NAMES[@]}"/bin/activate(N.); do
+        # make sure we're not in a venv already
+        (( $+functions[deactivate] )) && deactivate > /dev/null 2>&1
+        source $file > /dev/null 2>&1
+        break
+      done
+    fi
+  }
+  add-zsh-hook chpwd auto_vrun
+  auto_vrun
+fi
diff --git a/zsh/plugins/qodana/README.md b/zsh/plugins/qodana/README.md
new file mode 100644
index 0000000..0b68bde
--- /dev/null
+++ b/zsh/plugins/qodana/README.md
@@ -0,0 +1,20 @@
+# JetBrains Qodana CLI plugin
+
+This plugin adds completion for the [JetBrains Qodana CLI](https://github.com/JetBrains/qodana-cli).
+
+To use it, add `qodana` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... qodana)
+```
+
+This plugin does not add any aliases.
+
+## Cache
+
+This plugin caches the completion script and is automatically updated when the
+plugin is loaded, which is usually when you start up a new terminal emulator.
+
+The cache is stored at:
+
+- `$ZSH_CACHE_DIR/completions/_qodana` completions script
diff --git a/zsh/plugins/qodana/qodana.plugin.zsh b/zsh/plugins/qodana/qodana.plugin.zsh
new file mode 100644
index 0000000..2b92a80
--- /dev/null
+++ b/zsh/plugins/qodana/qodana.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the JetBrains Qodana CLI (qodana).
+if (( ! $+commands[qodana] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `qodana`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_qodana" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _qodana
+  _comps[qodana]=_qodana
+fi
+
+qodana completion zsh >| "$ZSH_CACHE_DIR/completions/_qodana" &|
diff --git a/zsh/plugins/qrcode/README.md b/zsh/plugins/qrcode/README.md
new file mode 100644
index 0000000..4428389
--- /dev/null
+++ b/zsh/plugins/qrcode/README.md
@@ -0,0 +1,8 @@
+# QRCode plugin
+
+Generate a QR Code from the command line. Uses [QRcode.show](https://qrcode.show) via curl.
+
+alias           | command
+--------------- | --------
+`qrcode [text]` | `curl -d "text" qrcode.show`
+`qrsvg  [text]` | `curl -d "text" qrcode.show -H "Accept: image/svg+xml"`
diff --git a/zsh/plugins/qrcode/qrcode.plugin.zsh b/zsh/plugins/qrcode/qrcode.plugin.zsh
new file mode 100644
index 0000000..d757e13
--- /dev/null
+++ b/zsh/plugins/qrcode/qrcode.plugin.zsh
@@ -0,0 +1,17 @@
+# Imported and improved from https://qrcode.show/, section SHELL FUNCTIONS
+
+_qrcode_show_message() {
+  echo "Type or paste your text, add a new blank line, and press ^d"
+}
+
+qrcode () {
+  local input="$*"
+  [ -z "$input" ] && _qrcode_show_message && local input="@/dev/stdin"
+  curl -d "$input" https://qrcode.show
+}
+
+qrsvg () {
+  local input="$*"
+  [ -z "$input" ] && _qrcode_show_message && local input="@/dev/stdin"
+  curl -d "$input" https://qrcode.show -H "Accept: image/svg+xml"
+}
diff --git a/zsh/plugins/rails/README.md b/zsh/plugins/rails/README.md
index fa66750..c0c37ff 100644
--- a/zsh/plugins/rails/README.md
+++ b/zsh/plugins/rails/README.md
@@ -40,13 +40,17 @@ plugins=(... rails)
 | `rn`    | `rails notes`                    | Search for notes (`FIXME`, `TODO`) in code comments    |
 | `rp`    | `rails plugin`                   | Run a Rails plugin command                             |
 | `rr`    | `rails routes`                   | List all defined routes                                |
-| `rrg`   | `rails routes \| grep`           | List and filter the defined routes                     |
+| `rrc`   | `rails routes --controller`      | List and filter routes mapped to specific controller   |
+| `rre`   | `rails routes --expanded`        | List all defined routes in expanded table mode         |
+| `rrg`   | `rails routes --grep`            | List and filter the defined routes                     |
+| `rru`   | `rails routes --unused`          | List unused routes                                     |
 | `rs`    | `rails server`                   | Launch a web server                                    |
 | `rsb`   | `rails server --bind`            | Launch a web server binding it to a specific IP        |
 | `rsd`   | `rails server --debugger`        | Launch a web server with debugger                      |
 | `rsp`   | `rails server --port`            | Launch a web server and specify the listening port     |
 | `rsts`  | `rails stats`                    | Print code statistics                                  |
 | `rt`    | `rails test`                     | Run Rails tests                                        |
+| `rta`   | `rails test:all`                 | Runs all Rails tests, including system tests           |
 | `ru`    | `rails runner`                   | Run Ruby code in the context of Rails                  |
 
 ### Foreman
diff --git a/zsh/plugins/rails/_rails b/zsh/plugins/rails/_rails
index 6dc85d4..dbd843c 100644
--- a/zsh/plugins/rails/_rails
+++ b/zsh/plugins/rails/_rails
@@ -1,6 +1,6 @@
 #compdef rails
 # ------------------------------------------------------------------------------
-# Copyright (c) 2016 Github zsh-users - http://github.com/zsh-users
+# Copyright (c) 2016 GitHub zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
@@ -28,136 +28,494 @@
 # Description
 # -----------
 #
-#  Completion script for Ruby on Rails (http://rubyonrails.org/).
+#  Completion script for Ruby on Rails 7.1.0 (https://rubyonrails.org/).
 #
 # ------------------------------------------------------------------------------
 # Authors
 # -------
 #
 #  * Kazuya Takeshima (https://github.com/mitukiii)
+#  * Shohei Yoshida (https://github.com/syohex)
 #
 # ------------------------------------------------------------------------------
 
-
 _rails() {
-  local context state line curcontext="$curcontext"
+  local context state state_descr line curcontext="$curcontext"
+  typeset -A opt_args
 
-  if (( CURRENT > 2 )); then
-    (( CURRENT-- ))
-    shift words
-    _call_function - "_rails_${words[1]}" || _nothing
-  else
-    __rails_commands
-  fi
-}
-
-__rails_commands() {
-  local context state line curcontext="$curcontext"
-
-  local -a rails_options
-  __rails_setup_rails_options
-
-  _arguments -C \
-    $rails_options \
-    ': :->command'
-
-  case "$state" in
-    command)
-      local -a commands
-      local application_directory
-      __rails_setup_application_directory
-
-      if [ -n "$application_directory" ]; then
-        commands=(
-          {generate,g}'[Generate new code]'
-          {console,c}'[Start the Rails console]'
-          {server,s}'[Start the Rails server]'
-          {dbconsole,db}'[Start a console for the database specified in config/database.yml]'
-          application'[Generate the Rails application code]'
-          {destroy,d}'[Undo code generated with "generate"]'
-          benchmarker'[See how fast a piece of code runs]'
-          profiler'[Get profile information from a piece of code]'
-          plugin'[Install a plugin]'
-          {runner,r}'[Run a piece of code in the application environment]'
-          {test,t}'[Run tests]'
-        )
-      else
-        commands=(
-          new'[Create a new Rails application]'
-        )
-      fi
-
-      _values 'command' $commands
-      ;;
-  esac
-}
-
-__rails_setup_application_directory() {
-  application_directory="$(pwd)"
-
-  while [ -n "$application_directory" ]; do
-    if [ -f "${application_directory}/script/rails" -o -f "${application_directory}/bin/rails" ]; then
-      return
-    fi
-    application_directory="${application_directory%/*}"
-  done
-
-  application_directory=
-}
-
-__rails_setup_rails_options() {
-  rails_options=(
-    {-h,--help}'[Show this help message and quit]'
-    {-v,--version}'[Show Rails version number and quit]'
+  local -a runtime_options rails_options
+  runtime_options=(
+    '(- *)'{-h,--help}'[Show this help message and quit]'
+    '(- *)'{-v,--version}'[Show Rails version and quit]'
   )
-}
 
-__rails_setup_runtime_options() {
   runtime_options=(
     '(-f --force)'{-f,--force}'[Overwrite files that already exist]'
     '(-p --pretend)'{-p,--pretend}'[Run but do not make any changes]'
     '(-q --quiet)'{-q,--quiet}'[Suppress status output]'
     '(-s --skip)'{-s,--skip}'[Skip files that already exist]'
   )
+
+  local ret=1
+
+  _arguments -C \
+    $rails_options \
+    '1: :_rails_subcommands' \
+    '*:: :->command' && ret=0
+
+  case "$state" in
+    (command)
+      case $words[1] in
+        (new)
+          _rails_new && ret=0
+          ;;
+        (generate|g|destroy|d)
+          _rails_generate && ret=0
+          ;;
+        (console|c)
+          _arguments \
+            '(- *)'{-h,--help}'[Show this help message and quit]' \
+            '(-e --environment)'{-e,--environment=}'[The environment to run "console" in]:env:(test development production)' \
+            '(-s --sandbox)'{-s,--sandbox}'[Rollback database modifications on exit]' \
+            && ret=0
+          ;;
+        (server|s)
+          _arguments \
+            '(- *)'{-h,--help}'[Show this help message and quit]' \
+            '(-e --environment)'{-e,--environment=}'[The environment to run "server" in]:env:(test development production)' \
+            '(-p --port)'{-p,--port}'[Run Rails on the specified port]:port' \
+            '(-b --binding)'{-b,--binding=}'[Bind Rails to the specified IP]:binding' \
+            '(-c --config)'{-c,--config=}'[Use a custom rackup configuration]:config file:_files -g "*.ru"' \
+            '(-d --daemon)'{-d,--daemon}'[Run server as a Daemon]' \
+            '(-u --using)'{-u,--using=}'[Specify the Rack server used to run the application]:server:(thin puma webrick)' \
+            '(-P --pid)'{-P,--pid=}'[Specify the PID file]:pid file:_files -g "*.pid"' \
+            '(-C --dev-caching --no-dev-caching)'{-C,--dev-caching}'[Perform caching in development]' \
+            '(-C --dev-caching --no-dev-caching)--no-dev-caching[Not perform caching in development]' \
+            '--early-hints[Enable HTTP/2 early hints]' \
+            '(--log-to-stdout --no-log-to-stdout)--log-to-stdout[Log to stdout]' \
+            '(--log-to-stdout --no-log-to-stdout)--no-log-to-stdout[Not log to stdout]' \
+            && ret=0
+          ;;
+        (dbconsole|db)
+          _arguments \
+            '(- *)'{-h,--help}'[Show this help message and quit]' \
+            '(-e --environment)'{-e,--environment=}'[The environment to run "server" in]:env:(test development production)' \
+            '(-p --include-password)'{-p,--include-password}'[Automatically provide the password from database.yml]' \
+            '--mode=[Automatically put the sqlite3 database in the specified mode]:mode:(html list line column)' \
+            '(--header --no-header)--header[Display header]' \
+            '(--header --no-header)--no-header[Not display header]' \
+            '(--db --database)'{--db=,--database=}'[Specify the database to use]:database:_files' \
+            && ret=0
+          ;;
+        (test|t|test:system)
+          _arguments \
+            '(- *)'{-h,--help}'[Show this help message and quit]' \
+            '--no-plugins[Bypass minitest plugin auto-loading]' \
+            '(-s --seed)'{-s,--seed=}'[Sets random seed]:seed' \
+            '(-v -verbose)'{-v,--verbose}'[Show progress processing files]' \
+            '--show-skips[Show skipped at the end of run]' \
+            \*{-n,--name=}'[Filter run on /regexp/ or string]:pattern' \
+            *--exclude='[Exclude /regexp/ or string from run]:pattern' \
+            \*{-S,--skip=}'[Skip reporting of certain types of results]' \
+            '(-w --warnings)'{-w,--warnings}'[Run with Ruby warnings enabled]' \
+            '(-e --environment)'{-e,--environment=}'[Run tests in the given environment]' \
+            '(-b --backtrace)'{-b,--backtrace}'[Show the complete backtrace]' \
+            '(-d --defer-output)'{-d,--defer-output}'[Output test failures and errors after the test run]' \
+            '(-f --fail-fast)'{-f,--fail-fast}'[Abort test run on first failure or error]' \
+            '(-c --color --no-color)'{-c,--color}'[Enable color in the output]' \
+            '(-c --color --no-color)--no-color[Disable color in the output]' \
+            '--profile=[Enable profiling of tests and list the slowest test cases]:count' \
+            '(-p --pride)'{-p,--pride}'[Show your testing pride]' \
+            '*:: :_files -g "*.rb"' \
+            && ret=0
+          ;;
+        (runner|r)
+          _arguments \
+            '(- *)'{-h,--help}'[Show this help message and quit]' \
+            '(-e --environment)'{-e,--environment=}'[The environment to run "runner"]:env:(test development production)' \
+            '*:: :_files -g "*.rb"' \
+            && ret=0
+          ;;
+        (plugin)
+          _arguments \
+            '1: :(new)' \
+            '*:: :_rails_new' \
+            && ret=0
+          ;;
+        (routes)
+          _arguments \
+            '(- *)'{-h,--help}'[Show this help message and quit]' \
+            '(-c --controller)'{-c,--controller=}'[Filter by a specific controller]:controller' \
+            '(-g --grep)'{-g,--grep}'[Grep routes by a specific pattern]' \
+            '(-E --expanded)'{-E,--expanded}'[Print routes expanded vertically with parts explained]' \
+            '(-u --unused)'{-u,--unused}'[Print unused routes]' \
+            && ret=0
+          ;;
+        (*)
+          _arguments \
+            '(- *)'{-h,--help}'[Show help message and quit]' \
+            '*:: :_files' \
+            && ret=0
+          ;;
+      esac
+      ;;
+  esac
+
+  return ret
 }
 
-__rails_setup_generators_options() {
-  local -a runtime_options
-  __rails_setup_runtime_options
+(( $+functions[_rails_subcommands] )) ||
+_rails_subcommands() {
+  local -a commands
 
-  generators_options=(
-    $runtime_options
-    --skip-namespace'[Skip namespace (affects only isolated applications)]'
-    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]"
+  _rails_is_in_app
+
+  if (( $? == 1 )); then
+    # is not in rails app directory
+    commands=(
+      new'[Create a new Rails application]'
+    )
+  else
+    commands=(
+      {generate,g}'[Generate new code]'
+      {console,c}'[Start the Rails console]'
+      {server,s}'[Start the Rails server]'
+      {test,t}'[Run tests]'
+      "test\\:system[Run systems test only]"
+      {dbconsole,db}'[Start a console for the database specified in config/database.yml]'
+      plugin'[Install a plugin]'
+
+      # generated by ./bin/rails --help | ruby -ne '(b=$2;printf("%s[%s]\n", $1.gsub(/:/,"\\:"),b.strip)) if /^([a-z0-9_:]+)\S*\s+([^(\n]+)/'
+      "about[List versions of all Rails frameworks and the environment]"
+      "action_mailbox\:ingress\:exim[Relay an inbound email from Exim to Action Mailbox]"
+      "action_mailbox\:ingress\:postfix[Relay an inbound email from Postfix to Action Mailbox]"
+      "action_mailbox\:ingress\:qmail[Relay an inbound email from Qmail to Action Mailbox]"
+      "action_mailbox\:install[Install Action Mailbox and its dependencies]"
+      "action_mailbox\:install\:migrations[Copy migrations from action_mailbox to application]"
+      "action_text\:install[Copy over the migration, stylesheet, and JavaScript files]"
+      "action_text\:install\:migrations[Copy migrations from action_text to application]"
+      "active_storage\:install[Copy over the migration needed to the application]"
+      "app\:template[Apply the template supplied by LOCATION=]"
+      "app\:update[Update configs and some other initially generated files]"
+      "assets\:clean[Remove old compiled assets]"
+      "assets\:clobber[Remove compiled assets]"
+      "assets\:environment[Load asset compile environment]"
+      "assets\:precompile[Compile all the assets named in config.assets.precompile]"
+      "cache_digests\:dependencies[Lookup first-level dependencies for TEMPLATE]"
+      "cache_digests\:nested_dependencies[Lookup nested dependencies for TEMPLATE]"
+      "credentials\:diff[Enroll/disenroll in decrypted diffs of credentials using git]"
+      "credentials\:edit[Open the decrypted credentials in $VISUAL or $EDITOR for editing]"
+      "credentials\:show[Show the decrypted credentials]"
+      "db\:create[Create the database from DATABASE_URL or config/database.yml for the current RAILS_ENV]"
+      "db\:drop[Drop the database from DATABASE_URL or config/database.yml for the current RAILS_ENV]"
+      "db\:encryption\:init[Generate a set of keys for configuring Active Record encryption in a given environment]"
+      "db\:environment\:set[Set the environment value for the database]"
+      "db\:fixtures\:load[Load fixtures into the current environment's database]"
+      "db\:migrate[Migrate the database]"
+      "db\:migrate\:down[Run the 'down' for a given migration VERSION]"
+      "db\:migrate\:redo[Roll back the database one migration and re-migrate up]"
+      "db\:migrate\:status[Display status of migrations]"
+      "db\:migrate\:up[Run the 'up' for a given migration VERSION]"
+      "db\:prepare[Run setup if database does not exist, or run migrations if it does]"
+      "db\:reset[Drop and recreate all databases from their schema for the current environment and load the seeds]"
+      "db\:rollback[Roll the schema back to the previous version]"
+      "db\:schema\:cache\:clear[Clear a db/schema_cache.yml file]"
+      "db\:schema\:cache\:dump[Create a db/schema_cache.yml file]"
+      "db\:schema\:dump[Create a database schema file]"
+      "db\:schema\:load[Load a database schema file]"
+      "db\:seed[Load the seed data from db/seeds.rb]"
+      "db\:seed\:replant[Truncate tables of each database for current environment and load the seeds]"
+      "db\:setup[Create all databases, load all schemas, and initialize with the seed data]"
+      "db\:system\:change[Change 'config/database.yml' and your database gem to the target database]"
+      "db\:version[Retrieve the current schema version number]"
+      "destroy[Remove code generated by 'bin/rails generate']"
+      "dev\:cache[Toggle development mode caching on/off]"
+      "encrypted\:edit[Open the decrypted file in $VISUAL or $EDITOR for editing]"
+      "encrypted\:show[Show the decrypted contents of the file]"
+      "importmap\:install[Setup Importmap for the app]"
+      "initializers[Print out all defined initializers in the order they are invoked by Rails.]"
+      "log\:clear[Truncate all/specified *.log files in log/ to zero bytes]"
+      "middleware[Print out your Rack middleware stack]"
+      "notes[Show comments in your code annotated with FIXME, OPTIMIZE, and TODO]"
+      "restart[Restart app by touching tmp/restart.txt]"
+      "routes[List all the defined routes]"
+      "runner[Run Ruby code in the context of your application]"
+      "secret[Generate a cryptographically secure secret key]"
+      "secrets\:edit[**deprecated** Open the secrets in $VISUAL or $EDITOR for editing]"
+      "secrets\:show[**deprecated** Show the decrypted secrets]"
+      "stats[Report code statistics]"
+      "stimulus\:install[Install Stimulus into the app]"
+      "stimulus\:install\:importmap[Install Stimulus on an app running importmap-rails]"
+      "stimulus\:install\:node[Install Stimulus on an app running node]"
+      "test\:all[Run all tests, including system tests]"
+      "test\:channels[Run tests in test/channels]"
+      "test\:controllers[Run tests in test/controllers]"
+      "test\:db[Reset the database and run 'bin/rails test']"
+      "test\:functionals[Run tests in test/controllers, test/mailers, and test/functional]"
+      "test\:generators[Run tests in test/lib/generators]"
+      "test\:helpers[Run tests in test/helpers]"
+      "test\:integration[Run tests in test/integration]"
+      "test\:jobs[Run tests in test/jobs]"
+      "test\:mailboxes[Run tests in test/mailboxes]"
+      "test\:mailers[Run tests in test/mailers]"
+      "test\:models[Run tests in test/models]"
+      "test\:units[Run tests in test/models, test/helpers, and test/unit]"
+      "time\:zones[List all time zones, list by two-letter country code]"
+      "tmp\:clear[Clear cache, socket and screenshot files from tmp/]"
+      "tmp\:create[Create tmp directories for cache, sockets, and pids]"
+      "turbo\:install[Install Turbo into the app]"
+      "turbo\:install\:importmap[Install Turbo into the app with asset pipeline]"
+      "turbo\:install\:node[Install Turbo into the app with webpacker]"
+      "turbo\:install\:redis[Switch on Redis and use it in development]"
+      "version[Show the Rails version]"
+      "yarn\:install[Install all JavaScript dependencies as specified via Yarn]"
+      "zeitwerk\:check[Check project structure for Zeitwerk compatibility]"
+    )
+  fi
+
+  _values 'command' $commands
+}
+
+# rails new
+(( $+functions[_rails_new] )) ||
+_rails_new() {
+  local ret=1
+
+  _arguments \
+    $runtime_options \
+    $rails_options \
+    --skip-namespace'[Skip namespace]' \
+    '(-n --name)'{-n,--name=}'[Name of the app]:name' \
+    '(-r --ruby)'{-r,--ruby=}'[Path to the Ruby binary of your choice]:path:_files' \
+    '(-b --builder)'{-b,--builder=}'[Path to a application builder(can be a filesystem path or URL)]: :_rails_path_or_url' \
+    '(-m --template)'{-m,--template=}'[Path to an application template(can be a filesystem path or URL)]: :_rails_path_or_url' \
+    '(-d --database)'{-d,--database=}'[Preconfigure for selected database]:database:(mysql trilogy oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc)' \
+    --skip-gemfile"[Don't create a Gemfile]" \
+    --skip-bundle"[Don't run bundle install]" \
+    '(-G --skip-git)'{-G,--skip-git}'[Skip git init]' \
+    --skip-docker'[Skip Dockerfile]' \
+    --skip-keeps'[Skip source control .keep files]' \
+    '(-M --skip-action-mailer)'{-M,--skip-action-mailer}'[Skip Action Mailer files]' \
+    --skip-action-mailbox'[Skip Action Mailbox gem]' \
+    --skip-action-text'[Skip Action Text gem]' \
+    '(-O --skip-active-record)'{-O,--skip-active-record}'[Skip Active Record files]' \
+    --skip-active-job'[Skip Active Job]' \
+    --skip-active-storage'[Skip Active Storage files]' \
+    '(-C --skip-action-cable)'{-C,--skip-action-cable}'[Skip Action Cable files]' \
+    '(-A --skip-asset-pipeline)'{-A,--skip-asset-pipeline}'[Skip asset pipeline]' \
+    '(-a --asset-pipeline)'{-a,--asset-pipeline=}'[Choose your asset pipeline]:asset pipeline:(sprockets propshaft)' \
+    '(-J --skip-js)'{-J,--skip-js}'[Skip JavaScript files]' \
+    --skip-hotwire'[Skip Hotwire integration]' \
+    --skip-jbuilder'[Skip jbuilder gem]' \
+    '(-T --skip-test)'{-T,--skip-test}'[Skip test files]' \
+    --skip-system-test'[Skip system test files]' \
+    --skip-bootsnap'[Skip bootsnap gem]' \
+    --skip-dev-gems'[Skip development gems(e.g. web-console)]' \
+    --dev'[Setup the application with Gemfile pointing to your Rails checkout]' \
+    --edge'[Setup the application with Gemfile pointing to Rails repository]' \
+    --master'[Set up the application with Gemfile pointing to Rails repository main branch]' \
+    --rc='[Path to file containing extra configuration options for rails command]:rc:_files' \
+    --api'[Preconfigure smaller stack for API only apps]' \
+    --minimal'[Preconfigure a minimal rails app]' \
+    '(-j --js)'{-j,--js=}'[Choose JavaScript approach]:javascript:(importmap bun webpack esbuild rollup)' \
+    '(-c --css)'{-c,--css=}'[Choose CSS processor]:css processor:(tailwind bootstrap bulma postcss sass)' \
+    '(-B --skip-bundle)'{-B,--skip-bundle}"[Don't run bundle install]" \
+    --skip-decrypted-diffs"[Don't configure git to show decrypted diffs of encrypted credentials]" \
+    ':app path:_directories' && ret=0
+
+  return ret
+}
+
+# rails generate
+(( $+functions[_rails_generate] )) ||
+_rails_generate() {
+  local ret=1
+
+  _arguments -C \
+    '(- *)'{-h,--help}"[Print generator's options and usage]" \
+    $runtime_options \
+    '1:generator:_rails_generate_generator' \
+    '*:: :->generate' && ret=0
+
+  case "$state" in
+    (generate)
+      local -a opts
+      opts=(
+        '(- *)'{-h,--help}'[Show this help message and quit]'
+        $runtime_options
+        '--skip-namespace[Skip namespace]'
+        '--skip-collision-check[Skip collision check]'
+      )
+
+      case $words[1] in
+        (application_record|migration|model|resource|scaffold|scaffold_controller)
+          opts+=(
+            '(-o --orm)'{-o,--orm=}'[ORM to be invoked]:orm:(active_record)'
+          )
+          ;|
+        (channel)
+          opts+=(
+            '--no-assets[Not generate assets]'
+          )
+          ;|
+        (controller|resource|scaffold|scaffold_controller)
+          opts+=(
+            '--skip-routes[Do not add routes to config/routes.rb]'
+            '--no-helper[Not generate helper]'
+          )
+          ;|
+        (controller|job|model|resource|scaffold)
+          opts+=(
+            '--parent=[The parent class for the generated controller]:parent class'
+          )
+          ;|
+        (controller|mailer|resource|scaffold|scaffold_controller)
+          opts+=(
+            '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:engine:(erb)'
+          )
+          ;|
+        (channel|controller|generator|helper|job|mailbox|mailer|model|scaffold|scaffold_controller)
+          opts+=(
+            '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test_framework:(test_unit)'
+          )
+          ;|
+        (generator|test_unit:channel)
+          opts+=(
+            '--no-namespace[Not generate namespace generate]'
+          )
+          ;|
+        (integration_test)
+          opts+=(
+            '--integration-tool=[Integration tool to be invoked]:tool:(test_unit)'
+          )
+          ;|
+        (jbuilder|resource|scaffold|scaffold_controller)
+          opts+=(
+            '--model-name=[ModelName to be used]:name'
+          )
+          ;|
+        (jbuilder|model|resource|scaffold|scaffold_controller)
+          opts+=(
+            '--force-plural[Do not singularize the model name]'
+          )
+          ;|
+        (jbuilder|migration|model|resource|scaffold_controller)
+          opts+=(
+            '--no-timestamps[Not generate timestamps]'
+          )
+          ;|
+        (job)
+          opts+=(
+            '--queue=[The queue name for the generated job]:name'
+          )
+          ;|
+        (migration|model|resource|scaffold)
+          opts+=(
+            '--primary-key-type=[The type for primary key]'
+            '(--db --database)'{--db,--database=}'[The database for your migration]:db'
+          )
+          ;|
+        (model|resource|scaffold)
+          opts+=(
+            '--no-migration[Not generate migration]'
+            '--no-indexes[Not add indexes for references and belongs_to columns]'
+            '--no-fixture[Not generate fixture]'
+            '(-r --fixture-replacement)'{-r,--fixture-replacement=}'[Fixture replacement to be invoked]:fixture'
+          )
+          ;|
+        (resource)
+          opts+=(
+            '(-c --resource-controller)'{-c,--resource-controller=}'[Resource controller to be invoked]:controller:(controller)'
+            '(-a --actions)'{-a,--actions=}'[Actions for the source controller]:action'
+          )
+          ;|
+        (resource|scaffold|scaffold_controller)
+          opts+=(
+            '--no-resource-route[Not generate resource route]'
+          )
+          ;|
+        (scaffold)
+          opts+=(
+            '(-c --scaffold-controller)'{-c,--scaffold-controller=}'[Scaffold controller to be invoked]:controller:(scaffold_controller)'
+
+          )
+          ;|
+        (scaffold|scaffold_controller)
+          opts+=(
+            '--api[Generate API-only controller and tests, with no view templates]'
+            '--no-jbuilder[Not generate jbuilder]'
+          )
+          ;|
+        (scaffold|scaffold_controller|system_test)
+          opts+=(
+            '--system-tests=[System test framework to be invoked]:framework:(test_unit)'
+          )
+          ;|
+        (stimulus)
+          opts+=(
+            '--skip-manifest[Do not update the stimulus manifest]'
+          )
+          ;|
+        (jbuilder|migration|resource|scaffold)
+          opts+=(
+            '*:field:_rails_migration_fields'
+          )
+          ;|
+      esac
+
+      _arguments $opts && ret=0
+      ;;
+  esac
+
+  return ret
+}
+
+(( $+functions[_rails_generate_generator] )) ||
+_rails_generate_generator() {
+  local -a generators=(
+    # rails
+    application_record benchmark channel controller generator helper integration_test
+    jbuilder job mailbox mailer migration model resource scaffold scaffold_controller
+    system_test task
+
+    # active record
+    "active_record\\:application_record"
+    "active_record\\:multi_db"
+
+    # Stimulus
+    stimulus
+
+    # TestUnit
+    "test_unit\\:channel" "test_unit\\:generator" "test_unit\\:install"
+    "test_unit\\:mailbox" "test_unit\\:plugin"
   )
+
+  _values 'generators' $generators
 }
 
-__rails_setup_model_generators_options() {
-  local -a generators_options
-  __rails_setup_generators_options
+# Utilities
+(( $+functions[_rails_is_in_app] )) ||
+_rails_is_in_app() {
+  local dir="$PWD"
+  while [ -n "$dir" ]; do
+    if [[ -f "${dir}/bin/rails" ]]; then
+      return 0
+    fi
+    dir="${dir/*}"
+  done
 
-  model_generators_options=(
-    $generators_options
-    '(-o --orm)'{-o,--orm=}'[Orm to be invoked]:orm'
-  )
+  return 1
 }
 
-__rails_setup_resource_generators_options() {
-  local -a model_generators_options
-  __rails_setup_model_generators_options
-
-  resource_generators_options=(
-    $model_generators_options
-    --force-plural'[Forces the use of a plural ModelName]'
-    --resource-route'[Indicates when to generate resource route]: :__rails_boolean'
-  )
+(( $+functions[_rails_path_or_url] )) ||
+_rails_path_or_url() {
+  _alternative \
+    'files:path:_files -g "*.rb"' \
+    'url:url:_urls'
 }
 
-__rails_boolean() {
-  _values 'boolean' 'true' 'false'
-}
-
-__rails_migration_fields() {
+(( $+functions[_rails_migration_fields] )) ||
+_rails_migration_fields() {
   if compset -P '*:*:'; then
     _values 'index' 'index' 'uniq'
   else
@@ -169,450 +527,6 @@ __rails_migration_fields() {
   fi
 }
 
-_rails_generate() {
-  local context state line curcontext="$curcontext"
-
-  if (( CURRENT > 2 )); then
-    (( CURRENT-- ))
-    shift words
-    _call_function - "_rails_generate_${words[1]}" || _rails_generate_default
-  else
-    __rails_generate_commands
-  fi
-}
-
-_rails_g() {
-  _rails_generate
-}
-
-__rails_generate_commands() {
-  local context curcontext="$curcontext" update_policy
-
-  zstyle -s ":completion:${curcontext}:" cache-policy update_policy
-  if [ -z "$update_policy" ]; then
-    zstyle ":completion:${curcontext}:" cache-policy _rails_generate_commands_caching_policy
-  fi
-
-  local application_directory
-  __rails_setup_application_directory
-  local cache_name
-  cache_name="rails/${application_directory##*/}/all_generators"
-  if ! _retrieve_cache ${cache_name}; then
-    local -a all_generators
-    all_generators=($(_call_program rails_generators rails generate 2> /dev/null | awk '/^  [a-zA-Z_]+/{ print $1 }'))
-    _store_cache ${cache_name} all_generators
-  fi
-
-  local -a rails_generators
-  rails_generators=(${all_generators:#*:*})
-  _describe -t rails_generators 'rails generator' rails_generators
-
-  local -a -U namespaces
-  local namespace
-  local -a generators
-  namespaces=(${(R)${(M)all_generators:#*:*}%:*})
-  for namespace in $namespaces; do
-    generators=(${${(M)all_generators:#${namespace}:*}/:/\\:})
-    _describe -t ${namespace}_generators "${namespace/_/ } generator" generators
-  done
-}
-
-_rails_generate_commands_caching_policy() {
-  local application_directory
-  __rails_setup_application_directory
-
-  if [ "${application_directory}/Gemfile" -nt "$1" ]; then
-    return 0
-  fi
-
-  local -a oldp
-  oldp=( "$1"(Nmw+1) )
-  (( $#oldp ))
-}
-
-_rails_generate_default() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    '*:argument'
-}
-
-_rails_generate_assets() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    '(-j --javascripts)'{-j,--javascripts}'[Generate JavaScripts]: :__rails_boolean' \
-    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
-    '(-je --javascript-engine)'{-je,--javascript-engine=}'[Engine for JavaScripts]:javascript engine' \
-    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
-    ': :_guard "^-*" "name"'
-}
-
-_rails_generate_controller() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
-    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
-    --helper'[Indicates when to generate helper]: :__rails_boolean' \
-    --assets'[Indicates when to generate assets]: :__rails_boolean' \
-    ': :_guard "^-*" "name"' \
-    '*: :_guard "^-*" "action"'
-}
-
-_rails_generate_generator() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    --namespace'[Namespace generator under lib/generators/name]: :__rails_boolean' \
-    ': :_guard "^-*" "name"'
-}
-
-_rails_generate_helper() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
-    ': :_guard "^-*" "name"' \
-}
-
-_rails_generate_integration_test() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    --integration-tool='[Integration tool to be invoke]:integration tool' \
-    ': :_guard "^-*" "name"' \
-}
-
-_rails_generate_jbuilder() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    ': :_guard "^-*" "name"' \
-    '*: :__rails_migration_fields'
-}
-
-_rails_generate_mailer() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
-    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
-    ': :_guard "^-*" "name"' \
-    '*: :_guard "^-*" "method"'
-}
-
-_rails_generate_migration() {
-  local -a modelgenerators_options
-  __rails_setup_model_generators_options
-
-  _arguments \
-    $model_generators_options \
-    ': :_guard "^-*" "name"' \
-    '*: :__rails_migration_fields'
-}
-
-_rails_generate_model() {
-  _rails_generate_migration
-}
-
-_rails_generate_observer() {
-  local -a model_generators_options
-  __rails_setup_model_generators_options
-
-  _arguments \
-    $model_generators_options \
-    ': :_guard "^-*" "name"'
-}
-
-_rails_generate_performance_test() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    --performance-tool='[Performance tool to be invoked]:performance tool' \
-    ': :_guard "^-*" "name"' \
-}
-
-_rails_generate_resource() {
-  local context state line curcontext="$curcontext"
-
-  local -a resource_generators_options
-  __rails_setup_resource_generators_options
-
-  _arguments -C \
-    $resource_generators_options \
-    '(-c --resource-controller)'{-c,--resource-controller=}'[Resource controller to be invoked]:name' \
-    '(-a --actions)'{-a,--actions=}'[Actions for the resource controller]: :->actions' \
-    ': :->name' \
-    '*: :->fields'
-
-  if (( words[(I)(--actions=*|-a)] > 0 && words[(I)(--actions=*|-a)] == words[(I)-*] )); then
-    state=actions
-  fi
-
-  case "$state" in
-    actions)
-      _guard "[[:alnum:]_]#" "actions"
-      ;;
-    name)
-      _guard "^-*" "name"
-      ;;
-    fields)
-      __rails_migration_fields
-      ;;
-  esac
-}
-
-_rails_generate_scaffold() {
-  local -a resource_generators_options
-  __rails_setup_resource_generators_options
-
-  _arguments \
-    $resource_generators_options \
-    '(-y --stylesheets)'{-y,--stylesheets}'[Generate Stylesheets]: :__rails_boolean' \
-    '(-se --stylesheet-engine)'{-se,--stylesheet-engine=}'[Engine for Stylesheets]:stylesheet engine' \
-    '(-c --scaffold-controller)'{-c,--scaffold-controller=}'[Scaffold controller to be invoked]:name' \
-    --assets'[Indicates when to generate assets]:boolean:(true false)' \
-    ': :_guard "^-*" "name"' \
-    '*: :__rails_migration_fields'
-}
-
-_rails_generate_scaffold_controller() {
-  local -a model_generators_options
-  __rails_setup_model_generators_options
-
-  _arguments \
-    $model_generators_options \
-    '(-e --template-engine)'{-e,--template-engine=}'[Template engine to be invoked]:template engine' \
-    '(-t --test-framework)'{-t,--test-framework=}'[Test framework to be invoked]:test framework' \
-      --helper'[Indicates when to generate helper]: :__rails_boolean' \
-    ': :_guard "^-*" "name"'
-}
-
-_rails_generate_session_migration() {
-  local -a model_generators_options
-  __rails_setup_model_generators_options
-
-  _arguments \
-    $model_generators_options \
-    ': :_guard "^-*" "name"'
-}
-
-_rails_generate_task() {
-  local -a generators_options
-  __rails_setup_generators_options
-
-  _arguments \
-    $generators_options \
-    ': :_guard "^-*" "name"' \
-    '*: :_guard "^-*" "action"'
-}
-
-_rails_console() {
-  _arguments \
-    '(- *)'{-h,--help}'[Show this help message]' \
-    '(-s --sandbox)'{-s,--sandbox}'[Rollback database modifications on exit]' \
-    --debugger'[Enable ruby-debugging for the console]'
-}
-
-_rails_c() {
-  _rails_console
-}
-
-_rails_server() {
-  _arguments \
-    '(- *)'{-h,--help}'[Show this help message]' \
-    '(-p --port)'{-p,--port=}'[Runs Rails on the specified port]: :_guard "[[\:digit\:]]#" "port"' \
-    '(-b --binding)'{-b,--binding=}'[Binds Rails to the specified ip]:ip:_hosts' \
-    '(-c --config)'{-c,--config=}'[Use custom rackup configuration file]:file:_files -g "*.ru"' \
-    '(-d --daemon)'{-d,--daemon}'[Make server run as a Daemon]' \
-    '(-u --debugger)'{-u,--debugger}'[Enable ruby-debugging for the server]' \
-    '(-e --environment)'{-e,--environment=}'[Specifies the environment to run this server under (test/development/production)]:name:(test development production)' \
-    '(-P --pid)'{-P,--pid=}'[Specifies the PID file]:pid:_files -g "*.pid"'
-}
-
-_rails_s() {
-  _rails_server
-}
-
-_rails_dbconsole() {
-  _arguments \
-    '(- *)'--help'[Show this help message]' \
-    '(-p --include-password)'{-p,--include-password}'[Automatically provide the password from database.yml]' \
-    --mode'[Automatically put the sqlite3 database in the specified mode (html, list, line, column)]:mode:(html list line column)' \
-    --header
-}
-
-_rails_new() {
-  local context state line curcontext="$curcontext"
-
-  local _a rails_options runtime_options
-  __rails_setup_rails_options
-  __rails_setup_runtime_options
-
-  _arguments -C \
-    $rails_options \
-    $runtime_options \
-    '(-r --ruby)'{-r,--ruby=}'[Path to the Ruby binary of your choice]:path' \
-    '(-b --builder)'{-b,--builder=}'[Path to a application builder (can be a filesystem path or URL)]: :->path_or_url' \
-    '(-m --template)'{-m,--template=}'[Path to an application template (can be a filesystem path or URL)]: :->path_or_url' \
-    --skip-gemfile"[Don't create a Gemfile]" \
-    --skip-bundle"[Don't run bundle install]" \
-    '(-G --skip-git)'{-G,--skip-git}'[Skip Git ignores and keeps]' \
-    '(-O --skip-active-record)'{-O,--skip-active-record}'[Skip Active Record files]' \
-    '(-S --skip-sprockets)'{-S,--skip-sprockets}'[Skip Sprockets files]' \
-    '(-d --database)'{-d,--database=}'[Preconfigure for selected database]:database:(mysql oracle postgresql sqlite3 frontbase ibm_db sqlserver jdbcmysql jdbcsqlite3 jdbcpostgresql jdbc)' \
-    '(-j --javascript)'{-j,--javascript=}'[Preconfigure for selected JavaScript library]:javascript' \
-    '(-J --skip-javascript)'{-J,--skip-javascript}'[Skip JavaScript files]' \
-    --dev'[Setup the application with Gemfile pointing to your Rails checkout]' \
-    --edge'[Setup the application with Gemfile pointing to Rails repository]' \
-    '(-T --skip-test-unit)'{-T,--skip-test-unit}'[Skip Test::Unit files]' \
-    --old-style-hash"[Force using old style hash (:foo => 'bar') on Ruby >= 1.9]" \
-    ':app path:_directories'
-
-  case "$state" in
-    path_or_url)
-      _alternative \
-        'files:path:_files -g "*.rb"' \
-        'url:url:_urls'
-      ;;
-  esac
-}
-
-_rails_application() {
-  _rails_new
-}
-
-_rails_db() {
-  _rails_dbconsole
-}
-
-_rails_destroy() {
-  _rails_generate
-}
-
-_rails_d() {
-  _rails_destroy
-}
-
-_rails_benchmarker() {
-  _arguments \
-    '(- *)'{-h,--help}'[Show this help message]' \
-    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
-    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
-    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "wall_time" "memory" "objects" "gc_runs" "gc_time"' \
-    '*: :_guard "^-*" "ruby code"'
-}
-
-_rails_profiler() {
-  _arguments \
-    '(- *)'{-h,--help}'[Show this help message]' \
-    '(-r --runs)'{-r,--runs}'[Number of runs]: :_guard "[[\:digit\:]]#" "number"' \
-    '(-o --output)'{-o,--output}'[Directory to use when writing the results]:directory:_directories' \
-    '(-m --metrics)'{-m,--metrics}'[Metrics to use]: :_values -s "," "metrics" "process_time" "memory" "objects"' \
-    '(-f --formats)'{-f,--formats}'[Formats to output to]: :_values -s "," "formats" "flat" "graph" "html" "call_tree" "call_stack"' \
-    '*: :_guard "^-*" "ruby code"'
-}
-
-_rails_plugin() {
-  local context state line curcontext="$curcontext"
-
-  if (( CURRENT > 2 )); then
-    (( CURRENT-- ))
-    shift words
-    _call_function - "_rails_plugin_${words[1]}" || _nothing
-  else
-    __rails_plugin_commands
-  fi
-}
-
-__rails_plugin_commands() {
-  _values 'plugin command' \
-    install'[Install plugin(s) from known repositories or URLs]' \
-    remove'[Uninstall plugins]' \
-    new
-}
-
-_rails_plugin_install() {
-  _arguments \
-    '(-x --externals)'{-x,--externals}'[Use svn:externals to grab the plugin. Enables plugin updates and plugin versioning]' \
-    '(-o --checkout)'{-o,--checkout}'[Use svn checkout to grab the plugin. Enables updating but does not add a svn:externals entry]' \
-    '(-e --export)'{-e,--export}'[Use svn export to grab the plugin. Exports the plugin, allowing you to check it into your local repository. Does not enable updates or add an svn:externals entry]' \
-    '(-q --quiet)'{-q,--quiet}'[Suppresses the output from installation. Ignored if -v is passed (rails plugin -v install ...)]' \
-    '(-r --revision)'{-r,--revision=}'[Checks out the given revision from subversion or git. Ignored if subversion/git is not used]:revision' \
-    '(-f --force)'{-f,--force}"[Reinstalls a plugin if it's already installed]" \
-    '*:plugin:_urls'
-}
-
-_rails_plugin_remove() {
-  local -a plugins
-
-  plugins=($(_call_program rails_plugins ls -1 vendor/plugins))
-
-  _describe -t plugins 'plugin' plugins
-}
-
-_rails_plugin_new() {
-  _rails_new
-}
-
-_rails_runner() {
-  local context state line curcontext="$curcontext"
-
-  _arguments -C \
-    '(- *)'{-h,--help}'[Show this help message]' \
-    '(-e --environment)'{-e,--environment=}'[Specifies the environment for the runner to operate under (test/development/production)]:name:(test development production)' \
-    ': :->code_or_path'
-
-  case "$state" in
-    code_or_path)
-      _alternative \
-        'files:filename:_files -g "*.rb"' \
-        'codes:ruby code:_guard "^-*" "ruby code"'
-      ;;
-  esac
-}
-
-_rails_r() {
-  _rails_runner
-}
-
-_rails_test() {
-  local context state line curcontext="$curcontext"
-
-  _arguments -C \
-    ': :->path'
-
-  case "$state" in
-    path)
-      _alternative \
-        'files:filename:_files -g "*.rb"'
-      ;;
-  esac
-}
-
-_rails_t() {
-  _rails_test
-}
-
 _rails "$@"
 
 # Local Variables:
diff --git a/zsh/plugins/rails/rails.plugin.zsh b/zsh/plugins/rails/rails.plugin.zsh
index b11cbb5..75dd9b0 100644
--- a/zsh/plugins/rails/rails.plugin.zsh
+++ b/zsh/plugins/rails/rails.plugin.zsh
@@ -68,13 +68,17 @@ alias rmd='rails middleware'
 alias rn='rails notes'
 alias rp='rails plugin'
 alias rr='rails routes'
-alias rrg='rails routes | grep'
+alias rrc='rails routes --controller'
+alias rre='rails routes --expanded'
+alias rrg='rails routes --grep'
+alias rru='rails routes --unused'
 alias rs='rails server'
 alias rsb='rails server --bind'
 alias rsd='rails server --debugger'
 alias rsp='rails server --port'
 alias rsts='rails stats'
 alias rt='rails test'
+alias rta='rails test:all'
 alias ru='rails runner'
 
 # Foreman aliases
diff --git a/zsh/plugins/rake-fast/rake-fast.plugin.zsh b/zsh/plugins/rake-fast/rake-fast.plugin.zsh
index 19dab15..082f02f 100644
--- a/zsh/plugins/rake-fast/rake-fast.plugin.zsh
+++ b/zsh/plugins/rake-fast/rake-fast.plugin.zsh
@@ -1,5 +1,28 @@
+# The version of the format of .rake_tasks. If the output of _rake_generate
+# changes, incrementing this number will force it to regenerate
+_rake_tasks_version=2
+
 _rake_does_task_list_need_generating () {
-  [[ ! -f .rake_tasks ]] || [[ Rakefile -nt .rake_tasks ]] || { _is_rails_app && _tasks_changed }
+  _rake_tasks_missing || _rake_tasks_version_changed || _rakefile_has_changes || { _is_rails_app && _tasks_changed }
+}
+
+_rake_tasks_missing () {
+  [[ ! -f .rake_tasks ]]
+}
+
+_rake_tasks_version_changed () {
+  local -a file_version
+  file_version=`head -n 1 .rake_tasks | sed "s/^version\://"`
+
+  if ! [[ $file_version =~ '^[0-9]*$' ]]; then
+    return true
+  fi
+
+  [[ $file_version -ne $_rake_tasks_version ]]
+}
+
+_rakefile_has_changes () {
+  [[ Rakefile -nt .rake_tasks ]]
 }
 
 _is_rails_app () {
@@ -20,7 +43,17 @@ _tasks_changed () {
 }
 
 _rake_generate () {
-  rake --silent --tasks | cut -d " " -f 2 | sed 's/\[.*\]//g' > .rake_tasks
+  local rake_tasks_content="version:$_rake_tasks_version\n"
+  rake_tasks_content+=$(rake --silent --tasks --all \
+    | sed "s/^rake //" | sed "s/\:/\\\:/g" \
+    | sed "s/\[[^]]*\]//g" \
+    | sed "s/ *# /\:/" \
+    | sed "s/\:$//")
+
+  local rake_tasks_file="$(mktemp -t .rake_tasks.XXXXXX)"
+  echo $rake_tasks_content > $rake_tasks_file
+
+  mv $rake_tasks_file .rake_tasks
 }
 
 _rake () {
@@ -29,7 +62,10 @@ _rake () {
       echo "\nGenerating .rake_tasks..." >&2
       _rake_generate
     fi
-    compadd $(cat .rake_tasks)
+    local -a rake_options
+    rake_options=("${(@f)$(cat .rake_tasks)}")
+    shift rake_options
+    _describe 'rake tasks' rake_options
   fi
 }
 compdef _rake rake
diff --git a/zsh/plugins/rand-quote/rand-quote.plugin.zsh b/zsh/plugins/rand-quote/rand-quote.plugin.zsh
index 23c21dc..1eda54c 100644
--- a/zsh/plugins/rand-quote/rand-quote.plugin.zsh
+++ b/zsh/plugins/rand-quote/rand-quote.plugin.zsh
@@ -8,7 +8,7 @@ function quote {
 
   # Get random quote data
   local data
-  data="$(command curl -s --connect-timeout 2 "http://www.quotationspage.com/random.php" \
+  data="$(command curl -s --connect-timeout 2 "https://www.quotationspage.com/random.php" \
     | iconv -c -f ISO-8859-1 -t UTF-8 \
     | command grep -a -m 1 'dt class="quote"')"
 
diff --git a/zsh/plugins/rbfu/README.md b/zsh/plugins/rbfu/README.md
deleted file mode 100644
index fbcab64..0000000
--- a/zsh/plugins/rbfu/README.md
+++ /dev/null
@@ -1,18 +0,0 @@
-# rbfu plugin
-
-This plugin starts [rbfu](https://github.com/hmans/rbfu), a minimal Ruby version
-manager, and adds some useful functions.
-
-To use it, add `rbfu` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... rbfu)
-```
-
-**Note: `rbfu` is deprecated and should no longer be used.**
-
-## Functions
-
-- `rbfu-rubies`: lists all installed rubies available to rbfu.
-
-- `rvm_prompt_info`: shows the Ruby version being used with rbfu.
diff --git a/zsh/plugins/rbfu/rbfu.plugin.zsh b/zsh/plugins/rbfu/rbfu.plugin.zsh
deleted file mode 100644
index 27dc3ee..0000000
--- a/zsh/plugins/rbfu/rbfu.plugin.zsh
+++ /dev/null
@@ -1,49 +0,0 @@
-# Enables rbfu with --auto option, if available.
-#
-# Also provides a command to list all installed/available
-# rubies. To ensure compatibility with themes, creates the
-# rvm_prompt_info function to return the $RBFU_RUBY_VERSION
-# version.
-
-command -v rbfu &>/dev/null || return
-
-eval "$(rbfu --init --auto)"
-
-# Internal: Print ruby version details, if it's currently active, etc.
-function _rbfu_rubies_print() {
-  # 1: path to ruby file
-  # 2: active ruby
-  local rb rb_out
-  rb="${$1:t}"
-  rb_out="$rb"
-
-  # If the ruby is a symlink, add @ to the name.
-  if [[ -h "$1" ]]; then
-    rb_out="${rb_out}${fg[green]}@${reset_color}"
-  fi
-
-  # If the ruby is active, add * to the name and show it in red.
-  if [[ "$rb" = "$2" ]]; then
-    rb_out="${fg[red]}${rb_out} ${fg[red]}*${reset_color}"
-  fi
-
-  echo $rb_out
-}
-
-# Public: Provide a list with all available rubies, this basically depends
-# on ~/.rfbu/rubies. Highlights the currently active ruby version and aliases.
-function rbfu-rubies() {
-  local rbfu_dir active_rb
-  rbfu_dir="${RBFU_RUBIES:-${HOME}/.rbfu/rubies}"
-  active_rb="${RBFU_RUBY_VERSION:-system}"
-
-  _rbfu_rubies_print "${rbfu_dir}/system" "$active_rb"
-  for rb in ${rbfu_dir}/*(N); do
-    _rbfu_rubies_print "$rb" "$active_rb"
-  done
-}
-
-# Public: Create rvm_prompt_info command for themes compatibility, unless
-# it has already been defined.
-(( ${+functions[rvm_prompt_info]} )) || \
-function rvm_prompt_info() { echo "${${RBFU_RUBY_VERSION:=system}:gs/%/%%}" }
diff --git a/zsh/plugins/rbw/rbw.plugin.zsh b/zsh/plugins/rbw/rbw.plugin.zsh
index b6cecf8..0b55e6e 100644
--- a/zsh/plugins/rbw/rbw.plugin.zsh
+++ b/zsh/plugins/rbw/rbw.plugin.zsh
@@ -29,9 +29,24 @@ function rbwpw {
     echo "$service not found"
     return 1
   fi
+
+  # Generate a random identifier for this call to rbwpw
+  # so we can check if the clipboard content has changed
+  local _random="$RANDOM" _cache="$ZSH_CACHE_DIR/.rbwpw"
+  echo -n "$_random" > "$_cache"
+
+  # Use clipcopy to copy the password to the clipboard
   echo -n $pw | clipcopy
   echo "password for $service copied!"
-  {sleep 20 && clipcopy </dev/null 2>/dev/null} &|
+
+  # Clear the clipboard after 20 seconds, but only if the clipboard hasn't
+  # changed (if rbwpw hasn't been called again)
+  {
+    sleep 20 \
+    && [[ "$(<"$_cache")" == "$_random" ]] \
+    && clipcopy </dev/null 2>/dev/null \
+    && command rm -f "$_cache" &>/dev/null
+  } &|
 }
 
 function _rbwpw {
diff --git a/zsh/plugins/rclone/README.md b/zsh/plugins/rclone/README.md
new file mode 100644
index 0000000..aa2ced9
--- /dev/null
+++ b/zsh/plugins/rclone/README.md
@@ -0,0 +1,9 @@
+# Rclone plugin
+
+This plugin adds completion for [Rclone](https://rclone.org/), the command-line program to manage files on cloud storage.
+
+To use it, add `rclone` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... rclone)
+```
diff --git a/zsh/plugins/rclone/rclone.plugin.zsh b/zsh/plugins/rclone/rclone.plugin.zsh
new file mode 100644
index 0000000..a667613
--- /dev/null
+++ b/zsh/plugins/rclone/rclone.plugin.zsh
@@ -0,0 +1,14 @@
+# Completion
+if (( ! $+commands[rclone] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `rclone`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_rclone" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _rclone
+  _comps[rclone]=_rclone
+fi
+
+rclone completion zsh - >| "$ZSH_CACHE_DIR/completions/_rclone" &|
diff --git a/zsh/plugins/react-native/README.md b/zsh/plugins/react-native/README.md
index 807c063..39eed6c 100644
--- a/zsh/plugins/react-native/README.md
+++ b/zsh/plugins/react-native/README.md
@@ -54,6 +54,10 @@ plugins=(... react-native)
 | **rnios14pl**   | `react-native run-ios --simulator "iPhone 14 Plus"`                        |
 | **rnios14p**    | `react-native run-ios --simulator "iPhone 14 Pro"`                         |
 | **rnios14pm**   | `react-native run-ios --simulator "iPhone 14 Pro Max"`                     |
+| **rnios15**     | `react-native run-ios --simulator "iPhone 15"`                             |
+| **rnios15pl**   | `react-native run-ios --simulator "iPhone 15 Plus"`                        |
+| **rnios15p**    | `react-native run-ios --simulator "iPhone 15 Pro"`                         |
+| **rnios15pm**   | `react-native run-ios --simulator "iPhone 15 Pro Max"`                     |
 | _iPad_          |                                                                            |
 | **rnipad2**     | `react-native run-ios --simulator "iPad 2"`                                |
 | **rnipad5**     | `react-native run-ios --simulator "iPad (5th generation)"`                 |
diff --git a/zsh/plugins/react-native/react-native.plugin.zsh b/zsh/plugins/react-native/react-native.plugin.zsh
index afeaab4..9ee0812 100644
--- a/zsh/plugins/react-native/react-native.plugin.zsh
+++ b/zsh/plugins/react-native/react-native.plugin.zsh
@@ -39,6 +39,10 @@ alias rnios14='react-native run-ios --simulator "iPhone 14"'
 alias rnios14pl='react-native run-ios --simulator "iPhone 14 Plus"'
 alias rnios14p='react-native run-ios --simulator "iPhone 14 Pro"'
 alias rnios14pm='react-native run-ios --simulator "iPhone 14 Pro Max"'
+alias rnios15='react-native run-ios --simulator "iPhone 15"'
+alias rnios15pl='react-native run-ios --simulator "iPhone 15 Plus"'
+alias rnios15p='react-native run-ios --simulator "iPhone 15 Pro"'
+alias rnios15pm='react-native run-ios --simulator "iPhone 15 Pro Max"'
 
 # iPad
 alias rnipad2='react-native run-ios --simulator "iPad 2"'
diff --git a/zsh/plugins/repo/_repo b/zsh/plugins/repo/_repo
index 2b1f165..c7a1eb1 100644
--- a/zsh/plugins/repo/_repo
+++ b/zsh/plugins/repo/_repo
@@ -131,6 +131,8 @@ _repo()
                      "(--autosquash)--no-ff[Pass --autosquash to git rebase]"\
                      "(--whitespace=)--whitespace=[Pass --whitespace to git rebase]: :__git_apply_whitespace_strategies"\
                      "(--auto-stash)--auto-stash[Stash local modifications before starting]"\
+                     "(--update-refs)--update-refs[Automatically force-update any branches that point to commits that are being rebased.]"\
+                     "(--no-update-refs)--no-update-refs[Turn off the automatic force-update of any branches that point to commits that are being rebased.]"\
                      && ret=0
           ;;
         (checkout)
diff --git a/zsh/plugins/ripgrep/README.md b/zsh/plugins/ripgrep/README.md
deleted file mode 100644
index ab9d041..0000000
--- a/zsh/plugins/ripgrep/README.md
+++ /dev/null
@@ -1,9 +0,0 @@
-# ripgrep
-
-This plugin adds completion for the text search tool [`ripgrep`](https://github.com/BurntSushi/ripgrep), also known as `rg`.
-
-To use it, add `ripgrep` to the plugins array in your zshrc file:
-
-```zsh
-plugins=(... ripgrep)
-```
diff --git a/zsh/plugins/ripgrep/_ripgrep b/zsh/plugins/ripgrep/_ripgrep
deleted file mode 100644
index 31bc697..0000000
--- a/zsh/plugins/ripgrep/_ripgrep
+++ /dev/null
@@ -1,640 +0,0 @@
-#compdef rg
-
-##
-# zsh completion function for ripgrep
-#
-# Run ci/test-complete after building to ensure that the options supported by
-# this function stay in synch with the `rg` binary.
-#
-# For convenience, a completion reference guide is included at the bottom of
-# this file.
-#
-# Originally based on code from the zsh-users project — see copyright notice
-# below.
-
-_rg() {
-  local curcontext=$curcontext no='!' descr ret=1
-  local -a context line state state_descr args tmp suf
-  local -A opt_args
-
-  # ripgrep has many options which negate the effect of a more common one — for
-  # example, `--no-column` to negate `--column`, and `--messages` to negate
-  # `--no-messages`. There are so many of these, and they're so infrequently
-  # used, that some users will probably find it irritating if they're completed
-  # indiscriminately, so let's not do that unless either the current prefix
-  # matches one of those negation options or the user has the `complete-all`
-  # style set. Note that this prefix check has to be updated manually to account
-  # for all of the potential negation options listed below!
-  if
-    # We also want to list all of these options during testing
-    [[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] ||
-    # (--[imnp]* => --ignore*, --messages, --no-*, --pcre2-unicode)
-    [[ $PREFIX$SUFFIX == --[imnp]* ]] ||
-    zstyle -t ":complete:$curcontext:*" complete-all
-  then
-    no=
-  fi
-
-  # We make heavy use of argument groups here to prevent the option specs from
-  # growing unwieldy. These aren't supported in zsh <5.4, though, so we'll strip
-  # them out below if necessary. This makes the exclusions inaccurate on those
-  # older versions, but oh well — it's not that big a deal
-  args=(
-    + '(exclusive)' # Misc. fully exclusive options
-    '(: * -)'{-h,--help}'[display help information]'
-    '(: * -)'{-V,--version}'[display version information]'
-    '(: * -)'--pcre2-version'[print the version of PCRE2 used by ripgrep, if available]'
-
-    + '(buffered)' # buffering options
-    '--line-buffered[force line buffering]'
-    $no"--no-line-buffered[don't force line buffering]"
-    '--block-buffered[force block buffering]'
-    $no"--no-block-buffered[don't force block buffering]"
-
-    + '(case)' # Case-sensitivity options
-    {-i,--ignore-case}'[search case-insensitively]'
-    {-s,--case-sensitive}'[search case-sensitively]'
-    {-S,--smart-case}'[search case-insensitively if pattern is all lowercase]'
-
-    + '(context-a)' # Context (after) options
-    '(context-c)'{-A+,--after-context=}'[specify lines to show after each match]:number of lines'
-
-    + '(context-b)' # Context (before) options
-    '(context-c)'{-B+,--before-context=}'[specify lines to show before each match]:number of lines'
-
-    + '(context-c)' # Context (combined) options
-    '(context-a context-b)'{-C+,--context=}'[specify lines to show before and after each match]:number of lines'
-
-    + '(column)' # Column options
-    '--column[show column numbers for matches]'
-    $no"--no-column[don't show column numbers for matches]"
-
-    + '(count)' # Counting options
-    {-c,--count}'[only show count of matching lines for each file]'
-    '--count-matches[only show count of individual matches for each file]'
-    '--include-zero[include files with zero matches in summary]'
-
-    + '(encoding)' # Encoding options
-    {-E+,--encoding=}'[specify text encoding of files to search]: :_rg_encodings'
-    $no'--no-encoding[use default text encoding]'
-
-    + '(engine)' # Engine choice options
-    '--engine=[select which regex engine to use]:when:((
-      default\:"use default engine"
-      pcre2\:"identical to --pcre2"
-      auto\:"identical to --auto-hybrid-regex"
-    ))'
-
-    + file # File-input options
-    '(1)*'{-f+,--file=}'[specify file containing patterns to search for]: :_files'
-
-    + '(file-match)' # Files with/without match options
-    '(stats)'{-l,--files-with-matches}'[only show names of files with matches]'
-    '(stats)--files-without-match[only show names of files without matches]'
-
-    + '(file-name)' # File-name options
-    {-H,--with-filename}'[show file name for matches]'
-    {-I,--no-filename}"[don't show file name for matches]"
-
-    + '(file-system)' # File system options
-    "--one-file-system[don't descend into directories on other file systems]"
-    $no'--no-one-file-system[descend into directories on other file systems]'
-
-    + '(fixed)' # Fixed-string options
-    {-F,--fixed-strings}'[treat pattern as literal string instead of regular expression]'
-    $no"--no-fixed-strings[don't treat pattern as literal string]"
-
-    + '(follow)' # Symlink-following options
-    {-L,--follow}'[follow symlinks]'
-    $no"--no-follow[don't follow symlinks]"
-
-    + glob # File-glob options
-    '*'{-g+,--glob=}'[include/exclude files matching specified glob]:glob'
-    '*--iglob=[include/exclude files matching specified case-insensitive glob]:glob'
-
-    + '(glob-case-insensitive)' # File-glob case sensitivity options
-    '--glob-case-insensitive[treat -g/--glob patterns case insensitively]'
-    $no'--no-glob-case-insensitive[treat -g/--glob patterns case sensitively]'
-
-    + '(heading)' # Heading options
-    '(pretty-vimgrep)--heading[show matches grouped by file name]'
-    "(pretty-vimgrep)--no-heading[don't show matches grouped by file name]"
-
-    + '(hidden)' # Hidden-file options
-    {-.,--hidden}'[search hidden files and directories]'
-    $no"--no-hidden[don't search hidden files and directories]"
-
-    + '(hybrid)' # hybrid regex options
-    '--auto-hybrid-regex[dynamically use PCRE2 if necessary]'
-    $no"--no-auto-hybrid-regex[don't dynamically use PCRE2 if necessary]"
-
-    + '(ignore)' # Ignore-file options
-    "(--no-ignore-global --no-ignore-parent --no-ignore-vcs --no-ignore-dot)--no-ignore[don't respect ignore files]"
-    $no'(--ignore-global --ignore-parent --ignore-vcs --ignore-dot)--ignore[respect ignore files]'
-
-    + '(ignore-file-case-insensitive)' # Ignore-file case sensitivity options
-    '--ignore-file-case-insensitive[process ignore files case insensitively]'
-    $no'--no-ignore-file-case-insensitive[process ignore files case sensitively]'
-
-    + '(ignore-exclude)' # Local exclude (ignore)-file options
-    "--no-ignore-exclude[don't respect local exclude (ignore) files]"
-    $no'--ignore-exclude[respect local exclude (ignore) files]'
-
-    + '(ignore-global)' # Global ignore-file options
-    "--no-ignore-global[don't respect global ignore files]"
-    $no'--ignore-global[respect global ignore files]'
-
-    + '(ignore-parent)' # Parent ignore-file options
-    "--no-ignore-parent[don't respect ignore files in parent directories]"
-    $no'--ignore-parent[respect ignore files in parent directories]'
-
-    + '(ignore-vcs)' # VCS ignore-file options
-    "--no-ignore-vcs[don't respect version control ignore files]"
-    $no'--ignore-vcs[respect version control ignore files]'
-
-    + '(require-git)' # git specific settings
-    "--no-require-git[don't require git repository to respect gitignore rules]"
-    $no'--require-git[require git repository to respect gitignore rules]'
-
-    + '(ignore-dot)' # .ignore options
-    "--no-ignore-dot[don't respect .ignore files]"
-    $no'--ignore-dot[respect .ignore files]'
-
-    + '(ignore-files)' # custom global ignore file options
-    "--no-ignore-files[don't respect --ignore-file flags]"
-    $no'--ignore-files[respect --ignore-file files]'
-
-    + '(json)' # JSON options
-    '--json[output results in JSON Lines format]'
-    $no"--no-json[don't output results in JSON Lines format]"
-
-    + '(line-number)' # Line-number options
-    {-n,--line-number}'[show line numbers for matches]'
-    {-N,--no-line-number}"[don't show line numbers for matches]"
-
-    + '(line-terminator)' # Line-terminator options
-    '--crlf[use CRLF as line terminator]'
-    $no"--no-crlf[don't use CRLF as line terminator]"
-    '(text)--null-data[use NUL as line terminator]'
-
-    + '(max-columns-preview)' # max column preview options
-    '--max-columns-preview[show preview for long lines (with -M)]'
-    $no"--no-max-columns-preview[don't show preview for long lines (with -M)]"
-
-    + '(max-depth)' # Directory-depth options
-    '--max-depth=[specify max number of directories to descend]:number of directories'
-    '!--maxdepth=:number of directories'
-
-    + '(messages)' # Error-message options
-    '(--no-ignore-messages)--no-messages[suppress some error messages]'
-    $no"--messages[don't suppress error messages affected by --no-messages]"
-
-    + '(messages-ignore)' # Ignore-error message options
-    "--no-ignore-messages[don't show ignore-file parse error messages]"
-    $no'--ignore-messages[show ignore-file parse error messages]'
-
-    + '(mmap)' # mmap options
-    '--mmap[search using memory maps when possible]'
-    "--no-mmap[don't search using memory maps]"
-
-    + '(multiline)' # Multiline options
-    {-U,--multiline}'[permit matching across multiple lines]'
-    $no'(multiline-dotall)--no-multiline[restrict matches to at most one line each]'
-
-    + '(multiline-dotall)' # Multiline DOTALL options
-    '(--no-multiline)--multiline-dotall[allow "." to match newline (with -U)]'
-    $no"(--no-multiline)--no-multiline-dotall[don't allow \".\" to match newline (with -U)]"
-
-    + '(only)' # Only-match options
-    {-o,--only-matching}'[show only matching part of each line]'
-
-    + '(passthru)' # Pass-through options
-    '(--vimgrep)--passthru[show both matching and non-matching lines]'
-    '!(--vimgrep)--passthrough'
-
-    + '(pcre2)' # PCRE2 options
-    {-P,--pcre2}'[enable matching with PCRE2]'
-    $no'(pcre2-unicode)--no-pcre2[disable matching with PCRE2]'
-
-    + '(pcre2-unicode)' # PCRE2 Unicode options
-    $no'(--no-pcre2 --no-pcre2-unicode)--pcre2-unicode[enable PCRE2 Unicode mode (with -P)]'
-    '(--no-pcre2 --pcre2-unicode)--no-pcre2-unicode[disable PCRE2 Unicode mode (with -P)]'
-
-    + '(pre)' # Preprocessing options
-    '(-z --search-zip)--pre=[specify preprocessor utility]:preprocessor utility:_command_names -e'
-    $no'--no-pre[disable preprocessor utility]'
-
-    + pre-glob # Preprocessing glob options
-    '*--pre-glob[include/exclude files for preprocessing with --pre]'
-
-    + '(pretty-vimgrep)' # Pretty/vimgrep display options
-    '(heading)'{-p,--pretty}'[alias for --color=always --heading -n]'
-    '(heading passthru)--vimgrep[show results in vim-compatible format]'
-
-    + regexp # Explicit pattern options
-    '(1 file)*'{-e+,--regexp=}'[specify pattern]:pattern'
-
-    + '(replace)' # Replacement options
-    {-r+,--replace=}'[specify string used to replace matches]:replace string'
-
-    + '(sort)' # File-sorting options
-    '(threads)--sort=[sort results in ascending order (disables parallelism)]:sort method:((
-      none\:"no sorting"
-      path\:"sort by file path"
-      modified\:"sort by last modified time"
-      accessed\:"sort by last accessed time"
-      created\:"sort by creation time"
-    ))'
-    '(threads)--sortr=[sort results in descending order (disables parallelism)]:sort method:((
-      none\:"no sorting"
-      path\:"sort by file path"
-      modified\:"sort by last modified time"
-      accessed\:"sort by last accessed time"
-      created\:"sort by creation time"
-    ))'
-    '!(threads)--sort-files[sort results by file path (disables parallelism)]'
-
-    + '(stats)' # Statistics options
-    '(--files file-match)--stats[show search statistics]'
-    $no"--no-stats[don't show search statistics]"
-
-    + '(text)' # Binary-search options
-    {-a,--text}'[search binary files as if they were text]'
-    "--binary[search binary files, don't print binary data]"
-    $no"--no-binary[don't search binary files]"
-    $no"(--null-data)--no-text[don't search binary files as if they were text]"
-
-    + '(threads)' # Thread-count options
-    '(sort)'{-j+,--threads=}'[specify approximate number of threads to use]:number of threads'
-
-    + '(trim)' # Trim options
-    '--trim[trim any ASCII whitespace prefix from each line]'
-    $no"--no-trim[don't trim ASCII whitespace prefix from each line]"
-
-    + type # Type options
-    '*'{-t+,--type=}'[only search files matching specified type]: :_rg_types'
-    '*--type-add=[add new glob for specified file type]: :->typespec'
-    '*--type-clear=[clear globs previously defined for specified file type]: :_rg_types'
-    # This should actually be exclusive with everything but other type options
-    '(: *)--type-list[show all supported file types and their associated globs]'
-    '*'{-T+,--type-not=}"[don't search files matching specified file type]: :_rg_types"
-
-    + '(word-line)' # Whole-word/line match options
-    {-w,--word-regexp}'[only show matches surrounded by word boundaries]'
-    {-x,--line-regexp}'[only show matches surrounded by line boundaries]'
-
-    + '(unicode)' # Unicode options
-    $no'--unicode[enable Unicode mode]'
-    '--no-unicode[disable Unicode mode]'
-
-    + '(zip)' # Compression options
-    '(--pre)'{-z,--search-zip}'[search in compressed files]'
-    $no"--no-search-zip[don't search in compressed files]"
-
-    + misc # Other options — no need to separate these at the moment
-    '(-b --byte-offset)'{-b,--byte-offset}'[show 0-based byte offset for each matching line]'
-    '--color=[specify when to use colors in output]:when:((
-      never\:"never use colors"
-      auto\:"use colors or not based on stdout, TERM, etc."
-      always\:"always use colors"
-      ansi\:"always use ANSI colors (even on Windows)"
-    ))'
-    '*--colors=[specify color and style settings]: :->colorspec'
-    '--context-separator=[specify string used to separate non-continuous context lines in output]:separator'
-    $no"--no-context-separator[don't print context separators]"
-    '--debug[show debug messages]'
-    '--field-context-separator[set string to delimit fields in context lines]'
-    '--field-match-separator[set string to delimit fields in matching lines]'
-    '--trace[show more verbose debug messages]'
-    '--dfa-size-limit=[specify upper size limit of generated DFA]:DFA size (bytes)'
-    "(1 stats)--files[show each file that would be searched (but don't search)]"
-    '*--ignore-file=[specify additional ignore file]:ignore file:_files'
-    '(-v --invert-match)'{-v,--invert-match}'[invert matching]'
-    '(-M --max-columns)'{-M+,--max-columns=}'[specify max length of lines to print]:number of bytes'
-    '(-m --max-count)'{-m+,--max-count=}'[specify max number of matches per file]:number of matches'
-    '--max-filesize=[specify size above which files should be ignored]:file size (bytes)'
-    "--no-config[don't load configuration files]"
-    '(-0 --null)'{-0,--null}'[print NUL byte after file names]'
-    '--path-separator=[specify path separator to use when printing file names]:separator'
-    '(-q --quiet)'{-q,--quiet}'[suppress normal output]'
-    '--regex-size-limit=[specify upper size limit of compiled regex]:regex size (bytes)'
-    '*'{-u,--unrestricted}'[reduce level of "smart" searching]'
-
-    + operand # Operands
-    '(--files --type-list file regexp)1: :_guard "^-*" pattern'
-    '(--type-list)*: :_files'
-  )
-
-  # This is used with test-complete to verify that there are no options
-  # listed in the help output that aren't also defined here
-  [[ $_RG_COMPLETE_LIST_ARGS == (1|t*|y*) ]] && {
-    print -rl - $args
-    return 0
-  }
-
-  # Strip out argument groups where unsupported (see above)
-  [[ $ZSH_VERSION == (4|5.<0-3>)(.*)# ]] &&
-  args=( ${(@)args:#(#i)(+|[a-z0-9][a-z0-9_-]#|\([a-z0-9][a-z0-9_-]#\))} )
-
-  _arguments -C -s -S : $args && ret=0
-
-  case $state in
-    colorspec)
-      if [[ ${IPREFIX#--*=}$PREFIX == [^:]# ]]; then
-        suf=( -qS: )
-        tmp=(
-          'column:specify coloring for column numbers'
-          'line:specify coloring for line numbers'
-          'match:specify coloring for match text'
-          'path:specify coloring for file names'
-        )
-        descr='color/style type'
-      elif [[ ${IPREFIX#--*=}$PREFIX == (column|line|match|path):[^:]# ]]; then
-        suf=( -qS: )
-        tmp=(
-          'none:clear color/style for type'
-          'bg:specify background color'
-          'fg:specify foreground color'
-          'style:specify text style'
-        )
-        descr='color/style attribute'
-      elif [[ ${IPREFIX#--*=}$PREFIX == [^:]##:(bg|fg):[^:]# ]]; then
-        tmp=( black blue green red cyan magenta yellow white )
-        descr='color name or r,g,b'
-      elif [[ ${IPREFIX#--*=}$PREFIX == [^:]##:style:[^:]# ]]; then
-        tmp=( {,no}bold {,no}intense {,no}underline )
-        descr='style name'
-      else
-        _message -e colorspec 'no more arguments'
-      fi
-
-      (( $#tmp )) && {
-        compset -P '*:'
-        _describe -t colorspec $descr tmp $suf && ret=0
-      }
-      ;;
-
-    typespec)
-      if compset -P '[^:]##:include:'; then
-        _sequence -s , _rg_types && ret=0
-      # @todo This bit in particular could be better, but it's a little
-      # complex, and attempting to solve it seems to run us up against a crash
-      # bug — zsh # 40362
-      elif compset -P '[^:]##:'; then
-        _message 'glob or include directive' && ret=1
-      elif [[ ! -prefix *:* ]]; then
-        _rg_types -qS : && ret=0
-      fi
-      ;;
-  esac
-
-  return ret
-}
-
-# Complete encodings
-_rg_encodings() {
-  local -a expl
-  local -aU _encodings
-
-  # This is impossible to read, but these encodings rarely if ever change, so it
-  # probably doesn't matter. They are derived from the list given here:
-  # https://encoding.spec.whatwg.org/#concept-encoding-get
-  _encodings=(
-    {{,us-}ascii,arabic,chinese,cyrillic,greek{,8},hebrew,korean}
-    logical visual mac {,cs}macintosh x-mac-{cyrillic,roman,ukrainian}
-    866 ibm{819,866} csibm866
-    big5{,-hkscs} {cn-,cs}big5 x-x-big5
-    cp{819,866,125{0..8}} x-cp125{0..8}
-    csiso2022{jp,kr} csiso8859{6,8}{e,i}
-    csisolatin{{1..6},9} csisolatin{arabic,cyrillic,greek,hebrew}
-    ecma-{114,118} asmo-708 elot_928 sun_eu_greek
-    euc-{jp,kr} x-euc-jp cseuckr cseucpkdfmtjapanese
-    {,x-}gbk csiso58gb231280 gb18030 {,cs}gb2312 gb_2312{,-80} hz-gb-2312
-    iso-2022-{cn,cn-ext,jp,kr}
-    iso8859{,-}{{1..11},13,14,15}
-    iso-8859-{{1..11},{6,8}-{e,i},13,14,15,16} iso_8859-{{1..9},15}
-    iso_8859-{1,2,6,7}:1987 iso_8859-{3,4,5,8}:1988 iso_8859-9:1989
-    iso-ir-{58,100,101,109,110,126,127,138,144,148,149,157}
-    koi{,8,8-r,8-ru,8-u,8_r} cskoi8r
-    ks_c_5601-{1987,1989} ksc{,_}5691 csksc56011987
-    latin{1..6} l{{1..6},9}
-    shift{-,_}jis csshiftjis {,x-}sjis ms_kanji ms932
-    utf{,-}8 utf-16{,be,le} unicode-1-1-utf-8
-    windows-{31j,874,949,125{0..8}} dos-874 tis-620 ansi_x3.4-1968
-    x-user-defined auto none
-  )
-
-  _wanted encodings expl encoding compadd -a "$@" - _encodings
-}
-
-# Complete file types
-_rg_types() {
-  local -a expl
-  local -aU _types
-
-  _types=( ${(@)${(f)"$( _call_program types rg --type-list )"}%%:*} )
-
-  _wanted types expl 'file type' compadd -a "$@" - _types
-}
-
-_rg "$@"
-
-################################################################################
-# ZSH COMPLETION REFERENCE
-#
-# For the convenience of developers who aren't especially familiar with zsh
-# completion functions, a brief reference guide follows. This is in no way
-# comprehensive; it covers just enough of the basic structure, syntax, and
-# conventions to help someone make simple changes like adding new options. For
-# more complete documentation regarding zsh completion functions, please see the
-# following:
-#
-# * http://zsh.sourceforge.net/Doc/Release/Completion-System.html
-# * https://github.com/zsh-users/zsh/blob/master/Etc/completion-style-guide
-#
-# OVERVIEW
-#
-# Most zsh completion functions are defined in terms of `_arguments`, which is a
-# shell function that takes a series of argument specifications. The specs for
-# `rg` are stored in an array, which is common for more complex functions; the
-# elements of the array are passed to `_arguments` on invocation.
-#
-# ARGUMENT-SPECIFICATION SYNTAX
-#
-# The following is a contrived example of the argument specs for a simple tool:
-#
-#   '(: * -)'{-h,--help}'[display help information]'
-#   '(-q -v --quiet --verbose)'{-q,--quiet}'[decrease output verbosity]'
-#   '!(-q -v --quiet --verbose)--silent'
-#   '(-q -v --quiet --verbose)'{-v,--verbose}'[increase output verbosity]'
-#   '--color=[specify when to use colors]:when:(always never auto)'
-#   '*:example file:_files'
-#
-# Although there may appear to be six specs here, there are actually nine; we
-# use brace expansion to combine specs for options that go by multiple names,
-# like `-q` and `--quiet`. This is customary, and ties in with the fact that zsh
-# merges completion possibilities together when they have the same description.
-#
-# The first line defines the option `-h`/`--help`. With most tools, it isn't
-# useful to complete anything after `--help` because it effectively overrides
-# all others; the `(: * -)` at the beginning of the spec tells zsh not to
-# complete any other operands (`:` and `*`) or options (`-`) after this one has
-# been used. The `[...]` at the end associates a description with `-h`/`--help`;
-# as mentioned, zsh will see the identical descriptions and merge these options
-# together when offering completion possibilities.
-#
-# The next line defines `-q`/`--quiet`. Here we don't want to suppress further
-# completions entirely, but we don't want to offer `-q` if `--quiet` has been
-# given (since they do the same thing), nor do we want to offer `-v` (since it
-# doesn't make sense to be quiet and verbose at the same time). We don't need to
-# tell zsh not to offer `--quiet` a second time, since that's the default
-# behaviour, but since this line expands to two specs describing `-q` *and*
-# `--quiet` we do need to explicitly list all of them here.
-#
-# The next line defines a hidden option `--silent` — maybe it's a deprecated
-# synonym for `--quiet`. The leading `!` indicates that zsh shouldn't offer this
-# option during completion. The benefit of providing a spec for an option that
-# shouldn't be completed is that, if someone *does* use it, we can correctly
-# suppress completion of other options afterwards.
-#
-# The next line defines `-v`/`--verbose`; this works just like `-q`/`--quiet`.
-#
-# The next line defines `--color`. In this example, `--color` doesn't have a
-# corresponding short option, so we don't need to use brace expansion. Further,
-# there are no other options it's exclusive with (just itself), so we don't need
-# to define those at the beginning. However, it does take a mandatory argument.
-# The `=` at the end of `--color=` indicates that the argument may appear either
-# like `--color always` or like `--color=always`; this is how most GNU-style
-# command-line tools work. The corresponding short option would normally use `+`
-# — for example, `-c+` would allow either `-c always` or `-calways`. For this
-# option, the arguments are known ahead of time, so we can simply list them in
-# parentheses at the end (`when` is used as the description for the argument).
-#
-# The last line defines an operand (a non-option argument). In this example, the
-# operand can be used any number of times (the leading `*`), and it should be a
-# file path, so we tell zsh to call the `_files` function to complete it. The
-# `example file` in the middle is the description to use for this operand; we
-# could use a space instead to accept the default provided by `_files`.
-#
-# GROUPING ARGUMENT SPECIFICATIONS
-#
-# Newer versions of zsh support grouping argument specs together. All specs
-# following a `+` and then a group name are considered to be members of the
-# named group. Grouping is useful mostly for organisational purposes; it makes
-# the relationship between different options more obvious, and makes it easier
-# to specify exclusions.
-#
-# We could rewrite our example above using grouping as follows:
-#
-#   '(: * -)'{-h,--help}'[display help information]'
-#   '--color=[specify when to use colors]:when:(always never auto)'
-#   '*:example file:_files'
-#   + '(verbosity)'
-#   {-q,--quiet}'[decrease output verbosity]'
-#   '!--silent'
-#   {-v,--verbose}'[increase output verbosity]'
-#
-# Here we take advantage of a useful feature of spec grouping — when the group
-# name is surrounded by parentheses, as in `(verbosity)`, it tells zsh that all
-# of the options in that group are exclusive with each other. As a result, we
-# don't need to manually list out the exclusions at the beginning of each
-# option.
-#
-# Groups can also be referred to by name in other argument specs; for example:
-#
-#   '(xyz)--aaa' '*: :_files'
-#   + xyz --xxx --yyy --zzz
-#
-# Here we use the group name `xyz` to tell zsh that `--xxx`, `--yyy`, and
-# `--zzz` are not to be completed after `--aaa`. This makes the exclusion list
-# much more compact and reusable.
-#
-# CONVENTIONS
-#
-# zsh completion functions generally adhere to the following conventions:
-#
-# * Use two spaces for indentation
-# * Combine specs for options with different names using brace expansion
-# * In combined specs, list the short option first (as in `{-a,--text}`)
-# * Use `+` or `=` as described above for options that take arguments
-# * Provide a description for all options, option-arguments, and operands
-# * Capitalise/punctuate argument descriptions as phrases, not complete
-#   sentences — 'display help information', never 'Display help information.'
-#   (but still capitalise acronyms and proper names)
-# * Write argument descriptions as verb phrases — 'display x', 'enable y',
-#   'use z'
-# * Word descriptions to make it clear when an option expects an argument;
-#   usually this is done with the word 'specify', as in 'specify x' or
-#   'use specified x')
-# * Write argument descriptions as tersely as possible — for example, articles
-#   like 'a' and 'the' should be omitted unless it would be confusing
-#
-# Other conventions currently used by this function:
-#
-# * Order argument specs alphabetically by group name, then option name
-# * Group options that are directly related, mutually exclusive, or frequently
-#   referenced by other argument specs
-# * Use only characters in the set [a-z0-9_-] in group names
-# * Order exclusion lists as follows: short options, long options, groups
-# * Use American English in descriptions
-# * Use 'don't' in descriptions instead of 'do not'
-# * Word descriptions for related options as similarly as possible. For example,
-#   `--foo[enable foo]` and `--no-foo[disable foo]`, or `--foo[use foo]` and
-#   `--no-foo[don't use foo]`
-# * Word descriptions to make it clear when an option only makes sense with
-#   another option, usually by adding '(with -x)' to the end
-# * Don't quote strings or variables unnecessarily. When quotes are required,
-#   prefer single-quotes to double-quotes
-# * Prefix option specs with `$no` when the option serves only to negate the
-#   behaviour of another option that must be provided explicitly by the user.
-#   This prevents rarely used options from cluttering up the completion menu
-################################################################################
-
-# ------------------------------------------------------------------------------
-# Copyright (c) 2011 Github zsh-users - http://github.com/zsh-users
-# All rights reserved.
-#
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions are met:
-#     * Redistributions of source code must retain the above copyright
-#       notice, this list of conditions and the following disclaimer.
-#     * Redistributions in binary form must reproduce the above copyright
-#       notice, this list of conditions and the following disclaimer in the
-#       documentation and/or other materials provided with the distribution.
-#     * Neither the name of the zsh-users nor the
-#       names of its contributors may be used to endorse or promote products
-#       derived from this software without specific prior written permission.
-#
-# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-# DISCLAIMED. IN NO EVENT SHALL ZSH-USERS BE LIABLE FOR ANY
-# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
-# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-# ------------------------------------------------------------------------------
-# Description
-# -----------
-#
-#  Completion script for ripgrep
-#
-# ------------------------------------------------------------------------------
-# Authors
-# -------
-#
-#  * arcizan <ghostrevery@gmail.com>
-#  * MaskRay <i@maskray.me>
-#
-# ------------------------------------------------------------------------------
-
-# Local Variables:
-# mode: shell-script
-# coding: utf-8-unix
-# indent-tabs-mode: nil
-# sh-indentation: 2
-# sh-basic-offset: 2
-# End:
-# vim: ft=zsh sw=2 ts=2 et
diff --git a/zsh/plugins/ros/_ros b/zsh/plugins/ros/_ros
index 6a04d3c..c73a7b3 100644
--- a/zsh/plugins/ros/_ros
+++ b/zsh/plugins/ros/_ros
@@ -18,7 +18,7 @@ _1st_arguments=(
 'config:Get and set options'
 'version:Show the roswell version information'
 "help:Use \"ros help [command]\" for more information about a command."$'\n\t\t'"Use \"ros help [topic]\" for more information about the topic."
-) 
+)
 
 #local expl
 
diff --git a/zsh/plugins/rsync/README.md b/zsh/plugins/rsync/README.md
index 032ee7f..04d16c8 100644
--- a/zsh/plugins/rsync/README.md
+++ b/zsh/plugins/rsync/README.md
@@ -1,16 +1,26 @@
 # rsync
 
-This plugin adds aliases for frequent [rsync](https://rsync.samba.org/) commands.
+This plugin adds aliases for frequent [rsync](https://rsync.samba.org/) commands, simplifying file transfer and synchronization tasks.
 
-To use it add `rsync` to the plugins array in you zshrc file.
+To use it add `rsync` to the plugins array in you `.zshrc` file.
 
 ```zsh
 plugins=(... rsync)
 ```
 
-| Alias               | Command                                          |
-| ------------------- | ------------------------------------------------ |
-| *rsync-copy*        | `rsync -avz --progress -h`                       |
-| *rsync-move*        | `rsync -avz --progress -h --remove-source-files` |
-| *rsync-update*      | `rsync -avzu --progress -h`                      |
-| *rsync-synchronize* | `rsync -avzu --delete --progress -h`             |
+| Alias               | Command                                          | Description |
+| ------------------- | ------------------------------------------------ | ------------|
+| `rsync-copy`        | `rsync -avz --progress -h`                       | Recursively copy files and directories, preserving permissions, timestamps, and symbolic links. Compression is enabled for faster transfers. Progress is displayed in a human-readable format. | 
+| `rsync-move`        | `rsync -avz --progress -h --remove-source-files` | Same as rsync-copy, but removes the source files after a successful transfer (effectively performing a move). | 
+| `rsync-update`      | `rsync -avzu --progress -h`                      | Like rsync-copy, but only updates files if the source is newer than the destination (or if the destination file is missing). | 
+| `rsync-synchronize` | `rsync -avzu --delete --progress -h`             | Performs bidirectional-style sync: updates files as in rsync-update and deletes files in the destination that no longer exist in the source. Useful for directory synchronization. | 
+
+Explanation of Flags:
+ - -a: Archive mode; preserves symbolic links, permissions, timestamps, etc.
+ - -v: Verbose; shows details of the transfer process.
+ - -z: Compress file data during transfer for efficiency.
+ - -u: Skip files that are newer on the receiver.
+ - --progress: Show progress during file transfer.
+ - -h: Output numbers in human-readable format (e.g., 1K, 234M).
+ - --remove-source-files: Deletes source files after they are copied (used in rsync-move).
+ - --delete: Deletes files in the destination that are not present in the source (used in rsync-synchronize).
diff --git a/zsh/plugins/ruby/ruby.plugin.zsh b/zsh/plugins/ruby/ruby.plugin.zsh
index 4085121..e09b22c 100644
--- a/zsh/plugins/ruby/ruby.plugin.zsh
+++ b/zsh/plugins/ruby/ruby.plugin.zsh
@@ -23,4 +23,4 @@ alias gel="gem lock"
 alias geo="gem open"
 alias geoe="gem open -e"
 alias rrun="ruby -e"
-alias rserver="ruby -e httpd . -p 8080" # requires webrick
+alias rserver="ruby -run -e httpd . -p 8080" # requires webrick
diff --git a/zsh/plugins/rust/rust.plugin.zsh b/zsh/plugins/rust/rust.plugin.zsh
index 858f141..567cebc 100644
--- a/zsh/plugins/rust/rust.plugin.zsh
+++ b/zsh/plugins/rust/rust.plugin.zsh
@@ -22,5 +22,5 @@ fi
 rustup completions zsh >| "$ZSH_CACHE_DIR/completions/_rustup" &|
 cat >| "$ZSH_CACHE_DIR/completions/_cargo" <<'EOF'
 #compdef cargo
-source "$(rustc +${${(z)$(rustup default)}[1]} --print sysroot)"/share/zsh/site-functions/_cargo
+source "$(rustup run ${${(z)$(rustup default)}[1]} rustc --print sysroot)"/share/zsh/site-functions/_cargo
 EOF
diff --git a/zsh/plugins/rustup/README.md b/zsh/plugins/rustup/README.md
deleted file mode 100644
index c620e72..0000000
--- a/zsh/plugins/rustup/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# rustup
-
-**Deprecated: use the [`rust`](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/rust) plugin instead.**
diff --git a/zsh/plugins/rustup/rustup.plugin.zsh b/zsh/plugins/rustup/rustup.plugin.zsh
deleted file mode 100644
index ef141cf..0000000
--- a/zsh/plugins/rustup/rustup.plugin.zsh
+++ /dev/null
@@ -1,7 +0,0 @@
-print ${(%):-'%F{yellow}The `rustup` plugin is deprecated and has been moved to the `rust` plugin.'}
-print ${(%):-'Please update your .zshrc to use the `%Brust%b` plugin instead.%f'}
-
-(( ${fpath[(Ie)$ZSH/plugins/rust]} )) || {
-  fpath=("$ZSH/plugins/rust" $fpath)
-  source "$ZSH/plugins/rust/rust.plugin.zsh"
-}
diff --git a/zsh/plugins/rvm/README.md b/zsh/plugins/rvm/README.md
index 576b037..410bd60 100644
--- a/zsh/plugins/rvm/README.md
+++ b/zsh/plugins/rvm/README.md
@@ -24,6 +24,7 @@ plugins=(... rvm)
 | `rb27`       | `rvm use ruby-2.7`   |
 | `rb30`       | `rvm use ruby-3.0`   |
 | `rb31`       | `rvm use ruby-3.1`   |
+| `rb32`       | `rvm use ruby-3.2`   |
 | `rvm-update` | `rvm get head`       |
 | `gems`       | `gem list`           |
 | `rvms`       | `rvm gemset`         |
diff --git a/zsh/plugins/rvm/rvm.plugin.zsh b/zsh/plugins/rvm/rvm.plugin.zsh
index 2a091d0..3ddf041 100644
--- a/zsh/plugins/rvm/rvm.plugin.zsh
+++ b/zsh/plugins/rvm/rvm.plugin.zsh
@@ -27,6 +27,7 @@ rubies=(
   27  'ruby-2.7'
   30  'ruby-3.0'
   31  'ruby-3.1'
+  32  'ruby-3.2'
 )
 
 for v in ${(k)rubies}; do
diff --git a/zsh/plugins/safe-paste/safe-paste.plugin.zsh b/zsh/plugins/safe-paste/safe-paste.plugin.zsh
index d443ae8..c707905 100644
--- a/zsh/plugins/safe-paste/safe-paste.plugin.zsh
+++ b/zsh/plugins/safe-paste/safe-paste.plugin.zsh
@@ -9,7 +9,8 @@
 # https://github.com/zsh-users/zsh/blob/f702e17b14d75aa21bff014168fa9048124db286/Functions/Zle/bracketed-paste-magic#L9-L12
 
 # Load bracketed-paste-magic if zsh version is >= 5.1
-if [[ ${ZSH_VERSION:0:3} -ge 5.1 ]]; then
+autoload -Uz is-at-least
+if is-at-least 5.1; then
   set zle_bracketed_paste  # Explicitly restore this zsh default
   autoload -Uz bracketed-paste-magic
   zle -N bracketed-paste bracketed-paste-magic
diff --git a/zsh/plugins/sbt/sbt.plugin.zsh b/zsh/plugins/sbt/sbt.plugin.zsh
index 851302c..1e97714 100644
--- a/zsh/plugins/sbt/sbt.plugin.zsh
+++ b/zsh/plugins/sbt/sbt.plugin.zsh
@@ -4,7 +4,7 @@
 #        AUTHOR:  Mirko Caserta (mirko.caserta@gmail.com)
 #       VERSION:  1.0.2
 # ------------------------------------------------------------------------------
- 
+
 # aliases - mnemonic: prefix is 'sb'
 alias sbc='sbt compile'
 alias sbcc='sbt clean compile'
diff --git a/zsh/plugins/scala/_scala b/zsh/plugins/scala/_scala
index ba7ac38..b4e834e 100644
--- a/zsh/plugins/scala/_scala
+++ b/zsh/plugins/scala/_scala
@@ -1,6 +1,6 @@
 #compdef scala scalac
 # ------------------------------------------------------------------------------
-# Copyright (c) 2012 Github zsh-users - https://github.com/zsh-users
+# Copyright (c) 2012 GitHub zsh-users - https://github.com/zsh-users
 # All rights reserved.
 #
 # Redistribution and use in source and binary forms, with or without
diff --git a/zsh/plugins/scd/scd b/zsh/plugins/scd/scd
index 7e9654b..c79de45 100755
--- a/zsh/plugins/scd/scd
+++ b/zsh/plugins/scd/scd
@@ -445,7 +445,7 @@ _scd_Y19oug_match() {
     # build a list of matching directories reverse-sorted by their probabilities
     dmatching=( ${(f)"$(
         builtin printf "%s %s\n" ${(Oakv)drank} |
-        /usr/bin/sort -grk1 )"}
+        command sort -grk1 )"}
     )
     dmatching=( ${dmatching#*[[:blank:]]} )
 
diff --git a/zsh/plugins/screen/screen.plugin.zsh b/zsh/plugins/screen/screen.plugin.zsh
index c1db8ad..375d875 100644
--- a/zsh/plugins/screen/screen.plugin.zsh
+++ b/zsh/plugins/screen/screen.plugin.zsh
@@ -1,6 +1,10 @@
 # if using GNU screen, let the zsh tell screen what the title and hardstatus
 # of the tab window should be.
 if [[ "$TERM" == screen* ]]; then
+  # Unset title() function defined in lib/termsupport.zsh to prevent
+  # overwriting our screen titles
+  title(){}
+
   if [[ $_GET_PATH == '' ]]; then
     _GET_PATH='echo $PWD | sed "s/^\/Users\//~/;s/^\/home\//~/;s/^~$USERNAME/~/"'
   fi
@@ -8,7 +12,7 @@ if [[ "$TERM" == screen* ]]; then
     _GET_HOST='echo $HOST | sed "s/\..*//"'
   fi
 
-  # use the current user as the prefix of the current tab title 
+  # use the current user as the prefix of the current tab title
   TAB_TITLE_PREFIX='"`'$_GET_HOST'`:`'$_GET_PATH' | sed "s:..*/::"`$PROMPT_CHAR"'
   # when at the shell prompt, show a truncated version of the current path (with
   # standard ~ replacement) as the rest of the title.
diff --git a/zsh/plugins/scw/README.md b/zsh/plugins/scw/README.md
index d2312c2..5dd630d 100644
--- a/zsh/plugins/scw/README.md
+++ b/zsh/plugins/scw/README.md
@@ -1,7 +1,9 @@
-## Scaleway CLI autocomplete plugin
+## Scaleway CLI plugin
 
-[scw](https://github.com/scaleway/scaleway-cli): Manage Bare Metal servers from Command Line (as easily as with Docker)
+This plugin adds completion for [scw](https://github.com/scaleway/scaleway-cli), the command line interface for Scaleway.
 
-- Adds autocomplete options for all `scw` commands.
+To use it, add `scw` to the plugins array in your zshrc file:
 
-Maintainer : Manfred Touron ([@moul](https://github.com/moul))
+```zsh
+plugins=(... scw)
+```
diff --git a/zsh/plugins/scw/_scw b/zsh/plugins/scw/_scw
deleted file mode 100644
index 0eb125c..0000000
--- a/zsh/plugins/scw/_scw
+++ /dev/null
@@ -1,333 +0,0 @@
-#compdef scw
-#
-# zsh completion for scw (https://www.scaleway.com)
-#
-# Inspired by https://github.com/felixr/docker-zsh-completion
-
-__scw_get_servers() {
-    local expl
-    declare -a servers
-    servers=(${(f)"$(_call_program commands scw _completion servers-names)"})
-    _describe -t servers "servers" servers
-}
-
-__scw_stoppedservers() {
-    __scw_get_servers
-}
-
-__scw_runningservers() {
-    __scw_get_servers
-}
-
-__scw_servers () {
-    __scw_get_servers
-}
-
-__scw_images () {
-    local expl
-    declare -a images
-    images=(${(f)"$(_call_program commands scw _completion images-names)"})
-    _describe -t images "images" images
-}
-
-__scw_images_and_snapshots () {
-    __scw_images
-    __scw_snapshots
-}
-
-__scw_snapshots () {
-    local expl
-    declare -a snapshots
-    snapshots=(${(f)"$(_call_program commands scw _completion --prefix snapshots-names)"})
-    _describe -t snapshots "snapshots" snapshots
-}
-
-__scw_bootscripts () {
-    local expl
-    declare -a bootscripts
-    bootscripts=(${(f)"$(_call_program commands scw _completion bootscripts-names)"})
-    _describe -t bootscripts "bootscripts" bootscripts
-}
-
-__scw_tags() {
-    __scw_images
-}
-
-__scw_repositories_with_tags() {
-    __scw_images
-}
-
-__scw_search() {
-    # declare -a scwsearch
-    local cache_policy
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __scw_caching_policy
-    fi
-
-    local searchterm cachename
-    searchterm="${words[$CURRENT]%/}"
-    cachename=_scw-search-$searchterm
-
-    local expl
-    local -a result
-    if ( [[ ${(P)+cachename} -eq 0 ]] || _cache_invalid ${cachename#_} ) \
-        && ! _retrieve_cache ${cachename#_}; then
-        _message "Searching for ${searchterm}..."
-        result=(${${${(f)"$(_call_program commands scw search ${searchterm})"}%% *}[2,-1]})
-        _store_cache ${cachename#_} result
-    fi
-    _wanted scwsearch expl 'available images' compadd -a result
-}
-
-__scw_caching_policy()
-{
-  oldp=( "$1"(Nmh+1) )     # 1 hour
-  (( $#oldp ))
-}
-
-
-__scw_repositories () {
-    __scw_images
-}
-
-__scw_commands () {
-    # local -a  _scw_subcommands
-    local cache_policy
-
-    zstyle -s ":completion:${curcontext}:" cache-policy cache_policy
-    if [[ -z "$cache_policy" ]]; then
-        zstyle ":completion:${curcontext}:" cache-policy __scw_caching_policy
-    fi
-
-    if ( [[ ${+_scw_subcommands} -eq 0 ]] || _cache_invalid scw_subcommands) \
-        && ! _retrieve_cache scw_subcommands;
-    then
-        local -a lines
-        lines=(${(f)"$(_call_program commands scw 2>&1)"})
-        _scw_subcommands=(${${${lines[$((${lines[(i)Commands:]} + 1)),${lines[(I)    *]}]}## #}/ ##/:})
-        _scw_subcommands=($_scw_subcommands 'help:Show help for a command')
-        _store_cache scw_subcommands _scw_subcommands
-    fi
-    _describe -t scw-commands "scw command" _scw_subcommands
-}
-
-__scw_subcommand () {
-    local -a _command_args
-    case "$words[1]" in
-        (attach)
-            _arguments \
-                '--no-stdin[Do not attach stdin]' \
-                ':servers:__scw_runningservers'
-            ;;
-        (commit)
-            _arguments \
-                {-v,--volume=0}'[Volume slot]:volume: ' \
-                ':server:__scw_servers' \
-                ':repository:__scw_repositories_with_tags'
-            ;;
-        (cp)
-            _arguments \
-                ':server:->server' \
-                ':hostpath:_files'
-            case $state in
-                (server)
-                    if compset -P '*:'; then
-                        _files
-                    else
-                        __scw_servers -qS ":"
-                    fi
-                    ;;
-            esac
-            ;;
-        (exec)
-            local state ret
-            _arguments \
-                {-T,--timeout=0}'[Set timeout values to seconds]' \
-                {-w,--wait}'[Wait for SSH to be ready]' \
-                ':servers:__scw_runningservers' \
-                '*::command:->anycommand' && ret=0
-
-            case $state in
-                (anycommand)
-                    shift 1 words
-                    (( CURRENT-- ))
-                    _normal
-                    ;;
-            esac
-
-            return ret
-            ;;
-        (history)
-            _arguments \
-                '--no-trunc[Do not truncate output]' \
-                {-q,--quiet}'[Only show numeric IDs]' \
-                '*:images:__scw_images'
-            ;;
-        (images)
-            _arguments \
-                {-a,--all}'[Show all images]' \
-                '--no-trunc[Do not truncate output]' \
-                {-q,--quiet}'[Only show numeric IDs]' \
-                ':repository:__scw_repositories'
-            ;;
-        (info)
-            ;;
-        (inspect)
-            _arguments \
-                {-f,--format=-}'[Format the output using the given go template]:template: ' \
-                '*:servers:__scw_servers'
-            ;;
-        (kill)
-            _arguments \
-                '*:servers:__scw_runningservers'
-            ;;
-        (login)
-            _arguments \
-                {-o,--organization=-}'[Organization]:organization: ' \
-                {-t,--token=-}'[Token]:token: ' \
-                ':server: '
-            ;;
-        (logout)
-            _arguments \
-                ':server: '
-            ;;
-        (logs)
-            _arguments \
-                '*:servers:__scw_servers'
-            ;;
-        (port)
-            _arguments \
-                '1:servers:__scw_runningservers' \
-                '2:port:_ports'
-            ;;
-        (start)
-            _arguments \
-                {-T,--timeout=0}'[Set timeout values to seconds]' \
-                {-w,--wait}'[Wait for SSH to be ready]' \
-                '*:servers:__scw_stoppedservers'
-            ;;
-        (rm)
-            _arguments \
-                '*:servers:__scw_stoppedservers'
-            ;;
-        (rmi)
-            _arguments \
-                '*:images:__scw_images'
-            ;;
-        (restart)
-            _arguments \
-                '*:servers:__scw_runningservers'
-            ;;
-        (stop)
-            _arguments \
-                {-t,--terminate}'[Stop and trash a server with its volumes]' \
-                {-w,--wait}'[Synchronous stop. Wait for server to be stopped]' \
-                '*:servers:__scw_runningservers'
-            ;;
-        (top)
-            _arguments \
-                '1:servers:__scw_runningservers' \
-                '(-)*:: :->ps-arguments'
-            case $state in
-                (ps-arguments)
-                    _ps
-                    ;;
-            esac
-            ;;
-        (ps)
-            _arguments \
-                {-a,--all}'[Show all servers. Only running servers are shown by default]' \
-                {-l,--latest}'[Show only the latest created server]' \
-                '-n[Show n last created servers, include non-running one]:n:(1 5 10 25 50)' \
-                '--no-trunc[Do not truncate output]' \
-                {-q,--quiet}'[Only show numeric IDs]'
-            ;;
-        (tag)
-            _arguments \
-                {-f,--force}'[force]'\
-                ':image:__scw_images'\
-                ':repository:__scw_repositories_with_tags'
-            ;;
-        (create|run)
-            _arguments \
-                {-a,--attach}'[Attach to stdin, stdout or stderr]' \
-                '*'{-e,--environment=-}'[Set environment variables]:environment variable: ' \
-                '--name=-[Server name]:name: ' \
-                '--bootscript=-[Assign a bootscript]:bootscript:__scw_bootscripts ' \
-                '*-v[Bind mount a volume]:volume: '\
-                '(-):images:__scw_images_and_snapshots' \
-                '(-):command: _command_names -e' \
-                '*::arguments: _normal'
-
-            case $state in
-                (link)
-                    if compset -P '*:'; then
-                        _wanted alias expl 'Alias' compadd -E ""
-                    else
-                        __scw_runningservers -qS ":"
-                    fi
-                    ;;
-            esac
-            ;;
-        (rename)
-            _arguments \
-                ':old name:__scw_servers' \
-                ':new name: '
-            ;;
-        (search)
-            _arguments \
-                '--no-trunc[Do not truncate output]' \
-                ':term: '
-            ;;
-        (wait)
-            _arguments '*:servers:__scw_runningservers'
-            ;;
-        (help)
-            _arguments ':subcommand:__scw_commands'
-            ;;
-        (*)
-            _message 'Unknown sub command'
-    esac
-
-}
-
-_scw () {
-    # Support for subservices, which allows for `compdef _scw scw-shell=_scw_servers`.
-    # Based on /usr/share/zsh/functions/Completion/Unix/_git without support for `ret`.
-    if [[ $service != scw ]]; then
-        _call_function - _$service
-        return
-    fi
-
-    local curcontext="$curcontext" state line
-    typeset -A opt_args
-
-    _arguments -C \
-      '-H[tcp://host:port to bind/connect to]:socket: ' \
-         '(-): :->command' \
-         '(-)*:: :->option-or-argument'
-
-    if (( CURRENT == 1 )); then
-
-    fi
-    case $state in
-        (command)
-            __scw_commands
-            ;;
-        (option-or-argument)
-            curcontext=${curcontext%:*:*}:scw-$words[1]:
-            __scw_subcommand
-            ;;
-    esac
-}
-
-_scw "$@"
-
-# Local Variables:
-# mode: Shell-Script
-# sh-indentation: 4
-# indent-tabs-mode: nil
-# sh-basic-offset: 4
-# End:
-# vim: ft=zsh sw=4 ts=4 et
diff --git a/zsh/plugins/scw/scw.plugin.zsh b/zsh/plugins/scw/scw.plugin.zsh
new file mode 100644
index 0000000..cd8ed4a
--- /dev/null
+++ b/zsh/plugins/scw/scw.plugin.zsh
@@ -0,0 +1,14 @@
+if (( ! $+commands[scw] )); then
+  return
+fi
+
+_scw () {
+  output=($(scw autocomplete complete zsh -- ${CURRENT} ${words}))
+  opts=('-S' ' ')
+  if [[ $output == *= ]]; then
+    opts=('-S' '')
+  fi
+  compadd "${opts[@]}" -- "${output[@]}"
+}
+
+compdef _scw scw
diff --git a/zsh/plugins/shell-proxy/README.md b/zsh/plugins/shell-proxy/README.md
index b19888c..102e46b 100644
--- a/zsh/plugins/shell-proxy/README.md
+++ b/zsh/plugins/shell-proxy/README.md
@@ -23,6 +23,7 @@ Set `SHELLPROXY_URL` environment variable to the URL of the proxy server:
 
 ```sh
 SHELLPROXY_URL="http://127.0.0.1:8123"
+SHELLPROXY_NO_PROXY="localhost,127.0.0.1"
 proxy enable
 ```
 
@@ -36,11 +37,15 @@ Example:
 ```sh
 #!/bin/bash
 
+# HTTP Proxy
 if [[ "$(uname)" = Darwin ]]; then
   echo "http://127.0.0.1:6152" # Surge Mac
 else
   echo "http://127.0.0.1:8123" # polipo
 fi
+
+# No Proxy
+echo "localhost,127.0.0.1"
 ```
 
 ### Method 3
diff --git a/zsh/plugins/shell-proxy/proxy.py b/zsh/plugins/shell-proxy/proxy.py
index 14f2944..8c2aaf9 100755
--- a/zsh/plugins/shell-proxy/proxy.py
+++ b/zsh/plugins/shell-proxy/proxy.py
@@ -6,6 +6,7 @@ from subprocess import check_output, list2cmdline
 cwd = os.path.dirname(__file__)
 ssh_agent = os.path.join(cwd, "ssh-agent.py")
 proxy_env = "SHELLPROXY_URL"
+no_proxy_env = "SHELLPROXY_NO_PROXY"
 proxy_config = os.environ.get("SHELLPROXY_CONFIG") or os.path.expandvars("$HOME/.config/proxy")
 
 usage="""shell-proxy: no proxy configuration found.
@@ -15,18 +16,30 @@ See the plugin README for more information.""".format(env=proxy_env, config=prox
 
 def get_http_proxy():
     default_proxy = os.environ.get(proxy_env)
-    if default_proxy:
-        return default_proxy
+    no_proxy = os.environ.get(no_proxy_env)
+    if default_proxy and no_proxy:
+        return default_proxy, no_proxy
+
     if os.path.isfile(proxy_config):
-        return check_output(proxy_config).decode("utf-8").strip()
+        proxy_configdata = [line.strip() for line in check_output(proxy_config).decode("utf-8").splitlines()]
+        if len(proxy_configdata) >= 1:
+            if not default_proxy:
+                default_proxy = proxy_configdata[0]
+            if len(proxy_configdata) == 2 and not no_proxy:
+                no_proxy = proxy_configdata[1]
+    
+    if default_proxy:
+        return default_proxy, no_proxy
     print(usage, file=sys.stderr)
     sys.exit(1)
 
 
-def make_proxies(url: str):
+def make_proxies(url: str, no_proxy: str):
     proxies = {"%s_PROXY" % _: url for _ in ("HTTP", "HTTPS", "FTP", "RSYNC", "ALL")}
     proxies.update({name.lower(): value for (name, value) in proxies.items()})
     proxies["GIT_SSH"] = ssh_agent
+    if no_proxy:
+        proxies.update({"NO_PROXY": no_proxy, "no_proxy": no_proxy})
     return proxies
 
 
@@ -35,7 +48,7 @@ def merge(mapping: dict):
 
 
 class CommandSet:
-    proxies = make_proxies(get_http_proxy())
+    proxies = make_proxies(*get_http_proxy())
     aliases = {
         _: "env __SSH_PROGRAM_NAME__=%s %s" % (_, ssh_agent)
         for _ in ("ssh", "sftp", "scp", "slogin", "ssh-copy-id")
diff --git a/zsh/plugins/shell-proxy/shell-proxy.plugin.zsh b/zsh/plugins/shell-proxy/shell-proxy.plugin.zsh
index 4fdbe93..f6c31da 100644
--- a/zsh/plugins/shell-proxy/shell-proxy.plugin.zsh
+++ b/zsh/plugins/shell-proxy/shell-proxy.plugin.zsh
@@ -27,7 +27,7 @@ eval '
 
     # capture the output of the proxy script and bail out if it fails
     local output
-    output="$(SHELLPROXY_URL="$SHELLPROXY_URL" SHELLPROXY_CONFIG="$SHELLPROXY_CONFIG" "$proxy" "$1")" ||
+    output="$(SHELLPROXY_URL="$SHELLPROXY_URL" SHELLPROXY_NO_PROXY="$SHELLPROXY_NO_PROXY" SHELLPROXY_CONFIG="$SHELLPROXY_CONFIG" "$proxy" "$1")" ||
       return $?
 
     # evaluate the output generated by the proxy script
diff --git a/zsh/plugins/shell-proxy/ssh-proxy.py b/zsh/plugins/shell-proxy/ssh-proxy.py
index a498c84..4b692f9 100755
--- a/zsh/plugins/shell-proxy/ssh-proxy.py
+++ b/zsh/plugins/shell-proxy/ssh-proxy.py
@@ -22,7 +22,8 @@ if parsed.scheme not in proxy_protocols:
 
 def make_argv():
     yield "nc"
-    if sys.platform == 'linux':
+    if sys.platform in {'linux', 'cygwin'}:
+        # caveats: the built-in netcat of most linux distributions and cygwin support proxy type
         # caveats: macOS built-in netcat command not supported proxy-type
         yield "-X" # --proxy-type
         # Supported protocols are 4 (SOCKS v4), 5 (SOCKS v5) and connect (HTTP proxy).
diff --git a/zsh/plugins/shrink-path/shrink-path.plugin.zsh b/zsh/plugins/shrink-path/shrink-path.plugin.zsh
index 373fd5b..1739f92 100644
--- a/zsh/plugins/shrink-path/shrink-path.plugin.zsh
+++ b/zsh/plugins/shrink-path/shrink-path.plugin.zsh
@@ -56,7 +56,16 @@ shrink_path () {
                 tilde=1
                 named=1
         fi
-        zstyle -t ':prompt:shrink_path' last && lastfull=1
+
+        local last
+        zstyle -s ':prompt:shrink_path' last last
+        case "$last" in
+          (false|no|off|0) lastfull=0 ;;
+          (true|yes|on|1) lastfull=1 ;;
+          (""|*[^0-9]*) lastfull=0 ;;
+          (*) lastfull=$last ;;
+        esac
+
         zstyle -t ':prompt:shrink_path' short && short=1
         zstyle -t ':prompt:shrink_path' tilde && tilde=1
         zstyle -t ':prompt:shrink_path' glob && ellipsis='*'
@@ -78,7 +87,7 @@ shrink_path () {
                                 print 'Usage: shrink_path [-f -l -s -t] [directory]'
                                 print ' -f, --fish      fish-simulation, like -l -s -t'
                                 print ' -g, --glob      Add asterisk to allow globbing of shrunk path (equivalent to -e "*")'
-                                print ' -l, --last      Print the last directory''s full name'
+                                print ' -l, --last [#]  Print the last n directory''s full name (default 1).'
                                 print ' -s, --short     Truncate directory names to the number of characters given by -#. Without'
                                 print '                 -s, names are truncated without making them ambiguous.'
                                 print ' -t, --tilde     Substitute ~ for the home directory'
@@ -93,7 +102,13 @@ shrink_path () {
                                 print '  zstyle :prompt:shrink_path fish yes'
                                 return 0
                         ;;
-                        -l|--last) lastfull=1 ;;
+                        -l|--last)
+                          lastfull=1
+                          if [[ -n "$2" && "$2" != *[^0-9]* ]]; then
+                            shift
+                            lastfull=$1
+                          fi
+                        ;;
                         -s|--short) short=1 ;;
                         -t|--tilde) tilde=1 ;;
                         -T|--nameddirs)
@@ -148,8 +163,8 @@ shrink_path () {
                         cd -q /
                 }
                 for dir in $tree; {
-                        if (( lastfull && $#tree == 1 )) {
-                                result+="/$tree"
+                        if (( lastfull && $#tree <= lastfull )) {
+                                result+="/${(j:/:)tree[@]}"
                                 break
                         }
                         expn=(a b)
diff --git a/zsh/plugins/sigstore/README.md b/zsh/plugins/sigstore/README.md
new file mode 100644
index 0000000..00e83c8
--- /dev/null
+++ b/zsh/plugins/sigstore/README.md
@@ -0,0 +1,13 @@
+# Sigstore plugin
+
+This plugin sets up completion for the following [Sigstore](https://sigstore.dev/) CLI tools.
+
+- [Cosign](https://docs.sigstore.dev/cosign/overview)
+- [Sget](https://docs.sigstore.dev/cosign/installation#alpine-linux)
+- [Rekor](https://docs.sigstore.dev/rekor/overview)
+
+To use it, add `sigstore` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... sigstore)
+```
diff --git a/zsh/plugins/sigstore/sigstore.plugin.zsh b/zsh/plugins/sigstore/sigstore.plugin.zsh
new file mode 100644
index 0000000..1f9d77c
--- /dev/null
+++ b/zsh/plugins/sigstore/sigstore.plugin.zsh
@@ -0,0 +1,22 @@
+function install_autocompletion {
+  if (( ! $+commands[$1] )); then
+    return
+  fi
+
+  # If the completion file doesn't exist yet, we need to autoload it and
+  # bind it to `$1` (cosign, sget, rekor-cli). Otherwise, compinit will
+  # have already done that
+  if [[ ! -f "$ZSH_CACHE_DIR/completions/_$1" ]]; then
+    autoload -Uz _$1
+    typeset -g -A _comps
+    _comps[$1]=_$1
+  fi
+
+  $1 completion zsh >| "$ZSH_CACHE_DIR/completions/_$1" &|
+}
+
+install_autocompletion cosign
+install_autocompletion sget
+install_autocompletion rekor-cli
+
+unfunction install_autocompletion
diff --git a/zsh/plugins/singlechar/singlechar.plugin.zsh b/zsh/plugins/singlechar/singlechar.plugin.zsh
index d4b0b67..6d785d9 100644
--- a/zsh/plugins/singlechar/singlechar.plugin.zsh
+++ b/zsh/plugins/singlechar/singlechar.plugin.zsh
@@ -1,5 +1,5 @@
 ###########################
-# Settings 
+# Settings
 
 # These can be overwritten any time.
 # If they are not set yet, they will be
diff --git a/zsh/plugins/skaffold/README.md b/zsh/plugins/skaffold/README.md
new file mode 100644
index 0000000..4ee12c6
--- /dev/null
+++ b/zsh/plugins/skaffold/README.md
@@ -0,0 +1,9 @@
+# Skaffold plugin (Autocompletion)
+
+This plugin adds completion for [Skaffold](https://skaffold.dev)
+
+To use it, add `skaffold` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... skaffold)
+```
diff --git a/zsh/plugins/skaffold/skaffold.plugin.zsh b/zsh/plugins/skaffold/skaffold.plugin.zsh
new file mode 100644
index 0000000..8296c45
--- /dev/null
+++ b/zsh/plugins/skaffold/skaffold.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for skaffold
+if (( ! $+commands[skaffold] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `skaffold`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_skaffold" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _skaffold
+  _comps[skaffold]=_skaffold
+fi
+
+skaffold completion zsh >| "$ZSH_CACHE_DIR/completions/_skaffold" &|
diff --git a/zsh/plugins/snap/README.md b/zsh/plugins/snap/README.md
new file mode 100644
index 0000000..75c5ec1
--- /dev/null
+++ b/zsh/plugins/snap/README.md
@@ -0,0 +1,18 @@
+# snap plugin
+
+This plugin sets up aliases for the common [snap](https://snapcraft.io/docs/getting-started) commands
+
+## Aliases
+
+| Alias | Full command |
+| --- | ---|
+| sv | snap version |
+| sf | snap find |
+| si | snap install |
+| sin | snap info |
+| sr | snap remove |
+| sref | snap refresh |
+| srev | snap revert |
+| sl | snap list |
+| sd | snap disable |
+| se | snap enable |
diff --git a/zsh/plugins/snap/snap.plugin.zsh b/zsh/plugins/snap/snap.plugin.zsh
new file mode 100644
index 0000000..af23469
--- /dev/null
+++ b/zsh/plugins/snap/snap.plugin.zsh
@@ -0,0 +1,10 @@
+alias sv="snap version"
+alias sf="snap find"
+alias si="snap install"
+alias sin="snap info"
+alias sr="snap remove"
+alias sref="snap refresh"
+alias srev="snap revert"
+alias sl="snap list"
+alias sd="snap disable"
+alias se="snap enable"
diff --git a/zsh/plugins/spackenv/README.md b/zsh/plugins/spackenv/README.md
new file mode 100644
index 0000000..3715158
--- /dev/null
+++ b/zsh/plugins/spackenv/README.md
@@ -0,0 +1,17 @@
+# spackenv
+
+Based on the virtualenv plugin.
+
+The plugin displays information of the created Spack environment and allows background theming.
+
+To use it, add `spackenv` to the plugins array of your zshrc file:
+```
+plugins=(... spackenv)
+```
+
+The plugin creates a `spackenv_prompt_info` function that you can use in your theme, which displays
+the basename of the current `$SPACK_ENV`. It uses two variables to control how that is shown:
+
+- `ZSH_THEME_SPACKENV_PREFIX`: sets the prefix of the SPACK_ENV. Defaults to `[`.
+
+- `ZSH_THEME_SPACKENV_SUFFIX`: sets the suffix of the SPACK_ENV. Defaults to `]`.
diff --git a/zsh/plugins/spackenv/spackenv.plugin.zsh b/zsh/plugins/spackenv/spackenv.plugin.zsh
new file mode 100644
index 0000000..f626f4f
--- /dev/null
+++ b/zsh/plugins/spackenv/spackenv.plugin.zsh
@@ -0,0 +1,5 @@
+function spackenv_prompt_info(){
+  [[ -n ${SPACK_ENV} ]] || return
+  export SPACK_ENV_PROMPT=${SPACK_ENV:t}
+  echo "${ZSH_THEME_SPACKENV_PREFIX=(}${SPACK_ENV:t:gs/%/%%}${ZSH_THEME_SPACKENV_SUFFIX=)}"
+}
diff --git a/zsh/plugins/spring/README.md b/zsh/plugins/spring/README.md
index 8161813..b934020 100644
--- a/zsh/plugins/spring/README.md
+++ b/zsh/plugins/spring/README.md
@@ -1,16 +1,12 @@
 # Spring Boot oh-my-zsh plugin
-oh-my-zsh Spring Boot plugin
 
-## Spring Boot autocomplete plugin
+Adds autocomplete options for all [Spring Boot](https://spring.io/projects/spring-boot) commands.
 
-- Adds autocomplete options for all spring boot commands.
+To use it, add `spring` to the plugins array in your zshrc file:
 
-## Manual Install
-
-     $ cd ~/.oh-my-zsh/plugins
-     $ git clone git@github.com:linux-china/oh-my-zsh-spring-boot-plugin.git spring
-
-Adjust your .zshrc file and add spring to plugins=(...)
+```zsh
+plugins=(... spring)
+```
 
 ## Tips
 
diff --git a/zsh/plugins/ssh-agent/README.md b/zsh/plugins/ssh-agent/README.md
index fa6a996..0afa80c 100644
--- a/zsh/plugins/ssh-agent/README.md
+++ b/zsh/plugins/ssh-agent/README.md
@@ -90,7 +90,7 @@ use the `ssh-add-args` setting. You can pass multiple arguments separated by spa
 zstyle :omz:plugins:ssh-agent ssh-add-args -K -c -a /run/user/1000/ssh-auth
 ```
 
-These will then be passed the the `ssh-add` call as if written directly. The example
+These will then be passed the `ssh-add` call as if written directly. The example
 above will turn into:
 
 ```zsh
@@ -99,6 +99,33 @@ ssh-add -K -c -a /run/user/1000/ssh-auth <identities>
 
 For valid `ssh-add` arguments run `ssh-add --help` or `man ssh-add`.
 
+### Powerline 10k specific settings
+
+Powerline10k has an instant prompt setting that doesn't like when this plugin
+writes to the console. Consider using the following settings if you're using
+p10k (documented above):
+
+```
+zstyle :omz:plugins:ssh-agent quiet yes
+zstyle :omz:plugins:ssh-agent lazy yes
+```
+
+### macOS specific settings
+
+macOS supports using passphrases stored in the keychain when adding identities
+to the ssh-agent.
+
+```
+ssh-add --apple-use-keychain ~/.ssh/id_rsa ...
+```
+
+
+This plugin can be configured to use the keychain when loading using the following:
+
+```
+zstyle :omz:plugins:ssh-agent ssh-add-args --apple-load-keychain
+```
+
 ## Credits
 
 Based on code from Joseph M. Reagle: https://www.cygwin.com/ml/cygwin/2001-06/msg00537.html
diff --git a/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh b/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh
index 78ac46b..8354864 100644
--- a/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh
+++ b/zsh/plugins/ssh-agent/ssh-agent.plugin.zsh
@@ -13,6 +13,11 @@ function _start_agent() {
     fi
   fi
 
+  if [[ ! -d "$HOME/.ssh" ]]; then
+    echo "[oh-my-zsh] ssh-agent plugin requires ~/.ssh directory"
+    return 1
+  fi
+
   # Set a maximum lifetime for identities added to ssh-agent
   local lifetime
   zstyle -s :omz:plugins:ssh-agent lifetime lifetime
@@ -38,7 +43,7 @@ function _add_identities() {
   # this is to mimic the call to ssh-add with no identities
   if [[ ${#identities} -eq 0 ]]; then
     # key list found on `ssh-add` man page's DESCRIPTION section
-    for id in id_rsa id_dsa id_ecdsa id_ed25519 identity; do
+    for id in id_rsa id_dsa id_ecdsa id_ed25519 id_ed25519_sk identity; do
       # check if file exists
       [[ -f "$HOME/.ssh/$id" ]] && identities+=($id)
     done
@@ -57,7 +62,7 @@ function _add_identities() {
     # if id is an absolute path, make file equal to id
     [[ "$id" = /* ]] && file="$id" || file="$HOME/.ssh/$id"
     # check for filename match, otherwise try for signature match
-    if [[ ${loaded_ids[(I)$file]} -le 0 ]]; then
+    if [[ -f $file && ${loaded_ids[(I)$file]} -le 0 ]]; then
       sig="$(ssh-keygen -lf "$file" | awk '{print $2}')"
       [[ ${loaded_sigs[(I)$sig]} -le 0 ]] && not_loaded+=("$file")
     fi
@@ -93,8 +98,14 @@ function _add_identities() {
 
 # Add a nifty symlink for screen/tmux if agent forwarding is enabled
 if zstyle -t :omz:plugins:ssh-agent agent-forwarding \
-   && [[ -n "$SSH_AUTH_SOCK" && ! -L "$SSH_AUTH_SOCK" ]]; then
-  ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
+   && [[ -n "$SSH_AUTH_SOCK" ]]; then
+  if [[ ! -L "$SSH_AUTH_SOCK" ]]; then
+    if [[ -n "$TERMUX_VERSION" ]]; then
+      ln -sf "$SSH_AUTH_SOCK" "$PREFIX"/tmp/ssh-agent-$USERNAME-screen
+    else
+      ln -sf "$SSH_AUTH_SOCK" /tmp/ssh-agent-$USERNAME-screen
+    fi
+  fi
 else
   _start_agent
 fi
diff --git a/zsh/plugins/ssh/README.md b/zsh/plugins/ssh/README.md
new file mode 100644
index 0000000..3dd32ec
--- /dev/null
+++ b/zsh/plugins/ssh/README.md
@@ -0,0 +1,16 @@
+# ssh plugin
+
+This plugin provides host completion based off of your `~/.ssh/config` file, and adds
+some utility functions to work with SSH keys.
+
+To use it, add `ssh` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... ssh)
+```
+
+## Functions
+
+- `ssh_rmhkey`: remove host key from known hosts based on a host section name from `.ssh/config`.
+- `ssh_load_key`: load SSH key into agent.
+- `ssh_unload_key`: remove SSH key from agent.
diff --git a/zsh/plugins/ssh/ssh.plugin.zsh b/zsh/plugins/ssh/ssh.plugin.zsh
new file mode 100644
index 0000000..24ad880
--- /dev/null
+++ b/zsh/plugins/ssh/ssh.plugin.zsh
@@ -0,0 +1,53 @@
+############################################################
+# Take all host sections in .ssh/config and offer them for
+# completion as hosts (e.g. for ssh, rsync, scp and the like)
+# Filter out wildcard host sections.
+_ssh_configfile="$HOME/.ssh/config"
+if [[ -f "$_ssh_configfile" ]]; then
+  _ssh_hosts=($(
+    grep -E '^Host.*' "$_ssh_configfile" |\
+    awk '{for (i=2; i<=NF; i++) print $i}' |\
+    sort |\
+    uniq |\
+    grep -v '^*' |\
+    sed -e 's/\.*\*$//'
+  ))
+  zstyle ':completion:*:hosts' hosts $_ssh_hosts
+  unset _ssh_hosts
+fi
+unset _ssh_configfile
+
+############################################################
+# Remove host key from known hosts based on a host section
+# name from .ssh/config
+function ssh_rmhkey {
+  local ssh_configfile="$HOME/.ssh/config"
+  local ssh_host="$1"
+  if [[ -z "$ssh_host" ]]; then return; fi
+  ssh-keygen -R $(grep -A10 "$ssh_host" "$ssh_configfile" | grep -i HostName | head -n 1 | awk '{print $2}')
+}
+compctl -k hosts ssh_rmhkey
+
+############################################################
+# Load SSH key into agent
+function ssh_load_key() {
+  local key="$1"
+  if [[ -z "$key" ]]; then return; fi
+  local keyfile="$HOME/.ssh/$key"
+  local keysig=$(ssh-keygen -l -f "$keyfile")
+  if ( ! ssh-add -l | grep -q "$keysig" ); then
+    ssh-add "$keyfile"
+  fi
+}
+
+############################################################
+# Remove SSH key from agent
+function ssh_unload_key {
+  local key="$1"
+  if [[ -z "$key" ]]; then return; fi
+  local keyfile="$HOME/.ssh/$key"
+  local keysig=$(ssh-keygen -l -f "$keyfile")
+  if ( ssh-add -l | grep -q "$keysig" ); then
+    ssh-add -d "$keyfile"
+  fi
+}
diff --git a/zsh/plugins/starship/README.md b/zsh/plugins/starship/README.md
new file mode 100644
index 0000000..0e66c52
--- /dev/null
+++ b/zsh/plugins/starship/README.md
@@ -0,0 +1,21 @@
+# starship plugin
+
+Initializes [starship prompt](https://starship.rs) - a minimal, blazing-fast and infinitely customizable cross-shell prompt.
+
+[Demo](https://user-images.githubusercontent.com/62098008/169764279-50b48262-9506-4651-ba89-f6611a88ebf0.mp4)
+
+[External repository](https://github.com/axieax/zsh-starship) for this zsh plugin.
+
+# Installation
+
+**Note:** you have to [install starship](https://starship.rs/guide/#%F0%9F%9A%80-installation) first.
+
+## [oh-my-zsh](https://github.com/ohmyzsh/ohmyzsh)
+
+Add `starship` to the plugins array in your `.zshrc` file:
+
+```zsh
+plugins=(... starship)
+```
+
+## ⚠️ ENABLING THIS PLUGIN WILL UNSET YOUR ZSH_THEME VARIABLE
diff --git a/zsh/plugins/starship/starship.plugin.zsh b/zsh/plugins/starship/starship.plugin.zsh
new file mode 100644
index 0000000..fc415e6
--- /dev/null
+++ b/zsh/plugins/starship/starship.plugin.zsh
@@ -0,0 +1,8 @@
+if (( $+commands[starship] )); then
+  # ignore oh-my-zsh theme
+  unset ZSH_THEME
+
+  eval "$(starship init zsh)"
+else
+  echo '[oh-my-zsh] starship not found, please install it from https://starship.rs'
+fi
diff --git a/zsh/plugins/stripe/README.md b/zsh/plugins/stripe/README.md
new file mode 100644
index 0000000..7e7944d
--- /dev/null
+++ b/zsh/plugins/stripe/README.md
@@ -0,0 +1,9 @@
+# Stripe
+
+This plugin provides completion for the [Stripe CLI](https://stripe.com/docs/stripe-cli).
+
+To use it add stripe to the plugins array in your zshrc file.
+
+```bash
+plugins=(... stripe)
+```
diff --git a/zsh/plugins/stripe/stripe.plugin.zsh b/zsh/plugins/stripe/stripe.plugin.zsh
new file mode 100644
index 0000000..e2041be
--- /dev/null
+++ b/zsh/plugins/stripe/stripe.plugin.zsh
@@ -0,0 +1,13 @@
+if (( ! $+commands[stripe] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `stripe`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_stripe" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _stripe
+  _comps[stripe]=_stripe
+fi
+
+stripe completion --shell zsh --write-to-stdout >| "$ZSH_CACHE_DIR/completions/_stripe" &|
diff --git a/zsh/plugins/sublime/sublime.plugin.zsh b/zsh/plugins/sublime/sublime.plugin.zsh
index dadf375..cc84de7 100644
--- a/zsh/plugins/sublime/sublime.plugin.zsh
+++ b/zsh/plugins/sublime/sublime.plugin.zsh
@@ -4,7 +4,7 @@ alias st=subl
 alias stt='subl .'
 
 # Define sst only if sudo exists
-(( $+commands[sudo] )) && alias sst='sudo subl'
+(( $+commands[sudo] )) && alias sst='sudo -EH subl'
 
 alias stp=find_project
 alias stn=create_project
@@ -62,7 +62,7 @@ alias stn=create_project
   for _sublime_path in $_sublime_paths; do
     if [[ -a $_sublime_path ]]; then
       alias subl="'$_sublime_path'"
-      (( $+commands[sudo] )) && alias sst="sudo '$_sublime_path'"
+      (( $+commands[sudo] )) && alias sst="sudo -EH '$_sublime_path'"
       break
     fi
   done
diff --git a/zsh/plugins/sudo/sudo.plugin.zsh b/zsh/plugins/sudo/sudo.plugin.zsh
index 2a0b3bf..66b253f 100644
--- a/zsh/plugins/sudo/sudo.plugin.zsh
+++ b/zsh/plugins/sudo/sudo.plugin.zsh
@@ -96,7 +96,7 @@ sudo-command-line() {
     LBUFFER="${WHITESPACE}${LBUFFER}"
 
     # Redisplay edit buffer (compatibility with zsh-syntax-highlighting)
-    zle redisplay
+    zle && zle redisplay # only run redisplay if zle is enabled
   }
 }
 
diff --git a/zsh/plugins/suse/README.md b/zsh/plugins/suse/README.md
index f37ec16..e1e3aad 100644
--- a/zsh/plugins/suse/README.md
+++ b/zsh/plugins/suse/README.md
@@ -1,8 +1,6 @@
 # suse
 
-**Maintainer**: [r-darwish](https://github.com/r-darwish)
-
-Alias for Zypper according to the official Zypper's alias
+Aliases for [Zypper](https://en.opensuse.org/Portal:Zypper) according to the official Zypper's alias
 
 To use it add `suse` to the plugins array in you zshrc file.
 
@@ -10,6 +8,8 @@ To use it add `suse` to the plugins array in you zshrc file.
 plugins=(... suse)
 ```
 
+**Maintainer**: [r-darwish](https://github.com/r-darwish)
+
 ## Main commands
 
 | Alias            | Commands                      | Description                                                    |
@@ -79,6 +79,7 @@ Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
 | zrr   | `sudo zypper rr`    | remove repositories                      |
 
 ## Services commands
+
 | Alias | Commands           | Description                                                    |
 | ----- | ------------------ | -------------------------------------------------------------- |
 | zas   | `sudo zypper as`   | adds a service specified by URI to the system                  |
@@ -88,6 +89,7 @@ Related: [#9798](https://github.com/ohmyzsh/ohmyzsh/pull/9798).
 | zls   | `zypper ls`        | list services defined on the system                            |
 
 ## Package Locks Management commands
+
 | Alias | Commands         | Description                         |
 | ----- | ---------------- | ----------------------------------- |
 | zal   | `sudo zypper al` | add a package lock                  |
diff --git a/zsh/plugins/swiftpm/README.md b/zsh/plugins/swiftpm/README.md
index a722c03..babbf4d 100644
--- a/zsh/plugins/swiftpm/README.md
+++ b/zsh/plugins/swiftpm/README.md
@@ -1,8 +1,6 @@
 # Swift Package Manager
 
-## Description
-
-This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager), as well as autocompletion for Swift 5.1.
+This plugin provides a few utilities that make you faster on your daily work with the [Swift Package Manager](https://github.com/apple/swift-package-manager), as well as autocompletion for Swift 5.9.
 
 To start using it, add the `swiftpm` plugin to your `plugins` array in `~/.zshrc`:
 
diff --git a/zsh/plugins/swiftpm/_swift b/zsh/plugins/swiftpm/_swift
index 3a92322..358d1dc 100644
--- a/zsh/plugins/swiftpm/_swift
+++ b/zsh/plugins/swiftpm/_swift
@@ -1,474 +1,844 @@
 #compdef swift
 local context state state_descr line
+_swift_commandname=$words[1]
 typeset -A opt_args
 
 _swift() {
-    _arguments -C \
-        '(- :)--help[prints the synopsis and a list of the most commonly used commands]: :->arg' \
-        '(-): :->command' \
-        '(-)*:: :->arg' && return
-
+    integer ret=1
+    local -a args
+    args+=(
+        '(-h --help)'{-h,--help}'[Show help information.]'
+        '(-): :->command'
+        '(-)*:: :->arg'
+    )
+    _arguments -w -s -S $args[@] && ret=0
     case $state in
         (command)
-            local tools
-            tools=(
-                'build:build sources into binary products'
-                'run:build and run an executable product'
-                'package:perform operations on Swift packages'
-                'test:build and run tests'
+            local subcommands
+            subcommands=(
+                'run:Build and run an executable product'
+                'build:Build sources into binary products'
+                'test:Build and run tests'
+                'package:Perform operations on Swift packages'
+                'help:Show subcommand help information.'
             )
-            _alternative \
-                'tools:common:{_describe "tool" tools }' \
-                'compiler: :_swift_compiler' && _ret=0
+            _describe "subcommand" subcommands
             ;;
         (arg)
             case ${words[1]} in
-                (build)
-                    _swift_build
-                    ;;
                 (run)
                     _swift_run
                     ;;
-                (package)
-                    _swift_package
+                (build)
+                    _swift_build
                     ;;
                 (test)
                     _swift_test
                     ;;
-                (*)
-                    _swift_compiler
+                (package)
+                    _swift_package
+                    ;;
+                (help)
+                    _swift_help
                     ;;
             esac
             ;;
     esac
+
+    return ret
 }
 
-_swift_dependency() {
-    local dependencies
-    dependencies=( $(swift package completion-tool list-dependencies) )
-    _describe '' dependencies
-}
-
-_swift_executable() {
-    local executables
-    executables=( $(swift package completion-tool list-executables) )
-    _describe '' executables
-}
-
-# Generates completions for swift build
-#
-# In the final compdef file, set the following file header:
-#
-#     #compdef _swift_build
-#     local context state state_descr line
-#     typeset -A opt_args
-_swift_build() {
-    arguments=(
-        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
-        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
-        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
-        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
-        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
-        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
-        "(--chdir -C)"{--chdir,-C}"[]: :_files"
-        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
-        "--disable-prefetching[]"
-        "--skip-update[Skip updating dependencies from their remote during a resolution]"
-        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
-        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
-        "--version[]"
-        "--destination[]: :_files"
-        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
-        "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--force-resolved-versions[]"
-        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
-        "--enable-index-store[Enable indexing-while-building feature]"
-        "--disable-index-store[Disable indexing-while-building feature]"
-        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
-        "--enable-parseable-module-interfaces[]"
-        "--trace-resolver[]"
-        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
-        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
-        "--build-tests[Build both source and test targets]"
-        "--product[Build the specified product]:Build the specified product: "
-        "--target[Build the specified target]:Build the specified target: "
-        "--show-bin-path[Print the binary output path]"
-    )
-    _arguments $arguments && return
-}
-
-# Generates completions for swift run
-#
-# In the final compdef file, set the following file header:
-#
-#     #compdef _swift_run
-#     local context state state_descr line
-#     typeset -A opt_args
 _swift_run() {
-    arguments=(
-        ":The executable to run:_swift_executable"
-        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
-        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
-        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
-        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
-        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
-        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
-        "(--chdir -C)"{--chdir,-C}"[]: :_files"
-        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
-        "--disable-prefetching[]"
-        "--skip-update[Skip updating dependencies from their remote during a resolution]"
-        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
-        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
-        "--version[]"
-        "--destination[]: :_files"
-        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
-        "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--force-resolved-versions[]"
-        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
-        "--enable-index-store[Enable indexing-while-building feature]"
-        "--disable-index-store[Disable indexing-while-building feature]"
-        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
-        "--enable-parseable-module-interfaces[]"
-        "--trace-resolver[]"
-        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
-        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
-        "--skip-build[Skip building the executable product]"
-        "--build-tests[Build both source and test targets]"
-        "--repl[Launch Swift REPL for the package]"
+    integer ret=1
+    local -a args
+    args+=(
+        '--package-path[Specify the package path to operate on (default current directory). This changes the working directory before any other operation]:package-path:_files -/'
+        '--cache-path[Specify the shared cache directory path]:cache-path:_files -/'
+        '--config-path[Specify the shared configuration directory path]:config-path:_files -/'
+        '--security-path[Specify the shared security directory path]:security-path:_files -/'
+        '--scratch-path[Specify a custom scratch directory path (default .build)]:scratch-path:_files -/'
+        '--pkg-config-path[Specify alternative path to search for pkg-config `.pc` files. Use the option multiple times to
+        specify more than one path.]:pkg-config-path:_files -/'
+        '--enable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--disable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--enable-build-manifest-caching'
+        '--disable-build-manifest-caching'
+        '--manifest-cache[Caching mode of Package.swift manifests (shared: shared cache, local: package'"'"'s build directory, none: disabled]:manifest-cache:'
+        '(--verbose -v)'{--verbose,-v}'[Increase verbosity to include informational output]'
+        '(--very-verbose --vv)'{--very-verbose,--vv}'[Increase verbosity to include debug output]'
+        '(--quiet -q)'{--quiet,-q}'[Decrease verbosity to only include error output.]'
+        '--disable-sandbox[Disable using the sandbox when executing subprocesses]'
+        '--netrc[Use netrc file even in cases where other credential stores are preferred]'
+        '--enable-netrc[Load credentials from a netrc file]'
+        '--disable-netrc[Load credentials from a netrc file]'
+        '--netrc-file[Specify the netrc file path]:netrc-file:_files'
+        '--enable-keychain[Search credentials in macOS keychain]'
+        '--disable-keychain[Search credentials in macOS keychain]'
+        '--resolver-fingerprint-checking:resolver-fingerprint-checking:'
+        '--resolver-signing-entity-checking:resolver-signing-entity-checking:'
+        '--enable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--disable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--enable-prefetching'
+        '--disable-prefetching'
+        '(--force-resolved-versions --disable-automatic-resolution --only-use-versions-from-resolved-file)'{--force-resolved-versions,--disable-automatic-resolution,--only-use-versions-from-resolved-file}'[Only use versions from the Package.resolved file and fail resolution if it is out-of-date]'
+        '--skip-update[Skip updating dependencies from their remote during a resolution]'
+        '--disable-scm-to-registry-transformation[disable source control to registry transformation]'
+        '--use-registry-identity-for-scm[look up source control dependencies in the registry and use their registry identity when possible to help deduplicate across the two origins]'
+        '--replace-scm-with-registry[look up source control dependencies in the registry and use the registry to retrieve them instead of source control when possible]'
+        '--default-registry-url[Default registry URL to use, instead of the registries.json configuration file]:default-registry-url:'
+        '(--configuration -c)'{--configuration,-c}'[Build with configuration]:configuration:(debug release)'
+        '-Xcc[Pass flag through to all C compiler invocations]:Xcc:'
+        '-Xswiftc[Pass flag through to all Swift compiler invocations]:Xswiftc:'
+        '-Xlinker[Pass flag through to all linker invocations]:Xlinker:'
+        '-Xcxx[Pass flag through to all C++ compiler invocations]:Xcxx:'
+        '--triple:triple:'
+        '--sdk:sdk:_files -/'
+        '--toolchain:toolchain:_files -/'
+        '--sanitize[Turn on runtime checks for erroneous behavior, possible values: address, thread, undefined, scudo]:sanitize:(address thread undefined scudo)'
+        '--auto-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-index-store[Enable or disable indexing-while-building feature]'
+        '--disable-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-parseable-module-interfaces'
+        '(--jobs -j)'{--jobs,-j}'[The number of jobs to spawn in parallel during the build process]:jobs:'
+        '--emit-swift-module-separately'
+        '--use-integrated-swift-driver'
+        '--explicit-target-dependency-import-check:explicit-target-dependency-import-check:'
+        '--experimental-explicit-module-build'
+        '--build-system:build-system:(native xcode)'
+        '--enable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--disable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--static-swift-stdlib[Link Swift stdlib statically]'
+        '--no-static-swift-stdlib[Link Swift stdlib statically]'
+        '--repl[Launch Swift REPL for the package]'
+        '--debugger[Launch the executable in a debugger session]'
+        '--run[Launch the executable with the provided arguments]'
+        '--skip-build[Skip building the executable product]'
+        '--build-tests[Build both source and test targets]'
+        ':executable:{local -a list; list=(${(f)"$(swift package completion-tool list-executables)"}); _describe '''' list}'
+        ':arguments:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
-# Generates completions for swift package
-#
-# In the final compdef file, set the following file header:
-#
-#     #compdef _swift_package
-#     local context state state_descr line
-#     typeset -A opt_args
-_swift_package() {
-    arguments=(
-        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
-        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
-        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
-        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
-        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
-        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
-        "(--chdir -C)"{--chdir,-C}"[]: :_files"
-        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
-        "--disable-prefetching[]"
-        "--skip-update[Skip updating dependencies from their remote during a resolution]"
-        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
-        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
-        "--version[]"
-        "--destination[]: :_files"
-        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
-        "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--force-resolved-versions[]"
-        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
-        "--enable-index-store[Enable indexing-while-building feature]"
-        "--disable-index-store[Disable indexing-while-building feature]"
-        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
-        "--enable-parseable-module-interfaces[]"
-        "--trace-resolver[]"
-        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
-        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
+_swift_build() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--package-path[Specify the package path to operate on (default current directory). This changes the working directory before any other operation]:package-path:_files -/'
+        '--cache-path[Specify the shared cache directory path]:cache-path:_files -/'
+        '--config-path[Specify the shared configuration directory path]:config-path:_files -/'
+        '--security-path[Specify the shared security directory path]:security-path:_files -/'
+        '--scratch-path[Specify a custom scratch directory path (default .build)]:scratch-path:_files -/'
+        '--pkg-config-path[Specify alternative path to search for pkg-config `.pc` files. Use the option multiple times to
+        specify more than one path.]:pkg-config-path:_files -/'
+        '--enable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--disable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--enable-build-manifest-caching'
+        '--disable-build-manifest-caching'
+        '--manifest-cache[Caching mode of Package.swift manifests (shared: shared cache, local: package'"'"'s build directory, none: disabled]:manifest-cache:'
+        '(--verbose -v)'{--verbose,-v}'[Increase verbosity to include informational output]'
+        '(--very-verbose --vv)'{--very-verbose,--vv}'[Increase verbosity to include debug output]'
+        '(--quiet -q)'{--quiet,-q}'[Decrease verbosity to only include error output.]'
+        '--disable-sandbox[Disable using the sandbox when executing subprocesses]'
+        '--netrc[Use netrc file even in cases where other credential stores are preferred]'
+        '--enable-netrc[Load credentials from a netrc file]'
+        '--disable-netrc[Load credentials from a netrc file]'
+        '--netrc-file[Specify the netrc file path]:netrc-file:_files'
+        '--enable-keychain[Search credentials in macOS keychain]'
+        '--disable-keychain[Search credentials in macOS keychain]'
+        '--resolver-fingerprint-checking:resolver-fingerprint-checking:'
+        '--resolver-signing-entity-checking:resolver-signing-entity-checking:'
+        '--enable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--disable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--enable-prefetching'
+        '--disable-prefetching'
+        '(--force-resolved-versions --disable-automatic-resolution --only-use-versions-from-resolved-file)'{--force-resolved-versions,--disable-automatic-resolution,--only-use-versions-from-resolved-file}'[Only use versions from the Package.resolved file and fail resolution if it is out-of-date]'
+        '--skip-update[Skip updating dependencies from their remote during a resolution]'
+        '--disable-scm-to-registry-transformation[disable source control to registry transformation]'
+        '--use-registry-identity-for-scm[look up source control dependencies in the registry and use their registry identity when possible to help deduplicate across the two origins]'
+        '--replace-scm-with-registry[look up source control dependencies in the registry and use the registry to retrieve them instead of source control when possible]'
+        '--default-registry-url[Default registry URL to use, instead of the registries.json configuration file]:default-registry-url:'
+        '(--configuration -c)'{--configuration,-c}'[Build with configuration]:configuration:(debug release)'
+        '-Xcc[Pass flag through to all C compiler invocations]:Xcc:'
+        '-Xswiftc[Pass flag through to all Swift compiler invocations]:Xswiftc:'
+        '-Xlinker[Pass flag through to all linker invocations]:Xlinker:'
+        '-Xcxx[Pass flag through to all C++ compiler invocations]:Xcxx:'
+        '--triple:triple:'
+        '--sdk:sdk:_files -/'
+        '--toolchain:toolchain:_files -/'
+        '--sanitize[Turn on runtime checks for erroneous behavior, possible values: address, thread, undefined, scudo]:sanitize:(address thread undefined scudo)'
+        '--auto-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-index-store[Enable or disable indexing-while-building feature]'
+        '--disable-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-parseable-module-interfaces'
+        '(--jobs -j)'{--jobs,-j}'[The number of jobs to spawn in parallel during the build process]:jobs:'
+        '--emit-swift-module-separately'
+        '--use-integrated-swift-driver'
+        '--explicit-target-dependency-import-check:explicit-target-dependency-import-check:'
+        '--experimental-explicit-module-build'
+        '--build-system:build-system:(native xcode)'
+        '--enable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--disable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--static-swift-stdlib[Link Swift stdlib statically]'
+        '--no-static-swift-stdlib[Link Swift stdlib statically]'
+        '--build-tests[Build both source and test targets]'
+        '--show-bin-path[Print the binary output path]'
+        '--print-manifest-job-graph[Write the command graph for the build manifest as a graphviz file]'
+        '--target[Build the specified target]:target:'
+        '--product[Build the specified product]:product:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_test() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--package-path[Specify the package path to operate on (default current directory). This changes the working directory before any other operation]:package-path:_files -/'
+        '--cache-path[Specify the shared cache directory path]:cache-path:_files -/'
+        '--config-path[Specify the shared configuration directory path]:config-path:_files -/'
+        '--security-path[Specify the shared security directory path]:security-path:_files -/'
+        '--scratch-path[Specify a custom scratch directory path (default .build)]:scratch-path:_files -/'
+        '--pkg-config-path[Specify alternative path to search for pkg-config `.pc` files. Use the option multiple times to
+        specify more than one path.]:pkg-config-path:_files -/'
+        '--enable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--disable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--enable-build-manifest-caching'
+        '--disable-build-manifest-caching'
+        '--manifest-cache[Caching mode of Package.swift manifests (shared: shared cache, local: package'"'"'s build directory, none: disabled]:manifest-cache:'
+        '(--verbose -v)'{--verbose,-v}'[Increase verbosity to include informational output]'
+        '(--very-verbose --vv)'{--very-verbose,--vv}'[Increase verbosity to include debug output]'
+        '(--quiet -q)'{--quiet,-q}'[Decrease verbosity to only include error output.]'
+        '--disable-sandbox[Disable using the sandbox when executing subprocesses]'
+        '--netrc[Use netrc file even in cases where other credential stores are preferred]'
+        '--enable-netrc[Load credentials from a netrc file]'
+        '--disable-netrc[Load credentials from a netrc file]'
+        '--netrc-file[Specify the netrc file path]:netrc-file:_files'
+        '--enable-keychain[Search credentials in macOS keychain]'
+        '--disable-keychain[Search credentials in macOS keychain]'
+        '--resolver-fingerprint-checking:resolver-fingerprint-checking:'
+        '--resolver-signing-entity-checking:resolver-signing-entity-checking:'
+        '--enable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--disable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--enable-prefetching'
+        '--disable-prefetching'
+        '(--force-resolved-versions --disable-automatic-resolution --only-use-versions-from-resolved-file)'{--force-resolved-versions,--disable-automatic-resolution,--only-use-versions-from-resolved-file}'[Only use versions from the Package.resolved file and fail resolution if it is out-of-date]'
+        '--skip-update[Skip updating dependencies from their remote during a resolution]'
+        '--disable-scm-to-registry-transformation[disable source control to registry transformation]'
+        '--use-registry-identity-for-scm[look up source control dependencies in the registry and use their registry identity when possible to help deduplicate across the two origins]'
+        '--replace-scm-with-registry[look up source control dependencies in the registry and use the registry to retrieve them instead of source control when possible]'
+        '--default-registry-url[Default registry URL to use, instead of the registries.json configuration file]:default-registry-url:'
+        '(--configuration -c)'{--configuration,-c}'[Build with configuration]:configuration:(debug release)'
+        '-Xcc[Pass flag through to all C compiler invocations]:Xcc:'
+        '-Xswiftc[Pass flag through to all Swift compiler invocations]:Xswiftc:'
+        '-Xlinker[Pass flag through to all linker invocations]:Xlinker:'
+        '-Xcxx[Pass flag through to all C++ compiler invocations]:Xcxx:'
+        '--triple:triple:'
+        '--sdk:sdk:_files -/'
+        '--toolchain:toolchain:_files -/'
+        '--sanitize[Turn on runtime checks for erroneous behavior, possible values: address, thread, undefined, scudo]:sanitize:(address thread undefined scudo)'
+        '--auto-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-index-store[Enable or disable indexing-while-building feature]'
+        '--disable-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-parseable-module-interfaces'
+        '(--jobs -j)'{--jobs,-j}'[The number of jobs to spawn in parallel during the build process]:jobs:'
+        '--emit-swift-module-separately'
+        '--use-integrated-swift-driver'
+        '--explicit-target-dependency-import-check:explicit-target-dependency-import-check:'
+        '--experimental-explicit-module-build'
+        '--build-system:build-system:(native xcode)'
+        '--enable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--disable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--static-swift-stdlib[Link Swift stdlib statically]'
+        '--no-static-swift-stdlib[Link Swift stdlib statically]'
+        '--skip-build[Skip building the test target]'
+        '--test-product[Test the specified product.]:test-product:'
+        '--parallel[Run the tests in parallel.]'
+        '--num-workers[Number of tests to execute in parallel.]:num-workers:'
+        '(--list-tests -l)'{--list-tests,-l}'[Lists test methods in specifier format]'
+        '(--show-codecov-path --show-code-coverage-path --show-coverage-path)'{--show-codecov-path,--show-code-coverage-path,--show-coverage-path}'[Print the path of the exported code coverage JSON file]'
+        '(-s --specifier)'{-s,--specifier}':specifier:'
+        '--filter[Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>]:filter:'
+        '--skip[Skip test cases matching regular expression, Example: --skip PerformanceTests]:skip:'
+        '--xunit-output[Path where the xUnit xml file should be generated.]:xunit-output:_files -/'
+        '--enable-testable-imports[Enable or disable testable imports. Enabled by default.]'
+        '--disable-testable-imports[Enable or disable testable imports. Enabled by default.]'
+        '--enable-code-coverage[Enable code coverage]'
+        '--disable-code-coverage[Enable code coverage]'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
         '(-): :->command'
         '(-)*:: :->arg'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
     case $state in
         (command)
-            local modes
-            modes=(
-                'completion-tool:Completion tool (for shell completions)'
-                'dump-package:Print parsed Package.swift as JSON'
-                'describe:Describe the current package'
-                'clean:Delete build artifacts'
-                'show-dependencies:Print the resolved dependency graph'
-                'init:Initialize a new package'
-                'unedit:Remove a package from editable mode'
-                'tools-version:Manipulate tools version of the current package'
-                'fetch:'
-                'resolve:Resolve package dependencies'
-                'reset:Reset the complete cache/build directory'
-                'generate-xcodeproj:Generates an Xcode project'
-                'edit:Put a package in editable mode'
-                'config:Manipulate configuration of the package'
-                'update:Update package dependencies'
+            local subcommands
+            subcommands=(
+                'list:Lists test methods in specifier format'
+                'generate-linuxmain:Generate LinuxMain.swift (deprecated)'
             )
-            _describe "mode" modes
+            _describe "subcommand" subcommands
             ;;
         (arg)
             case ${words[1]} in
-                (completion-tool)
-                    _swift_package_completion-tool
+                (list)
+                    _swift_test_list
                     ;;
-                (dump-package)
-                    _swift_package_dump-package
-                    ;;
-                (describe)
-                    _swift_package_describe
+                (generate-linuxmain)
+                    _swift_test_generate-linuxmain
                     ;;
+            esac
+            ;;
+    esac
+
+    return ret
+}
+
+_swift_test_list() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--skip-build[Skip building the test target]'
+        '--test-product[Test the specified product.]:test-product:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_test_generate-linuxmain() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--package-path[Specify the package path to operate on (default current directory). This changes the working directory before any other operation]:package-path:_files -/'
+        '--cache-path[Specify the shared cache directory path]:cache-path:_files -/'
+        '--config-path[Specify the shared configuration directory path]:config-path:_files -/'
+        '--security-path[Specify the shared security directory path]:security-path:_files -/'
+        '--scratch-path[Specify a custom scratch directory path (default .build)]:scratch-path:_files -/'
+        '--pkg-config-path[Specify alternative path to search for pkg-config `.pc` files. Use the option multiple times to
+        specify more than one path.]:pkg-config-path:_files -/'
+        '--enable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--disable-dependency-cache[Use a shared cache when fetching dependencies]'
+        '--enable-build-manifest-caching'
+        '--disable-build-manifest-caching'
+        '--manifest-cache[Caching mode of Package.swift manifests (shared: shared cache, local: package'"'"'s build directory, none: disabled]:manifest-cache:'
+        '(--verbose -v)'{--verbose,-v}'[Increase verbosity to include informational output]'
+        '(--very-verbose --vv)'{--very-verbose,--vv}'[Increase verbosity to include debug output]'
+        '(--quiet -q)'{--quiet,-q}'[Decrease verbosity to only include error output.]'
+        '--disable-sandbox[Disable using the sandbox when executing subprocesses]'
+        '--netrc[Use netrc file even in cases where other credential stores are preferred]'
+        '--enable-netrc[Load credentials from a netrc file]'
+        '--disable-netrc[Load credentials from a netrc file]'
+        '--netrc-file[Specify the netrc file path]:netrc-file:_files'
+        '--enable-keychain[Search credentials in macOS keychain]'
+        '--disable-keychain[Search credentials in macOS keychain]'
+        '--resolver-fingerprint-checking:resolver-fingerprint-checking:'
+        '--resolver-signing-entity-checking:resolver-signing-entity-checking:'
+        '--enable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--disable-signature-validation[Validate signature of a signed package release downloaded from registry]'
+        '--enable-prefetching'
+        '--disable-prefetching'
+        '(--force-resolved-versions --disable-automatic-resolution --only-use-versions-from-resolved-file)'{--force-resolved-versions,--disable-automatic-resolution,--only-use-versions-from-resolved-file}'[Only use versions from the Package.resolved file and fail resolution if it is out-of-date]'
+        '--skip-update[Skip updating dependencies from their remote during a resolution]'
+        '--disable-scm-to-registry-transformation[disable source control to registry transformation]'
+        '--use-registry-identity-for-scm[look up source control dependencies in the registry and use their registry identity when possible to help deduplicate across the two origins]'
+        '--replace-scm-with-registry[look up source control dependencies in the registry and use the registry to retrieve them instead of source control when possible]'
+        '--default-registry-url[Default registry URL to use, instead of the registries.json configuration file]:default-registry-url:'
+        '(--configuration -c)'{--configuration,-c}'[Build with configuration]:configuration:(debug release)'
+        '-Xcc[Pass flag through to all C compiler invocations]:Xcc:'
+        '-Xswiftc[Pass flag through to all Swift compiler invocations]:Xswiftc:'
+        '-Xlinker[Pass flag through to all linker invocations]:Xlinker:'
+        '-Xcxx[Pass flag through to all C++ compiler invocations]:Xcxx:'
+        '--triple:triple:'
+        '--sdk:sdk:_files -/'
+        '--toolchain:toolchain:_files -/'
+        '--sanitize[Turn on runtime checks for erroneous behavior, possible values: address, thread, undefined, scudo]:sanitize:(address thread undefined scudo)'
+        '--auto-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-index-store[Enable or disable indexing-while-building feature]'
+        '--disable-index-store[Enable or disable indexing-while-building feature]'
+        '--enable-parseable-module-interfaces'
+        '(--jobs -j)'{--jobs,-j}'[The number of jobs to spawn in parallel during the build process]:jobs:'
+        '--emit-swift-module-separately'
+        '--use-integrated-swift-driver'
+        '--explicit-target-dependency-import-check:explicit-target-dependency-import-check:'
+        '--experimental-explicit-module-build'
+        '--build-system:build-system:(native xcode)'
+        '--enable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--disable-dead-strip[Disable/enable dead code stripping by the linker]'
+        '--static-swift-stdlib[Link Swift stdlib statically]'
+        '--no-static-swift-stdlib[Link Swift stdlib statically]'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+        '(-): :->command'
+        '(-)*:: :->arg'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+    case $state in
+        (command)
+            local subcommands
+            subcommands=(
+                'clean:Delete build artifacts'
+                'purge-cache:Purge the global repository cache.'
+                'reset:Reset the complete cache/build directory'
+                'update:Update package dependencies'
+                'describe:Describe the current package'
+                'init:Initialize a new package'
+                'diagnose-api-breaking-changes:Diagnose API-breaking changes to Swift modules in a package'
+                'dump-symbol-graph:Dump Symbol Graph'
+                'dump-package:Print parsed Package.swift as JSON'
+                'edit:Put a package in editable mode'
+                'unedit:Remove a package from editable mode'
+                'config:Manipulate configuration of the package'
+                'resolve:Resolve package dependencies'
+                'show-dependencies:Print the resolved dependency graph'
+                'tools-version:Manipulate tools version of the current package'
+                'compute-checksum:Compute the checksum for a binary artifact.'
+                'archive-source:Create a source archive for the package'
+                'completion-tool:Completion tool (for shell completions)'
+                'plugin:Invoke a command plugin or perform other actions on command plugins'
+            )
+            _describe "subcommand" subcommands
+            ;;
+        (arg)
+            case ${words[1]} in
                 (clean)
                     _swift_package_clean
                     ;;
-                (show-dependencies)
-                    _swift_package_show-dependencies
-                    ;;
-                (init)
-                    _swift_package_init
-                    ;;
-                (unedit)
-                    _swift_package_unedit
-                    ;;
-                (tools-version)
-                    _swift_package_tools-version
-                    ;;
-                (fetch)
-                    _swift_package_fetch
-                    ;;
-                (resolve)
-                    _swift_package_resolve
+                (purge-cache)
+                    _swift_package_purge-cache
                     ;;
                 (reset)
                     _swift_package_reset
                     ;;
-                (generate-xcodeproj)
-                    _swift_package_generate-xcodeproj
+                (update)
+                    _swift_package_update
+                    ;;
+                (describe)
+                    _swift_package_describe
+                    ;;
+                (init)
+                    _swift_package_init
+                    ;;
+                (diagnose-api-breaking-changes)
+                    _swift_package_diagnose-api-breaking-changes
+                    ;;
+                (dump-symbol-graph)
+                    _swift_package_dump-symbol-graph
+                    ;;
+                (dump-package)
+                    _swift_package_dump-package
                     ;;
                 (edit)
                     _swift_package_edit
                     ;;
+                (unedit)
+                    _swift_package_unedit
+                    ;;
                 (config)
                     _swift_package_config
                     ;;
-                (update)
-                    _swift_package_update
+                (resolve)
+                    _swift_package_resolve
+                    ;;
+                (show-dependencies)
+                    _swift_package_show-dependencies
+                    ;;
+                (tools-version)
+                    _swift_package_tools-version
+                    ;;
+                (compute-checksum)
+                    _swift_package_compute-checksum
+                    ;;
+                (archive-source)
+                    _swift_package_archive-source
+                    ;;
+                (completion-tool)
+                    _swift_package_completion-tool
+                    ;;
+                (plugin)
+                    _swift_package_plugin
                     ;;
             esac
             ;;
     esac
-}
 
-_swift_package_completion-tool() {
-    arguments=(
-        ": :{_values '' 'generate-bash-script[generate Bash completion script]' 'generate-zsh-script[generate Bash completion script]' 'list-dependencies[list all dependencies' names]' 'list-executables[list all executables' names]'}"
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_dump-package() {
-    arguments=(
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_describe() {
-    arguments=(
-        "--type[json|text]: :{_values '' 'text[describe using text format]' 'json[describe using JSON format]'}"
-    )
-    _arguments $arguments && return
+    return ret
 }
 
 _swift_package_clean() {
-    arguments=(
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
-_swift_package_show-dependencies() {
-    arguments=(
-        "--format[text|dot|json|flatlist]: :{_values '' 'text[list dependencies using text format]' 'dot[list dependencies using dot format]' 'json[list dependencies using JSON format]'}"
+_swift_package_purge-cache() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
-}
+    _arguments -w -s -S $args[@] && ret=0
 
-_swift_package_init() {
-    arguments=(
-        "--type[empty|library|executable|system-module|manifest]: :{_values '' 'empty[generates an empty project]' 'library[generates project for a dynamic library]' 'executable[generates a project for a cli executable]' 'system-module[generates a project for a system module]'}"
-        "--name[Provide custom package name]:Provide custom package name: "
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_unedit() {
-    arguments=(
-        ":The name of the package to unedit:_swift_dependency"
-        "--force[Unedit the package even if it has uncommitted and unpushed changes.]"
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_tools-version() {
-    arguments=(
-        "--set[Set tools version of package to the given value]:Set tools version of package to the given value: "
-        "--set-current[Set tools version of package to the current tools version in use]"
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_fetch() {
-    arguments=(
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_resolve() {
-    arguments=(
-        ":The name of the package to resolve:_swift_dependency"
-        "--version[The version to resolve at]:The version to resolve at: "
-        "--branch[The branch to resolve at]:The branch to resolve at: "
-        "--revision[The revision to resolve at]:The revision to resolve at: "
-    )
-    _arguments $arguments && return
+    return ret
 }
 
 _swift_package_reset() {
-    arguments=(
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
-_swift_package_generate-xcodeproj() {
-    arguments=(
-        "--xcconfig-overrides[Path to xcconfig file]:Path to xcconfig file:_files"
-        "--enable-code-coverage[Enable code coverage in the generated project]"
-        "--output[Path where the Xcode project should be generated]:Path where the Xcode project should be generated:_files"
-        "--legacy-scheme-generator[Use the legacy scheme generator]"
-        "--watch[Watch for changes to the Package manifest to regenerate the Xcode project]"
-        "--skip-extra-files[Do not add file references for extra files to the generated Xcode project]"
+_swift_package_update() {
+    integer ret=1
+    local -a args
+    args+=(
+        '(--dry-run -n)'{--dry-run,-n}'[Display the list of dependencies that can be updated]'
+        ':packages:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_describe() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--type[json | text]:type:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_init() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--type[Package type:]:type:'
+        '--name[Provide custom package name]:name:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_diagnose-api-breaking-changes() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--breakage-allowlist-path[The path to a text file containing breaking changes which should be ignored by the API comparison. Each ignored breaking change in the file should appear on its own line and contain the exact message to be ignored (e.g. '"'"'API breakage: func foo() has been removed'"'"').]:breakage-allowlist-path:_files -/'
+        ':treeish:'
+        '--products[One or more products to include in the API comparison. If present, only the specified products (and any targets specified using `--targets`) will be compared.]:products:'
+        '--targets[One or more targets to include in the API comparison. If present, only the specified targets (and any products specified using `--products`) will be compared.]:targets:'
+        '--baseline-dir[The path to a directory used to store API baseline files. If unspecified, a temporary directory will be used.]:baseline-dir:_files -/'
+        '--regenerate-baseline[Regenerate the API baseline, even if an existing one is available.]'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_dump-symbol-graph() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--pretty-print[Pretty-print the output JSON.]'
+        '--skip-synthesized-members[Skip members inherited through classes or default implementations.]'
+        '--minimum-access-level[Include symbols with this access level or more. Possible values: private | fileprivate | internal | public | open]:minimum-access-level:(private fileprivate internal public open)'
+        '--skip-inherited-docs[Skip emitting doc comments for members inherited through classes or default implementations.]'
+        '--include-spi-symbols[Add symbols with SPI information to the symbol graph.]'
+        '--emit-extension-block-symbols[Emit extension block symbols for extensions to external types or directly associate members and conformances with the extended nominal.]'
+        '--omit-extension-block-symbols[Emit extension block symbols for extensions to external types or directly associate members and conformances with the extended nominal.]'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_dump-package() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
 _swift_package_edit() {
-    arguments=(
-        ":The name of the package to edit:_swift_dependency"
-        "--revision[The revision to edit]:The revision to edit: "
-        "--branch[The branch to create]:The branch to create: "
-        "--path[Create or use the checkout at this path]:Create or use the checkout at this path:_files"
+    integer ret=1
+    local -a args
+    args+=(
+        '--revision[The revision to edit]:revision:'
+        '--branch[The branch to create]:branch:'
+        '--path[Create or use the checkout at this path]:path:_files -/'
+        ':package-name:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_unedit() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--force[Unedit the package even if it has uncommitted and unpushed changes]'
+        ':package-name:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
 _swift_package_config() {
-    arguments=(
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
         '(-): :->command'
         '(-)*:: :->arg'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
     case $state in
         (command)
-            local modes
-            modes=(
+            local subcommands
+            subcommands=(
+                'set-mirror:Set a mirror for a dependency'
                 'unset-mirror:Remove an existing mirror'
                 'get-mirror:Print mirror configuration for the given package dependency'
-                'set-mirror:Set a mirror for a dependency'
             )
-            _describe "mode" modes
+            _describe "subcommand" subcommands
             ;;
         (arg)
             case ${words[1]} in
+                (set-mirror)
+                    _swift_package_config_set-mirror
+                    ;;
                 (unset-mirror)
                     _swift_package_config_unset-mirror
                     ;;
                 (get-mirror)
                     _swift_package_config_get-mirror
                     ;;
-                (set-mirror)
-                    _swift_package_config_set-mirror
-                    ;;
             esac
             ;;
     esac
-}
 
-_swift_package_config_unset-mirror() {
-    arguments=(
-        "--package-url[The package dependency url]:The package dependency url: "
-        "--mirror-url[The mirror url]:The mirror url: "
-    )
-    _arguments $arguments && return
-}
-
-_swift_package_config_get-mirror() {
-    arguments=(
-        "--package-url[The package dependency url]:The package dependency url: "
-    )
-    _arguments $arguments && return
+    return ret
 }
 
 _swift_package_config_set-mirror() {
-    arguments=(
-        "--package-url[The package dependency url]:The package dependency url: "
-        "--mirror-url[The mirror url]:The mirror url: "
+    integer ret=1
+    local -a args
+    args+=(
+        '--original[The original url or identity]:original:'
+        '--mirror[The mirror url or identity]:mirror:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
-_swift_package_update() {
-    arguments=(
+_swift_package_config_unset-mirror() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--original[The original url or identity]:original:'
+        '--mirror[The mirror url or identity]:mirror:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
-# Generates completions for swift test
-#
-# In the final compdef file, set the following file header:
-#
-#     #compdef _swift_test
-#     local context state state_descr line
-#     typeset -A opt_args
-_swift_test() {
-    arguments=(
-        "-Xcc[Pass flag through to all C compiler invocations]:Pass flag through to all C compiler invocations: "
-        "-Xswiftc[Pass flag through to all Swift compiler invocations]:Pass flag through to all Swift compiler invocations: "
-        "-Xlinker[Pass flag through to all linker invocations]:Pass flag through to all linker invocations: "
-        "-Xcxx[Pass flag through to all C++ compiler invocations]:Pass flag through to all C++ compiler invocations: "
-        "(--configuration -c)"{--configuration,-c}"[Build with configuration (debug|release) ]: :{_values '' 'debug[build with DEBUG configuration]' 'release[build with RELEASE configuration]'}"
-        "--build-path[Specify build/cache directory ]:Specify build/cache directory :_files"
-        "(--chdir -C)"{--chdir,-C}"[]: :_files"
-        "--package-path[Change working directory before any other operation]:Change working directory before any other operation:_files"
-        "--sanitize[Turn on runtime checks for erroneous behavior]: :{_values '' 'address[enable Address sanitizer]' 'thread[enable Thread sanitizer]' 'undefined[enable Undefined Behavior sanitizer]'}"
-        "--disable-prefetching[]"
-        "--skip-update[Skip updating dependencies from their remote during a resolution]"
-        "--disable-sandbox[Disable using the sandbox when executing subprocesses]"
-        "--disable-package-manifest-caching[Disable caching Package.swift manifests]"
-        "--version[]"
-        "--destination[]: :_files"
-        "(--verbose -v)"{--verbose,-v}"[Increase verbosity of informational output]"
-        "--no-static-swift-stdlib[Do not link Swift stdlib statically \[default\]]"
-        "--static-swift-stdlib[Link Swift stdlib statically]"
-        "--force-resolved-versions[]"
-        "--disable-automatic-resolution[Disable automatic resolution if Package.resolved file is out-of-date]"
-        "--enable-index-store[Enable indexing-while-building feature]"
-        "--disable-index-store[Disable indexing-while-building feature]"
-        "--enable-pubgrub-resolver[\[Experimental\] Enable the new Pubgrub dependency resolver]"
-        "--enable-parseable-module-interfaces[]"
-        "--trace-resolver[]"
-        "(--jobs -j)"{--jobs,-j}"[The number of jobs to spawn in parallel during the build process]:The number of jobs to spawn in parallel during the build process: "
-        "--enable-test-discovery[Enable test discovery on platforms without Objective-C runtime]"
-        "--skip-build[Skip building the test target]"
-        "(--list-tests -l)"{--list-tests,-l}"[Lists test methods in specifier format]"
-        "--generate-linuxmain[Generate LinuxMain.swift entries for the package]"
-        "--parallel[Run the tests in parallel.]"
-        "--num-workers[Number of tests to execute in parallel.]:Number of tests to execute in parallel.: "
-        "(--specifier -s)"{--specifier,-s}"[]: : "
-        "--xunit-output[]: :_files"
-        "--filter[Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>]:Run test cases matching regular expression, Format: <test-target>.<test-case> or <test-target>.<test-case>/<test>: "
-        "--enable-code-coverage[Test with code coverage enabled]"
+_swift_package_config_get-mirror() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--original[The original url or identity]:original:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
     )
-    _arguments $arguments && return
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
 }
 
-_swift_compiler() {
+_swift_package_resolve() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--version[The version to resolve at]:version:'
+        '--branch[The branch to resolve at]:branch:'
+        '--revision[The revision to resolve at]:revision:'
+        ':package-name:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_show-dependencies() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--format[text | dot | json | flatlist]:format:'
+        '(--output-path -o)'{--output-path,-o}'[The absolute or relative path to output the resolved dependency graph.]:output-path:_files -/'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_tools-version() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--set-current[Set tools version of package to the current tools version in use]'
+        '--set[Set tools version of package to the given value]:set:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_compute-checksum() {
+    integer ret=1
+    local -a args
+    args+=(
+        ':path:_files -/'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_archive-source() {
+    integer ret=1
+    local -a args
+    args+=(
+        '(-o --output)'{-o,--output}'[The absolute or relative path for the generated source archive]:output:_files -/'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_completion-tool() {
+    integer ret=1
+    local -a args
+    args+=(
+        ':mode:(generate-bash-script generate-zsh-script generate-fish-script list-dependencies list-executables list-snippets)'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_package_plugin() {
+    integer ret=1
+    local -a args
+    args+=(
+        '--list[List the available command plugins]'
+        '--allow-writing-to-package-directory[Allow the plugin to write to the package directory]'
+        '--allow-writing-to-directory[Allow the plugin to write to an additional directory]:allow-writing-to-directory:'
+        '--allow-network-connections:allow-network-connections:(none local all docker unixDomainSocket)'
+        ':command:'
+        ':arguments:'
+        '--version[Show the version.]'
+        '(-help -h --help)'{-help,-h,--help}'[Show help information.]'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+_swift_help() {
+    integer ret=1
+    local -a args
+    args+=(
+        ':subcommands:'
+    )
+    _arguments -w -s -S $args[@] && ret=0
+
+    return ret
+}
+
+
+_custom_completion() {
+    local completions=("${(@f)$($*)}")
+    _describe '' completions
 }
 
 _swift
diff --git a/zsh/plugins/symfony6/README.md b/zsh/plugins/symfony6/README.md
new file mode 100644
index 0000000..54611bc
--- /dev/null
+++ b/zsh/plugins/symfony6/README.md
@@ -0,0 +1,9 @@
+# Symfony
+
+This plugin provides native completion for [Symfony](https://symfony.com/), but requires at least Symfony 6.2.
+
+To use it add `symfony6` to the plugins array in your zshrc file.
+
+```bash
+plugins=(... symfony6)
+```
diff --git a/zsh/plugins/symfony6/symfony6.plugin.zsh b/zsh/plugins/symfony6/symfony6.plugin.zsh
new file mode 100644
index 0000000..ed7dbe6
--- /dev/null
+++ b/zsh/plugins/symfony6/symfony6.plugin.zsh
@@ -0,0 +1,82 @@
+#compdef console
+
+# This file is part of the Symfony package.
+#
+# (c) Fabien Potencier <fabien@symfony.com>
+#
+# For the full copyright and license information, please view
+# https://symfony.com/doc/current/contributing/code/license.html
+
+#
+# zsh completions for console
+#
+# References:
+#   - https://github.com/spf13/cobra/blob/master/zsh_completions.go
+#   - https://github.com/symfony/symfony/blob/5.4/src/Symfony/Component/Console/Resources/completion.bash
+#
+_sf_console() {
+    local lastParam flagPrefix requestComp out comp
+    local -a completions
+
+    # The user could have moved the cursor backwards on the command-line.
+    # We need to trigger completion from the $CURRENT location, so we need
+    # to truncate the command-line ($words) up to the $CURRENT location.
+    # (We cannot use $CURSOR as its value does not work when a command is an alias.)
+    words=("${=words[1,CURRENT]}") lastParam=${words[-1]}
+
+    # For zsh, when completing a flag with an = (e.g., console -n=<TAB>)
+    # completions must be prefixed with the flag
+    setopt local_options BASH_REMATCH
+    if [[ "${lastParam}" =~ '-.*=' ]]; then
+        # We are dealing with a flag with an =
+        flagPrefix="-P ${BASH_REMATCH}"
+    fi
+
+    # Prepare the command to obtain completions
+    requestComp="${words[0]} ${words[1]} _complete --no-interaction -szsh -a1 -c$((CURRENT-1))" i=""
+    for w in ${words[@]}; do
+        w=$(printf -- '%b' "$w")
+        # remove quotes from typed values
+        quote="${w:0:1}"
+        if [ "$quote" = \' ]; then
+            w="${w%\'}"
+            w="${w#\'}"
+        elif [ "$quote" = \" ]; then
+            w="${w%\"}"
+            w="${w#\"}"
+        fi
+        # empty values are ignored
+        if [ ! -z "$w" ]; then
+            i="${i}-i${w} "
+        fi
+    done
+
+    # Ensure at least 1 input
+    if [ "${i}" = "" ]; then
+        requestComp="${requestComp} -i\" \""
+    else
+        requestComp="${requestComp} ${i}"
+    fi
+
+    # Use eval to handle any environment variables and such
+    out=$(eval ${requestComp} 2>/dev/null)
+
+    while IFS='\n' read -r comp; do
+        if [ -n "$comp" ]; then
+            # If requested, completions are returned with a description.
+            # The description is preceded by a TAB character.
+            # For zsh's _describe, we need to use a : instead of a TAB.
+            # We first need to escape any : as part of the completion itself.
+            comp=${comp//:/\\:}
+            local tab=$(printf '\t')
+            comp=${comp//$tab/:}
+            completions+=${comp}
+        fi
+    done < <(printf "%s\n" "${out[@]}")
+
+    # Let inbuilt _describe handle completions
+    eval _describe "completions" completions $flagPrefix
+    return $?
+}
+
+compdef _sf_console console
diff --git a/zsh/plugins/systemadmin/README.md b/zsh/plugins/systemadmin/README.md
index 3a9d9de..7847e15 100644
--- a/zsh/plugins/systemadmin/README.md
+++ b/zsh/plugins/systemadmin/README.md
@@ -1,7 +1,7 @@
 # Systemadmin plugin
 
 This plugin adds a series of aliases and functions which make a System Administrator's life easier.
- 
+
 To use it, add `systemadmin` to the plugins array in your zshrc file:
 
 ```zsh
@@ -13,6 +13,7 @@ plugins=(... systemadmin)
 | Alias   | Command                                                                    | Description                                                        |
 |---------|----------------------------------------------------------------------------|--------------------------------------------------------------------|
 | ping    | `ping -c 5`                                                                | Sends only 5 ICMP Messages                                         |
+| ping6   | `ping6 -c 5`                                                               | Sends only 5 ICMPv6 Messages                                       |
 | clr     | `clear; echo Currently logged in on $TTY, as $USERNAME in directory $PWD.` | Clears the screen and prints the current user, TTY, and directory  |
 | path    | `print -l $path`                                                           | Displays PATH with each entry on a separate line                   |
 | mkdir   | `mkdir -pv`                                                                | Automatically create parent directories and display verbose output |
@@ -48,4 +49,4 @@ plugins=(... systemadmin)
 | geteip      | Gather information regarding an external IP address using [icanhazip.com](https://icanhazip.com)                      |
 | getip       | Determine the local IP Address with `ip addr` or `ifconfig`                                                           |
 | clrz        | Clear zombie processes                                                                                                |
-| conssec     | Show number of concurrent connections per second based on ngnix/access.log file or another log file if specified      |
+| conssec     | Show number of concurrent connections per second based on nginx/access.log file or another log file if specified      |
diff --git a/zsh/plugins/systemadmin/systemadmin.plugin.zsh b/zsh/plugins/systemadmin/systemadmin.plugin.zsh
index 8e5e0af..fa7e5f7 100644
--- a/zsh/plugins/systemadmin/systemadmin.plugin.zsh
+++ b/zsh/plugins/systemadmin/systemadmin.plugin.zsh
@@ -13,14 +13,15 @@
 # ------------------------------------------------------------------------------
 
 function retlog() {
-    if [[ -z $1 ]];then
-        echo '/var/log/nginx/access.log'
-    else
-        echo $1
-    fi
+  if [[ -z $1 ]];then
+    echo '/var/log/nginx/access.log'
+  else
+    echo $1
+  fi
 }
 
 alias ping='ping -c 5'
+alias ping6='ping6 -c 5'
 alias clr='clear; echo Currently logged in on $TTY, as $USERNAME in directory $PWD.'
 alias path='print -l $path'
 alias mkdir='mkdir -pv'
@@ -28,128 +29,160 @@ alias mkdir='mkdir -pv'
 alias psmem='ps -e -orss=,args= | sort -b -k1 -nr'
 alias psmem10='ps -e -orss=,args= | sort -b -k1 -nr | head -n 10'
 # get top process eating cpu if not work try execute : export LC_ALL='C'
-alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr'
-alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args|sort -k1,1n -nr | head -n 10'
+alias pscpu='ps -e -o pcpu,cpu,nice,state,cputime,args | sort -k1,1n -nr'
+alias pscpu10='ps -e -o pcpu,cpu,nice,state,cputime,args | sort -k1,1n -nr | head -n 10'
 # top10 of the history
 alias hist10='print -l ${(o)history%% *} | uniq -c | sort -nr | head -n 10'
 
+function ip() {
+  if [ -t 1 ]; then
+    command ip -color "$@"
+  else
+    command ip "$@"
+  fi
+}
+
 # directory LS
 function dls() {
-    print -l *(/)
+  print -l *(/)
 }
 function psgrep() {
-    ps aux | grep "${1:-.}" | grep -v grep
+  ps aux | grep "${1:-.}" | grep -v grep
 }
 # Kills any process that matches a regexp passed to it
 function killit() {
-    ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
+  ps aux | grep -v "grep" | grep "$@" | awk '{print $2}' | xargs sudo kill
 }
 
 # list contents of directories in a tree-like format
 if ! (( $+commands[tree] )); then
-    function tree() {
-        find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
-    }
+  function tree() {
+    find $@ -print | sed -e 's;[^/]*/;|____;g;s;____|; |;g'
+  }
 fi
 
 # Sort connection state
 function sortcons() {
-    netstat -nat |awk '{print $6}'|sort|uniq -c|sort -rn
+  {
+    LANG= ss -nat | awk 'NR > 1 {print $1}' \
+    || LANG= netstat -nat | awk 'NR > 2 {print $6}'
+  } | sort | uniq -c | sort -rn
 }
 
 # View all 80 Port Connections
 function con80() {
-    netstat -nat|grep -i ":80"|wc -l
+  {
+    LANG= ss -nat || LANG= netstat -nat
+  } | grep -E ":80[^0-9]" | wc -l
 }
 
 # On the connected IP sorted by the number of connections
 function sortconip() {
-    netstat -ntu | awk '{print $5}' | cut -d: -f1 | sort | uniq -c | sort -n
+  {
+    LANG= ss -ntu | awk 'NR > 1 {print $6}' \
+    || LANG= netstat -ntu | awk 'NR > 2 {print $5}'
+  } | cut -d: -f1 | sort | uniq -c | sort -n
 }
 
 # top20 of Find the number of requests on 80 port
 function req20() {
-    netstat -anlp|grep 80|grep tcp|awk '{print $5}'|awk -F: '{print $1}'|sort|uniq -c|sort -nr|head -n20
+  {
+    LANG= ss -tn | awk '$4 ~ /:80$/ {print $5}' \
+    || LANG= netstat -tn | awk '$4 ~ /:80$/ {print $5}'
+  } | awk -F: '{print $1}' | sort | uniq -c | sort -nr | head -n 20
 }
 
 # top20 of Using tcpdump port 80 access to view
 function http20() {
-    sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr |head -n 20
+  sudo tcpdump -i eth0 -tnn dst port 80 -c 1000 | awk -F"." '{print $1"."$2"."$3"."$4}' | sort | uniq -c | sort -nr | head -n 20
 }
 
 # top20 of Find time_wait connection
 function timewait20() {
-    netstat -n|grep TIME_WAIT|awk '{print $5}'|sort|uniq -c|sort -rn|head -n20
+  {
+    LANG= ss -nat | awk 'NR > 1 && /TIME-WAIT/ {print $5}' \
+    || LANG= netstat -nat | awk 'NR > 2 && /TIME_WAIT/ {print $5}'
+  } | sort | uniq -c | sort -rn | head -n 20
 }
 
 # top20 of Find SYN connection
 function syn20() {
-    netstat -an | grep SYN | awk '{print $5}' | awk -F: '{print $1}' | sort | uniq -c | sort -nr|head -n20
+  {
+    LANG= ss -an | awk '/SYN/ {print $5}' \
+    || LANG= netstat -an | awk '/SYN/ {print $5}'
+  } | awk -F: '{print $1}' | sort | uniq -c | sort -nr | head -n20
 }
 
 # Printing process according to the port number
 function port_pro() {
-    netstat -ntlp | grep "${1:-.}" | awk '{print $7}' | cut -d/ -f1
+  LANG= ss -ntlp | awk "NR > 1 && /:${1:-}/ {print \$6}" | sed 's/.*pid=\([^,]*\).*/\1/' \
+  || LANG= netstat -ntlp | awk "NR > 2 && /:${1:-}/ {print \$7}" | cut -d/ -f1
 }
 
 # top10 of gain access to the ip address
 function accessip10() {
-    awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
+  awk '{counts[$(11)]+=1}; END {for(url in counts) print counts[url], url}' "$(retlog)"
 }
 
 # top20 of Most Visited file or page
 function visitpage20() {
-    awk '{print $11}' "$(retlog)"|sort|uniq -c|sort -nr|head -n 20
+  awk '{print $11}' "$(retlog)" | sort | uniq -c | sort -nr | head -n 20
 }
 
 # top100 of Page lists the most time-consuming (more than 60 seconds) as well as the corresponding page number of occurrences
 function consume100() {
-    awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
-    # if django website or other website make by no suffix language
-    # awk '{print $7}' "$(retlog)" |sort -n|uniq -c|sort -nr|head -n 100
+  awk '($NF > 60 && $7~/\.php/){print $7}' "$(retlog)" | sort -n | uniq -c | sort -nr | head -n 100
+  # if django website or other website make by no suffix language
+  # awk '{print $7}' "$(retlog)" | sort -n | uniq -c | sort -nr | head -n 100
 }
 
 # Website traffic statistics (G)
 function webtraffic() {
-    awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
+  awk "{sum+=$10} END {print sum/1024/1024/1024}" "$(retlog)"
 }
 
 # Statistical connections 404
 function c404() {
-    awk '($9 ~/404/)' "$(retlog)" | awk '{print $9,$7}' | sort
+  awk '($9 ~ /404/)' "$(retlog)" | awk '{print $9,$7}' | sort
 }
 
 # Statistical http status.
 function httpstatus() {
-    awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
+  awk '{counts[$(9)]+=1}; END {for(code in counts) print code, counts[code]}' "$(retlog)"
 }
 
 # Delete 0 byte file
 function d0() {
-    find "${1:-.}" -type f -size 0 -exec rm -rf {} \;
+  find "${1:-.}" -type f -size 0 -exec rm -rf {} \;
 }
 
 # gather external ip address
 function geteip() {
-    curl -s -S -4 https://icanhazip.com
-    curl -s -S -6 https://icanhazip.com
+  curl -s -S -4 https://icanhazip.com
+
+  # handle case when there is no IPv6 external IP, which shows error
+  # curl: (7) Couldn't connect to server
+  curl -s -S -6 https://icanhazip.com 2>/dev/null
+  local ret=$?
+  (( ret == 7 )) && print -P -u2 "%F{red}error: no IPv6 route to host%f"
+  return $ret
 }
 
 # determine local IP address(es)
 function getip() {
-    if (( ${+commands[ip]} )); then
-        ip addr | awk '/inet /{print $2}' | command grep -v 127.0.0.1
-    else
-        ifconfig | awk '/inet /{print $2}' | command grep -v 127.0.0.1
-    fi
+  if (( ${+commands[ip]} )); then
+    ip addr | awk '/inet /{print $2}' | command grep -v 127.0.0.1
+  else
+    ifconfig | awk '/inet /{print $2}' | command grep -v 127.0.0.1
+  fi
 }
 
 # Clear zombie processes
 function clrz() {
-    ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
+  ps -eal | awk '{ if ($2 == "Z") {print $4}}' | kill -9
 }
 
 # Second concurrent
 function conssec() {
-    awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)"|sort -k 2 -nr|head -n10
+  awk '{if($9~/200|30|404/)COUNT[$4]++}END{for( a in COUNT) print a,COUNT[a]}' "$(retlog)" | sort -k 2 -nr | head -n10
 }
diff --git a/zsh/plugins/systemd/README.md b/zsh/plugins/systemd/README.md
index ffa0567..755c649 100644
--- a/zsh/plugins/systemd/README.md
+++ b/zsh/plugins/systemd/README.md
@@ -12,6 +12,7 @@ plugins=(... systemd)
 
 | Alias                  | Command                            | Description                                                      |
 |:-----------------------|:-----------------------------------|:-----------------------------------------------------------------|
+| `sc-failed`            | `systemctl --failed`               | List failed systemd units                                        |
 | `sc-list-units`        | `systemctl list-units`             | List all units systemd has in memory                             |
 | `sc-is-active`         | `systemctl is-active`              | Show whether a unit is active                                    |
 | `sc-status`            | `systemctl status`                 | Show terse runtime status information about one or more units    |
diff --git a/zsh/plugins/systemd/systemd.plugin.zsh b/zsh/plugins/systemd/systemd.plugin.zsh
index 7afd2be..382a57b 100644
--- a/zsh/plugins/systemd/systemd.plugin.zsh
+++ b/zsh/plugins/systemd/systemd.plugin.zsh
@@ -93,6 +93,9 @@ alias scu-enable-now="scu-enable --now"
 alias scu-disable-now="scu-disable --now"
 alias scu-mask-now="scu-mask --now"
 
+# --failed commands
+alias scu-failed='systemctl --user --failed'
+alias sc-failed='systemctl --failed'
 
 function systemd_prompt_info {
   local unit
@@ -107,6 +110,8 @@ function systemd_prompt_info {
 
     if systemctl is-active "$unit" &>/dev/null; then
       echo -n "$ZSH_THEME_SYSTEMD_PROMPT_ACTIVE"
+    elif systemctl --user is-active "$unit" &>/dev/null; then
+      echo -n "$ZSH_THEME_SYSTEMD_PROMPT_ACTIVE"
     else
       echo -n "$ZSH_THEME_SYSTEMD_PROMPT_NOTACTIVE"
     fi
diff --git a/zsh/plugins/tailscale/README.md b/zsh/plugins/tailscale/README.md
new file mode 100644
index 0000000..be5a621
--- /dev/null
+++ b/zsh/plugins/tailscale/README.md
@@ -0,0 +1,11 @@
+# tailscale
+
+This plugin provides completion for [tailscale](https://tailscale.com/) (Easy software-defined networks using an implementation of wireguard).
+
+To use it, add `tailscale` to the plugins array in your zshrc file.
+
+```
+plugins=(... tailscale)
+```
+
+**Author:** [@lukeab](https://github.com/lukeab)
diff --git a/zsh/plugins/tailscale/tailscale.plugin.zsh b/zsh/plugins/tailscale/tailscale.plugin.zsh
new file mode 100644
index 0000000..8b4e1e3
--- /dev/null
+++ b/zsh/plugins/tailscale/tailscale.plugin.zsh
@@ -0,0 +1,25 @@
+if (( ! $+commands[tailscale] && ! $+aliases[tailscale] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `tailscale`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_tailscale" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _tailscale
+
+  if (( $+commands[tailscale] )); then
+    _comps[tailscale]=_tailscale
+  elif (( $+aliases[tailscale] )); then
+    _comps[${aliases[tailscale]:t}]=_tailscale
+  fi
+fi
+
+# If using the alias, let's make sure that the aliased executable is also bound
+# in case the alias points to "Tailscale" instead of "tailscale".
+# See https://github.com/ohmyzsh/ohmyzsh/discussions/12928
+if (( $+aliases[tailscale] )); then
+  _comps[${aliases[tailscale]:t}]=_tailscale
+fi
+
+tailscale completion zsh >| "$ZSH_CACHE_DIR/completions/_tailscale" &|
diff --git a/zsh/plugins/task/README.md b/zsh/plugins/task/README.md
new file mode 100644
index 0000000..4ef931c
--- /dev/null
+++ b/zsh/plugins/task/README.md
@@ -0,0 +1,9 @@
+# Task plugin
+
+This plugin adds completion for [Task CLI](https://taskfile.dev/), a fast, cross-platform build tool inspired by Make, designed for modern workflows.
+
+To use it, add `task` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... task)
+```
\ No newline at end of file
diff --git a/zsh/plugins/task/task.plugin.zsh b/zsh/plugins/task/task.plugin.zsh
new file mode 100644
index 0000000..86b21b3
--- /dev/null
+++ b/zsh/plugins/task/task.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the task CLI (task).
+if (( !$+commands[task] )); then
+  return
+fi
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `task`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_task" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _task
+  _comps[task]=_task
+fi
+
+# Generate and load task completion
+task --completion zsh >! "$ZSH_CACHE_DIR/completions/_task" &|
\ No newline at end of file
diff --git a/zsh/plugins/term_tab/README b/zsh/plugins/term_tab/README
deleted file mode 100644
index 316062e..0000000
--- a/zsh/plugins/term_tab/README
+++ /dev/null
@@ -1,16 +0,0 @@
-
-term_tab - 'cwd' for all open zsh sessions
-******************************************
-
-What it does:
-*************
-This plugin allows to complete the 'cwd' of other Zsh sessions. Sounds
-complicated but is rather simple. E.g. if you have three zsh sessions open, in
-each session you are in a different folder, you can hit Ctrl+v in one session
-to show you the current working directory of the other open zsh sessions.
-
-How it works:
-*************
-* It uses 'pidof zsh' to determine all zsh PIDs
-* It reads procfs to get the current working directory of this session
-* Everything is fed into zsh's completion magic
diff --git a/zsh/plugins/term_tab/README.md b/zsh/plugins/term_tab/README.md
new file mode 100644
index 0000000..59462a8
--- /dev/null
+++ b/zsh/plugins/term_tab/README.md
@@ -0,0 +1,18 @@
+# term_tab plugin
+
+This plugin only works for Solaris and linux.
+
+term_tab - `cwd` for all open zsh sessions
+
+## What it does:
+
+This plugin allows to complete the `cwd` of other Zsh sessions. Sounds
+complicated but is rather simple. E.g. if you have three zsh sessions open, in
+each session you are in a different folder, you can hit `Ctrl+V` in one session
+to show you the current working directory of the other open zsh sessions.
+
+## How it works:
+
+* It uses `pidof zsh` to determine all zsh PIDs
+* It reads procfs to get the current working directory of this session
+* Everything is fed into zsh's completion magic
diff --git a/zsh/plugins/term_tab/term_tab.plugin.zsh b/zsh/plugins/term_tab/term_tab.plugin.zsh
index 1b612df..89acd91 100644
--- a/zsh/plugins/term_tab/term_tab.plugin.zsh
+++ b/zsh/plugins/term_tab/term_tab.plugin.zsh
@@ -28,6 +28,7 @@ function _term_list(){
   case $OSTYPE in
     solaris*) dirs=( ${(M)${${(f)"$(pgrep -U $UID -x zsh|xargs pwdx)"}:#$$:*}%%/*} ) ;;
     linux*) dirs=( /proc/${^$(pidof zsh):#$$}/cwd(N:A) ) ;;
+    darwin*) dirs=( $( lsof -d cwd -c zsh -a -w -Fn | sed -n 's/^n//p' ) ) ;;
   esac
   dirs=( ${(D)dirs} )
 
diff --git a/zsh/plugins/terraform/README.md b/zsh/plugins/terraform/README.md
index 59c6e7f..711139e 100644
--- a/zsh/plugins/terraform/README.md
+++ b/zsh/plugins/terraform/README.md
@@ -1,7 +1,7 @@
 # Terraform plugin
 
-Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently.
-It adds completion for `terraform`, as well as aliases and a prompt function.
+Plugin for Terraform, a tool from Hashicorp for managing infrastructure safely and efficiently. It adds
+completion for `terraform`, as well as aliases and a prompt function.
 
 To use it, add `terraform` to the plugins array of your `~/.zshrc` file:
 
@@ -11,28 +11,44 @@ plugins=(... terraform)
 
 ## Requirements
 
-* [Terraform](https://terraform.io/)
+- [Terraform](https://terraform.io/)
 
 ## Aliases
 
-| Alias | Command              |
-| ----- | -------------------- |
-| `tf`  | `terraform`          |
-| `tfa` | `terraform apply`    |
-| `tfd` | `terraform destroy`  |
-| `tff` | `terraform fmt`      |
-| `tfi` | `terraform init`     |
-| `tfo` | `terraform output`   |
-| `tfp` | `terraform plan`     |
-| `tfv` | `terraform validate` |
+| Alias   | Command                                |
+|---------|----------------------------------------|
+| `tf`    | `terraform`                            |
+| `tfa`   | `terraform apply`                      |
+| `tfa!`  | `terraform apply -auto-approve`        |
+| `tfap`  | `terraform apply -parallelism=1`       |
+| `tfc`   | `terraform console`                    |
+| `tfd`   | `terraform destroy`                    |
+| `tfd!`  | `terraform destroy -auto-approve`      |
+| `tfdp`  | `terraform destroy -parallelism=1`     |
+| `tff`   | `terraform fmt`                        |
+| `tffr`  | `terraform fmt -recursive`             |
+| `tfi`   | `terraform init`                       |
+| `tfir`  | `terraform init -reconfigure`          |
+| `tfiu`  | `terraform init -upgrade`              |
+| `tfiur` | `terraform init -upgrade -reconfigure` |
+| `tfo`   | `terraform output`                     |
+| `tfp`   | `terraform plan`                       |
+| `tfv`   | `terraform validate`                   |
+| `tfs`   | `terraform state`                      |
+| `tft`   | `terraform test`                       |
+| `tfsh`  | `terraform show`                       |
+| `tfw`   | `terraform workspace`                  |
+| `tfwl`  | `terraform workspace list`             |
+| `tfws`  | `terraform workspace select`           |
 
 ## Prompt function
 
-You can add the current Terraform workspace in your prompt by adding `$(tf_prompt_info)`
-to your `PROMPT` or `RPROMPT` variable.
+You can add the current Terraform workspace in your prompt by adding `$(tf_prompt_info)`,
+`$(tf_version_prompt_info)` to your `PROMPT` or `RPROMPT` variable.
 
 ```sh
 RPROMPT='$(tf_prompt_info)'
+RPROMPT='$(tf_version_prompt_info)'
 ```
 
 You can also specify the PREFIX and SUFFIX for the workspace with the following variables:
@@ -40,4 +56,6 @@ You can also specify the PREFIX and SUFFIX for the workspace with the following
 ```sh
 ZSH_THEME_TF_PROMPT_PREFIX="%{$fg[white]%}"
 ZSH_THEME_TF_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_TF_VERSION_PROMPT_PREFIX="%{$fg[white]%}"
+ZSH_THEME_TF_VERSION_PROMPT_SUFFIX="%{$reset_color%}"
 ```
diff --git a/zsh/plugins/terraform/_terraform b/zsh/plugins/terraform/_terraform
index 6258345..1574958 100644
--- a/zsh/plugins/terraform/_terraform
+++ b/zsh/plugins/terraform/_terraform
@@ -1,411 +1,545 @@
 #compdef terraform
+compdef _terraform terraform
 
-local -a _terraform_cmds opt_args
-_terraform_cmds=(
-    'apply:Builds or changes infrastructure'
-    'console:Interactive console for Terraform interpolations'
-    'destroy:Destroy Terraform-managed infrastructure'
-    'fmt:Rewrites config files to canonical format'
-    'force-unlock:Manually unlock the terraform state'
-    'get:Download and install modules for the configuration'
-    'graph:Create a visual graph of Terraform resources'
-    'import:Import existing infrastructure into Terraform'
-    'init:Initialize a Terraform working directory'
+(( ${+functions[_terraform_commands]} )) || _terraform_commands() {
+  local -a _terraform_cmds
+  _terraform_cmds=(
+    'apply:Create or update infrastructure'
+    'console:Try Terraform expressions at an interactive command prompt'
+    'destroy:Destroy previously-created infrastructure'
+    'fmt:Reformat your configuration in the standard style'
+    'force-unlock:Release a stuck lock on the current workspace'
+    'get:Install or upgrade remote Terraform modules'
+    'graph:Generate a Graphviz graph of the steps in an operation'
+    'import:Associate existing infrastructure with a Terraform resource'
+    'init:Prepare your working directory for other commands'
     'login:Obtain and save credentials for a remote host'
     'logout:Remove locally-stored credentials for a remote host'
-    'output:Read an output from a state file'
-    'plan:Generate and show an execution plan'
-    'providers:Prints a tree of the providers used in the configuration'
-    'refresh:Update local state file against real resources'
-    'show:Inspect Terraform state or plan'
+    'metadata:Metadata related commands'
+    'output:Show output values from your root module'
+    'plan:Show changes required by the current configuration'
+    'providers:Show the providers required for this configuration'
+    'refresh:Update the state to match remote systems'
+    'show:Show the current state or a saved plan'
     'state:Advanced state management'
-    'taint:Manually mark a resource for recreation'
-    'untaint:Manually unmark a resource as tainted'
-    'validate:Validates the Terraform files'
-    'version:Prints the Terraform version'
+    'taint:Mark a resource instance as not fully functional'
+    'test:Execute integration tests for Terraform modules'
+    'untaint:Remove the '\''tainted'\'' state from a resource instance'
+    'validate:Check whether the configuration is valid'
+    'version:Show the current Terraform version'
     'workspace:Workspace management'
-    '0.12upgrade:Rewrites pre-0.12 module source code for v0.12'
-    '0.13upgrade:Rewrites pre-0.13 module source code for v0.13'
-)
+  )
+  if (( CURRENT == 1 )); then
+    _describe -t commands 'terraform commands' _terraform_cmds
+    return
+  fi
 
-__012upgrade() {
+  local curcontext="${curcontext}"
+  cmd="${${_terraform_cmds[(r)$words[1]:*]%%:*}}"
+  curcontext="${curcontext%:*:*}:terraform-${cmd}:"
+
+  local __chdir="${opt_args[-chdir]:-.}"
+
+  if (( ${+functions[_terraform_$cmd]} )); then
+    "_terraform_${cmd}"
+  else
+    _message "no more options"
+  fi
+}
+
+(( ${+functions[_terraform_apply]} )) || _terraform_apply() {
   _arguments \
-    '-yes[Skip the initial introduction messages and interactive confirmation. This can be used to run this command in batch from a script.]' \
-    '-force[ Override the heuristic that attempts to detect if a configuration is already written for v0.12 or later.  Some of the transformations made by this command are not idempotent, so re-running against the same module may change the meanings expressions in the module.]'
+    '-auto-approve[Skip interactive approval of plan before applying.]' \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+    '-destroy[Destroy Terraform-managed infrastructure. The command "terraform destroy" is a convenience alias for this option.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-input=[(true) Ask for input for variables if not directly set.]:input:(true false)' \
+    '-no-color[If specified, output won'\''t contain any color.]' \
+    '-parallelism=[(10) Limit the number of parallel resource operations.]:parallelism:' \
+    '-refresh=[(true) Skip checking for external changes to remote objects while creating the plan. This can potentially make planning faster, but at the expense of possibly planning against a stale record of the remote system state.]:refresh:(true false)' \
+    '*-replace=[(resource) Force replacement of a particular resource instance using its resource address. If applying would'\''ve normally produced an update or no-op action for this instance, Terraform will replace it instead. You can use this option multiple times to replace more than one object.]:resource:__terraform_state_resources' \
+    '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*-target=[(resource) Limit the operation to only the given module, resource, or resource instance and all of its dependencies. You can use this option multiple times to include more than one object. This is for exceptional use only.]:target:__terraform_state_resources' \
+    '*-var=[(for=bar) Set a value for one of the input variables in the root module of the configuration. Use this option more than once to set more than one variable.]:var:' \
+    '*-var-file=[(foo) Load variable values from the given file, in addition to the default files terraform.tfvars and *.auto.tfvars. Use this option more than once to include more than one variables file.]:file:_files -W __chdir -g "*.tfvars{,.json}"' \
+    ':plan:_files -W __chdir -'
 }
 
-__013upgrade() {
+(( ${+functions[_terraform_console]} )) || _terraform_console() {
   _arguments \
-    '-yes[Skip the initial introduction messages and interactive confirmation. This can be used to run this command in batch from a script.]'
+    '-state=[(terraform.tfstate) Legacy option for the local backend only. See the local backend'\''s documentation for more information.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-plan[Create a new plan (as if running "terraform plan") and then evaluate expressions against its planned state, instead of evaluating against the current state. You can use this to inspect the effects of configuration changes that haven'\''t been applied yet.]' \
+    '*-var=[(for=bar) Set a variable in the Terraform configuration. This flag can be set multiple times.]:var:' \
+    '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -W __chdir -g "*.tfvars{,.json}"'
 }
 
-__apply() {
-    _arguments \
-        '-auto-approve[Skip interactive approval of plan before applying.]' \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
-        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-no-color[If specified, output will be colorless.]' \
-        '-parallelism=[(10) Limit the number of parallel resource operations.]' \
-        '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -g "*.tfstate"' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
-        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
-}
-
-__console() {
-    _arguments \
-        '-state=[(terraform.tfstate) Path to read state.]' \
-        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
-}
-
-__destroy() {
-    _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
-        '-auto-approve[Skip interactive approval before destroying.]' \
-        '-force[Deprecated: same as auto-approve.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-no-color[If specified, output will contain no color.]' \
-        '-parallelism=[(10) Limit the number of concurrent operations.]' \
-        '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]' \
-        '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -g "*.tfstate"' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
-        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
-}
-
-__fmt() {
-    _arguments \
-        '-list=[(true) List files whose formatting differs (always false if using STDIN)]' \
-        '-write=[(true) Write result to source file instead of STDOUT (always false if using STDIN or -check)]' \
-        '-diff=[(false) Display diffs of formatting changes]' \
-        '-check=[(false) Check if the input is formatted. Exit status will be 0 if all input is properly formatted and non-zero otherwise.]' \
-        '-recursive=[(false) Also process files in subdirectories. By default, only the given directory (or current directory) is processed.]'
-}
-
-__force_unlock() {
-    _arguments \
-        "-force[Don't ask for input for unlock confirmation.]"
-}
-
-__get() {
-    _arguments \
-        '-update=[(false) If true, modules already downloaded will be checked for updates and updated if necessary.]' \
-        '-no-color[Disable text coloring in the output.]'
-}
-
-__graph() {
-    _arguments \
-        '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors.]' \
-        '-type=[(plan) Type of graph to output. Can be: plan, plan-destroy, apply, validate, input, refresh.]'
-}
-
-__import() {
-    _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
-        '-config=[(path) Path to a directory of Terraform configuration files to use to configure the provider. Defaults to pwd. If no config files are present, they must be provided via the input prompts or env vars.]' \
-        '-allow-missing-config[Allow import when no resource configuration block exists.]' \
-        '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-no-color[If specified, output will contain no color.]' \
-        '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
-        '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -g "*.tfstate"' \
-        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]' \
-        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
-}
-
-__init() {
-    _arguments \
-        '-backend=[(true) Configure the backend for this configuration.]' \
-        '-backend-config=[This can be either a path to an HCL file with key/value assignments (same format as terraform.tfvars) or a 'key=value' format. This is merged with what is in the configuration file. This can be specified multiple times. The backend type must be in the configuration itself.]' \
-        '-force-copy[Suppress prompts about copying state data. This is equivalent to providing a "yes" to all confirmation prompts.]' \
-        '-from-module=[(SOURCE) Copy the contents of the given module into the target directory before initialization.]' \
-        '-get=[(true) Download any modules for this configuration.]' \
-        '-get-plugins=[(true) Download any missing plugins for this configuration.]' \
-        '-input=[(true) Ask for input if necessary. If false, will error if input was required.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-no-color[If specified, output will contain no color.]' \
-        '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]:plugin_dir:_files -/' \
-        '-reconfigure[Reconfigure the backend, ignoring any saved configuration.]' \
-        '-upgrade=[(false) If installing modules (-get) or plugins (-get-plugins), ignore previously-downloaded objects and install the latest version allowed within configured constraints.]' \
-        '-verify-plugins=[(true) Verify the authenticity and integrity of automatically downloaded plugins.]'
-}
-
-__login() {
-    _arguments \
-
-}
-
-__logout() {
-    _arguments \
-
-}
-
-__output() {
-    _arguments \
-        '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
-        '-no-color[If specified, output will contain no color.]' \
-        '-json[If specified, machine readable output will be printed in JSON format]'
-}
-
-__plan() {
-    _arguments \
-        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
-        '-destroy[If set, a plan will be generated to destroy all resources managed by the given configuration and state.]' \
-        '-detailed-exitcode[() Return detailed exit codes when the command exits. This will change the meaning of exit codes to: 0 - Succeeded, diff is empty (no changes); 1 - Errored, 2 - Succeeded; there is a diff]' \
-        '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-no-color[() If specified, output will contain no color.]' \
-        '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]' \
-        '-parallelism=[(10) Limit the number of concurrent operations.]' \
-        '-refresh=[(true) Update state prior to checking for differences.]' \
-        '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -g "*.tfstate"' \
-        '*-target=[(resource) Resource to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
-}
-
-__providers() {
-    local -a __providers_cmds
-    __providers_cmds=(
-      'mirror:Mirrors the provider plugins needed for the current configuration'
-      'schema:Prints the schemas of the providers used in the configuration'
-    )
-    _describe -t providers "providers commands" __providers_cmds
-
-}
-
-__providers_mirror() {
-    _arguments \
-      '-platform=[(os_arch) Choose which target platform to build a mirror for.]' \
-      "*:target_dir:_files -/"
-}
-
-__providers_schema() {
-    _arguments \
-      '-json[]' \
-      '::'
-}
-
-__refresh() {
-    _arguments \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]::backupfile:_files -g "*.backup"' \
-        '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
-        '-input=[(true) Ask for input for variables if not directly set.]' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-no-color[If specified, output will not contain any color.]' \
-        '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
-        '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -g "*.tfstate"' \
-        '*-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__statelist' \
-        '*-var[("foo=bar") Set a variable in the Terraform configuration. This flag can be set multiple times.]' \
-        '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -g "*.tfvars{,.json}"'
-}
-
-__show() {
-    _arguments \
-        '-json[If specified, output the Terraform plan or state in a machine-readable form.]' \
-        '-no-color[If specified, output will not contain any color.]'
-}
-
-__state() {
-    local -a __state_cmds
-    __state_cmds=(
-      'list:List resources in the state'
-      'mv:Move an item in the state'
-      'pull:Pull current state and output to stdout'
-      'push:Update remote state from a local state file'
-      'replace-provider:Replace provider for resources in the Terraform state'
-      'rm:Remove instances from the state' 
-      'show:Show a resource in the state'
-    )
-    _describe -t state "state commands" __state_cmds
-}
-
-__state_list() {
+(( ${+functions[_terraform_destroy]} )) || _terraform_destroy() {
   _arguments \
-    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default, Terraform will consult the state of the currently-selected workspace.]' \
-    '-id=[(id) Filters the results to include only instances whose resource types have an attribute named id whose value equals the given id string.]' \
-    "*:address:__statelist" 
+    '-auto-approve[Skip interactive approval of plan before applying.]' \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-input=[(true) Ask for input for variables if not directly set.]:input:(true false)' \
+    '-no-color[If specified, output won'\''t contain any color.]' \
+    '-parallelism=[(10) Limit the number of parallel resource operations.]:parallelism:' \
+    '-refresh=[(true) Update state prior to checking for differences. This has no effect if a plan file is given to apply.]:refresh:(true false)' \
+    '-state=[(terraform.tfstate) Path to read and save state (unless state-out is specified).]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*-target=[(resource) Limit the operation to only the given module, resource, or resource instance and all of its dependencies. You can use this option multiple times to include more than one object. This is for exceptional use only.]:target:__terraform_state_resources' \
+    '*-var=[(for=bar) Set a value for one of the input variables in the root module of the configuration. Use this option more than once to set more than one variable.]:var:' \
+    '*-var-file=[(foo) Load variable values from the given file, in addition to the default files terraform.tfvars and *.auto.tfvars. Use this option more than once to include more than one variables file.]:file:_files -W __chdir -g "*.tfvars{,.json}"'
 }
 
-__state_mv() {
+(( ${+functions[_terraform_fmt]} )) || _terraform_fmt() {
   _arguments \
-    "-dry-run[If set, prints out what would've been moved but doesn't actually move anything.]" \
-    '-backup=[(PATH) Path where Terraform should write the backup for the original state. This can"t be disabled. If not set, Terraform will write it to the same path as the statefile with a ".backup" extension.]:backupfile:_files -g "*.backup"' \
-    '-backup-out=[(PATH) Path where Terraform should write the backup for the destination state. This can"t be disabled. If not set, Terraform will write it to the same path as the destination state file with a backup extension. This only needs to be specified if -state-out is set to a different path than -state.]:backupfile:_files -g "*.backup"' \
-    "-lock=[(true) Lock the state files when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
-    '-state=[(path) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
-    '-state-out=[(path) Path to the destination state file to write to. If this isn"t specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -g "*.tfstate"' \
-    "::" \
-    ":source:__statelist" \
-    ":destination: " 
+    '-list=[(true) Don'\''t list files whose formatting differs (always disabled if using STDIN)]:list:(true false)' \
+    '-write=[(true) Don'\''t write to source files (always disabled if using STDIN or -check)]:write:(true false)' \
+    '-diff[Display diffs of formatting changes]' \
+    '-check[Check if the input is formatted. Exit status will be 0 if all input is properly formatted and non-zero otherwise.]' \
+    '-no-color[If specified, output won'\''t contain any color.]' \
+    '-recursive[Also process files in subdirectories. By default, only the given directory (or current directory) is processed.]' \
+    '*:targets:_files -W __chdir -'
 }
 
-__state_push() {
+(( ${+functions[_terraform_force-unlock]} )) || _terraform_force-unlock() {
   _arguments \
-    "-force[Write the state even if lineages don't match or the remote serial is higher.]" \
-    '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
-    "::" \
-    ":destination:_files"
+    '-force[Don'\''t ask for input for unlock confirmation.]' \
+    ':lock_id:'
 }
 
-__state_replace_provider() {
+(( ${+functions[_terraform_get]} )) || _terraform_get() {
+  _arguments \
+    '-update[Check already-downloaded modules for available updates and install the newest versions available.]' \
+    '-no-color[Disable text coloring in the output.]' \
+    '-test-directory=[(tests) Set the Terraform test directory, defaults to "tests".]:test_directory:_files -W __chdir -/'
+}
+
+(( ${+functions[_terraform_graph]} )) || _terraform_graph() {
+  _arguments \
+    '-draw-cycles[Highlight any cycles in the graph with colored edges. This helps when diagnosing cycle errors. This option is supported only when illustrating a real evaluation graph, selected using the -type=TYPE option.]' \
+    '-module-depth=[(-1) (deprecated) In prior versions of Terraform, specified the depth of modules to show in the output.]:module_depth:' \
+    '-plan=[Render graph using the specified plan file instead of the configuration in the current directory. Implies -type=apply.]:plan:_files -W __chdir -' \
+    '-type=[(plan) Type of operation graph to output. Can be: plan, plan-refresh-only, plan-destroy, or apply. By default Terraform just summarizes the relationships between the resources in your configuration, without any particular operation in mind. Full operation graphs are more detailed but therefore often harder to read.]:type:(plan plan-refresh-only plan-destroy apply)'
+}
+
+(( ${+functions[_terraform_import]} )) || _terraform_import() {
+  _arguments \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-config=[(path) Path to a directory of Terraform configuration files to use to configure the provider. Defaults to pwd. If no config files are present, they must be provided via the input prompts or env vars.]:config:_files -W __chdir -/' \
+    '-input=[(true) Disable interactive input prompts.]:input:(true false)' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-no-color[If specified, output will contain no color.]' \
+    '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(PATH) Path to the destination state file to write to. If this is not specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*-var=[(for=bar) Set a variable in the Terraform configuration. This flag can be set multiple times. This is only useful with the "-config" flag.]:var:' \
+    '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -W __chdir -g "*.tfvars{,.json}"' \
+    ':addr:' \
+    ':id:'
+}
+
+(( ${+functions[_terraform_init]} )) || _terraform_init() {
+  _arguments \
+    '-backend=[(true) Disable backend or Terraform Cloud initialization for this configuration and use what was previously initialized instead.]:backend:(true false)' \
+    '-backend-config=[Configuration to be merged with what is in the configuration file'\''s '\''backend'\'' block. This can be either a path to an HCL file with key/value assignments (same format as terraform.tfvars) or a '\''key=value'\'' format, and can be specified multiple times. The backend type must be in the configuration itself.]:backend_config:_files -W __chdir -' \
+    '-force-copy[Suppress prompts about copying state data. This is equivalent to providing a "yes" to all confirmation prompts.]' \
+    '-from-module=[Copy the contents of the given module into the target directory before initialization.]:from_module:_files -W __chdir -/' \
+    '-get=[(true) Disable downloading modules for this configuration.]:get:(true false)' \
+    '-input=[(true) Disable interactive prompts. Note that some actions may require interactive prompts and will error if input is disabled.]:input:(true false)' \
+    '-lock=[(true) Don'\''t hold a state lock during backend migration. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-no-color[If specified, output will contain no color.]' \
+    '-plugin-dir[Directory containing plugin binaries. This overrides all default search paths for plugins, and prevents the automatic installation of plugins. This flag can be used multiple times.]:plugin_dir:_files -W __chdir -/' \
+    '-reconfigure[Reconfigure the backend, ignoring any saved configuration.]' \
+    '-migrate-state[Reconfigure a backend, and attempt to migrate any existing state.]' \
+    '-upgrade[Install the latest module and provider versions allowed within configured constraints, overriding the default behavior of selecting exactly the version recorded in the dependency lockfile.]' \
+    '-lockfile=[Set a dependency lockfile mode. Currently only "readonly" is valid.]:lockfile:( readonly )' \
+    '-ignore-remote-version[A rare option used for Terraform Cloud and the remote backend only. Set this to ignore checking that the local and remote Terraform versions use compatible state representations, making an operation proceed even when there is a potential mismatch. See the documentation on configuring Terraform with Terraform Cloud for more information.]' \
+    '-test-directory=[(tests) Set the Terraform test directory, defaults to "tests".]:test_directory:_files -W __chdir -/'
+}
+
+(( ${+functions[_terraform_login]} )) || _terraform_login() {
+  _arguments \
+    ':hostname:'
+}
+
+(( ${+functions[_terraform_logout]} )) || _terraform_logout() {
+  _arguments \
+    ':hostname:'
+}
+
+(( ${+functions[_terraform_metadata]} )) || _terraform_metadata() {
+  _arguments \
+    '*::terraform metadata command:_terraform_metadata_commands'
+}
+
+(( ${+functions[_terraform_metadata_commands]} )) || _terraform_metadata_commands() {
+  local -a _metadata_cmds
+  _metadata_cmds=(
+    'functions:Show signatures and descriptions for the available functions'
+  )
+  if (( CURRENT == 1 )); then
+    _describe -t commands "terraform metadata commands" _metadata_cmds
+    return
+  fi
+
+  local curcontext="${curcontext}"
+  cmd="${${_metadata_cmds[(r)$words[1]:*]%%:*}}"
+  curcontext="${curcontext%:*:*}:terraform-metadata-${cmd}:"
+
+  if (( ${+functions[_terraform_metadata_$cmd]} )); then
+    "_terraform_metadata_${cmd}"
+  else
+    _message "no more options"
+  fi
+}
+
+(( ${+functions[_terraform_metadata_functions]} )) || _terraform_metadata_functions() {
+  _arguments \
+    '-json[]'
+}
+
+(( ${+functions[_terraform_output]} )) || _terraform_output() {
+  _arguments \
+    '-state=[(path) Path to the state file to read. Defaults to "terraform.tfstate". Ignored when remote state is used.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-no-color[If specified, output will contain no color.]' \
+    '-json[If specified, machine readable output will be printed in JSON format]' \
+    '-raw[For value types that can be automatically converted to a string, will print the raw string directly, rather than a human-oriented representation of the value.]' \
+    ':name:'
+}
+
+(( ${+functions[_terraform_plan]} )) || _terraform_plan() {
+  _arguments \
+    '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+    '-destroy[Select the "destroy" planning mode, which creates a plan to destroy all objects currently managed by this Terraform configuration instead of the usual behavior.]' \
+    '-detailed-exitcode[Return detailed exit codes when the command exits. This will change the meaning of exit codes to: 0 - Succeeded, diff is empty (no changes); 1 - Errored, 2 - Succeeded; there is a diff]' \
+    '-input=[(true) Ask for input for variables if not directly set.]:input:(true false)' \
+    '-generate-config-out=[(path) (Experimental) If import blocks are present in configuration, instructs Terraform to generate HCL for any imported resources not already present. The configuration is written to a new file at PATH, which must not already exist. Terraform may still attempt to write configuration if the plan errors.]:generate_config_out:' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-no-color[If specified, output will contain no color.]' \
+    '-out=[(path) Write a plan file to the given path. This can be used as input to the "apply" command.]:out:' \
+    '-parallelism=[(10) Limit the number of concurrent operations.]:parallelism:' \
+    '-refresh=[(true) Skip checking for external changes to remote objects while creating the plan. This can potentially make planning faster, but at the expense of possibly planning against a stale record of the remote system state.]:refresh:(true false)' \
+    '-refresh-only[Select the "refresh only" planning mode, which checks whether remote objects still match the outcome of the most recent Terraform apply but does not propose any actions to undo any changes made outside of Terraform.]' \
+    '*-replace=[(resource) Force replacement of a particular resource instance using its resource address. If the plan would'\''ve normally produced an update or no-op action for this instance, Terraform will plan to replace it instead. You can use this option multiple times to replace more than one object.]:replace:__terraform_state_resources' \
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*-target=[(resource) Limit the planning operation to only the given module, resource, or resource instance and all of its dependencies. You can use this option multiple times to include more than one object. This is for exceptional use only.]:target:__terraform_state_resources' \
+    '*-var=[(for=bar) Set a value for one of the input variables in the root module of the configuration. Use this option more than once to set more than one variable.]:var:' \
+    '*-var-file=[(foo) Load variable values from the given file, in addition to the default files terraform.tfvars and *.auto.tfvars. Use this option more than once to include more than one variables file.]:file:_files -W __chdir -g "*.tfvars{,.json}"'
+}
+
+(( ${+functions[_terraform_providers]} )) || _terraform_providers() {
+  _arguments \
+    '-test-directory=[(path) Set the Terraform test directory, defaults to "tests".]:test_directory:_files -W __chdir -/' \
+    '*::terraform providers command:_terraform_providers_commands'
+}
+
+(( ${+functions[_terraform_providers_commands]} )) || _terraform_providers_commands() {
+  local -a _providers_cmds
+  _providers_cmds=(
+    'lock:Write out dependency locks for the configured providers'
+    'mirror:Save local copies of all required provider plugins'
+    'schema:Show schemas for the providers used in the configuration'
+  )
+  if (( CURRENT == 1 )); then
+    _describe -t commands "terraform providers commands" _providers_cmds
+    return
+  fi
+
+  local curcontext="${curcontext}"
+  cmd="${${_providers_cmds[(r)$words[1]:*]%%:*}}"
+  curcontext="${curcontext%:*:*}:terraform-providers-${cmd}:"
+
+  if (( ${+functions[_terraform_providers_$cmd]} )); then
+    "_terraform_providers_${cmd}"
+  else
+    _message "no more options"
+  fi
+}
+
+(( ${+functions[_terraform_providers_lock]} )) || _terraform_providers_lock() {
+  _arguments \
+    '-fs-mirror=[(dir) Consult the given filesystem mirror directory instead of the origin registry for each of the given providers.]:fs_mirror:_files -W __chdir -/' \
+    '-net-mirror=[(url) Consult the given network mirror (given as a base URL) instead of the origin registry for each of the given providers.]:net_mirror:' \
+    '*-platform=[(os_arch) Choose a target platform to request package checksums for.]:platform:' \
+    '*:provider:'
+}
+
+(( ${+functions[_terraform_providers_mirror]} )) || _terraform_providers_mirror() {
+  _arguments \
+    '*-platform=[(os_arch) Choose which target platform to build a mirror for.]:platform:' \
+    '::' \
+    ':target_dir:_files -W __chdir -/'
+}
+
+(( ${+functions[_terraform_providers_schema]} )) || _terraform_providers_schema() {
+  _arguments \
+    '-json[]'
+}
+
+(( ${+functions[_terraform_refresh]} )) || _terraform_refresh() {
+  _arguments \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]::backupfile:_files -W __chdir -g "*.backup"' \
+    '-compact-warnings[If Terraform produces any warnings that are not accompanied by errors, show them in a more compact form that includes only the summary messages.]' \
+    '-input=[(true) Ask for input for variables if not directly set.]:input:(true false)' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-no-color[If specified, output will not contain any color.]' \
+    '-parallelism=[(10) Limit the number of parallel resource operations.]:parallelism:' \
+    '-state=[(path) Path to read and save state (unless state-out is specified). Defaults to "terraform.tfstate".]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(path) Path to write state to that is different than "-state". This can be used to preserve the old state.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*-target=[(resource) A Resource Address to target. Operation will be limited to this resource and its dependencies. This flag can be used multiple times.]:target:__terraform_state_resources' \
+    '*-var=[(for=bar) Set a variable in the Terraform configuration. This flag can be set multiple times.]:var:' \
+    '*-var-file=[(foo) Set variables in the Terraform configuration from a file. If "terraform.tfvars" or any ".auto.tfvars" files are present, they will be automatically loaded.]:file:_files -W __chdir -g "*.tfvars{,.json}"'
+}
+
+(( ${+functions[_terraform_show]} )) || _terraform_show() {
+  _arguments \
+    '-json[If specified, output the Terraform plan or state in a machine-readable form.]' \
+    '-no-color[If specified, output will not contain any color.]' \
+    ':path:_files -W __chdir -g "*.tfstate"'
+}
+
+(( ${+functions[_terraform_state]} )) || _terraform_state() {
+  _arguments \
+    '*::terraform state command:_terraform_state_commands'
+}
+
+(( ${+functions[_terraform_state_commands]} )) || _terraform_state_commands() {
+  local -a _state_cmds
+  _state_cmds=(
+    'list:List resources in the state'
+    'mv:Move an item in the state'
+    'pull:Pull current state and output to stdout'
+    'push:Update remote state from a local state file'
+    'replace-provider:Replace provider in the state'
+    'rm:Remove instances from the state'
+    'show:Show a resource in the state'
+  )
+  if (( CURRENT == 1 )); then
+    _describe -t commands "terraform state commands" _state_cmds
+    return
+  fi
+
+  local curcontext="${curcontext}"
+  cmd="${${_state_cmds[(r)$words[1]:*]%%:*}}"
+  curcontext="${curcontext%:*:*}:terraform-state-${cmd}:"
+
+  if (( ${+functions[_terraform_state_$cmd]} )); then
+    "_terraform_state_${cmd}"
+  else
+    _message "no more options"
+  fi
+}
+
+(( ${+functions[_terraform_state_list]} )) || _terraform_state_list() {
+  _arguments \
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default, Terraform will consult the state of the currently-selected workspace.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-id=[(id) Filters the results to include only instances whose resource types have an attribute named id whose value equals the given id string.]:id:' \
+    '*:address:__terraform_state_resources'
+}
+
+(( ${+functions[_terraform_state_mv]} )) || _terraform_state_mv() {
+  _arguments \
+    '-dry-run[If set, prints out what would'\''ve been moved but doesn'\''t actually move anything.]' \
+    '-backup=[(PATH) Path where Terraform should write the backup for the original state. This can"t be disabled. If not set, Terraform will write it to the same path as the statefile with a ".backup" extension.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-backup-out=[(PATH) Path where Terraform should write the backup for the destination state. This can"t be disabled. If not set, Terraform will write it to the same path as the destination state file with a backup extension. This only needs to be specified if -state-out is set to a different path than -state.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-ignore-remote-version[A rare option used for the remote backend only. See the remote backend documentation for more information.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-state=[(path) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(path) Path to the destination state file to write to. If this isn"t specified, the source state file will be used. This can be a new or existing path.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '::' \
+    ':source:__terraform_state_resources' \
+    ':destination: '
+}
+
+(( ${+functions[_terraform_state_push]} )) || _terraform_state_push() {
+  _arguments \
+    '-force[Write the state even if lineages don'\''t match or the remote serial is higher.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '::' \
+    ':destination:_files'
+}
+
+(( ${+functions[_terraform_state_replace-provider]} )) || _terraform_state_replace-provider() {
   _arguments \
     '-auto-approve[Skip interactive approval.]' \
-    '-backup=[(PATH) Path where Terraform should write the backup for the state file. This can"t be disabled. If not set, Terraform will write it to the same path as the state file with a ".backup" extension.]:backupfile:_files -g "*.backup"' \
-    "-lock=[(true) Lock the state files when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
-    '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -g "*.tfstate"' \
-    ":from_provider_fqn:" \
-    ":to_provider_fqn:"
+    '-backup=[(PATH) Path where Terraform should write the backup for the state file. This can"t be disabled. If not set, Terraform will write it to the same path as the state file with a ".backup" extension.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-state=[(PATH) Path to the source state file. Defaults to the configured backend, or "terraform.tfstate"]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '::' \
+    ':from_provider_fqn:' \
+    ':to_provider_fqn:'
 }
 
-__state_rm() {
+(( ${+functions[_terraform_state_rm]} )) || _terraform_state_rm() {
   _arguments \
-    "-dry-run[If set, prints out what would've been removed but doesn't actually remove anything.]" \
-    '-backup=[(PATH) Path where Terraform should write the backup for the original state.]::backupfile:_files -g "*.backup"' \
-    "-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)" \
-    "-lock-timeout=[(0s) Duration to retry a state lock.]" \
-    '-state=[(PATH) Path to the state file to update. Defaults to the current workspace state.]:statefile:_files -g "*.tfstate"' \
-    "*:address:__statelist" 
+    '-dry-run[If set, prints out what would'\''ve been removed but doesn'\''t actually remove anything.]' \
+    '-backup=[(PATH) Path where Terraform should write the backup for the original state.]::backupfile:_files -W __chdir -g "*.backup"' \
+    '-ignore-remote-version[Continue even if remote and local Terraform versions are incompatible. This may result in an unusable workspace, and should be used with extreme caution.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-state=[(PATH) Path to the state file to update. Defaults to the current workspace state.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*:address:__terraform_state_resources'
 }
 
-
-__state_show() {
+(( ${+functions[_terraform_state_show]} )) || _terraform_state_show() {
   _arguments \
-    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -g "*.tfstate"' \
-    "*:address:__statelist" 
+    '-state=[(statefile) Path to a Terraform state file to use to look up Terraform-managed resources. By default it will use the state "terraform.tfstate" if it exists.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    "*:address:__terraform_state_resources"
 }
 
-__statelist() {
-  compadd $(terraform state list $opt_args[-state])
+(( ${+functions[__terraform_state_resources]} )) || __terraform_state_resources() {
+  local resource
+  local -a resources
+  terraform -chdir="${__chdir}" state list -state="${opt_args[-state]}" 2>/dev/null | while read -r resource; do
+    resources+=( "${resource}" )
+  done
+  compadd "${@}" - "${resources[@]}"
 }
 
-__taint() {
-    _arguments \
-        '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-        '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
-        '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-        '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-        '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-        '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
-        '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -g "*.tfstate"' \
-        "*:address:__statelist" 
-}
-
-__untaint() {
-    _arguments \
+(( ${+functions[_terraform_taint]} )) || _terraform_taint() {
+  _arguments \
     '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
-    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -g "*.backup"' \
-    '-lock=[(true) Lock the state file when locking is supported.]:lock:(true false)' \
-    '-lock-timeout=[(0s) Duration to retry a state lock.]' \
-    '-module=[(path)  The module path where the resource lives. By default this will be root. Child modules can be specified by names. Ex. "consul" or "consul.vpc" (nested modules).]' \
-    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -g "*.tfstate"' \
-    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -g "*.tfstate"'
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-ignore-remote-version[A rare option used for the remote backend only. See the remote backend documentation for more information.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '*:address:__terraform_state_resources'
 }
 
-__validate() {
-    _arguments \
-    '-no-color[If specified, output will not contain any color.]' \
+(( ${+functions[_terraform_test]} )) || _terraform_test() {
+  _arguments \
+    '-cloud-run=[(source) If specified, Terraform will execute this test run remotely using Terraform Cloud. You must specify the source of a module registered in a private module registry as the argument to this flag. This allows Terraform to associate the cloud run with the correct Terraform Cloud module and organization.]:cloud_run:' \
+    '*-filter=[(testfile) If specified, Terraform will only execute the test files specified by this flag. You can use this option multiple times to execute more than one test file.]:testfile:_files -W __chdir -g "*.tftest.hcl"' \
+    '-json[If specified, machine readable output will be printed in JSON format]' \
+    '-no-color[If specified, machine readable output will be printed in JSON format]' \
+    '-test-directory=[(path) Set the Terraform test directory, defaults to "tests".]:test_directory:_files -W __chdir -/' \
+    '*-var=[(for=bar) Set a value for one of the input variables in the root module of the configuration. Use this option more than once to set more than one variable.]:var:' \
+    '*-var-file=[(foo) Load variable values from the given file, in addition to the default files terraform.tfvars and *.auto.tfvars. Use this option more than once to include more than one variables file.]:file:_files -W __chdir -g "*.tfvars{,.json}"' \
+    '-verbose[Print the plan or state for each test run block as it executes.]' \
+}
+
+(( ${+functions[_terraform_untaint]} )) || _terraform_untaint() {
+  _arguments \
+    '-allow-missing[If specified, the command will succeed (exit code 0) even if the resource is missing.]' \
+    '-backup=[(path) Path to backup the existing state file before modifying. Defaults to the "-state-out" path with ".backup" extension. Set to "-" to disable backup.]:backupfile:_files -W __chdir -g "*.backup"' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-state=[(path) Path to read and save state (unless state-out is  specified). Defaults to "terraform.tfstate".]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '-state-out=[(path) Path to write updated state file. By default, the "-state" path will be used.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    ':name:__terraform_state_resources'
+}
+
+(( ${+functions[_terraform_validate]} )) || _terraform_validate() {
+  _arguments \
     '-json[Produce output in a machine-readable JSON format, suitable for use in text editor integrations and other automated systems.]' \
-    ':dir:_files -/'
+    '-no-color[If specified, output will not contain any color.]' \
+    '-no-tests[If specified, Terraform will not validate test files.]' \
+    '-test-directory=[(path) Set the Terraform test directory, defaults to "tests".]:test_directory:_files -W __chdir -/' \
+    ':dir:_files -W __chdir -/'
 }
 
-__version() {
-    _arguments \
-    '-json[Output the version information as a JSON object.]'
+(( ${+functions[_terraform_version]} )) || _terraform_version() {
+  _arguments \
+    '-json[Output the version information as a JSON object.]' \
+    '::'
 }
 
-__workspace() {
-    local -a __workspace_cmds
-    __workspace_cmds=(
-        'delete:Delete a workspace'
-        'list:List Workspaces'
-        'new:Create a new workspace'
-        'select:Select a workspace'
-        'show:Show the name of the current workspace'
-    )
-    _describe -t workspace "workspace commands" __workspace_cmds
+(( ${+functions[_terraform_workspace]} )) || _terraform_workspace() {
+  _arguments \
+    '*::terraform workspace command:_terraform_workspace_commands'
 }
 
-_arguments '*:: :->command'
+(( ${+functions[_terraform_workspace_commands]} )) || _terraform_workspace_commands() {
+  local -a _workspace_cmds
+  _workspace_cmds=(
+    'delete:Delete a workspace'
+    'list:List Workspaces'
+    'new:Create a new workspace'
+    'select:Select a workspace'
+    'show:Show the name of the current workspace'
+  )
+  if (( CURRENT == 1 )); then
+    _describe -t commands "terraform workspace commands" _workspace_cmds
+    return
+  fi
 
-if (( CURRENT == 1 )); then
-  _describe -t commands "terraform command" _terraform_cmds
-  return
+  local curcontext="${curcontext}"
+  cmd="${${_workspace_cmds[(r)$words[1]:*]%%:*}}"
+  curcontext="${curcontext%:*:*}:terraform-workspace-${cmd}:"
+
+  if (( ${+functions[_terraform_workspace_$cmd]} )); then
+    "_terraform_workspace_${cmd}"
+  else
+    _message "no more options"
+  fi
+}
+
+(( ${+functions[_terraform_workspace_delete]} )) || _terraform_workspace_delete() {
+  _arguments \
+    '-force[Remove a workspace even if it is managing resources. Terraform can no longer track or manage the workspace'\''s infrastructure.]' \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '::' \
+    ':name:__terraform_workspaces'
+}
+
+(( ${+functions[_terraform_workspace_list]} )) || _terraform_workspace_list() {
+  _arguments
+}
+
+(( ${+functions[_terraform_workspace_new]} )) || _terraform_workspace_new() {
+  _arguments \
+    '-lock=[(true) Don'\''t hold a state lock during the operation. This is dangerous if others might concurrently run commands against the same workspace.]:lock:(true false)' \
+    '-lock-timeout=[(0s) Duration to retry a state lock.]:lock_timeout:' \
+    '-state=[(path) Copy an existing state file into the new workspace.]:statefile:_files -W __chdir -g "*.tfstate"' \
+    '::' \
+    ':name:'
+}
+
+(( ${+functions[_terraform_workspace_select]} )) || _terraform_workspace_select() {
+  _arguments \
+    '-or-create=[(false) Create the Terraform workspace if it doesn'\''t exist.]:or_create:(true false)' \
+    '::' \
+    ':name:__terraform_workspaces'
+}
+
+(( ${+functions[_terraform_workspace_show]} )) || _terraform_workspace_show() {
+  _arguments
+}
+
+(( ${+functions[__terraform_workspaces]} )) || __terraform_workspaces() {
+  local workspace
+  local -a workspaces
+  terraform -chdir="${__chdir}" workspace list | while read -r workspace; do
+    if [[ -z "${workspace}" ]]; then
+      continue
+    fi
+    workspaces+=( "${workspace#[ *] }" )
+  done
+  compadd "${@}" - "${workspaces[@]}"
+}
+
+_terraform() {
+  _arguments \
+    '-chdir=[(DIR) Switch to a different working directory before executing the given subcommand.]:chdir:_files -W __chdir -/' \
+    '-help[Show this help output, or the help for a specified subcommand.]' \
+    '-version[An alias for the "version" subcommand.]' \
+    '*::terraform command:_terraform_commands'
+}
+
+# don't run the completion function when being source-ed or eval-ed
+if [ "${funcstack[1]}" = '_terraform' ]; then
+  _terraform
 fi
-
-local -a _command_args
-case "$words[1]" in
-  0.12upgrade)
-    __012upgrade ;;
-  0.13upgrade)
-    __013upgrade ;;
-  apply)
-    __apply ;;
-  console)
-    __console;;
-  destroy)
-    __destroy ;;
-  fmt)
-    __fmt;;
-  force-unlock)
-    __force_unlock;;
-  get)
-    __get ;;
-  graph)
-    __graph ;;
-  import)
-    __import;;
-  init)
-    __init ;;
-  login)
-    __login ;;
-  logout)
-    __logout ;;
-  output)
-    __output ;;
-  plan)
-    __plan ;;
-  providers)
-    test $CURRENT -lt 3 && __providers
-    [[ $words[2] = "mirror" ]] && __providers_mirror
-    [[ $words[2] = "schema" ]] && __providers_schema
-    ;;
-  refresh)
-    __refresh ;;
-  show)
-    __show ;;
-  state)
-    test $CURRENT -lt 3 && __state
-    [[ $words[2] = "list" ]] && __state_list
-    [[ $words[2] = "mv" ]] && __state_mv
-    [[ $words[2] = "push" ]] && __state_push
-    [[ $words[2] = "replace-provider" ]] && __state_replace_provider
-    [[ $words[2] = "rm" ]] && __state_rm
-    [[ $words[2] = "show" ]] && __state_show
-    ;;
-  taint)
-    __taint ;;
-  untaint)
-    __untaint ;;
-  validate)
-    __validate ;;
-  version)
-    __version ;;
-  workspace)
-    test $CURRENT -lt 3 && __workspace ;;
-esac
diff --git a/zsh/plugins/terraform/terraform.plugin.zsh b/zsh/plugins/terraform/terraform.plugin.zsh
index d9e39e6..1359ddd 100644
--- a/zsh/plugins/terraform/terraform.plugin.zsh
+++ b/zsh/plugins/terraform/terraform.plugin.zsh
@@ -2,17 +2,39 @@ function tf_prompt_info() {
   # dont show 'default' workspace in home dir
   [[ "$PWD" != ~ ]] || return
   # check if in terraform dir and file exists
-  [[ -d .terraform && -r .terraform/environment ]] || return
+  [[ -d "${TF_DATA_DIR:-.terraform}" && -r "${TF_DATA_DIR:-.terraform}/environment" ]] || return
 
-  local workspace="$(< .terraform/environment)"
+  local workspace="$(< "${TF_DATA_DIR:-.terraform}/environment")"
   echo "${ZSH_THEME_TF_PROMPT_PREFIX-[}${workspace:gs/%/%%}${ZSH_THEME_TF_PROMPT_SUFFIX-]}"
 }
 
+function tf_version_prompt_info() {
+    local terraform_version
+    terraform_version=$(terraform --version | head -n 1 | cut -d ' ' -f 2)
+    echo "${ZSH_THEME_TF_VERSION_PROMPT_PREFIX-[}${terraform_version:gs/%/%%}${ZSH_THEME_TF_VERSION_PROMPT_SUFFIX-]}"
+}
+
+
 alias tf='terraform'
 alias tfa='terraform apply'
+alias tfa!='terraform apply -auto-approve'
+alias tfap='terraform apply -parallelism=1'
+alias tfc='terraform console'
 alias tfd='terraform destroy'
+alias tfd!='terraform destroy -auto-approve'
+alias tfdp='terraform destroy -parallelism=1'
 alias tff='terraform fmt'
+alias tffr='terraform fmt -recursive'
 alias tfi='terraform init'
+alias tfir='terraform init -reconfigure'
+alias tfiu='terraform init -upgrade'
+alias tfiur='terraform init -upgrade -reconfigure'
 alias tfo='terraform output'
 alias tfp='terraform plan'
 alias tfv='terraform validate'
+alias tfs='terraform state'
+alias tft='terraform test'
+alias tfsh='terraform show'
+alias tfw='terraform workspace'
+alias tfwl='terraform workspace list'
+alias tfws='terraform workspace select'
diff --git a/zsh/plugins/thefuck/thefuck.plugin.zsh b/zsh/plugins/thefuck/thefuck.plugin.zsh
index 2ab4eb6..8cc3893 100644
--- a/zsh/plugins/thefuck/thefuck.plugin.zsh
+++ b/zsh/plugins/thefuck/thefuck.plugin.zsh
@@ -5,8 +5,8 @@ if [[ -z $commands[thefuck] ]]; then
 fi
 
 # Register alias
-[[ ! -a $ZSH_CACHE_DIR/thefuck ]] && thefuck --alias > $ZSH_CACHE_DIR/thefuck
-source $ZSH_CACHE_DIR/thefuck
+[[ ! -a "$ZSH_CACHE_DIR/thefuck" ]] && thefuck --alias > "$ZSH_CACHE_DIR/thefuck"
+source "$ZSH_CACHE_DIR/thefuck"
 
 fuck-command-line() {
     local FUCK="$(THEFUCK_REQUIRE_CONFIRMATION=0 thefuck $(fc -ln -1 | tail -n 1) 2> /dev/null)"
diff --git a/zsh/plugins/thor/README.md b/zsh/plugins/thor/README.md
index 09c705d..484c88b 100644
--- a/zsh/plugins/thor/README.md
+++ b/zsh/plugins/thor/README.md
@@ -1,6 +1,6 @@
 # Thor plugin
 
-This plugin adds completion for [Thor](http://whatisthor.com/), 
+This plugin adds completion for [Thor](http://whatisthor.com/),
 a ruby toolkit for building powerful command-line interfaces.
 
 To use it, add `thor` to the plugins array in your zshrc file:
diff --git a/zsh/plugins/tig/tig.plugin.zsh b/zsh/plugins/tig/tig.plugin.zsh
index 7e0c530..5b7d255 100644
--- a/zsh/plugins/tig/tig.plugin.zsh
+++ b/zsh/plugins/tig/tig.plugin.zsh
@@ -1,3 +1,5 @@
 alias tis='tig status'
 alias til='tig log'
 alias tib='tig blame -C'
+alias tif='tig reflog'
+alias tia='tig --all'
diff --git a/zsh/plugins/timer/timer.plugin.zsh b/zsh/plugins/timer/timer.plugin.zsh
index b261f71..6baf1f6 100644
--- a/zsh/plugins/timer/timer.plugin.zsh
+++ b/zsh/plugins/timer/timer.plugin.zsh
@@ -6,7 +6,7 @@ __timer_current_time() {
 }
 
 __timer_format_duration() {
-  local mins=$(printf '%.0f' $(($1 / 60)))
+  local mins=$(printf '%.0f' $(($(IFS='.' read int dec <<< "$1"; echo $int) / 60)))
   local secs=$(printf "%.${TIMER_PRECISION:-1}f" $(($1 - 60 * mins)))
   local duration_str=$(echo "${mins}m${secs}s")
   local format="${TIMER_FORMAT:-/%d}"
@@ -23,9 +23,12 @@ __timer_display_timer_precmd() {
     local tdiff=$((cmd_end_time - __timer_cmd_start_time))
     unset __timer_cmd_start_time
     if [[ -z "${TIMER_THRESHOLD}" || ${tdiff} -ge "${TIMER_THRESHOLD}" ]]; then
+      local last_cmd="${history[$((HISTCMD - 1))]%% *}"
+      if [[ "$last_cmd" != clear ]]; then
         local tdiffstr=$(__timer_format_duration ${tdiff})
         local cols=$((COLUMNS - ${#tdiffstr} - 1))
         echo -e "\033[1A\033[${cols}C ${tdiffstr}"
+      fi 
     fi
   fi
 }
diff --git a/zsh/plugins/timoni/README.md b/zsh/plugins/timoni/README.md
new file mode 100644
index 0000000..8701ede
--- /dev/null
+++ b/zsh/plugins/timoni/README.md
@@ -0,0 +1,9 @@
+# Timoni plugin
+
+This plugin adds completion for [Timoni](https://timoni.sh), a package manager for Kubernetes, powered by CUE and inspired by Helm.
+
+To use it, add `timoni` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... timoni)
+```
diff --git a/zsh/plugins/timoni/timoni.plugin.zsh b/zsh/plugins/timoni/timoni.plugin.zsh
new file mode 100644
index 0000000..971eda0
--- /dev/null
+++ b/zsh/plugins/timoni/timoni.plugin.zsh
@@ -0,0 +1,14 @@
+# Autocompletion for the Timoni CLI (timoni).
+if (( ! $+commands[timoni] )); then
+  return
+fi
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it to `timoni`. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_timoni" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _timoni
+  _comps[timoni]=_timoni
+fi
+
+timoni completion zsh >| "$ZSH_CACHE_DIR/completions/_timoni" &|
diff --git a/zsh/plugins/tldr/README.md b/zsh/plugins/tldr/README.md
new file mode 100644
index 0000000..03b1dfc
--- /dev/null
+++ b/zsh/plugins/tldr/README.md
@@ -0,0 +1,18 @@
+# tldr plugin
+
+This plugin adds a shortcut to insert tldr before the previous command.
+Heavily inspired from [Man plugin](https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/man).
+
+To use it, add `tldr` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... tldr)
+```
+
+# Keyboard Shortcuts
+| Shortcut                           | Description                                                                |
+|------------------------------------|----------------------------------------------------------------------------|
+| <kbd>Esc</kbd> + tldr              | add tldr before the previous command to see the tldr page for this command |
+
+## Note
+You also need to install ```tldr```.
diff --git a/zsh/plugins/tldr/tldr.plugin.zsh b/zsh/plugins/tldr/tldr.plugin.zsh
new file mode 100644
index 0000000..9f3de5f
--- /dev/null
+++ b/zsh/plugins/tldr/tldr.plugin.zsh
@@ -0,0 +1,19 @@
+tldr-command-line() {
+    # if there is no command typed, use the last command
+    [[ -z "$BUFFER" ]] && zle up-history
+
+    # if typed command begins with tldr, do nothing
+    [[ "$BUFFER" = tldr\ * ]] && return
+
+    # get command and possible subcommand
+    # http://zsh.sourceforge.net/Doc/Release/Expansion.html#Parameter-Expansion-Flags
+    local -a args
+    args=(${${(Az)BUFFER}[1]} ${${(Az)BUFFER}[2]})
+
+    BUFFER="tldr ${args[1]}"
+}
+
+zle -N tldr-command-line
+# Defined shortcut keys: [Esc]tldr
+bindkey "\e"tldr tldr-command-line
+
diff --git a/zsh/plugins/tmux/README.md b/zsh/plugins/tmux/README.md
index 7348f77..aaa81aa 100644
--- a/zsh/plugins/tmux/README.md
+++ b/zsh/plugins/tmux/README.md
@@ -1,7 +1,7 @@
 # tmux
 
-This plugin provides aliases for [tmux](https://tmux.github.io/), the terminal multiplexer.
-To use it add `tmux` to the plugins array in your zshrc file.
+This plugin provides aliases for [tmux](https://tmux.github.io/), the terminal multiplexer. To use it add
+`tmux` to the plugins array in your zshrc file.
 
 ```zsh
 plugins=(... tmux)
@@ -19,25 +19,30 @@ The plugin also supports the following:
 | ---------- | -------------------------- | -------------------------------------------------------- |
 | `ta`       | tmux attach -t             | Attach new tmux session to already running named session |
 | `tad`      | tmux attach -d -t          | Detach named tmux session                                |
-| `ts`       | tmux new-session -s        | Create a new named tmux session                          |
-| `tl`       | tmux list-sessions         | Displays a list of running tmux sessions                 |
-| `tksv`     | tmux kill-server           | Terminate all running tmux sessions                      |
+| `tds`      | `_tmux_directory_session`  | Creates or attaches to a session for the current path    |
 | `tkss`     | tmux kill-session -t       | Terminate named running tmux session                     |
+| `tksv`     | tmux kill-server           | Terminate all running tmux sessions                      |
+| `tl`       | tmux list-sessions         | Displays a list of running tmux sessions                 |
+| `to`       | tmux new-session -A -s     | Create or attach to a named tmux session                 |
 | `tmux`     | `_zsh_tmux_plugin_run`     | Start a new tmux session                                 |
 | `tmuxconf` | `$EDITOR $ZSH_TMUX_CONFIG` | Open .tmux.conf file with an editor                      |
+| `ts`       | tmux new-session -s        | Create a new named tmux session                          |
 
 ## Configuration Variables
 
-| Variable                            | Description                                                                   |
-| ----------------------------------- | ----------------------------------------------------------------------------- |
-| `ZSH_TMUX_AUTOSTART`                | Automatically starts tmux (default: `false`)                                  |
-| `ZSH_TMUX_AUTOSTART_ONCE`           | Autostart only if tmux hasn't been started previously (default: `true`)       |
-| `ZSH_TMUX_AUTOCONNECT`              | Automatically connect to a previous session if it exits (default: `true`)     |
-| `ZSH_TMUX_AUTOQUIT`                 | Automatically closes terminal once tmux exits (default: `ZSH_TMUX_AUTOSTART`) |
-| `ZSH_TMUX_FIXTERM`                  | Sets `$TERM` to 256-color term or not based on current terminal support       |
-| `ZSH_TMUX_ITERM2`                   | Sets the `-CC` option for iTerm2 tmux integration (default: `false`)          |
-| `ZSH_TMUX_FIXTERM_WITHOUT_256COLOR` | `$TERM` to use for non 256-color terminals (default: `screen`)                |
-| `ZSH_TMUX_FIXTERM_WITH_256COLOR`    | `$TERM` to use for 256-color terminals (default: `screen-256color`            |
-| `ZSH_TMUX_CONFIG`                   | Set the configuration path (default: `$HOME/.tmux.conf`)                      |
-| `ZSH_TMUX_UNICODE`                  | Set `tmux -u` option to support unicode                                       |
-| `ZSH_TMUX_DEFAULT_SESSION_NAME`     | Set tmux default session name when autostart is enabled                       |
+| Variable                            | Description                                                                                                                    |
+| ----------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| `ZSH_TMUX_AUTOREFRESH`              | Automatically refresh global environments (default: `false`)                                                                   |
+| `ZSH_TMUX_AUTOSTART`                | Automatically starts tmux (default: `false`)                                                                                   |
+| `ZSH_TMUX_AUTOSTART_ONCE`           | Autostart only if tmux hasn't been started previously (default: `true`)                                                        |
+| `ZSH_TMUX_AUTOCONNECT`              | Automatically connect to a previous session if it exits (default: `true`)                                                      |
+| `ZSH_TMUX_AUTOQUIT`                 | Automatically closes terminal once tmux exits (default: `ZSH_TMUX_AUTOSTART`)                                                  |
+| `ZSH_TMUX_CONFIG`                   | Set the configuration path (default: `$HOME/.tmux.conf`, `$XDG_CONFIG_HOME/tmux/tmux.conf`)                                    |
+| `ZSH_TMUX_DEFAULT_SESSION_NAME`     | Set tmux default session name when autostart is enabled                                                                        |
+| `ZSH_TMUX_AUTONAME_SESSION`         | Automatically name new sessions based on the basename of `$PWD` (default: `false`)                                             |
+| `ZSH_TMUX_DETACHED`                 | Set the detached mode (default: `false`)                                                                                       |
+| `ZSH_TMUX_FIXTERM`                  | Sets `$TERM` to 256-color term or not based on current terminal support                                                        |
+| `ZSH_TMUX_FIXTERM_WITHOUT_256COLOR` | `$TERM` to use for non 256-color terminals (default: `tmux` if available, `screen` otherwise)                                  |
+| `ZSH_TMUX_FIXTERM_WITH_256COLOR`    | `$TERM` to use for 256-color terminals (default: `tmux-256color` if available, `screen-256color` otherwise)                    |
+| `ZSH_TMUX_ITERM2`                   | Sets the `-CC` option for [iTerm2 tmux integration](https://iterm2.com/documentation-tmux-integration.html) (default: `false`) |
+| `ZSH_TMUX_UNICODE`                  | Set `tmux -u` option to support unicode                                                                                        |
diff --git a/zsh/plugins/tmux/tmux.plugin.zsh b/zsh/plugins/tmux/tmux.plugin.zsh
index b9bb66d..b1d97e9 100644
--- a/zsh/plugins/tmux/tmux.plugin.zsh
+++ b/zsh/plugins/tmux/tmux.plugin.zsh
@@ -13,33 +13,80 @@ fi
 : ${ZSH_TMUX_AUTOCONNECT:=true}
 # Automatically close the terminal when tmux exits
 : ${ZSH_TMUX_AUTOQUIT:=$ZSH_TMUX_AUTOSTART}
+# Automatically name the new session based on the basename of PWD
+: ${ZSH_TMUX_AUTONAME_SESSION:=false}
+# Automatically pick up tmux environments
+: ${ZSH_TMUX_AUTOREFRESH:=false}
 # Set term to screen or screen-256color based on current terminal support
+: ${ZSH_TMUX_DETACHED:=false}
+# Set detached mode
 : ${ZSH_TMUX_FIXTERM:=true}
 # Set '-CC' option for iTerm2 tmux integration
 : ${ZSH_TMUX_ITERM2:=false}
 # The TERM to use for non-256 color terminals.
-# Tmux states this should be screen, but you may need to change it on
+# Tmux states this should be tmux|screen, but you may need to change it on
 # systems without the proper terminfo
-: ${ZSH_TMUX_FIXTERM_WITHOUT_256COLOR:=screen}
+if [[ -e /usr/share/terminfo/t/tmux ]]; then
+  : ${ZSH_TMUX_FIXTERM_WITHOUT_256COLOR:=tmux}
+else
+  : ${ZSH_TMUX_FIXTERM_WITHOUT_256COLOR:=screen}
+fi
 # The TERM to use for 256 color terminals.
-# Tmux states this should be screen-256color, but you may need to change it on
+# Tmux states this should be (tmux|screen)-256color, but you may need to change it on
 # systems without the proper terminfo
-: ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color}
+if [[ -e /usr/share/terminfo/t/tmux-256color ]]; then
+  : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=tmux-256color}
+else
+  : ${ZSH_TMUX_FIXTERM_WITH_256COLOR:=screen-256color}
+fi
 # Set the configuration path
-: ${ZSH_TMUX_CONFIG:=$HOME/.tmux.conf}
+if [[ -e $HOME/.tmux.conf ]]; then
+  : ${ZSH_TMUX_CONFIG:=$HOME/.tmux.conf}
+elif [[ -e ${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf ]]; then
+  : ${ZSH_TMUX_CONFIG:=${XDG_CONFIG_HOME:-$HOME/.config}/tmux/tmux.conf}
+else
+  : ${ZSH_TMUX_CONFIG:=$HOME/.tmux.conf}
+fi
 # Set -u option to support unicode
 : ${ZSH_TMUX_UNICODE:=false}
 
 # ALIASES
+function _build_tmux_alias {
+  setopt localoptions no_rc_expand_param
+  eval "function $1 {
+    if [[ -z \$1 ]] || [[ \${1:0:1} == '-' ]]; then
+      tmux $2 \"\$@\"
+    else
+      tmux $2 $3 \"\$@\"
+    fi
+  }"
+
+  local f s
+  f="_omz_tmux_alias_${1}"
+  s=(${(z)2})
+
+  eval "function ${f}() {
+    shift words;
+    words=(tmux ${@:2} \$words);
+    ((CURRENT+=${#s[@]}+1))
+    _tmux
+  }"
+
+  compdef "$f" "$1"
+}
 
-alias ta='tmux attach -t'
-alias tad='tmux attach -d -t'
-alias ts='tmux new-session -s'
-alias tl='tmux list-sessions'
 alias tksv='tmux kill-server'
-alias tkss='tmux kill-session -t'
+alias tl='tmux list-sessions'
 alias tmuxconf='$EDITOR $ZSH_TMUX_CONFIG'
 
+_build_tmux_alias "ta" "attach" "-t"
+_build_tmux_alias "tad" "attach -d" "-t"
+_build_tmux_alias "to" "new-session -A" "-s"
+_build_tmux_alias "ts" "new-session" "-s"
+_build_tmux_alias "tkss" "kill-session" "-t"
+
+unfunction _build_tmux_alias
+
 # Determine if the terminal supports 256 colors
 if [[ $terminfo[colors] == 256 ]]; then
   export ZSH_TMUX_TERM=$ZSH_TMUX_FIXTERM_WITH_256COLOR
@@ -72,8 +119,27 @@ function _zsh_tmux_plugin_run() {
   [[ "$ZSH_TMUX_ITERM2" == "true" ]] && tmux_cmd+=(-CC)
   [[ "$ZSH_TMUX_UNICODE" == "true" ]] && tmux_cmd+=(-u)
 
+  local _detached=""
+  [[ "$ZSH_TMUX_DETACHED" == "true" ]] && _detached="-d"
+
+  local session_name
+  if [[ "$ZSH_TMUX_AUTONAME_SESSION" == "true" ]]; then
+    # Name the session after the basename of the current directory
+    session_name=${PWD##*/}
+    # If the current directory is the home directory, name it 'HOME'
+    [[ "$PWD" == "$HOME" ]] && session_name="HOME"
+    # If the current directory is the root directory, name it 'ROOT'
+    [[ "$PWD" == "/" ]] && session_name="ROOT"
+  else
+      session_name="$ZSH_TMUX_DEFAULT_SESSION_NAME"
+  fi
+
   # Try to connect to an existing session.
-  [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] && $tmux_cmd attach
+  if [[ -n "$session_name" ]]; then
+    [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] && $tmux_cmd attach $_detached -t "$session_name"
+  else
+    [[ "$ZSH_TMUX_AUTOCONNECT" == "true" ]] && $tmux_cmd attach $_detached
+  fi
 
   # If failed, just run tmux, fixing the TERM variable if requested.
   if [[ $? -ne 0 ]]; then
@@ -82,10 +148,11 @@ function _zsh_tmux_plugin_run() {
     elif [[ -e "$ZSH_TMUX_CONFIG" ]]; then
       tmux_cmd+=(-f "$ZSH_TMUX_CONFIG")
     fi
-    if [[ -n "$ZSH_TMUX_DEFAULT_SESSION_NAME" ]]; then
-        $tmux_cmd new-session -s $ZSH_TMUX_DEFAULT_SESSION_NAME
+
+    if [[ -n "$session_name" ]]; then
+      $tmux_cmd new-session -s "$session_name"
     else
-        $tmux_cmd new-session
+      $tmux_cmd new-session
     fi
   fi
 
@@ -94,16 +161,44 @@ function _zsh_tmux_plugin_run() {
   fi
 }
 
+# Refresh tmux environment variables.
+function _zsh_tmux_plugin_preexec()
+{
+  local -a tmux_cmd
+  tmux_cmd=(command tmux)
+
+  eval $($tmux_cmd show-environment -s)
+}
+
 # Use the completions for tmux for our function
 compdef _tmux _zsh_tmux_plugin_run
 # Alias tmux to our wrapper function.
 alias tmux=_zsh_tmux_plugin_run
 
+function _tmux_directory_session() {
+  # current directory without leading path
+  local dir=${PWD##*/}
+  # md5 hash for the full working directory path
+  local md5=$(printf '%s' "$PWD" | md5sum | cut -d  ' ' -f 1)
+  # human friendly unique session name for this directory
+  local session_name="${dir}-${md5:0:6}"
+  # create or attach to the session
+  tmux new -As "$session_name"
+}
+
+alias tds=_tmux_directory_session
+
 # Autostart if not already in tmux and enabled.
-if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" ]]; then
+if [[ -z "$TMUX" && "$ZSH_TMUX_AUTOSTART" == "true" && -z "$INSIDE_EMACS" && -z "$EMACS" && -z "$VIM" && -z "$INTELLIJ_ENVIRONMENT_READER" && -z "$ZED_TERM" ]]; then
   # Actually don't autostart if we already did and multiple autostarts are disabled.
   if [[ "$ZSH_TMUX_AUTOSTART_ONCE" == "false" || "$ZSH_TMUX_AUTOSTARTED" != "true" ]]; then
     export ZSH_TMUX_AUTOSTARTED=true
     _zsh_tmux_plugin_run
   fi
 fi
+
+# Automatically refresh tmux environments if tmux is running.
+if [[ -n "$TMUX" && "$ZSH_TMUX_AUTOREFRESH" == "true" ]] && tmux ls >/dev/null 2>/dev/null; then
+  autoload -U add-zsh-hook
+  add-zsh-hook preexec _zsh_tmux_plugin_preexec
+fi
diff --git a/zsh/plugins/toolbox/README.md b/zsh/plugins/toolbox/README.md
index abaca31..d957d9b 100644
--- a/zsh/plugins/toolbox/README.md
+++ b/zsh/plugins/toolbox/README.md
@@ -10,7 +10,8 @@ plugins=(... toolbox)
 
 ## Prompt function
 
-This plugins adds `toolbox_prompt_info()` function. Using it in your prompt, it will show the toolbox indicator ⬢ (if you are running in a toolbox container), and nothing if not.
+This plugins adds `toolbox_prompt_info()` function. Using it in your prompt, it will show the toolbox
+indicator ⬢ (if you are running in a toolbox container), and nothing if not.
 
 You can use it by adding `$(toolbox_prompt_info)` to your `PROMPT` or `RPROMPT` variable:
 
@@ -18,8 +19,11 @@ You can use it by adding `$(toolbox_prompt_info)` to your `PROMPT` or `RPROMPT`
 RPROMPT='$(toolbox_prompt_info)'
 ```
 
+In the same way, it adds `toolbox_prompt_name()`, showing the name of the containerized environment.
+
 ## Aliases
 
-| Alias | Command              | Description                            |
-|-------|----------------------|----------------------------------------|
-| tb    | `toolbox enter`      | Enters the toolbox environment         |
+| Alias | Command         | Description                          |
+| ----- | --------------- | ------------------------------------ |
+| tbe   | `toolbox enter` | Enters the toolbox environment       |
+| tbr   | `toolbox run`   | Run a command in an existing toolbox |
diff --git a/zsh/plugins/toolbox/kubectx.plugin.zsh b/zsh/plugins/toolbox/kubectx.plugin.zsh
deleted file mode 100644
index 8b6bf5e..0000000
--- a/zsh/plugins/toolbox/kubectx.plugin.zsh
+++ /dev/null
@@ -1,3 +0,0 @@
-function toolbox_prompt_info() {
-  [[ -f /run/.toolboxenv ]] && echo "⬢"
-}
diff --git a/zsh/plugins/toolbox/toolbox.plugin.zsh b/zsh/plugins/toolbox/toolbox.plugin.zsh
index d24d6d3..efe3836 100644
--- a/zsh/plugins/toolbox/toolbox.plugin.zsh
+++ b/zsh/plugins/toolbox/toolbox.plugin.zsh
@@ -2,4 +2,15 @@ function toolbox_prompt_info() {
   [[ -f /run/.toolboxenv ]] && echo "⬢"
 }
 
-alias tb="toolbox enter"
+function toolbox_prompt_name() {
+  [[ -f /run/.containerenv ]] || return
+
+  # This command reads the /run/.containerenv file line by line and extracts the
+  # container name from it by looking for the `name="..."` line, and uses -F\" to
+  # split the line by double quotes. Then all % characters are replaced with %%
+  # to escape them for the prompt.
+  awk -F\" '/name/ { gsub(/%/, "%%", $2); print $2 }' /run/.containerenv
+}
+
+alias tbe="toolbox enter"
+alias tbr="toolbox run"
diff --git a/zsh/plugins/tt/README.MD b/zsh/plugins/tt/README.MD
new file mode 100644
index 0000000..6246488
--- /dev/null
+++ b/zsh/plugins/tt/README.MD
@@ -0,0 +1,26 @@
+# TT 
+
+This plugin provides mutual conversion of timestamp and date. 
+
+To use it add tt to the plugins array in your zshrc file.
+
+```bash
+plugins=(... tt)
+```
+# Example
+
+print timestamp for "2019-10-16"
+```bash
+tt 2019-10-16
+```
+
+print timestamp for "2019-10-16 18:41:00"
+```bash
+tt "2019-10-16 18:41:00"
+```
+
+print date for "1571222561"
+```bash
+tt 1571222561
+```
+echo 2019-10-16 18:42:41
diff --git a/zsh/plugins/tt/tt.plugin.zsh b/zsh/plugins/tt/tt.plugin.zsh
new file mode 100644
index 0000000..cffb4b8
--- /dev/null
+++ b/zsh/plugins/tt/tt.plugin.zsh
@@ -0,0 +1,21 @@
+# 
+# Functions
+#
+# timestamp to date Or date to timestamp
+#
+tt () {
+	if [[ $1 =~ "-" ]]
+	then
+		if [[ $1 =~ " " ]]
+		then
+			date -j -f "%Y-%m-%d %H:%M:%S" "$1" +%s 2> /dev/null
+		else
+			date -j -f "%Y-%m-%d %H:%M:%S" "$1 00:00:00" +%s 2> /dev/null
+		fi
+	elif [[ $1 = "" ]]
+	then
+		date +%s
+	else
+		date -r $1 "+%Y-%m-%d %H:%M:%S"
+	fi
+}
diff --git a/zsh/plugins/ubuntu/README.md b/zsh/plugins/ubuntu/README.md
index 20f5c65..4b09ba0 100644
--- a/zsh/plugins/ubuntu/README.md
+++ b/zsh/plugins/ubuntu/README.md
@@ -10,10 +10,11 @@ plugins=(... ubuntu)
 
 ## Aliases
 
-Commands that use `$APT` will use `apt` if installed or defer to `apt-get` otherwise.
+Commands that use `$APT` will use `apt-fast` if installed, or `apt` if installed, or defer to `apt-get`
+otherwise.
 
 | Alias   | Command                                                                  | Description                                                                                       |
-|---------|--------------------------------------------------------------------------|---------------------------------------------------------------------------------------------------|
+| ------- | ------------------------------------------------------------------------ | ------------------------------------------------------------------------------------------------- |
 | age     | `sudo $APT`                                                              | Run apt-get with sudo                                                                             |
 | acs     | `apt-cache search`                                                       | Search the apt-cache with the specified criteria                                                  |
 | acsp    | `apt-cache showpkg`                                                      | Shows information about the listed packages                                                       |
@@ -26,7 +27,7 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 | agd     | `sudo $APT dselect-upgrade`                                              | Follows dselect choices for package installation                                                  |
 | agi     | `sudo $APT install <pkg>`                                                | Install the specified package                                                                     |
 | agli    | `apt list --installed`                                                   | List the installed packages                                                                       |
-| aglu    | `sudo apt-get -u upgrade --assume-no`                                    | Run an apt-get upgrade assuming no to all prompts                                                 |
+| aglu    | `apt list --upgradable`                                                  | List available updates only                                                                       |
 | agp     | `sudo $APT purge <pkg>`                                                  | Remove a package including any configuration files                                                |
 | agr     | `sudo $APT remove <pkg>`                                                 | Remove a package                                                                                  |
 | ags     | `$APT source <pkg>`                                                      | Fetch the source for the specified package                                                        |
@@ -36,21 +37,20 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 | agar    | `sudo $APT autoremove`                                                   | Remove automatically installed packages no longer needed                                          |
 | aguu    | `sudo $APT update && sudo $APT upgrade`                                  | Update packages list and upgrade available packages                                               |
 | allpkgs | `dpkg --get-selections \| grep -v deinstall`                             | Print all installed packages                                                                      |
-| kclean  | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))` |Remove ALL kernel images and headers EXCEPT the one in use                                         |
+| kclean  | `sudo aptitude remove -P ?and(~i~nlinux-(ima\|hea) ?not(~n$(uname -r)))` | Remove ALL kernel images and headers EXCEPT the one in use                                        |
 | mydeb   | `time dpkg-buildpackage -rfakeroot -us -uc`                              | Create a basic .deb package                                                                       |
 | ppap    | `sudo ppa-purge <ppa>`                                                   | Remove the specified PPA                                                                          |
 
-
 ## Functions
 
-| Function          | Usage                                 |Description                                                               |
-|-------------------|---------------------------------------|--------------------------------------------------------------------------|
+| Function          | Usage                                 | Description                                                              |
+| ----------------- | ------------------------------------- | ------------------------------------------------------------------------ |
 | aar               | `aar ppa:xxxxxx/xxxxxx [packagename]` | apt-add-repository with automatic install/upgrade of the desired package |
 | apt-history       | `apt-history <action>`                | Prints the Apt history of the specified action                           |
 | apt-list-packages | `apt-list-packages`                   | List packages by size                                                    |
 | kerndeb           | `kerndeb`                             | Kernel-package building shortcut                                         |
 
-## Authors:
+## Authors
 
 - [@AlexBio](https://github.com/AlexBio)
 - [@dbb](https://github.com/dbb)
@@ -59,3 +59,4 @@ Commands that use `$APT` will use `apt` if installed or defer to `apt-get` other
 - [Nicolas Jonas](https://nextgenthemes.com)
 - [@loctauxphilippe](https://github.com/loctauxphilippe)
 - [@HaraldNordgren](https://github.com/HaraldNordgren)
+- [@AmrElsayyad](https://github.com/AmrElsayyad)
diff --git a/zsh/plugins/ubuntu/ubuntu.plugin.zsh b/zsh/plugins/ubuntu/ubuntu.plugin.zsh
index 7b765a4..66e2d52 100644
--- a/zsh/plugins/ubuntu/ubuntu.plugin.zsh
+++ b/zsh/plugins/ubuntu/ubuntu.plugin.zsh
@@ -1,11 +1,22 @@
-(( $+commands[apt] )) && APT=apt || APT=apt-get
+# Detect available package manager (prefer apt-fast > apt > apt-get)
+if (( $+commands[apt-fast] )); then
+    APT=apt-fast
+elif (( $+commands[apt] )); then
+    APT=apt
+else
+    APT=apt-get
+fi
 
 alias acs='apt-cache search'
 
 alias afs='apt-file search --regexp'
 
 # These are apt/apt-get only
-alias ags="$APT source"
+if (( $+commands[apt] )); then
+    alias ags="apt source"
+else
+    alias ags="apt-get source"
+fi
 
 alias acp='apt-cache policy'
 
diff --git a/zsh/plugins/ufw/README.md b/zsh/plugins/ufw/README.md
index ac377cd..ffcc6d6 100644
--- a/zsh/plugins/ufw/README.md
+++ b/zsh/plugins/ufw/README.md
@@ -10,7 +10,7 @@ plugins=(... ufw)
 
 Some of the commands include:
 
-* `allow <port>/<optional: protocol>` add an allow rule 
+* `allow <port>/<optional: protocol>` add an allow rule
 * `default` set default policy
 * `delete <port>/<optional: protocol>` delete RULE
 * `deny <port>/<optional: protocol>` add deny rule
diff --git a/zsh/plugins/universalarchive/README.md b/zsh/plugins/universalarchive/README.md
index 93a1bd9..bcd33ce 100644
--- a/zsh/plugins/universalarchive/README.md
+++ b/zsh/plugins/universalarchive/README.md
@@ -1,46 +1,76 @@
 # universalarchive plugin
 
-Lets you compress files by a command `ua <format> <files>`, supporting various
-compression formats (e.g. 7z, tar.gz, lzma, ...).
+The `universalarchive` plugin provides a convenient command-line interface for archiving files and directories using a wide variety of compression formats - without having to remember the exact syntax for each tool.
 
-To enable it, add `universalarchive` to the plugins array in your zshrc file:
+To enable it, add `universalarchive` to the plugins array in your `.zshrc` file:
 
 ```zsh
 plugins=(... universalarchive)
 ```
 
+## Features
+ - Compress files and directories using a simple, unified command: ua <format> <files>
+ - Automatically detects file/directory names to generate appropriate output names
+ - Supports fallback naming if an output file already exists
+ - Works with many common and advanced compression formats
+ - Designed for simplicity and quick use in the terminal
+
 ## Usage
 
-Run `ua <format> <files>` to compress `<files>` into an archive file using `<format>`.
-For example:
-
+Basic command format:
 ```sh
-ua xz *.html
+ua <format> <files...>
+```
+- `<format>`: the archive format to use (e.g., `zip`, `tar.gz`, `xz`, `7z`, etc.)
+- `<files...>`: one or more files or directories to compress
+
+## Examples:
+
+Compresses `notes.txt` and `images` into `notes.zip`
+```sh
+ua zip notes.txt images/
 ```
 
-this command will compress all `.html` files in directory `folder` into `folder.xz`.
+Creates `myproject.tar.gz`
+```sh
+ua tar.gz myproject/
+```
 
-This plugin saves you from having to remember which command line arguments compress a file.
+Compresses all .log files into `current_folder.xz`
+```sh
+ua xz *.log
+```
 
-## Supported compression formats
+The plugin will generate a default archive filename based on the input:
+ - For a file, the output is derived from the file name without its extension.
+ - For a directory, it uses the directory name.
+ - For multiple files, it uses the name of the common parent directory.
 
-| Extension        | Description                    |
-|:-----------------|:-------------------------------|
-| `7z`             | 7zip file                      |
-| `bz2`            | Bzip2 file                     |
-| `gz`             | Gzip file                      |
-| `lzma`           | LZMA archive                   |
-| `lzo`            | LZO archive                    |
-| `rar`            | WinRAR archive                 |
-| `tar`            | Tarball                        |
-| `tbz`/`tar.bz2`  | Tarball with bzip2 compression |
-| `tgz`/`tar.gz`   | Tarball with gzip compression  |
-| `tlz`/`tar.lzma` | Tarball with lzma compression  |
-| `txz`/`tar.xz`   | Tarball with lzma2 compression |
-| `tZ`/`tar.Z`     | Tarball with LZW compression   |
-| `xz`             | LZMA2 archive                  |
-| `Z`              | Z archive (LZW)                |
-| `zip`            | Zip archive                    |
-| `zst`            | Zstd archive                   |
+ If the output file already exists, a unique filename is generated using `mktemp`.
 
-See [list of archive formats](https://en.wikipedia.org/wiki/List_of_archive_formats) for more information regarding the archive formats.
+## Supported Archive Formats
+
+| Format           | Description                    | Tool Used        |
+|:-----------------|:-------------------------------|:-----------------|
+| `7z`             | 7zip archive                   | `7z`             |
+| `bz2`            | Bzip2-compressed file          | `bzip2`          |
+| `gz`             | Gzip-compressed file           | `gzip`           |
+| `lzma`           | LZMA-compressed file           | `lzma`           |
+| `lzo`            | LZO-compressed file            | `lzop`           |
+| `rar`            | WinRAR archive                 | `rar`            |
+| `tar`            | Uncompressed tarball           | `tar`            |
+| `tbz`,`tar.bz2`  | Tarball compressed with Bzip2  | `tar + bzip2`    |
+| `tgz`,`tar.gz`   | Tarball compressed with Gzip   | `tar + gzip`     |
+| `tlz`,`tar.lzma` | Tarball compressed with LZMA   | `tar + lzma`     |
+| `txz`,`tar.xz`   | Tarball compressed with LZMA2  | `tar + xz`       |
+| `tZ`,`tar.Z`     | Tarball compressed with LZW    | `tar + compress` |
+| `xz`             | XZ-compressed file             | `xz`             |
+| `Z`              | LZW-compressed file            | `compress`       |
+| `zip`            | Standard Zip archive           | `zip`            |
+| `zst`            | Zstandard-compressed file      | `zstd`           |
+
+ > Note: Some formats may require specific tools to be installed on your system (e.g. `7z`, `rar`, `lzop`, `zstd`). Make sure these tools are available in your `$PATH`.
+
+## Auto-Completion
+
+The plugin provides tab-completion for supported formats and input files. Type `ua <TAB>` to see available formats, and `ua <format> <TAB>` to browse files.
diff --git a/zsh/plugins/uv/README.md b/zsh/plugins/uv/README.md
new file mode 100644
index 0000000..266963e
--- /dev/null
+++ b/zsh/plugins/uv/README.md
@@ -0,0 +1,36 @@
+# uv plugin
+
+This plugin automatically installs [uv](https://github.com/astral-sh/uv)'s completions for you,
+and keeps them up to date. It also adds convenient aliases for common usage.
+
+To use it, add `uv` to the plugins array in your zshrc file:
+
+```zsh
+plugins=(... uv)
+```
+
+## Aliases
+
+| Alias | Command                                                                                  | Description                                                           |
+| :---- | ---------------------------------------------------------------------------------------- | :-------------------------------------------------------------------- |
+| uva   | `uv add`                                                                                 | Add packages to the project                                           |
+| uvexp | `uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet` | Export the lock file to `requirements.txt`                            |
+| uvi   | `uv init`                                                                                | Initialize a new project in current workspace and environment.        |
+| uvinw | `uv init --no-workspace`                                                                 | Initialize a new project in a new workspace and environment           |
+| uvl   | `uv lock`                                                                                | Lock the dependencies                                                 |
+| uvlr  | `uv lock --refresh`                                                                      | Rebuild the lock file without upgrading dependencies                  |
+| uvlu  | `uv lock --upgrade`                                                                      | Lock the dependencies to the newest compatible versions               |
+| uvp   | `uv pip`                                                                                 | Manage pip packages                                                   |
+| uvpi  | `uv python install`                                                                      | Install a specific version of python                                  |
+| uvpl  | `uv python list`                                                                         | Lists all python version installed                                    |
+| uvpp  | `uv python pin`                                                                          | Pin the current project to use a specific Python version              |
+| uvpu  | `uv python uninstall`                                                                    | Remove a specific version of python                                   |
+| uvpy  | `uv python`                                                                              | Manage Python installs                                                |
+| uvr   | `uv run`                                                                                 | Run commands within the project's environment                         |
+| uvrm  | `uv remove`                                                                              | Remove packages from the project                                      |
+| uvs   | `uv sync`                                                                                | Sync the environment with the lock file                               |
+| uvsr  | `uv sync --refresh`                                                                      | "Force" sync the environment with the lock file (ignore cache)        |
+| uvsu  | `uv sync --upgrade`                                                                      | Sync the environment, allowing upgrades and ignoring the lock file    |
+| uvtr  | `uv tree`                                                                                | Displays the full dependency tree for the current project environment |
+| uvup  | `uv self update`                                                                         | Update the UV tool to the latest version                              |
+| uvv   | `uv venv`                                                                                | Manage virtual environments                                           |
diff --git a/zsh/plugins/uv/uv.plugin.zsh b/zsh/plugins/uv/uv.plugin.zsh
new file mode 100644
index 0000000..0c0795e
--- /dev/null
+++ b/zsh/plugins/uv/uv.plugin.zsh
@@ -0,0 +1,47 @@
+# Return immediately if uv is not found
+if (( ! ${+commands[uv]} )); then
+  return
+fi
+
+alias uv="noglob uv"
+
+alias uva='uv add'
+alias uvexp='uv export --format requirements-txt --no-hashes --output-file requirements.txt --quiet'
+alias uvi='uv init'
+alias uvinw='uv init --no-workspace'
+alias uvl='uv lock'
+alias uvlr='uv lock --refresh'
+alias uvlu='uv lock --upgrade'
+alias uvp='uv pip'
+alias uvpi='uv python install'
+alias uvpl='uv python list'
+alias uvpu='uv python uninstall'
+alias uvpy='uv python'
+alias uvpp='uv python pin'
+alias uvr='uv run'
+alias uvrm='uv remove'
+alias uvs='uv sync'
+alias uvsr='uv sync --refresh'
+alias uvsu='uv sync --upgrade'
+alias uvtr='uv tree'
+alias uvup='uv self update'
+alias uvv='uv venv'
+
+# If the completion file doesn't exist yet, we need to autoload it and
+# bind it. Otherwise, compinit will have already done that.
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_uv" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _uv
+  _comps[uv]=_uv
+fi
+
+if [[ ! -f "$ZSH_CACHE_DIR/completions/_uvx" ]]; then
+  typeset -g -A _comps
+  autoload -Uz _uvx
+  _comps[uvx]=_uvx
+fi
+
+# uv and uvx are installed together (uvx is an alias to `uv tool run`)  
+# Overwrites the file each time as completions might change with uv versions.
+uv generate-shell-completion zsh >| "$ZSH_CACHE_DIR/completions/_uv" &|
+uvx --generate-shell-completion zsh >| "$ZSH_CACHE_DIR/completions/_uvx" &|
diff --git a/zsh/plugins/vagrant-prompt/README.md b/zsh/plugins/vagrant-prompt/README.md
index c5bc55d..f7bfce4 100644
--- a/zsh/plugins/vagrant-prompt/README.md
+++ b/zsh/plugins/vagrant-prompt/README.md
@@ -1,6 +1,52 @@
+# vagrant-prompt
+
 This plugin prompts the status of the Vagrant VMs. It supports single-host and
 multi-host configurations as well.
 
-Look inside the source for documentation about custom variables. 
+To use it, add `vagrant-prompt` to the plugins array in your zshrc file:
 
-Alberto Re <alberto.re@gmail.com>
+```zsh
+plugins=(... vagrant-prompt)
+```
+
+**Alberto Re <alberto.re@gmail.com>**
+
+## Usage
+
+To display Vagrant info on your prompt add the `vagrant_prompt_info` to the
+`$PROMPT` or `$RPROMPT` variable in your theme. Example:
+
+```zsh
+PROMPT="$PROMPT"' $(vagrant_prompt_info)'
+# or
+RPROMPT='$(vagrant_prompt_info)'
+```
+
+### Customization
+
+`vagrant_prompt_info` makes use of the following custom variables, which can be set in your
+`.zshrc` file:
+
+```zsh
+ZSH_THEME_VAGRANT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
+ZSH_THEME_VAGRANT_PROMPT_SUFFIX="%{$fg_bold[blue]%}]%{$reset_color%} "
+ZSH_THEME_VAGRANT_PROMPT_RUNNING="%{$fg_no_bold[green]%}●"
+ZSH_THEME_VAGRANT_PROMPT_POWEROFF="%{$fg_no_bold[red]%}●"
+ZSH_THEME_VAGRANT_PROMPT_SUSPENDED="%{$fg_no_bold[yellow]%}●"
+ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED="%{$fg_no_bold[white]%}○"
+```
+
+### State to variable mapping
+
+The plugin uses the output reported by `vagrant status` to print whichever symbol matches,
+according to the following table:
+
+| State       | Symbol                                 |
+| ----------- | -------------------------------------- |
+| running     | `ZSH_THEME_VAGRANT_PROMPT_RUNNING`     |
+| not running | `ZSH_THEME_VAGRANT_PROMPT_POWEROFF`    |
+| poweroff    | `ZSH_THEME_VAGRANT_PROMPT_POWEROFF`    |
+| paused      | `ZSH_THEME_VAGRANT_PROMPT_SUSPENDED`   |
+| saved       | `ZSH_THEME_VAGRANT_PROMPT_SUSPENDED`   |
+| suspended   | `ZSH_THEME_VAGRANT_PROMPT_SUSPENDED`   |
+| not created | `ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED` |
diff --git a/zsh/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh b/zsh/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
index d7c76c3..2d8455a 100644
--- a/zsh/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
+++ b/zsh/plugins/vagrant-prompt/vagrant-prompt.plugin.zsh
@@ -1,33 +1,18 @@
-# vim:ft=zsh ts=2 sw=2 sts=2
-#
-# To display Vagrant infos on your prompt add the vagrant_prompt_info to the
-# $PROMPT variable in your theme. Example:
-#
-# PROMPT='%{$fg[$NCOLOR]%}%B%n%b%{$reset_color%}:%{$fg[blue]%}%B%c/%b%{$reset_color%} $(vagrant_prompt_info)$(svn_prompt_info)$(git_prompt_info)%(!.#.$) '
-#
-# `vagrant_prompt_info` makes use of some custom variables. This is an example
-# definition:
-#
-# ZSH_THEME_VAGRANT_PROMPT_PREFIX="%{$fg_bold[blue]%}["
-# ZSH_THEME_VAGRANT_PROMPT_SUFFIX="%{$fg_bold[blue]%}]%{$reset_color%} "
-# ZSH_THEME_VAGRANT_PROMPT_RUNNING="%{$fg_no_bold[green]%}●"
-# ZSH_THEME_VAGRANT_PROMPT_POWEROFF="%{$fg_no_bold[red]%}●"
-# ZSH_THEME_VAGRANT_PROMPT_SUSPENDED="%{$fg_no_bold[yellow]%}●"
-# ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED="%{$fg_no_bold[white]%}○"
-
 function vagrant_prompt_info() {
-  local vm_states vm_state
-  if [[ -d .vagrant && -f Vagrantfile ]]; then
-    vm_states=(${(f)"$(vagrant status 2> /dev/null | sed -nE 's/^.*(saved|poweroff|running|not created) \([[:alnum:]_]+\)$/\1/p')"})
-    printf '%s' $ZSH_THEME_VAGRANT_PROMPT_PREFIX
-    for vm_state in $vm_states; do
-      case "$vm_state" in
-        saved) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED ;;
-        running) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING ;;
-        poweroff) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF ;;
-        "not created") printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED ;;
-      esac
-    done
-    printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUFFIX
+  if [[ ! -d .vagrant || ! -f Vagrantfile ]]; then
+    return
   fi
+
+  local vm_states vm_state
+  vm_states=(${(f)"$(vagrant status 2> /dev/null | sed -nE 's/^[^ ]* *([[:alnum:] ]*) \([[:alnum:]_]+\)$/\1/p')"})
+  printf '%s' $ZSH_THEME_VAGRANT_PROMPT_PREFIX
+  for vm_state in $vm_states; do
+    case "$vm_state" in
+      running) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_RUNNING ;;
+      "not running"|poweroff) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_POWEROFF ;;
+      paused|saved|suspended) printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUSPENDED ;;
+      "not created") printf '%s' $ZSH_THEME_VAGRANT_PROMPT_NOT_CREATED ;;
+    esac
+  done
+  printf '%s' $ZSH_THEME_VAGRANT_PROMPT_SUFFIX
 }
diff --git a/zsh/plugins/vault/README.md b/zsh/plugins/vault/README.md
index 69051d2..cc270a3 100644
--- a/zsh/plugins/vault/README.md
+++ b/zsh/plugins/vault/README.md
@@ -1,15 +1,9 @@
 # Vault plugin
 
-Note: this plugin is deprecated. Use the [official autocompletion](https://www.vaultproject.io/docs/commands/index.html#autocompletion) instead.
-
--------
-
-Adds autocomplete options for all [vault](https://www.vaultproject.io) commands.
+This plugin adds completion for [Vault](https://www.vaultproject.io/), the secrets and sensitive data manager.
 
 To use it, add `vault` to the plugins array in your zshrc file:
 
 ```zsh
 plugins=(... vault)
 ```
-
-Crafted with <3 by Valentin Bud ([@valentinbud](https://twitter.com/valentinbud))
diff --git a/zsh/plugins/vault/_vault b/zsh/plugins/vault/_vault
deleted file mode 100644
index f6bd351..0000000
--- a/zsh/plugins/vault/_vault
+++ /dev/null
@@ -1,400 +0,0 @@
-#compdef vault
-
-typeset -a main_args
-main_args=(
-    '(-version)-version[Prints the Vault version]'
-    '(-help)-help[Prints Vault Help]'
-)
-
-typeset -a general_args
-general_args=(
-    '(-help)-help[Prints Help]'
-    '(-address)-address=-[The address of the Vault server. Overrides the VAULT_ADDR environment variable if set.]:address:'
-    '(-ca-cert)-ca-cert=-[Path to a PEM encoded CA cert file to use to verify the Vault server SSL certificate. Overrides the VAULT_CACERT environment variable if set.]:file:_files -g "*.pem"'
-    '(-ca-path)-ca-path=-[Path to a directory of PEM encoded CA cert files to verify the Vault server SSL certificate. If both -ca-cert and -ca-path are specified, -ca-path is used.Overrides the VAULT_CAPATH environment variable if set.]:directory:_directories'
-    '(-client-cert)-client-cert=-[Path to a PEM encoded client certificate for TLS authentication to the Vault server. Must also specify -client-key. Overrides the VAULT_CLIENT_CERT environment variable if set.]:file:_files -g "*.pem"'
-    '(-client-key)-client-key=-[Path to an unencrypted PEM encoded private key matching the client certificate from -client-cert. Overrides the VAULT_CLIENT_KEY environment variable if set.]:file:_files -g "*.pem"'
-    '(-tls-skip-verify)-tls-skip-verify[Do not verify TLS certificate. This is highly not recommended. Verification will also be skipped if VAULT_SKIP_VERIFY is set.]'
-)
-
-typeset -a audit_enable_args
-audit_enable_args=(
-    '(-description)-description=-[A human-friendly description for the backend. This shows up only when querying the enabled backends.]:description:'
-    '(-id)-id=-[Specify a unique ID for this audit backend. This is purely for referencing this audit backend. By default this will be the backend type.]:id:'
-)
-
-typeset -a auth_args
-auth_args=(
-    '(-method)-method=-[Outputs help for the authentication method with the given name for the remote server. If this authentication method is not available, exit with code 1.]:method:(cert ldap github userpass app-id)'
-    '(-method-help)-method-help[If set, the help for the selected method will be shown.]'
-    '(-methods)-methods[List the available auth methods.]'
-    '(-no-verify)-no-verify[Do not verify the token after creation; avoids a use count]'
-)
-
-typeset -a auth_enable_args
-auth_enable_args=(
-    '(-description)-description=-[Human-friendly description of the purpose for the auth provider. This shows up in the auth-list command.]:description:'
-    '(-path)-path=-[Mount point for the auth provider. This defaults to the type of the mount. This will make the auth provider available at "/auth/<path>"]:path:'
-)
-
-typeset -a init_args
-init_args=(
-    '(-key-shares)-key-shares=-[(default: 5) The number of key shares to split the master key into.]:keyshares:'
-    '(-key-threshold)-key-threshold=-[(default: 3) The number of key shares required to reconstruct the master key.]:keythreshold:'
-    '(-pgp-keys)-pgp-keys[If provided, must be a comma-separated list of files on disk containing binary- or base64-format public PGP keys. The number of files must match "key-shares". The output unseal keys will encrypted and hex-encoded, in order, with the given public keys. If you want to use them with the "vault unseal" command, you will need to hex decode and decrypt; this will be the plaintext unseal key.]:pgpkeys:_files'
-)
-
-typeset -a mount_tune_args
-mount_tune_args=(
-    '(-default-lease-ttl)-default-lease-ttl=-[Default lease time-to-live for this backend. If not specified, uses the system default, or the previously set value. Set to "system" to explicitly set it to use the system default.]:defaultleasettl:'
-    '(-max-lease-ttl)-max-lease-ttl=-[Max lease time-to-live for this backend. If not specified, uses the system default, or the previously set value. Set to "system" to explicitly set it to use the system default.]:maxleasettl:'
-)
-
-typeset -a mount_args
-mount_args=(
-    $mount_tune_args
-    '(-path)-path=-[Mount point for the logical backend. This defaults to the type of the mount.]:path:'
-    '(-description)-description=-[Human-friendly description of the purpose for the mount. This shows up in the mounts command.]:description:'
-)
-
-typeset -a rekey_args
-rekey_args=(
-    $init_args
-    '(-init)-init[Initialize the rekey operation by setting the desired number of shares and the key threshold. This can only be done if no rekey is already initiated.]:init:'
-    '(-cancel)-cancel[Reset the rekey process by throwing away prior keys and the rekey configuration.]:cancel:'
-    '(-status)-status[Prints the status of the current rekey operation. This can be used to see the status without attempting to provide an unseal key.]:status:'
-)
-
-typeset -a ssh_args
-ssh_args=(
-    '(-role)-role[Role to be used to create the key. ]:role:'
-    '(-no-exec)-no-exec[Shows the credentials but does not establish connection.]:noexec:'
-    '(-mount-point)-mount-point[Mount point of SSH backend. If the backend is mounted at "ssh", which is the default as well, this parameter can be skipped.]:mountpoint:'
-    '(-format)-format[If no-exec option is enabled, then the credentials will be printed out and SSH connection will not be established. The format of the output can be "json" or "table". JSON output is useful when writing scripts. Default is "table".]:format:(json table)'
-)
-
-typeset -a token_create_args
-token_create_args=(
-    '(-id)-id=-[The token value that clients will use to authenticate with vault. If not provided this defaults to a 36 character UUID. A root token is required to specify the ID of a token.]:id:'
-    '(-display-name)-display-name=-[A display name to associate with this token. This is a non-security sensitive value used to help identify created secrets, i.e. prefixes.]:displayname:'
-    '(-ttl)-ttl=-[TTL to associate with the token. This option enables the tokens to be renewable.]:ttl:'
-    '*-metadata=-[Metadata to associate with the token. This shows up in the audit log. This can be specified multiple times.]:metadata:'
-    '(-orphan)-orphan[If specified, the token will have no parent. Only root tokens can create orphan tokens. This prevents the new token from being revoked with your token.]:orphan:'
-    '(-no-default-policy)-no-default-policy[If specified, the token will not have the "default" policy included in its policy set.]:nodefaultpolicy:'
-    '*-policy=-[Policy to associate with this token. This can be specified multiple times.]:policy:__vault_policies'
-    '(-use-limit)-use-limit=-[The number of times this token can be used until it is automatically revoked.]:uselimit:'
-    '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)'
-)
-
-typeset -a server_args
-server_args=(
-    '*-config=-[Path to the configuration file or directory. This can be specified multiple times. If it is a directory, all files with a ".hcl" or ".json" suffix will be loaded.]:config:_files'
-    '-dev[Enables Dev mode. In this mode, Vault is completely in-memory and unsealed. Do not run the Dev server in production!]:dev:'
-    '-log-level=-[Log verbosity. Defaults to "info", will be outputtedto stderr. Supported values: "trace", "debug", "info", "warn", "err"]:loglevel:(trace debug info warn err)'
-)
-
-_vault_audit-list() {
-    _arguments : \
-        ${general_args[@]} && ret=0
-}
-
-_vault_audit-disable() {
-    # vault audit-list doesn't print the backend id so for now
-    # no *smart* autocompletion for this subcommand.
-    _arguments : \
-        ${general_args[@]} \
-        ':::(file syslog)' && ret=0
-}
-
-_vault_audit-enable() {
-    _arguments : \
-        ${general_args[@]} \
-        ${audit_enable_args[@]} \
-        ': :->backends' \
-        '*:: :->backendconfig' && ret=0
-
-    case $state in
-        backends)
-            local -a backends
-            backends=(
-                'file:The "file" audit backend writes audit logs to a file.'
-                'syslog:The "syslog" audit backend writes audit logs to syslog.'
-            )
-            _describe -t backends 'vault audit backends' backends && ret=0
-            ;;
-        backendconfig)
-            case ${line[1]} in
-                file)
-                    _values -w "Audit Backend File" \
-                        'path[(required) - The path to where the file will be written. If this path exists, the audit backend will append to it.]:file:_files' \
-                        'log_raw[(optional) Should security sensitive information be logged raw. Defaults to "false".]:log_raw:(true false)' && ret=0
-                    ;;
-                syslog)
-                    _values -w "Audit Backend Syslog" \
-                        'facility[(optional) - The syslog facility to use. Defaults to "AUTH".]:facility:(kern user mail daemon auth syslog lpr news uucp authpriv ftp cron local0 local1 local2 local3 local4 local5 local6 local7)' \
-                        'tag[(optional) - The syslog tag to use. Defaults to "vault".]:tag:' \
-                        'log_raw[(optional) Should security sensitive information be logged raw.]:log_raw:(true false)' && ret=0
-                            ;;
-            esac
-            ;;
-    esac
-}
-
-_vault_auth() {
-    _arguments : \
-        ${general_args[@]} \
-        ${auth_args[@]} && ret=0
-}
-
-_vault_auth-enable() {
-    _arguments : \
-        ${general_args[@]} \
-        ${auth_enable_args[@]} \
-        ':::(cert ldap github userpass app-id)' && ret=0
-}
-
-__vault_auth_methods() {
-    local -a authmethods
-    authmethods=($(vault auth -methods | awk 'NR>1{split ($1,a,"/"); print a[1]":["$2"]"}'))
-    _describe -t authmethods 'authmethods' authmethods && ret=0
-}
-
-_vault_auth-disable() {
-    _arguments : \
-        ${general_args[@]} \
-        ':::__vault_auth_methods' && ret=0
-
-}
-
-_vault_init() {
-    _arguments : \
-        ${general_args[@]} \
-        ${init_args[@]} && ret=0
-}
-
-_vault_key-status() {
-    _arguments : \
-        ${general_args[@]} && ret=0
-}
-
-__vault_mounts() {
-    local -a mounts
-    mounts=($(vault mounts | awk 'NR>1{split ($1,a,"/"); print a[1]":["$2"]"}'))
-    _describe -t mounts 'mounts' mounts && ret=0
-}
-
-_vault_mounts() {
-    _arguments : \
-        ${general_args[@]} && ret=0
-}
-
-_vault_mount() {
-    # to find out how many types of backends are there
-    _arguments : \
-        ${general_args[@]} \
-        ${mount_args[@]} \
-        ':::(generic ssh)' && ret=0
-}
-
-_vault_mount-tune() {
-    _arguments : \
-        ${general_args[@]} \
-        ${mount_tune_args[@]} \
-        ':::__vault_mounts' && ret=0
-}
-
-_vault_unmount() {
-    _arguments : \
-        ${general_args[@]} \
-        ':::__vault_mounts' && ret=0
-}
-
-_vault_remount() {
-    _arguments : \
-        ${general_args[@]} \
-        ':::__vault_mounts' \
-        ':::'  && ret=0
-}
-
-__vault_policies() {
-    local -a policies
-    policies=($(vault policies | awk '{print $1":["$1"]"}'))
-    _describe -t policies 'policies' policies && ret=0
-}
-
-_vault_policies() {
-    _arguments : \
-        ${general_args[@]} \
-        ':::__vault_policies' && ret=0
-}
-
-_vault_policy-delete() {
-    _arguments : \
-        ${general_args[@]} \
-        ':::__vault_policies' && ret=0
-}
-
-_vault_policy-write() {
-    _arguments : \
-        ${general_args[@]} \
-        ': ::' \
-        '::policy:_files' && ret=0
-}
-
-_vault_status() {
-    _arguments : \
-        ${general_args[@]} && ret=0
-}
-
-_vault_rekey() {
-    _arguments : \
-        ${general_args[@]} \
-        ${rekey_args[@]} \
-        ': ::' && ret=0
-}
-
-_vault_rotate() {
-    _arguments : \
-        ${general_args[@]} && ret=0
-}
-
-_vault_seal() {
-    _arguments : \
-        ${general_args[@]} && ret=0
-}
-
-_vault_ssh() {
-    _arguments : \
-        ${general_args[@]} \
-        ${ssh_args[@]} \
-        ': ::' && ret=0
-}
-
-_vault_token-create() {
-    _arguments : \
-        ${general_args[@]} \
-        ${token_create_args[@]} && ret=0
-}
-
-_vault_token-renew() {
-    _arguments : \
-        ${general_args[@]} \
-        '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' \
-        ': ::' \
-        ': ::' && ret=0
-}
-
-_vault_token-revoke() {
-    _arguments : \
-        ${general_args[@]} \
-        '(-mode)-mode=-[The type of revocation to do. See the documentation above for more information.]:mode:(  orphan path)' \
-        ': ::' && ret=0
-}
-
-_vault_unseal() {
-    _arguments : \
-        ${general_args[@]} \
-        '(-reset)-reset[Reset the unsealing process by throwing away prior keys in process to unseal the vault.]:reset:' \
-        ': ::' && ret=0
-}
-
-_vault_version() {
-    # no args
-}
-
-_vault_delete() {
-    _arguments : \
-        ${general_args[@]} \
-        ': ::' && ret=0
-}
-
-_vault_path-help() {
-    _arguments : \
-        ${general_args[@]} \
-        ': ::' && ret=0
-}
-
-_vault_revoke() {
-    _arguments : \
-        ${general_args[@]} \
-        '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' \
-        ': ::' \
-        ': ::' && ret=0
-}
-
-_vault_server() {
-    _arguments : \
-        ${server_args[@]} && ret=0
-
-}
-
-_vault_write() {
-    _arguments : \
-        ${general_args[@]} \
-        '(-f -force)'{-f,-force}'[Force the write to continue without any data values specified. This allows writing to keys that do not need or expect any fields to be specified.]:force:' \
-        ': ::' \
-        ': ::' && ret=0
-}
-
-_vault_read() {
-    _arguments : \
-        ${general_args[@]} \
-        '(-format)-format=-[The format for output. By default it is a whitespace-delimited table. This can also be json.]:format:(json table)' \
-        '(-field)-field=-[If included, the raw value of the specified field will be output raw to stdout.]:field:' \
-        ': ::' && ret=0
-}
-
-_vault_commands() {
-    local -a commands
-
-    commands=(
-        "delete":"Delete operation on secrets in Vault"
-        "path-help":"Look up the help for a path"
-        "read":"Read data or secrets from Vault"
-        "renew":"Renew the lease of a secret"
-        "revoke":"Revoke a secret"
-        "server":"Start a Vault server"
-        "status":"Outputs status of whether Vault is sealed and if HA mode is enabled"
-        "write":"Write secrets or configuration into Vault"
-        "audit-disable":"Disable an audit backend"
-        "audit-enable":"Enable an audit backend"
-        "audit-list":"Lists enabled audit backends in Vault"
-        "auth":"Prints information about how to authenticate with Vault"
-        "auth-disable":"Disable an auth provider"
-        "auth-enable":"Enable a new auth provider"
-        "init":"Initialize a new Vault server"
-        "key-status":"Provides information about the active encryption key"
-        "mount":"Mount a logical backend"
-        "mount-tune":"Tune mount configuration parameters"
-        "mounts":"Lists mounted backends in Vault"
-        "policies":"List the policies on the server"
-        "policy-delete":"Delete a policy from the server"
-        "policy-write":"Write a policy to the server"
-        "rekey":"Rekeys Vault to generate new unseal keys"
-        "remount":"Remount a secret backend to a new path"
-        "rotate":"Rotates the backend encryption key used to persist data"
-        "seal":"Seals the vault server"
-        "ssh":"Initiate a SSH session"
-        "token-create":"Create a new auth token"
-        "token-renew":"Renew an auth token if there is an associated lease"
-        "token-revoke":"Revoke one or more auth tokens"
-        "unmount":"Unmount a secret backend"
-        "unseal":"Unseals the vault server"
-        "version":"Prints the Vault version"
-    )
-
-    _describe -t commands 'vault command' commands && ret=0
-}
-
-local curcontext=$curcontext ret=1
-_arguments : \
-    ${main_args[@]} \
-    '*:: :->subcommands' && ret=0
-if ((CURRENT == 1 )); then
-    _vault_commands && ret=0
-fi
-if [[ $state == subcommands ]]; then
-    # (( CURRENT -- ))
-    curcontext="${curcontext%:*:*}:vault-$words[1]:"
-    _call_function ret _vault_$words[1]
-fi
diff --git a/zsh/plugins/vault/vault.plugin.zsh b/zsh/plugins/vault/vault.plugin.zsh
new file mode 100644
index 0000000..996cd12
--- /dev/null
+++ b/zsh/plugins/vault/vault.plugin.zsh
@@ -0,0 +1,7 @@
+# Completion
+if (( ! $+commands[vault] )); then
+  return
+fi
+
+autoload -Uz bashcompinit && bashcompinit
+complete -o nospace -C vault vault
diff --git a/zsh/plugins/vi-mode/README.md b/zsh/plugins/vi-mode/README.md
index 476666b..bc78cfa 100644
--- a/zsh/plugins/vi-mode/README.md
+++ b/zsh/plugins/vi-mode/README.md
@@ -29,12 +29,16 @@ plugins=(... vi-mode)
   VI_MODE_SET_CURSOR=true
   ```
 
+  See [Cursor Styles](#cursor-styles) for controlling how the cursor looks in different modes
+
 - `MODE_INDICATOR`: controls the string displayed when the shell is in normal mode.
   See [Mode indicators](#mode-indicators) for details.
 
 - `INSERT_MODE_INDICATOR`: controls the string displayed when the shell is in insert mode.
   See [Mode indicators](#mode-indicators) for details.
 
+- `VI_MODE_DISABLE_CLIPBOARD`: If set, disables clipboard integration on yank/paste
+
 ## Mode indicators
 
 *Normal mode* is indicated with a red `<<<` mark at the right prompt, when it
@@ -42,15 +46,49 @@ hasn't been defined by theme, *Insert mode* is not displayed by default.
 
 You can change these indicators by setting the `MODE_INDICATOR` (*Normal mode*) and
 `INSERT_MODE_INDICATORS` (*Insert mode*) variables.
-This settings support Prompt Expansion sequences. For example:
+These settings support Prompt Expansion sequences. For example:
 
 ```zsh
 MODE_INDICATOR="%F{white}+%f"
 INSERT_MODE_INDICATOR="%F{yellow}+%f"
 ```
 
-You can also use the `vi_mode_prompt_info` function in your prompt, which will display
-this mode indicator.
+### Adding mode indicators to your prompt
+
+`Vi-mode` by default will add mode indicators to `RPROMPT` **unless** that is defined by
+a preceding plugin.
+
+If `PROMPT` or `RPROMPT` is not defined to your liking, you can add mode info manually. The `vi_mode_prompt_info` function is available to insert mode indicator information.
+
+Here are some examples:
+
+```bash
+source $ZSH/oh-my-zsh.sh
+
+PROMPT="$PROMPT\$(vi_mode_prompt_info)"
+RPROMPT="\$(vi_mode_prompt_info)$RPROMPT"
+```
+
+Note the `\$` here, which importantly prevents interpolation at the time of defining, but allows it to be executed for each prompt update event.
+
+## Cursor Styles
+
+You can control the cursor style used in each active vim mode by changing the values of the following variables.
+
+```zsh
+# defaults
+VI_MODE_CURSOR_NORMAL=2
+VI_MODE_CURSOR_VISUAL=6
+VI_MODE_CURSOR_INSERT=6
+VI_MODE_CURSOR_OPPEND=0
+```
+
+- 0, 1 - Blinking block
+- 2 - Solid block
+- 3 - Blinking underline
+- 4 - Solid underline
+- 5 - Blinking line
+- 6 - Solid line
 
 ## Key bindings
 
@@ -108,11 +146,38 @@ NOTE: this used to be bound to `v`. That is now the default (`visual-mode`).
 - `c{motion}`   : Delete {motion} text and start insert
 - `cc`          : Delete line and start insert
 - `C`           : Delete to the end of the line and start insert
+- `P`           : Insert the contents of the clipboard before the cursor
+- `p`           : Insert the contents of the clipboard after the cursor
 - `r{char}`     : Replace the character under the cursor with {char}
 - `R`           : Enter replace mode: Each character replaces existing one
 - `x`           : Delete `count` characters under and after the cursor
 - `X`           : Delete `count` characters before the cursor
 
+NOTE: delete/kill commands (`dd`, `D`, `c{motion}`, `C`, `x`,`X`) and yank commands
+(`y`, `Y`) will copy to the clipboard. Contents can then be put back using paste commands
+(`P`, `p`).
+
+## Text objects
+
+Standard text objects are supported with `i` ("inside") and `a` ("around"), e.g., for words; thus, you can select the word the cursor is in with `viw`, or delete the current word, including surrounding spaces, with `daw`.
+
+For other text objects, you can rely on the built-in functionality of Zsh and enable it accordingly.
+For example, for quoted strings, you can copy the commented snippet of <https://sourceforge.net/p/zsh/code/ci/master/tree/Functions/Zle/select-quoted>: place this in your `.zsrhc` file, e.g., after sourcing oh-my-zsh:
+
+```sh
+autoload -U select-quoted
+zle -N select-quoted
+for m in visual viopp; do
+    for c in {a,i}{\',\",\`}; do
+        bindkey -M $m $c select-quoted
+    done
+done
+```
+
+Now, in normal mode, you can select everything inside a double-quoted string with `vi"`.
+Note that this works even if you're not already inside a quoted string.
+For example, you can replace everything inside a single-quoted string in the current line, from wherever the cursor is, with `ci'`.
+
 ## Known issues
 
 ### Low `$KEYTIMEOUT`
diff --git a/zsh/plugins/vi-mode/vi-mode.plugin.zsh b/zsh/plugins/vi-mode/vi-mode.plugin.zsh
index 149d6bb..85208cf 100644
--- a/zsh/plugins/vi-mode/vi-mode.plugin.zsh
+++ b/zsh/plugins/vi-mode/vi-mode.plugin.zsh
@@ -14,7 +14,16 @@ typeset -g VI_MODE_RESET_PROMPT_ON_MODE_CHANGE
 # Unset or set to any other value to do the opposite.
 typeset -g VI_MODE_SET_CURSOR
 
-typeset -g VI_KEYMAP=main
+# Control how the cursor appears in the various vim modes. This only applies
+# if $VI_MODE_SET_CURSOR=true.
+#
+# See https://vt100.net/docs/vt510-rm/DECSCUSR for cursor styles
+typeset -g VI_MODE_CURSOR_NORMAL=${VI_MODE_CURSOR_NORMAL:=2}
+typeset -g VI_MODE_CURSOR_VISUAL=${VI_MODE_CURSOR_VISUAL:=6}
+typeset -g VI_MODE_CURSOR_INSERT=${VI_MODE_CURSOR_INSERT:=6}
+typeset -g VI_MODE_CURSOR_OPPEND=${VI_MODE_CURSOR_OPPEND:=0}
+
+typeset -g VI_KEYMAP=${VI_KEYMAP:=main}
 
 function _vi-mode-set-cursor-shape-for-keymap() {
   [[ "$VI_MODE_SET_CURSOR" = true ]] || return
@@ -22,24 +31,44 @@ function _vi-mode-set-cursor-shape-for-keymap() {
   # https://vt100.net/docs/vt510-rm/DECSCUSR
   local _shape=0
   case "${1:-${VI_KEYMAP:-main}}" in
-    main)    _shape=6 ;; # vi insert: line
-    viins)   _shape=6 ;; # vi insert: line
-    isearch) _shape=6 ;; # inc search: line
-    command) _shape=6 ;; # read a command name
-    vicmd)   _shape=2 ;; # vi cmd: block
-    visual)  _shape=2 ;; # vi visual mode: block
-    viopp)   _shape=0 ;; # vi operation pending: blinking block
+    main)    _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
+    viins)   _shape=$VI_MODE_CURSOR_INSERT ;; # vi insert: line
+    isearch) _shape=$VI_MODE_CURSOR_INSERT ;; # inc search: line
+    command) _shape=$VI_MODE_CURSOR_INSERT ;; # read a command name
+    vicmd)   _shape=$VI_MODE_CURSOR_NORMAL ;; # vi cmd: block
+    visual)  _shape=$VI_MODE_CURSOR_VISUAL ;; # vi visual mode: block
+    viopp)   _shape=$VI_MODE_CURSOR_OPPEND ;; # vi operation pending: blinking block
     *)       _shape=0 ;;
   esac
   printf $'\e[%d q' "${_shape}"
 }
 
+function _visual-mode {
+  typeset -g VI_KEYMAP=visual
+  _vi-mode-set-cursor-shape-for-keymap "$VI_KEYMAP"
+  zle .visual-mode
+}
+zle -N visual-mode _visual-mode
+
+function _vi-mode-should-reset-prompt() {
+  # If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE is unset (default), dynamically
+  # check whether we're using the prompt to display vi-mode info
+  if [[ -z "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" ]]; then
+    [[ "${PS1} ${RPS1}" = *'$(vi_mode_prompt_info)'* ]]
+    return $?
+  fi
+
+  # If $VI_MODE_RESET_PROMPT_ON_MODE_CHANGE was manually set, let's check
+  # if it was specifically set to true or it was disabled with any other value
+  [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE}" = true ]]
+}
+
 # Updates editor information when the keymap changes.
 function zle-keymap-select() {
   # update keymap variable for the prompt
   typeset -g VI_KEYMAP=$KEYMAP
 
-  if [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]]; then
+  if _vi-mode-should-reset-prompt; then
     zle reset-prompt
     zle -R
   fi
@@ -50,10 +79,9 @@ zle -N zle-keymap-select
 # These "echoti" statements were originally set in lib/key-bindings.zsh
 # Not sure the best way to extend without overriding.
 function zle-line-init() {
-  local prev_vi_keymap
-  prev_vi_keymap="${VI_KEYMAP:-}"
+  local prev_vi_keymap="${VI_KEYMAP:-}"
   typeset -g VI_KEYMAP=main
-  [[ "$prev_vi_keymap" != 'main' ]] && [[ "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:-}" = true ]] && zle reset-prompt
+  [[ "$prev_vi_keymap" != 'main' ]] && _vi-mode-should-reset-prompt && zle reset-prompt
   (( ! ${+terminfo[smkx]} )) || echoti smkx
   _vi-mode-set-cursor-shape-for-keymap "${VI_KEYMAP}"
 }
@@ -119,23 +147,24 @@ function wrap_clipboard_widgets() {
   done
 }
 
-wrap_clipboard_widgets copy vi-yank vi-yank-eol vi-backward-kill-word vi-change-whole-line vi-delete vi-delete-char
-wrap_clipboard_widgets paste vi-put-{before,after}
-unfunction wrap_clipboard_widgets
+if [[ -z "${VI_MODE_DISABLE_CLIPBOARD:-}" ]]; then
+  wrap_clipboard_widgets copy \
+      vi-yank vi-yank-eol vi-yank-whole-line \
+      vi-change vi-change-eol vi-change-whole-line \
+      vi-kill-line vi-kill-eol vi-backward-kill-word \
+      vi-delete vi-delete-char vi-backward-delete-char
 
-# if mode indicator wasn't setup by theme, define default, we'll leave INSERT_MODE_INDICATOR empty by default
-if [[ -z "$MODE_INDICATOR" ]]; then
-  MODE_INDICATOR='%B%F{red}<%b<<%f'
+  wrap_clipboard_widgets paste \
+      vi-put-{before,after} \
+      put-replace-selection
+
+  unfunction wrap_clipboard_widgets
 fi
 
-function vi_mode_prompt_info() {
-  # If we're using the prompt to display mode info, and we haven't explicitly
-  # disabled "reset prompt on mode change", then set it here.
-  #
-  # We do that here instead of the `if` statement below because the user may
-  # set RPS1/RPROMPT to something else in their custom config.
-  : "${VI_MODE_RESET_PROMPT_ON_MODE_CHANGE:=true}"
+# if mode indicator wasn't setup by theme, define default, we'll leave INSERT_MODE_INDICATOR empty by default
+typeset -g MODE_INDICATOR=${MODE_INDICATOR:='%B%F{red}<%b<<%f'}
 
+function vi_mode_prompt_info() {
   echo "${${VI_KEYMAP/vicmd/$MODE_INDICATOR}/(main|viins)/$INSERT_MODE_INDICATOR}"
 }
 
diff --git a/zsh/plugins/vim-interaction/README.md b/zsh/plugins/vim-interaction/README.md
index 6816480..437b48d 100644
--- a/zsh/plugins/vim-interaction/README.md
+++ b/zsh/plugins/vim-interaction/README.md
@@ -1,22 +1,22 @@
 # Vim Interaction #
 
-The plugin presents a function called `callvim` whose usage is:
-
-    usage: callvim [-b cmd] [-a cmd] [file ... fileN]
-    
-      -b cmd     Run this command in GVIM before editing the first file
-      -a cmd     Run this command in GVIM after editing the first file
-      file       The file to edit
-      ... fileN  The other files to add to the argslist
-
-## Rationale ##
-
 The idea for this script is to give you some decent interaction with a running
 GVim session.  Normally you'll be running around your filesystem doing any
 number of amazing things and you'll need to load some files into GVim for
 editing, inspecting, destruction, or other bits of mayhem.  This script lets you
 do that.
 
+## Usage
+
+The plugin presents a function called `callvim` whose usage is:
+
+    usage: callvim [-b cmd] [-a cmd] [file ... fileN]
+
+      -b cmd     Run this command in GVIM before editing the first file
+      -a cmd     Run this command in GVIM after editing the first file
+      file       The file to edit
+      ... fileN  The other files to add to the argslist
+
 ## Aliases ##
 
 There are a few aliases presented as well:
diff --git a/zsh/plugins/vim-interaction/vim-interaction.plugin.zsh b/zsh/plugins/vim-interaction/vim-interaction.plugin.zsh
index b73f9b4..a12b52b 100644
--- a/zsh/plugins/vim-interaction/vim-interaction.plugin.zsh
+++ b/zsh/plugins/vim-interaction/vim-interaction.plugin.zsh
@@ -2,7 +2,7 @@
 # See README.md
 #
 # Derek Wyatt (derek@{myfirstnamemylastname}.org
-# 
+#
 
 function callvim {
   if [[ $# == 0 ]]; then
diff --git a/zsh/plugins/virtualenv/virtualenv.plugin.zsh b/zsh/plugins/virtualenv/virtualenv.plugin.zsh
index 56707bb..e339ef9 100644
--- a/zsh/plugins/virtualenv/virtualenv.plugin.zsh
+++ b/zsh/plugins/virtualenv/virtualenv.plugin.zsh
@@ -1,6 +1,6 @@
 function virtualenv_prompt_info(){
   [[ -n ${VIRTUAL_ENV} ]] || return
-  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV:t:gs/%/%%}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
+  echo "${ZSH_THEME_VIRTUALENV_PREFIX=[}${VIRTUAL_ENV_PROMPT:-${VIRTUAL_ENV:t:gs/%/%%}}${ZSH_THEME_VIRTUALENV_SUFFIX=]}"
 }
 
 # disables prompt mangling in virtual_env/bin/activate
diff --git a/zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh b/zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
index d359e0c..d57c503 100644
--- a/zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
+++ b/zsh/plugins/virtualenvwrapper/virtualenvwrapper.plugin.zsh
@@ -4,6 +4,7 @@ function {
       $commands[virtualenvwrapper.sh] \
       /usr/share/virtualenvwrapper/virtualenvwrapper{_lazy,}.sh \
       /usr/local/bin/virtualenvwrapper{_lazy,}.sh \
+      /usr/bin/virtualenvwrapper{_lazy,}.sh \
       /etc/bash_completion.d/virtualenvwrapper \
       /usr/share/bash-completion/completions/virtualenvwrapper \
       $HOME/.local/bin/virtualenvwrapper.sh
@@ -52,7 +53,7 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
       else
         ENV_NAME=""
       fi
-      
+
       if [[ -n $CD_VIRTUAL_ENV && "$ENV_NAME" != "$CD_VIRTUAL_ENV" ]]; then
         # We've just left the repo, deactivate the environment
         # Note: this only happens if the virtualenv was activated automatically
@@ -88,4 +89,5 @@ if [[ ! $DISABLE_VENV_CD -eq 1 ]]; then
   # http://zsh.sourceforge.net/Doc/Release/Functions.html
   autoload -U add-zsh-hook
   add-zsh-hook chpwd workon_cwd
+  [[ $PWD != ~ ]] && workon_cwd
 fi
diff --git a/zsh/plugins/volta/volta.plugin.zsh b/zsh/plugins/volta/volta.plugin.zsh
index ab05ed5..173b9c8 100644
--- a/zsh/plugins/volta/volta.plugin.zsh
+++ b/zsh/plugins/volta/volta.plugin.zsh
@@ -4,7 +4,7 @@ if (( ! $+commands[volta] )); then
 fi
 
 # If the completion file doesn't exist yet, we need to autoload it and
-# bind it to `deno`. Otherwise, compinit will have already done that.
+# bind it to `volta`. Otherwise, compinit will have already done that.
 if [[ ! -f "$ZSH_CACHE_DIR/completions/_volta" ]]; then
   typeset -g -A _comps
   autoload -Uz _volta
diff --git a/zsh/plugins/vscode/README.md b/zsh/plugins/vscode/README.md
index e95ed5d..43581a8 100644
--- a/zsh/plugins/vscode/README.md
+++ b/zsh/plugins/vscode/README.md
@@ -1,6 +1,6 @@
 # VS Code
 
-This plugin provides useful aliases to simplify the interaction between the command line and VS Code or VSCodium editor.
+This plugin provides useful aliases to simplify interaction between the command line and VS Code, VSCodium, or Cursor.
 
 To start using it, add the `vscode` plugin to your `plugins` array in `~/.zshrc`:
 
@@ -10,37 +10,45 @@ plugins=(... vscode)
 
 ## Requirements
 
-This plugin requires to have a flavour of VS Code installed and it's executable available in PATH.
+This plugin requires one of the supported editors to be installed and its executable to be available in `PATH`.
 
-You can install either:
+You can install one of the following:
 
-* VS Code (code)
-* VS Code Insiders (code-insiders)
-* VSCodium (codium)
+- VS Code (`code`)
+- VS Code Insiders (`code-insiders`)
+- VSCodium (`codium`)
+- Cursor (`cursor`)
 
-### MacOS
-While Linux installations will add the executable to PATH, MacOS users might still have to do this manually:
+### macOS
+
+While Linux installations usually add the executable to `PATH`, macOS users might still have to do this manually:
+
+[For VS Code and VS Code Insiders](https://code.visualstudio.com/docs/setup/mac#_launching-from-the-command-line),
+open the Command Palette with `F1` or `Shift+Cmd+P`, then search for the following command:
 
-[For VS Code and VS Code Insiders](https://code.visualstudio.com/docs/setup/mac#_launching-from-the-command-line), open
-the Command Palette via (F1 or ⇧⌘P) and type shell command to find the Shell Command:
 > Shell Command: Install 'code' command in PATH
 
-[For VSCodium](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#how-do-i-open-vscodium-from-the-terminal), open
-the Command Palette via (F1 or ⇧⌘P) and type shell command to find the Shell Command:
+[For VSCodium](https://github.com/VSCodium/vscodium/blob/master/DOCS.md#how-do-i-open-vscodium-from-the-terminal),
+open the Command Palette with `F1` or `Shift+Cmd+P`, then search for the following command:
+
 > Shell Command: Install 'codium' command in PATH
 
-## Using multiple flavours
+For Cursor, open the Command Palette with `F1` or `Cmd+Shift+P`, then search for the following command:
 
-If for any reason, you ever require to use multiple flavours of VS Code i.e. VS Code (stable) and VS Code Insiders, you can 
-manually specify the flavour's executable. Add the following line to the .zshrc file (between the `ZSH_THEME` and the `plugins=()` lines).
-This will make the plugin use your manually defined executable.
+> Shell Command: Install 'cursor' command in PATH
+
+## Choosing an editor
+
+If you have multiple supported editors installed, e.g., VS Code (stable) and VS Code Insiders, you can manually
+specify which executable the plugin should use. Add the following line to `~/.zshrc` between the `ZSH_THEME`
+and `plugins=()` lines. This makes the plugin use your manually defined executable.
 
 ```zsh
 ZSH_THEME=...
 
-# Choose between one [code, code-insiders or codium]
-# The following line will make the plugin to open VS Code Insiders
-# Invalid entries will be ignored, no aliases will be added
+# Choose one of `code`, `code-insiders`, `codium`, or `cursor`.
+# The following line makes the plugin open VS Code Insiders.
+# Invalid entries are ignored and no aliases are added.
 VSCODE=code-insiders
 
 plugins=(... vscode)
@@ -52,27 +60,29 @@ source $ZSH/oh-my-zsh.sh
 
 | Alias                   | Command                        | Description                                                                                                 |
 | ----------------------- | ------------------------------ | ----------------------------------------------------------------------------------------------------------- |
-| vsc                     | code .                         | Open the current folder in VS code                                                                          |
-| vsca `dir`              | code --add `dir`               | Add folder(s) to the last active window                                                                     |
+| vsc                     | code .                         | Open the current folder in VS Code                                                                          |
+| vsc `[args ...]`        | code `[args ...]`              | Pass arguments through to VS Code, e.g., a file, folder, or CLI flags.                                      |
+| vsca `dir`              | code --add `dir`               | Add one or more folders to the last active window.                                                          |
 | vscd `file` `file`      | code --diff `file` `file`      | Compare two files with each other.                                                                          |
 | vscg `file:line[:char]` | code --goto `file:line[:char]` | Open a file at the path on the specified line and character position.                                       |
-| vscn                    | code --new-window              | Force to open a new window.                                                                                 |
-| vscr                    | code --reuse-window            | Force to open a file or folder in the last active window.                                                   |
+| vscn                    | code --new-window              | Force opening in a new window.                                                                              |
+| vscr                    | code --reuse-window            | Force opening a file or folder in the last active window.                                                   |
 | vscw                    | code --wait                    | Wait for the files to be closed before returning.                                                           |
-| vscu `dir`              | code --user-data-dir `dir`     | Specifies the directory that user data is kept in. Can be used to open multiple distinct instances of Code. |
+| vscu `dir`              | code --user-data-dir `dir`     | Specifies the directory where user data is stored. Can be used to open multiple distinct instances of Code. |
+| vscp `profile`          | code --profile `profile`       | Specifies the profile to open Code with.                                                                    |
 
-## Extensions aliases
+## Extension aliases
 
-| Alias                   | Command                                                          | Description                       |
-| ----------------------- | ---------------------------------------------------------------- | --------------------------------- |
-| vsced `dir`             | code --extensions-dir `dir`                                      | Set the root path for extensions. |
-| vscie `id or vsix-path` | code --install-extension `extension-id> or <extension-vsix-path` | Installs an extension.            |
-| vscue `id or vsix-path` | code --uninstall-extension `id or vsix-path`                     | Uninstalls an extension.          |
+| Alias                       | Command                                        | Description                            |
+| --------------------------- | ---------------------------------------------- | -------------------------------------- |
+| vsced `dir`                 | code --extensions-dir `dir`                    | Set the root directory for extensions. |
+| vscie `ext-id or vsix-path` | code --install-extension `ext-id or vsix-path` | Installs or updates an extension.      |
+| vscue `ext-id`              | code --uninstall-extension `ext-id`            | Uninstalls an extension.               |
 
-## Other options:
+## Other options
 
-| Alias        | Command                   | Description                                                                                                           |
-| ------------ | ------------------------- | --------------------------------------------------------------------------------------------------------------------- |
-| vscv         | code --verbose            | Print verbose output (implies --wait).                                                                                |
-| vscl `level` | code --log `level`        | Log level to use. Default is 'info'. Allowed values are 'critical', 'error', 'warn', 'info', 'debug', 'trace', 'off'. |
-| vscde        | code --disable-extensions | Disable all installed extensions.                                                                                     |
+| Alias        | Command                   | Description                              |
+| ------------ | ------------------------- | ---------------------------------------- |
+| vscv         | code --verbose            | Print verbose output (implies `--wait`). |
+| vscl `level` | code --log `level`        | Log level to use. Default is `info`.     |
+| vscde        | code --disable-extensions | Disable all installed extensions.        |
diff --git a/zsh/plugins/vscode/vscode.plugin.zsh b/zsh/plugins/vscode/vscode.plugin.zsh
index 48d9043..1635a98 100644
--- a/zsh/plugins/vscode/vscode.plugin.zsh
+++ b/zsh/plugins/vscode/vscode.plugin.zsh
@@ -1,8 +1,9 @@
-# VS Code (stable / insiders) / VSCodium zsh plugin
+# VS Code (stable / insiders) / VSCodium / Cursor zsh plugin
 # Authors:
 #   https://github.com/MarsiBarsi (original author)
 #   https://github.com/babakks
 #   https://github.com/SteelShot
+#   https://github.com/AliSajid
 
 # Verify if any manual user choice of VS Code exists first.
 if [[ -n "$VSCODE" ]] && ! which $VSCODE &>/dev/null; then
@@ -18,12 +19,21 @@ if [[ -z "$VSCODE" ]]; then
     VSCODE=code-insiders
   elif which codium &>/dev/null; then
     VSCODE=codium
+  elif which cursor &>/dev/null; then
+    VSCODE=cursor
   else
     return
   fi
 fi
 
-alias vsc="$VSCODE ."
+function vsc {
+  if (( $# )); then
+    $VSCODE $@
+  else
+    $VSCODE .
+  fi
+}
+
 alias vsca="$VSCODE --add"
 alias vscd="$VSCODE --diff"
 alias vscg="$VSCODE --goto"
@@ -31,6 +41,7 @@ alias vscn="$VSCODE --new-window"
 alias vscr="$VSCODE --reuse-window"
 alias vscw="$VSCODE --wait"
 alias vscu="$VSCODE --user-data-dir"
+alias vscp="$VSCODE --profile"
 
 alias vsced="$VSCODE --extensions-dir"
 alias vscie="$VSCODE --install-extension"
diff --git a/zsh/plugins/watson/README.md b/zsh/plugins/watson/README.md
new file mode 100644
index 0000000..ef734ec
--- /dev/null
+++ b/zsh/plugins/watson/README.md
@@ -0,0 +1,9 @@
+# Watson
+
+This plugin provides completion for [Watson](https://tailordev.github.io/Watson/).
+
+To use it add `watson` to the plugins array in your zshrc file.
+
+```zsh
+plugins=(... watson)
+```
diff --git a/zsh/plugins/watson/_watson b/zsh/plugins/watson/_watson
new file mode 100644
index 0000000..0f599bd
--- /dev/null
+++ b/zsh/plugins/watson/_watson
@@ -0,0 +1,34 @@
+#compdef watson
+
+_watson_completion() {
+    local -a completions
+    local -a completions_with_descriptions
+    local -a response
+    (( ! $+commands[watson] )) && return 1
+
+    response=("${(@f)$(env COMP_WORDS="${words[*]}" COMP_CWORD=$((CURRENT-1)) _WATSON_COMPLETE=zsh_complete watson)}")
+
+    for type key descr in ${response}; do
+        if [[ "$type" == "plain" ]]; then
+            if [[ "$descr" == "_" ]]; then
+                completions+=("$key")
+            else
+                completions_with_descriptions+=("$key":"$descr")
+            fi
+        elif [[ "$type" == "dir" ]]; then
+            _path_files -/
+        elif [[ "$type" == "file" ]]; then
+            _path_files -f
+        fi
+    done
+
+    if [ -n "$completions_with_descriptions" ]; then
+        _describe -V unsorted completions_with_descriptions -U
+    fi
+
+    if [ -n "$completions" ]; then
+        compadd -U -V unsorted -a completions
+    fi
+}
+
+compdef _watson_completion watson;
diff --git a/zsh/plugins/wd/README.md b/zsh/plugins/wd/README.md
index 8791f9f..1240afe 100644
--- a/zsh/plugins/wd/README.md
+++ b/zsh/plugins/wd/README.md
@@ -1,12 +1,12 @@
 # wd
 
-[![Build Status](https://travis-ci.org/mfaerevaag/wd.png?branch=master)](https://travis-ci.org/mfaerevaag/wd)
+[![Build Status](https://github.com/mfaerevaag/wd/actions/workflows/test.yml/badge.svg)](https://github.com/mfaerevaag/wd/actions)
 
 `wd` (*warp directory*) lets you jump to custom directories in zsh, without using `cd`.
 Why?
 Because `cd` seems inefficient when the folder is frequently visited or has a long path.
 
-![tty.gif](https://raw.githubusercontent.com/mfaerevaag/wd/master/tty.gif)
+![Demo](https://raw.githubusercontent.com/mfaerevaag/wd/master/tty.gif)
 
 ## Setup
 
@@ -36,6 +36,10 @@ In your `.zshrc`:
 antibody bundle mfaerevaag/wd
 ```
 
+### [Fig](https://fig.io)
+
+Install `wd` here: [![Fig plugin store](https://fig.io/badges/install-with-fig.svg)](https://fig.io/plugins/other/wd_mfaerevaag)
+
 ### Arch ([AUR](https://aur.archlinux.org/packages/zsh-plugin-wd-git/))
 
 1. Install from the AUR
@@ -53,6 +57,21 @@ wd() {
 }
 ```
 
+### [Home Manager](https://github.com/nix-community/home-manager)
+
+Add the following to your `home.nix` then run `home-manager switch`:
+
+```nix
+programs.zsh.plugins = [
+  {
+    name = "wd";
+    src = pkgs.zsh-wd;
+    file = "share/wd/wd.plugin.zsh";
+    completions = [ "share/zsh/site-functions" ];
+  }
+];
+```
+
 ### [zplug](https://github.com/zplug/zplug)
 
 ```zsh
@@ -93,9 +112,11 @@ wd() {
 
 3. Install manpage (optional):
 
+Move manpage into an appropriate directory, then trigger `mandb` to discover it
+
 ```zsh
-sudo cp ~/.local/wd/wd.1 /usr/share/man/man1/wd.1
-sudo chmod 644 /usr/share/man/man1/wd.1
+sudo install -m 644 ~/.local/wd/wd.1 /usr/share/man/man1/wd.1
+sudo mandb /usr/share/man/man1
 ```
 
 **Note:** when pulling and updating `wd`, you'll need to repeat step 3 should the manpage change
@@ -115,6 +136,15 @@ Also, you may have to force a rebuild of `zcompdump` by running:
 rm -f ~/.zcompdump; compinit
 ```
 
+## Browse
+
+`wd` comes with an `fzf`-powered browse feature to fuzzy search through all your warp points. It's available through the `wd browse` command. For quick access you can set up an alias or keybind in your `.zshrc`:
+
+```zsh
+# ctrl-b to open the fzf browser
+bindkey ${FZF_WD_BINDKEY:-'^B'} wd_browse_widget
+```
+
 ## Usage
 
 * Add warp point to current working directory:
@@ -128,6 +158,19 @@ If a warp point with the same name exists, use `wd add foo --force` to overwrite
 **Note:** a warp point cannot contain colons, or consist of only spaces and dots.
 The first will conflict in how `wd` stores the warp points, and the second will conflict with other features, as below.
 
+* Add warp point to any directory with default name:
+
+```zsh
+wd addcd /foo/ bar
+```
+
+* Add warp point to any directory with a custom name:
+
+```zsh
+wd addcd /foo/
+```
+
+
 You can omit point name to automatically use the current directory's name instead.
 
 * From any directory, warp to `foo` with:
@@ -212,12 +255,6 @@ wd --version
 wd --config ./file <command>
 ```
 
-* Force `exit` with return code after running. This is not default, as it will *exit your terminal*, though required for testing/debugging.
-
-```zsh
-wd --debug <command>
-```
-
 * Silence all output:
 
 ```zsh
diff --git a/zsh/plugins/wd/_wd.sh b/zsh/plugins/wd/_wd.sh
index 8d5cf15..7c41608 100644
--- a/zsh/plugins/wd/_wd.sh
+++ b/zsh/plugins/wd/_wd.sh
@@ -31,11 +31,13 @@ function _wd() {
 
   commands=(
     'add:Adds the current working directory to your warp points'
+    'addcd:Adds a directory to your warp points'
     'add!:Overwrites existing warp point'
     'export:Export warp points as static named directories'
     'rm:Removes the given warp point'
     'list:Outputs all stored warp points'
     'ls:Show files from given warp point'
+    'open:Open warp point in the default file explorer'
     'path:Show path to given warp point'
     'show:Outputs all warp points that point to the current directory or shows a specific target directory for a point'
     'help:Show this extremely helpful text'
@@ -63,12 +65,18 @@ function _wd() {
         add)
           _message 'Write the name of your warp point' && ret=0
           ;;
+	addcd)
+          _message 'Write the name of your path' && ret=0
+          ;;
         show)
           _describe -t points "Warp points" warp_points && ret=0
           ;;
         ls)
           _describe -t points "Warp points" warp_points && ret=0
           ;;
+        open)
+          _describe -t points "Warp points" warp_points && ret=0
+          ;;
         path)
           _describe -t points "Warp points" warp_points && ret=0
           ;;
@@ -77,7 +85,7 @@ function _wd() {
             # complete sub directories from the warp point
             _path_files -W "(${points[$target]})" -/ && ret=0
           fi
-          
+
           # don't complete anything if warp point is not valid
           ;;
       esac
diff --git a/zsh/plugins/wd/wd.plugin.zsh b/zsh/plugins/wd/wd.plugin.zsh
index ca2ca7c..2397e6f 100644
--- a/zsh/plugins/wd/wd.plugin.zsh
+++ b/zsh/plugins/wd/wd.plugin.zsh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 # WARP DIRECTORY
 # ==============
@@ -8,8 +8,13 @@
 # @github.com/mfaerevaag/wd
 
 # Handle $0 according to the standard:
-# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+# # https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
 0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
 0="${${(M)0:#/*}:-$PWD/$0}"
 
 eval "wd() { source '${0:A:h}/wd.sh' }"
+wd > /dev/null
+zle -N wd_browse_widget
+zle -N wd_restore_buffer
+autoload -Uz add-zle-hook-widget
+add-zle-hook-widget line-init wd_restore_buffer
diff --git a/zsh/plugins/wd/wd.sh b/zsh/plugins/wd/wd.sh
old mode 100644
new mode 100755
index 9085c5b..56c0292
--- a/zsh/plugins/wd/wd.sh
+++ b/zsh/plugins/wd/wd.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 # WARP DIRECTORY
 # ==============
@@ -8,7 +8,7 @@
 # @github.com/mfaerevaag/wd
 
 # version
-readonly WD_VERSION=0.5.0
+readonly WD_VERSION=0.10.1
 
 # colors
 readonly WD_BLUE="\033[96m"
@@ -57,12 +57,11 @@ wd_print_msg()
 {
     if [[ -z $wd_quiet_mode ]]
     then
-        local color=$1
-        local msg=$2
+        local color="${1:-$WD_BLUE}"  # Default to blue if no color is provided
+        local msg="$2"
 
-        if [[ $color == "" || $msg == "" ]]
-        then
-            print " ${WD_RED}*${WD_NOC} Could not print message. Sorry!"
+        if [[ -z "$msg" ]]; then
+            print "${WD_RED}*${WD_NOC} Could not print message. Sorry!"
         else
             print " ${color}*${WD_NOC} ${msg}"
         fi
@@ -75,21 +74,23 @@ wd_print_usage()
 Usage: wd [command] [point]
 
 Commands:
-    <point>         Warps to the directory specified by the warp point
-    <point> <path>  Warps to the directory specified by the warp point with path appended
-    add <point>     Adds the current working directory to your warp points
-    add             Adds the current working directory to your warp points with current directory's name
-    rm <point>      Removes the given warp point
-    rm              Removes the given warp point with current directory's name
-    show <point>    Print path to given warp point
-    show            Print warp points to current directory
-    list            Print all stored warp points
-    ls  <point>     Show files from given warp point (ls)
-    path <point>    Show the path to given warp point (pwd)
-    clean           Remove points warping to nonexistent directories (will prompt unless --force is used)
+    <point>              Warps to the directory specified by the warp point
+    <point> <path>       Warps to the directory specified by the warp point with path appended
+    add <point>          Adds the current working directory to your warp points
+    add                  Adds the current working directory to your warp points with current directory's name
+    addcd <path>         Adds a path to your warp points with the directory's name
+    addcd <path> <point> Adds a path to your warp points with a custom name
+    rm <point>           Removes the given warp point
+    rm                   Removes the given warp point with current directory's name
+    show <point>         Print path to given warp point
+    show                 Print warp points to current directory
+    list                 Print all stored warp points
+    ls  <point>          Show files from given warp point (ls)
+    open <point>         Open the warp point in the default file explorer (open / xdg-open)
+    path <point>         Show the path to given warp point (pwd)
+    clean                Remove points warping to nonexistent directories (will prompt unless --force is used)
 
     -v | --version  Print version
-    -d | --debug    Exit after execution with exit codes (for testing)
     -c | --config   Specify config file (default ~/.warprc)
     -q | --quiet    Suppress all output
     -f | --force    Allows overwriting without warning (for add & clean)
@@ -145,14 +146,17 @@ wd_warp()
         else
             (( n = $#1 - 1 ))
             cd -$n > /dev/null
+            WD_EXIT_CODE=$?
         fi
     elif [[ ${points[$point]} != "" ]]
     then
         if [[ $sub != "" ]]
         then
             cd ${points[$point]/#\~/$HOME}/$sub
+            WD_EXIT_CODE=$?
         else
             cd ${points[$point]/#\~/$HOME}
+            WD_EXIT_CODE=$?
         fi
     else
         wd_exit_fail "Unknown warp point '${point}'"
@@ -163,12 +167,18 @@ wd_add()
 {
     local point=$1
     local force=$2
+    cmdnames=(add rm show list ls path clean help)
 
     if [[ $point == "" ]]
     then
         point=$(basename "$PWD")
     fi
 
+    if [ ! -w "$wd_config_file" ]; then
+        wd_exit_fail "\'$wd_config_file\' is not writeable."
+        return
+    fi
+
     if [[ $point =~ "^[\.]+$" ]]
     then
         wd_exit_fail "Warp point cannot be just dots"
@@ -178,14 +188,17 @@ wd_add()
     elif [[ $point =~ : ]] || [[ $point =~ / ]]
     then
         wd_exit_fail "Warp point contains illegal character (:/)"
+    elif (($cmdnames[(Ie)$point]))
+    then
+        wd_exit_fail "Warp point name cannot be a wd command (see wd -h for a full list)"
     elif [[ ${points[$point]} == "" ]] || [ ! -z "$force" ]
     then
         wd_remove "$point" > /dev/null
-        printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> "$WD_CONFIG"
+        printf "%q:%s\n" "${point}" "${PWD/#$HOME/~}" >> "$wd_config_file"
         if (whence sort >/dev/null); then
             local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
-            # use 'cat' below to ensure we respect $WD_CONFIG as a symlink
-            command sort -o "${config_tmp}" "$WD_CONFIG" && command cat "${config_tmp}" > "$WD_CONFIG" && command rm "${config_tmp}"
+            # use 'cat' below to ensure we respect $wd_config_file as a symlink
+            command sort -o "${config_tmp}" "$wd_config_file" && command cat "${config_tmp}" >| "$wd_config_file" && command rm "${config_tmp}"
         fi
 
         wd_export_static_named_directories
@@ -200,6 +213,28 @@ wd_add()
     fi
 }
 
+wd_addcd() {
+    local folder="$1"
+    local point=$2
+    local force=$3
+    local currentdir=$PWD
+
+    if [[ -z "$folder" ]]; then
+        wd_exit_fail "You must specify a path"
+        return
+    fi
+
+    if [[ ! -d "$folder" ]]; then
+        wd_exit_fail "The directory does not exist"
+        return
+    fi
+
+    cd "$folder" || return
+    wd_add "$point" "$force"
+    cd "$currentdir" || return
+}
+
+
 wd_remove()
 {
     local point_list=$1
@@ -209,12 +244,17 @@ wd_remove()
         point_list=$(basename "$PWD")
     fi
 
+    if [ ! -w "$wd_config_file" ]; then
+        wd_exit_fail "\'$wd_config_file\' is not writeable."
+        return
+    fi
+
     for point_name in $point_list ; do
         if [[ ${points[$point_name]} != "" ]]
         then
             local config_tmp=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
             # Copy and delete in two steps in order to preserve symlinks
-            if sed -n "/^${point_name}:.*$/!p" "$WD_CONFIG" > "$config_tmp" && command cp "$config_tmp" "$WD_CONFIG" && command rm "$config_tmp"
+            if sed -n "/^${point_name}:.*$/!p" "$wd_config_file" >| "$config_tmp" && command cp "$config_tmp" "$wd_config_file" && command rm "$config_tmp"
             then
                 wd_print_msg "$WD_GREEN" "Warp point removed"
             else
@@ -226,11 +266,92 @@ wd_remove()
     done
 }
 
+wd_browse() {
+    # Check if fzf is installed
+    if ! command -v fzf >/dev/null; then
+        wd_print_msg "$WD_RED" "This functionality requires fzf. Please install fzf first."
+        return 1
+    fi
+
+    # Ensure wd_config_file is properly set
+    if [[ -z $wd_config_file ]]; then
+        wd_config_file="${WD_CONFIG:-$HOME/.warprc}"
+    fi
+
+    # Check if config file exists
+    if [[ ! -f $wd_config_file ]]; then
+        wd_print_msg "$WD_RED" "Config file $wd_config_file does not exist. Please create it first."
+        return 1
+    fi
+
+    # Read entries from the config file
+    local entries=("${(@f)$(sed "s:${HOME}:~:g" "$wd_config_file" | awk -F ':' '{print $1 " -> " $2}')}")
+    if [[ -z $entries ]]; then
+        wd_print_msg "$WD_YELLOW" "You don't have any warp points to browse"
+        return 1
+    fi
+
+    # Temp file for remove operations
+    local script_path="${${(%):-%x}:h}"
+    local wd_remove_output=$(mktemp "${TMPDIR:-/tmp}/wd.XXXXXXXXXX")
+
+    # Create fzf bindings
+    entries=("All warp points:" "Press enter to select. Press delete to remove" "${entries[@]}")
+    local fzf_bind="delete:execute(echo {} | awk -F ' -> ' '{print \$1}' | xargs -I {} \"$script_path/wd.sh\" rm {} > \"$wd_remove_output\")+abort"
+
+    # Run fzf
+    local selected_entry=$(printf '%s\n' "${entries[@]}" | fzf --height 100% --reverse --header-lines=2 --bind="$fzf_bind")
+
+    # Handle selection
+    if [[ -e $wd_remove_output ]]; then
+        cat "$wd_remove_output"
+        rm -f "$wd_remove_output"
+    fi
+
+    if [[ -n $selected_entry ]]; then
+        local selected_point="${selected_entry%% ->*}"
+        selected_point=$(echo "$selected_point" | xargs)
+        wd $selected_point
+    fi
+}
+
+wd_browse_widget() {
+    # Ensure wd_config_file is properly set
+    if [[ -z $wd_config_file ]]; then
+        wd_config_file="${WD_CONFIG:-$HOME/.warprc}"
+    fi
+
+    # Check if config file exists
+    if [[ ! -f $wd_config_file ]]; then
+        wd_print_msg "$WD_RED" "Config file $wd_config_file does not exist. Please create it first."
+        return 1
+    fi
+
+    # Call wd_browse to handle the selection
+    wd_browse
+
+    # Restore the zsh buffer and cursor after running wd_browse
+    saved_buffer=$BUFFER
+    saved_cursor=$CURSOR
+    BUFFER=
+    zle redisplay
+    zle accept-line
+}
+
+wd_restore_buffer() {
+  if [[ -n $saved_buffer ]]; then
+    BUFFER=$saved_buffer
+    CURSOR=$saved_cursor
+  fi
+  saved_buffer=
+  saved_cursor=1
+}
+
 wd_list_all()
 {
     wd_print_msg "$WD_BLUE" "All warp points:"
 
-    entries=$(sed "s:${HOME}:~:g" "$WD_CONFIG")
+    entries=$(sed "s:${HOME}:~:g" "$wd_config_file")
 
     max_warp_point_length=0
     while IFS= read -r line
@@ -251,7 +372,7 @@ wd_list_all()
         then
             arr=(${(s,:,)line})
             key=${arr[1]}
-            val=${arr[2]}
+            val=${line#"${arr[1]}:"}
 
             if [[ -z $wd_quiet_mode ]]
             then
@@ -267,6 +388,21 @@ wd_ls()
     ls "${dir/#\~/$HOME}"
 }
 
+wd_open()
+{
+    wd_getdir "$1"
+    if command -v open >/dev/null 2>&1; then
+        # MacOS, Ubuntu (alias)
+        open "${dir/#\~/$HOME}"
+    elif command -v xdg-open >/dev/null 2>&1; then
+        # Most Linux desktops
+        xdg-open "${dir/#\~/$HOME}"
+    else
+        echo "No known file opener found (need 'open' or 'xdg-open')." >&2
+        exit 1
+    fi
+}
+
 wd_path()
 {
     wd_getdir "$1"
@@ -276,6 +412,7 @@ wd_path()
 wd_show()
 {
     local name_arg=$1
+    local show_pwd
     # if there's an argument we look up the value
     if [[ -n $name_arg ]]
     then
@@ -290,12 +427,12 @@ wd_show()
         local wd_matches
         wd_matches=()
         # do a reverse lookup to check whether PWD is in $points
-        PWD="${PWD/$HOME/~}"
-        if [[ ${points[(r)$PWD]} == "$PWD" ]]
+        show_pwd="${PWD/$HOME/~}"
+        if [[ ${points[(r)$show_pwd]} == "$show_pwd" ]]
         then
             for name in ${(k)points}
             do
-                if [[ $points[$name] == "$PWD" ]]
+                if [[ $points[$name] == "$show_pwd" ]]
                 then
                     wd_matches[$(($#wd_matches+1))]=$name
                 fi
@@ -303,7 +440,7 @@ wd_show()
 
             wd_print_msg "$WD_BLUE" "$#wd_matches warp point(s) to current directory: ${WD_GREEN}$wd_matches${WD_NOC}"
         else
-            wd_print_msg "$WD_YELLOW" "No warp point to $(echo "$PWD" | sed "s:$HOME:~:")"
+            wd_print_msg "$WD_YELLOW" "No warp point to $show_pwd"
         fi
     fi
 }
@@ -313,6 +450,11 @@ wd_clean() {
     local count=0
     local wd_tmp=""
 
+    if [ ! -w "$wd_config_file" ]; then
+        wd_exit_fail "\'$wd_config_file\' is not writeable."
+        return
+    fi
+
     while read -r line
     do
         if [[ $line != "" ]]
@@ -329,7 +471,7 @@ wd_clean() {
                 count=$((count+1))
             fi
         fi
-    done < "$WD_CONFIG"
+    done < "$wd_config_file"
 
     if [[ $count -eq 0 ]]
     then
@@ -337,7 +479,7 @@ wd_clean() {
     else
         if [ ! -z "$force" ] || wd_yesorno "Removing ${count} warp points. Continue? (y/n)"
         then
-            echo "$wd_tmp" >! "$WD_CONFIG"
+            echo "$wd_tmp" >! "$wd_config_file"
             wd_print_msg "$WD_GREEN" "Cleanup complete. ${count} warp point(s) removed"
         else
             wd_print_msg "$WD_BLUE" "Cleanup aborted"
@@ -348,16 +490,15 @@ wd_clean() {
 wd_export_static_named_directories() {
   if [[ ! -z $WD_EXPORT ]]
   then
-    command grep '^[0-9a-zA-Z_-]\+:' "$WD_CONFIG" | sed -e "s,~,$HOME," -e 's/:/=/' | while read -r warpdir ; do
+    command grep '^[0-9a-zA-Z_-]\+:' "$wd_config_file" | sed -e "s,~,$HOME," -e 's/:/=/' | while read -r warpdir ; do
         hash -d "$warpdir"
     done
   fi
 }
 
-local WD_CONFIG=${WD_CONFIG:-$HOME/.warprc}
+WD_CONFIG=${WD_CONFIG:-$HOME/.warprc}
 local WD_QUIET=0
 local WD_EXIT_CODE=0
-local WD_DEBUG=0
 
 # Parse 'meta' options first to avoid the need to have them before
 # other commands. The `-D` flag consumes recognized options so that
@@ -367,7 +508,6 @@ zparseopts -D -E \
     c:=wd_alt_config -config:=wd_alt_config \
     q=wd_quiet_mode -quiet=wd_quiet_mode \
     v=wd_print_version -version=wd_print_version \
-    d=wd_debug_mode -debug=wd_debug_mode \
     f=wd_force_mode -force=wd_force_mode
 
 if [[ ! -z $wd_print_version ]]
@@ -375,20 +515,30 @@ then
     echo "wd version $WD_VERSION"
 fi
 
+# set the config file from variable or default
+typeset wd_config_file=${WD_CONFIG:-$HOME/.warprc}
 if [[ ! -z $wd_alt_config ]]
 then
-    WD_CONFIG=$wd_alt_config[2]
+    # prefer the flag if provided
+    wd_config_file=$wd_alt_config[2]
 fi
 
 # check if config file exists
-if [ ! -e "$WD_CONFIG" ]
+if [ ! -e "$wd_config_file" ]
 then
     # if not, create config file
-    touch "$WD_CONFIG"
+    touch "$wd_config_file"
 else
     wd_export_static_named_directories
 fi
 
+# disable extendedglob for the complete wd execution time
+setopt | grep -q extendedglob
+wd_extglob_is_set=$?
+if (( wd_extglob_is_set == 0 )); then
+    setopt noextendedglob
+fi
+
 # load warp points
 typeset -A points
 while read -r line
@@ -399,23 +549,15 @@ do
     val=${(j,:,)arr[2,-1]}
 
     points[$key]=$val
-done < "$WD_CONFIG"
+done < "$wd_config_file"
 
 # get opts
-args=$(getopt -o a:r:c:lhs -l add:,rm:,clean,list,ls:,path:,help,show -- $*)
+args=$(getopt -o a:r:c:lhs -l add:,rm:,clean,list,ls:,open:,path:,help,show -- $*)
 
 # check if no arguments were given, and that version is not set
 if [[ ($? -ne 0 || $#* -eq 0) && -z $wd_print_version ]]
 then
     wd_print_usage
-
-# check if config file is writeable
-elif [ ! -w "$WD_CONFIG" ]
-then
-    # do nothing
-    # can't run `exit`, as this would exit the executing shell
-    wd_exit_fail "\'$WD_CONFIG\' is not writeable."
-
 else
     # parse rest of options
     local wd_o
@@ -427,6 +569,14 @@ else
                 wd_add "$2" "$wd_force_mode"
                 break
                 ;;
+            "-b"|"browse")
+                wd_browse
+                break
+                ;;
+            "-c"|"--addcd"|"addcd")
+                wd_addcd "$2" "$3" "$wd_force_mode"
+                break
+                ;;
             "-e"|"export")
                 wd_export_static_named_directories
                 break
@@ -444,6 +594,10 @@ else
                 wd_ls "$2"
                 break
                 ;;
+            "-o"|"--open"|"open")
+                wd_open "$2"
+                break
+                ;;
             "-p"|"--path"|"path")
                 wd_path "$2"
                 break
@@ -475,8 +629,14 @@ fi
 # if not, next time warp will pick up variables from this run
 # remember, there's no sub shell
 
+if (( wd_extglob_is_set == 0 )); then
+    setopt extendedglob
+fi
+
+unset wd_extglob_is_set
 unset wd_warp
 unset wd_add
+unset wd_addcd
 unset wd_remove
 unset wd_show
 unset wd_list_all
@@ -484,8 +644,10 @@ unset wd_print_msg
 unset wd_yesorno
 unset wd_print_usage
 unset wd_alt_config
+#unset wd_config_file do not unset this - breaks keybind
 unset wd_quiet_mode
 unset wd_print_version
+unset wd_force_mode
 unset wd_export_static_named_directories
 unset wd_o
 
@@ -493,9 +655,4 @@ unset args
 unset points
 unset val &> /dev/null # fixes issue #1
 
-if [[ -n $wd_debug_mode ]]
-then
-    exit $WD_EXIT_CODE
-else
-    unset wd_debug_mode
-fi
+return $WD_EXIT_CODE
diff --git a/zsh/plugins/web-search/README.md b/zsh/plugins/web-search/README.md
index 54232a9..8d74a08 100644
--- a/zsh/plugins/web-search/README.md
+++ b/zsh/plugins/web-search/README.md
@@ -12,8 +12,8 @@ plugins=( ... web-search)
 
 You can use the `web-search` plugin in these two forms:
 
-* `web_search <context> <term> [more terms if you want]`
-* `<context> <term> [more terms if you want]`
+- `web_search <context> <term> [more terms if you want]`
+- `<context> <term> [more terms if you want]`
 
 For example, these two are equivalent:
 
@@ -24,42 +24,55 @@ $ google oh-my-zsh
 
 Available search contexts are:
 
-| Context               | URL                                      |
-| --------------------- | ---------------------------------------- |
-| `bing`                | `https://www.bing.com/search?q=`         |
-| `google`              | `https://www.google.com/search?q=`       |
-| `brs` or `brave`      | `https://search.brave.com/search?q=`     |
-| `yahoo`               | `https://search.yahoo.com/search?p=`     |
-| `ddg` or `duckduckgo` | `https://www.duckduckgo.com/?q=`         |
-| `sp` or `startpage`   | `https://www.startpage.com/do/search?q=` |
-| `yandex`              | `https://yandex.ru/yandsearch?text=`     |
-| `github`              | `https://github.com/search?q=`           |
-| `baidu`               | `https://www.baidu.com/s?wd=`            |
-| `ecosia`              | `https://www.ecosia.org/search?q=`       |
-| `goodreads`           | `https://www.goodreads.com/search?q=`    |
-| `qwant`               | `https://www.qwant.com/?q=`              |
-| `givero`              | `https://www.givero.com/search?q=`       |
-| `stackoverflow`       | `https://stackoverflow.com/search?q=`    |
-| `wolframalpha`        | `https://wolframalpha.com/input?i=`      |
-| `archive`             | `https://web.archive.org/web/*/`         |
-| `scholar`             | `https://scholar.google.com/scholar?q=`  |
+| Context               | URL                                             |
+| --------------------- | ----------------------------------------------- |
+| `bing`                | `https://www.bing.com/search?q=`                |
+| `google`              | `https://www.google.com/search?q=`              |
+| `brs` or `brave`      | `https://search.brave.com/search?q=`            |
+| `yahoo`               | `https://search.yahoo.com/search?p=`            |
+| `ddg` or `duckduckgo` | `https://www.duckduckgo.com/?q=`                |
+| `sp` or `startpage`   | `https://www.startpage.com/do/search?q=`        |
+| `yandex`              | `https://yandex.ru/yandsearch?text=`            |
+| `github`              | `https://github.com/search?q=`                  |
+| `baidu`               | `https://www.baidu.com/s?wd=`                   |
+| `ecosia`              | `https://www.ecosia.org/search?q=`              |
+| `goodreads`           | `https://www.goodreads.com/search?q=`           |
+| `qwant`               | `https://www.qwant.com/?q=`                     |
+| `givero`              | `https://www.givero.com/search?q=`              |
+| `stackoverflow`       | `https://stackoverflow.com/search?q=`           |
+| `wolframalpha`        | `https://wolframalpha.com/input?i=`             |
+| `archive`             | `https://web.archive.org/web/*/`                |
+| `scholar`             | `https://scholar.google.com/scholar?q=`         |
+| `ask`                 | `https://www.ask.com/web?q=`                    |
+| `youtube`             | `https://www.youtube.com/results?search_query=` |
+| `deepl`               | `https://www.deepl.com/translator#auto/auto/`   |
+| `dockerhub`           | `https://hub.docker.com/search?q=`              |
+| `gems`                | `https://rubygems.org/search?query=`            |
+| `npmpkg`              | `https://www.npmjs.com/search?q=`               |
+| `packagist`           | `https://packagist.org/?query=`                 |
+| `gopkg`               | `https://pkg.go.dev/search?m=package&q=`        |
+| `chatgpt`             | `https://chatgpt.com/?q=`                       |
+| `claudeai`            | `https://claude.ai/new?q=`                      |
+| `grok`                | `https://grok.com/?q=`                          |
+| `reddit`              | `https://www.reddit.com/search/?q=`             |
+| `ppai`                | `https://www.perplexity.ai/search/new?q=`       |
+| `rscrate`             | `https://crates.io/search?q=`                   |
+| `rsdoc`               | `https://docs.rs/releases/search?query=`        |
 
 Also there are aliases for bang-searching DuckDuckGo:
 
-| Context   | Bang  |
-|-----------|-------|
-| `wiki`    | `!w`  |
-| `news`    | `!n`  |
-| `youtube` | `!yt` |
-| `map`     | `!m`  |
-| `image`   | `!i`  |
-| `ducky`   | `!`   |
+| Context | Bang |
+| ------- | ---- |
+| `wiki`  | `!w` |
+| `news`  | `!n` |
+| `map`   | `!m` |
+| `image` | `!i` |
+| `ducky` | `!`  |
 
 ### Custom search engines
 
-If you want to add other search contexts to the plugin, you can use the
-`$ZSH_WEB_SEARCH_ENGINES` variable. Set it before Oh My Zsh is sourced,
-with the following format:
+If you want to add other search contexts to the plugin, you can use the `$ZSH_WEB_SEARCH_ENGINES` variable.
+Set it before Oh My Zsh is sourced, with the following format:
 
 ```zsh
 ZSH_WEB_SEARCH_ENGINES=(
@@ -68,13 +81,12 @@ ZSH_WEB_SEARCH_ENGINES=(
 )
 ```
 
-where `<context>` is the name of the search context, and `<URL>` a URL of
-the same type as the search contexts above. For example, to add `reddit`,
-you'd do:
+where `<context>` is the name of the search context, and `<URL>` a URL of the same type as the search contexts
+above. For example, to add `reddit`, you'd do:
 
 ```zsh
 ZSH_WEB_SEARCH_ENGINES=(reddit "https://www.reddit.com/search/?q=")
 ```
 
-These custom search engines will also be turned to aliases, so you can
-both do `web_search reddit <query>` or `reddit <query>`.
+These custom search engines will also be turned to aliases, so you can both do `web_search reddit <query>` or
+`reddit <query>`.
diff --git a/zsh/plugins/web-search/web-search.plugin.zsh b/zsh/plugins/web-search/web-search.plugin.zsh
index d8b4a7f..93237f4 100644
--- a/zsh/plugins/web-search/web-search.plugin.zsh
+++ b/zsh/plugins/web-search/web-search.plugin.zsh
@@ -24,6 +24,21 @@ function web_search() {
     wolframalpha    "https://www.wolframalpha.com/input/?i="
     archive         "https://web.archive.org/web/*/"
     scholar         "https://scholar.google.com/scholar?q="
+    ask             "https://www.ask.com/web?q="
+    youtube         "https://www.youtube.com/results?search_query="
+    deepl           "https://www.deepl.com/translator#auto/auto/"
+    dockerhub       "https://hub.docker.com/search?q="
+    gems            "https://rubygems.org/search?query="
+    npmpkg          "https://www.npmjs.com/search?q="
+    packagist       "https://packagist.org/?query="
+    gopkg           "https://pkg.go.dev/search?m=package&q="
+    chatgpt         "https://chatgpt.com/?q="
+    grok            "https://grok.com/?q="
+    claudeai        "https://claude.ai/new?q="
+    reddit          "https://www.reddit.com/search/?q="
+    ppai            "https://www.perplexity.ai/search/new?q="
+    rscrate         "https://crates.io/search?q="
+    rsdoc           "https://docs.rs/releases/search?query="
   )
 
   # check whether the search engine is supported
@@ -34,9 +49,14 @@ function web_search() {
 
   # search or go to main page depending on number of arguments passed
   if [[ $# -gt 1 ]]; then
+    # if search goes in the query string ==> space as +, otherwise %20
+    # see https://stackoverflow.com/questions/1634271/url-encoding-the-space-character-or-20
+    local param="-P"
+    [[ "$urls[$1]" == *\?*= ]] && param=""
+
     # build search url:
     # join arguments passed with '+', then append to search engine URL
-    url="${urls[$1]}$(omz_urlencode ${@[2,-1]})"
+    url="${urls[$1]}$(omz_urlencode $param ${(s: :)@[2,-1]})"
   else
     # build main page url:
     # split by '/', then rejoin protocol (1) and domain (2) parts with '//'
@@ -64,11 +84,25 @@ alias stackoverflow='web_search stackoverflow'
 alias wolframalpha='web_search wolframalpha'
 alias archive='web_search archive'
 alias scholar='web_search scholar'
+alias ask='web_search ask'
+alias youtube='web_search youtube'
+alias deepl='web_search deepl'
+alias dockerhub='web_search dockerhub'
+alias gems='web_search gems'
+alias npmpkg='web_search npmpkg'
+alias packagist='web_search packagist'
+alias gopkg='web_search gopkg'
+alias chatgpt='web_search chatgpt'
+alias grok='web_search grok'
+alias claudeai='web_search claudeai'
+alias reddit='web_search reddit'
+alias ppai='web_search ppai'
+alias rscrate='web_search rscrate'
+alias rsdoc='web_search rsdoc'
 
 #add your own !bang searches here
 alias wiki='web_search duckduckgo \!w'
 alias news='web_search duckduckgo \!n'
-alias youtube='web_search duckduckgo \!yt'
 alias map='web_search duckduckgo \!m'
 alias image='web_search duckduckgo \!i'
 alias ducky='web_search duckduckgo \!'
@@ -82,3 +116,4 @@ if [[ ${#ZSH_WEB_SEARCH_ENGINES} -gt 0 ]]; then
   done
   unset engines key
 fi
+
diff --git a/zsh/plugins/xcode/README.md b/zsh/plugins/xcode/README.md
index 27d6a22..ac79f72 100644
--- a/zsh/plugins/xcode/README.md
+++ b/zsh/plugins/xcode/README.md
@@ -1,7 +1,5 @@
 # Xcode
 
-## Description
-
 This plugin provides a few utilities that can help you on your daily use of Xcode and iOS development.
 
 To start using it, add the `xcode` plugin to your `plugins` array in `~/.zshrc`:
diff --git a/zsh/plugins/xcode/xcode.plugin.zsh b/zsh/plugins/xcode/xcode.plugin.zsh
index 3bd12cd..f09434e 100644
--- a/zsh/plugins/xcode/xcode.plugin.zsh
+++ b/zsh/plugins/xcode/xcode.plugin.zsh
@@ -17,6 +17,13 @@ function xc {
   local active_path
   active_path=${"$(xcode-select -p)"%%/Contents/Developer*}
   echo "Found ${xcode_files[1]}. Opening with ${active_path}"
+
+  # If Xcode is already opened in another Desk, we need this double call
+  # with -g to open the project window in the current Desk and focus it.
+  # See https://github.com/ohmyzsh/ohmyzsh/issues/10384
+  if command pgrep -q "^Xcode"; then
+    open -g -a "$active_path" "${xcode_files[1]}"
+  fi
   open -a "$active_path" "${xcode_files[1]}"
 }
 
@@ -31,7 +38,7 @@ function xx {
   open -a "Xcode.app" "$@"
 }
 
-# "XCode-SELect by Version" - select Xcode by just version number
+# "Xcode-Select by Version" - select Xcode by just version number
 # Uses naming convention:
 #  - different versions of Xcode are named Xcode-<version>.app or stored
 #     in a folder named Xcode-<version>
diff --git a/zsh/plugins/yarn/README.md b/zsh/plugins/yarn/README.md
index 9c16ff2..f1d089b 100644
--- a/zsh/plugins/yarn/README.md
+++ b/zsh/plugins/yarn/README.md
@@ -1,7 +1,7 @@
 # Yarn plugin
 
-This plugin adds completion for the [Yarn package manager](https://yarnpkg.com/en/),
-as well as some aliases for common Yarn commands.
+This plugin adds completion for the [Yarn package manager](https://yarnpkg.com/en/), as well as some aliases
+for common Yarn commands.
 
 To use it, add `yarn` to the plugins array in your zshrc file:
 
@@ -11,46 +11,64 @@ plugins=(... yarn)
 
 ## Global scripts directory
 
-It also adds `yarn` global scripts dir (commonly `~/.yarn/bin`) to the `$PATH`.
-To disable this feature, set the following style in your `.zshrc`:
+It also adds `yarn` global scripts dir (commonly `~/.yarn/bin`) to the `$PATH`. To disable this feature, set
+the following style in your `.zshrc`:
 
 ```zsh
-zstyle ':omz:plugins:yarn' global-path false
+zstyle ':omz:plugins:yarn' global-path no
+```
+
+## Yarn Berry
+
+If you are using Yarn berry (a.k.a. Yarn version 2 or higher) as your global Yarn version you should configure
+this plugin to configure its aliases accordingly, set the following style in your `.zshrc`:
+
+```zsh
+zstyle ':omz:plugins:yarn' berry yes
 ```
 
 ## Aliases
 
-| Alias | Command                                   | Description                                                                   |
-| ----- | ----------------------------------------- | ----------------------------------------------------------------------------- |
-| y     | `yarn`                                    | The Yarn command                                                              |
-| ya    | `yarn add`                                | Install a package in dependencies (`package.json`)                            |
-| yad   | `yarn add --dev`                          | Install a package in devDependencies (`package.json`)                         |
-| yap   | `yarn add --peer`                         | Install a package in peerDependencies (`package.json`)                        |
-| yb    | `yarn build`                              | Run the build script defined in `package.json`                                |
-| ycc   | `yarn cache clean`                        | Clean yarn's global cache of packages                                         |
-| yd    | `yarn dev`                                | Run the dev script defined in `package.json`                                  |
-| yga   | `yarn global add`                         | Install packages globally on your operating system                            |
-| ygls  | `yarn global list`                        | Lists global installed packages                                               |
-| ygrm  | `yarn global remove`                      | Remove global installed packages from your OS                                 |
-| ygu   | `yarn global upgrade`                     | Upgrade packages installed globally to their latest version                   |
-| yh    | `yarn help`                               | Show help for a yarn command                                                  |
-| yi    | `yarn init`                               | Interactively creates or updates a package.json file                          |
-| yin   | `yarn install`                            | Install dependencies defined in `package.json`                                |
-| yln   | `yarn lint`                               | Run the lint script defined in `package.json`                                 |
-| ylnf  | `yarn lint --fix`                         | Run the lint script defined in `package.json`to automatically fix problems    |
-| yls   | `yarn list`                               | List installed packages                                                       |
-| yout  | `yarn outdated`                           | Check for outdated package dependencies                                       |
-| yp    | `yarn pack`                               | Create a compressed gzip archive of package dependencies                      |
-| yrm   | `yarn remove`                             | Remove installed packages                                                     |
-| yrun  | `yarn run`                                | Run a defined package script                                                  |
-| ys    | `yarn serve`                              | Start the dev server                                                          |
-| yst   | `yarn start`                              | Run the start script defined in `package.json`                                |
-| yt    | `yarn test`                               | Run the test script defined in `package.json`                                 |
-| ytc   | `yarn test --coverage`                    | Run the test script defined in `package.json` with coverage                   |
-| yuc   | `yarn global upgrade && yarn cache clean` | Upgrade global packages and clean yarn's global cache                         |
-| yui   | `yarn upgrade-interactive`                | Prompt for which outdated packages to upgrade                                 |
-| yuil  | `yarn upgrade-interactive --latest`       | Prompt for which outdated packages to upgrade to the latest available version |
-| yup   | `yarn upgrade`                            | Upgrade packages to their latest version                                      |
-| yv    | `yarn version`                            | Update the version of your package                                            |
-| yw    | `yarn workspace`                          | Run a command within a single workspace.                                      |
-| yws   | `yarn workspaces`                         | Run a command within all defined workspaces.                                  |
+- Aliases marked with <sup>`*`</sup> are only available when using Yarn v1 (non-berry)
+- Aliases marked with <sup>`b`</sup> are only available when using Yarn berry
+
+| Alias              | Command                                                                                               | Description                                                                        |
+| ------------------ | ----------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------------------- |
+| y                  | `yarn`                                                                                                | The Yarn command                                                                   |
+| ya                 | `yarn add`                                                                                            | Install a package in dependencies (`package.json`)                                 |
+| yad                | `yarn add --dev`                                                                                      | Install a package in devDependencies (`package.json`)                              |
+| yap                | `yarn add --peer`                                                                                     | Install a package in peerDependencies (`package.json`)                             |
+| yb                 | `yarn build`                                                                                          | Run the build script defined in `package.json`                                     |
+| ycc                | `yarn cache clean`                                                                                    | Clean yarn's global cache of packages                                              |
+| yd                 | `yarn dev`                                                                                            | Run the dev script defined in `package.json`                                       |
+| yf                 | `yarn format`                                                                                         | Run the dev script defined in `package.json`                                       |
+| yh                 | `yarn help`                                                                                           | Show help for a yarn command                                                       |
+| yi                 | `yarn init`                                                                                           | Interactively creates or updates a package.json file                               |
+| yin                | `yarn install`                                                                                        | Install dependencies defined in `package.json`                                     |
+| yln                | `yarn lint`                                                                                           | Run the lint script defined in `package.json`                                      |
+| ylnf               | `yarn lint --fix`                                                                                     | Run the lint script defined in `package.json`to automatically fix problems         |
+| yp                 | `yarn pack`                                                                                           | Create a compressed gzip archive of package dependencies                           |
+| yrm                | `yarn remove`                                                                                         | Remove installed packages                                                          |
+| yrun               | `yarn run`                                                                                            | Run a defined package script                                                       |
+| ys                 | `yarn serve`                                                                                          | Start the dev server                                                               |
+| yst                | `yarn start`                                                                                          | Run the start script defined in `package.json`                                     |
+| yt                 | `yarn test`                                                                                           | Run the test script defined in `package.json`                                      |
+| ytc                | `yarn test --coverage`                                                                                | Run the test script defined in `package.json` with coverage                        |
+| yui                | `yarn upgrade-interactive`                                                                            | Prompt for which outdated packages to upgrade                                      |
+| yuil               | `yarn upgrade-interactive --latest` (or see `yui` when using [yarn berry](#yarn-berry))               | Prompt for which outdated packages to upgrade to the latest available version      |
+| yii                | `yarn install --frozen-lockfile` (or `yarn install --immutable` when using [yarn berry](#yarn-berry)) | Install dependencies and abort if the lockfile was to be modified                  |
+| yifl               | `yii`                                                                                                 | Install dependencies and abort if the lockfile was to be modified                  |
+| yup                | `yarn upgrade`                                                                                        | Upgrade packages to their latest version                                           |
+| yv                 | `yarn version`                                                                                        | Update the version of your package                                                 |
+| yw                 | `yarn workspace`                                                                                      | Run a command within a single workspace.                                           |
+| yws                | `yarn workspaces`                                                                                     | Run a command within all defined workspaces.                                       |
+| yy                 | `yarn why`                                                                                            | Show why a package has been installed, detailing which other packages depend on it |
+| yga<sup>`*`</sup>  | `yarn global add`                                                                                     | Install packages globally on your operating system                                 |
+| ygls<sup>`*`</sup> | `yarn global list`                                                                                    | Lists global installed packages                                                    |
+| ygrm<sup>`*`</sup> | `yarn global remove`                                                                                  | Remove global installed packages from your OS                                      |
+| ygu<sup>`*`</sup>  | `yarn global upgrade`                                                                                 | Upgrade packages installed globally to their latest version                        |
+| yls<sup>`*`</sup>  | `yarn list`                                                                                           | List installed packages                                                            |
+| yout<sup>`*`</sup> | `yarn outdated`                                                                                       | Check for outdated package dependencies                                            |
+| yuca<sup>`*`</sup> | `yarn global upgrade && yarn cache clean`                                                             | Upgrade global packages and clean yarn's global cache                              |
+| ydlx<sup>`b`</sup> | `yarn dlx`                                                                                            | Run a package in a temporary environment.                                          |
+| yn<sup>`b`</sup>   | `yarn node`                                                                                           | Run node with the hook already setup.                                              |
diff --git a/zsh/plugins/yarn/_yarn b/zsh/plugins/yarn/_yarn
index 1237ba6..50d3e43 100644
--- a/zsh/plugins/yarn/_yarn
+++ b/zsh/plugins/yarn/_yarn
@@ -86,7 +86,7 @@ _global_commands=(
 )
 
 _yarn_find_package_json() {
-  local dir=$(cd "$1" && pwd)
+  local dir=$(builtin cd "$1" && pwd)
 
   while true
   do
@@ -109,9 +109,9 @@ _yarn_commands_scripts() {
 
   if [[ -n $opt_args[--cwd] ]]; then
     packageJson=$(_yarn_find_package_json $opt_args[--cwd])
-    binaries=($(cd $opt_args[--cwd] && echo node_modules/.bin/*(x:t)))
+    binaries=($(builtin cd $opt_args[--cwd] && echo node_modules/.bin/*(x:t)))
   else
-    packageJson=$(_yarn_find_package_json $pwd)
+    packageJson=$(_yarn_find_package_json $PWD)
     binaries=($(echo node_modules/.bin/*(x:t)))
   fi
 
@@ -130,12 +130,12 @@ _yarn_scripts() {
   if [[ -n $_yarn_run_cwd ]]; then
     packageJson=$(_yarn_find_package_json $_yarn_run_cwd)
     if [[ -d "${_yarn_run_cwd}/node_modules" ]]; then
-      binaries=($(cd $_yarn_run_cwd && echo node_modules/.bin/*(x:t)))
+      binaries=($(builtin cd $_yarn_run_cwd && echo node_modules/.bin/*(x:t)))
     else
-      binaries=($(cd $_yarn_run_cwd && yarn bin | perl -wln -e 'm{^[^:]+: (\S+)$} and print $1'))
+      binaries=($(builtin cd $_yarn_run_cwd && yarn bin | perl -wln -e 'm{^[^:]+: (\S+)$} and print $1'))
     fi
   else
-    packageJson=$(_yarn_find_package_json $pwd)
+    packageJson=$(_yarn_find_package_json $PWD)
     if [[ -d node_modules ]]; then
       binaries=($(echo node_modules/.bin/*(x:t)))
     else
@@ -144,7 +144,7 @@ _yarn_scripts() {
   fi
 
   if [[ -n $packageJson ]]; then
-    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E '%r=%{decode_json($_)->{scripts}}; do{$k=$_;($e=$k)=~s/:/\\:/g; printf "$e:$r{$k}\n"} for sort keys %r')}")
+    scripts=("${(@f)$(cat ${packageJson} | perl -0777 -MJSON::PP -n -E 'binmode(STDOUT, ":encoding(UTF-8)"); %r=%{decode_json($_)->{scripts}}; do{$k=$_;($e=$k)=~s/:/\\:/g; printf "$e:$r{$k}\n"} for sort keys %r')}")
   fi
 
   commands=('env' $scripts $binaries)
diff --git a/zsh/plugins/yarn/yarn.plugin.zsh b/zsh/plugins/yarn/yarn.plugin.zsh
index bcb8661..5dd3296 100644
--- a/zsh/plugins/yarn/yarn.plugin.zsh
+++ b/zsh/plugins/yarn/yarn.plugin.zsh
@@ -17,17 +17,12 @@ alias yap="yarn add --peer"
 alias yb="yarn build"
 alias ycc="yarn cache clean"
 alias yd="yarn dev"
-alias yga="yarn global add"
-alias ygls="yarn global list"
-alias ygrm="yarn global remove"
-alias ygu="yarn global upgrade"
+alias yf="yarn format"
 alias yh="yarn help"
 alias yi="yarn init"
 alias yin="yarn install"
 alias yln="yarn lint"
 alias ylnf="yarn lint --fix"
-alias yls="yarn list"
-alias yout="yarn outdated"
 alias yp="yarn pack"
 alias yrm="yarn remove"
 alias yrun="yarn run"
@@ -35,10 +30,35 @@ alias ys="yarn serve"
 alias yst="yarn start"
 alias yt="yarn test"
 alias ytc="yarn test --coverage"
-alias yuc="yarn global upgrade && yarn cache clean"
 alias yui="yarn upgrade-interactive"
-alias yuil="yarn upgrade-interactive --latest"
 alias yup="yarn upgrade"
 alias yv="yarn version"
 alias yw="yarn workspace"
 alias yws="yarn workspaces"
+alias yy="yarn why"
+
+# Commands that are specific to the yarn version being used
+if zstyle -t ':omz:plugins:yarn' berry; then
+  # aliases that differ
+  alias yuil='yui' # --latest flag was removed in yarn berry
+  alias yii='yarn install --immutable'
+  alias yifl='yarn install --immutable'
+
+  # unique aliases
+  alias ydlx="yarn dlx"
+  alias yn="yarn node"
+else
+  # aliases that differ
+  alias yuil='yarn upgrade-interactive --latest'
+  alias yii='yarn install --frozen-lockfile'
+  alias yifl='yarn install --frozen-lockfile'
+
+  # unique aliases
+  alias yga="yarn global add"
+  alias ygls="yarn global list"
+  alias ygrm="yarn global remove"
+  alias ygu="yarn global upgrade"
+  alias yls="yarn list"
+  alias yout="yarn outdated"
+  alias yuca="yarn global upgrade && yarn cache clean"
+fi
diff --git a/zsh/plugins/yii2/README.md b/zsh/plugins/yii2/README.md
index 345b66e..e6c71f2 100644
--- a/zsh/plugins/yii2/README.md
+++ b/zsh/plugins/yii2/README.md
@@ -1,7 +1,7 @@
 # Yii2 autocomplete plugin
 
-* Adds autocomplete commands and subcommands for yii.
+Adds autocomplete commands and subcommands for [yii](https://www.yiiframework.com/).
 
 ## Requirements
 
-Autocomplete works from directory where your `yii` file contains.
+Autocomplete works from directory where your `yii` file is contained.
diff --git a/zsh/plugins/yum/README.md b/zsh/plugins/yum/README.md
index fec5849..162dcd5 100644
--- a/zsh/plugins/yum/README.md
+++ b/zsh/plugins/yum/README.md
@@ -22,6 +22,6 @@ plugins=(... yum)
 | yi    | `sudo yum install`                | Install package              |
 | ygi   | `sudo yum groupinstall`           | Install package group        |
 | yr    | `sudo yum remove`                 | Remove package               |
-| ygr   | `sudo yum groupremove`            | Remove pagage group          |
+| ygr   | `sudo yum groupremove`            | Remove package group         |
 | yrl   | `sudo yum remove --remove-leaves` | Remove package and leaves    |
 | yc    | `sudo yum clean all`              | Clean yum cache              |
diff --git a/zsh/plugins/z/LICENSE b/zsh/plugins/z/LICENSE
index d1cca7a..b36aeb4 100644
--- a/zsh/plugins/z/LICENSE
+++ b/zsh/plugins/z/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2018-2022 Alexandros Kozak
+Copyright (c) 2018-2025 Alexandros Kozak
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
diff --git a/zsh/plugins/z/MANUAL.md b/zsh/plugins/z/MANUAL.md
index dcca3c4..eddf787 100644
--- a/zsh/plugins/z/MANUAL.md
+++ b/zsh/plugins/z/MANUAL.md
@@ -1,14 +1,20 @@
 # Zsh-z
 
-Zsh-z is a command line tool that allows you to jump quickly to directories that you have visited frequently in the past, or recently -- but most often a combination of the two (a concept known as ["frecency"](https://en.wikipedia.org/wiki/Frecency)). It works by keeping track of when you go to directories and how much time you spend in them. It is then in the position to guess where you want to go when you type a partial string, e.g., `z src` might take you to `~/src/zsh`. `z zsh` might also get you there, and `z c/z` might prove to be even more specific -- it all depends on your habits and how much time you have been using Zsh-z to build up a database. After using Zsh-z for a little while, you will get to where you want to be by typing considerably less than you would need if you were using `cd`.
+[![MIT License](img/mit_license.svg)](https://opensource.org/licenses/MIT)
+![Zsh version 4.3.11 and higher](img/zsh_4.3.11_plus.svg)
+[![GitHub stars](https://img.shields.io/github/stars/agkozak/zsh-z.svg)](https://github.com/agkozak/zsh-z/stargazers)
 
-Zsh-z is a native Zsh port of [rupa/z](https://github.com/rupa/z), a tool written for `bash` and Zsh that uses embedded `awk` scripts to do the heavy lifting. It was quite possibly my most used command line tool for a couple of years. I decided to translate it, `awk` parts and all, into pure Zsh script, to see if by eliminating calls to external tools (`awk`, `sort`, `date`, `sed`, `mv`, `rm`, and `chown`) and reducing forking through subshells I could make it faster. The performance increase is impressive, particularly on systems where forking is slow, such as Cygwin, MSYS2, and WSL. I have found that, in those environments, switching directories using Zsh-z can be over 100% faster than it is using `rupa/z`.
+![Zsh-z demo](img/demo.gif)
 
-There is a noteworthy stability increase as well. Race conditions have always been a problem with `rupa/z`, and users of that utility will occasionally lose their `.z` databases. By having Zsh-z only use Zsh (`rupa/z` uses a hybrid shell code that works on `bash` as well), I have been able to implement a `zsh/system`-based file-locking mechanism similar to [the one @mafredri once proposed for `rupa/z`](https://github.com/rupa/z/pull/199). It is now nearly impossible to crash the database, even through extreme testing.
+Zsh-z is a command-line tool that allows you to jump quickly to directories that you have visited frequently or recently -- but most often a combination of the two (a concept known as ["frecency"](https://en.wikipedia.org/wiki/Frecency)). It works by keeping track of when you go to directories and how much time you spend in them. Based on this data, it predicts where you want to go when you type a partial string. For example, `z src` might take you to `~/src/zsh`. `z zsh` might also get you there, and `z c/z` might prove to be even more specific -- it all depends on your habits and how long you have been using Zsh-z to build up a database. After using Zsh-z for a little while, you will get to where you want to be by typing considerably less than you would need to if you were using `cd`.
 
-There are other, smaller improvements which I try to document in [Improvements and Fixes](#improvements-and-fixes). These include the new default behavior of sorting your tab completions by frecency rather than just letting Zsh sort the raw results alphabetically (a behavior which can be restored if you like it -- [see below](#settings)).
+Zsh-z is a native Zsh port of [`rupa/z`](https://github.com/rupa/z), a tool written for `bash` and Zsh that uses embedded `awk` scripts to do the heavy lifting. `rupa/z` was my most used command-line tool for a couple of years. I decided to translate it, `awk` parts and all, into pure Zsh script, to see if by eliminating calls to external tools (`awk`, `sort`, `date`, `sed`, `mv`, `rm`, and `chown`) and reducing forking through subshells I could make it faster. The performance increase is impressive, particularly on systems where forking is slow, such as Cygwin, MSYS2, and WSL. I have found that in those environments, switching directories using Zsh-z can be over 100% faster than it is using `rupa/z`.
 
-Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same database (`~/.z`), so you can go on using `rupa/z` when you launch `bash`.
+There is also a significant stability improvement. Race conditions have always been a problem with `rupa/z`, and users of that utility occasionally lose their `~/.z` databases. By having Zsh-z only use Zsh (`rupa/z` uses a hybrid shell code standard that works on `bash` as well), I have been able to implement a `zsh/system`-based file-locking mechanism similar to [the one @mafredri once proposed for `rupa/z`](https://github.com/rupa/z/pull/199). It is now nearly impossible to crash the database.
+
+There are other, smaller improvements which I document below in [Improvements and Fixes](#improvements-and-fixes). For instance, tab completions are now sorted by frecency by default rather than alphabetically (the latter behavior can be restored if you like it -- [see below](#settings)).
+
+Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same database (`~/.z`, or whatever database file you specify), so you can go on using `rupa/z` when you launch `bash`.
 
 ## Table of Contents
 - [News](#news)
@@ -28,6 +34,16 @@ Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same d
 <details>
     <summary>Here are the latest features and updates.</summary>
 
+- August 24, 2023
+    + Zsh-z will now run when `setopt NO_UNSET` has been enabled (props @ntninja).
+- August 23, 2023
+    + Better logic for loading `zsh/files` (props @z0rc).
+- August 2, 2023
+    + Zsh-z still uses the `zsh/files` module when possible but will fall back on the standard `chown`, `mv`, and `rm` commands in its absence.
+- April 27, 2023
+    + Zsh-z now allows the user to specify the directory-changing command using the `ZSHZ_CD` environment variable (default: `builtin cd`; props @basnijholt).
+- January 27, 2023
+    + If the database file directory specified by `ZSHZ_DATA` or `_Z_DATA` does not already exist, create it (props @mattmc3).
 - June 29, 2022
     + Zsh-z is less likely to leave temporary files sitting around (props @mafredri).
 - June 27, 2022
@@ -53,10 +69,10 @@ Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same d
     + Fixed the explanation string printed during completion so that it may be formatted with `zstyle`.
     + Zsh-z now declares `ZSHZ_EXCLUDE_DIRS` as an array with unique elements so that you do not have to.
 - July 29, 2021
-    + Temporarily disabling use of `print -v`, which seems to be mangling CJK multibyte strings.
+    + Temporarily disabling the use of `print -v`, which was mangling CJK multibyte strings.
 - July 27, 2021
     + Internal escaping of path names now works with older versions of ZSH.
-    + Zsh-z now detects and discards any incomplete or incorrectly formattted database entries.
+    + Zsh-z now detects and discards any incomplete or incorrectly formatted database entries.
 - July 10, 2021
     + Setting `ZSHZ_TRAILING_SLASH=1` makes it so that a search pattern ending in `/` can match the end of a path; e.g. `z foo/` can match `/path/to/foo`.
 - June 25, 2021
@@ -77,7 +93,7 @@ Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same d
 - January 11, 2021
     + Major refactoring of the code.
     + `z -lr` and `z -lt` work as expected.
-    + `EXTENDED_GLOB` has been disabled within the plugin to accomodate old-fashioned Windows directories with names such as `Progra~1`.
+    + `EXTENDED_GLOB` has been disabled within the plugin to accommodate old-fashioned Windows directories with names such as `Progra~1`.
     + Removed `zshelldoc` documentation.
 - January 6, 2021
     + I have corrected the frecency routine so that it matches `rupa/z`'s math, but for the present, Zsh-z will continue to display ranks as 1/10000th of what they are in `rupa/z` -- [they had to multiply theirs by 10000](https://github.com/rupa/z/commit/f1f113d9bae9effaef6b1e15853b5eeb445e0712) to work around `bash`'s inadequacies at dealing with decimal fractions.
@@ -86,7 +102,7 @@ Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same d
 - December 22, 2020
     + `ZSHZ_CASE`: when set to `ignore`, pattern matching is case-insensitive; when set to `smart`, patterns are matched case-insensitively when they are all lowercase and case-sensitively when they have uppercase characters in them (a behavior very much like Vim's `smartcase` setting).
     + `ZSHZ_KEEP_DIRS` is an array of directory names that should not be removed from the database, even if they are not currently available (useful when a drive is not always mounted).
-    + Symlinked datafiles were having their symlinks overwritten; this bug has been fixed.
+    + Symlinked database files were having their symlinks overwritten; this bug has been fixed.
 
 </details>
 
@@ -94,15 +110,15 @@ Zsh-z is a drop-in replacement for `rupa/z` and will, by default, use the same d
 
 ### General observations
 
-This script can be installed simply by downloading it and sourcing it from your `.zshrc`:
+This plugin can be installed simply by putting the various files in a directory together and by sourcing `zsh-z.plugin.zsh` in your `.zshrc`:
 
     source /path/to/zsh-z.plugin.zsh
 
-For tab completion to work, you will want to have loaded `compinit`. The frameworks handle this themselves. If you are not using a framework, put
+For tab completion to work, `_zshz` *must* be in the same directory as `zsh-z.plugin.zsh`, and you will want to have loaded `compinit`. The frameworks handle this themselves. If you are not using a framework, put
 
-    autoload -U compinit && compinit
+    autoload -U compinit; compinit
 
-in your .zshrc somewhere below where you source `zsh-z.plugin.zsh`.
+in your `.zshrc` somewhere below where you source `zsh-z.plugin.zsh`.
 
 If you add
 
@@ -118,13 +134,19 @@ Add the line
 
 to your `.zshrc`, somewhere above the line that says `antigen apply`.
 
-### For [oh-my-zsh](http://ohmyz.sh/) users
+### For [Oh My Zsh](http://ohmyz.sh/) users
 
-Execute the following command:
+Zsh-z is now included as part of Oh My Zsh! As long as you are using an up-to-date installation of Oh My Zsh, you can activate Zsh-z simply by adding `z` to your `plugins` array in your `.zshrc`, e.g.,
+
+    plugins=( git z )
+
+It is as simple as that.
+
+If, however, you prefer always to use the latest version of Zsh-z from the `agkozak/zsh-z` repo, you may install it thus:
 
     git clone https://github.com/agkozak/zsh-z ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-z
 
-and add `zsh-z` to the line of your `.zshrc` that specifies `plugins=()`, e.g., `plugins=( git zsh-z )`.
+and activate it by adding `zsh-z` to the line of your `.zshrc` that specifies `plugins=()`, e.g., `plugins=( git zsh-z )`.
 
 ### For [prezto](https://github.com/sorin-ionescu/prezto) users
 
@@ -206,7 +228,7 @@ Add the line
 
 to your `.zshrc`.
 
-`zsh-z` supports `zinit`'s `unload` feature; just run `zinit unload agkozak/zshz` to restore the shell to its state before `zsh-z` was loaded.
+Zsh-z supports `zinit`'s `unload` feature; just run `zinit unload agkozak/zsh-z` to restore the shell to its state before Zsh-z was loaded.
 
 ### For [Znap](https://github.com/marlonrichert/zsh-snap) users
 
@@ -227,7 +249,7 @@ somewhere above the line that says `zplug load`. Then run
     zplug install
     zplug load
 
-to install `zsh-z`.
+to install Zsh-z.
 
 ## Command Line Options
 
@@ -241,11 +263,12 @@ to install `zsh-z`.
 - `-x`    Remove a directory (by default, the current directory) from the database
 - `-xR`   Remove a directory (by default, the current directory) and its subdirectories from the database
 
-# Settings
+## Settings
 
-Zsh-z has environment variables (they all begin with `ZSHZ_`) that change its behavior if you set them; you can also keep your old ones if you have been using `rupa/z` (they begin with `_Z_`).
+Zsh-z has environment variables (they all begin with `ZSHZ_`) that change its behavior if you set them. You can also keep your old ones if you have been using `rupa/z` (whose environment variables begin with `_Z_`).
 
 * `ZSHZ_CMD` changes the command name (default: `z`)
+* `ZSHZ_CD` specifies the default directory-changing command (default: `builtin cd`)
 * `ZSHZ_COMPLETION` can be `'frecent'` (default) or `'legacy'`, depending on whether you want your completion results sorted according to frecency or simply sorted alphabetically
 * `ZSHZ_DATA` changes the database file (default: `~/.z`)
 * `ZSHZ_ECHO` displays the new path name when changing directories (default: `0`)
@@ -301,19 +324,18 @@ A good example might involve a directory tree that has Git repositories within i
 
 (As a Zsh user, I tend to use `**` instead of `find`, but it is good to see how deep your directory trees go before doing that.)
 
-
 ## Other Improvements and Fixes
 
 * `z -x` works, with the help of `chpwd_functions`.
-* Zsh-z works on Solaris.
+* Zsh-z is compatible with Solaris.
 * Zsh-z uses the "new" `zshcompsys` completion system instead of the old `compctl` one.
-* There is no error message when the database file has not yet been created.
-* There is support for special characters (e.g., `[`) in directory names.
-* If `z -l` only returns one match, a common root is not printed.
-* Exit status codes increasingly make sense.
-* Completions work with options `-c`, `-r`, and `-t`.
-* If `~/foo` and `~/foob` are matches, `~/foo` is *not* the common root. Only a common parent directory can be a common root.
-* `z -x` and the new, recursive `z -xR` can take an argument so that you can remove directories other than `PWD` from the database.
+* No error message is displayed when the database file has not yet been created.
+* Special characters (e.g., `[`) in directory names are now supported.
+* If `z -l` returns only one match, a common root is not printed.
+* Exit status codes are more logical.
+* Completions now work with options `-c`, `-r`, and `-t`.
+* If `~/foo` and `~/foob` are matches, `~/foo` is no longer considered the common root. Only a common parent directory can be a common root.
+* `z -x` and the new, recursive `z -xR` can now accept an argument so that you can remove directories other than `PWD` from the database.
 
 ## Migrating from Other Tools
 
@@ -335,7 +357,7 @@ the line
 
 That will re-bind `z` or the command of your choice to the underlying Zsh-z function.
 
-## Known Bugs
+## Known Bug
 It is possible to run a completion on a string with spaces in it, e.g., `z us bi<TAB>` might take you to `/usr/local/bin`. This works, but as things stand, after the completion the command line reads
 
     z us /usr/local/bin.
diff --git a/zsh/plugins/z/Makefile b/zsh/plugins/z/Makefile
deleted file mode 100644
index dcf433d..0000000
--- a/zsh/plugins/z/Makefile
+++ /dev/null
@@ -1,4 +0,0 @@
-readme:
-	@groff -man -Tascii z.1 | col -bx
-
-.PHONY: readme
diff --git a/zsh/plugins/z/README b/zsh/plugins/z/README
deleted file mode 100644
index 47e54c5..0000000
--- a/zsh/plugins/z/README
+++ /dev/null
@@ -1,148 +0,0 @@
-Z(1)                             User Commands                            Z(1)
-
-
-
-NAME
-       z - jump around
-
-SYNOPSIS
-       z [-chlrtx] [regex1 regex2 ... regexn]
-
-AVAILABILITY
-       bash, zsh
-
-DESCRIPTION
-       Tracks your most used directories, based on 'frecency'.
-
-       After  a  short  learning  phase, z will take you to the most 'frecent'
-       directory that matches ALL of the regexes given on the command line, in
-       order.
-
-       For example, z foo bar would match /foo/bar but not /bar/foo.
-
-OPTIONS
-       -c     restrict matches to subdirectories of the current directory
-
-       -e     echo the best match, don't cd
-
-       -h     show a brief help message
-
-       -l     list only
-
-       -r     match by rank only
-
-       -t     match by recent access only
-
-       -x     remove the current directory from the datafile
-
-EXAMPLES
-       z foo         cd to most frecent dir matching foo
-
-       z foo bar     cd to most frecent dir matching foo, then bar
-
-       z -r foo      cd to highest ranked dir matching foo
-
-       z -t foo      cd to most recently accessed dir matching foo
-
-       z -l foo      list all dirs matching foo (by frecency)
-
-NOTES
-   Installation:
-       Put something like this in your $HOME/.bashrc or $HOME/.zshrc:
-
-              . /path/to/z.sh
-
-       cd around for a while to build up the db.
-
-       PROFIT!!
-
-       Optionally:
-              Set $_Z_CMD to change the command name (default z).
-              Set $_Z_DATA to change the datafile (default $HOME/.z).
-              Set  $_Z_MAX_SCORE  lower  to  age  entries  out faster (default
-              9000).
-              Set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
-              Set $_Z_NO_PROMPT_COMMAND to handle PROMPT_COMMAND/precmd  your-
-              self.
-              Set $_Z_EXCLUDE_DIRS to an array of directory trees to  exclude.
-              Set $_Z_OWNER to allow usage when in 'sudo -s' mode.
-              (These  settings  should  go  in  .bashrc/.zshrc before the line
-              added above.)
-              Install the provided man page z.1  somewhere  in  your  MANPATH,
-              like /usr/local/man/man1.
-
-   Aging:
-       The rank of directories maintained by z undergoes aging based on a sim-
-       ple formula. The rank of each entry is incremented  every  time  it  is
-       accessed.  When the sum of ranks is over 9000, all ranks are multiplied
-       by 0.99. Entries with a rank lower than 1 are forgotten.
-
-   Frecency:
-       Frecency is a portmanteau of 'recent' and 'frequency'. It is a weighted
-       rank  that depends on how often and how recently something occurred. As
-       far as I know, Mozilla came up with the term.
-
-       To z, a directory that has low ranking but has been  accessed  recently
-       will  quickly  have  higher rank than a directory accessed frequently a
-       long time ago.
-
-       Frecency is determined at runtime.
-
-   Common:
-       When multiple directories match all queries, and they all have a common
-       prefix, z will cd to the shortest matching directory, without regard to
-       priority.  This has been in effect, if  undocumented,  for  quite  some
-       time, but should probably be configurable or reconsidered.
-
-   Tab Completion:
-       z  supports tab completion. After any number of arguments, press TAB to
-       complete on directories that match each argument. Due to limitations of
-       the  completion  implementations,  only  the last argument will be com-
-       pleted in the shell.
-
-       Internally, z decides you've requested a completion if the  last  argu-
-       ment  passed  is  an  absolute  path to an existing directory. This may
-       cause unexpected behavior if the last argument to z begins with /.
-
-ENVIRONMENT
-       A function _z() is defined.
-
-       The contents of the variable $_Z_CMD is aliased to _z 2>&1. If not set,
-       $_Z_CMD defaults to z.
-
-       The  environment  variable $_Z_DATA can be used to control the datafile
-       location. If it is not defined, the location defaults to $HOME/.z.
-
-       The environment variable $_Z_NO_RESOLVE_SYMLINKS can be set to  prevent
-       resolving  of  symlinks.  If  it  is  not  set,  symbolic links will be
-       resolved when added to the datafile.
-
-       In bash, z appends a command to the PROMPT_COMMAND environment variable
-       to maintain its database. In zsh, z appends a function _z_precmd to the
-       precmd_functions array.
-
-       The environment variable $_Z_NO_PROMPT_COMMAND can be set if  you  want
-       to handle PROMPT_COMMAND or precmd yourself.
-
-       The  environment  variable  $_Z_EXCLUDE_DIRS  can be set to an array of
-       directory trees to exclude from tracking.  $HOME  is  always  excluded.
-       Directories must be full paths without trailing slashes.
-
-       The  environment  variable  $_Z_OWNER  can  be set to your username, to
-       allow usage of z when your sudo environment keeps $HOME set.
-
-FILES
-       Data is stored in $HOME/.z. This  can  be  overridden  by  setting  the
-       $_Z_DATA  environment variable. When initialized, z will raise an error
-       if this path is a directory, and not function correctly.
-
-       A man page (z.1) is provided.
-
-SEE ALSO
-       regex(7), pushd, popd, autojump, cdargs
-
-       Please file bugs at https://github.com/rupa/z/
-
-
-
-z                                January 2013                             Z(1)
diff --git a/zsh/plugins/z/_z b/zsh/plugins/z/_z
index 9891a52..a493f35 100644
--- a/zsh/plugins/z/_z
+++ b/zsh/plugins/z/_z
@@ -5,7 +5,7 @@
 #
 # https://github.com/agkozak/zsh-z
 #
-# Copyright (c) 2018-2022 Alexandros Kozak
+# Copyright (c) 2018-2023 Alexandros Kozak
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
diff --git a/zsh/plugins/z/img/demo.gif b/zsh/plugins/z/img/demo.gif
new file mode 100644
index 0000000..247f52f
Binary files /dev/null and b/zsh/plugins/z/img/demo.gif differ
diff --git a/zsh/plugins/z/img/mit_license.svg b/zsh/plugins/z/img/mit_license.svg
new file mode 100644
index 0000000..1c02079
--- /dev/null
+++ b/zsh/plugins/z/img/mit_license.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="78" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="78" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h47v20H0z"/><path fill="#97CA00" d="M47 0h31v20H47z"/><path fill="url(#b)" d="M0 0h78v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="245" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="370">license</text><text x="245" y="140" transform="scale(.1)" textLength="370">license</text><text x="615" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="210">MIT</text><text x="615" y="140" transform="scale(.1)" textLength="210">MIT</text></g> </svg>
\ No newline at end of file
diff --git a/zsh/plugins/z/img/zsh_4.3.11_plus.svg b/zsh/plugins/z/img/zsh_4.3.11_plus.svg
new file mode 100644
index 0000000..f46d947
--- /dev/null
+++ b/zsh/plugins/z/img/zsh_4.3.11_plus.svg
@@ -0,0 +1 @@
+<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" width="84" height="20"><linearGradient id="b" x2="0" y2="100%"><stop offset="0" stop-color="#bbb" stop-opacity=".1"/><stop offset="1" stop-opacity=".1"/></linearGradient><clipPath id="a"><rect width="84" height="20" rx="3" fill="#fff"/></clipPath><g clip-path="url(#a)"><path fill="#555" d="M0 0h29v20H0z"/><path fill="#e05d44" d="M29 0h55v20H29z"/><path fill="url(#b)" d="M0 0h84v20H0z"/></g><g fill="#fff" text-anchor="middle" font-family="DejaVu Sans,Verdana,Geneva,sans-serif" font-size="110"><text x="155" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="190">zsh</text><text x="155" y="140" transform="scale(.1)" textLength="190">zsh</text><text x="555" y="150" fill="#010101" fill-opacity=".3" transform="scale(.1)" textLength="450">4.3.11+</text><text x="555" y="140" transform="scale(.1)" textLength="450">4.3.11+</text></g> </svg>
\ No newline at end of file
diff --git a/zsh/plugins/z/z.1 b/zsh/plugins/z/z.1
deleted file mode 100644
index 182f981..0000000
--- a/zsh/plugins/z/z.1
+++ /dev/null
@@ -1,173 +0,0 @@
-.TH "Z" "1" "January 2013" "z" "User Commands"
-.SH
-NAME
-z \- jump around
-.SH
-SYNOPSIS
-z [\-chlrtx] [regex1 regex2 ... regexn]
-.SH
-AVAILABILITY
-bash, zsh
-.SH
-DESCRIPTION
-Tracks your most used directories, based on 'frecency'.
-.P
-After a short learning phase, \fBz\fR will take you to the most 'frecent'
-directory that matches ALL of the regexes given on the command line, in order.
-
-For example, \fBz foo bar\fR would match \fB/foo/bar\fR but not \fB/bar/foo\fR.
-.SH
-OPTIONS
-.TP
-\fB\-c\fR
-restrict matches to subdirectories of the current directory
-.TP
-\fB\-e\fR
-echo the best match, don't cd
-.TP
-\fB\-h\fR
-show a brief help message
-.TP
-\fB\-l\fR
-list only
-.TP
-\fB\-r\fR
-match by rank only
-.TP
-\fB\-t\fR
-match by recent access only
-.TP
-\fB\-x\fR
-remove the current directory from the datafile
-.SH EXAMPLES
-.TP 14
-\fBz foo\fR
-cd to most frecent dir matching foo
-.TP 14
-\fBz foo bar\fR
-cd to most frecent dir matching foo, then bar
-.TP 14
-\fBz -r foo\fR
-cd to highest ranked dir matching foo
-.TP 14
-\fBz -t foo\fR
-cd to most recently accessed dir matching foo
-.TP 14
-\fBz -l foo\fR
-list all dirs matching foo (by frecency)
-.SH
-NOTES
-.SS
-Installation:
-.P
-Put something like this in your \fB$HOME/.bashrc\fR or \fB$HOME/.zshrc\fR:
-.RS
-.P
-\fB. /path/to/z.sh\fR
-.RE
-.P
-\fBcd\fR around for a while to build up the db.
-.P
-PROFIT!!
-.P
-Optionally:
-.RS
-Set \fB$_Z_CMD\fR to change the command name (default \fBz\fR).
-.RE
-.RS
-Set \fB$_Z_DATA\fR to change the datafile (default \fB$HOME/.z\fR).
-.RE
-.RS
-Set \fB$_Z_MAX_SCORE\fR lower to age entries out faster (default \fB9000\fR).
-.RE
-.RS
-Set \fB$_Z_NO_RESOLVE_SYMLINKS\fR to prevent symlink resolution.
-.RE
-.RS
-Set \fB$_Z_NO_PROMPT_COMMAND\fR to handle \fBPROMPT_COMMAND/precmd\fR yourself.
-.RE
-.RS
-Set \fB$_Z_EXCLUDE_DIRS\fR to an array of directory trees to exclude.
-.RE
-.RS
-Set \fB$_Z_OWNER\fR to allow usage when in 'sudo -s' mode.
-.RE
-.RS
-(These settings should go in .bashrc/.zshrc before the line added above.)
-.RE
-.RS
-Install the provided man page \fBz.1\fR somewhere in your \f$MANPATH, like
-\fB/usr/local/man/man1\fR.
-.RE
-.SS
-Aging:
-The rank of directories maintained by \fBz\fR undergoes aging based on a simple
-formula. The rank of each entry is incremented every time it is accessed. When
-the sum of ranks is over 9000, all ranks are multiplied by 0.99. Entries with a
-rank lower than 1 are forgotten.
-.SS
-Frecency:
-Frecency is a portmanteau of 'recent' and 'frequency'. It is a weighted rank
-that depends on how often and how recently something occurred. As far as I
-know, Mozilla came up with the term.
-.P
-To \fBz\fR, a directory that has low ranking but has been accessed recently
-will quickly have higher rank than a directory accessed frequently a long time
-ago.
-.P
-Frecency is determined at runtime.
-.SS
-Common:
-When multiple directories match all queries, and they all have a common prefix,
-\fBz\fR will cd to the shortest matching directory, without regard to priority.
-This has been in effect, if undocumented, for quite some time, but should
-probably be configurable or reconsidered.
-.SS
-Tab Completion:
-\fBz\fR supports tab completion. After any number of arguments, press TAB to
-complete on directories that match each argument. Due to limitations of the
-completion implementations, only the last argument will be completed in the
-shell.
-.P
-Internally, \fBz\fR decides you've requested a completion if the last argument
-passed is an absolute path to an existing directory. This may cause unexpected
-behavior if the last argument to \fBz\fR begins with \fB/\fR.
-.SH
-ENVIRONMENT
-A function \fB_z()\fR is defined.
-.P
-The contents of the variable \fB$_Z_CMD\fR is aliased to \fB_z 2>&1\fR. If not
-set, \fB$_Z_CMD\fR defaults to \fBz\fR.
-.P
-The environment variable \fB$_Z_DATA\fR can be used to control the datafile
-location. If it is not defined, the location defaults to \fB$HOME/.z\fR.
-.P
-The environment variable \fB$_Z_NO_RESOLVE_SYMLINKS\fR can be set to prevent
-resolving of symlinks. If it is not set, symbolic links will be resolved when
-added to the datafile.
-.P
-In bash, \fBz\fR appends a command to the \fBPROMPT_COMMAND\fR environment
-variable to maintain its database. In zsh, \fBz\fR appends a function
-\fB_z_precmd\fR to the \fBprecmd_functions\fR array.
-.P
-The environment variable \fB$_Z_NO_PROMPT_COMMAND\fR can be set if you want to
-handle \fBPROMPT_COMMAND\fR or \fBprecmd\fR yourself.
-.P
-The environment variable \fB$_Z_EXCLUDE_DIRS\fR can be set to an array of
-directory trees to exclude from tracking. \fB$HOME\fR is always excluded.
-Directories must be full paths without trailing slashes.
-.P
-The environment variable \fB$_Z_OWNER\fR can be set to your username, to
-allow usage of \fBz\fR when your sudo environment keeps \fB$HOME\fR set.
-.SH
-FILES
-Data is stored in \fB$HOME/.z\fR. This can be overridden by setting the
-\fB$_Z_DATA\fR environment variable. When initialized, \fBz\fR will raise an
-error if this path is a directory, and not function correctly.
-.P
-A man page (\fBz.1\fR) is provided.
-.SH
-SEE ALSO
-regex(7), pushd, popd, autojump, cdargs
-.P
-Please file bugs at https://github.com/rupa/z/
diff --git a/zsh/plugins/z/z.plugin.zsh b/zsh/plugins/z/z.plugin.zsh
index 209edfe..39b8322 100644
--- a/zsh/plugins/z/z.plugin.zsh
+++ b/zsh/plugins/z/z.plugin.zsh
@@ -4,7 +4,7 @@
 #
 # https://github.com/agkozak/zsh-z
 #
-# Copyright (c) 2018-2022 Alexandros Kozak
+# Copyright (c) 2018-2025 Alexandros Kozak
 #
 # Permission is hereby granted, free of charge, to any person obtaining a copy
 # of this software and associated documentation files (the "Software"), to deal
@@ -52,6 +52,7 @@
 #   ZSHZ_CASE -> if `ignore', pattern matching is case-insensitive; if `smart',
 #     pattern matching is case-insensitive only when the pattern is all
 #     lowercase
+#   ZSHZ_CD -> the directory-changing command that is used (default: builtin cd)
 #   ZSHZ_CMD -> name of command (default: z)
 #   ZSHZ_COMPLETION -> completion method (default: 'frecent'; 'legacy' for
 #     alphabetic sorting)
@@ -99,20 +100,29 @@ With no ARGUMENT, list the directory history in ascending rank.
 }
 
 # Load zsh/datetime module, if necessary
-(( $+EPOCHSECONDS )) || zmodload zsh/datetime
-
-# Load zsh/files, if necessary
-[[ ${builtins[zf_chown]} == 'defined' &&
-   ${builtins[zf_mv]}    == 'defined' &&
-   ${builtins[zf_rm]}    == 'defined' ]] ||
-  zmodload -F zsh/files b:zf_chown b:zf_mv b:zf_rm
-
-# Load zsh/system, if necessary
-[[ ${modules[zsh/system]} == 'loaded' ]] || zmodload zsh/system &> /dev/null
+(( ${+EPOCHSECONDS} )) || zmodload zsh/datetime
 
 # Global associative array for internal use
 typeset -gA ZSHZ
 
+# Fallback utilities in case Zsh lacks zsh/files (as is the case with MobaXterm)
+ZSHZ[CHOWN]='chown'
+ZSHZ[MV]='mv'
+ZSHZ[RM]='rm'
+# Try to load zsh/files utilities
+if [[ ${builtins[zf_chown]-} != 'defined' ||
+      ${builtins[zf_mv]-}    != 'defined' ||
+      ${builtins[zf_rm]-}    != 'defined' ]]; then
+  zmodload -F zsh/files b:zf_chown b:zf_mv b:zf_rm &> /dev/null
+fi
+# Use zsh/files, if it is available
+[[ ${builtins[zf_chown]-} == 'defined' ]] && ZSHZ[CHOWN]='zf_chown'
+[[ ${builtins[zf_mv]-} == 'defined' ]] && ZSHZ[MV]='zf_mv'
+[[ ${builtins[zf_rm]-} == 'defined' ]] && ZSHZ[RM]='zf_rm'
+
+# Load zsh/system, if necessary
+[[ ${modules[zsh/system]-} == 'loaded' ]] || zmodload zsh/system &> /dev/null
+
 # Make sure ZSHZ_EXCLUDE_DIRS has been declared so that other scripts can
 # simply append to it
 (( ${+ZSHZ_EXCLUDE_DIRS} )) || typeset -gUa ZSHZ_EXCLUDE_DIRS
@@ -129,6 +139,7 @@ is-at-least 5.3.0 && ZSHZ[PRINTV]=1
 # Globals:
 #   ZSHZ
 #   ZSHZ_CASE
+#   ZSHZ_CD
 #   ZSHZ_COMPLETION
 #   ZSHZ_DATA
 #   ZSHZ_DEBUG
@@ -143,15 +154,25 @@ is-at-least 5.3.0 && ZSHZ[PRINTV]=1
 zshz() {
 
   # Don't use `emulate -L zsh' - it breaks PUSHD_IGNORE_DUPS
-  setopt LOCAL_OPTIONS NO_KSH_ARRAYS NO_SH_WORD_SPLIT EXTENDED_GLOB
+  setopt LOCAL_OPTIONS NO_KSH_ARRAYS NO_SH_WORD_SPLIT EXTENDED_GLOB UNSET
   (( ZSHZ_DEBUG )) && setopt LOCAL_OPTIONS WARN_CREATE_GLOBAL
 
   local REPLY
   local -a lines
 
-  # Allow the user to specify the datafile name in $ZSHZ_DATA (default: ~/.z)
+  # Allow the user to specify a custom datafile in $ZSHZ_DATA (or legacy $_Z_DATA)
+  local custom_datafile="${ZSHZ_DATA:-$_Z_DATA}"
+
+  # If a datafile was provided as a standalone file without a directory path
+  # print a warning and exit
+  if [[ -n ${custom_datafile} && ${custom_datafile} != */* ]]; then
+    print "ERROR: You configured a custom Zsh-z datafile (${custom_datafile}), but have not specified its directory." >&2
+    exit
+  fi
+
+  # If the user specified a datafile, use that or default to ~/.z
   # If the datafile is a symlink, it gets dereferenced
-  local datafile=${${ZSHZ_DATA:-${_Z_DATA:-${HOME}/.z}}:A}
+  local datafile=${${custom_datafile:-$HOME/.z}:A}
 
   # If the datafile is a directory, print a warning and exit
   if [[ -d $datafile ]]; then
@@ -161,7 +182,7 @@ zshz() {
 
   # Make sure that the datafile exists before attempting to read it or lock it
   # for writing
-  [[ -f $datafile ]] || touch "$datafile"
+  [[ -f $datafile ]] || { mkdir -p "${datafile:h}" && touch "$datafile" }
 
   # Bail if we don't own the datafile and $ZSHZ_OWNER is not set
   [[ -z ${ZSHZ_OWNER:-${_Z_OWNER}} && -f $datafile && ! -O $datafile ]] &&
@@ -265,7 +286,7 @@ zshz() {
 
     if (( ret != 0 )); then
       # Avoid clobbering the datafile if the write to tempfile failed
-      zf_rm -f "$tempfile"
+      ${ZSHZ[RM]} -f "$tempfile"
       return $ret
     fi
 
@@ -273,16 +294,26 @@ zshz() {
     owner=${ZSHZ_OWNER:-${_Z_OWNER}}
 
     if (( ZSHZ[USE_FLOCK] )); then
-      zf_mv "$tempfile" "$datafile" 2> /dev/null || zf_rm -f "$tempfile"
+      # An unsual case: if inside Docker container where datafile could be bind
+      # mounted
+      if [[ -r '/proc/1/cgroup' && "$(< '/proc/1/cgroup')" == *docker* ]]; then
+        print "$(< "$tempfile")" > "$datafile" 2> /dev/null
+        ${ZSHZ[RM]} -f "$tempfile"
+      # All other cases
+      else
+        ${ZSHZ[MV]} "$tempfile" "$datafile" 2> /dev/null ||
+            ${ZSHZ[RM]} -f "$tempfile"
+      fi
 
       if [[ -n $owner ]]; then
-        zf_chown ${owner}:"$(id -ng ${owner})" "$datafile"
+        ${ZSHZ[CHOWN]} ${owner}:"$(id -ng ${owner})" "$datafile"
       fi
     else
       if [[ -n $owner ]]; then
-        zf_chown "${owner}":"$(id -ng "${owner}")" "$tempfile"
+        ${ZSHZ[CHOWN]} "${owner}":"$(id -ng "${owner}")" "$tempfile"
       fi
-      zf_mv -f "$tempfile" "$datafile" 2> /dev/null || zf_rm -f "$tempfile"
+      ${ZSHZ[MV]} -f "$tempfile" "$datafile" 2> /dev/null ||
+          ${ZSHZ[RM]} -f "$tempfile"
     fi
 
     # In order to make z -x work, we have to disable zsh-z's adding
@@ -294,7 +325,7 @@ zshz() {
   }
 
   ############################################################
-  # Read the curent datafile contents, update them, "age" them
+  # Read the current datafile contents, update them, "age" them
   # when the total rank gets high enough, and print the new
   # contents to STDOUT.
   #
@@ -620,7 +651,7 @@ zshz() {
         *)
           # Frecency routine
           (( dx = EPOCHSECONDS - time_field ))
-          rank=$(( 10000 * rank_field * (3.75/((0.0001 * dx + 1) + 0.25)) ))
+          rank=$(( 10000 * rank_field * (3.75/( (0.0001 * dx + 1) + 0.25)) ))
           ;;
       esac
 
@@ -756,6 +787,26 @@ zshz() {
     [[ $output_format != 'completion' ]] && output_format='list'
   }
 
+  #########################################################
+  # Allow the user to specify directory-changing command
+  # using $ZSHZ_CD (default: builtin cd).
+  #
+  # Globals:
+  #   ZSHZ_CD
+  #
+  # Arguments:
+  #   $* Path
+  #########################################################
+  zshz_cd() {
+    setopt LOCAL_OPTIONS NO_WARN_CREATE_GLOBAL
+
+    if [[ -z $ZSHZ_CD ]]; then
+      builtin cd "$*"
+    else
+      ${=ZSHZ_CD} "$*"
+    fi
+  }
+
   #########################################################
   # If $ZSHZ_ECHO == 1, display paths as you jump to them.
   # If it is also the case that $ZSHZ_TILDE == 1, display
@@ -773,7 +824,7 @@ zshz() {
 
   if [[ ${@: -1} == /* ]] && (( ! $+opts[-e] && ! $+opts[-l] )); then
     # cd if possible; echo the new path if $ZSHZ_ECHO == 1
-    [[ -d ${@: -1} ]] && builtin cd ${@: -1} && _zshz_echo && return
+    [[ -d ${@: -1} ]] && zshz_cd ${@: -1} && _zshz_echo && return
   fi
 
   # With option -c, make sure query string matches beginning of matches;
@@ -830,12 +881,12 @@ zshz() {
       print -- "$cd"
     else
       # cd if possible; echo the new path if $ZSHZ_ECHO == 1
-      [[ -d $cd ]] && builtin cd "$cd" && _zshz_echo
+      [[ -d $cd ]] && zshz_cd "$cd" && _zshz_echo
     fi
   else
     # if $req is a valid path, cd to it; echo the new path if $ZSHZ_ECHO == 1
     if ! (( $+opts[-e] || $+opts[-l] )) && [[ -d $req ]]; then
-      builtin cd "$req" && _zshz_echo
+      zshz_cd "$req" && _zshz_echo
     else
       return $ret2
     fi
@@ -852,6 +903,9 @@ alias ${ZSHZ_CMD:-${_Z_CMD:-z}}='zshz 2>&1'
 #   ZSHZ
 ############################################################
 _zshz_precmd() {
+  # Protect against `setopt NO_UNSET'
+  setopt LOCAL_OPTIONS UNSET
+
   # Do not add PWD to datafile when in HOME directory, or
   # if `z -x' has just been run
   [[ $PWD == "$HOME" ]] || (( ZSHZ[DIRECTORY_REMOVED] )) && return
@@ -899,10 +953,10 @@ add-zsh-hook chpwd _zshz_chpwd
 # Completion
 ############################################################
 
-# Standarized $0 handling
-# (See https://github.com/agkozak/Zsh-100-Commits-Club/blob/master/Zsh-Plugin-Standard.adoc)
-0=${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}
-0=${${(M)0:#/*}:-$PWD/$0}
+# Standardized $0 handling
+# https://zdharma-continuum.github.io/Zsh-100-Commits-Club/Zsh-Plugin-Standard.html
+0="${${ZERO:-${0:#$ZSH_ARGZERO}}:-${(%):-%N}}"
+0="${${(M)0:#/*}:-$PWD/$0}"
 
 (( ${fpath[(ie)${0:A:h}]} <= ${#fpath} )) || fpath=( "${0:A:h}" "${fpath[@]}" )
 
@@ -926,7 +980,7 @@ ZSHZ[FUNCTIONS]='_zshz_usage
 # Enable WARN_NESTED_VAR for functions listed in
 #   ZSHZ[FUNCTIONS]
 ############################################################
-(( ZSHZ_DEBUG )) && () {
+(( ${+ZSHZ_DEBUG} )) && () {
   if is-at-least 5.4.0; then
     local x
     for x in ${=ZSHZ[FUNCTIONS]}; do
diff --git a/zsh/plugins/z/z.sh b/zsh/plugins/z/z.sh
deleted file mode 100644
index 67f504e..0000000
--- a/zsh/plugins/z/z.sh
+++ /dev/null
@@ -1,267 +0,0 @@
-# Copyright (c) 2009 rupa deadwyler. Licensed under the WTFPL license, Version 2
-
-# maintains a jump-list of the directories you actually use
-#
-# INSTALL:
-#     * put something like this in your .bashrc/.zshrc:
-#         . /path/to/z.sh
-#     * cd around for a while to build up the db
-#     * PROFIT!!
-#     * optionally:
-#         set $_Z_CMD in .bashrc/.zshrc to change the command (default z).
-#         set $_Z_DATA in .bashrc/.zshrc to change the datafile (default ~/.z).
-#         set $_Z_MAX_SCORE lower to age entries out faster (default 9000).
-#         set $_Z_NO_RESOLVE_SYMLINKS to prevent symlink resolution.
-#         set $_Z_NO_PROMPT_COMMAND if you're handling PROMPT_COMMAND yourself.
-#         set $_Z_EXCLUDE_DIRS to an array of directories to exclude.
-#         set $_Z_OWNER to your username if you want use z while sudo with $HOME kept
-#
-# USE:
-#     * z foo     # cd to most frecent dir matching foo
-#     * z foo bar # cd to most frecent dir matching foo and bar
-#     * z -r foo  # cd to highest ranked dir matching foo
-#     * z -t foo  # cd to most recently accessed dir matching foo
-#     * z -l foo  # list matches instead of cd
-#     * z -e foo  # echo the best match, don't cd
-#     * z -c foo  # restrict matches to subdirs of $PWD
-#     * z -x      # remove the current directory from the datafile
-#     * z -h      # show a brief help message
-
-[ -d "${_Z_DATA:-$HOME/.z}" ] && {
-    echo "ERROR: z.sh's datafile (${_Z_DATA:-$HOME/.z}) is a directory."
-}
-
-_z() {
-
-    local datafile="${_Z_DATA:-$HOME/.z}"
-
-    # if symlink, dereference
-    [ -h "$datafile" ] && datafile=$(readlink "$datafile")
-
-    # bail if we don't own ~/.z and $_Z_OWNER not set
-    [ -z "$_Z_OWNER" -a -f "$datafile" -a ! -O "$datafile" ] && return
-
-    _z_dirs () {
-        [ -f "$datafile" ] || return
-
-        local line
-        while read line; do
-            # only count directories
-            [ -d "${line%%\|*}" ] && echo "$line"
-        done < "$datafile"
-        return 0
-    }
-
-    # add entries
-    if [ "$1" = "--add" ]; then
-        shift
-
-        # $HOME and / aren't worth matching
-        [ "$*" = "$HOME" -o "$*" = '/' ] && return
-
-        # don't track excluded directory trees
-        if [ ${#_Z_EXCLUDE_DIRS[@]} -gt 0 ]; then
-            local exclude
-            for exclude in "${_Z_EXCLUDE_DIRS[@]}"; do
-                case "$*" in "$exclude"*) return;; esac
-            done
-        fi
-
-        # maintain the data file
-        local tempfile="$datafile.$RANDOM"
-        local score=${_Z_MAX_SCORE:-9000}
-        _z_dirs | awk -v path="$*" -v now="$(date +%s)" -v score=$score -F"|" '
-            BEGIN {
-                rank[path] = 1
-                time[path] = now
-            }
-            $2 >= 1 {
-                # drop ranks below 1
-                if( $1 == path ) {
-                    rank[$1] = $2 + 1
-                    time[$1] = now
-                } else {
-                    rank[$1] = $2
-                    time[$1] = $3
-                }
-                count += $2
-            }
-            END {
-                if( count > score ) {
-                    # aging
-                    for( x in rank ) print x "|" 0.99*rank[x] "|" time[x]
-                } else for( x in rank ) print x "|" rank[x] "|" time[x]
-            }
-        ' 2>/dev/null >| "$tempfile"
-        # do our best to avoid clobbering the datafile in a race condition.
-        if [ $? -ne 0 -a -f "$datafile" ]; then
-            env rm -f "$tempfile"
-        else
-            [ "$_Z_OWNER" ] && chown $_Z_OWNER:"$(id -ng $_Z_OWNER)" "$tempfile"
-            env mv -f "$tempfile" "$datafile" || env rm -f "$tempfile"
-        fi
-
-    # tab completion
-    elif [ "$1" = "--complete" -a -s "$datafile" ]; then
-        _z_dirs | awk -v q="$2" -F"|" '
-            BEGIN {
-                q = substr(q, 3)
-                if( q == tolower(q) ) imatch = 1
-                gsub(/ /, ".*", q)
-            }
-            {
-                if( imatch ) {
-                    if( tolower($1) ~ q ) print $1
-                } else if( $1 ~ q ) print $1
-            }
-        ' 2>/dev/null
-
-    else
-        # list/go
-        local echo fnd last list opt typ
-        while [ "$1" ]; do case "$1" in
-            --) while [ "$1" ]; do shift; fnd="$fnd${fnd:+ }$1";done;;
-            -*) opt=${1:1}; while [ "$opt" ]; do case ${opt:0:1} in
-                    c) fnd="^$PWD $fnd";;
-                    e) echo=1;;
-                    h) echo "${_Z_CMD:-z} [-cehlrtx] args" >&2; return;;
-                    l) list=1;;
-                    r) typ="rank";;
-                    t) typ="recent";;
-                    x) sed -i -e "\:^${PWD}|.*:d" "$datafile";;
-                esac; opt=${opt:1}; done;;
-             *) fnd="$fnd${fnd:+ }$1";;
-        esac; last=$1; [ "$#" -gt 0 ] && shift; done
-        [ "$fnd" -a "$fnd" != "^$PWD " ] || list=1
-
-        # if we hit enter on a completion just go there
-        case "$last" in
-            # completions will always start with /
-            /*) [ -z "$list" -a -d "$last" ] && builtin cd "$last" && return;;
-        esac
-
-        # no file yet
-        [ -f "$datafile" ] || return
-
-        local cd
-        cd="$( < <( _z_dirs ) awk -v t="$(date +%s)" -v list="$list" -v typ="$typ" -v q="$fnd" -F"|" '
-            function frecent(rank, time) {
-              # relate frequency and time
-              dx = t - time
-              return int(10000 * rank * (3.75/((0.0001 * dx + 1) + 0.25)))
-            }
-            function output(matches, best_match, common) {
-                # list or return the desired directory
-                if( list ) {
-                    if( common ) {
-                        printf "%-10s %s\n", "common:", common > "/dev/stderr"
-                    }
-                    cmd = "sort -n >&2"
-                    for( x in matches ) {
-                        if( matches[x] ) {
-                            printf "%-10s %s\n", matches[x], x | cmd
-                        }
-                    }
-                } else {
-                    if( common && !typ ) best_match = common
-                    print best_match
-                }
-            }
-            function common(matches) {
-                # find the common root of a list of matches, if it exists
-                for( x in matches ) {
-                    if( matches[x] && (!short || length(x) < length(short)) ) {
-                        short = x
-                    }
-                }
-                if( short == "/" ) return
-                for( x in matches ) if( matches[x] && index(x, short) != 1 ) {
-                    return
-                }
-                return short
-            }
-            BEGIN {
-                gsub(" ", ".*", q)
-                hi_rank = ihi_rank = -9999999999
-            }
-            {
-                if( typ == "rank" ) {
-                    rank = $2
-                } else if( typ == "recent" ) {
-                    rank = $3 - t
-                } else rank = frecent($2, $3)
-                if( $1 ~ q ) {
-                    matches[$1] = rank
-                } else if( tolower($1) ~ tolower(q) ) imatches[$1] = rank
-                if( matches[$1] && matches[$1] > hi_rank ) {
-                    best_match = $1
-                    hi_rank = matches[$1]
-                } else if( imatches[$1] && imatches[$1] > ihi_rank ) {
-                    ibest_match = $1
-                    ihi_rank = imatches[$1]
-                }
-            }
-            END {
-                # prefer case sensitive
-                if( best_match ) {
-                    output(matches, best_match, common(matches))
-                    exit
-                } else if( ibest_match ) {
-                    output(imatches, ibest_match, common(imatches))
-                    exit
-                }
-                exit(1)
-            }
-        ')"
-
-        if [ "$?" -eq 0 ]; then
-          if [ "$cd" ]; then
-            if [ "$echo" ]; then echo "$cd"; else builtin cd "$cd"; fi
-          fi
-        else
-          return $?
-        fi
-    fi
-}
-
-alias ${_Z_CMD:-z}='_z 2>&1'
-
-[ "$_Z_NO_RESOLVE_SYMLINKS" ] || _Z_RESOLVE_SYMLINKS="-P"
-
-if type compctl >/dev/null 2>&1; then
-    # zsh
-    [ "$_Z_NO_PROMPT_COMMAND" ] || {
-        # populate directory list, avoid clobbering any other precmds.
-        if [ "$_Z_NO_RESOLVE_SYMLINKS" ]; then
-            _z_precmd() {
-                (_z --add "${PWD:a}" &)
-                : $RANDOM
-            }
-        else
-            _z_precmd() {
-                (_z --add "${PWD:A}" &)
-                : $RANDOM
-            }
-        fi
-        [[ -n "${precmd_functions[(r)_z_precmd]}" ]] || {
-            precmd_functions[$(($#precmd_functions+1))]=_z_precmd
-        }
-    }
-    _z_zsh_tab_completion() {
-        # tab completion
-        local compl
-        read -l compl
-        reply=(${(f)"$(_z --complete "$compl")"})
-    }
-    compctl -U -K _z_zsh_tab_completion _z
-elif type complete >/dev/null 2>&1; then
-    # bash
-    # tab completion
-    complete -o filenames -C '_z --complete "$COMP_LINE"' ${_Z_CMD:-z}
-    [ "$_Z_NO_PROMPT_COMMAND" ] || {
-        # populate directory list. avoid clobbering other PROMPT_COMMANDs.
-        grep "_z --add" <<< "$PROMPT_COMMAND" >/dev/null || {
-            PROMPT_COMMAND="$PROMPT_COMMAND"$'\n''(_z --add "$(command pwd '$_Z_RESOLVE_SYMLINKS' 2>/dev/null)" 2>/dev/null &);'
-        }
-    }
-fi
diff --git a/zsh/plugins/zoxide/README.md b/zsh/plugins/zoxide/README.md
index f326eff..45f77bd 100644
--- a/zsh/plugins/zoxide/README.md
+++ b/zsh/plugins/zoxide/README.md
@@ -10,5 +10,8 @@ To use it, add `zoxide` to the plugins array in your `.zshrc` file:
 ```zsh
 plugins=(... zoxide)
 ```
+## Overriding `z` Alias
+
+You can set the `ZOXIDE_CMD_OVERRIDE`, which will be passed to the `--cmd` flag of `zoxide init`. This allows you to set your `z` command to a default of `cd`.
 
 **Note:** you have to [install zoxide](https://github.com/ajeetdsouza/zoxide#step-1-install-zoxide) first.
diff --git a/zsh/plugins/zoxide/zoxide.plugin.zsh b/zsh/plugins/zoxide/zoxide.plugin.zsh
index e5658b8..25d2e83 100644
--- a/zsh/plugins/zoxide/zoxide.plugin.zsh
+++ b/zsh/plugins/zoxide/zoxide.plugin.zsh
@@ -1,5 +1,5 @@
 if (( $+commands[zoxide] )); then
-  eval "$(zoxide init zsh)"
+  eval "$(zoxide init --cmd ${ZOXIDE_CMD_OVERRIDE:-z} zsh)"
 else
   echo '[oh-my-zsh] zoxide not found, please install it from https://github.com/ajeetdsouza/zoxide'
 fi
diff --git a/zsh/plugins/zsh-interactive-cd/LICENSE b/zsh/plugins/zsh-interactive-cd/LICENSE
new file mode 100644
index 0000000..40b3f8d
--- /dev/null
+++ b/zsh/plugins/zsh-interactive-cd/LICENSE
@@ -0,0 +1,375 @@
+Copyright 2017-2018 Henry Chang
+
+Mozilla Public License Version 2.0
+==================================
+
+1. Definitions
+--------------
+
+1.1. "Contributor"
+    means each individual or legal entity that creates, contributes to
+    the creation of, or owns Covered Software.
+
+1.2. "Contributor Version"
+    means the combination of the Contributions of others (if any) used
+    by a Contributor and that particular Contributor's Contribution.
+
+1.3. "Contribution"
+    means Covered Software of a particular Contributor.
+
+1.4. "Covered Software"
+    means Source Code Form to which the initial Contributor has attached
+    the notice in Exhibit A, the Executable Form of such Source Code
+    Form, and Modifications of such Source Code Form, in each case
+    including portions thereof.
+
+1.5. "Incompatible With Secondary Licenses"
+    means
+
+    (a) that the initial Contributor has attached the notice described
+        in Exhibit B to the Covered Software; or
+
+    (b) that the Covered Software was made available under the terms of
+        version 1.1 or earlier of the License, but not also under the
+        terms of a Secondary License.
+
+1.6. "Executable Form"
+    means any form of the work other than Source Code Form.
+
+1.7. "Larger Work"
+    means a work that combines Covered Software with other material, in 
+    a separate file or files, that is not Covered Software.
+
+1.8. "License"
+    means this document.
+
+1.9. "Licensable"
+    means having the right to grant, to the maximum extent possible,
+    whether at the time of the initial grant or subsequently, any and
+    all of the rights conveyed by this License.
+
+1.10. "Modifications"
+    means any of the following:
+
+    (a) any file in Source Code Form that results from an addition to,
+        deletion from, or modification of the contents of Covered
+        Software; or
+
+    (b) any new file in Source Code Form that contains any Covered
+        Software.
+
+1.11. "Patent Claims" of a Contributor
+    means any patent claim(s), including without limitation, method,
+    process, and apparatus claims, in any patent Licensable by such
+    Contributor that would be infringed, but for the grant of the
+    License, by the making, using, selling, offering for sale, having
+    made, import, or transfer of either its Contributions or its
+    Contributor Version.
+
+1.12. "Secondary License"
+    means either the GNU General Public License, Version 2.0, the GNU
+    Lesser General Public License, Version 2.1, the GNU Affero General
+    Public License, Version 3.0, or any later versions of those
+    licenses.
+
+1.13. "Source Code Form"
+    means the form of the work preferred for making modifications.
+
+1.14. "You" (or "Your")
+    means an individual or a legal entity exercising rights under this
+    License. For legal entities, "You" includes any entity that
+    controls, is controlled by, or is under common control with You. For
+    purposes of this definition, "control" means (a) the power, direct
+    or indirect, to cause the direction or management of such entity,
+    whether by contract or otherwise, or (b) ownership of more than
+    fifty percent (50%) of the outstanding shares or beneficial
+    ownership of such entity.
+
+2. License Grants and Conditions
+--------------------------------
+
+2.1. Grants
+
+Each Contributor hereby grants You a world-wide, royalty-free,
+non-exclusive license:
+
+(a) under intellectual property rights (other than patent or trademark)
+    Licensable by such Contributor to use, reproduce, make available,
+    modify, display, perform, distribute, and otherwise exploit its
+    Contributions, either on an unmodified basis, with Modifications, or
+    as part of a Larger Work; and
+
+(b) under Patent Claims of such Contributor to make, use, sell, offer
+    for sale, have made, import, and otherwise transfer either its
+    Contributions or its Contributor Version.
+
+2.2. Effective Date
+
+The licenses granted in Section 2.1 with respect to any Contribution
+become effective for each Contribution on the date the Contributor first
+distributes such Contribution.
+
+2.3. Limitations on Grant Scope
+
+The licenses granted in this Section 2 are the only rights granted under
+this License. No additional rights or licenses will be implied from the
+distribution or licensing of Covered Software under this License.
+Notwithstanding Section 2.1(b) above, no patent license is granted by a
+Contributor:
+
+(a) for any code that a Contributor has removed from Covered Software;
+    or
+
+(b) for infringements caused by: (i) Your and any other third party's
+    modifications of Covered Software, or (ii) the combination of its
+    Contributions with other software (except as part of its Contributor
+    Version); or
+
+(c) under Patent Claims infringed by Covered Software in the absence of
+    its Contributions.
+
+This License does not grant any rights in the trademarks, service marks,
+or logos of any Contributor (except as may be necessary to comply with
+the notice requirements in Section 3.4).
+
+2.4. Subsequent Licenses
+
+No Contributor makes additional grants as a result of Your choice to
+distribute the Covered Software under a subsequent version of this
+License (see Section 10.2) or under the terms of a Secondary License (if
+permitted under the terms of Section 3.3).
+
+2.5. Representation
+
+Each Contributor represents that the Contributor believes its
+Contributions are its original creation(s) or it has sufficient rights
+to grant the rights to its Contributions conveyed by this License.
+
+2.6. Fair Use
+
+This License is not intended to limit any rights You have under
+applicable copyright doctrines of fair use, fair dealing, or other
+equivalents.
+
+2.7. Conditions
+
+Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
+in Section 2.1.
+
+3. Responsibilities
+-------------------
+
+3.1. Distribution of Source Form
+
+All distribution of Covered Software in Source Code Form, including any
+Modifications that You create or to which You contribute, must be under
+the terms of this License. You must inform recipients that the Source
+Code Form of the Covered Software is governed by the terms of this
+License, and how they can obtain a copy of this License. You may not
+attempt to alter or restrict the recipients' rights in the Source Code
+Form.
+
+3.2. Distribution of Executable Form
+
+If You distribute Covered Software in Executable Form then:
+
+(a) such Covered Software must also be made available in Source Code
+    Form, as described in Section 3.1, and You must inform recipients of
+    the Executable Form how they can obtain a copy of such Source Code
+    Form by reasonable means in a timely manner, at a charge no more
+    than the cost of distribution to the recipient; and
+
+(b) You may distribute such Executable Form under the terms of this
+    License, or sublicense it under different terms, provided that the
+    license for the Executable Form does not attempt to limit or alter
+    the recipients' rights in the Source Code Form under this License.
+
+3.3. Distribution of a Larger Work
+
+You may create and distribute a Larger Work under terms of Your choice,
+provided that You also comply with the requirements of this License for
+the Covered Software. If the Larger Work is a combination of Covered
+Software with a work governed by one or more Secondary Licenses, and the
+Covered Software is not Incompatible With Secondary Licenses, this
+License permits You to additionally distribute such Covered Software
+under the terms of such Secondary License(s), so that the recipient of
+the Larger Work may, at their option, further distribute the Covered
+Software under the terms of either this License or such Secondary
+License(s).
+
+3.4. Notices
+
+You may not remove or alter the substance of any license notices
+(including copyright notices, patent notices, disclaimers of warranty,
+or limitations of liability) contained within the Source Code Form of
+the Covered Software, except that You may alter any license notices to
+the extent required to remedy known factual inaccuracies.
+
+3.5. Application of Additional Terms
+
+You may choose to offer, and to charge a fee for, warranty, support,
+indemnity or liability obligations to one or more recipients of Covered
+Software. However, You may do so only on Your own behalf, and not on
+behalf of any Contributor. You must make it absolutely clear that any
+such warranty, support, indemnity, or liability obligation is offered by
+You alone, and You hereby agree to indemnify every Contributor for any
+liability incurred by such Contributor as a result of warranty, support,
+indemnity or liability terms You offer. You may include additional
+disclaimers of warranty and limitations of liability specific to any
+jurisdiction.
+
+4. Inability to Comply Due to Statute or Regulation
+---------------------------------------------------
+
+If it is impossible for You to comply with any of the terms of this
+License with respect to some or all of the Covered Software due to
+statute, judicial order, or regulation then You must: (a) comply with
+the terms of this License to the maximum extent possible; and (b)
+describe the limitations and the code they affect. Such description must
+be placed in a text file included with all distributions of the Covered
+Software under this License. Except to the extent prohibited by statute
+or regulation, such description must be sufficiently detailed for a
+recipient of ordinary skill to be able to understand it.
+
+5. Termination
+--------------
+
+5.1. The rights granted under this License will terminate automatically
+if You fail to comply with any of its terms. However, if You become
+compliant, then the rights granted under this License from a particular
+Contributor are reinstated (a) provisionally, unless and until such
+Contributor explicitly and finally terminates Your grants, and (b) on an
+ongoing basis, if such Contributor fails to notify You of the
+non-compliance by some reasonable means prior to 60 days after You have
+come back into compliance. Moreover, Your grants from a particular
+Contributor are reinstated on an ongoing basis if such Contributor
+notifies You of the non-compliance by some reasonable means, this is the
+first time You have received notice of non-compliance with this License
+from such Contributor, and You become compliant prior to 30 days after
+Your receipt of the notice.
+
+5.2. If You initiate litigation against any entity by asserting a patent
+infringement claim (excluding declaratory judgment actions,
+counter-claims, and cross-claims) alleging that a Contributor Version
+directly or indirectly infringes any patent, then the rights granted to
+You by any and all Contributors for the Covered Software under Section
+2.1 of this License shall terminate.
+
+5.3. In the event of termination under Sections 5.1 or 5.2 above, all
+end user license agreements (excluding distributors and resellers) which
+have been validly granted by You or Your distributors under this License
+prior to termination shall survive termination.
+
+************************************************************************
+*                                                                      *
+*  6. Disclaimer of Warranty                                           *
+*  -------------------------                                           *
+*                                                                      *
+*  Covered Software is provided under this License on an "as is"       *
+*  basis, without warranty of any kind, either expressed, implied, or  *
+*  statutory, including, without limitation, warranties that the       *
+*  Covered Software is free of defects, merchantable, fit for a        *
+*  particular purpose or non-infringing. The entire risk as to the     *
+*  quality and performance of the Covered Software is with You.        *
+*  Should any Covered Software prove defective in any respect, You     *
+*  (not any Contributor) assume the cost of any necessary servicing,   *
+*  repair, or correction. This disclaimer of warranty constitutes an   *
+*  essential part of this License. No use of any Covered Software is   *
+*  authorized under this License except under this disclaimer.         *
+*                                                                      *
+************************************************************************
+
+************************************************************************
+*                                                                      *
+*  7. Limitation of Liability                                          *
+*  --------------------------                                          *
+*                                                                      *
+*  Under no circumstances and under no legal theory, whether tort      *
+*  (including negligence), contract, or otherwise, shall any           *
+*  Contributor, or anyone who distributes Covered Software as          *
+*  permitted above, be liable to You for any direct, indirect,         *
+*  special, incidental, or consequential damages of any character      *
+*  including, without limitation, damages for lost profits, loss of    *
+*  goodwill, work stoppage, computer failure or malfunction, or any    *
+*  and all other commercial damages or losses, even if such party      *
+*  shall have been informed of the possibility of such damages. This   *
+*  limitation of liability shall not apply to liability for death or   *
+*  personal injury resulting from such party's negligence to the       *
+*  extent applicable law prohibits such limitation. Some               *
+*  jurisdictions do not allow the exclusion or limitation of           *
+*  incidental or consequential damages, so this exclusion and          *
+*  limitation may not apply to You.                                    *
+*                                                                      *
+************************************************************************
+
+8. Litigation
+-------------
+
+Any litigation relating to this License may be brought only in the
+courts of a jurisdiction where the defendant maintains its principal
+place of business and such litigation shall be governed by laws of that
+jurisdiction, without reference to its conflict-of-law provisions.
+Nothing in this Section shall prevent a party's ability to bring
+cross-claims or counter-claims.
+
+9. Miscellaneous
+----------------
+
+This License represents the complete agreement concerning the subject
+matter hereof. If any provision of this License is held to be
+unenforceable, such provision shall be reformed only to the extent
+necessary to make it enforceable. Any law or regulation which provides
+that the language of a contract shall be construed against the drafter
+shall not be used to construe this License against a Contributor.
+
+10. Versions of the License
+---------------------------
+
+10.1. New Versions
+
+Mozilla Foundation is the license steward. Except as provided in Section
+10.3, no one other than the license steward has the right to modify or
+publish new versions of this License. Each version will be given a
+distinguishing version number.
+
+10.2. Effect of New Versions
+
+You may distribute the Covered Software under the terms of the version
+of the License under which You originally received the Covered Software,
+or under the terms of any subsequent version published by the license
+steward.
+
+10.3. Modified Versions
+
+If you create software not governed by this License, and you want to
+create a new license for such software, you may create and use a
+modified version of this License if you rename the license and remove
+any references to the name of the license steward (except to note that
+such modified license differs from this License).
+
+10.4. Distributing Source Code Form that is Incompatible With Secondary
+Licenses
+
+If You choose to distribute Source Code Form that is Incompatible With
+Secondary Licenses under the terms of this version of the License, the
+notice described in Exhibit B of this License must be attached.
+
+Exhibit A - Source Code Form License Notice
+-------------------------------------------
+
+  This Source Code Form is subject to the terms of the Mozilla Public
+  License, v. 2.0. If a copy of the MPL was not distributed with this
+  file, You can obtain one at http://mozilla.org/MPL/2.0/.
+
+If it is not possible or desirable to put the notice in a particular
+file, then You may include the notice in a location (such as a LICENSE
+file in a relevant directory) where a recipient would be likely to look
+for such a notice.
+
+You may add additional accurate notices of copyright ownership.
+
+Exhibit B - "Incompatible With Secondary Licenses" Notice
+---------------------------------------------------------
+
+  This Source Code Form is "Incompatible With Secondary Licenses", as
+  defined by the Mozilla Public License, v. 2.0.
diff --git a/zsh/plugins/zsh-interactive-cd/README.md b/zsh/plugins/zsh-interactive-cd/README.md
index c8337fb..29812a2 100644
--- a/zsh/plugins/zsh-interactive-cd/README.md
+++ b/zsh/plugins/zsh-interactive-cd/README.md
@@ -1,23 +1,21 @@
 # zsh-interactive-cd
 
-This plugin adds a fish-like interactive tab completion for the `cd` command.
+This plugin provides an interactive way to change directories in zsh using fzf.
 
-To use it, add `zsh-interactive-cd` to the plugins array of your zshrc file:
-```zsh
-plugins=(... zsh-interactive-cd)
-```
+## Demo
 
-![demo](https://user-images.githubusercontent.com/1441704/74360670-cb202900-4dc5-11ea-9734-f60caf726e85.gif)
+![demo](demo.gif)
+
+## Installation
+
+1. Install [fzf](https://github.com/junegunn/fzf) by following its [installation instruction](https://github.com/junegunn/fzf#installation).
+
+2. Add `zsh-interactive-cd` to your plugin list in `~/.zshrc`:
+
+   ```zsh
+   plugins=(... zsh-interactive-cd)
+   ```
 
 ## Usage
 
 Press tab for completion as usual, it'll launch fzf automatically. Check fzf’s [readme](https://github.com/junegunn/fzf#search-syntax) for more search syntax usage.
-
-## Requirements
-
-This plugin requires [fzf](https://github.com/junegunn/fzf). Install it by following
-its [installation instructions](https://github.com/junegunn/fzf#installation).
-
-## Author
-
-[Henry Chang](https://github.com/changyuheng)
diff --git a/zsh/plugins/zsh-interactive-cd/demo.gif b/zsh/plugins/zsh-interactive-cd/demo.gif
new file mode 100644
index 0000000..3568ecf
Binary files /dev/null and b/zsh/plugins/zsh-interactive-cd/demo.gif differ
diff --git a/zsh/plugins/zsh-interactive-cd/zsh-interactive-cd.plugin.zsh b/zsh/plugins/zsh-interactive-cd/zsh-interactive-cd.plugin.zsh
index b0520c2..0ae9d50 100644
--- a/zsh/plugins/zsh-interactive-cd/zsh-interactive-cd.plugin.zsh
+++ b/zsh/plugins/zsh-interactive-cd/zsh-interactive-cd.plugin.zsh
@@ -1,4 +1,10 @@
-# Copyright (c) 2017 Henry Chang
+#!/usr/bin/env zsh
+#
+# Copyright 2017-2018 Henry Chang
+#
+# This Source Code Form is subject to the terms of the Mozilla Public
+# License, v. 2.0. If a copy of the MPL was not distributed with this
+# file, You can obtain one at http://mozilla.org/MPL/2.0/.
 
 __zic_fzf_prog() {
   [ -n "$TMUX_PANE" ] && [ "${FZF_TMUX:-0}" != 0 ] && [ ${LINES:-40} -gt 15 ] \
@@ -17,7 +23,7 @@ __zic_matched_subdir_list() {
       length=0
     fi
     find -L "$dir" -mindepth 1 -maxdepth 1 -type d 2>/dev/null \
-        | cut -b $(( ${length} + 2 ))- | sed '/^$/d' | while read -r line; do
+        | cut -b $(( ${length} + 2 ))- | command sed '/^$/d' | while read -r line; do
       if [[ "${line[1]}" == "." ]]; then
         continue
       fi
@@ -32,13 +38,19 @@ __zic_matched_subdir_list() {
     seg=$(basename -- "$1")
     starts_with_dir=$( \
       find -L "$dir" -mindepth 1 -maxdepth 1 -type d \
-          2>/dev/null | cut -b $(( ${length} + 2 ))- | sed '/^$/d' \
+          2>/dev/null | cut -b $(( ${length} + 2 ))- | command sed '/^$/d' \
           | while read -r line; do
         if [[ "${seg[1]}" != "." && "${line[1]}" == "." ]]; then
           continue
         fi
-        if [[ "$line" == "$seg"* ]]; then
-          echo "$line"
+        if [ "$zic_case_insensitive" = "true" ]; then
+          if [[ "$line:u" == "$seg:u"* ]]; then
+            echo "$line"
+          fi
+        else
+          if [[ "$line" == "$seg"* ]]; then
+            echo "$line"
+          fi
         fi
       done
     )
@@ -46,19 +58,36 @@ __zic_matched_subdir_list() {
       echo "$starts_with_dir"
     else
       find -L "$dir" -mindepth 1 -maxdepth 1 -type d \
-          2>/dev/null | cut -b $(( ${length} + 2 ))- | sed '/^$/d' \
+          2>/dev/null | cut -b $(( ${length} + 2 ))- | command sed '/^$/d' \
           | while read -r line; do
         if [[ "${seg[1]}" != "." && "${line[1]}" == "." ]]; then
           continue
         fi
-        if [[ "$line" == *"$seg"* ]]; then
-          echo "$line"
+        if [ "$zic_case_insensitive" = "true" ]; then
+          if [[ "$line:u" == *"$seg:u"* ]]; then
+            echo "$line"
+          fi
+        else
+          if [[ "$line" == *"$seg"* ]]; then
+            echo "$line"
+          fi
         fi
       done
     fi
   fi
 }
 
+__zic_fzf_bindings() {
+  autoload is-at-least
+  fzf=$(__zic_fzf_prog)
+
+  if $(is-at-least '0.21.0' $(${=fzf} --version)); then
+    echo 'shift-tab:up,tab:down,bspace:backward-delete-char/eof'
+  else
+    echo 'shift-tab:up,tab:down'
+  fi
+}
+
 _zic_list_generator() {
   __zic_matched_subdir_list "${(Q)@[-1]}" | sort
 }
@@ -75,6 +104,7 @@ _zic_complete() {
   fi
 
   fzf=$(__zic_fzf_prog)
+  fzf_bindings=$(__zic_fzf_bindings)
 
   if [ $(echo $l | wc -l) -eq 1 ]; then
     matches=${(q)l}
@@ -82,7 +112,7 @@ _zic_complete() {
     matches=$(echo $l \
         | FZF_DEFAULT_OPTS="--height ${FZF_TMUX_HEIGHT:-40%} \
           --reverse $FZF_DEFAULT_OPTS $FZF_COMPLETION_OPTS \
-          --bind 'shift-tab:up,tab:down'" ${=fzf} \
+          --bind '${fzf_bindings}'" ${=fzf} \
         | while read -r item; do
       echo -n "${(q)item} "
     done)
@@ -144,5 +174,7 @@ zic-completion() {
 }
 
 zle -N zic-completion
-bindkey -M emacs '^I' zic-completion
-bindkey -M viins '^I' zic-completion
+if [ -z $zic_custom_binding ]; then
+  zic_custom_binding='^I'
+fi
+bindkey "${zic_custom_binding}" zic-completion
diff --git a/zsh/plugins/zsh-navigation-tools/README.md b/zsh/plugins/zsh-navigation-tools/README.md
index 4dc9cdb..6d6c22f 100644
--- a/zsh/plugins/zsh-navigation-tools/README.md
+++ b/zsh/plugins/zsh-navigation-tools/README.md
@@ -185,7 +185,7 @@ Result is stored as `$reply[REPLY]` (`$` isn't needed before `REPLY` because
 of arithmetic context inside `[]`). The returned array might be different from
 input arguments as `n-list` can process them via incremental search or uniq
 mode. `$REPLY` is the index in that possibly processed array. If `$REPLY`
-equals `-1` it means that no selection have been made (user quitted via `q`
+equals `-1` it means that no selection have been made (user quit via `q`
 key).
 
 To set up entries that can be jumped to with `[`,`]` keys add their indices to
diff --git a/zsh/plugins/zsh-navigation-tools/doc/n-preview b/zsh/plugins/zsh-navigation-tools/doc/n-preview
index 2d8eea3..bcbbb88 100644
--- a/zsh/plugins/zsh-navigation-tools/doc/n-preview
+++ b/zsh/plugins/zsh-navigation-tools/doc/n-preview
@@ -170,7 +170,7 @@ while (( 1 )); do
     elif [ -n "$keypad" ]; then
         final_key="$keypad"
     else
-        _vpreview_status_msg "Inproper input detected"
+        _vpreview_status_msg "Improper input detected"
         zcurses refresh status 
     fi
 
diff --git a/zsh/plugins/zsh-navigation-tools/n-list b/zsh/plugins/zsh-navigation-tools/n-list
index f25db8f..3be0219 100644
--- a/zsh/plugins/zsh-navigation-tools/n-list
+++ b/zsh/plugins/zsh-navigation-tools/n-list
@@ -55,9 +55,9 @@ _nlist_cursor_visibility() {
         [ "$1" = "1" ] && { tput cvvis; tput cnorm }
         [ "$1" = "0" ] && tput civis
     elif [ "$_nlist_has_terminfo" = "1" ]; then
-        [ "$1" = "1" ] && { [ -n $terminfo[cvvis] ] && echo -n $terminfo[cvvis];
-                           [ -n $terminfo[cnorm] ] && echo -n $terminfo[cnorm] }
-        [ "$1" = "0" ] && [ -n $terminfo[civis] ] && echo -n $terminfo[civis]
+        [ "$1" = "1" ] && { [ -n "$terminfo[cvvis]" ] && echo -n "$terminfo[cvvis]";
+                           [ -n "$terminfo[cnorm]" ] && echo -n "$terminfo[cnorm]" }
+        [ "$1" = "0" ] && [ -n "$terminfo[civis]" ] && echo -n "$terminfo[civis]"
     fi 
 }
 
@@ -467,7 +467,7 @@ while (( 1 )); do
     elif [ -n "$keypad" ]; then
         final_key="$keypad"
     else
-        _nlist_status_msg "Inproper input detected"
+        _nlist_status_msg "Improper input detected"
         zcurses refresh main inner
     fi
 
diff --git a/zsh/templates/minimal.zshrc b/zsh/templates/minimal.zshrc
new file mode 100644
index 0000000..6d4cd9a
--- /dev/null
+++ b/zsh/templates/minimal.zshrc
@@ -0,0 +1,5 @@
+export ZSH="$HOME/.oh-my-zsh"
+ZSH_THEME="robbyrussell"
+plugins=(git)
+
+source $ZSH/oh-my-zsh.sh
diff --git a/zsh/templates/zshrc.zsh-template b/zsh/templates/zshrc.zsh-template
index 7e1c799..fa83cc0 100644
--- a/zsh/templates/zshrc.zsh-template
+++ b/zsh/templates/zshrc.zsh-template
@@ -1,11 +1,11 @@
 # If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
 
-# Path to your oh-my-zsh installation.
-export ZSH=$HOME/.oh-my-zsh
+# Path to your Oh My Zsh installation.
+export ZSH="$HOME/.oh-my-zsh"
 
 # Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
+# load a random theme each time Oh My Zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
 # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
 ZSH_THEME="robbyrussell"
@@ -85,15 +85,18 @@ source $ZSH/oh-my-zsh.sh
 # if [[ -n $SSH_CONNECTION ]]; then
 #   export EDITOR='vim'
 # else
-#   export EDITOR='mvim'
+#   export EDITOR='nvim'
 # fi
 
 # Compilation flags
-# export ARCHFLAGS="-arch x86_64"
+# export ARCHFLAGS="-arch $(uname -m)"
 
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# Set personal aliases, overriding those provided by Oh My Zsh libs,
+# plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# users are encouraged to define aliases within a top-level file in
+# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# - $ZSH_CUSTOM/aliases.zsh
+# - $ZSH_CUSTOM/macos.zsh
 # For a full list of active aliases, run `alias`.
 #
 # Example aliases
diff --git a/zsh/themes/Soliah.zsh-theme b/zsh/themes/Soliah.zsh-theme
index c3dd6af..e297fe9 100644
--- a/zsh/themes/Soliah.zsh-theme
+++ b/zsh/themes/Soliah.zsh-theme
@@ -5,10 +5,10 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[white]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%})"
 
 # Text to display if the branch is dirty
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}" 
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
 
 # Text to display if the branch is clean
-ZSH_THEME_GIT_PROMPT_CLEAN="" 
+ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # Colors vary depending on time lapsed.
 ZSH_THEME_GIT_TIME_SINCE_COMMIT_SHORT="%{$fg[green]%}"
@@ -36,7 +36,7 @@ function rvm_gemset() {
         GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
         if [[ -n $GEMSET ]]; then
             echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
-        fi 
+        fi
     fi
 }
 
@@ -52,12 +52,12 @@ function git_time_since_commit() {
             # Totals
             MINUTES=$((seconds_since_last_commit / 60))
             HOURS=$((seconds_since_last_commit/3600))
-           
+
             # Sub-hours and sub-minutes
             DAYS=$((seconds_since_last_commit / 86400))
             SUB_HOURS=$((HOURS % 24))
             SUB_MINUTES=$((MINUTES % 60))
-            
+
             if [[ -n $(git status -s 2> /dev/null) ]]; then
                 if [ "$MINUTES" -gt 30 ]; then
                     COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
diff --git a/zsh/themes/adben.zsh-theme b/zsh/themes/adben.zsh-theme
index c2fdbed..cc09705 100644
--- a/zsh/themes/adben.zsh-theme
+++ b/zsh/themes/adben.zsh-theme
@@ -79,7 +79,7 @@ ps1_command_tip() {
       command wget -qO- https://www.commandlinefu.com/commands/random/plaintext
     elif (( ${+commands[curl]} )); then
       command curl -fsL https://www.commandlinefu.com/commands/random/plaintext
-    fi 
+    fi
   } | sed '1d;/^$/d'
 }
 
diff --git a/zsh/themes/af-magic.zsh-theme b/zsh/themes/af-magic.zsh-theme
index 2ef9b02..f47d373 100644
--- a/zsh/themes/af-magic.zsh-theme
+++ b/zsh/themes/af-magic.zsh-theme
@@ -6,12 +6,15 @@
 # dashed separator size
 function afmagic_dashes {
   # check either virtualenv or condaenv variables
-  local python_env="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
+  local python_env_dir="${VIRTUAL_ENV:-$CONDA_DEFAULT_ENV}"
+  local python_env="${python_env_dir##*/}"
 
   # if there is a python virtual environment and it is displayed in
   # the prompt, account for it when returning the number of dashes
-  if [[ -n "$python_env" && "$PS1" = \(* ]]; then
+  if [[ -n "$python_env" && "$PS1" = *\(${python_env}\)* ]]; then
     echo $(( COLUMNS - ${#python_env} - 3 ))
+  elif [[ -n "$VIRTUAL_ENV_PROMPT" && "$PS1" = *${VIRTUAL_ENV_PROMPT}* ]]; then
+    echo $(( COLUMNS - ${#VIRTUAL_ENV_PROMPT} - 3 ))
   else
     echo $COLUMNS
   fi
diff --git a/zsh/themes/agnoster.zsh-theme b/zsh/themes/agnoster.zsh-theme
index 5f4efe8..6345237 100644
--- a/zsh/themes/agnoster.zsh-theme
+++ b/zsh/themes/agnoster.zsh-theme
@@ -35,10 +35,74 @@
 CURRENT_BG='NONE'
 
 case ${SOLARIZED_THEME:-dark} in
-    light) CURRENT_FG='white';;
-    *)     CURRENT_FG='black';;
+    light)
+      CURRENT_FG=${CURRENT_FG:-'white'}
+      CURRENT_DEFAULT_FG=${CURRENT_DEFAULT_FG:-'white'}
+      ;;
+    *)
+      CURRENT_FG=${CURRENT_FG:-'black'}
+      CURRENT_DEFAULT_FG=${CURRENT_DEFAULT_FG:-'default'}
+      ;;
 esac
 
+### Theme Configuration Initialization
+#
+# Override these settings in your ~/.zshrc
+
+# Current working directory
+: ${AGNOSTER_DIR_FG:=${CURRENT_FG}}
+: ${AGNOSTER_DIR_BG:=blue}
+
+# user@host
+: ${AGNOSTER_CONTEXT_FG:=${CURRENT_DEFAULT_FG}}
+: ${AGNOSTER_CONTEXT_BG:=black}
+
+# Git related
+: ${AGNOSTER_GIT_CLEAN_FG:=${CURRENT_FG}}
+: ${AGNOSTER_GIT_CLEAN_BG:=green}
+: ${AGNOSTER_GIT_DIRTY_FG:=black}
+: ${AGNOSTER_GIT_DIRTY_BG:=yellow}
+
+# Bazaar related
+: ${AGNOSTER_BZR_CLEAN_FG:=${CURRENT_FG}}
+: ${AGNOSTER_BZR_CLEAN_BG:=green}
+: ${AGNOSTER_BZR_DIRTY_FG:=black}
+: ${AGNOSTER_BZR_DIRTY_BG:=yellow}
+
+# Mercurial related
+: ${AGNOSTER_HG_NEWFILE_FG:=white}
+: ${AGNOSTER_HG_NEWFILE_BG:=red}
+: ${AGNOSTER_HG_CHANGED_FG:=black}
+: ${AGNOSTER_HG_CHANGED_BG:=yellow}
+: ${AGNOSTER_HG_CLEAN_FG:=${CURRENT_FG}}
+: ${AGNOSTER_HG_CLEAN_BG:=green}
+
+# VirtualEnv colors
+: ${AGNOSTER_VENV_FG:=black}
+: ${AGNOSTER_VENV_BG:=blue}
+
+# AWS Profile colors
+: ${AGNOSTER_AWS_PROD_FG:=yellow}
+: ${AGNOSTER_AWS_PROD_BG:=red}
+: ${AGNOSTER_AWS_FG:=black}
+: ${AGNOSTER_AWS_BG:=green}
+
+# Status symbols
+: ${AGNOSTER_STATUS_RETVAL_FG:=red}
+: ${AGNOSTER_STATUS_ROOT_FG:=yellow}
+: ${AGNOSTER_STATUS_JOB_FG:=cyan}
+: ${AGNOSTER_STATUS_FG:=${CURRENT_DEFAULT_FG}}
+: ${AGNOSTER_STATUS_BG:=black}
+
+## Non-Color settings - set to 'true' to enable
+# Show the actual numeric return value rather than a cross symbol.
+: ${AGNOSTER_STATUS_RETVAL_NUMERIC:=false}
+# Show git working dir in the style "/git/root   master  relative/dir" instead of "/git/root/relative/dir   master"
+: ${AGNOSTER_GIT_INLINE:=false}
+# Show the git branch status in the prompt rather than the generic branch symbol
+: ${AGNOSTER_GIT_BRANCH_STATUS:=true}
+
+
 # Special Powerline characters
 
 () {
@@ -83,20 +147,40 @@ prompt_end() {
   CURRENT_BG=''
 }
 
+git_toplevel() {
+	local repo_root=$(git rev-parse --show-toplevel)
+	if [[ $repo_root = '' ]]; then
+		# We are in a bare repo. Use git dir as root
+		repo_root=$(git rev-parse --git-dir)
+		if [[ $repo_root = '.' ]]; then
+			repo_root=$PWD
+		fi
+	fi
+	echo -n $repo_root
+}
+
 ### Prompt components
 # Each component will draw itself, and hide itself if no information needs to be shown
 
 # Context: user@hostname (who am I and where am I)
 prompt_context() {
   if [[ "$USERNAME" != "$DEFAULT_USER" || -n "$SSH_CLIENT" ]]; then
-    prompt_segment black default "%(!.%{%F{yellow}%}.)%n@%m"
+    prompt_segment "$AGNOSTER_CONTEXT_BG" "$AGNOSTER_CONTEXT_FG" "%(!.%{%F{$AGNOSTER_STATUS_ROOT_FG}%}.)%n@%m"
   fi
 }
 
+prompt_git_relative() {
+  local repo_root=$(git_toplevel)
+  local path_in_repo=$(pwd | sed "s/^$(echo "$repo_root" | sed 's:/:\\/:g;s/\$/\\$/g')//;s:^/::;s:/$::;")
+  if [[ $path_in_repo != '' ]]; then
+    prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" "$path_in_repo"
+  fi;
+}
+
 # Git: branch/detached head, dirty status
 prompt_git() {
   (( $+commands[git] )) || return
-  if [[ "$(git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]]; then
+  if [[ "$(command git config --get oh-my-zsh.hide-status 2>/dev/null)" = 1 ]]; then
     return
   fi
   local PL_BRANCH_CHAR
@@ -106,14 +190,29 @@ prompt_git() {
   }
   local ref dirty mode repo_path
 
-   if [[ "$(git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then
-    repo_path=$(git rev-parse --git-dir 2>/dev/null)
+   if [[ "$(command git rev-parse --is-inside-work-tree 2>/dev/null)" = "true" ]]; then
+    repo_path=$(command git rev-parse --git-dir 2>/dev/null)
     dirty=$(parse_git_dirty)
-    ref=$(git symbolic-ref HEAD 2> /dev/null) || ref="➦ $(git rev-parse --short HEAD 2> /dev/null)"
+    ref=$(command git symbolic-ref HEAD 2> /dev/null) || \
+    ref="◈ $(command git describe --exact-match --tags HEAD 2> /dev/null)" || \
+    ref="➦ $(command git rev-parse --short HEAD 2> /dev/null)"
     if [[ -n $dirty ]]; then
-      prompt_segment yellow black
+      prompt_segment "$AGNOSTER_GIT_DIRTY_BG" "$AGNOSTER_GIT_DIRTY_FG"
     else
-      prompt_segment green $CURRENT_FG
+      prompt_segment "$AGNOSTER_GIT_CLEAN_BG" "$AGNOSTER_GIT_CLEAN_FG"
+    fi
+
+    if [[ $AGNOSTER_GIT_BRANCH_STATUS == 'true' ]]; then
+      local ahead behind
+      ahead=$(command git log --oneline @{upstream}.. 2>/dev/null)
+      behind=$(command git log --oneline ..@{upstream} 2>/dev/null)
+      if [[ -n "$ahead" ]] && [[ -n "$behind" ]]; then
+        PL_BRANCH_CHAR=$'\u21c5'
+      elif [[ -n "$ahead" ]]; then
+        PL_BRANCH_CHAR=$'\u21b1'
+      elif [[ -n "$behind" ]]; then
+        PL_BRANCH_CHAR=$'\u21b0'
+      fi
     fi
 
     if [[ -e "${repo_path}/BISECT_LOG" ]]; then
@@ -136,6 +235,7 @@ prompt_git() {
     zstyle ':vcs_info:*' actionformats ' %u%c'
     vcs_info
     echo -n "${${ref:gs/%/%%}/refs\/heads\//$PL_BRANCH_CHAR }${vcs_info_msg_0_%% }${mode}"
+    [[ $AGNOSTER_GIT_INLINE == 'true' ]] && prompt_git_relative
   fi
 }
 
@@ -150,17 +250,17 @@ prompt_bzr() {
   done
 
   local bzr_status status_mod status_all revision
-  if bzr_status=$(bzr status 2>&1); then
+  if bzr_status=$(command bzr status 2>&1); then
     status_mod=$(echo -n "$bzr_status" | head -n1 | grep "modified" | wc -m)
     status_all=$(echo -n "$bzr_status" | head -n1 | wc -m)
-    revision=${$(bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
+    revision=${$(command bzr log -r-1 --log-format line | cut -d: -f1):gs/%/%%}
     if [[ $status_mod -gt 0 ]] ; then
-      prompt_segment yellow black "bzr@$revision ✚"
+      prompt_segment "$AGNOSTER_BZR_DIRTY_BG" "$AGNOSTER_BZR_DIRTY_FG" "bzr@$revision ✚"
     else
       if [[ $status_all -gt 0 ]] ; then
-        prompt_segment yellow black "bzr@$revision"
+        prompt_segment "$AGNOSTER_BZR_DIRTY_BG" "$AGNOSTER_BZR_DIRTY_FG" "bzr@$revision"
       else
-        prompt_segment green black "bzr@$revision"
+        prompt_segment "$AGNOSTER_BZR_CLEAN_BG" "$AGNOSTER_BZR_CLEAN_FG" "bzr@$revision"
       fi
     fi
   fi
@@ -169,33 +269,33 @@ prompt_bzr() {
 prompt_hg() {
   (( $+commands[hg] )) || return
   local rev st branch
-  if $(hg id >/dev/null 2>&1); then
-    if $(hg prompt >/dev/null 2>&1); then
-      if [[ $(hg prompt "{status|unknown}") = "?" ]]; then
+  if $(command hg id >/dev/null 2>&1); then
+    if $(command hg prompt >/dev/null 2>&1); then
+      if [[ $(command hg prompt "{status|unknown}") = "?" ]]; then
         # if files are not added
-        prompt_segment red white
+        prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
         st='±'
-      elif [[ -n $(hg prompt "{status|modified}") ]]; then
+      elif [[ -n $(command hg prompt "{status|modified}") ]]; then
         # if any modification
-        prompt_segment yellow black
+        prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
         st='±'
       else
         # if working copy is clean
-        prompt_segment green $CURRENT_FG
+        prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"
       fi
-      echo -n ${$(hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
+      echo -n ${$(command hg prompt "☿ {rev}@{branch}"):gs/%/%%} $st
     else
       st=""
-      rev=$(hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
-      branch=$(hg id -b 2>/dev/null)
-      if `hg st | grep -q "^\?"`; then
-        prompt_segment red black
+      rev=$(command hg id -n 2>/dev/null | sed 's/[^-0-9]//g')
+      branch=$(command hg id -b 2>/dev/null)
+      if command hg st | command grep -q "^\?"; then
+        prompt_segment "$AGNOSTER_HG_NEWFILE_BG" "$AGNOSTER_HG_NEWFILE_FG"
         st='±'
-      elif `hg st | grep -q "^[MA]"`; then
-        prompt_segment yellow black
+      elif command hg st | command grep -q "^[MA]"; then
+        prompt_segment "$AGNOSTER_HG_CHANGED_BG" "$AGNOSTER_HG_CHANGED_FG"
         st='±'
       else
-        prompt_segment green $CURRENT_FG
+        prompt_segment "$AGNOSTER_HG_CLEAN_BG" "$AGNOSTER_HG_CLEAN_FG"
       fi
       echo -n "☿ ${rev:gs/%/%%}@${branch:gs/%/%%}" $st
     fi
@@ -204,13 +304,21 @@ prompt_hg() {
 
 # Dir: current working directory
 prompt_dir() {
-  prompt_segment blue $CURRENT_FG '%~'
+  if [[ $AGNOSTER_GIT_INLINE == 'true' ]] && $(git rev-parse --is-inside-work-tree >/dev/null 2>&1); then
+    # Git repo and inline path enabled, hence only show the git root
+    prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" "$(git_toplevel | sed "s:^$HOME:~:")"
+  else
+    prompt_segment "$AGNOSTER_DIR_BG" "$AGNOSTER_DIR_FG" '%~'
+  fi
 }
 
 # Virtualenv: current working virtualenv
 prompt_virtualenv() {
+  if [ -n "$CONDA_DEFAULT_ENV" ]; then
+    prompt_segment magenta $CURRENT_FG "🐍 $CONDA_DEFAULT_ENV"
+  fi
   if [[ -n "$VIRTUAL_ENV" && -n "$VIRTUAL_ENV_DISABLE_PROMPT" ]]; then
-    prompt_segment blue black "(${VIRTUAL_ENV:t:gs/%/%%})"
+    prompt_segment "$AGNOSTER_VENV_BG" "$AGNOSTER_VENV_FG" "(${VIRTUAL_ENV:t:gs/%/%%})"
   fi
 }
 
@@ -221,11 +329,15 @@ prompt_virtualenv() {
 prompt_status() {
   local -a symbols
 
-  [[ $RETVAL -ne 0 ]] && symbols+="%{%F{red}%}✘"
-  [[ $UID -eq 0 ]] && symbols+="%{%F{yellow}%}⚡"
-  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{cyan}%}⚙"
+  if [[ $AGNOSTER_STATUS_RETVAL_NUMERIC == 'true' ]]; then
+    [[ $RETVAL -ne 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_RETVAL_FG}%}$RETVAL"
+  else
+    [[ $RETVAL -ne 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_RETVAL_FG}%}✘"
+  fi
+  [[ $UID -eq 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_ROOT_FG}%}⚡"
+  [[ $(jobs -l | wc -l) -gt 0 ]] && symbols+="%{%F{$AGNOSTER_STATUS_JOB_FG}%}⚙"
 
-  [[ -n "$symbols" ]] && prompt_segment black default "$symbols"
+  [[ -n "$symbols" ]] && prompt_segment "$AGNOSTER_STATUS_BG" "$AGNOSTER_STATUS_FG" "$symbols"
 }
 
 #AWS Profile:
@@ -236,17 +348,24 @@ prompt_status() {
 prompt_aws() {
   [[ -z "$AWS_PROFILE" || "$SHOW_AWS_PROMPT" = false ]] && return
   case "$AWS_PROFILE" in
-    *-prod|*production*) prompt_segment red yellow  "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
-    *) prompt_segment green black "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
+    *-prod|*production*) prompt_segment "$AGNOSTER_AWS_PROD_BG" "$AGNOSTER_AWS_PROD_FG"  "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
+    *) prompt_segment "$AGNOSTER_AWS_BG" "$AGNOSTER_AWS_FG" "AWS: ${AWS_PROFILE:gs/%/%%}" ;;
   esac
 }
 
+prompt_terraform() {
+  local terraform_info=$(tf_prompt_info)
+  [[ -z "$terraform_info" ]] && return
+  prompt_segment magenta yellow "TF: $terraform_info"
+}
+
 ## Main prompt
 build_prompt() {
   RETVAL=$?
   prompt_status
   prompt_virtualenv
   prompt_aws
+  prompt_terraform
   prompt_context
   prompt_dir
   prompt_git
diff --git a/zsh/themes/amuse.zsh-theme b/zsh/themes/amuse.zsh-theme
index 3f7ec0b..cddbcd4 100644
--- a/zsh/themes/amuse.zsh-theme
+++ b/zsh/themes/amuse.zsh-theme
@@ -11,8 +11,14 @@ ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg_bold[red]%}‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%{$reset_color%}"
 
 PROMPT='
-%{$fg_bold[green]%}%~%{$reset_color%}$(git_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
+%{$fg_bold[green]%}%~%{$reset_color%}$(git_prompt_info)$(virtualenv_prompt_info) ⌚ %{$fg_bold[red]%}%*%{$reset_color%}
 $ '
 
 RPROMPT='$(ruby_prompt_info)'
 
+VIRTUAL_ENV_DISABLE_PROMPT=0
+ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX=" %{$fg[green]%}🐍 "
+ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX="%{$reset_color%}"
+ZSH_THEME_VIRTUALENV_PREFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_PREFIX
+ZSH_THEME_VIRTUALENV_SUFFIX=$ZSH_THEME_VIRTUAL_ENV_PROMPT_SUFFIX
+
diff --git a/zsh/themes/aussiegeek.zsh-theme b/zsh/themes/aussiegeek.zsh-theme
index 2ded5c1..9ea6662 100644
--- a/zsh/themes/aussiegeek.zsh-theme
+++ b/zsh/themes/aussiegeek.zsh-theme
@@ -1,8 +1,8 @@
+PROMPT="%{${fg_bold[blue]}%}[ %{${fg[red]}%}%t %{${fg_bold[blue]}%}] %{${fg_bold[blue]}%} [ %{${fg[red]}%}%n@%m:%~\$(git_prompt_info)%{${fg[yellow]}%}\$(ruby_prompt_info)%{${fg_bold[blue]}%} ]%{$reset_color%}
+ $ "
 
-PROMPT='$fg_bold[blue][ $fg[red]%t $fg_bold[blue]] $fg_bold[blue] [ $fg[red]%n@%m:%~$(git_prompt_info)$fg[yellow]$(ruby_prompt_info)$fg_bold[blue] ]$reset_color
- $ '
 # git theming
-ZSH_THEME_GIT_PROMPT_PREFIX="$fg_bold[green]("
-ZSH_THEME_GIT_PROMPT_SUFFIX=")"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{${fg_bold[green]}%}("
+ZSH_THEME_GIT_PROMPT_SUFFIX=")%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="✔"
 ZSH_THEME_GIT_PROMPT_DIRTY="✗"
diff --git a/zsh/themes/avit.zsh-theme b/zsh/themes/avit.zsh-theme
index f90ba33..0e39d90 100644
--- a/zsh/themes/avit.zsh-theme
+++ b/zsh/themes/avit.zsh-theme
@@ -11,7 +11,12 @@ $(_user_host)${_current_dir} $(git_prompt_info) $(ruby_prompt_info)
 
 PROMPT2='%{%(!.${fg[red]}.${fg[white]})%}◀%{$reset_color%} '
 
-RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
+__RPROMPT='$(vi_mode_prompt_info)%{$(echotc UP 1)%}$(_git_time_since_commit) $(git_prompt_status) ${_return_status}%{$(echotc DO 1)%}'
+if [[ -z $RPROMPT ]]; then
+  RPROMPT=$__RPROMPT
+else
+  RPROMPT="${RPROMPT} ${__RPROMPT}"
+fi
 
 function _user_host() {
   local me
@@ -82,4 +87,4 @@ ZSH_THEME_GIT_TIME_SINCE_COMMIT_NEUTRAL="%{$fg[white]%}"
 # LS colors, made with https://geoff.greer.fm/lscolors/
 export LSCOLORS="exfxcxdxbxegedabagacad"
 export LS_COLORS='di=34;40:ln=35;40:so=32;40:pi=33;40:ex=31;40:bd=34;46:cd=34;43:su=0;41:sg=0;46:tw=0;42:ow=0;43:'
-export GREP_COLOR='1;33'
+export GREP_COLORS='mt=1;33'
diff --git a/zsh/themes/bira.zsh-theme b/zsh/themes/bira.zsh-theme
index 42a70a0..acfe6dc 100644
--- a/zsh/themes/bira.zsh-theme
+++ b/zsh/themes/bira.zsh-theme
@@ -2,14 +2,20 @@ local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 local user_host="%B%(!.%{$fg[red]%}.%{$fg[green]%})%n@%m%{$reset_color%} "
 local user_symbol='%(!.#.$)'
 local current_dir="%B%{$fg[blue]%}%~ %{$reset_color%}"
+local conda_prompt='$(conda_prompt_info)'
 
 local vcs_branch='$(git_prompt_info)$(hg_prompt_info)'
 local rvm_ruby='$(ruby_prompt_info)'
 local venv_prompt='$(virtualenv_prompt_info)'
+if [[ "${plugins[@]}" =~ 'kube-ps1' ]]; then
+    local kube_prompt='$(kube_ps1)'
+else
+    local kube_prompt=''
+fi
 
 ZSH_THEME_RVM_PROMPT_OPTIONS="i v g"
 
-PROMPT="╭─${user_host}${current_dir}${rvm_ruby}${vcs_branch}${venv_prompt}
+PROMPT="╭─${conda_prompt}${user_host}${current_dir}${rvm_ruby}${vcs_branch}${venv_prompt}${kube_prompt}
 ╰─%B${user_symbol}%b "
 RPROMPT="%B${return_code}%b"
 
diff --git a/zsh/themes/blinks.zsh-theme b/zsh/themes/blinks.zsh-theme
index ddb32f7..736683c 100644
--- a/zsh/themes/blinks.zsh-theme
+++ b/zsh/themes/blinks.zsh-theme
@@ -11,11 +11,11 @@ function _prompt_char() {
 # This theme works with both the "dark" and "light" variants of the
 # Solarized color schema.  Set the SOLARIZED_THEME variable to one of
 # these two values to choose.  If you don't specify, we'll assume you're
-# using the "dark" variant.
+# using neither variant.
 
 case ${SOLARIZED_THEME:-dark} in
     light) bkg=white;;
-    *)     bkg=black;;
+    *)  bkg=default;;
 esac
 
 ZSH_THEME_GIT_PROMPT_PREFIX=" [%{%B%F{blue}%}"
diff --git a/zsh/themes/bureau.zsh-theme b/zsh/themes/bureau.zsh-theme
index 698aa2f..e87a594 100644
--- a/zsh/themes/bureau.zsh-theme
+++ b/zsh/themes/bureau.zsh-theme
@@ -15,6 +15,7 @@ ZSH_THEME_GIT_PROMPT_BEHIND="%{$fg[magenta]%}▾%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_STAGED="%{$fg_bold[green]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg_bold[yellow]%}●%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_UNTRACKED="%{$fg_bold[red]%}●%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_STASHED="(%{$fg_bold[blue]%}✹%{$reset_color%})"
 
 bureau_git_info () {
   local ref
@@ -67,6 +68,12 @@ bureau_git_status() {
 }
 
 bureau_git_prompt() {
+  # ignore non git folders and hidden repos (adapted from lib/git.zsh)
+  if ! command git rev-parse --git-dir &> /dev/null \
+     || [[ "$(command git config --get oh-my-zsh.hide-info 2>/dev/null)" == 1 ]]; then
+    return
+  fi
+
   # check git information
   local gitinfo=$(bureau_git_info)
   if [[ -z "$gitinfo" ]]; then
diff --git a/zsh/themes/crunch.zsh-theme b/zsh/themes/crunch.zsh-theme
index 8278661..d86ce1e 100644
--- a/zsh/themes/crunch.zsh-theme
+++ b/zsh/themes/crunch.zsh-theme
@@ -1,15 +1,15 @@
 # CRUNCH - created from Steve Eley's cat waxing.
 # Initially hacked from the Dallas theme. Thanks, Dallas Reedy.
 #
-# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine, 
-# and eschews the standard space-consuming user and hostname info.  Instead, only the 
+# This theme assumes you do most of your oh-my-zsh'ed "colorful" work at a single machine,
+# and eschews the standard space-consuming user and hostname info.  Instead, only the
 # things that vary in my own workflow are shown:
 #
 # * The time (not the date)
 # * The RVM version and gemset (omitting the 'ruby' name if it's MRI)
 # * The current directory
 # * The Git branch and its 'dirty' state
-# 
+#
 # Colors are at the top so you can mess with those separately if you like.
 # For the most part I stuck with Dallas's.
 
diff --git a/zsh/themes/dpoggi.zsh-theme b/zsh/themes/dpoggi.zsh-theme
index 6469a20..1d1e341 100644
--- a/zsh/themes/dpoggi.zsh-theme
+++ b/zsh/themes/dpoggi.zsh-theme
@@ -1,10 +1,7 @@
 if [ $UID -eq 0 ]; then NCOLOR="red"; else NCOLOR="green"; fi
 local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
-PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m\
-%{$reset_color%}:%{$fg[magenta]%}%~\
-$(git_prompt_info) \
-%{$fg[red]%}%(!.#.»)%{$reset_color%} '
+PROMPT='%{$fg[$NCOLOR]%}%n%{$reset_color%}@%{$fg[cyan]%}%m%{$reset_color%}:%{$fg[magenta]%}%~$(git_prompt_info) %{$fg[red]%}%(!.#.»)%{$reset_color%} '
 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
 RPS1='${return_code}'
 
diff --git a/zsh/themes/eastwood.zsh-theme b/zsh/themes/eastwood.zsh-theme
index 88134f8..31e24fa 100644
--- a/zsh/themes/eastwood.zsh-theme
+++ b/zsh/themes/eastwood.zsh-theme
@@ -1,5 +1,5 @@
 # RVM settings
-if [[ -s ~/.rvm/scripts/rvm ]] ; then 
+if [[ -s ~/.rvm/scripts/rvm ]] ; then
   RPS1="%{$fg[yellow]%}rvm:%{$reset_color%}%{$fg[red]%}\$(~/.rvm/bin/rvm-prompt)%{$reset_color%} $EPS1"
 else
   if which rbenv &> /dev/null; then
diff --git a/zsh/themes/emotty.zsh-theme b/zsh/themes/emotty.zsh-theme
index ba08409..0fea7d9 100644
--- a/zsh/themes/emotty.zsh-theme
+++ b/zsh/themes/emotty.zsh-theme
@@ -11,7 +11,7 @@
 #
 # There are pre-defined different emoji sets to choose from, e.g.:
 # emoji, stellar, floral, zodiac, love (see emotty plugin).
-# 
+#
 # To choose a different emotty set than the default (emoji)
 # % export emotty_set=nature
 #
@@ -95,7 +95,7 @@ zstyle ':vcs_info:*' stagedstr "${green}${vcs_staged_glyph}"
 # %(k|f) reset (back|fore)ground color
 zstyle ':vcs_info:*' max-exports 3
 zstyle ':vcs_info:*' nvcsformats "${prompt_glyph}" '%3~' ''
-zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]" 
+zstyle ':vcs_info:*' formats "${yellow}%u%c%b${vcs_branch_glyph}%f" '%S|' "$FX[bold]%r$FX[no-bold]"
 zstyle ':vcs_info:*' actionformats "${red}%K{white}%a${vcs_action_glyph}%k%f" '%S|' "$FX[bold]%r$FX[no-bold]"
 
 red_if_root="%(!.%F{red}.)"
diff --git a/zsh/themes/essembeh.zsh-theme b/zsh/themes/essembeh.zsh-theme
index 43d4093..65abe3a 100644
--- a/zsh/themes/essembeh.zsh-theme
+++ b/zsh/themes/essembeh.zsh-theme
@@ -8,24 +8,10 @@
 #   - prefix to detect docker containers or chroot
 #   - git plugin to display current branch and status
 
-# git plugin 
+# git plugin
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}("
 ZSH_THEME_GIT_PROMPT_SUFFIX=") %{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_UNTRACKED="%%"
-ZSH_THEME_GIT_PROMPT_ADDED="+"
-ZSH_THEME_GIT_PROMPT_MODIFIED="*"
-ZSH_THEME_GIT_PROMPT_RENAMED="~"
-ZSH_THEME_GIT_PROMPT_DELETED="!"
-ZSH_THEME_GIT_PROMPT_UNMERGED="?"
 
-function zsh_essembeh_gitstatus {
-	ref=$(git symbolic-ref HEAD 2> /dev/null) || return
-	GIT_STATUS=$(git_prompt_status)
-	if [[ -n $GIT_STATUS ]]; then
-		GIT_STATUS=" $GIT_STATUS"
-	fi
-	echo "$ZSH_THEME_GIT_PROMPT_PREFIX${ref#refs/heads/}$GIT_STATUS$ZSH_THEME_GIT_PROMPT_SUFFIX"
-}
 
 # by default, use green for user@host and no prefix
 local ZSH_ESSEMBEH_COLOR="green"
@@ -35,7 +21,7 @@ if [[ -n "$SSH_CONNECTION" ]]; then
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[$(echo $SSH_CONNECTION | awk '{print $1}')]%{$reset_color%} "
 	# use red color to highlight a remote connection
 	ZSH_ESSEMBEH_COLOR="red"
-elif [[ -r /etc/debian_chroot ]]; then 
+elif [[ -r /etc/debian_chroot ]]; then
 	# prefix prompt in case of chroot
 	ZSH_ESSEMBEH_PREFIX="%{$fg[yellow]%}[chroot:$(cat /etc/debian_chroot)]%{$reset_color%} "
 elif [[ -r /.dockerenv ]]; then
@@ -46,5 +32,5 @@ if [[ $UID = 0 ]]; then
 	# always use magenta for root sessions, even in ssh
 	ZSH_ESSEMBEH_COLOR="magenta"
 fi
-PROMPT='${ZSH_ESSEMBEH_PREFIX}%{$fg[$ZSH_ESSEMBEH_COLOR]%}%n@%M%{$reset_color%}:%{%B$fg[yellow]%}%~%{$reset_color%b%} $(zsh_essembeh_gitstatus)%(!.#.$) '
+PROMPT='${ZSH_ESSEMBEH_PREFIX}%{$fg[$ZSH_ESSEMBEH_COLOR]%}%n@%M%{$reset_color%}:%{%B$fg[yellow]%}%~%{$reset_color%b%} $(git_prompt_info)%(!.#.$) '
 RPROMPT="%(?..%{$fg[red]%}%?%{$reset_color%})"
diff --git a/zsh/themes/fino-time.zsh-theme b/zsh/themes/fino-time.zsh-theme
index c7e2d96..3f9360a 100644
--- a/zsh/themes/fino-time.zsh-theme
+++ b/zsh/themes/fino-time.zsh-theme
@@ -12,6 +12,7 @@
 # Also borrowing from http://stevelosh.com/blog/2010/02/my-extravagant-zsh-prompt/
 
 function virtualenv_info {
+    [ $CONDA_DEFAULT_ENV ] && echo "($CONDA_DEFAULT_ENV) "
     [ $VIRTUAL_ENV ] && echo '('`basename $VIRTUAL_ENV`') '
 }
 
diff --git a/zsh/themes/fishy.zsh-theme b/zsh/themes/fishy.zsh-theme
index 2b8d559..3b975c8 100644
--- a/zsh/themes/fishy.zsh-theme
+++ b/zsh/themes/fishy.zsh-theme
@@ -16,7 +16,8 @@ _fishy_collapsed_wd() {
 }
 
 local user_color='green'; [ $UID -eq 0 ] && user_color='red'
-PROMPT='%n@%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '
+local host_color='white'; [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ] && host_color='yellow'
+PROMPT='%{$fg[$user_color]%}%n%{$reset_color%}@%{$fg[$host_color]%}%m %{$fg[$user_color]%}$(_fishy_collapsed_wd)%{$reset_color%}%(!.#.>) '
 PROMPT2='%{$fg[red]%}\ %{$reset_color%}'
 
 local return_status="%{$fg_bold[red]%}%(?..%?)%{$reset_color%}"
diff --git a/zsh/themes/gallois.zsh-theme b/zsh/themes/gallois.zsh-theme
index bb97bfb..3fc3490 100644
--- a/zsh/themes/gallois.zsh-theme
+++ b/zsh/themes/gallois.zsh-theme
@@ -1,24 +1,140 @@
 # Depends on the git plugin for work_in_progress()
 (( $+functions[work_in_progress] )) || work_in_progress() {}
 
-ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
-ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg[cyan]%}[%{$fg[green]%}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg[cyan]%}]"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_CLEAN=""
 
 # Customized git status, oh-my-zsh currently does not allow render dirty status before branch
 git_custom_status() {
   local branch=$(git_current_branch)
   [[ -n "$branch" ]] || return 0
-  echo "$(parse_git_dirty)\
-%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
-${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+  print "%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
+${ZSH_THEME_GIT_PROMPT_PREFIX}$(parse_git_dirty)${branch}\
+${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+}
+autoload -U colors && colors
+
+#export VCS_PROMPT=hg_prompt_info
+export VCS_PROMPT=git_custom_status
+
+base_prompt="%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b "
+custom_prompt=""
+last_run_time=""
+last_vcs_info=""
+
+
+function pipestatus_parse {
+  PIPESTATUS="$pipestatus"
+  ERROR=0
+  for i in "${(z)PIPESTATUS}"; do
+      if [[ "$i" -ne 0 ]]; then
+          ERROR=1
+      fi
+  done
+
+  if [[ "$ERROR" -ne 0 ]]; then
+      print "[%{$fg[red]%}$PIPESTATUS%{$fg[cyan]%}]"
+  fi
 }
 
-# RVM component of prompt
-ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
-ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
 
 # Combine it all into a final right-side prompt
-RPS1="\$(git_custom_status)\$(ruby_prompt_info)${RPS1:+ $RPS1}"
 PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
+function preexec() {
+    last_run_time=$(perl -MTime::HiRes=time -e 'printf "%.9f\n", time')
+}
+
+function duration() {
+    local duration
+    local now=$(perl -MTime::HiRes=time -e 'printf "%.9f\n", time')
+    local last=$1
+    local last_split=("${(@s/./)last}")
+    local now_split=("${(@s/./)now}")
+    local T=$((now_split[1] - last_split[1]))
+    local D=$((T/60/60/24))
+    local H=$((T/60/60%24))
+    local M=$((T/60%60))
+    local S=$((T%60))
+    local s=$(((now_split[2] - last_split[2]) / 1000000000.))
+    local m=$(((now_split[2] - last_split[2]) / 1000000.))
+
+    (( $D > 0 )) && duration+="${D}d"
+    (( $H > 0 )) && duration+="${H}h"
+    (( $M > 0 )) && duration+="${M}m"
+
+    if [[ $S -le 0 ]]; then
+        printf "%ims" "$m"
+    else
+        if ! [[ -z $duration ]] && printf "%s" "$duration"
+        local sec_milli=$((S + s))
+        printf "%.3fs" "$sec_milli"
+    fi
+}
+
+function precmd() {
+    RETVAL=$(pipestatus_parse)
+    local info=""
+
+    if [ ! -z "$last_run_time" ]; then
+        local elapsed=$(duration $last_run_time)
+        last_run_time=$(print $last_run_time | tr -d ".")
+        if [ $(( $(perl -MTime::HiRes=time -e 'printf "%.9f\n", time' | tr -d ".") - $last_run_time )) -gt $(( 120 * 1000 * 1000 * 1000 )) ]; then
+            local elapsed_color="%{$fg[magenta]%}"
+        elif [ $(( $(perl -MTime::HiRes=time -e 'printf "%.9f\n", time' | tr -d ".") - $last_run_time )) -gt $(( 60 * 1000 * 1000 * 1000 )) ]; then
+            local elapsed_color="%{$fg[red]%}"
+        elif [ $(( $(perl -MTime::HiRes=time -e 'printf "%.9f\n", time' | tr -d ".") - $last_run_time )) -gt $(( 10 * 1000 * 1000 * 1000 )) ]; then
+            local elapsed_color="%{$fg[yellow]%}"
+        else
+            local elapsed_color="%{$fg[green]%}"
+        fi
+        info=$(printf "%s%s%s%s%s" "%{$fg[cyan]%}[" "$elapsed_color" "$elapsed" "%{$fg[cyan]%}]" "$RETVAL")
+        unset last_run_time
+    fi
+
+    if [ -z "$info" -a ! -z "$last_vcs_info" ]; then
+        custom_prompt="$last_vcs_info$base_prompt"
+        return;
+    fi
+
+    if (( ${+VCS_PROMPT} )); then
+        last_vcs_info=$($VCS_PROMPT)
+        if [ ! -z "$last_vcs_info" ]; then
+            [ -z "$info" ] && info=$last_vcs_info || info="$info$last_vcs_info"
+        fi
+    fi
+
+    [ -z "$info" ] && custom_prompt="$base_prompt" || custom_prompt="$info$base_prompt"
+}
+
+function hg_prompt_info() {
+    unset output info parts branch_parts branch
+
+    local output=""
+    if ! output="$(hg status 2> /dev/null)"; then
+        return
+    fi
+
+    local info=$(hg log -l1 --template '{author}:{node|short}:{remotenames}:{phabdiff}')
+    local parts=(${(@s/:/)info})
+    local branch_parts=(${(@s,/,)parts[3]})
+    local branch=${branch_parts[-1]}
+    [ ! -z "${parts[3]}" ] && [[ "${parts[1]}" =~ "$USER@" ]] && branch=${parts[3]}
+    [ -z "${parts[3]}" ] && branch=${parts[2]}
+
+    if [[ ! -z "$output" ]]; then
+        local color="%{$fg[red]%}"
+    elif [[ "${branch}" == "master" || "${branch}" == "warm" ]]; then
+        local color="%{$fg[yellow]%}"
+    else
+        local color="%{$fg[green]%}"
+    fi
+
+    print "%{$fg[cyan]%}[${color}${branch}%{$fg[cyan]%}]"
+}
+
+setopt PROMPT_SUBST
+PROMPT='$custom_prompt'
+
+
diff --git a/zsh/themes/gnzh.zsh-theme b/zsh/themes/gnzh.zsh-theme
index 1e6c4e9..0297a6f 100644
--- a/zsh/themes/gnzh.zsh-theme
+++ b/zsh/themes/gnzh.zsh-theme
@@ -21,7 +21,7 @@ fi
 if [[ -n "$SSH_CLIENT"  ||  -n "$SSH2_CLIENT" ]]; then
   PR_HOST='%F{red}%M%f' # SSH
 else
-  PR_HOST='%F{green}%M%f' # no SSH
+  PR_HOST='%F{green}%m%f' # no SSH
 fi
 
 
@@ -30,8 +30,9 @@ local return_code="%(?..%F{red}%? ↵%f)"
 local user_host="${PR_USER}%F{cyan}@${PR_HOST}"
 local current_dir="%B%F{blue}%~%f%b"
 local git_branch='$(git_prompt_info)'
+local venv_prompt='$(virtualenv_prompt_info)' 
 
-PROMPT="╭─${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
+PROMPT="╭─${venv_prompt}${user_host} ${current_dir} \$(ruby_prompt_info) ${git_branch}
 ╰─$PR_PROMPT "
 RPROMPT="${return_code}"
 
@@ -39,5 +40,7 @@ ZSH_THEME_GIT_PROMPT_PREFIX="%F{yellow}‹"
 ZSH_THEME_GIT_PROMPT_SUFFIX="› %f"
 ZSH_THEME_RUBY_PROMPT_PREFIX="%F{red}‹"
 ZSH_THEME_RUBY_PROMPT_SUFFIX="›%f"
+ZSH_THEME_VIRTUALENV_PREFIX="%F{red}("
+ZSH_THEME_VIRTUALENV_SUFFIX=")%f "
 
 }
diff --git a/zsh/themes/half-life.zsh-theme b/zsh/themes/half-life.zsh-theme
index c4d7851..2ad84ac 100644
--- a/zsh/themes/half-life.zsh-theme
+++ b/zsh/themes/half-life.zsh-theme
@@ -89,5 +89,9 @@ ZSH_THEME_RUBY_PROMPT_PREFIX="with%F{red} "
 ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
 ZSH_THEME_RVM_PROMPT_OPTIONS="v g"
 
+# virtualenv prompt settings
+ZSH_THEME_VIRTUALENV_PREFIX=" with%F{red} "
+ZSH_THEME_VIRTUALENV_SUFFIX="%{$reset_color%}"
+
 setopt prompt_subst
-PROMPT="${purple}%n%{$reset_color%} in ${limegreen}%~%{$reset_color%}\$(ruby_prompt_info)\$vcs_info_msg_0_${orange} λ%{$reset_color%} "
+PROMPT="${purple}%n%{$reset_color%} in ${limegreen}%~%{$reset_color%}\$(virtualenv_prompt_info)\$(ruby_prompt_info)\$vcs_info_msg_0_${orange} λ%{$reset_color%} "
diff --git a/zsh/themes/jonathan.zsh-theme b/zsh/themes/jonathan.zsh-theme
index e8c4908..5185ebf 100644
--- a/zsh/themes/jonathan.zsh-theme
+++ b/zsh/themes/jonathan.zsh-theme
@@ -7,14 +7,16 @@ function theme_precmd {
   local promptsize=${#${(%):---(%n@%m:%l)---()--}}
   local rubypromptsize=${#${(%)$(ruby_prompt_info)}}
   local pwdsize=${#${(%):-%~}}
+  local venvpromptsize=$((${#$(virtualenv_prompt_info)}))
+  local condapromptsize=$((${#$(conda_prompt_info)}))
 
   # Truncate the path if it's too long.
-  if (( promptsize + rubypromptsize + pwdsize > TERMWIDTH )); then
+  if (( promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize > TERMWIDTH )); then
     (( PR_PWDLEN = TERMWIDTH - promptsize ))
   elif [[ "${langinfo[CODESET]}" = UTF-8 ]]; then
-    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${PR_HBAR}:)}"
+    PR_FILLBAR="\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${PR_HBAR}:)}"
   else
-    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
+    PR_FILLBAR="${PR_SHIFT_IN}\${(l:$(( TERMWIDTH - (promptsize + rubypromptsize + pwdsize + venvpromptsize + condapromptsize ) ))::${altchar[q]:--}:)}${PR_SHIFT_OUT}"
   fi
 }
 
@@ -103,7 +105,7 @@ fi
 PROMPT='${PR_SET_CHARSET}${PR_STITLE}${(e)PR_TITLEBAR}\
 ${PR_CYAN}${PR_ULCORNER}${PR_HBAR}${PR_GREY}(\
 ${PR_GREEN}%${PR_PWDLEN}<...<%~%<<\
-${PR_GREY})$(ruby_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
+${PR_GREY})$(virtualenv_prompt_info)$(ruby_prompt_info)$(conda_prompt_info)${PR_CYAN}${PR_HBAR}${PR_HBAR}${(e)PR_FILLBAR}${PR_HBAR}${PR_GREY}(\
 ${PR_CYAN}%(!.%SROOT%s.%n)${PR_GREY}@${PR_GREEN}%m:%l\
 ${PR_GREY})${PR_CYAN}${PR_HBAR}${PR_URCORNER}\
 
diff --git a/zsh/themes/josh.zsh-theme b/zsh/themes/josh.zsh-theme
index ea051c5..df59280 100644
--- a/zsh/themes/josh.zsh-theme
+++ b/zsh/themes/josh.zsh-theme
@@ -15,7 +15,7 @@ function josh_prompt {
   branch_size=${#branch}
   ruby_size=${#ruby_version}
   user_machine_size=${#${(%):-%n@%m-}}
-  
+
   if [[ ${#branch} -eq 0 ]]
     then (( ruby_size = ruby_size + 1 ))
   else
@@ -24,15 +24,15 @@ function josh_prompt {
       (( branch_size = branch_size + 2 ))
     fi
   fi
-  
+
   (( spare_width = ${spare_width} - (${user_machine_size} + ${path_size} + ${branch_size} + ${ruby_size}) ))
 
   while [ ${#prompt} -lt $spare_width ]; do
     prompt=" $prompt"
   done
-  
+
   prompt="%{%F{green}%}$PWD$prompt%{%F{red}%}$(ruby_prompt_info)%{$reset_color%} $(git_current_branch)"
-  
+
   echo $prompt
 }
 
diff --git a/zsh/themes/juanghurtado.zsh-theme b/zsh/themes/juanghurtado.zsh-theme
index dbdfde7..95a400e 100644
--- a/zsh/themes/juanghurtado.zsh-theme
+++ b/zsh/themes/juanghurtado.zsh-theme
@@ -34,8 +34,11 @@ ZSH_THEME_GIT_PROMPT_AHEAD=" %{$RED%}(!)"
 ZSH_THEME_GIT_PROMPT_SHA_BEFORE=" %{$WHITE%}[%{$YELLOW%}"
 ZSH_THEME_GIT_PROMPT_SHA_AFTER="%{$WHITE%}]"
 
+USER_COLOR=$GREEN_BOLD
+[[ $UID -eq 0 ]] && USER_COLOR=$RED_BOLD
+
 # Prompt format
 PROMPT='
-%{$GREEN_BOLD%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
+%{$USER_COLOR%}%n@%m%{$WHITE%}:%{$YELLOW%}%~%u$(parse_git_dirty)$(git_prompt_ahead)%{$RESET_COLOR%}
 %{$BLUE%}>%{$RESET_COLOR%} '
 RPROMPT='%{$GREEN_BOLD%}$(git_current_branch)$(git_prompt_short_sha)$(git_prompt_status)%{$RESET_COLOR%}'
diff --git a/zsh/themes/junkfood.zsh-theme b/zsh/themes/junkfood.zsh-theme
index 01fae4b..e3b746c 100644
--- a/zsh/themes/junkfood.zsh-theme
+++ b/zsh/themes/junkfood.zsh-theme
@@ -3,10 +3,10 @@
 # Grab the current date (%W) and time (%t):
 JUNKFOOD_TIME_="%{$fg_bold[red]%}#%{$fg_bold[white]%}( %{$fg_bold[yellow]%}%W%{$reset_color%}@%{$fg_bold[white]%}%t )( %{$reset_color%}"
 
-# Grab the current machine name 
+# Grab the current machine name
 JUNKFOOD_MACHINE_="%{$fg_bold[blue]%}%m%{$fg[white]%} ):%{$reset_color%}"
 
-# Grab the current username 
+# Grab the current username
 JUNKFOOD_CURRENT_USER_="%{$fg_bold[green]%}%n%{$reset_color%}"
 
 # Grab the current filepath, use shortcuts: ~/Desktop
diff --git a/zsh/themes/michelebologna.zsh-theme b/zsh/themes/michelebologna.zsh-theme
index bb86d68..b13b2ca 100644
--- a/zsh/themes/michelebologna.zsh-theme
+++ b/zsh/themes/michelebologna.zsh-theme
@@ -29,14 +29,13 @@ local cyan="%{$fg_bold[cyan]%}"
 local yellow="%{$fg_bold[yellow]%}"
 local blue="%{$fg_bold[blue]%}"
 local magenta="%{$fg_bold[magenta]%}"
-local white="%{$fg_bold[white]%}"
 local reset="%{$reset_color%}"
 
 local -a color_array
-color_array=($green $red $cyan $yellow $blue $magenta $white)
+color_array=($green $red $cyan $yellow $blue $magenta)
 
-local username_color=$white
-local hostname_color=$color_array[$[((#HOST))%7+1]] # choose hostname color based on first character
+local username_color=$blue
+local hostname_color=$color_array[$[((#HOST))%6+1]] # choose hostname color based on first character
 local current_dir_color=$blue
 
 local username="%n"
@@ -66,10 +65,10 @@ function michelebologna_git_prompt {
   local out=$(git_prompt_info)$(git_prompt_status)$(git_remote_status)
   [[ -n $out ]] || return
   printf " %s(%s%s%s)%s" \
-    "%{$fg_bold[white]%}" \
+    "%{$fg_bold[blue]%}" \
     "%{$fg_bold[green]%}" \
     "$out" \
-    "%{$fg_bold[white]%}" \
+    "%{$fg_bold[blue]%}" \
     "%{$reset_color%}"
 }
 
diff --git a/zsh/themes/mlh.zsh-theme b/zsh/themes/mlh.zsh-theme
index baff3fb..94718f8 100644
--- a/zsh/themes/mlh.zsh-theme
+++ b/zsh/themes/mlh.zsh-theme
@@ -15,7 +15,7 @@
 # To customize symbols (e.g MLH_AT_SYMBOL), simply set them as environment variables
 # for example in your ~/.zshrc file, like this:
 # MLH_AT_SYMBOL=" at "
-# 
+#
 # Settings *must* be set before sourcing oh-my-zsh.sh the .zshrc file.
 #
 # To easily discover colors and their codes, type `spectrum_ls` in the terminal
@@ -47,6 +47,10 @@ if [ -z "$MLH_SHELL_SYMBOL" ]; then
   MLH_SHELL_SYMBOL="$ "
 fi
 
+if [ -z "$MLH_SHELL_SYMBOL_ROOT" ]; then
+  MLH_SHELL_SYMBOL_ROOT="# "
+fi
+
 # colors
 USER_COLOR="%F{001}"
 DEVICE_COLOR="%F{033}"
@@ -83,7 +87,11 @@ exit_code() {
 }
 
 prompt_end() {
-  printf "\n$MLH_SHELL_SYMBOL"
+  if [ "$UID" -eq 0 ]; then
+    printf "\n$MLH_SHELL_SYMBOL_ROOT"
+  else
+    printf "\n$MLH_SHELL_SYMBOL"
+  fi
 }
 
 # Set git_prompt_info text
diff --git a/zsh/themes/mortalscumbag.zsh-theme b/zsh/themes/mortalscumbag.zsh-theme
index d81a7ca..c9994c0 100644
--- a/zsh/themes/mortalscumbag.zsh-theme
+++ b/zsh/themes/mortalscumbag.zsh-theme
@@ -1,6 +1,6 @@
 function my_git_prompt() {
   tester=$(git rev-parse --git-dir 2> /dev/null) || return
-  
+
   INDEX=$(git status --porcelain 2> /dev/null)
   STATUS=""
 
@@ -51,8 +51,14 @@ function ssh_connection() {
   fi
 }
 
+function _toolbox_prompt_info() {
+  if typeset -f toolbox_prompt_info > /dev/null; then
+    toolbox_prompt_info
+  fi
+}
+
 local ret_status="%(?:%{$fg_bold[green]%}:%{$fg_bold[red]%})%?%{$reset_color%}"
-PROMPT=$'\n$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '
+PROMPT=$'\n$(_toolbox_prompt_info)$(ssh_connection)%{$fg_bold[green]%}%n@%m%{$reset_color%}$(my_git_prompt) : %~\n[${ret_status}] %# '
 
 ZSH_THEME_PROMPT_RETURNCODE_PREFIX="%{$fg_bold[red]%}"
 ZSH_THEME_GIT_PROMPT_PREFIX=" $fg[white]‹ %{$fg_bold[yellow]%}"
diff --git a/zsh/themes/nicoulaj.zsh-theme b/zsh/themes/nicoulaj.zsh-theme
old mode 100644
new mode 100755
index 685cd1a..6435c38
--- a/zsh/themes/nicoulaj.zsh-theme
+++ b/zsh/themes/nicoulaj.zsh-theme
@@ -12,12 +12,12 @@
 # ------------------------------------------------------------------------------
 
 # Customizable parameters.
-PROMPT_PATH_MAX_LENGTH=30
-PROMPT_DEFAULT_END=❯
-PROMPT_ROOT_END=❯❯❯
-PROMPT_SUCCESS_COLOR=$FG[071]
-PROMPT_FAILURE_COLOR=$FG[124]
-PROMPT_VCS_INFO_COLOR=$FG[242]
+PROMPT_PATH_MAX_LENGTH=${PROMPT_PATH_MAX_LENGTH:-30}
+PROMPT_DEFAULT_END=${PROMPT_DEFAULT_END:-❯}
+PROMPT_ROOT_END=${PROMPT_ROOT_END:-❯❯❯}
+PROMPT_SUCCESS_COLOR=${PROMPT_SUCCESS_COLOR:-$FG[071]}
+PROMPT_FAILURE_COLOR=${PROMPT_FAILURE_COLOR:-$FG[124]}
+PROMPT_VCS_INFO_COLOR=${PROMPT_VCS_INFO_COLOR:-$FG[242]}
 
 # Set required options.
 setopt promptsubst
diff --git a/zsh/themes/oldgallois.zsh-theme b/zsh/themes/oldgallois.zsh-theme
new file mode 100644
index 0000000..bb97bfb
--- /dev/null
+++ b/zsh/themes/oldgallois.zsh-theme
@@ -0,0 +1,24 @@
+# Depends on the git plugin for work_in_progress()
+(( $+functions[work_in_progress] )) || work_in_progress() {}
+
+ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}["
+ZSH_THEME_GIT_PROMPT_SUFFIX="]%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[red]%}*%{$reset_color%}"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
+
+# Customized git status, oh-my-zsh currently does not allow render dirty status before branch
+git_custom_status() {
+  local branch=$(git_current_branch)
+  [[ -n "$branch" ]] || return 0
+  echo "$(parse_git_dirty)\
+%{${fg_bold[yellow]}%}$(work_in_progress)%{$reset_color%}\
+${ZSH_THEME_GIT_PROMPT_PREFIX}${branch}${ZSH_THEME_GIT_PROMPT_SUFFIX}"
+}
+
+# RVM component of prompt
+ZSH_THEME_RUBY_PROMPT_PREFIX="%{$fg[red]%}["
+ZSH_THEME_RUBY_PROMPT_SUFFIX="]%{$reset_color%}"
+
+# Combine it all into a final right-side prompt
+RPS1="\$(git_custom_status)\$(ruby_prompt_info)${RPS1:+ $RPS1}"
+PROMPT='%{$fg[cyan]%}[%~% ]%(?.%{$fg[green]%}.%{$fg[red]%})%B$%b '
diff --git a/zsh/themes/pygmalion.zsh-theme b/zsh/themes/pygmalion.zsh-theme
index be9ca38..14fe6c4 100644
--- a/zsh/themes/pygmalion.zsh-theme
+++ b/zsh/themes/pygmalion.zsh-theme
@@ -1,32 +1,12 @@
 # Yay! High voltage and arrows!
 
-prompt_setup_pygmalion(){
-  setopt localoptions extendedglob
+ZSH_THEME_GIT_PROMPT_PREFIX="%{${reset_color}%}%F{green}"
+ZSH_THEME_GIT_PROMPT_SUFFIX="%{${reset_color}%} "
+ZSH_THEME_GIT_PROMPT_DIRTY="%F{yellow}⚡%f"
+ZSH_THEME_GIT_PROMPT_CLEAN=""
 
-  ZSH_THEME_GIT_PROMPT_PREFIX="%{$reset_color%}%{$fg[green]%}"
-  ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-  ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[yellow]%}⚡%{$reset_color%}"
-  ZSH_THEME_GIT_PROMPT_CLEAN=""
+base_prompt="%{${reset_color}%}%F{magenta}%n%F{cyan}@%F{yellow}%m%F{red}:%F{cyan}%0~%F{red}|%f"
+post_prompt="%{${reset_color}%}%F{cyan}⇒%f  "
 
-  base_prompt='%{$fg[magenta]%}%n%{$reset_color%}%{$fg[cyan]%}@%{$reset_color%}%{$fg[yellow]%}%m%{$reset_color%}%{$fg[red]%}:%{$reset_color%}%{$fg[cyan]%}%0~%{$reset_color%}%{$fg[red]%}|%{$reset_color%}'
-  post_prompt='%{$fg[cyan]%}⇒%{$reset_color%}  '
-
-  base_prompt_nocolor=${base_prompt//\%\{[^\}]##\}}
-  post_prompt_nocolor=${post_prompt//\%\{[^\}]##\}}
-
-  autoload -U add-zsh-hook
-  add-zsh-hook precmd prompt_pygmalion_precmd
-}
-
-prompt_pygmalion_precmd(){
-  setopt localoptions nopromptsubst extendedglob
-
-  local gitinfo=$(git_prompt_info)
-  local gitinfo_nocolor=${gitinfo//\%\{[^\}]##\}}
-  local exp_nocolor="$(print -P \"${base_prompt_nocolor}${gitinfo_nocolor}${post_prompt_nocolor}\")"
-  local prompt_length=${#exp_nocolor}
-
-  PROMPT="${base_prompt}\$(git_prompt_info)${post_prompt}"
-}
-
-prompt_setup_pygmalion
+PROMPT="${base_prompt}\$(git_prompt_info)${post_prompt}"
+unset base_prompt post_prompt
diff --git a/zsh/themes/refined.zsh-theme b/zsh/themes/refined.zsh-theme
index 5e2de7a..2b55cfb 100644
--- a/zsh/themes/refined.zsh-theme
+++ b/zsh/themes/refined.zsh-theme
@@ -11,11 +11,11 @@
 # more about both of these fantastic two people here:
 #
 # Sindre Sorhus
-#   Github:   https://github.com/sindresorhus
+#   GitHub:   https://github.com/sindresorhus
 #   Twitter:  https://twitter.com/sindresorhus
 #
 # Julien Nicoulaud
-#   Github:   https://github.com/nicoulaj
+#   GitHub:   https://github.com/nicoulaj
 #   Twitter:  https://twitter.com/nicoulaj
 #
 # ------------------------------------------------------------------------------
diff --git a/zsh/themes/rkj-repos.zsh-theme b/zsh/themes/rkj-repos.zsh-theme
index 3cb4523..a9fe1a9 100644
--- a/zsh/themes/rkj-repos.zsh-theme
+++ b/zsh/themes/rkj-repos.zsh-theme
@@ -1,7 +1,7 @@
 # user, host, full path, and time/date on two lines for easier vgrepping
 
 function hg_prompt_info {
-  if (( $+commands[hg] )) && grep -q "prompt" ~/.hgrc; then
+  if (( $+commands[hg] )) && [[ -e ~/.hgrc ]] && grep -q "prompt" ~/.hgrc; then
     hg prompt --angle-brackets "\
 <hg:%{$fg[magenta]%}<branch>%{$reset_color%}><:%{$fg[magenta]%}<bookmark>%{$reset_color%}>\
 </%{$fg[yellow]%}<tags|%{$reset_color%}, %{$fg[yellow]%}>%{$reset_color%}>\
diff --git a/zsh/themes/robbyrussell.zsh-theme b/zsh/themes/robbyrussell.zsh-theme
index 2fd5f2c..cfecfc8 100644
--- a/zsh/themes/robbyrussell.zsh-theme
+++ b/zsh/themes/robbyrussell.zsh-theme
@@ -1,7 +1,7 @@
-PROMPT="%(?:%{$fg_bold[green]%}➜ :%{$fg_bold[red]%}➜ )"
-PROMPT+=' %{$fg[cyan]%}%c%{$reset_color%} $(git_prompt_info)'
+PROMPT="%(?:%{$fg_bold[green]%}%1{➜%} :%{$fg_bold[red]%}%1{➜%} ) %{$fg[cyan]%}%c%{$reset_color%}"
+PROMPT+=' $(git_prompt_info)'
 
 ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[blue]%}git:(%{$fg[red]%}"
 ZSH_THEME_GIT_PROMPT_SUFFIX="%{$reset_color%} "
-ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}✗"
+ZSH_THEME_GIT_PROMPT_DIRTY="%{$fg[blue]%}) %{$fg[yellow]%}%1{✗%}"
 ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg[blue]%})"
diff --git a/zsh/themes/sonicradish.zsh-theme b/zsh/themes/sonicradish.zsh-theme
index 5086118..11d66a2 100644
--- a/zsh/themes/sonicradish.zsh-theme
+++ b/zsh/themes/sonicradish.zsh-theme
@@ -1,4 +1,4 @@
-#!/usr/bin/env zsh 
+#!/usr/bin/env zsh
 #local return_code="%(?..%{$fg[red]%}%? ↵%{$reset_color%})"
 
 setopt promptsubst
@@ -29,7 +29,7 @@ ZSH_THEME_GIT_PROMPT_SUFFIX="%{$GIT_PROMPT_INFO%} :"
 ZSH_THEME_GIT_PROMPT_DIRTY=" %{$GIT_DIRTY_COLOR%}✘"
 ZSH_THEME_GIT_PROMPT_CLEAN=" %{$GIT_CLEAN_COLOR%}✔"
 
-ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[103]%}✚%{$rset_color%}"
+ZSH_THEME_GIT_PROMPT_ADDED="%{$FG[103]%}✚%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_MODIFIED="%{$FG[103]%}✹%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_DELETED="%{$FG[103]%}✖%{$reset_color%}"
 ZSH_THEME_GIT_PROMPT_RENAMED="%{$FG[103]%}➜%{$reset_color%}"
diff --git a/zsh/themes/wedisagree.zsh-theme b/zsh/themes/wedisagree.zsh-theme
index e9e9d6e..3588919 100644
--- a/zsh/themes/wedisagree.zsh-theme
+++ b/zsh/themes/wedisagree.zsh-theme
@@ -5,9 +5,9 @@
 # - Place that bundle in ~/Library/Application\ Support/SIMBL/Plugins (create that folder if it doesn't exist)
 # - Open Terminal preferences. Go to Settings -> Text -> More
 # - Change default colours to your liking.
-# 
+#
 # Here are the colours from Textmate's Monokai theme:
-# 
+#
 # Black: 0, 0, 0
 # Red: 229, 34, 34
 # Green: 166, 227, 45
@@ -28,7 +28,7 @@ PROMPT='%{$fg[magenta]%}[%c] %{$reset_color%}'
 RPROMPT='${time} %{$fg[magenta]%}$(git_prompt_info)%{$reset_color%}$(git_prompt_status)%{$reset_color%}$(git_prompt_ahead)%{$reset_color%}'
 
 # Add this at the start of RPROMPT to include rvm info showing ruby-version@gemset-name
-# $(ruby_prompt_info) 
+# $(ruby_prompt_info)
 
 # local time, color coded by last return code
 time_enabled="%(?.%{$fg[green]%}.%{$fg[red]%})%*%{$reset_color%}"
@@ -53,7 +53,7 @@ ZSH_THEME_RUBY_PROMPT_SUFFIX="%{$reset_color%}"
 
 # More symbols to choose from:
 # ☀ ✹ ☄ ♆ ♀ ♁ ♐ ♇ ♈ ♉ ♚ ♛ ♜ ♝ ♞ ♟ ♠ ♣ ⚢ ⚲ ⚳ ⚴ ⚥ ⚤ ⚦ ⚒ ⚑ ⚐ ♺ ♻ ♼ ☰ ☱ ☲ ☳ ☴ ☵ ☶ ☷
-# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠ 
+# ✡ ✔ ✖ ✚ ✱ ✤ ✦ ❤ ➜ ➟ ➼ ✂ ✎ ✐ ⨀ ⨁ ⨂ ⨍ ⨎ ⨏ ⨷ ⩚ ⩛ ⩡ ⩱ ⩲ ⩵  ⩶ ⨠
 # ⬅ ⬆ ⬇ ⬈ ⬉ ⬊ ⬋ ⬒ ⬓ ⬔ ⬕ ⬖ ⬗ ⬘ ⬙ ⬟  ⬤ 〒 ǀ ǁ ǂ ĭ Ť Ŧ
 
 # Determine if we are using a gemset.
@@ -61,7 +61,7 @@ function rvm_gemset() {
     GEMSET=`rvm gemset list | grep '=>' | cut -b4-`
     if [[ -n $GEMSET ]]; then
         echo "%{$fg[yellow]%}$GEMSET%{$reset_color%}|"
-    fi 
+    fi
 }
 
 # Determine the time since last commit. If branch is clean,
@@ -76,12 +76,12 @@ function git_time_since_commit() {
             # Totals
             MINUTES=$((seconds_since_last_commit / 60))
             HOURS=$((seconds_since_last_commit/3600))
-           
+
             # Sub-hours and sub-minutes
             DAYS=$((seconds_since_last_commit / 86400))
             SUB_HOURS=$((HOURS % 24))
             SUB_MINUTES=$((MINUTES % 60))
-            
+
             if [[ -n $(git status -s 2> /dev/null) ]]; then
                 if [ "$MINUTES" -gt 30 ]; then
                     COLOR="$ZSH_THEME_GIT_TIME_SINCE_COMMIT_LONG"
diff --git a/zsh/tools/changelog.sh b/zsh/tools/changelog.sh
index 6489a3c..ff40911 100755
--- a/zsh/tools/changelog.sh
+++ b/zsh/tools/changelog.sh
@@ -106,6 +106,9 @@ function parse-commit {
       message="${match[1]}"
       # remove CR characters (might be inserted in GitHub UI commit description form)
       message="${message//$'\r'/}"
+      # remove lines containing only whitespace
+      local nlnl=$'\n\n'
+      message="${message//$'\n'[[:space:]]##$'\n'/$nlnl}"
       # skip next paragraphs (separated by two newlines or more)
       message="${message%%$'\n\n'*}"
       # ... and replace newlines with spaces
@@ -157,6 +160,94 @@ function parse-commit {
   fi
 }
 
+################################
+# SUPPORTS HYPERLINKS FUNCTION #
+################################
+
+# The code for checking if a terminal supports hyperlinks is copied from install.sh
+
+# The [ -t 1 ] check only works when the function is not called from
+# a subshell (like in `$(...)` or `(...)`, so this hack redefines the
+# function at the top level to always return false when stdout is not
+# a tty.
+if [ -t 1 ]; then
+  is_tty() {
+    true
+  }
+else
+  is_tty() {
+    false
+  }
+fi
+
+# This function uses the logic from supports-hyperlinks[1][2], which is
+# made by Kat Marchán (@zkat) and licensed under the Apache License 2.0.
+# [1] https://github.com/zkat/supports-hyperlinks
+# [2] https://crates.io/crates/supports-hyperlinks
+#
+# Copyright (c) 2021 Kat Marchán
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+supports_hyperlinks() {
+  # $FORCE_HYPERLINK must be set and be non-zero (this acts as a logic bypass)
+  if [ -n "$FORCE_HYPERLINK" ]; then
+    [ "$FORCE_HYPERLINK" != 0 ]
+    return $?
+  fi
+
+  # If stdout is not a tty, it doesn't support hyperlinks
+  is_tty || return 1
+
+  # DomTerm terminal emulator (domterm.org)
+  if [ -n "$DOMTERM" ]; then
+    return 0
+  fi
+
+  # VTE-based terminals above v0.50 (Gnome Terminal, Guake, ROXTerm, etc)
+  if [ -n "$VTE_VERSION" ]; then
+    [ $VTE_VERSION -ge 5000 ]
+    return $?
+  fi
+
+  # If $TERM_PROGRAM is set, these terminals support hyperlinks
+  case "$TERM_PROGRAM" in
+  Hyper|iTerm.app|terminology|WezTerm|vscode) return 0 ;;
+  esac
+
+  # These termcap entries support hyperlinks
+  case "$TERM" in
+  xterm-kitty|alacritty|alacritty-direct) return 0 ;;
+  esac
+
+  # xfce4-terminal supports hyperlinks
+  if [ "$COLORTERM" = "xfce4-terminal" ]; then
+    return 0
+  fi
+
+  # Windows Terminal also supports hyperlinks
+  if [ -n "$WT_SESSION" ]; then
+    return 0
+  fi
+
+  # Konsole supports hyperlinks, but it's an opt-in setting that can't be detected
+  # https://github.com/ohmyzsh/ohmyzsh/issues/10964
+  # if [ -n "$KONSOLE_VERSION" ]; then
+  #   return 0
+  # fi
+
+  return 1
+}
+
 #############################
 # RELEASE CHANGELOG DISPLAY #
 #############################
@@ -206,10 +297,17 @@ function display-release {
   function fmt:hash {
     #* Uses $hash from outer scope
     local hash="${1:-$hash}"
+    local short_hash="${hash:0:7}" # 7 characters sha, top level sha is 12 characters
     case "$output" in
-    raw) printf '%s' "$hash" ;;
-    text) printf '\e[33m%s\e[0m' "$hash" ;; # red
-    md) printf '[`%s`](https://github.com/ohmyzsh/ohmyzsh/commit/%s)' "$hash" ;;
+    raw) printf '%s' "$short_hash" ;;
+    text)
+      local text="\e[33m$short_hash\e[0m"; # red
+      if supports_hyperlinks; then
+        printf "\e]8;;%s\a%s\e]8;;\a" "https://github.com/ohmyzsh/ohmyzsh/commit/$hash" $text;
+      else
+        echo $text;
+      fi ;;
+    md) printf '[`%s`](https://github.com/ohmyzsh/ohmyzsh/commit/%s)' "$short_hash" "$hash" ;;
     esac
   }
 
@@ -272,7 +370,12 @@ function display-release {
     case "$output" in
     raw) printf '%s' "$subject" ;;
     # In text mode, highlight (#<issue>) and dim text between `backticks`
-    text) sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`([^`]+)`|`\e[2m\\1\e[0m`|g' <<< "$subject" ;;
+    text)
+      if supports_hyperlinks; then
+        sed -E $'s|#([0-9]+)|\e]8;;https://github.com/ohmyzsh/ohmyzsh/issues/\\1\a\e[32m#\\1\e[0m\e]8;;\a|g;s|`([^`]+)`|`\e[2m\\1\e[0m`|g' <<< "$subject"
+      else
+        sed -E $'s|#([0-9]+)|\e[32m#\\1\e[0m|g;s|`([^`]+)`|`\e[2m\\1\e[0m`|g' <<< "$subject"
+      fi ;;
     # In markdown mode, link to (#<issue>) issues
     md) sed -E 's|#([0-9]+)|[#\1](https://github.com/ohmyzsh/ohmyzsh/issues/\1)|g' <<< "$subject" ;;
     esac
@@ -297,6 +400,9 @@ function display-release {
   function display:breaking {
     (( $#breaking != 0 )) || return 0
 
+    # If we reach here we have shown commits, set flag
+    shown_commits=1
+
     case "$output" in
     text) printf '\e[31m'; fmt:header "BREAKING CHANGES" 3 ;;
     raw) fmt:header "BREAKING CHANGES" 3 ;;
@@ -324,6 +430,9 @@ function display-release {
     # If no commits found of type $type, go to next type
     (( $#hashes != 0 )) || return 0
 
+    # If we reach here we have shown commits, set flag
+    shown_commits=1
+
     fmt:header "${TYPES[$type]}" 3
     for hash in $hashes; do
       echo " - $(fmt:hash) $(fmt:scope)$(fmt:subject)"
@@ -341,6 +450,9 @@ function display-release {
     # If no commits found under "other" types, don't display anything
     (( $#changes != 0 )) || return 0
 
+    # If we reach here we have shown commits, set flag
+    shown_commits=1
+
     fmt:header "Other changes" 3
     for hash type in ${(kv)changes}; do
       case "$type" in
@@ -395,7 +507,7 @@ function main {
 
   # Commit classification arrays
   local -A types subjects scopes breaking reverts
-  local truncate=0 read_commits=0
+  local truncate=0 read_commits=0 shown_commits=0
   local version tag
   local hash refs subject body
 
@@ -415,13 +527,13 @@ function main {
   # Git log options
   # -z:             commits are delimited by null bytes
   # --format:       [7-char hash]<field sep>[ref names]<field sep>[subject]<field sep>[body]
-  # --abbrev=7:     force commit hashes to be 7 characters long
+  # --abbrev=7:     force commit hashes to be 12 characters long
   # --no-merges:    merge commits are omitted
   # --first-parent: commits from merged branches are omitted
   local SEP="0mZmAgIcSeP"
   local -a raw_commits
   raw_commits=(${(0)"$(command git -c log.showSignature=false log -z \
-    --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=7 \
+    --format="%h${SEP}%D${SEP}%s${SEP}%b" --abbrev=12 \
     --no-merges --first-parent $range)"})
 
   local raw_commit
@@ -466,6 +578,10 @@ function main {
     echo " ...more commits omitted"
     echo
   fi
+
+  if (( ! shown_commits )); then
+    echo "No changes to mention."
+  fi
 }
 
 # Use raw output if stdout is not a tty
diff --git a/zsh/tools/check_for_upgrade.sh b/zsh/tools/check_for_upgrade.sh
index cc527e7..44dbb7b 100644
--- a/zsh/tools/check_for_upgrade.sh
+++ b/zsh/tools/check_for_upgrade.sh
@@ -9,6 +9,7 @@ fi
 # - prompt (default): the user is asked before updating when it's time to update
 # - auto: the update is performed automatically when it's time
 # - reminder: a reminder is shown to the user when it's time to update
+# - background-alpha: an experimental update-on-the-background option
 # - disabled: automatic update is turned off
 zstyle -s ':omz:update' mode update_mode || {
   update_mode=prompt
@@ -19,12 +20,16 @@ zstyle -s ':omz:update' mode update_mode || {
 }
 
 # Cancel update if:
-# - the automatic update is disabled.
-# - the current user doesn't have write permissions nor owns the $ZSH directory.
-# - git is unavailable on the system.
+# - the automatic update is disabled
+# - the current user doesn't have write permissions nor owns the $ZSH directory
+# - is not run from a tty
+# - git is unavailable on the system
+# - $ZSH is not a git repository
 if [[ "$update_mode" = disabled ]] \
    || [[ ! -w "$ZSH" || ! -O "$ZSH" ]] \
-   || ! command -v git &>/dev/null; then
+   || [[ ! -t 1 && ${POWERLEVEL9K_INSTANT_PROMPT:-off} == off ]] \
+   || ! command git --version 2>&1 >/dev/null \
+   || (builtin cd -q "$ZSH"; ! command git rev-parse --is-inside-work-tree &>/dev/null); then
   unset update_mode
   return
 fi
@@ -89,12 +94,42 @@ function is_update_available() {
 }
 
 function update_last_updated_file() {
-  echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
+  local exit_status="$1" error="$2"
+
+  if [[ -z "${1}${2}" ]]; then
+    echo "LAST_EPOCH=$(current_epoch)" >! "${ZSH_CACHE_DIR}/.zsh-update"
+    return
+  fi
+
+  cat >! "${ZSH_CACHE_DIR}/.zsh-update" <<EOD
+LAST_EPOCH=$(current_epoch)
+EXIT_STATUS=${exit_status}
+ERROR='${error//\'/’}'
+EOD
 }
 
 function update_ohmyzsh() {
-  if ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" --interactive; then
+  local verbose_mode
+  zstyle -s ':omz:update' verbose verbose_mode || verbose_mode=default
+
+  # Force verbose mode to silent if p10k instant prompt is enabled
+  if [[ ${POWERLEVEL9K_INSTANT_PROMPT:-off} != "off" ]]; then
+    verbose_mode=silent
+  fi
+
+  if [[ "$update_mode" != background-alpha ]] \
+    && LANG= ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v $verbose_mode; then
     update_last_updated_file
+    return $?
+  fi
+
+  local exit_status error
+  if error=$(LANG= ZSH="$ZSH" zsh -f "$ZSH/tools/upgrade.sh" -i -v silent 2>&1); then
+    update_last_updated_file 0 "Update successful"
+  else
+    exit_status=$?
+    update_last_updated_file $exit_status "$error"
+    return $exit_status
   fi
 }
 
@@ -123,87 +158,145 @@ function has_typed_input() {
   }
 }
 
-() {
-  emulate -L zsh
+function handle_update() {
+  () {
+    emulate -L zsh
 
-  local epoch_target mtime option LAST_EPOCH
+    local epoch_target mtime option LAST_EPOCH
 
-  # Remove lock directory if older than a day
-  zmodload zsh/datetime
-  zmodload -F zsh/stat b:zstat
-  if mtime=$(zstat +mtime "$ZSH/log/update.lock" 2>/dev/null); then
-    if (( (mtime + 3600 * 24) < EPOCHSECONDS )); then
-      command rm -rf "$ZSH/log/update.lock"
+    # Remove lock directory if older than a day
+    zmodload zsh/datetime
+    zmodload -F zsh/stat b:zstat
+    if mtime=$(zstat +mtime "$ZSH/log/update.lock" 2>/dev/null); then
+      if (( (mtime + 3600 * 24) < EPOCHSECONDS )); then
+        command rm -rf "$ZSH/log/update.lock"
+      fi
     fi
-  fi
 
-  # Check for lock directory
-  if ! command mkdir "$ZSH/log/update.lock" 2>/dev/null; then
-    return
-  fi
+    # Check for lock directory
+    if ! command mkdir "$ZSH/log/update.lock" 2>/dev/null; then
+      return
+    fi
 
-  # Remove lock directory on exit. `return $ret` is important for when trapping a SIGINT:
-  #  The return status from the function is handled specially. If it is zero, the signal is
-  #  assumed to have been handled, and execution continues normally. Otherwise, the shell
-  #  will behave as interrupted except that the return status of the trap is retained.
-  #  This means that for a CTRL+C, the trap needs to return the same exit status so that
-  #  the shell actually exits what it's running.
-  trap "
-    ret=\$?
-    unset update_mode
-    unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh 2>/dev/null
-    command rm -rf '$ZSH/log/update.lock'
-    return \$ret
-  " EXIT INT QUIT
+    # Remove lock directory on exit. `return $ret` is important for when trapping a SIGINT:
+    #  The return status from the function is handled specially. If it is zero, the signal is
+    #  assumed to have been handled, and execution continues normally. Otherwise, the shell
+    #  will behave as interrupted except that the return status of the trap is retained.
+    #  This means that for a CTRL+C, the trap needs to return the same exit status so that
+    #  the shell actually exits what it's running.
+    trap "
+      ret=\$?
+      unset update_mode
+      unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh handle_update 2>/dev/null
+      command rm -rf '$ZSH/log/update.lock'
+      return \$ret
+    " EXIT INT QUIT
 
-  # Create or update .zsh-update file if missing or malformed
-  if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
-    update_last_updated_file
-    return
-  fi
+    # Create or update .zsh-update file if missing or malformed
+    if ! source "${ZSH_CACHE_DIR}/.zsh-update" 2>/dev/null || [[ -z "$LAST_EPOCH" ]]; then
+      update_last_updated_file
+      return
+    fi
 
-  # Number of days before trying to update again
-  zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
-  # Test if enough time has passed until the next update
-  if (( ( $(current_epoch) - $LAST_EPOCH ) < $epoch_target )); then
-    return
-  fi
+    # Number of days before trying to update again
+    zstyle -s ':omz:update' frequency epoch_target || epoch_target=${UPDATE_ZSH_DAYS:-13}
+    # Test if enough time has passed until the next update
+    if (( ( $(current_epoch) - $LAST_EPOCH ) < $epoch_target )); then
+      return
+    fi
 
-  # Test if Oh My Zsh directory is a git repository
-  if ! (builtin cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
-    echo >&2 "[oh-my-zsh] Can't update: not a git repository."
-    return
-  fi
+    # Test if Oh My Zsh directory is a git repository
+    if ! (builtin cd -q "$ZSH" && LANG= git rev-parse &>/dev/null); then
+      echo >&2 "[oh-my-zsh] Can't update: not a git repository."
+      return
+    fi
 
-  # Check if there are updates available before proceeding
-  if ! is_update_available; then
-    return
-  fi
+    # Check if there are updates available before proceeding
+    if ! is_update_available; then
+      update_last_updated_file
+      return
+    fi
 
-  # If in reminder mode or user has typed input, show reminder and exit
-  if [[ "$update_mode" = reminder ]] || has_typed_input; then
-    printf '\r\e[0K' # move cursor to first column and clear whole line
-    echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
-    return 0
-  fi
+    # If in reminder mode or user has typed input, show reminder and exit
+    if [[ "$update_mode" = reminder ]] || { [[ "$update_mode" != background-alpha ]] && has_typed_input }; then
+      printf '\r\e[0K' # move cursor to first column and clear whole line
+      echo "[oh-my-zsh] It's time to update! You can do that by running \`omz update\`"
+      return 0
+    fi
 
-  # Don't ask for confirmation before updating if in auto mode
-  if [[ "$update_mode" = auto ]]; then
-    update_ohmyzsh
-    return $?
-  fi
+    # Don't ask for confirmation before updating if in auto mode
+    if [[ "$update_mode" = (auto|background-alpha) ]]; then
+      update_ohmyzsh
+      return $?
+    fi
 
-  # Ask for confirmation and only update on 'y', 'Y' or Enter
-  # Otherwise just show a reminder for how to update
-  echo -n "[oh-my-zsh] Would you like to update? [Y/n] "
-  read -r -k 1 option
-  [[ "$option" = $'\n' ]] || echo
-  case "$option" in
-    [yY$'\n']) update_ohmyzsh ;;
-    [nN]) update_last_updated_file ;&
-    *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
-  esac
+    # Ask for confirmation and only update on 'y', 'Y' or Enter
+    # Otherwise just show a reminder for how to update
+    printf "[oh-my-zsh] Would you like to update? [Y/n] "
+    read -r -k 1 option
+    [[ "$option" = $'\n' ]] || echo
+    case "$option" in
+      [yY$'\n']) update_ohmyzsh ;;
+      [nN]) update_last_updated_file ;&
+      *) echo "[oh-my-zsh] You can update manually by running \`omz update\`" ;;
+    esac
+  }
+
+  unset update_mode
+  unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh handle_update
 }
 
-unset update_mode
-unset -f current_epoch is_update_available update_last_updated_file update_ohmyzsh
+case "$update_mode" in
+  background-alpha)
+    autoload -Uz add-zsh-hook
+
+    _omz_bg_update() {
+      # do the update in a subshell
+      (handle_update) &|
+
+      # register update results function
+      add-zsh-hook precmd _omz_bg_update_status
+
+      # deregister background function
+      add-zsh-hook -d precmd _omz_bg_update
+      unset -f _omz_bg_update
+    }
+
+    _omz_bg_update_status() {
+      {
+        local LAST_EPOCH EXIT_STATUS ERROR
+        if [[ ! -f "$ZSH_CACHE_DIR"/.zsh-update ]]; then
+          return 1
+        fi
+
+        # check update results until timeout is reached
+        . "$ZSH_CACHE_DIR/.zsh-update"
+        if [[ -z "$EXIT_STATUS" || -z "$ERROR" ]]; then
+          return 1
+        fi
+
+        if [[ "$EXIT_STATUS" -eq 0 ]]; then
+          print -P "\n%F{green}[oh-my-zsh] Update successful.%f"
+          return 0
+        elif [[ "$EXIT_STATUS" -ne 0 ]]; then
+          print -P "\n%F{red}[oh-my-zsh] There was an error updating:%f"
+          printf "\n${fg[yellow]}%s${reset_color}" "${ERROR}"
+          return 0
+        fi
+      } always {
+        if (( TRY_BLOCK_ERROR == 0 )); then
+          # if last update results have been handled, remove them from the status file
+          update_last_updated_file
+
+          # deregister background function
+          add-zsh-hook -d precmd _omz_bg_update_status
+          unset -f _omz_bg_update_status
+        fi
+      }
+    }
+
+    add-zsh-hook precmd _omz_bg_update
+    ;;
+  *)
+    handle_update ;;
+esac
diff --git a/zsh/tools/install.sh b/zsh/tools/install.sh
index a6538f9..d907b79 100755
--- a/zsh/tools/install.sh
+++ b/zsh/tools/install.sh
@@ -16,15 +16,19 @@
 #   ZSH=~/.zsh sh install.sh
 #
 # Respects the following environment variables:
+#   ZDOTDIR - path to Zsh dotfiles directory (default: unset). See [1][2]
+#             [1] https://zsh.sourceforge.io/Doc/Release/Parameters.html#index-ZDOTDIR
+#             [2] https://zsh.sourceforge.io/Doc/Release/Files.html#index-ZDOTDIR_002c-use-of
 #   ZSH     - path to the Oh My Zsh repository folder (default: $HOME/.oh-my-zsh)
 #   REPO    - name of the GitHub repo to install from (default: ohmyzsh/ohmyzsh)
 #   REMOTE  - full remote URL of the git repo to install (default: GitHub via HTTPS)
 #   BRANCH  - branch to check out immediately after install (default: master)
 #
 # Other options:
-#   CHSH       - 'no' means the installer will not change the default shell (default: yes)
-#   RUNZSH     - 'no' means the installer will not run zsh after the install (default: yes)
-#   KEEP_ZSHRC - 'yes' means the installer will not replace an existing .zshrc (default: no)
+#   CHSH                   - 'no' means the installer will not change the default shell (default: yes)
+#   RUNZSH                 - 'no' means the installer will not run zsh after the install (default: yes)
+#   KEEP_ZSHRC             - 'yes' means the installer will not replace an existing .zshrc (default: no)
+#   OVERWRITE_CONFIRMATION - 'no' means the installer will not ask for confirmation to overwrite the existing .zshrc (default: yes)
 #
 # You can also pass some arguments to the install script to set some these options:
 #   --skip-chsh: has the same behavior as setting CHSH to 'no'
@@ -53,8 +57,19 @@ HOME="${HOME:-$(eval echo ~$USER)}"
 # Track if $ZSH was provided
 custom_zsh=${ZSH:+yes}
 
-# Default settings
+# Use $zdot to keep track of where the directory is for zsh dotfiles
+# To check if $ZDOTDIR was provided, explicitly check for $ZDOTDIR
+zdot="${ZDOTDIR:-$HOME}"
+
+# Default value for $ZSH
+# a) if $ZDOTDIR is supplied and not $HOME: $ZDOTDIR/ohmyzsh
+# b) otherwise, $HOME/.oh-my-zsh
+if [ -n "$ZDOTDIR" ] && [ "$ZDOTDIR" != "$HOME" ]; then
+  ZSH="${ZSH:-$ZDOTDIR/ohmyzsh}"
+fi
 ZSH="${ZSH:-$HOME/.oh-my-zsh}"
+
+# Default settings
 REPO=${REPO:-ohmyzsh/ohmyzsh}
 REMOTE=${REMOTE:-https://github.com/${REPO}.git}
 BRANCH=${BRANCH:-master}
@@ -63,6 +78,7 @@ BRANCH=${BRANCH:-master}
 CHSH=${CHSH:-yes}
 RUNZSH=${RUNZSH:-yes}
 KEEP_ZSHRC=${KEEP_ZSHRC:-no}
+OVERWRITE_CONFIRMATION=${OVERWRITE_CONFIRMATION:-yes}
 
 
 command_exists() {
@@ -72,6 +88,10 @@ command_exists() {
 user_can_sudo() {
   # Check if sudo is installed
   command_exists sudo || return 1
+  # Termux can't run sudo, so we can detect it and exit the function early.
+  case "$PREFIX" in
+  *com.termux*) return 1 ;;
+  esac
   # The following command has 3 parts:
   #
   # 1. Run `sudo` with `-v`. Does the following:
@@ -148,11 +168,16 @@ supports_hyperlinks() {
 
   # If $TERM_PROGRAM is set, these terminals support hyperlinks
   case "$TERM_PROGRAM" in
-  Hyper|iTerm.app|terminology|WezTerm) return 0 ;;
+  Hyper|iTerm.app|terminology|WezTerm|vscode) return 0 ;;
   esac
 
-  # kitty supports hyperlinks
-  if [ "$TERM" = xterm-kitty ]; then
+  # These termcap entries support hyperlinks
+  case "$TERM" in
+  xterm-kitty|alacritty|alacritty-direct) return 0 ;;
+  esac
+
+  # xfce4-terminal supports hyperlinks
+  if [ "$COLORTERM" = "xfce4-terminal" ]; then
     return 0
   fi
 
@@ -311,13 +336,32 @@ setup_zshrc() {
   echo "${FMT_BLUE}Looking for an existing zsh config...${FMT_RESET}"
 
   # Must use this exact name so uninstall.sh can find it
-  OLD_ZSHRC=~/.zshrc.pre-oh-my-zsh
-  if [ -f ~/.zshrc ] || [ -h ~/.zshrc ]; then
+  OLD_ZSHRC="$zdot/.zshrc.pre-oh-my-zsh"
+  if [ -f "$zdot/.zshrc" ] || [ -h "$zdot/.zshrc" ]; then
     # Skip this if the user doesn't want to replace an existing .zshrc
     if [ "$KEEP_ZSHRC" = yes ]; then
-      echo "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Keeping...${FMT_RESET}"
+      echo "${FMT_YELLOW}Found ${zdot}/.zshrc.${FMT_RESET} ${FMT_GREEN}Keeping...${FMT_RESET}"
       return
     fi
+    
+    if [ $OVERWRITE_CONFIRMATION != "no" ]; then
+      # Ask user for confirmation before backing up and overwriting
+      echo "${FMT_YELLOW}Found ${zdot}/.zshrc."
+      echo "The existing .zshrc will be backed up to .zshrc.pre-oh-my-zsh if overwritten."
+      echo "Make sure your .zshrc contains the following minimal configuration if you choose not to overwrite it:${FMT_RESET}"
+      echo "----------------------------------------"
+      cat "$ZSH/templates/minimal.zshrc"
+      echo "----------------------------------------"
+      printf '%sDo you want to overwrite it with the Oh My Zsh template? [Y/n]%s ' \
+        "$FMT_YELLOW" "$FMT_RESET"
+      read -r opt
+      case $opt in
+        [Yy]*|"") ;;
+        [Nn]*) echo "Overwrite skipped. Existing .zshrc will be kept."; return ;;
+        *) echo "Invalid choice. Overwrite skipped. Existing .zshrc will be kept."; return ;;
+      esac
+    fi
+
     if [ -e "$OLD_ZSHRC" ]; then
       OLD_OLD_ZSHRC="${OLD_ZSHRC}-$(date +%Y-%m-%d_%H-%M-%S)"
       if [ -e "$OLD_OLD_ZSHRC" ]; then
@@ -327,19 +371,24 @@ setup_zshrc() {
       fi
       mv "$OLD_ZSHRC" "${OLD_OLD_ZSHRC}"
 
-      echo "${FMT_YELLOW}Found old ~/.zshrc.pre-oh-my-zsh." \
+      echo "${FMT_YELLOW}Found old .zshrc.pre-oh-my-zsh." \
         "${FMT_GREEN}Backing up to ${OLD_OLD_ZSHRC}${FMT_RESET}"
     fi
-    echo "${FMT_YELLOW}Found ~/.zshrc.${FMT_RESET} ${FMT_GREEN}Backing up to ${OLD_ZSHRC}${FMT_RESET}"
-    mv ~/.zshrc "$OLD_ZSHRC"
+    echo "${FMT_GREEN}Backing up to ${OLD_ZSHRC}${FMT_RESET}"
+    mv "$zdot/.zshrc" "$OLD_ZSHRC"
   fi
 
-  echo "${FMT_GREEN}Using the Oh My Zsh template file and adding it to ~/.zshrc.${FMT_RESET}"
+  echo "${FMT_GREEN}Using the Oh My Zsh template file and adding it to $zdot/.zshrc.${FMT_RESET}"
 
-  # Replace $HOME path with '$HOME' in $ZSH variable in .zshrc file
-  omz=$(echo "$ZSH" | sed "s|^$HOME/|\$HOME/|")
-  sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > ~/.zshrc-omztemp
-  mv -f ~/.zshrc-omztemp ~/.zshrc
+  # Modify $ZSH variable in .zshrc directory to use the literal $ZDOTDIR or $HOME
+  omz="$ZSH"
+  if [ -n "$ZDOTDIR" ] && [ "$ZDOTDIR" != "$HOME" ]; then
+    omz=$(echo "$omz" | sed "s|^$ZDOTDIR/|\$ZDOTDIR/|")
+  fi
+  omz=$(echo "$omz" | sed "s|^$HOME/|\$HOME/|")
+
+  sed "s|^export ZSH=.*$|export ZSH=\"${omz}\"|" "$ZSH/templates/zshrc.zsh-template" > "$zdot/.zshrc-omztemp"
+  mv -f "$zdot/.zshrc-omztemp" "$zdot/.zshrc"
 
   echo
 }
@@ -371,8 +420,8 @@ EOF
     "$FMT_YELLOW" "$FMT_RESET"
   read -r opt
   case $opt in
-    y*|Y*|"") ;;
-    n*|N*) echo "Shell change skipped."; return ;;
+    [Yy]*|"") ;;
+    [Nn]*) echo "Shell change skipped."; return ;;
     *) echo "Invalid choice. Shell change skipped."; return ;;
   esac
 
@@ -407,9 +456,9 @@ EOF
 
   # We're going to change the default shell, so back up the current one
   if [ -n "$SHELL" ]; then
-    echo "$SHELL" > ~/.shell.pre-oh-my-zsh
+    echo "$SHELL" > "$zdot/.shell.pre-oh-my-zsh"
   else
-    grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > ~/.shell.pre-oh-my-zsh
+    grep "^$USER:" /etc/passwd | awk -F: '{print $7}' > "$zdot/.shell.pre-oh-my-zsh"
   fi
 
   echo "Changing your shell to $zsh..."
@@ -424,7 +473,8 @@ EOF
   # be prompted for the password either way, so this shouldn't cause any issues.
   #
   if user_can_sudo; then
-    sudo -k chsh -s "$zsh" "$USER"  # -k forces the password prompt
+    sudo -k >/dev/null 2>&1         # -k forces the password prompt
+    sudo chsh -s "$zsh" "$USER"
   else
     chsh -s "$zsh" "$USER"          # run chsh normally
   fi
@@ -451,12 +501,12 @@ print_success() {
   printf '\n'
   printf '\n'
   printf "%s %s %s\n" "Before you scream ${FMT_BOLD}${FMT_YELLOW}Oh My Zsh!${FMT_RESET} look over the" \
-    "$(fmt_code "$(fmt_link ".zshrc" "file://$HOME/.zshrc" --text)")" \
+    "$(fmt_code "$(fmt_link ".zshrc" "file://$zdot/.zshrc" --text)")" \
     "file to select plugins, themes, and options."
   printf '\n'
-  printf '%s\n' "• Follow us on Twitter: $(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
+  printf '%s\n' "• Follow us on X: $(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
   printf '%s\n' "• Join our Discord community: $(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
-  printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
+  printf '%s\n' "• Get stickers, t-shirts, coffee mugs and more: $(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
   printf '%s\n' $FMT_RESET
 }
 
@@ -465,12 +515,13 @@ main() {
   if [ ! -t 0 ]; then
     RUNZSH=no
     CHSH=no
+    OVERWRITE_CONFIRMATION=no
   fi
 
   # Parse arguments
   while [ $# -gt 0 ]; do
     case $1 in
-      --unattended) RUNZSH=no; CHSH=no ;;
+      --unattended) RUNZSH=no; CHSH=no; OVERWRITE_CONFIRMATION=no ;;
       --skip-chsh) CHSH=no ;;
       --keep-zshrc) KEEP_ZSHRC=yes ;;
     esac
@@ -506,6 +557,11 @@ EOF
     exit 1
   fi
 
+  # Create ZDOTDIR folder structure if it doesn't exist
+  if [ -n "$ZDOTDIR" ]; then
+    mkdir -p "$ZDOTDIR"
+  fi
+
   setup_ohmyzsh
   setup_zshrc
   setup_shell
diff --git a/zsh/tools/theme_chooser.sh b/zsh/tools/theme_chooser.sh
index 3883f1d..ab270e8 100755
--- a/zsh/tools/theme_chooser.sh
+++ b/zsh/tools/theme_chooser.sh
@@ -1,4 +1,4 @@
-#!/bin/zsh
+#!/usr/bin/env zsh
 
 # Zsh Theme Chooser by fox (fox91 at anche dot no)
 # This program is free software. It comes without any warranty, to
diff --git a/zsh/tools/uninstall.sh b/zsh/tools/uninstall.sh
index 6a0e7b4..6e3df7a 100644
--- a/zsh/tools/uninstall.sh
+++ b/zsh/tools/uninstall.sh
@@ -1,3 +1,15 @@
+if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then
+  old_shell=$(cat ~/.shell.pre-oh-my-zsh)
+  echo "Switching your shell back to '$old_shell':"
+  if chsh -s "$old_shell"; then
+    rm -f ~/.shell.pre-oh-my-zsh
+  else
+    echo "Could not change default shell. Change it manually by running chsh"
+    echo "or editing the /etc/passwd file."
+    exit
+  fi
+fi
+
 read -r -p "Are you sure you want to remove Oh My Zsh? [y/N] " confirmation
 if [ "$confirmation" != y ] && [ "$confirmation" != Y ]; then
   echo "Uninstall cancelled"
@@ -25,16 +37,5 @@ else
   echo "No original zsh config found"
 fi
 
-if hash chsh >/dev/null 2>&1 && [ -f ~/.shell.pre-oh-my-zsh ]; then
-  old_shell=$(cat ~/.shell.pre-oh-my-zsh)
-  echo "Switching your shell back to '$old_shell':"
-  if chsh -s "$old_shell"; then
-    rm -f ~/.shell.pre-oh-my-zsh
-  else
-    echo "Could not change default shell. Change it manually by running chsh"
-    echo "or editing the /etc/passwd file."
-  fi
-fi
-
 echo "Thanks for trying out Oh My Zsh. It's been uninstalled."
 echo "Don't forget to restart your terminal!"
diff --git a/zsh/tools/upgrade.sh b/zsh/tools/upgrade.sh
index 596a593..01719d2 100755
--- a/zsh/tools/upgrade.sh
+++ b/zsh/tools/upgrade.sh
@@ -1,4 +1,7 @@
 #!/usr/bin/env zsh
+set +u # disable nounset
+
+local ret=0 # exit code
 
 # Protect against running with shells other than zsh
 if [ -z "$ZSH_VERSION" ]; then
@@ -7,11 +10,33 @@ fi
 
 # Protect against unwanted sourcing
 case "$ZSH_EVAL_CONTEXT" in
-  *:file) echo "error: this file should not be sourced" && return ;;
+  *:file) echo "error: this file should not be sourced" && return 1 ;;
 esac
 
+# Define "$ZSH" if not defined -- in theory this should be `export`ed by the calling script
+if [[ -z "$ZSH" ]]; then
+  ZSH="${0:a:h:h}"
+fi
+
 cd "$ZSH"
 
+verbose_mode="default"
+interactive=false
+
+while getopts "v:i" opt; do
+  case $opt in
+    v)
+      if [[ $OPTARG == default || $OPTARG == minimal || $OPTARG == silent ]]; then
+        verbose_mode=$OPTARG
+      else
+        echo "[oh-my-zsh] update verbosity '$OPTARG' is not valid"
+        echo "[oh-my-zsh] valid options are 'default', 'minimal' and 'silent'"
+      fi
+      ;;
+    i) interactive=true ;;
+  esac
+done
+
 # Use colors, but only if connected to a terminal
 # and that terminal supports them.
 
@@ -70,11 +95,16 @@ supports_hyperlinks() {
 
   # If $TERM_PROGRAM is set, these terminals support hyperlinks
   case "$TERM_PROGRAM" in
-  Hyper|iTerm.app|terminology|WezTerm) return 0 ;;
+  Hyper|iTerm.app|terminology|WezTerm|vscode) return 0 ;;
   esac
 
-  # kitty supports hyperlinks
-  if [ "$TERM" = xterm-kitty ]; then
+  # These termcap entries support hyperlinks
+  case "$TERM" in
+  xterm-kitty|alacritty|alacritty-direct) return 0 ;;
+  esac
+
+  # xfce4-terminal supports hyperlinks
+  if [ "$COLORTERM" = "xfce4-terminal" ]; then
     return 0
   fi
 
@@ -164,17 +194,23 @@ fi
 # Update upstream remote to ohmyzsh org
 git remote -v | while read remote url extra; do
   case "$url" in
-  https://github.com/robbyrussell/oh-my-zsh(|.git))
-    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
-    break ;;
-  git@github.com:robbyrussell/oh-my-zsh(|.git))
-    git remote set-url "$remote" "git@github.com:ohmyzsh/ohmyzsh.git"
-    break ;;
-  # Update out-of-date "unauthenticated git protocol on port 9418" to https
   git://github.com/robbyrussell/oh-my-zsh(|.git))
-    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git"
-    break ;;
+    # Update out-of-date "unauthenticated git protocol on port 9418" to https
+    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git" ;;
+  https://github.com/robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "https://github.com/ohmyzsh/ohmyzsh.git" ;;
+  git@github.com:robbyrussell/oh-my-zsh(|.git))
+    git remote set-url "$remote" "git@github.com:ohmyzsh/ohmyzsh.git" ;;
+  https://github.com/ohmyzsh/ohmyzsh(|.git)) ;;
+  git@github.com:ohmyzsh/ohmyzsh(|.git)) ;;
+  *) continue ;;
   esac
+
+  # If we reach this point we have found the proper ohmyzsh upstream remote. If we don't,
+  # we'll only update from the set remote if `oh-my-zsh.remote` has been set to a remote,
+  # as when installing from a fork.
+  git config --local oh-my-zsh.remote "$remote"
+  break
 done
 
 # Set git-config values known to fix git errors
@@ -203,7 +239,9 @@ git checkout -q "$branch" -- || exit 1
 last_commit=$(git rev-parse "$branch")
 
 # Update Oh My Zsh
-printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
+if [[ $verbose_mode != silent ]]; then
+  printf "${BLUE}%s${RESET}\n" "Updating Oh My Zsh"
+fi
 if LANG= git pull --quiet --rebase $remote $branch; then
   # Check if it was really updated or not
   if [[ "$(git rev-parse HEAD)" = "$last_commit" ]]; then
@@ -215,24 +253,30 @@ if LANG= git pull --quiet --rebase $remote $branch; then
     git config oh-my-zsh.lastVersion "$last_commit"
 
     # Print changelog to the terminal
-    if [[ "$1" = --interactive ]]; then
-      "$ZSH/tools/changelog.sh" HEAD "$last_commit"
+    if [[ $interactive == true && $verbose_mode == default ]]; then
+      ZSH="$ZSH" command zsh -f "$ZSH/tools/changelog.sh" HEAD "$last_commit"
     fi
 
-    printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
+    if [[ $verbose_mode != silent ]]; then
+      printf "${BLUE}%s \`${BOLD}%s${RESET}${BLUE}\`${RESET}\n" "You can see the changelog with" "omz changelog"
+    fi
   fi
 
-  printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
-  printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
-  printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
-  printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
-  printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
-  printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
-  printf '\n'
-  printf "${BLUE}%s${RESET}\n\n" "$message"
-  printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on Twitter:" "$(fmt_link @ohmyzsh https://twitter.com/ohmyzsh)"
-  printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
-  printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "Planet Argon Shop" https://shop.planetargon.com/collections/oh-my-zsh)"
+  if [[ $verbose_mode == default ]]; then
+    printf '%s         %s__      %s           %s        %s       %s     %s__   %s\n'      $RAINBOW $RESET
+    printf '%s  ____  %s/ /_    %s ____ ___  %s__  __  %s ____  %s_____%s/ /_  %s\n'      $RAINBOW $RESET
+    printf '%s / __ \\%s/ __ \\  %s / __ `__ \\%s/ / / / %s /_  / %s/ ___/%s __ \\ %s\n'  $RAINBOW $RESET
+    printf '%s/ /_/ /%s / / / %s / / / / / /%s /_/ / %s   / /_%s(__  )%s / / / %s\n'      $RAINBOW $RESET
+    printf '%s\\____/%s_/ /_/ %s /_/ /_/ /_/%s\\__, / %s   /___/%s____/%s_/ /_/  %s\n'    $RAINBOW $RESET
+    printf '%s    %s        %s           %s /____/ %s       %s     %s          %s\n'      $RAINBOW $RESET
+    printf '\n'
+    printf "${BLUE}%s${RESET}\n\n" "$message"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "To keep up with the latest news and updates, follow us on X:" "$(fmt_link @ohmyzsh https://x.com/ohmyzsh)"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Want to get involved in the community? Join our Discord:" "$(fmt_link "Discord server" https://discord.gg/ohmyzsh)"
+    printf "${BLUE}${BOLD}%s %s${RESET}\n" "Get your Oh My Zsh swag at:" "$(fmt_link "CommitGoods Shop" https://commitgoods.com/collections/oh-my-zsh)"
+  elif [[ $verbose_mode == minimal ]]; then
+    printf "${BLUE}%s${RESET}\n" "$message"
+  fi
 else
   ret=$?
   printf "${RED}%s${RESET}\n" 'There was an error updating. Try again later?'
diff --git a/zshrc b/zshrc
index 9d58879..776e432 100644
--- a/zshrc
+++ b/zshrc
@@ -1,13 +1,13 @@
 # If you come from bash you might have to change your $PATH.
-# export PATH=$HOME/bin:/usr/local/bin:$PATH
+export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH
 
-# Path to your oh-my-zsh installation.
-export ZSH=$HOME/.dots/zsh
+# Path to your Oh My Zsh installation.
+export ZSH="$HOME/.dots/zsh"
 
 # Set name of the theme to load --- if set to "random", it will
-# load a random theme each time oh-my-zsh is loaded, in which case,
+# load a random theme each time Oh My Zsh is loaded, in which case,
 # to know which specific one was loaded, run: echo $RANDOM_THEME
-# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+# See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes
 ZSH_THEME="eof"
 
 # Setup eof theme mode
@@ -23,7 +23,7 @@ fi
 
 # Set list of themes to pick from when loading at random
 # Setting this variable when ZSH_THEME=random will cause zsh to load
-# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/
+# a theme from this variable instead of looking in $ZSH/themes/
 # If set to an empty array, this variable will have no effect.
 # ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" )
 
@@ -34,17 +34,16 @@ fi
 # Case-sensitive completion must be off. _ and - will be interchangeable.
 # HYPHEN_INSENSITIVE="true"
 
-# Uncomment the following line to disable bi-weekly auto-update checks.
-# DISABLE_AUTO_UPDATE="true"
-
-# Uncomment the following line to automatically update without prompting.
-DISABLE_UPDATE_PROMPT="true"
+# Uncomment one of the following lines to change the auto-update behavior
+# zstyle ':omz:update' mode disabled  # disable automatic updates
+# zstyle ':omz:update' mode auto      # update automatically without asking
+zstyle ':omz:update' mode reminder  # just remind me to update when it's time
 
 # Uncomment the following line to change how often to auto-update (in days).
-export UPDATE_ZSH_DAYS=5
+zstyle ':omz:update' frequency 13
 
 # Uncomment the following line if pasting URLs and other text is messed up.
-# DISABLE_MAGIC_FUNCTIONS=true
+# DISABLE_MAGIC_FUNCTIONS="true"
 
 # Uncomment the following line to disable colors in ls.
 # DISABLE_LS_COLORS="true"
@@ -56,7 +55,10 @@ export UPDATE_ZSH_DAYS=5
 # ENABLE_CORRECTION="true"
 
 # Uncomment the following line to display red dots whilst waiting for completion.
-# COMPLETION_WAITING_DOTS="true"
+# You can also set it to another string to have that shown instead of the default red dots.
+# e.g. COMPLETION_WAITING_DOTS="%F{yellow}waiting...%f"
+# Caution: this setting can cause issues with multiline prompts in zsh < 5.7.1 (see #5765)
+COMPLETION_WAITING_DOTS="true"
 
 # Uncomment the following line if you want to disable marking untracked files
 # under VCS as dirty. This makes repository status check for large repositories
@@ -75,8 +77,8 @@ export UPDATE_ZSH_DAYS=5
 # ZSH_CUSTOM=/path/to/new-custom-folder
 
 # Which plugins would you like to load?
-# Standard plugins can be found in ~/.oh-my-zsh/plugins/*
-# Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
+# Standard plugins can be found in $ZSH/plugins/
+# Custom plugins may be added to $ZSH_CUSTOM/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
 plugins=(git themes common-aliases git-prompt terraform tmux ansible archlinux docker docker-compose kubectl kubectx minikube aws)
@@ -98,11 +100,14 @@ else
 fi
 
 # Compilation flags
-# export ARCHFLAGS="-arch x86_64"
+# export ARCHFLAGS="-arch $(uname -m)"
 
-# Set personal aliases, overriding those provided by oh-my-zsh libs,
-# plugins, and themes. Aliases can be placed here, though oh-my-zsh
-# users are encouraged to define aliases within the ZSH_CUSTOM folder.
+# Set personal aliases, overriding those provided by Oh My Zsh libs,
+# plugins, and themes. Aliases can be placed here, though Oh My Zsh
+# users are encouraged to define aliases within a top-level file in
+# the $ZSH_CUSTOM folder, with .zsh extension. Examples:
+# - $ZSH_CUSTOM/aliases.zsh
+# - $ZSH_CUSTOM/macos.zsh
 # For a full list of active aliases, run `alias`.
 #
 # Example aliases