Cleanup. [1423]

Trying to keep my streak alive! Now back to reading about self
trepanation (in an effort to relieve some of this pressure in my
sinuses).
First stab at renaming subcategories.

Still need to work on refreshing the bundles in the toolbar.

[1796]