diff --git a/black-white/theme-black-white_v1.0_pcm.zip b/black-white/com.github.pointhi.kicad-color-schemes.black-white_v1.0_pcm.zip
similarity index 72%
rename from black-white/theme-black-white_v1.0_pcm.zip
rename to black-white/com.github.pointhi.kicad-color-schemes.black-white_v1.0_pcm.zip
index 5354136..85af3cf 100644
Binary files a/black-white/theme-black-white_v1.0_pcm.zip and b/black-white/com.github.pointhi.kicad-color-schemes.black-white_v1.0_pcm.zip differ
diff --git a/black-white/metadata.json b/black-white/metadata.json
index 05177e8..94ac5ac 100644
--- a/black-white/metadata.json
+++ b/black-white/metadata.json
@@ -1,9 +1,9 @@
 {
-    "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+    "$schema": "https://go.kicad.org/pcm/schemas/v1",
     "name": "Black-White Theme",
     "description": "Designed for printing",
     "description_full": "Designed for printing",
-    "identifier": "theme-black-white",
+    "identifier": "com.github.pointhi.kicad-color-schemes.black-white",
     "type": "colortheme",
     "author": {
         "name": "Thomas Pointhuber",
diff --git a/create_repository.py b/create_repository.py
index beb6acb..60bcb7b 100644
--- a/create_repository.py
+++ b/create_repository.py
@@ -116,7 +116,7 @@ def write_repository_json():
     packages_json_update_time_utc = datetime.datetime.fromtimestamp(packages_json_update_timestamp, tz=datetime.timezone.utc)
 
     repository_data = {
-        "$schema": "https://gitlab.com/kicad/code/kicad/-/raw/master/kicad/pcm/schemas/pcm.v1.schema.json#/definitions/Repository",
+        "$schema": "https://go.kicad.org/pcm/schemas/v1#/definitions/Repository",
         "maintainer": {
             "contact": {
                 "web": "https://github.com/pointhi/kicad-color-schemes/"
diff --git a/eagle/theme-eagle_v1.0_pcm.zip b/eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip
similarity index 87%
rename from eagle/theme-eagle_v1.0_pcm.zip
rename to eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip
index 5a887ef..bad29eb 100644
Binary files a/eagle/theme-eagle_v1.0_pcm.zip and b/eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip differ
diff --git a/eagle/metadata.json b/eagle/metadata.json
index 1eb2696..89bed55 100644
--- a/eagle/metadata.json
+++ b/eagle/metadata.json
@@ -1,9 +1,9 @@
 {
-    "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+    "$schema": "https://go.kicad.org/pcm/schemas/v1",
     "name": "Eagle inspired Theme",
     "description": "Eagle CAD inspired color theme",
     "description_full": "Eagle CAD inspired color theme",
-    "identifier": "theme-eagle",
+    "identifier": "com.github.pointhi.kicad-color-schemes.eagle",
     "type": "colortheme",
     "author": {
         "name": "Rachel Mant",
diff --git a/packages.json b/packages.json
index 2c2ea9d..626ad08 100644
--- a/packages.json
+++ b/packages.json
@@ -1,11 +1,11 @@
 {
     "packages": [
         {
-            "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+            "$schema": "https://go.kicad.org/pcm/schemas/v1",
             "name": "Black-White Theme",
             "description": "Designed for printing",
             "description_full": "Designed for printing",
-            "identifier": "theme-black-white",
+            "identifier": "com.github.pointhi.kicad-color-schemes.black-white",
             "type": "colortheme",
             "author": {
                 "name": "Thomas Pointhuber",
@@ -28,19 +28,19 @@
                     "version": "1.0",
                     "status": "stable",
                     "kicad_version": "5.99",
-                    "download_sha256": "6c2f34f7c6158929712c38f8bcff938c19414666d594cfa7043abe4cc7d92de1",
-                    "download_size": 3973,
-                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/black-white/theme-black-white_v1.0_pcm.zip",
-                    "install_size": 5154
+                    "download_sha256": "40ae0995aae5748311f10c0fd34f456859598d5b55990b63c8723f6c34fbc8e6",
+                    "download_size": 3962,
+                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/black-white/com.github.pointhi.kicad-color-schemes.black-white_v1.0_pcm.zip",
+                    "install_size": 5144
                 }
             ]
         },
         {
-            "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+            "$schema": "https://go.kicad.org/pcm/schemas/v1",
             "name": "Eagle inspired Theme",
             "description": "Eagle CAD inspired color theme",
             "description_full": "Eagle CAD inspired color theme",
-            "identifier": "theme-eagle",
+            "identifier": "com.github.pointhi.kicad-color-schemes.eagle",
             "type": "colortheme",
             "author": {
                 "name": "Rachel Mant",
@@ -63,19 +63,19 @@
                     "version": "1.0",
                     "status": "stable",
                     "kicad_version": "5.99",
-                    "download_sha256": "edf8db137c2152ff4a1b4cf2d779c17eb278d2a8f9bbe88f9ebe59a9c5dc69e8",
-                    "download_size": 4791,
-                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle/theme-eagle_v1.0_pcm.zip",
-                    "install_size": 10084
+                    "download_sha256": "d28fd88ca32c4826fab71d780896ddccf9d48c7cdc5858a5e64f8ff5f3c49922",
+                    "download_size": 4781,
+                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/eagle/com.github.pointhi.kicad-color-schemes.eagle_v1.0_pcm.zip",
+                    "install_size": 10074
                 }
             ]
         },
         {
-            "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+            "$schema": "https://go.kicad.org/pcm/schemas/v1",
             "name": "Solarized Dark Theme",
             "description": "Based on Solarized colorscheme from Ethan Schoonover",
             "description_full": "Based on Solarized colorscheme from Ethan Schoonover.\nSee https://ethanschoonover.com/solarized/ for more details.",
-            "identifier": "theme-solarized-dark",
+            "identifier": "com.github.pointhi.kicad-color-schemes.solarized-dark",
             "type": "colortheme",
             "author": {
                 "name": "Thomas Pointhuber",
@@ -98,19 +98,19 @@
                     "version": "1.0",
                     "status": "stable",
                     "kicad_version": "5.99",
-                    "download_sha256": "698691d195fd009e1aa65954ccdf55690d10bbd3a2d6a80647e83c210eb7c4b6",
-                    "download_size": 4398,
-                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/solarized-dark/theme-solarized-dark_v1.0_pcm.zip",
-                    "install_size": 5684
+                    "download_sha256": "5ba4458fb3635083aaed5425cc852d78e2c16aeb4271145ffd328e5ec120fc99",
+                    "download_size": 4387,
+                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/solarized-dark/com.github.pointhi.kicad-color-schemes.solarized-dark_v1.0_pcm.zip",
+                    "install_size": 5674
                 }
             ]
         },
         {
-            "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+            "$schema": "https://go.kicad.org/pcm/schemas/v1",
             "name": "Solarized Light Theme",
             "description": "Based on Solarized colorscheme from Ethan Schoonover",
             "description_full": "Based on Solarized colorscheme from Ethan Schoonover.\nSee https://ethanschoonover.com/solarized/ for more details.",
-            "identifier": "theme-solarized-light",
+            "identifier": "com.github.pointhi.kicad-color-schemes.solarized-light",
             "type": "colortheme",
             "author": {
                 "name": "Thomas Pointhuber",
@@ -133,19 +133,19 @@
                     "version": "1.0",
                     "status": "stable",
                     "kicad_version": "5.99",
-                    "download_sha256": "bc9332b5119dee02e6860877af32aa0e3214e91004678a998944541fb1103d3d",
-                    "download_size": 4393,
-                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/solarized-light/theme-solarized-light_v1.0_pcm.zip",
-                    "install_size": 5672
+                    "download_sha256": "2c8575c352f3368156234d0ce7704c8108971c6d87c8e4675fff23d30b7aa7d2",
+                    "download_size": 4380,
+                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/solarized-light/com.github.pointhi.kicad-color-schemes.solarized-light_v1.0_pcm.zip",
+                    "install_size": 5662
                 }
             ]
         },
         {
-            "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+            "$schema": "https://go.kicad.org/pcm/schemas/v1",
             "name": "wLight Theme",
             "description": "Designed by wykys, Inspired by Altium",
             "description_full": "Designed by wykys, Inspired by Altium",
-            "identifier": "theme-wlight",
+            "identifier": "com.github.pointhi.kicad-color-schemes.wlight",
             "type": "colortheme",
             "author": {
                 "name": "Jan Vykydal",
@@ -168,10 +168,10 @@
                     "version": "1.0",
                     "status": "stable",
                     "kicad_version": "5.99",
-                    "download_sha256": "fde9ff2fefbc8a1e63cfaed3edb790b948270590a695526ac36fed060729f548",
-                    "download_size": 5155,
-                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/wlight/theme-wlight_v1.0_pcm.zip",
-                    "install_size": 11053
+                    "download_sha256": "951ca2ce68bdec8addb8ee63a6293e80f8be66d0eb22aeca9c601b82cc348239",
+                    "download_size": 5145,
+                    "download_url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/wlight/com.github.pointhi.kicad-color-schemes.wlight_v1.0_pcm.zip",
+                    "install_size": 11043
                 }
             ]
         }
diff --git a/repository.json b/repository.json
index 533efbb..faed381 100644
--- a/repository.json
+++ b/repository.json
@@ -1,5 +1,5 @@
 {
-    "$schema": "https://gitlab.com/kicad/code/kicad/-/raw/master/kicad/pcm/schemas/pcm.v1.schema.json#/definitions/Repository",
+    "$schema": "https://go.kicad.org/pcm/schemas/v1#/definitions/Repository",
     "maintainer": {
         "contact": {
             "web": "https://github.com/pointhi/kicad-color-schemes/"
@@ -8,15 +8,15 @@
     },
     "name": "kicad-color-schemes repository by @pointhi",
     "packages": {
-        "sha256": "15b84be25fd4acac983b5a11fab8ed6ad1393f788fec5268fc9ec3ce78297e18",
-        "update_time_utc": "2021-10-31 15:47:14",
-        "update_timestamp": 1635695234,
+        "sha256": "13590900aa264bd71089c237347ea1cf85df517e6dee17c5ded25ceba2e86468",
+        "update_time_utc": "2021-11-06 17:33:26",
+        "update_timestamp": 1636220006,
         "url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/packages.json"
     },
     "resources": {
-        "sha256": "e438fe66584ea0c2c972f39c17c61a0fdb4ddfc73e052d70396537649cee0eda",
-        "update_time_utc": "2021-10-31 15:47:14",
-        "update_timestamp": 1635695234,
+        "sha256": "8d99a5f3e1da63ba146c253f5c5db2c12c916f2b86a8047a218f3a762cbf8948",
+        "update_time_utc": "2021-11-06 17:33:27",
+        "update_timestamp": 1636220007,
         "url": "https://raw.githubusercontent.com/pointhi/kicad-color-schemes/master/resources.zip"
     }
 }
\ No newline at end of file
diff --git a/resources.zip b/resources.zip
index 6785b20..a166aa8 100644
Binary files a/resources.zip and b/resources.zip differ
diff --git a/solarized-dark/theme-solarized-dark_v1.0_pcm.zip b/solarized-dark/com.github.pointhi.kicad-color-schemes.solarized-dark_v1.0_pcm.zip
similarity index 85%
rename from solarized-dark/theme-solarized-dark_v1.0_pcm.zip
rename to solarized-dark/com.github.pointhi.kicad-color-schemes.solarized-dark_v1.0_pcm.zip
index c5a64e0..a5376f3 100644
Binary files a/solarized-dark/theme-solarized-dark_v1.0_pcm.zip and b/solarized-dark/com.github.pointhi.kicad-color-schemes.solarized-dark_v1.0_pcm.zip differ
diff --git a/solarized-dark/metadata.json b/solarized-dark/metadata.json
index 515f0cd..fea6fe0 100644
--- a/solarized-dark/metadata.json
+++ b/solarized-dark/metadata.json
@@ -1,9 +1,9 @@
 {
-    "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+    "$schema": "https://go.kicad.org/pcm/schemas/v1",
     "name": "Solarized Dark Theme",
     "description": "Based on Solarized colorscheme from Ethan Schoonover",
     "description_full": "Based on Solarized colorscheme from Ethan Schoonover.\nSee https://ethanschoonover.com/solarized/ for more details.",
-    "identifier": "theme-solarized-dark",
+    "identifier": "com.github.pointhi.kicad-color-schemes.solarized-dark",
     "type": "colortheme",
     "author": {
         "name": "Thomas Pointhuber",
diff --git a/solarized-light/theme-solarized-light_v1.0_pcm.zip b/solarized-light/com.github.pointhi.kicad-color-schemes.solarized-light_v1.0_pcm.zip
similarity index 71%
rename from solarized-light/theme-solarized-light_v1.0_pcm.zip
rename to solarized-light/com.github.pointhi.kicad-color-schemes.solarized-light_v1.0_pcm.zip
index c26e2bf..28ca143 100644
Binary files a/solarized-light/theme-solarized-light_v1.0_pcm.zip and b/solarized-light/com.github.pointhi.kicad-color-schemes.solarized-light_v1.0_pcm.zip differ
diff --git a/solarized-light/metadata.json b/solarized-light/metadata.json
index fead5b6..3e7fa0c 100644
--- a/solarized-light/metadata.json
+++ b/solarized-light/metadata.json
@@ -1,9 +1,9 @@
 {
-    "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+    "$schema": "https://go.kicad.org/pcm/schemas/v1",
     "name": "Solarized Light Theme",
     "description": "Based on Solarized colorscheme from Ethan Schoonover",
     "description_full": "Based on Solarized colorscheme from Ethan Schoonover.\nSee https://ethanschoonover.com/solarized/ for more details.",
-    "identifier": "theme-solarized-light",
+    "identifier": "com.github.pointhi.kicad-color-schemes.solarized-light",
     "type": "colortheme",
     "author": {
         "name": "Thomas Pointhuber",
diff --git a/wlight/theme-wlight_v1.0_pcm.zip b/wlight/com.github.pointhi.kicad-color-schemes.wlight_v1.0_pcm.zip
similarity index 87%
rename from wlight/theme-wlight_v1.0_pcm.zip
rename to wlight/com.github.pointhi.kicad-color-schemes.wlight_v1.0_pcm.zip
index 011fd58..e170ae3 100644
Binary files a/wlight/theme-wlight_v1.0_pcm.zip and b/wlight/com.github.pointhi.kicad-color-schemes.wlight_v1.0_pcm.zip differ
diff --git a/wlight/metadata.json b/wlight/metadata.json
index a4b8b95..cba76a3 100644
--- a/wlight/metadata.json
+++ b/wlight/metadata.json
@@ -1,9 +1,9 @@
 {
-    "$schema": "https://gitlab.com/qu1ck/kicad/-/raw/pcm/kicad/pcm/schemas/pcm.v1.schema.json#",
+    "$schema": "https://go.kicad.org/pcm/schemas/v1",
     "name": "wLight Theme",
     "description": "Designed by wykys, Inspired by Altium",
     "description_full": "Designed by wykys, Inspired by Altium",
-    "identifier": "theme-wlight",
+    "identifier": "com.github.pointhi.kicad-color-schemes.wlight",
     "type": "colortheme",
     "author": {
         "name": "Jan Vykydal",