diff --git a/Examples.md b/Examples.md
index f3beec0..b63783e 100644
--- a/Examples.md
+++ b/Examples.md
@@ -1,46 +1,60 @@
-*Disclaimer: The examples are maintained by the community and are not thoroughly tested*
+*Disclaimer: The examples are maintained by the community and are not thoroughly tested.*
 
-*Make sure that your script runs both on bash and zsh before adding it here*
+To add a script:
+- check it runs on bash and zsh
+- add it under an appropriate category in the ToC
 
 Table of Contents
 =================
 
 * [General](#general)
-* [Opening files](#opening-files)
-* [Changing directory](#changing-directory)
-* [Searching file contents](#searching-file-contents)
 * [Command history](#command-history)
    * [With write to terminal capabilities](#with-write-to-terminal-capabilities)
-* [Processes](#processes)
-* [Systemctl units](#systemctl-units)
-* [Git](#git)
-* [jrnl](#jrnl)
-* [Tags](#tags)
+* System
+  * [i3](#i3)
+  * [Copy current item to clipboard](#clipboard)
+  * [Processes](#processes)
+  * [dotfiles management](#dotfiles-management)
+  * [Systemctl units](#systemctl-units)
+  * [man pages](#man-pages)
+* Package management
+  * [apt](#apt)
+  * [Pacman](#pacman)
+  * [NPM](#npm)
+  * [Homebrew](#homebrew)
+  * [Homebrew Cask](#homebrew-cask)
+* Filesystem navigation
+  * [Opening files](#opening-files)
+  * [Changing directory](#changing-directory)
+  * [Searching file contents](#searching-file-contents)
+  * [cd](#cd)
+     * [Integration with <a href="https://github.com/changyuheng/zsh-interactive-cd">zsh-interactive-cd</a>.](#integration-with-zsh-interactive-cd)
+     * [Interactive cd](#interactive-cd)
+  * [autojump](#autojump)
+     * [Integration with <a href="https://github.com/wting/autojump">autojump</a>](#integration-with-autojump)
+  * [z](#z)
+     * [Integration with <a href="https://github.com/rupa/z">z</a>.](#integration-with-z)
+     * [With <a href="https://github.com/changyuheng/fz">fz</a>.](#with-fz)
+     * [With <a href="https://github.com/clvv/fasd">fasd</a>.](#with-fasd-1)
+  * [Locate](#locate)
+  * [Browsing](#browsing)
+* CLI Tools
+  * [Git](#git)
+  * [jrnl](#jrnl)
+* Moving from other tools
+  * [fzf as rofi replacement](#fzf-as-rofi-replacement)
+  * [fzf as dmenu replacement](#fzf-as-dmenu-replacement)
+* [ctags](#ctags)
 * [tmux](#tmux)
 * [ASDF](#asdf)
 * [Images](#images)
-* [apt](#apt)
-* [Homebrew](#homebrew)
-* [Homebrew Cask](#homebrew-cask)
 * [v](#v)
    * [Inspired by v. Opens files in ~/.viminfo](#inspired-by-v-opens-files-in-viminfo)
    * [With <a href="https://github.com/clvv/fasd">fasd</a>.](#with-fasd)
-* [cd](#cd)
-   * [Integration with <a href="https://github.com/changyuheng/zsh-interactive-cd">zsh-interactive-cd</a>.](#integration-with-zsh-interactive-cd)
-   * [Interactive cd](#interactive-cd)
-* [autojump](#autojump)
-   * [Integration with <a href="https://github.com/wting/autojump">autojump</a>](#integration-with-autojump)
-* [z](#z)
-   * [Integration with <a href="https://github.com/rupa/z">z</a>.](#integration-with-z)
-   * [With <a href="https://github.com/changyuheng/fz">fz</a>.](#with-fz)
-   * [With <a href="https://github.com/clvv/fasd">fasd</a>.](#with-fasd-1)
 * [Shell bookmarks](#shell-bookmarks)
 * [Google Chrome](#google-chrome)
    * [Browsing history](#browsing-history)
    * [Bookmarks](#bookmarks)
-* [Browsing](#browsing)
-* [NPM](#npm)
-* [Locate](#locate)
 * [mpd](#mpd)
    * [fmui](#fmui)
    * [fzf-mpd](#fzf-mpd)
@@ -55,15 +69,8 @@ Table of Contents
 * [BibTeX](#bibtex)
 * [Docker](#docker)
 * [buku](#buku)
-* [i3](#i3)
-* [man pages](#man-pages)
 * [Python Behave BDD](#python-behave-bdd)
-* [fzf as rofi replacement](#fzf-as-rofi-replacement)
-* [fzf as dmenu replacement](#fzf-as-dmenu-replacement)
-* [dotfiles management](#dotfiles-management)
 * [Transmission](#transmission)
-* [Pacman](#pacman)
-* [Copy current item to clipboard](#clipboard)
 * [Todoist CLI](#Todoist-CLI)
 
 
@@ -780,7 +787,7 @@ fjrnl() {
   } 
 ```
 
-### Tags
+### ctags
 
 ```sh
 # ftags - search ctags
@@ -1638,7 +1645,8 @@ for_window [title="fzf-menu"] floating enable
 ```
 
 ### Man pages
-Quickly display a man page using fzf and fd. `MANPATH` has to be set to a single directory (usually `/usr/share/man`).
+Quickly display a man page using fzf and fd.
+`MANPATH` has to be set to a single directory (usually `/usr/share/man`).
 Accepts an optional argument for the manual section (defaults to 1).
 
 ```sh
@@ -1738,10 +1746,10 @@ Don't forget to add a float/center rule for `fzfmenu` class/name to your wm's co
 
 ### dotfiles management
 
-[dotbare](https://github.com/kazhala/dotbare) is a command-line utility to help
-you manage your dotfiles. It heavily utilises fzf for interactive user
-experience. It is inspired by [forgit](https://github.com/wfxr/forgit), but focuses on dotfiles rather than generic
-git. By default, it wraps around git bare repository but it could also be easily integrated with a symlink/GNU stow setup.
+[dotbare](https://github.com/kazhala/dotbare) is a command-line utility to manage your dotfiles.
+It heavily utilises fzf for interactive user experience.
+It is inspired by [forgit](https://github.com/wfxr/forgit), but focuses on dotfiles rather than generic git.
+By default, it wraps around git bare repository but it could also be easily integrated with a symlink/GNU stow setup.
 
 ![dotbare screenshot](https://user-images.githubusercontent.com/43941510/82644470-b4a32c80-9c54-11ea-9601-d237eb98912e.gif)