Fred, ClientConfig and Extract Template

I’ve built a theme with Fred and ClientConfig. It’s working fine for most part, however, I run into an issue when making changes the the ClientConfig settings and then run an update of the theme package. Step by step:

  1. I made some changes in ClientConfig (renamed and created some new settings) on site A.
  2. I created a new build of my Fred theme on site A.
  3. I uploaded the new theme to site B and updated.
  4. If I now go into the ClientConfig settings on site B I have both the new and old settings and things are complete mess with loads of headings at the top, dropdowns at the bottoms etc.

Can this be fixed by changing the Extract Template settings somehow? This is what I’ve currently got:

{
  "packages": [
    {
      "name": "clientconfig",
      "class": "ClientConfig"
    }
  ],
  "vehicles": [
    {
      "object": {
        "class": "cgGroup",
        "graph": {
          "Settings": []
        }
      },
      "attributes": {
        "preserve_keys": false,
        "update_object": true,
        "unique_key": "label",
        "related_objects": true,
        "related_object_attributes": {
          "Settings": {
            "preserve_keys": false,
            "update_object": true,
            "unique_key": [
              "key",
              "group"
            ]
          }
        }
      }
    }
  ]
}

How can I change it so that both:
a) the values of non changed keys are preserved;
b) renamed, deleted and new keys are properly updated?

I’ve tried making some changes to Extract Template when building the theme, see below. However, the values are still overwritten. I can’t keep redoing the settings every time I update the theme so I’d really appreciate some help :pray: If I can’t sort this I may have to break up with Fred :broken_heart: :cry:

{
  "packages": [
    {
      "name": "clientconfig",
      "class": "ClientConfig"
    }
  ],
  "vehicles": [
    {
      "object": {
        "class": "cgGroup",
        "graph": {
          "Settings": []
        }
      },
      "attributes": {
        "preserve_keys": true,
        "update_object": true,
        "unique_key": "label",
        "related_objects": true,
        "related_object_attributes": {
          "Settings": {
            "preserve_keys": true,
            "update_object": true,
            "unique_key": [
              "key",
              "group"
            ]
          }
        }
      }
    }
  ]
}