[AAT v0.10.2; FW v5.1.0]

In the framework I created a theme based on Vanilla v5 and renamed it in bower. Pages element titles are orange. I uploaded the new theme to the AAT.

When in the theme picker, I selected my theme from 'Base theme' dropdown. The selection had no effect on the custom color selections; they remained Vanilla blue and greys. 'Preset' remained with 'No preset' selected. 

Before selecting 'Save', I was faced with the question of the effect of the Vanilla color selections on my new theme. Having set my style colors in my theme, I hoped that I would not have to spend time trying to replicate color selections already made. I left the Vanilla colors in place; and with 'No preset' selected, I saved my new theme.

Upon preview, the Vanilla blues have overridden my theme's oranges.

What steps during upload can I take to ensure that the defaulting Vanilla colors don't override my theme colors?

(I'm aware of https://github.com/adaptlearning/adapt_authoring/issues/2388 and understand that this feature is still evolving.)

Thanks for any advice or insight!