Watched categories overhaul