Add core option categories + sublabels finally show up properly

20 jobs for master in 7 minutes and 59 seconds (queued for 8 seconds)