I was trying to make theme editing a bit simpler but now I reverted back to the original workflow.
So upgrade to the latest version (16.11.66) and follow this tutorial again (updated) [16.11.24] Added ability to create custom themes
Then it will preserve your custom theme even if you switch to different one.