Cleaned up Archive Search Checkbox, added names to color categories.
Merge branch 'devel' into user-sync-issues
Merge branch 'devel' into user-sync-issues
More changes with category colors
Merge branch 'devel' into user-sync-issues