[PATCH 1/2] Put TUI spokes in common categories