I'd prefer the groups were diversified than going by theme. Keep things fresh.