Introduce categories instead of levels + highlights