I have also replaced most tests to use data-testid and getByTestId so that they're more resilient to UI changes

Lovely, nice touch.

Appreciate the kind words @afonsojramos and the feedback on some visual inconsistencies. I'll address them shortly 👨‍💻

However, I've found a couple of visual issues:

Apologies this took a while to get back to. Items 1, 2 and 3 have been addressed

I think we're getting quite close to this being merged. 6.x.x milestone perhaps?

@setchy do you want some help in the replacement of the sxs?

@setchy do you want some help in the replacement of the sxs?

Absolutely! Always welcome a friendly hand.

I haven't attempted to remove the style components used with primer components... I'm not sure how feasible that will be, but if possible I'm keen

Seems like it is not possible 😅 We need to override the component's defaults... Oh well 🤷 It's annoying, but isn't much of a problem.

Thanks for taking a look 🙏

@bmulholland @afonsojramos - I've resolved all merge conflicts and done some final refactoring to our tailwind colors.

I think I'm ready for final review from you both if you have some time 🙏

There is one niggling issue remaining whereby the user-selected theme is not correctly loading on startup...

There is one niggling issue remaining whereby the user-selected theme is not correctly loading on startup...

This is now resolved. Left a few TODO comments for future us to clean up some of the legacy theming code