Hi @Robert_Powers1
I built a plugin to save & reuse variables between your Figma files and it could help you to reorder the modes too
Waiting for Figma to build it natively, it can already help many
Here is the small tutorial and the youtube link (if you need subtitles or video below does not work)