diff --git a/pages/common/espeak.md b/pages/common/espeak.md
new file mode 100644
index 000000000..b803f0481
--- /dev/null
+++ b/pages/common/espeak.md
@@ -0,0 +1,19 @@
+# espeak
+
+> Uses text-to-speech to speak through the default sound device.
+
+- Speak a phrase aloud:
+
+`espeak "I like to ride my bike."`
+
+- Speak a file aloud:
+
+`espeak -f {{filename}}`
+
+- Save output to a WAV audio file, rather than speaking it directly:
+
+`espeak -w {{filename.wav}} "It's GNU plus Linux"`
+
+- Use a different voice:
+
+`espeak -v {{voice}}`
diff --git a/pages/index.json b/pages/index.json
index 8cbd12949..f06cfd471 100644
--- a/pages/index.json
+++ b/pages/index.json
@@ -1 +1 @@
-{"commands":[{"name":"ab","platform":["common"]},{"name":"ack","platform":["common"]},{"name":"ag","platform":["common"]},{"name":"airport","platform":["osx"]},{"name":"alias","platform":["common"]},{"name":"apropos","platform":["common"]},{"name":"apt-get","platform":["linux"]},{"name":"aptitude","platform":["linux"]},{"name":"ar","platform":["common"]},{"name":"awk","platform":["common"]},{"name":"base64","platform":["linux"]},{"name":"bc","platform":["common"]},{"name":"brew","platform":["osx"]},{"name":"bundle","platform":["common"]},{"name":"caffeinate","platform":["osx"]},{"name":"cal","platform":["common"]},{"name":"calibre-server","platform":["common"]},{"name":"calibredb","platform":["common"]},{"name":"cat","platform":["common"]},{"name":"cd","platform":["common"]},{"name":"chmod","platform":["common"]},{"name":"chown","platform":["common"]},{"name":"chsh","platform":["common"]},{"name":"cksum","platform":["common"]},{"name":"clang","platform":["common"]},{"name":"convert","platform":["common"]},{"name":"cordova","platform":["common"]},{"name":"cp","platform":["common"]},{"name":"curl","platform":["common"]},{"name":"cut","platform":["common"]},{"name":"date","platform":["common"]},{"name":"deluser","platform":["common"]},{"name":"df","platform":["common"]},{"name":"diff","platform":["common"]},{"name":"dig","platform":["common"]},{"name":"diskutil","platform":["osx"]},{"name":"docker","platform":["common"]},{"name":"dpkg","platform":["linux"]},{"name":"drush","platform":["common"]},{"name":"drutil","platform":["osx"]},{"name":"du","platform":["linux","osx"]},{"name":"ebook-convert","platform":["common"]},{"name":"echo","platform":["common"]},{"name":"electrum","platform":["common"]},{"name":"emerge","platform":["linux"]},{"name":"env","platform":["common"]},{"name":"exiftool","platform":["common"]},{"name":"fdupes","platform":["common"]},{"name":"ffmpeg","platform":["common"]},{"name":"find","platform":["common"]},{"name":"findmnt","platform":["linux"]},{"name":"firewall-cmd","platform":["linux"]},{"name":"free","platform":["linux"]},{"name":"fswebcam","platform":["common"]},{"name":"gcc","platform":["common"]},{"name":"gem","platform":["common"]},{"name":"gifsicle","platform":["common"]},{"name":"git","platform":["common"]},{"name":"git-add","platform":["common"]},{"name":"git-blame","platform":["common"]},{"name":"git-branch","platform":["common"]},{"name":"git-checkout","platform":["common"]},{"name":"git-clone","platform":["common"]},{"name":"git-commit","platform":["common"]},{"name":"git-config","platform":["common"]},{"name":"git-diff","platform":["common"]},{"name":"git-init","platform":["common"]},{"name":"git-log","platform":["common"]},{"name":"git-merge","platform":["common"]},{"name":"git-mv","platform":["common"]},{"name":"git-pull","platform":["common"]},{"name":"git-push","platform":["common"]},{"name":"git-remote","platform":["common"]},{"name":"git-rm","platform":["common"]},{"name":"git-stash","platform":["common"]},{"name":"git-status","platform":["common"]},{"name":"git-tag","platform":["common"]},{"name":"gpg","platform":["common"]},{"name":"grep","platform":["common"]},{"name":"gzip","platform":["common"]},{"name":"handbrakecli","platform":["common"]},{"name":"haxelib","platform":["common"]},{"name":"head","platform":["linux","osx"]},{"name":"history","platform":["common"]},{"name":"hostname","platform":["linux","osx"]},{"name":"iconv","platform":["common"]},{"name":"ioping","platform":["common"]},{"name":"iostat","platform":["linux"]},{"name":"ip","platform":["linux"]},{"name":"ipcs","platform":["common"]},{"name":"java","platform":["common"]},{"name":"journalctl","platform":["linux"]},{"name":"kill","platform":["common"]},{"name":"less","platform":["common"]},{"name":"ln","platform":["common"]},{"name":"locate","platform":["linux","osx"]},{"name":"lp","platform":["common"]},{"name":"lpstat","platform":["common"]},{"name":"ls","platform":["common"]},{"name":"lsb_release","platform":["linux"]},{"name":"lsof","platform":["common"]},{"name":"man","platform":["common"]},{"name":"md5","platform":["osx"]},{"name":"md5sum","platform":["linux"]},{"name":"mdadm","platform":["linux"]},{"name":"mdfind","platform":["osx"]},{"name":"mkdir","platform":["common"]},{"name":"more","platform":["common"]},{"name":"mount","platform":["common"]},{"name":"mp4box","platform":["common"]},{"name":"mtr","platform":["common"]},{"name":"mv","platform":["common"]},{"name":"mysql","platform":["common"]},{"name":"mysqldump","platform":["common"]},{"name":"nc","platform":["common"]},{"name":"netstat","platform":["linux","osx"]},{"name":"networksetup","platform":["osx"]},{"name":"nginx","platform":["common"]},{"name":"nmap","platform":["common"]},{"name":"node","platform":["common"]},{"name":"nohup","platform":["common"]},{"name":"npm","platform":["common"]},{"name":"nvm","platform":["common"]},{"name":"open","platform":["osx"]},{"name":"pacman","platform":["linux"]},{"name":"pandoc","platform":["common"]},{"name":"passwd","platform":["common"]},{"name":"patch","platform":["common"]},{"name":"pbcopy","platform":["osx"]},{"name":"pbpaste","platform":["osx"]},{"name":"pgrep","platform":["common"]},{"name":"php","platform":["common"]},{"name":"ping","platform":["common"]},{"name":"pip","platform":["common"]},{"name":"play","platform":["common"]},{"name":"prctl","platform":["sunos"]},{"name":"prstat","platform":["sunos"]},{"name":"ps","platform":["common"]},{"name":"psql","platform":["common"]},{"name":"pushd","platform":["common"]},{"name":"pwd","platform":["common"]},{"name":"python","platform":["common"]},{"name":"qlmanage","platform":["osx"]},{"name":"redis-cli","platform":["common"]},{"name":"rename","platform":["common"]},{"name":"rm","platform":["common"]},{"name":"rmdir","platform":["common"]},{"name":"route","platform":["osx"]},{"name":"rsync","platform":["common"]},{"name":"salt","platform":["common"]},{"name":"salt-call","platform":["common"]},{"name":"salt-key","platform":["common"]},{"name":"salt-run","platform":["common"]},{"name":"say","platform":["osx"]},{"name":"scp","platform":["common"]},{"name":"screen","platform":["common"]},{"name":"sed","platform":["common"]},{"name":"sha1sum","platform":["linux"]},{"name":"sha224sum","platform":["linux"]},{"name":"sha256sum","platform":["linux"]},{"name":"sha384sum","platform":["linux"]},{"name":"sha512sum","platform":["linux"]},{"name":"shuf","platform":["linux"]},{"name":"shutdown","platform":["linux","osx"]},{"name":"sort","platform":["common"]},{"name":"sox","platform":["common"]},{"name":"split","platform":["common"]},{"name":"srm","platform":["common"]},{"name":"ss","platform":["linux"]},{"name":"ssh","platform":["common"]},{"name":"sshfs","platform":["common"]},{"name":"strace","platform":["linux"]},{"name":"sudo","platform":["common"]},{"name":"svcadm","platform":["sunos"]},{"name":"svccfg","platform":["sunos"]},{"name":"svcs","platform":["sunos"]},{"name":"svn","platform":["common"]},{"name":"sw_vers","platform":["osx"]},{"name":"sysctl","platform":["osx"]},{"name":"system_profiler","platform":["osx"]},{"name":"systemctl","platform":["linux"]},{"name":"systemsetup","platform":["osx"]},{"name":"tail","platform":["common"]},{"name":"tar","platform":["common"]},{"name":"tcpdump","platform":["common"]},{"name":"tcpflow","platform":["linux"]},{"name":"tee","platform":["common"]},{"name":"telnet","platform":["common"]},{"name":"test","platform":["common"]},{"name":"time","platform":["common"]},{"name":"tldr","platform":["common"]},{"name":"tmux","platform":["common"]},{"name":"top","platform":["linux","osx"]},{"name":"touch","platform":["common"]},{"name":"tr","platform":["common"]},{"name":"traceroute","platform":["common"]},{"name":"transcode","platform":["common"]},{"name":"tree","platform":["common"]},{"name":"ufraw-batch","platform":["common"]},{"name":"umount","platform":["common"]},{"name":"uname","platform":["common"]},{"name":"unzip","platform":["common"]},{"name":"uptime","platform":["common"]},{"name":"useradd","platform":["common"]},{"name":"userdel","platform":["common"]},{"name":"usermod","platform":["common"]},{"name":"w","platform":["common"]},{"name":"wacaw","platform":["osx"]},{"name":"wall","platform":["linux"]},{"name":"watch","platform":["linux"]},{"name":"wc","platform":["common"]},{"name":"wget","platform":["common"]},{"name":"which","platform":["common"]},{"name":"wpa_cli","platform":["linux"]},{"name":"xargs","platform":["linux"]},{"name":"xctool","platform":["osx"]},{"name":"xed","platform":["osx"]},{"name":"xsetwacom","platform":["linux"]},{"name":"xsltproc","platform":["osx"]},{"name":"yes","platform":["common"]},{"name":"zbarimg","platform":["common"]},{"name":"zfs","platform":["common"]},{"name":"zip","platform":["common"]},{"name":"zpool","platform":["common"]}]}
\ No newline at end of file
+{"commands":[{"name":"7za","platform":["common"]},{"name":"ab","platform":["common"]},{"name":"ack","platform":["common"]},{"name":"adb","platform":["common"]},{"name":"ag","platform":["common"]},{"name":"airport","platform":["osx"]},{"name":"alias","platform":["common"]},{"name":"apropos","platform":["common"]},{"name":"apt-cache","platform":["linux"]},{"name":"apt-get","platform":["linux"]},{"name":"apt-key","platform":["linux"]},{"name":"aptitude","platform":["linux"]},{"name":"ar","platform":["common"]},{"name":"autojump","platform":["common"]},{"name":"autossh","platform":["common"]},{"name":"awk","platform":["common"]},{"name":"base64","platform":["linux"]},{"name":"bash","platform":["common"]},{"name":"bashmarks","platform":["common"]},{"name":"bc","platform":["common"]},{"name":"bmaptool","platform":["common"]},{"name":"brew","platform":["osx"]},{"name":"bundle","platform":["common"]},{"name":"caffeinate","platform":["osx"]},{"name":"cal","platform":["common"]},{"name":"calibre-server","platform":["common"]},{"name":"calibredb","platform":["common"]},{"name":"cat","platform":["common"]},{"name":"cd","platform":["common"]},{"name":"chmod","platform":["common"]},{"name":"chown","platform":["common"]},{"name":"chroot","platform":["linux"]},{"name":"chsh","platform":["common"]},{"name":"cksum","platform":["common"]},{"name":"clang","platform":["common"]},{"name":"comm","platform":["common"]},{"name":"convert","platform":["common"]},{"name":"cordova","platform":["common"]},{"name":"cowsay","platform":["common"]},{"name":"cp","platform":["common"]},{"name":"curl","platform":["common"]},{"name":"cut","platform":["common"]},{"name":"date","platform":["common"]},{"name":"dd","platform":["linux","osx"]},{"name":"deluser","platform":["common"]},{"name":"devfsadm","platform":["sunos"]},{"name":"df","platform":["common"]},{"name":"diff","platform":["common"]},{"name":"dig","platform":["common"]},{"name":"diskutil","platform":["osx"]},{"name":"ditto","platform":["osx"]},{"name":"dnf","platform":["linux"]},{"name":"docker","platform":["common"]},{"name":"dokku","platform":["common"]},{"name":"dpkg","platform":["linux"]},{"name":"dpkg-query","platform":["linux"]},{"name":"drush","platform":["common"]},{"name":"drutil","platform":["osx"]},{"name":"du","platform":["linux","osx"]},{"name":"ebook-convert","platform":["common"]},{"name":"echo","platform":["common"]},{"name":"electrum","platform":["common"]},{"name":"emacs","platform":["common"]},{"name":"emerge","platform":["linux"]},{"name":"enca","platform":["common"]},{"name":"env","platform":["common"]},{"name":"espeak","platform":["common"]},{"name":"exiftool","platform":["common"]},{"name":"fdupes","platform":["common"]},{"name":"ffmpeg","platform":["common"]},{"name":"file","platform":["common"]},{"name":"find","platform":["common"]},{"name":"findmnt","platform":["linux"]},{"name":"firewall-cmd","platform":["linux"]},{"name":"for","platform":["common"]},{"name":"fortune","platform":["common"]},{"name":"free","platform":["linux"]},{"name":"fswebcam","platform":["common"]},{"name":"gcc","platform":["common"]},{"name":"gem","platform":["common"]},{"name":"gifsicle","platform":["common"]},{"name":"git","platform":["common"]},{"name":"git-add","platform":["common"]},{"name":"git-blame","platform":["common"]},{"name":"git-branch","platform":["common"]},{"name":"git-checkout","platform":["common"]},{"name":"git-clone","platform":["common"]},{"name":"git-commit","platform":["common"]},{"name":"git-config","platform":["common"]},{"name":"git-diff","platform":["common"]},{"name":"git-init","platform":["common"]},{"name":"git-log","platform":["common"]},{"name":"git-merge","platform":["common"]},{"name":"git-mv","platform":["common"]},{"name":"git-pull","platform":["common"]},{"name":"git-push","platform":["common"]},{"name":"git-remote","platform":["common"]},{"name":"git-rm","platform":["common"]},{"name":"git-stash","platform":["common"]},{"name":"git-status","platform":["common"]},{"name":"git-svn","platform":["common"]},{"name":"git-tag","platform":["common"]},{"name":"glances","platform":["common"]},{"name":"gpg","platform":["common"]},{"name":"gradle","platform":["common"]},{"name":"grep","platform":["common"]},{"name":"gzip","platform":["common"]},{"name":"handbrakecli","platform":["common"]},{"name":"haxelib","platform":["common"]},{"name":"head","platform":["linux","osx"]},{"name":"history","platform":["common"]},{"name":"host","platform":["common"]},{"name":"hostname","platform":["linux","osx"]},{"name":"iconv","platform":["common"]},{"name":"if","platform":["common"]},{"name":"ifconfig","platform":["common"]},{"name":"ionice","platform":["common"]},{"name":"ioping","platform":["common"]},{"name":"iostat","platform":["linux"]},{"name":"ip","platform":["linux"]},{"name":"ipcs","platform":["common"]},{"name":"jar","platform":["common"]},{"name":"java","platform":["common"]},{"name":"javac","platform":["common"]},{"name":"jobs","platform":["linux"]},{"name":"journalctl","platform":["linux"]},{"name":"kill","platform":["common"]},{"name":"last","platform":["common"]},{"name":"latexmk","platform":["common"]},{"name":"less","platform":["common"]},{"name":"ln","platform":["common"]},{"name":"locate","platform":["linux","osx"]},{"name":"lp","platform":["common"]},{"name":"lpstat","platform":["common"]},{"name":"ls","platform":["common"]},{"name":"lsattr","platform":["linux"]},{"name":"lsb_release","platform":["linux"]},{"name":"lsblk","platform":["linux"]},{"name":"lsof","platform":["common"]},{"name":"mailx","platform":["common"]},{"name":"make","platform":["common"]},{"name":"man","platform":["common"]},{"name":"md5","platform":["osx"]},{"name":"md5sum","platform":["linux"]},{"name":"mdadm","platform":["linux"]},{"name":"mdfind","platform":["osx"]},{"name":"mkdir","platform":["common"]},{"name":"mke2fs","platform":["linux"]},{"name":"mkfs.cramfs","platform":["linux"]},{"name":"mkfs.exfat","platform":["linux"]},{"name":"mkfs.fat","platform":["linux"]},{"name":"mkfs.minix","platform":["linux"]},{"name":"mkfs.ntfs","platform":["linux"]},{"name":"mkfs.vfat","platform":["linux"]},{"name":"mocha","platform":["common"]},{"name":"montage","platform":["common"]},{"name":"more","platform":["common"]},{"name":"mount","platform":["common"]},{"name":"mp4box","platform":["common"]},{"name":"mtr","platform":["common"]},{"name":"mv","platform":["common"]},{"name":"mysql","platform":["common"]},{"name":"mysqldump","platform":["common"]},{"name":"nc","platform":["common"]},{"name":"nethogs","platform":["linux"]},{"name":"netstat","platform":["linux","osx"]},{"name":"networksetup","platform":["osx"]},{"name":"nginx","platform":["common"]},{"name":"nice","platform":["common"]},{"name":"nm","platform":["linux","osx"]},{"name":"nmap","platform":["common"]},{"name":"node","platform":["common"]},{"name":"nohup","platform":["common"]},{"name":"npm","platform":["common"]},{"name":"nvm","platform":["common"]},{"name":"open","platform":["osx"]},{"name":"pacman","platform":["linux"]},{"name":"pandoc","platform":["common"]},{"name":"parallel","platform":["common"]},{"name":"pass","platform":["common"]},{"name":"passwd","platform":["common"]},{"name":"paste","platform":["common"]},{"name":"patch","platform":["common"]},{"name":"pbcopy","platform":["osx"]},{"name":"pbpaste","platform":["osx"]},{"name":"pdflatex","platform":["common"]},{"name":"pg_dump","platform":["common"]},{"name":"pg_restore","platform":["common"]},{"name":"pgrep","platform":["common"]},{"name":"php","platform":["common"]},{"name":"phpunit","platform":["common"]},{"name":"ping","platform":["common"]},{"name":"pip","platform":["common"]},{"name":"pkill","platform":["common"]},{"name":"play","platform":["common"]},{"name":"prctl","platform":["sunos"]},{"name":"printf","platform":["common"]},{"name":"prstat","platform":["sunos"]},{"name":"ps","platform":["common"]},{"name":"psql","platform":["common"]},{"name":"pushd","platform":["common"]},{"name":"pwd","platform":["common"]},{"name":"python","platform":["common"]},{"name":"qlmanage","platform":["osx"]},{"name":"reboot","platform":["linux"]},{"name":"redis-cli","platform":["common"]},{"name":"rename","platform":["common"]},{"name":"renice","platform":["common"]},{"name":"rm","platform":["common"]},{"name":"rmdir","platform":["common"]},{"name":"route","platform":["osx"]},{"name":"rsync","platform":["common"]},{"name":"sails","platform":["common"]},{"name":"salt","platform":["common"]},{"name":"salt-call","platform":["common"]},{"name":"salt-key","platform":["common"]},{"name":"salt-run","platform":["common"]},{"name":"sass","platform":["common"]},{"name":"say","platform":["osx"]},{"name":"scp","platform":["common"]},{"name":"screen","platform":["common"]},{"name":"screenfetch","platform":["linux"]},{"name":"sed","platform":["common"]},{"name":"sha1sum","platform":["linux"]},{"name":"sha224sum","platform":["linux"]},{"name":"sha256sum","platform":["linux"]},{"name":"sha384sum","platform":["linux"]},{"name":"sha512sum","platform":["linux"]},{"name":"shuf","platform":["linux"]},{"name":"shutdown","platform":["linux","osx"]},{"name":"sl","platform":["common"]},{"name":"sort","platform":["common"]},{"name":"sox","platform":["common"]},{"name":"split","platform":["common"]},{"name":"srm","platform":["common"]},{"name":"ss","platform":["linux"]},{"name":"ssh","platform":["common"]},{"name":"ssh-copy-id","platform":["linux"]},{"name":"ssh-keygen","platform":["common"]},{"name":"sshfs","platform":["common"]},{"name":"strace","platform":["linux"]},{"name":"strings","platform":["common"]},{"name":"su","platform":["common"]},{"name":"sudo","platform":["common"]},{"name":"svcadm","platform":["sunos"]},{"name":"svccfg","platform":["sunos"]},{"name":"svcs","platform":["sunos"]},{"name":"svn","platform":["common"]},{"name":"sw_vers","platform":["osx"]},{"name":"sysctl","platform":["osx"]},{"name":"system_profiler","platform":["osx"]},{"name":"systemctl","platform":["linux"]},{"name":"systemsetup","platform":["osx"]},{"name":"tac","platform":["common"]},{"name":"tail","platform":["common"]},{"name":"tar","platform":["common"]},{"name":"tcpdump","platform":["common"]},{"name":"tcpflow","platform":["linux"]},{"name":"tee","platform":["common"]},{"name":"telnet","platform":["common"]},{"name":"test","platform":["common"]},{"name":"time","platform":["common"]},{"name":"timedatectl","platform":["linux"]},{"name":"tldr","platform":["common"]},{"name":"tmux","platform":["common"]},{"name":"top","platform":["linux","osx"]},{"name":"touch","platform":["common"]},{"name":"tr","platform":["common"]},{"name":"traceroute","platform":["common"]},{"name":"transcode","platform":["common"]},{"name":"tree","platform":["common"]},{"name":"ufraw-batch","platform":["common"]},{"name":"ulimit","platform":["linux"]},{"name":"umount","platform":["common"]},{"name":"uname","platform":["common"]},{"name":"uniq","platform":["common"]},{"name":"unrar","platform":["common"]},{"name":"unzip","platform":["common"]},{"name":"uptime","platform":["common"]},{"name":"useradd","platform":["linux"]},{"name":"userdel","platform":["linux"]},{"name":"usermod","platform":["linux"]},{"name":"vagrant","platform":["common"]},{"name":"vim","platform":["common"]},{"name":"vimtutor","platform":["common"]},{"name":"virtualenv","platform":["common"]},{"name":"w","platform":["common"]},{"name":"wacaw","platform":["osx"]},{"name":"wall","platform":["linux"]},{"name":"watch","platform":["linux"]},{"name":"wc","platform":["common"]},{"name":"wget","platform":["common"]},{"name":"which","platform":["common"]},{"name":"while","platform":["common"]},{"name":"who","platform":["common"]},{"name":"whoami","platform":["common"]},{"name":"wpa_cli","platform":["linux"]},{"name":"xargs","platform":["linux"]},{"name":"xctool","platform":["osx"]},{"name":"xed","platform":["osx"]},{"name":"xinput","platform":["linux"]},{"name":"xrandr","platform":["linux"]},{"name":"xsetwacom","platform":["linux"]},{"name":"xsltproc","platform":["osx"]},{"name":"yes","platform":["common"]},{"name":"yum","platform":["linux"]},{"name":"zbarimg","platform":["common"]},{"name":"zfs","platform":["common"]},{"name":"zip","platform":["common"]},{"name":"zpool","platform":["common"]},{"name":"zypper","platform":["linux"]}]}
\ No newline at end of file
diff --git a/pages/osx/say.md b/pages/osx/say.md
index 1abb48505..efffbfd13 100644
--- a/pages/osx/say.md
+++ b/pages/osx/say.md
@@ -1,6 +1,6 @@
 # say
 
-> Uses text to speech to speak through the default sound device.
+> Uses text-to-speech to speak through the default sound device.
 
 - Speak a phrase aloud: