Sorry - I didn't see those.
Should we be using `$gs-` values for these as we do everywhere else?