diff --git a/docs/TODO.md b/docs/TODO.md
index 69a32efd..d6bf6efe 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -14,12 +14,14 @@ zsh completions have been installed to:
 ==> Linking Binary 'completion.zsh.inc' to '/usr/local/share/zsh/site-functions/_google_cloud_sdk'
 Ansible roles
 https://github.com/altermo/vim-plugin-list
+Play with Navi and configure cheat repos
 
 ## Pending
 
 * [Actions](https://github.com/sindresorhus/Actions) adds a wide-variety of actions that you can utilize with the macOS Shortcuts app. It is currently only available via the macOS app store. Requested a Homebrew Cask [here](https://github.com/sindresorhus/Actions/issues/127).
 * [Color Picker](https://github.com/sindresorhus/System-Color-Picker) is an improved color picker app available on macOS. It is currently only available via the macOS app store. Requested Homebrew Cask [here](https://github.com/sindresorhus/System-Color-Picker/issues/32).
 * Consider integrating [LocalAI](https://github.com/go-skynet/LocalAI) which can be used in combination with mods to generate ChatGPT responses locally
+* Wait for Homebrew install option for [Warpgate](https://github.com/warp-tech/warpgate)
 
 ## Premium Software Recommendations
 
@@ -173,7 +175,12 @@ https://github.com/rigoneri/Syte3
 * https://github.com/r-darwish/idnt
 * https://github.com/charmbracelet/wish
 * https://github.com/charmbracelet/skate
+* https://github.com/console-rs/indicatif
 
 ## PHP
 
-https://github.com/deployphp/deployer
\ No newline at end of file
+https://github.com/deployphp/deployer
+
+## Alternative OSes
+
+https://github.com/Andy-Python-Programmer/aero
\ No newline at end of file
diff --git a/home/.chezmoidata.yaml b/home/.chezmoidata.yaml
index 50ae7688..0ebe2033 100644
--- a/home/.chezmoidata.yaml
+++ b/home/.chezmoidata.yaml
@@ -256,6 +256,7 @@ softwareGroups:
     - lsd
     - mc
     - mcfly
+    - navi
     - nb
     - neovim
     - netcat
@@ -574,6 +575,7 @@ softwareGroups:
     - markdownlint-cli
     - prettierd
     - pre-commit
+    - ruff
     - shellcheck
     - shfmt
     - tflint
@@ -597,6 +599,7 @@ softwareGroups:
     - spotdl
     - svgo
     - tinypng
+    - vidmerger
     - wkhtmltopdf
     - youtube-dl
   Media-Desktop: &Media-Desktop
@@ -891,10 +894,12 @@ softwareGroups:
     - gfi
     - gulp
     - hey
+    - hugo
     - ionic
     - imageoptim-cli
     - ipfs
     - ipfs-deploy
+    - json-server
     - localtunnel
     - mitmproxy
     - muffet
@@ -1286,6 +1291,8 @@ softwareGroups:
       note: Editly NPM package is failing to install on macOS. Attempts to compile with node-gyp and fails.
     - pkg: rear
       note: System backup utility that may be incorporated after comparing it with alternative and perhaps better alternatives.
+    - pkg: frps / frpc
+      note: No need to integrate these packages at this time.
   helmCharts:
     - vector
 softwarePlugins:
diff --git a/home/dot_bashrc b/home/dot_bashrc
index 220f6fec..bbd84faf 100644
--- a/home/dot_bashrc
+++ b/home/dot_bashrc
@@ -115,6 +115,11 @@ if [ "$BASH_SUPPORT" = 'true' ]; then
     . "$HOME/.fig/shell/bashrc.post.bash"
   fi
 
+  ### Navi (Ctrl+G)
+  if command -v navi > /dev/null; then
+    eval "$(navi widget bash)"
+  fi
+
   ### The Fuck
   if command -v thefuck > /dev/null; then
 	  eval "$(thefuck --alias)"
diff --git a/home/dot_config/Code/User/README.md b/home/dot_config/Code/User/README.md
index 84301420..4a2a9797 100644
--- a/home/dot_config/Code/User/README.md
+++ b/home/dot_config/Code/User/README.md
@@ -16,4 +16,6 @@
 // Creates ~/.console-ninja folder -- needs to respect XDG
     // "wallabyjs.console-ninja",
     "gitpod.gitpod-remote-ssh", // Bunch of errors like this during install [gitpod-remote-ssh]: Couldn't find message for key openPreview.
-    // "leonardssh.vscord", Discord presence plugin (requires embedding key in settings.json)
\ No newline at end of file
+    // "leonardssh.vscord", Discord presence plugin (requires embedding key in settings.json)
+    "ms-toolsai.vscode-ai-remote", [vscode-ai]: Couldn't find message for key azureml.internal.activate.title.
+    "ms-toolsai.vscode-ai",
\ No newline at end of file
diff --git a/home/dot_config/Code/User/extensions.json b/home/dot_config/Code/User/extensions.json
index eacf712a..a7752201 100644
--- a/home/dot_config/Code/User/extensions.json
+++ b/home/dot_config/Code/User/extensions.json
@@ -166,8 +166,6 @@
     "ms-toolsai.jupyter-keymap",
     "ms-toolsai.jupyter-renderers",
     "ms-toolsai.jupyter",
-    "ms-toolsai.vscode-ai-remote",
-    "ms-toolsai.vscode-ai",
     "ms-toolsai.vscode-jupyter-cell-tags",
     "ms-toolsai.vscode-jupyter-slideshow",
     "ms-vscode-remote.remote-containers",
diff --git a/home/dot_config/navi/config.yaml b/home/dot_config/navi/config.yaml
new file mode 100644
index 00000000..863d36f5
--- /dev/null
+++ b/home/dot_config/navi/config.yaml
@@ -0,0 +1,29 @@
+style:
+  tag:
+    color: cyan # text color. possible values: https://bit.ly/3gloNNI
+    width_percentage: 26 # column width relative to the terminal window
+    min_width: 20 # minimum column width as number of characters
+  comment:
+    color: blue
+    width_percentage: 42
+    min_width: 45
+  snippet:
+    color: white
+
+finder:
+  command: fzf # equivalent to the --finder option
+  # overrides: --tac # equivalent to the --fzf-overrides option
+  # overrides_var: --tac # equivalent to the --fzf-overrides-var option
+
+# cheats:
+# paths:
+# - /path/to/some/dir
+# - /path/to/another/dir
+# path: /path/to/some/dir # (DEPRECATED) equivalent to the --path option
+
+# search:
+# tags: git,!checkout # equivalent to the --tag-rules option
+
+shell:
+  command: bash # shell used for shell out. possible values: bash, zsh, dash, ...
+  # finder_command: bash # similar, but for fzf's internals
diff --git a/home/dot_config/shell/exports.sh.tmpl b/home/dot_config/shell/exports.sh.tmpl
index a839fa6a..0088399b 100644
--- a/home/dot_config/shell/exports.sh.tmpl
+++ b/home/dot_config/shell/exports.sh.tmpl
@@ -137,6 +137,11 @@ fi
 # BW_CLIENTID client_id
 # BW_CLIENTSECRET
 
+### Cheat
+if command -v fzf > /dev/null; then
+  export CHEAT_USE_FZF=true
+fi
+
 ### Deta
 export DETA_INSTALL="$XDG_DATA_HOME/deta"
 export PATH="$PATH:$DETA_INSTALL/bin"
@@ -249,6 +254,9 @@ export MYSQL_HISTFILE="$XDG_DATA_HOME/mysql_history"
 ### .netrc
 export NETRC="$XDG_CONFIG_HOME/netrc"
 
+### Navi
+export NAVI_CONFIG "$XDG_CONFIG_HOME/navi/config.yaml"
+
 ### nnn
 if command -v nnn > /dev/null; then
   alias n='nnn -de'
diff --git a/home/dot_zshrc b/home/dot_zshrc
index d544fa80..dd60e86c 100644
--- a/home/dot_zshrc
+++ b/home/dot_zshrc
@@ -415,6 +415,11 @@ fi
 #   . "$ASDF_DATA_DIR/plugins/java/set-java-home.zsh"
 # fi
 
+### Navi (Ctrl+G)
+if command -v navi > /dev/null; then
+	eval "$(navi widget zsh)"
+fi
+
 ### mcfly
 if command -v mcfly > /dev/null; then
 	eval "$(mcfly init zsh)"
diff --git a/software.yml b/software.yml
index b00be190..e1264eb2 100644
--- a/software.yml
+++ b/software.yml
@@ -7676,6 +7676,80 @@ softwarePackages:
     _type: cli
     github: github.com/samber/sync-ssh-keys
     yay: sync-ssh-keys-bin
+  vidmerger:
+    _deps:
+      - ffmpeg
+    _bin: vidmerger
+    _desc: Merge video & audio files via CLI
+    _docs: https://github.com/tgotwig/vidmerger
+    _github: https://github.com/tgotwig/vidmerger
+    _home: https://github.com/tgotwig/vidmerger
+    _name: VidMerger
+    brew: tgotwig/vidmerger/vidmerger
+    choco: vidmerger
+  navi:
+    _bin: navi
+    _desc: An interactive cheatsheet tool for the command-line
+    _docs: https://github.com/denisidoro/navi/blob/master/docs/installation.md
+    _github: https://github.com/denisidoro/navi
+    _home: https://github.com/denisidoro/navi
+    _name: Navi
+    _repology: navi
+    brew: navi
+    cargo: navi --locked
+    emerge: app-misc/navi
+    nix-env: nixpkgs.navi
+    pacman: navi
+  frpc:
+    _bin: frpc
+    _desc: A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet.
+    _docs: https://github.com/fatedier/frp
+    _github: https://github.com/fatedier/frp
+    _home: https://github.com/fatedier/frp
+    _name: frpc (client)
+    brew: frpc
+  frps:
+    _bin: frps
+    _desc: A fast reverse proxy to help you expose a local server behind a NAT or firewall to the internet.
+    _docs: https://github.com/fatedier/frp
+    _github: https://github.com/fatedier/frp
+    _home: https://github.com/fatedier/frp
+    _name: frps (server)
+    brew: frps
+  ruff:
+    _bin: ruff
+    _desc: An extremely fast Python linter, written in Rust.
+    _docs: https://beta.ruff.rs/docs/
+    _github: https://github.com/charliermarsh/ruff
+    _home: https://beta.ruff.rs/docs/
+    _name: Ruff
+    pipx: ruff
+  hugo:
+    _bin: hugo
+    _desc: The world’s fastest framework for building websites.
+    _docs: https://gohugo.io/documentation/
+    _github: https://github.com/gohugoio/hugo
+    _home: https://gohugo.io/
+    _name: Hugo
+    apt: hugo
+    dnf: hugo
+    brew: hugo
+    choco: hugo
+    eopkg: hugo
+    go: github.com/gohugoio/hugo@latest
+    pacman: hugo
+    port: hugo
+    scoop: main/hugo
+    snap: hugo
+    zypper: hugo
+  json-server:
+    _bin: json-server
+    _desc: Get a full fake REST API with zero coding in less than 30 seconds (seriously)
+    _docs: https://github.com/typicode/json-server
+    _github: https://github.com/typicode/json-server
+    _home: https://github.com/typicode/json-server
+    _name: JSON Server
+    npm: json-server
   synp:
     _bin: synp
     _desc: Convert yarn.lock to package-lock.json and vice versa