Switched back to tildes to enforce sort order.
Better category handling.