diff --git a/proprietary/dinkelland-design-tokens/publiccode.yaml b/proprietary/dinkelland-design-tokens/publiccode.yaml
index e12d2bc9a..35ec901dc 100644
--- a/proprietary/dinkelland-design-tokens/publiccode.yaml
+++ b/proprietary/dinkelland-design-tokens/publiccode.yaml
@@ -1,22 +1,29 @@
-publiccodeYmlVersion: "0.1"
+publiccodeYmlVersion: "0.3"
 name: "@nl-design-system-unstable/dinkelland-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/dinkelland-design-tokens
+url: https://github.com/nl-design-system/themes
 platforms:
   - web
 releaseDate: 2023-09-19
+categories:
+  - it-development
 developmentStatus: development
+softwareType: "standalone/desktop"
 description:
   en:
     localisedName: NL Design Tokens Dinkelland
     shortDescription: "The NL Design Tokens of municipality Dinkelland"
-    longDescription: "The NL Design Tokens of municipality Dinkelland"
+    longDescription: "The NL Design Tokens set from the municipality of Dinkelland, this token set is used to style websites such as Woo and OpenCatalogi that are used by the municipality in the municipal colors."
     documentation: https://github.com/nl-design-system/documentatie
+    features:
+      - Just one feature
   nl:
     localisedName: NL Design Tokens Dinkelland
     shortDescription: "De NL Design Tokens van gemeente Dinkelland"
-    longDescription: "De NL Design Tokens van gemeente Dinkelland"
+    longDescription: "De NL Design Tokens set van de gemeente Dinkelland, deze token set wordt gebruikt om websites zoals Woo en OpenCatalogi die door de gemeente gebruikt worden te stylen in de gemeentelijke kleuren."
     documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
+    features:
+      - Just one feature
+intendedAudience:
   countries:
     - nl
   scope:
@@ -31,14 +38,15 @@ maintenance:
   contractors:
     - name: Conduction
       until: 2035-01-01
-      email: info\x64conduction.nl
+      email: info@conduction.nl
       website: https://www.conduction.nl
-  contact:
+  contacts:
     - name: Ruben van der Linde
-      email: info\x64conduction.nl
+      email: info@conduction.nl
       phone: 085 303 6840
       affiliation: Conduction
 localisation:
+  localisationReady: true
   availableLanguages:
     - en
     - nl
diff --git a/proprietary/epe-design-tokens/publiccode.yaml b/proprietary/epe-design-tokens/publiccode.yaml
deleted file mode 100644
index a6e02aab6..000000000
--- a/proprietary/epe-design-tokens/publiccode.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-publiccodeYmlVersion: "0.1"
-name: "@nl-design-system-unstable/epe-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/epe-design-tokens
-platforms:
-  - web
-releaseDate: 2023-09-19
-developmentStatus: development
-description:
-  en:
-    localisedName: NL Design Tokens Epe
-    shortDescription: "The NL Design Tokens of municipality Epe"
-    longDescription: "The NL Design Tokens of municipality Epe"
-    documentation: https://github.com/nl-design-system/documentatie
-  nl:
-    localisedName: NL Design Tokens Epe
-    shortDescription: "De NL Design Tokens van gemeente Epe"
-    longDescription: "De NL Design Tokens van gemeente Epe"
-    documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
-  countries:
-    - nl
-  scope:
-    - government
-    - local-authorities
-legal:
-  license: EUPL-1.2
-  mainCopyrightOwner: legal/authorsFile
-  repoOwner: NL Design System
-maintenance:
-  type: internal
-  contractors:
-    - name: Conduction
-      until: 2035-01-01
-      email: info\x64conduction.nl
-      website: https://www.conduction.nl
-  contact:
-    - name: Ruben van der Linde
-      email: info\x64conduction.nl
-      phone: 085 303 6840
-      affiliation: Conduction
-localisation:
-  availableLanguages:
-    - en
-    - nl
-nl:
-  commonground:
-    layerType: interface
diff --git a/proprietary/leiden-design-tokens/publiccode.yaml b/proprietary/leiden-design-tokens/publiccode.yaml
deleted file mode 100644
index 88075cb46..000000000
--- a/proprietary/leiden-design-tokens/publiccode.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-publiccodeYmlVersion: "0.1"
-name: "@nl-design-system-unstable/leiden-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/leiden-design-tokens
-platforms:
-  - web
-releaseDate: 2023-09-19
-developmentStatus: development
-description:
-  en:
-    localisedName: NL Design Tokens Leiden
-    shortDescription: "The NL Design Tokens of municipality Leiden"
-    longDescription: "The NL Design Tokens of municipality Leiden"
-    documentation: https://github.com/nl-design-system/documentatie
-  nl:
-    localisedName: NL Design Tokens Leiden
-    shortDescription: "De NL Design Tokens van gemeente Leiden"
-    longDescription: "De NL Design Tokens van gemeente Leiden"
-    documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
-  countries:
-    - nl
-  scope:
-    - government
-    - local-authorities
-legal:
-  license: EUPL-1.2
-  mainCopyrightOwner: legal/authorsFile
-  repoOwner: NL Design System
-maintenance:
-  type: internal
-  contractors:
-    - name: Conduction
-      until: 2035-01-01
-      email: info\x64conduction.nl
-      website: https://www.conduction.nl
-  contact:
-    - name: Ruben van der Linde
-      email: info\x64conduction.nl
-      phone: 085 303 6840
-      affiliation: Conduction
-localisation:
-  availableLanguages:
-    - en
-    - nl
-nl:
-  commonground:
-    layerType: interface
diff --git a/proprietary/noaberkracht-design-tokens/publiccode.yaml b/proprietary/noaberkracht-design-tokens/publiccode.yaml
deleted file mode 100644
index 30b43eb6e..000000000
--- a/proprietary/noaberkracht-design-tokens/publiccode.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-publiccodeYmlVersion: "0.1"
-name: "@nl-design-system-unstable/noaberkracht-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/noaberkracht-design-tokens
-platforms:
-  - web
-releaseDate: 2023-09-19
-developmentStatus: development
-description:
-  en:
-    localisedName: NL Design Tokens Noaberkracht
-    shortDescription: "The NL Design Tokens of regional cooperation body Noaberkracht"
-    longDescription: "The NL Design Tokens of regional cooperation body Noaberkracht"
-    documentation: https://github.com/nl-design-system/documentatie
-  nl:
-    localisedName: NL Design Tokens Noaberkracht
-    shortDescription: "De NL Design Tokens van regionaal samenwerkingsorgaan Noaberkracht"
-    longDescription: "De NL Design Tokens van regionaal samenwerkingsorgaan Noaberkracht"
-    documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
-  countries:
-    - nl
-  scope:
-    - government
-    - local-authorities
-legal:
-  license: EUPL-1.2
-  mainCopyrightOwner: legal/authorsFile
-  repoOwner: NL Design System
-maintenance:
-  type: internal
-  contractors:
-    - name: Conduction
-      until: 2035-01-01
-      email: info\x64conduction.nl
-      website: https://www.conduction.nl
-  contact:
-    - name: Ruben van der Linde
-      email: info\x64conduction.nl
-      phone: 085 303 6840
-      affiliation: Conduction
-localisation:
-  availableLanguages:
-    - en
-    - nl
-nl:
-  commonground:
-    layerType: interface
diff --git a/proprietary/noordwijk-design-tokens/publiccode.yaml b/proprietary/noordwijk-design-tokens/publiccode.yaml
deleted file mode 100644
index 7f698b986..000000000
--- a/proprietary/noordwijk-design-tokens/publiccode.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-publiccodeYmlVersion: "0.1"
-name: "@nl-design-system-unstable/noordwijk-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/noordwijk-design-tokens
-platforms:
-  - web
-releaseDate: 2023-09-19
-developmentStatus: development
-description:
-  en:
-    localisedName: NL Design Tokens Noordwijk
-    shortDescription: "The NL Design Tokens of municipality Noordwijk"
-    longDescription: "The NL Design Tokens of municipality Noordwijk"
-    documentation: https://github.com/nl-design-system/documentatie
-  nl:
-    localisedName: NL Design Tokens Noordwijk
-    shortDescription: "De NL Design Tokens van gemeente Noordwijk"
-    longDescription: "De NL Design Tokens van gemeente Noordwijk"
-    documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
-  countries:
-    - nl
-  scope:
-    - government
-    - local-authorities
-legal:
-  license: EUPL-1.2
-  mainCopyrightOwner: legal/authorsFile
-  repoOwner: NL Design System
-maintenance:
-  type: internal
-  contractors:
-    - name: Conduction
-      until: 2035-01-01
-      email: info\x64conduction.nl
-      website: https://www.conduction.nl
-  contact:
-    - name: Ruben van der Linde
-      email: info\x64conduction.nl
-      phone: 085 303 6840
-      affiliation: Conduction
-localisation:
-  availableLanguages:
-    - en
-    - nl
-nl:
-  commonground:
-    layerType: interface
diff --git a/proprietary/tubbergen-design-tokens/publiccode.yaml b/proprietary/tubbergen-design-tokens/publiccode.yaml
deleted file mode 100644
index 6e89ae18a..000000000
--- a/proprietary/tubbergen-design-tokens/publiccode.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-publiccodeYmlVersion: "0.1"
-name: "@nl-design-system-unstable/tubbergen-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/tubbergen-design-tokens
-platforms:
-  - web
-releaseDate: 2023-09-19
-developmentStatus: development
-description:
-  en:
-    localisedName: NL Design Tokens Tubbergen
-    shortDescription: "The NL Design Tokens of municipality Tubbergen"
-    longDescription: "The NL Design Tokens of municipality Tubbergen"
-    documentation: https://github.com/nl-design-system/documentatie
-  nl:
-    localisedName: NL Design Tokens Tubbergen
-    shortDescription: "De NL Design Tokens van gemeente Tubbergen"
-    longDescription: "De NL Design Tokens van gemeente Tubbergen"
-    documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
-  countries:
-    - nl
-  scope:
-    - government
-    - local-authorities
-legal:
-  license: EUPL-1.2
-  mainCopyrightOwner: legal/authorsFile
-  repoOwner: NL Design System
-maintenance:
-  type: internal
-  contractors:
-    - name: Conduction
-      until: 2035-01-01
-      email: info\x64conduction.nl
-      website: https://www.conduction.nl
-  contact:
-    - name: Ruben van der Linde
-      email: info\x64conduction.nl
-      phone: 085 303 6840
-      affiliation: Conduction
-localisation:
-  availableLanguages:
-    - en
-    - nl
-nl:
-  commonground:
-    layerType: interface
diff --git a/proprietary/xxllnc-design-tokens/publiccode.yaml b/proprietary/xxllnc-design-tokens/publiccode.yaml
deleted file mode 100644
index b173f39a1..000000000
--- a/proprietary/xxllnc-design-tokens/publiccode.yaml
+++ /dev/null
@@ -1,47 +0,0 @@
-publiccodeYmlVersion: "0.1"
-name: "@nl-design-system-unstable/xxllnc-design-tokens"
-url: https://github.com/nl-design-system/themes/tree/main/proprietary/xxllnc-design-tokens
-platforms:
-  - web
-releaseDate: 2023-09-19
-developmentStatus: development
-description:
-  en:
-    localisedName: NL Design Tokens XXLLNC
-    shortDescription: "The NL Design Tokens of XXLLNC"
-    longDescription: "The NL Design Tokens of XXLLNC"
-    documentation: https://github.com/nl-design-system/documentatie
-  nl:
-    localisedName: NL Design Tokens XXLLNC
-    shortDescription: "De NL Design Tokens van XXLLNC"
-    longDescription: "De NL Design Tokens van XXLLNC"
-    documentation: https://github.com/nl-design-system/documentatie
-intendedaudience:
-  countries:
-    - nl
-  scope:
-    - government
-    - local-authorities
-legal:
-  license: EUPL-1.2
-  mainCopyrightOwner: legal/authorsFile
-  repoOwner: NL Design System
-maintenance:
-  type: internal
-  contractors:
-    - name: Conduction
-      until: 2035-01-01
-      email: info\x64conduction.nl
-      website: https://www.conduction.nl
-  contact:
-    - name: Ruben van der Linde
-      email: info\x64conduction.nl
-      phone: 085 303 6840
-      affiliation: Conduction
-localisation:
-  availableLanguages:
-    - en
-    - nl
-nl:
-  commonground:
-    layerType: interface