New sections for clarity.

The section organization was getting to be a bit confusing. Some reorganization:
- Pull out Zsh-specific items (since most people want them together or not at all).
- Split "Utilities and Tools" (the biggest section) into sections for command-line productivity,
  system utilities, command-line applications.
- Clarify section names and descriptions.

README.md

@@ -2,39 +2,38 @@
 
 A curated list of awesome command-line frameworks, toolkits, guides and gizmos. Inspired by awesome-php. This awesome collection is also available on [Unix-Shell.ZEEF.com](https://unix-shell.zeef.com/caleb.xu).
 - [Awesome Bash](#awesome-bash)
-	- [Networking and Servers](#networking-and-servers)
+	- [Downloading and Serving](#downloading-and-serving)
 	- [Customization](#customization)
-	- [Package Management and Frameworks](#package-management-and-frameworks)
+	- [Shell Package Management](#shell-package-management)
-	- [Writing and Testing Scripts](#writing-and-testing-scripts)
+	- [Shell Script Development](#shell-script-development)
-	- [Multimedia](#multimedia)
+	- [Multimedia and File Formats](#multimedia-and-file-formats)
+	- [Applications](#applications)
 	- [Games](#games)
-	- [Utilities and Tools](#utilities-and-tools)
+	- [Command-Line Productivity](#command-line-productivity)
+	- [For Developers](#for-developers)
+	- [System Utilities](#system-utilities)
+	- [Zsh](#zsh)
 - [Guides](#guides)
 - [Other Awesome Lists](#other-awesome-lists)
 
-## Networking and Servers
+## Downloading and Serving
 
 *Self-hosted, lightweight servers and networking tools written in shell scripts.*
 
 * [aria2](https://github.com/tatsuhiro-t/aria2) - aria2 is a lightweight multi-protocol & multi-source, cross platform download utility operated in command-line. It supports HTTP/HTTPS, FTP, BitTorrent and Metalink
 * [balls](https://github.com/jneen/balls) - Bash on Balls
-* [bashblog](https://github.com/cfenollosa/bashblog) - A Bash script that handles blog posting
 * [bashttpd](https://github.com/avleen/bashttpd) - A web server written in Bash
 * [bitpocket](https://github.com/sickill/bitpocket) - "DIY Dropbox" or "2-way directory (r)sync with proper deletion"
-* [dokku](https://github.com/progrium/dokku) - Docker powered mini-Heroku in around 100 lines of Bash
 * [Dropbox-Uploader](https://github.com/andreafabrizi/Dropbox-Uploader) - Dropbox Uploader is a Bash script which can be used to upload, download, list or delete files from Dropbox
 * [httpie](https://github.com/jakubroztocil/httpie) - HTTPie is a command line HTTP client, a user-friendly cURL replacement
 * [ngincat](https://github.com/jaburns/ngincat) - Tiny Bash HTTP server using netcat
-* [pushblast](https://github.com/alebcay/pushblast) - Get PushBullet notifications when a shell program exits
-* [pushbullet-bash](https://github.com/Red5d/pushbullet-bash) - Bash interface to the PushBullet API
 * [resty](https://github.com/micha/resty) - Little command line REST client that you can use in pipelines
-* [youtube-dl](https://github.com/rg3/youtube-dl) Small command-line program to download videos from YouTube.com and other video sites
+* [youtube-dl](https://github.com/rg3/youtube-dl) - Small command-line program to download videos from YouTube.com and other video sites
 
 ## Customization
 
 *Custom prompts, color themes, etc.*
 
-* [awesome-zsh-plugins](https://github.com/unixorn/awesome-zsh-plugins) - A list of Zsh plugins usable with antigen, dotzsh, oh-my-zsh & prezto.
 * [base16-shell](https://github.com/chriskempson/base16-shell) - Base16 for Shells
 * [bash-git-prompt](https://github.com/magicmonty/bash-git-prompt) - An informative and fancy Bash prompt for Git users
 * [bash-powerline](https://github.com/riobard/bash-powerline) - Powerline-style Bash prompt in pure Bash script
@@ -44,52 +43,64 @@ A curated list of awesome command-line frameworks, toolkits, guides and gizmos.
 * [gittify](https://github.com/momeni/gittify) - A colorful Bash prompt + customized Git aliases
 * [Gogh - Color Scheme](https://github.com/Mayccoll/Elementary-OS-Terminal-Colors) - Color Scheme for Gnome Terminal
 * [liquidprompt](https://github.com/nojhan/liquidprompt) - A full-featured & carefully designed adaptive prompt for Bash & Zsh
-* [powerline-zsh](https://github.com/carlcarl/powerline-zsh) - Powerline for Zsh
+* [mysql-colorize](https://github.com/horosgrisa/mysql-colorize.bash) -  Colorization for mysql comand-line client
-* [pure](https://github.com/sindresorhus/pure) - Pretty, minimal and fast Zsh prompt
 * [sexy-bash-prompt](https://github.com/twolfson/sexy-bash-prompt) - Bash prompt with colors, Git statuses, and Git branches
-* [zsh-autosuggestions](https://github.com/tarruda/zsh-autosuggestions) - Fish-like autosuggestions for Zsh
-* [zsh-git-prompt](https://github.com/olivierverdier/zsh-git-prompt) - Informative Git prompt for Zsh
-* [zsh-history-substring-search](https://github.com/zsh-users/zsh-history-substring-search) - An implementation of the Fish shell's history search feature for Zsh.
-* [zsh-prompt-powerline](https://github.com/Valodim/zsh-prompt-powerline) - A Zsh prompt based on the powerline font from the popular vim plugin
-* [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting) - Fish shell like syntax highlighting for Zsh
 
-## Package Management and Frameworks
+## Shell Package Management
 
 *Tools for managing multiple shell configurations.*
 
-* [antigen](https://github.com/zsh-users/antigen) - A plugin manager for Zsh, inspired by oh-my-zsh and vundle
 * [antigen-hs](https://github.com/Tarrasch/antigen-hs) - A replacement for antigen optimized for a low overhead when starting up the shell.
 * [bash-it](https://github.com/revans/bash-it) - A community Bash framework
 * [basher](https://github.com/basherpm/basher) - A package manager for shell scripts
 * [bpkg](http://www.bpkg.io/) - JavaScript has npm, Ruby has Gems, Python has pip and now Shell has bpkg
-* [dotzsh](https://github.com/dotphiles/dotzsh) - dotzsh strives to be platform and version independent, some functionality may be lost when running under older versions of Zsh, but it should degrade cleanly and allow you to use the same setup on multiple machines of differing OS's without problems.
 * [fresh](https://github.com/freshshell/fresh) - Keep your dotfiles fresh
 * [homeshick](https://github.com/andsens/homeshick) - Git dotfile synchronizer written in Bash
 * [oh-my-fish](https://github.com/bpinto/oh-my-fish) - Framework for managing your Fish shell configuration inspired by Oh My Zsh
-* [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) - A community-driven framework for managing your Zsh configuration
-* [prezto](https://github.com/sorin-ionescu/prezto) - The configuration framework for Zsh
 * [vcsh](https://github.com/RichiH/vcsh) - Config manager based on Git
 * [zgen](https://github.com/tarjoilija/zgen) - A lightweight plugin manager for ZSH inspired by antigen, but optimized for speed when starting a new shell. Can load oh-my-zsh compatible plugins and themes.
 
-## Writing and Testing Scripts
+## Shell Script Development
 
-*Boilerplate-like templates and systems to jump-start whatever script you are writing.*
+*Tools for writing, improving, or organizing Bash or other shell scripts*
 
 * [bashful](https://github.com/jmcantrell/bashful) - A collection of libraries to simplify writing Bash scripts
 * [bats](https://github.com/sstephenson/bats) - Bash Automated Testing System
 * [composure](https://github.com/erichs/composure) - Compose, document, version and organize your shell functions
 * [dispatch](https://github.com/Mosai/workshop/blob/master/doc/dispatch.md) - A command line argument parser in 50 lines of portable shell script.
+* [rerun](https://github.com/rerun/rerun) - A modular shell automation framework to organize your keeper scripts
+* [semver_bash](https://github.com/cloudflare/semver_bash) - Semantic Versioning in Bash
+* [shellcheck](https://github.com/koalaman/shellcheck) - Static analysis tool for shell scripts
 * [shpec](https://github.com/rylnd/shpec) - A shell testing framework
 * [sub](https://github.com/basecamp/sub) - A delicious way to organize programs
 * [ts](https://github.com/thinkerbot/ts) - A shell test script
 * [shunit2](https://code.google.com/p/shunit2/) - A unit test framework for Bash scripts with a flavour of JUnit/PyUnit.
 
-## Multimedia
+## Multimedia and File Formats
 
 *Tools for handling video and audio files.*
 
+* [adb-export](https://github.com/sromku/adb-export) - Export Android content providers to CSV format
+* [Android-Kitchen](https://github.com/dsixda/Android-Kitchen) - A text-based kitchen for Android ROM customization. Uses shell scripts and works with Cygwin/OS X/Linux
 * [Beets](https://github.com/sampsyo/beets) - Music library manager and MusicBrainz tagger
+* [image-scraper](https://github.com/sananth12/ImageScraper) - A cool command line image scraper with a lot of features.
+* [jq](https://github.com/stedolan/jq) - Sed for json data. You can use it to slice and filter and map and transform structured data
 * [PiCAST](https://github.com/lanceseidman/PiCAST) - PiCAST turns your $35 Raspberry Pi in to a Chromecast like Device
+* [sejda](https://github.com/torakiki/sejda/) - Command line manipulation of PDF documents (split, merge, rotate, convert to jpg, extract text, etc)
+
+## Applications
+
+*Command line-based applications or command line access to existing services.*
+
+* [ansiweather](https://github.com/fcambus/ansiweather) - Weather in your terminal, with ANSI colors and Unicode symbols
+* [bashblog](https://github.com/cfenollosa/bashblog) - A Bash script that handles blog posting
+* [geeknote](https://github.com/VitaliyRodnenko/geeknote) - Command line evernote client
+* [jrnl](https://github.com/maebert/jrnl) - A simple command line journal application that stores your journal in a plain text file
+* [ledger](https://github.com/ledger/ledger) - Command line accounting
+* [pushblast](https://github.com/alebcay/pushblast) - Get PushBullet notifications when a shell program exits
+* [pushbullet-bash](https://github.com/Red5d/pushbullet-bash) - Bash interface to the PushBullet API
+* [transfer.sh](https://transfer.sh/) — Quickly upload and share files from your shell
+* [wego](https://github.com/schachmat/wego) - Weather app for the terminal
 
 ## Games
 
@@ -100,63 +111,76 @@ A curated list of awesome command-line frameworks, toolkits, guides and gizmos.
 * [sedtris](https://github.com/uuner/sedtris) - Tetris in sed
 * [sed-scripts](https://github.com/aureliojargas/sed-scripts) - Arkanoid and Sokoban written using sed
 
-## Utilities and Tools
+## Command-Line Productivity
 
-*Other various neat gizmos to make your terminal experience more enjoyable.*
+*Search, bookmarks, multiplexing, and other tools that make your terminal experience more productive.*
 
-* [adb-export](https://github.com/sromku/adb-export) - Export Android content providers to CSV format
 * [ag](https://github.com/ggreer/the_silver_searcher) - Super fast string search through a directory hierarchy
-* [Android-Kitchen](https://github.com/dsixda/Android-Kitchen) - A text-based kitchen for Android ROM customization. Uses shell scripts and works with Cygwin/OS X/Linux
-* [ansiweather](https://github.com/fcambus/ansiweather) - Weather in your terminal, with ANSI colors and Unicode symbols
 * [autoenv](https://github.com/kennethreitz/autoenv) - Directory-based environments
 * [autojump](https://github.com/joelthelion/autojump) - A cd command that learns - easily navigate directories from the command line
 * [bash-slugify](https://github.com/benlinton/bash-slugify) - Command that converts filenames and directories to a web friendly format
 * [bashmarks](https://github.com/huyng/bashmarks) - Directory bookmarks for the shell
 * [byobu](http://byobu.co/) - Text-based window manager and terminal multiplexer
-* [cloc](http://cloc.sourceforge.net) - Count Lines of Code
 * [commacd](https://github.com/shyiko/commacd) - A faster way to move around in Bash
-* [cv](https://github.com/Xfennec/cv) - Linux tool to show progress for cp, rm, dd, ...
 * [fasd](https://github.com/clvv/fasd) - Command-line productivity booster, offers quick access to files and directories
-* [geeknote](https://github.com/VitaliyRodnenko/geeknote) - Command line evernote client
-* [git-extra-commands](https://github.com/unixorn/git-extra-commands) - Many Git extra utilities. Churn, cut-branch, improved-merge and many more.
-* [git-extras](https://github.com/visionmedia/git-extras) - Git utilities -- repo summary, repl, changelog population, author commit percentages and more
-* [git-sh](https://github.com/rtomayko/git-sh) - A customized Bash environment suitable for Git work
 * [hhighlighter](https://github.com/paoloantinori/hhighlighter) - Colorize words in a command output
 * [hr](https://github.com/LuRsT/hr) - `<hr />` for your terminal
 * [hstr](https://github.com/dvorka/hstr) - Bash History Suggest Box
-* [image-scraper](https://github.com/sananth12/ImageScraper) - A cool command line image scraper with a lot of features.
-* [jq](https://github.com/stedolan/jq) - Sed for json data. You can use it to slice and filter and map and transform structured data
-* [jrnl](https://github.com/maebert/jrnl) - A simple command line journal application that stores your journal in a plain text file
 * [k](https://github.com/supercrabtree/k) - k is a Zsh script to make directory listings more readable, adding Git status, fileweight colors and rotting dates
-* [ledger](https://github.com/ledger/ledger) - Command line accounting
-* [lsp](https://github.com/dborzov/lsp) - An improved `ls`, with file descriptions in plain language and intelligent file grouping
-* [mr](https://github.com/joeyh/myrepos) - Multiple Respository management tool
-* [mysql-colorize](https://github.com/horosgrisa/mysql-colorize.bash) -  Colorization for mysql comand-line client
-* [ncdu](http://dev.yorhel.nl/ncdu) - NCurses Disk Usage
 * [parallel](http://www.gnu.org/software/parallel) - Build and execute shell command lines from standard input in parallel
 * [percol](https://github.com/mooz/percol) - Adds flavor of interactive filtering to the traditional pipe concept of UNIX shell
-* [pretty-time-zsh](https://github.com/sindresorhus/pretty-time-zsh) - Convert seconds to a human readable string: `165392` → `1d 21h 56m 32s`
-* [quick-secure](https://github.com/marshyski/quick-secure) - Quickly secure and harden UNIX/Linux systems
-* [rerun](https://github.com/rerun/rerun) - A modular shell automation framework to organize your keeper scripts
-* [sejda](https://github.com/torakiki/sejda/) - Command line manipulation of PDF documents (split, merge, rotate, convert to jpg, extract text, etc)
-* [semver_bash](https://github.com/cloudflare/semver_bash) - Semantic Versioning in Bash
-* [shellcheck](https://github.com/koalaman/shellcheck) - Static analysis tool for shell scripts
-* [shipit](https://github.com/sapegin/shipit) - Minimalistic SSH deployment
-* [slap](https://github.com/slap-editor/slap) - Sublime-like terminal-based text editor that runs on Node.js
 * [spark](https://github.com/holman/spark) - ▁▂▃▅▂▇ in your shell
 * [spot](https://github.com/guille/spot) - Tiny file search utility
 * [sshfs](https://github.com/osxfuse/sshfs) - A tool for mounting remote file systems over SSH
 * [sshrc](https://github.com/Russell91/sshrc) - Bring your .bashrc, .vimrc, etc. with you when you SSH
 * [tmux](http://tmux.sourceforge.net/) - Amazing terminal multiplexer
-* [transfer.sh](https://transfer.sh/) — Quickly upload and share files from your shell
 * [v](https://github.com/rupa/v) - z for vim.
-* [wego](https://github.com/schachmat/wego) - Weather app for the terminal
 * [wemux](https://github.com/zolrath/wemux) - Multi-User Tmux Made Easy
 * [xmlstarlet](http://xmlstar.sourceforge.net/) - Old but powerful tool for command-line XML formatting, filtering, and manipulation.
 * [z](https://github.com/rupa/z) - z is the new j, yo
+
+## For Developers
+
+*Command-line development, version control, and deployment.*
+
+* [cloc](http://cloc.sourceforge.net) - Count Lines of Code
+* [dokku](https://github.com/progrium/dokku) - Docker powered mini-Heroku in around 100 lines of Bash
+* [git-extra-commands](https://github.com/unixorn/git-extra-commands) - Many Git extra utilities. Churn, cut-branch, improved-merge and many more.
+* [git-extras](https://github.com/visionmedia/git-extras) - Git utilities -- repo summary, repl, changelog population, author commit percentages and more
+* [git-sh](https://github.com/rtomayko/git-sh) - A customized Bash environment suitable for Git work
+* [mr](https://github.com/joeyh/myrepos) - Multiple Respository management tool
+* [slap](https://github.com/slap-editor/slap) - Sublime-like terminal-based text editor that runs on Node.js
+* [shipit](https://github.com/sapegin/shipit) - Minimalistic SSH deployment
+
+## System Utilities
+
+*System administration and system debugging.*
+
+* [cv](https://github.com/Xfennec/cv) - Linux tool to show progress for cp, rm, dd, ...
+* [lsp](https://github.com/dborzov/lsp) - An improved `ls`, with file descriptions in plain language and intelligent file grouping
+* [ncdu](http://dev.yorhel.nl/ncdu) - NCurses Disk Usage
+* [quick-secure](https://github.com/marshyski/quick-secure) - Quickly secure and harden UNIX/Linux systems
+
+## Zsh
+
+*Tools and customizations specifically for Zsh.*
+
+* [awesome-zsh-plugins](https://github.com/unixorn/awesome-zsh-plugins) - A list of Zsh plugins usable with antigen, dotzsh, oh-my-zsh & prezto.
+* [antigen](https://github.com/zsh-users/antigen) - A plugin manager for Zsh, inspired by oh-my-zsh and vundle
+* [dotzsh](https://github.com/dotphiles/dotzsh) - dotzsh strives to be platform and version independent, some functionality may be lost when running under older versions of Zsh, but it should degrade cleanly and allow you to use the same setup on multiple machines of differing OS's without problems.
+* [oh-my-zsh](https://github.com/robbyrussell/oh-my-zsh) - A community-driven framework for managing your Zsh configuration
+* [pretty-time-zsh](https://github.com/sindresorhus/pretty-time-zsh) - Convert seconds to a human readable string: `165392` → `1d 21h 56m 32s`
+* [powerline-zsh](https://github.com/carlcarl/powerline-zsh) - Powerline for Zsh
+* [prezto](https://github.com/sorin-ionescu/prezto) - The configuration framework for Zsh
+* [pure](https://github.com/sindresorhus/pure) - Pretty, minimal and fast Zsh prompt
+* [zsh-autosuggestions](https://github.com/tarruda/zsh-autosuggestions) - Fish-like autosuggestions for Zsh
 * [zsh-dwim](https://github.com/oknowton/zsh-dwim) - Zsh do what I mean.
-* [zsh-notify](https://github.com/marzocchi/zsh-notify) - Desktop notifications for long running commands in Zsh
+* [zsh-git-prompt](https://github.com/olivierverdier/zsh-git-prompt) - Informative Git prompt for Zsh
+* [zsh-history-substring-search](https://github.com/zsh-users/zsh-history-substring-search) - An implementation of the Fish shell's history search feature for Zsh.
 * [zshmarks](https://github.com/jocelynmallon/zshmarks) - A port of Bashmarks (simple bookmarking plugin by Todd Werth) for oh-my-zsh
+* [zsh-notify](https://github.com/marzocchi/zsh-notify) - Desktop notifications for long running commands in Zsh
+* [zsh-prompt-powerline](https://github.com/Valodim/zsh-prompt-powerline) - A Zsh prompt based on the powerline font from the popular vim plugin
+* [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting) - Fish shell like syntax highlighting for Zsh
 
 
 # Guides