Merge "Update colours to match the updated scheme" into main