diff --git a/README.md b/README.md
index 0b1c458a5..b8e4a6a22 100644
--- a/README.md
+++ b/README.md
@@ -489,7 +489,7 @@ rm -rf "~/.fzf"
 flatpak uninstall io.mpv.Mpv
 ```
 * iOS
-```
+```sh
 rm -rf /usr/local/bin/ani-cli
 ```
 To uninstall other dependencies:
@@ -504,7 +504,7 @@ apk del grep sed curl fzf git aria2 ffmpeg ncurses
 ### bash
 
 To add tab completions using bash run the following command inside the ani-cli directory
-```
+```sh
 cp _ani-cli-bash /path/to/your/completions
 echo "source /path/to/your/completions/_ani-cli-bash" >> ~/.bashrc
 ```
@@ -512,11 +512,19 @@ echo "source /path/to/your/completions/_ani-cli-bash" >> ~/.bashrc
 ### zsh
 
 To add tab completions using zsh run the following command inside the ani-cli directory
-```
+```sh
 cp _ani-cli-zsh /path/to/your/completions
 echo "source /path/to/your/completions/_ani-cli-zsh" >> ~/.zshrc
 ```
 
+### Cross-Shell (with [Carapace](https://github.com/carapace-sh/carapace))
+
+See the [setup](https://carapace-sh.github.io/carapace-bin/setup.html) guide on Carapace for your specific shell.
+To add tab completions using zsh run the following command inside the ani-cli directory
+```sh
+cp ani-cli.toml $HOME/.config/carapace/specs/ani-cli.yaml
+# Restart your shell for good measure
+``````
 ## Dependencies
 
 - grep
@@ -545,7 +553,7 @@ Ani-skip uses the external lua script function of mpv and as such – for now 
 
 ## FAQ
 <details>
-	
+
 * Can I change subtitle language or turn them off? - No, the subtitles are baked into the video.
 * Can I watch dub? - Yes, use `--dub`.
 * Can I change dub language? - No.
diff --git a/ani-cli.yaml b/ani-cli.yaml
new file mode 100644
index 000000000..aa79273a7
--- /dev/null
+++ b/ani-cli.yaml
@@ -0,0 +1,29 @@
+# yaml-language-server: $schema=https://carapace.sh/schemas/command.json
+name: ani-cli
+flags:
+  -c:  Continue watching from history
+  -d, --download:  Download the video instead of playing it
+  -D, --delete:  Delete history
+  -l, --logview:  Show logs
+  -s, --syncplay:  Use Syncplay to watch with friends
+  -S, --select-nth: Select nth entry
+  -q, --quality=: Specify the video quality
+  -v, --vlc:  Use VLC to play the video
+  -V, --version:  Show the version of the script
+  -e, --episode=:                      Specify the episode to watch
+  -r, --range=:                        Specify the range of episodes to watch
+  --dub:  Play dubbed version
+  --rofi:  Use rofi instead of fzf for the interactive menu
+  --skip:  Use ani-skip to skip the intro of the episode (mpv only)
+  --no-detach:  Don't detach the player (mpv only)
+  --exit-after-play:  Exit the player, and return the player exit code (mpv only)
+  --skip-title=:                       Use given title as ani-skip query
+  -N, --nextep-countdown:             Display a countdown to the next episode
+  -U, --update:  Update the script
+persistentflags:
+  -h, --help:  Show this help message and exit
+completion:
+  flag:
+    quality: ["480p", "720p", "1080p", "4K"] # Add supported qualities
+    episode: ["1", "2", "3", "4", "5", "6", "7", "8", "9", "10", "11", "12", "13"] # Example episode numbers or ranges
+    range: [ "1-13","1-26","1-3", "2-4", "3-4", "5-6"] # Example ranges