Update categories for iOS 6

- Also make resetting the categories consistent in both locations

Fixes #290