update colors dir

286 files changed, 572 insertions, 572 deletions

diff --git a/colors/base16-0x96f.json b/colors/base16-0x96f.json
index 878693c..4aed594 100644
--- a/colors/base16-0x96f.json
+++ b/colors/base16-0x96f.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "0x96f",
+  "name": "base16",
+  "scheme-name": "0x96f",
   "author": "Filip Janevski (https://0x96f.dev/theme)",
   "slug": "0x96f",
   "slug-underscored": "0x96f",
diff --git a/colors/base16-3024.json b/colors/base16-3024.json
index 459b545..d8003e6 100644
--- a/colors/base16-3024.json
+++ b/colors/base16-3024.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "3024",
+  "name": "base16",
+  "scheme-name": "3024",
   "author": "Jan T. Sott (http://github.com/idleberg)",
   "slug": "3024",
   "slug-underscored": "3024",
diff --git a/colors/base16-apathy.json b/colors/base16-apathy.json
index 216cc24..f7965f8 100644
--- a/colors/base16-apathy.json
+++ b/colors/base16-apathy.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Apathy",
+  "name": "base16",
+  "scheme-name": "Apathy",
   "author": "Jannik Siebert (https://github.com/janniks)",
   "slug": "apathy",
   "slug-underscored": "apathy",
diff --git a/colors/base16-apprentice.json b/colors/base16-apprentice.json
index 02535fe..e03596e 100644
--- a/colors/base16-apprentice.json
+++ b/colors/base16-apprentice.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Apprentice",
+  "name": "base16",
+  "scheme-name": "Apprentice",
   "author": "romainl",
   "slug": "apprentice",
   "slug-underscored": "apprentice",
diff --git a/colors/base16-ashes.json b/colors/base16-ashes.json
index 07dc3af..7e8e9b9 100644
--- a/colors/base16-ashes.json
+++ b/colors/base16-ashes.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Ashes",
+  "name": "base16",
+  "scheme-name": "Ashes",
   "author": "Jannik Siebert (https://github.com/janniks)",
   "slug": "ashes",
   "slug-underscored": "ashes",
diff --git a/colors/base16-atelier-cave-light.json b/colors/base16-atelier-cave-light.json
index f9d7908..70e88e9 100644
--- a/colors/base16-atelier-cave-light.json
+++ b/colors/base16-atelier-cave-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Cave Light",
+  "name": "base16",
+  "scheme-name": "Atelier Cave Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-cave-light",
   "slug-underscored": "atelier_cave_light",
diff --git a/colors/base16-atelier-cave.json b/colors/base16-atelier-cave.json
index 4468908..b488757 100644
--- a/colors/base16-atelier-cave.json
+++ b/colors/base16-atelier-cave.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Cave",
+  "name": "base16",
+  "scheme-name": "Atelier Cave",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-cave",
   "slug-underscored": "atelier_cave",
diff --git a/colors/base16-atelier-dune-light.json b/colors/base16-atelier-dune-light.json
index 6d5dc85..76d7c20 100644
--- a/colors/base16-atelier-dune-light.json
+++ b/colors/base16-atelier-dune-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Dune Light",
+  "name": "base16",
+  "scheme-name": "Atelier Dune Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-dune-light",
   "slug-underscored": "atelier_dune_light",
diff --git a/colors/base16-atelier-dune.json b/colors/base16-atelier-dune.json
index 562b325..0babda6 100644
--- a/colors/base16-atelier-dune.json
+++ b/colors/base16-atelier-dune.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Dune",
+  "name": "base16",
+  "scheme-name": "Atelier Dune",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-dune",
   "slug-underscored": "atelier_dune",
diff --git a/colors/base16-atelier-estuary-light.json b/colors/base16-atelier-estuary-light.json
index 911d89c..d946b24 100644
--- a/colors/base16-atelier-estuary-light.json
+++ b/colors/base16-atelier-estuary-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Estuary Light",
+  "name": "base16",
+  "scheme-name": "Atelier Estuary Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-estuary-light",
   "slug-underscored": "atelier_estuary_light",
diff --git a/colors/base16-atelier-estuary.json b/colors/base16-atelier-estuary.json
index 33ce119..daf0ba7 100644
--- a/colors/base16-atelier-estuary.json
+++ b/colors/base16-atelier-estuary.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Estuary",
+  "name": "base16",
+  "scheme-name": "Atelier Estuary",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-estuary",
   "slug-underscored": "atelier_estuary",
diff --git a/colors/base16-atelier-forest-light.json b/colors/base16-atelier-forest-light.json
index 64f125d..99c3a1b 100644
--- a/colors/base16-atelier-forest-light.json
+++ b/colors/base16-atelier-forest-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Forest Light",
+  "name": "base16",
+  "scheme-name": "Atelier Forest Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-forest-light",
   "slug-underscored": "atelier_forest_light",
diff --git a/colors/base16-atelier-forest.json b/colors/base16-atelier-forest.json
index b70094b..016aec7 100644
--- a/colors/base16-atelier-forest.json
+++ b/colors/base16-atelier-forest.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Forest",
+  "name": "base16",
+  "scheme-name": "Atelier Forest",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-forest",
   "slug-underscored": "atelier_forest",
diff --git a/colors/base16-atelier-heath-light.json b/colors/base16-atelier-heath-light.json
index 5c87816..aa9d99e 100644
--- a/colors/base16-atelier-heath-light.json
+++ b/colors/base16-atelier-heath-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Heath Light",
+  "name": "base16",
+  "scheme-name": "Atelier Heath Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-heath-light",
   "slug-underscored": "atelier_heath_light",
diff --git a/colors/base16-atelier-heath.json b/colors/base16-atelier-heath.json
index 0243dbc..9f4bbe9 100644
--- a/colors/base16-atelier-heath.json
+++ b/colors/base16-atelier-heath.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Heath",
+  "name": "base16",
+  "scheme-name": "Atelier Heath",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-heath",
   "slug-underscored": "atelier_heath",
diff --git a/colors/base16-atelier-lakeside-light.json b/colors/base16-atelier-lakeside-light.json
index c27e4ab..45a203e 100644
--- a/colors/base16-atelier-lakeside-light.json
+++ b/colors/base16-atelier-lakeside-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Lakeside Light",
+  "name": "base16",
+  "scheme-name": "Atelier Lakeside Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-lakeside-light",
   "slug-underscored": "atelier_lakeside_light",
diff --git a/colors/base16-atelier-lakeside.json b/colors/base16-atelier-lakeside.json
index 8ebe2c7..e80440a 100644
--- a/colors/base16-atelier-lakeside.json
+++ b/colors/base16-atelier-lakeside.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Lakeside",
+  "name": "base16",
+  "scheme-name": "Atelier Lakeside",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-lakeside",
   "slug-underscored": "atelier_lakeside",
diff --git a/colors/base16-atelier-plateau-light.json b/colors/base16-atelier-plateau-light.json
index 632f964..b9550c4 100644
--- a/colors/base16-atelier-plateau-light.json
+++ b/colors/base16-atelier-plateau-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Plateau Light",
+  "name": "base16",
+  "scheme-name": "Atelier Plateau Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-plateau-light",
   "slug-underscored": "atelier_plateau_light",
diff --git a/colors/base16-atelier-plateau.json b/colors/base16-atelier-plateau.json
index 3246ca7..79d15ed 100644
--- a/colors/base16-atelier-plateau.json
+++ b/colors/base16-atelier-plateau.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Plateau",
+  "name": "base16",
+  "scheme-name": "Atelier Plateau",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-plateau",
   "slug-underscored": "atelier_plateau",
diff --git a/colors/base16-atelier-savanna-light.json b/colors/base16-atelier-savanna-light.json
index a727dc1..0af517c 100644
--- a/colors/base16-atelier-savanna-light.json
+++ b/colors/base16-atelier-savanna-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Savanna Light",
+  "name": "base16",
+  "scheme-name": "Atelier Savanna Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-savanna-light",
   "slug-underscored": "atelier_savanna_light",
diff --git a/colors/base16-atelier-savanna.json b/colors/base16-atelier-savanna.json
index 2d121df..ab71dee 100644
--- a/colors/base16-atelier-savanna.json
+++ b/colors/base16-atelier-savanna.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Savanna",
+  "name": "base16",
+  "scheme-name": "Atelier Savanna",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-savanna",
   "slug-underscored": "atelier_savanna",
diff --git a/colors/base16-atelier-seaside-light.json b/colors/base16-atelier-seaside-light.json
index 4c1cd46..69857f5 100644
--- a/colors/base16-atelier-seaside-light.json
+++ b/colors/base16-atelier-seaside-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Seaside Light",
+  "name": "base16",
+  "scheme-name": "Atelier Seaside Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-seaside-light",
   "slug-underscored": "atelier_seaside_light",
diff --git a/colors/base16-atelier-seaside.json b/colors/base16-atelier-seaside.json
index e9d5e3f..e9fc1f9 100644
--- a/colors/base16-atelier-seaside.json
+++ b/colors/base16-atelier-seaside.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Seaside",
+  "name": "base16",
+  "scheme-name": "Atelier Seaside",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-seaside",
   "slug-underscored": "atelier_seaside",
diff --git a/colors/base16-atelier-sulphurpool-light.json b/colors/base16-atelier-sulphurpool-light.json
index d4fdfd6..32f89c5 100644
--- a/colors/base16-atelier-sulphurpool-light.json
+++ b/colors/base16-atelier-sulphurpool-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Sulphurpool Light",
+  "name": "base16",
+  "scheme-name": "Atelier Sulphurpool Light",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-sulphurpool-light",
   "slug-underscored": "atelier_sulphurpool_light",
diff --git a/colors/base16-atelier-sulphurpool.json b/colors/base16-atelier-sulphurpool.json
index d3d68d1..92a6246 100644
--- a/colors/base16-atelier-sulphurpool.json
+++ b/colors/base16-atelier-sulphurpool.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atelier Sulphurpool",
+  "name": "base16",
+  "scheme-name": "Atelier Sulphurpool",
   "author": "Bram de Haan (http://atelierbramdehaan.nl)",
   "slug": "atelier-sulphurpool",
   "slug-underscored": "atelier_sulphurpool",
diff --git a/colors/base16-atlas.json b/colors/base16-atlas.json
index 6864844..b2974ca 100644
--- a/colors/base16-atlas.json
+++ b/colors/base16-atlas.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Atlas",
+  "name": "base16",
+  "scheme-name": "Atlas",
   "author": "Alex Lende (https://ajlende.com)",
   "slug": "atlas",
   "slug-underscored": "atlas",
diff --git a/colors/base16-ayu-dark.json b/colors/base16-ayu-dark.json
index 5cec095..7c2fb05 100644
--- a/colors/base16-ayu-dark.json
+++ b/colors/base16-ayu-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Ayu Dark",
+  "name": "base16",
+  "scheme-name": "Ayu Dark",
   "author": "Khue Nguyen <Z5483Y@gmail.com>",
   "slug": "ayu-dark",
   "slug-underscored": "ayu_dark",
diff --git a/colors/base16-ayu-light.json b/colors/base16-ayu-light.json
index e806ad3..4d3b821 100644
--- a/colors/base16-ayu-light.json
+++ b/colors/base16-ayu-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Ayu Light",
+  "name": "base16",
+  "scheme-name": "Ayu Light",
   "author": "Khue Nguyen <Z5483Y@gmail.com>",
   "slug": "ayu-light",
   "slug-underscored": "ayu_light",
diff --git a/colors/base16-ayu-mirage.json b/colors/base16-ayu-mirage.json
index 7834617..59a3cbe 100644
--- a/colors/base16-ayu-mirage.json
+++ b/colors/base16-ayu-mirage.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Ayu Mirage",
+  "name": "base16",
+  "scheme-name": "Ayu Mirage",
   "author": "Khue Nguyen <Z5483Y@gmail.com>",
   "slug": "ayu-mirage",
   "slug-underscored": "ayu_mirage",
diff --git a/colors/base16-aztec.json b/colors/base16-aztec.json
index 2b465c6..75288e2 100644
--- a/colors/base16-aztec.json
+++ b/colors/base16-aztec.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Aztec",
+  "name": "base16",
+  "scheme-name": "Aztec",
   "author": "TheNeverMan (github.com/TheNeverMan)",
   "slug": "aztec",
   "slug-underscored": "aztec",
diff --git a/colors/base16-bespin.json b/colors/base16-bespin.json
index 06a73af..b529ec1 100644
--- a/colors/base16-bespin.json
+++ b/colors/base16-bespin.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Bespin",
+  "name": "base16",
+  "scheme-name": "Bespin",
   "author": "Jan T. Sott",
   "slug": "bespin",
   "slug-underscored": "bespin",
diff --git a/colors/base16-black-metal-bathory.json b/colors/base16-black-metal-bathory.json
index 48637cc..c7bbce3 100644
--- a/colors/base16-black-metal-bathory.json
+++ b/colors/base16-black-metal-bathory.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Bathory)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Bathory)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-bathory",
   "slug-underscored": "black_metal_bathory",
diff --git a/colors/base16-black-metal-burzum.json b/colors/base16-black-metal-burzum.json
index 41ef20a..ba68ee7 100644
--- a/colors/base16-black-metal-burzum.json
+++ b/colors/base16-black-metal-burzum.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Burzum)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Burzum)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-burzum",
   "slug-underscored": "black_metal_burzum",
diff --git a/colors/base16-black-metal-dark-funeral.json b/colors/base16-black-metal-dark-funeral.json
index fbfde19..45d30f2 100644
--- a/colors/base16-black-metal-dark-funeral.json
+++ b/colors/base16-black-metal-dark-funeral.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Dark Funeral)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Dark Funeral)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-dark-funeral",
   "slug-underscored": "black_metal_dark_funeral",
diff --git a/colors/base16-black-metal-gorgoroth.json b/colors/base16-black-metal-gorgoroth.json
index fe78d40..c1747c7 100644
--- a/colors/base16-black-metal-gorgoroth.json
+++ b/colors/base16-black-metal-gorgoroth.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Gorgoroth)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Gorgoroth)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-gorgoroth",
   "slug-underscored": "black_metal_gorgoroth",
diff --git a/colors/base16-black-metal-immortal.json b/colors/base16-black-metal-immortal.json
index 2dbba52..6fbee5e 100644
--- a/colors/base16-black-metal-immortal.json
+++ b/colors/base16-black-metal-immortal.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Immortal)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Immortal)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-immortal",
   "slug-underscored": "black_metal_immortal",
diff --git a/colors/base16-black-metal-khold.json b/colors/base16-black-metal-khold.json
index 2aa5bdb..42d8fbd 100644
--- a/colors/base16-black-metal-khold.json
+++ b/colors/base16-black-metal-khold.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Khold)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Khold)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-khold",
   "slug-underscored": "black_metal_khold",
diff --git a/colors/base16-black-metal-marduk.json b/colors/base16-black-metal-marduk.json
index fe36e21..c6d3a68 100644
--- a/colors/base16-black-metal-marduk.json
+++ b/colors/base16-black-metal-marduk.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Marduk)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Marduk)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-marduk",
   "slug-underscored": "black_metal_marduk",
diff --git a/colors/base16-black-metal-mayhem.json b/colors/base16-black-metal-mayhem.json
index 71064f4..efde238 100644
--- a/colors/base16-black-metal-mayhem.json
+++ b/colors/base16-black-metal-mayhem.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Mayhem)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Mayhem)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-mayhem",
   "slug-underscored": "black_metal_mayhem",
diff --git a/colors/base16-black-metal-nile.json b/colors/base16-black-metal-nile.json
index 5405222..cc9b63b 100644
--- a/colors/base16-black-metal-nile.json
+++ b/colors/base16-black-metal-nile.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Nile)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Nile)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-nile",
   "slug-underscored": "black_metal_nile",
diff --git a/colors/base16-black-metal-venom.json b/colors/base16-black-metal-venom.json
index 6449dd7..72a3d8f 100644
--- a/colors/base16-black-metal-venom.json
+++ b/colors/base16-black-metal-venom.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal (Venom)",
+  "name": "base16",
+  "scheme-name": "Black Metal (Venom)",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal-venom",
   "slug-underscored": "black_metal_venom",
diff --git a/colors/base16-black-metal.json b/colors/base16-black-metal.json
index 97d841c..e1a68ef 100644
--- a/colors/base16-black-metal.json
+++ b/colors/base16-black-metal.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Black Metal",
+  "name": "base16",
+  "scheme-name": "Black Metal",
   "author": "metalelf0 (https://github.com/metalelf0)",
   "slug": "black-metal",
   "slug-underscored": "black_metal",
diff --git a/colors/base16-blueforest.json b/colors/base16-blueforest.json
index cfd18e8..212d68e 100644
--- a/colors/base16-blueforest.json
+++ b/colors/base16-blueforest.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Blue Forest",
+  "name": "base16",
+  "scheme-name": "Blue Forest",
   "author": "alonsodomin (https://github.com/alonsodomin)",
   "slug": "blueforest",
   "slug-underscored": "blueforest",
diff --git a/colors/base16-blueish.json b/colors/base16-blueish.json
index 12e1ccf..0d6dd8c 100644
--- a/colors/base16-blueish.json
+++ b/colors/base16-blueish.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Blueish",
+  "name": "base16",
+  "scheme-name": "Blueish",
   "author": "Ben Mayoras",
   "slug": "blueish",
   "slug-underscored": "blueish",
diff --git a/colors/base16-brewer.json b/colors/base16-brewer.json
index 97b41dd..083fea9 100644
--- a/colors/base16-brewer.json
+++ b/colors/base16-brewer.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Brewer",
+  "name": "base16",
+  "scheme-name": "Brewer",
   "author": "Timothée Poisot (http://github.com/tpoisot)",
   "slug": "brewer",
   "slug-underscored": "brewer",
diff --git a/colors/base16-bright.json b/colors/base16-bright.json
index a444601..ee55d47 100644
--- a/colors/base16-bright.json
+++ b/colors/base16-bright.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Bright",
+  "name": "base16",
+  "scheme-name": "Bright",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "bright",
   "slug-underscored": "bright",
diff --git a/colors/base16-brogrammer.json b/colors/base16-brogrammer.json
index b9b83d2..73106ba 100644
--- a/colors/base16-brogrammer.json
+++ b/colors/base16-brogrammer.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Brogrammer",
+  "name": "base16",
+  "scheme-name": "Brogrammer",
   "author": "Vik Ramanujam (http://github.com/piggyslasher)",
   "slug": "brogrammer",
   "slug-underscored": "brogrammer",
diff --git a/colors/base16-brushtrees-dark.json b/colors/base16-brushtrees-dark.json
index 5eca518..fa9620a 100644
--- a/colors/base16-brushtrees-dark.json
+++ b/colors/base16-brushtrees-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Brush Trees Dark",
+  "name": "base16",
+  "scheme-name": "Brush Trees Dark",
   "author": "Abraham White <abelincoln.white@gmail.com>",
   "slug": "brushtrees-dark",
   "slug-underscored": "brushtrees_dark",
diff --git a/colors/base16-brushtrees.json b/colors/base16-brushtrees.json
index 3109845..3951e20 100644
--- a/colors/base16-brushtrees.json
+++ b/colors/base16-brushtrees.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Brush Trees",
+  "name": "base16",
+  "scheme-name": "Brush Trees",
   "author": "Abraham White <abelincoln.white@gmail.com>",
   "slug": "brushtrees",
   "slug-underscored": "brushtrees",
diff --git a/colors/base16-caroline.json b/colors/base16-caroline.json
index 07225b5..d96ba10 100644
--- a/colors/base16-caroline.json
+++ b/colors/base16-caroline.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "caroline",
+  "name": "base16",
+  "scheme-name": "caroline",
   "author": "ed (https://codeberg.org/ed)",
   "slug": "caroline",
   "slug-underscored": "caroline",
diff --git a/colors/base16-catppuccin-frappe.json b/colors/base16-catppuccin-frappe.json
index f440a8b..ade943f 100644
--- a/colors/base16-catppuccin-frappe.json
+++ b/colors/base16-catppuccin-frappe.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Catppuccin Frappe",
+  "name": "base16",
+  "scheme-name": "Catppuccin Frappe",
   "author": "https://github.com/catppuccin/catppuccin",
   "slug": "catppuccin-frappe",
   "slug-underscored": "catppuccin_frappe",
diff --git a/colors/base16-catppuccin-latte.json b/colors/base16-catppuccin-latte.json
index 6bfe050..4aa5352 100644
--- a/colors/base16-catppuccin-latte.json
+++ b/colors/base16-catppuccin-latte.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Catppuccin Latte",
+  "name": "base16",
+  "scheme-name": "Catppuccin Latte",
   "author": "https://github.com/catppuccin/catppuccin",
   "slug": "catppuccin-latte",
   "slug-underscored": "catppuccin_latte",
diff --git a/colors/base16-catppuccin-macchiato.json b/colors/base16-catppuccin-macchiato.json
index a29221c..ea5233f 100644
--- a/colors/base16-catppuccin-macchiato.json
+++ b/colors/base16-catppuccin-macchiato.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Catppuccin Macchiato",
+  "name": "base16",
+  "scheme-name": "Catppuccin Macchiato",
   "author": "https://github.com/catppuccin/catppuccin",
   "slug": "catppuccin-macchiato",
   "slug-underscored": "catppuccin_macchiato",
diff --git a/colors/base16-catppuccin-mocha.json b/colors/base16-catppuccin-mocha.json
index a061d6f..dc0e669 100644
--- a/colors/base16-catppuccin-mocha.json
+++ b/colors/base16-catppuccin-mocha.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Catppuccin Mocha",
+  "name": "base16",
+  "scheme-name": "Catppuccin Mocha",
   "author": "https://github.com/catppuccin/catppuccin",
   "slug": "catppuccin-mocha",
   "slug-underscored": "catppuccin_mocha",
diff --git a/colors/base16-chalk.json b/colors/base16-chalk.json
index f43744c..3495cbe 100644
--- a/colors/base16-chalk.json
+++ b/colors/base16-chalk.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Chalk",
+  "name": "base16",
+  "scheme-name": "Chalk",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "chalk",
   "slug-underscored": "chalk",
diff --git a/colors/base16-chicago-day.json b/colors/base16-chicago-day.json
index bd5350c..9ea4e56 100644
--- a/colors/base16-chicago-day.json
+++ b/colors/base16-chicago-day.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Chicago Day",
+  "name": "base16",
+  "scheme-name": "Chicago Day",
   "author": "Wendell, Ryan <ryanjwendell@gmail.com>",
   "slug": "chicago-day",
   "slug-underscored": "chicago_day",
diff --git a/colors/base16-chicago-night.json b/colors/base16-chicago-night.json
index bc188e9..c2d5f2e 100644
--- a/colors/base16-chicago-night.json
+++ b/colors/base16-chicago-night.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Chicago Night",
+  "name": "base16",
+  "scheme-name": "Chicago Night",
   "author": "Wendell, Ryan <ryanjwendell@gmail.com>",
   "slug": "chicago-night",
   "slug-underscored": "chicago_night",
diff --git a/colors/base16-circus.json b/colors/base16-circus.json
index 4077eb2..96fe734 100644
--- a/colors/base16-circus.json
+++ b/colors/base16-circus.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Circus",
+  "name": "base16",
+  "scheme-name": "Circus",
   "author": "Stephan Boyer (https://github.com/stepchowfun) and Esther Wang (https://github.com/ewang12)",
   "slug": "circus",
   "slug-underscored": "circus",
diff --git a/colors/base16-classic-dark.json b/colors/base16-classic-dark.json
index dd89f41..4d52ca7 100644
--- a/colors/base16-classic-dark.json
+++ b/colors/base16-classic-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Classic Dark",
+  "name": "base16",
+  "scheme-name": "Classic Dark",
   "author": "Jason Heeris (http://heeris.id.au)",
   "slug": "classic-dark",
   "slug-underscored": "classic_dark",
diff --git a/colors/base16-classic-light.json b/colors/base16-classic-light.json
index f4a0ff0..6157fc3 100644
--- a/colors/base16-classic-light.json
+++ b/colors/base16-classic-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Classic Light",
+  "name": "base16",
+  "scheme-name": "Classic Light",
   "author": "Jason Heeris (http://heeris.id.au)",
   "slug": "classic-light",
   "slug-underscored": "classic_light",
diff --git a/colors/base16-codeschool.json b/colors/base16-codeschool.json
index 95f4e68..78b9a8a 100644
--- a/colors/base16-codeschool.json
+++ b/colors/base16-codeschool.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Codeschool",
+  "name": "base16",
+  "scheme-name": "Codeschool",
   "author": "blockloop",
   "slug": "codeschool",
   "slug-underscored": "codeschool",
diff --git a/colors/base16-colors.json b/colors/base16-colors.json
index 55b65a5..7233e96 100644
--- a/colors/base16-colors.json
+++ b/colors/base16-colors.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Colors",
+  "name": "base16",
+  "scheme-name": "Colors",
   "author": "mrmrs (http://clrs.cc)",
   "slug": "colors",
   "slug-underscored": "colors",
diff --git a/colors/base16-cupcake.json b/colors/base16-cupcake.json
index 4471f81..2d30d78 100644
--- a/colors/base16-cupcake.json
+++ b/colors/base16-cupcake.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Cupcake",
+  "name": "base16",
+  "scheme-name": "Cupcake",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "cupcake",
   "slug-underscored": "cupcake",
diff --git a/colors/base16-cupertino.json b/colors/base16-cupertino.json
index 59d19eb..29fca8c 100644
--- a/colors/base16-cupertino.json
+++ b/colors/base16-cupertino.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Cupertino",
+  "name": "base16",
+  "scheme-name": "Cupertino",
   "author": "Defman21",
   "slug": "cupertino",
   "slug-underscored": "cupertino",
diff --git a/colors/base16-da-one-black.json b/colors/base16-da-one-black.json
index a567880..5bdc5ae 100644
--- a/colors/base16-da-one-black.json
+++ b/colors/base16-da-one-black.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Da One Black",
+  "name": "base16",
+  "scheme-name": "Da One Black",
   "author": "NNB (https://github.com/NNBnh)",
   "slug": "da-one-black",
   "slug-underscored": "da_one_black",
diff --git a/colors/base16-da-one-gray.json b/colors/base16-da-one-gray.json
index 7e5de92..8c04bcb 100644
--- a/colors/base16-da-one-gray.json
+++ b/colors/base16-da-one-gray.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Da One Gray",
+  "name": "base16",
+  "scheme-name": "Da One Gray",
   "author": "NNB (https://github.com/NNBnh)",
   "slug": "da-one-gray",
   "slug-underscored": "da_one_gray",
diff --git a/colors/base16-da-one-ocean.json b/colors/base16-da-one-ocean.json
index 49465d7..cbe2120 100644
--- a/colors/base16-da-one-ocean.json
+++ b/colors/base16-da-one-ocean.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Da One Ocean",
+  "name": "base16",
+  "scheme-name": "Da One Ocean",
   "author": "NNB (https://github.com/NNBnh)",
   "slug": "da-one-ocean",
   "slug-underscored": "da_one_ocean",
diff --git a/colors/base16-da-one-paper.json b/colors/base16-da-one-paper.json
index aea43fd..80a9aae 100644
--- a/colors/base16-da-one-paper.json
+++ b/colors/base16-da-one-paper.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Da One Paper",
+  "name": "base16",
+  "scheme-name": "Da One Paper",
   "author": "NNB (https://github.com/NNBnh)",
   "slug": "da-one-paper",
   "slug-underscored": "da_one_paper",
diff --git a/colors/base16-da-one-sea.json b/colors/base16-da-one-sea.json
index c266032..378fd0f 100644
--- a/colors/base16-da-one-sea.json
+++ b/colors/base16-da-one-sea.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Da One Sea",
+  "name": "base16",
+  "scheme-name": "Da One Sea",
   "author": "NNB (https://github.com/NNBnh)",
   "slug": "da-one-sea",
   "slug-underscored": "da_one_sea",
diff --git a/colors/base16-da-one-white.json b/colors/base16-da-one-white.json
index c174ae6..40167ac 100644
--- a/colors/base16-da-one-white.json
+++ b/colors/base16-da-one-white.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Da One White",
+  "name": "base16",
+  "scheme-name": "Da One White",
   "author": "NNB (https://github.com/NNBnh)",
   "slug": "da-one-white",
   "slug-underscored": "da_one_white",
diff --git a/colors/base16-danqing-light.json b/colors/base16-danqing-light.json
index 9040046..335f4e2 100644
--- a/colors/base16-danqing-light.json
+++ b/colors/base16-danqing-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "DanQing Light",
+  "name": "base16",
+  "scheme-name": "DanQing Light",
   "author": "Wenhan Zhu (Cosmos) (zhuwenhan950913@gmail.com)",
   "slug": "danqing-light",
   "slug-underscored": "danqing_light",
diff --git a/colors/base16-danqing.json b/colors/base16-danqing.json
index 8488331..1bc2455 100644
--- a/colors/base16-danqing.json
+++ b/colors/base16-danqing.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "DanQing",
+  "name": "base16",
+  "scheme-name": "DanQing",
   "author": "Wenhan Zhu (Cosmos) (zhuwenhan950913@gmail.com)",
   "slug": "danqing",
   "slug-underscored": "danqing",
diff --git a/colors/base16-darcula.json b/colors/base16-darcula.json
index 4174fff..c482227 100644
--- a/colors/base16-darcula.json
+++ b/colors/base16-darcula.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Darcula",
+  "name": "base16",
+  "scheme-name": "Darcula",
   "author": "jetbrains",
   "slug": "darcula",
   "slug-underscored": "darcula",
diff --git a/colors/base16-darkmoss.json b/colors/base16-darkmoss.json
index 279b635..a033eda 100644
--- a/colors/base16-darkmoss.json
+++ b/colors/base16-darkmoss.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "darkmoss",
+  "name": "base16",
+  "scheme-name": "darkmoss",
   "author": "Gabriel Avanzi (https://github.com/avanzzzi)",
   "slug": "darkmoss",
   "slug-underscored": "darkmoss",
diff --git a/colors/base16-darktooth.json b/colors/base16-darktooth.json
index fcea924..20fc3ef 100644
--- a/colors/base16-darktooth.json
+++ b/colors/base16-darktooth.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Darktooth",
+  "name": "base16",
+  "scheme-name": "Darktooth",
   "author": "Jason Milkins (https://github.com/jasonm23)",
   "slug": "darktooth",
   "slug-underscored": "darktooth",
diff --git a/colors/base16-darkviolet.json b/colors/base16-darkviolet.json
index b04bf78..2ffe6d2 100644
--- a/colors/base16-darkviolet.json
+++ b/colors/base16-darkviolet.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Dark Violet",
+  "name": "base16",
+  "scheme-name": "Dark Violet",
   "author": "ruler501 (https://github.com/ruler501/base16-darkviolet)",
   "slug": "darkviolet",
   "slug-underscored": "darkviolet",
diff --git a/colors/base16-decaf.json b/colors/base16-decaf.json
index 9853084..b51faf7 100644
--- a/colors/base16-decaf.json
+++ b/colors/base16-decaf.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Decaf",
+  "name": "base16",
+  "scheme-name": "Decaf",
   "author": "Alex Mirrington (https://github.com/alexmirrington)",
   "slug": "decaf",
   "slug-underscored": "decaf",
diff --git a/colors/base16-deep-oceanic-next.json b/colors/base16-deep-oceanic-next.json
index 3159779..c8a1e3c 100644
--- a/colors/base16-deep-oceanic-next.json
+++ b/colors/base16-deep-oceanic-next.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Deep Oceanic Next",
+  "name": "base16",
+  "scheme-name": "Deep Oceanic Next",
   "author": "spearkkk (https://github.com/spearkkk)",
   "slug": "deep-oceanic-next",
   "slug-underscored": "deep_oceanic_next",
diff --git a/colors/base16-default-dark.json b/colors/base16-default-dark.json
index d4e8c55..96b736a 100644
--- a/colors/base16-default-dark.json
+++ b/colors/base16-default-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Default Dark",
+  "name": "base16",
+  "scheme-name": "Default Dark",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "default-dark",
   "slug-underscored": "default_dark",
diff --git a/colors/base16-default-light.json b/colors/base16-default-light.json
index 3046eaa..0099cc6 100644
--- a/colors/base16-default-light.json
+++ b/colors/base16-default-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Default Light",
+  "name": "base16",
+  "scheme-name": "Default Light",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "default-light",
   "slug-underscored": "default_light",
diff --git a/colors/base16-digital-rain.json b/colors/base16-digital-rain.json
index 71db613..f294960 100644
--- a/colors/base16-digital-rain.json
+++ b/colors/base16-digital-rain.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Digital Rain",
+  "name": "base16",
+  "scheme-name": "Digital Rain",
   "author": "Nathan Byrd (https://github.com/cognitivegears)",
   "slug": "digital-rain",
   "slug-underscored": "digital_rain",
diff --git a/colors/base16-dirtysea.json b/colors/base16-dirtysea.json
index 28db469..5edfb9e 100644
--- a/colors/base16-dirtysea.json
+++ b/colors/base16-dirtysea.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "dirtysea",
+  "name": "base16",
+  "scheme-name": "dirtysea",
   "author": "Kahlil (Kal) Hodgson",
   "slug": "dirtysea",
   "slug-underscored": "dirtysea",
diff --git a/colors/base16-dracula.json b/colors/base16-dracula.json
index 6e9efb5..55f6b71 100644
--- a/colors/base16-dracula.json
+++ b/colors/base16-dracula.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Dracula",
+  "name": "base16",
+  "scheme-name": "Dracula",
   "author": "Jamy Golden (http://github.com/JamyGolden), based on Dracula Theme (http://github.com/dracula)",
   "slug": "dracula",
   "slug-underscored": "dracula",
diff --git a/colors/base16-edge-dark.json b/colors/base16-edge-dark.json
index 159995a..7074faa 100644
--- a/colors/base16-edge-dark.json
+++ b/colors/base16-edge-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Edge Dark",
+  "name": "base16",
+  "scheme-name": "Edge Dark",
   "author": "cjayross (https://github.com/cjayross)",
   "slug": "edge-dark",
   "slug-underscored": "edge_dark",
diff --git a/colors/base16-edge-light.json b/colors/base16-edge-light.json
index 8597ab9..3fc307d 100644
--- a/colors/base16-edge-light.json
+++ b/colors/base16-edge-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Edge Light",
+  "name": "base16",
+  "scheme-name": "Edge Light",
   "author": "cjayross (https://github.com/cjayross)",
   "slug": "edge-light",
   "slug-underscored": "edge_light",
diff --git a/colors/base16-eighties.json b/colors/base16-eighties.json
index ee17052..14fc387 100644
--- a/colors/base16-eighties.json
+++ b/colors/base16-eighties.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Eighties",
+  "name": "base16",
+  "scheme-name": "Eighties",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "eighties",
   "slug-underscored": "eighties",
diff --git a/colors/base16-embers-light.json b/colors/base16-embers-light.json
index 7f5e823..2444d0b 100644
--- a/colors/base16-embers-light.json
+++ b/colors/base16-embers-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Embers Light",
+  "name": "base16",
+  "scheme-name": "Embers Light",
   "author": "Jannik Siebert (https://github.com/janniks)",
   "slug": "embers-light",
   "slug-underscored": "embers_light",
diff --git a/colors/base16-embers.json b/colors/base16-embers.json
index 43c3a8e..fb2b4e9 100644
--- a/colors/base16-embers.json
+++ b/colors/base16-embers.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Embers",
+  "name": "base16",
+  "scheme-name": "Embers",
   "author": "Jannik Siebert (https://github.com/janniks)",
   "slug": "embers",
   "slug-underscored": "embers",
diff --git a/colors/base16-emil.json b/colors/base16-emil.json
index 6c6a2b6..73d0bee 100644
--- a/colors/base16-emil.json
+++ b/colors/base16-emil.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "emil",
+  "name": "base16",
+  "scheme-name": "emil",
   "author": "limelier",
   "slug": "emil",
   "slug-underscored": "emil",
diff --git a/colors/base16-equilibrium-dark.json b/colors/base16-equilibrium-dark.json
index 57c9bdc..1d0787f 100644
--- a/colors/base16-equilibrium-dark.json
+++ b/colors/base16-equilibrium-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Equilibrium Dark",
+  "name": "base16",
+  "scheme-name": "Equilibrium Dark",
   "author": "Carlo Abelli",
   "slug": "equilibrium-dark",
   "slug-underscored": "equilibrium_dark",
diff --git a/colors/base16-equilibrium-gray-dark.json b/colors/base16-equilibrium-gray-dark.json
index b5cea67..eca6957 100644
--- a/colors/base16-equilibrium-gray-dark.json
+++ b/colors/base16-equilibrium-gray-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Equilibrium Gray Dark",
+  "name": "base16",
+  "scheme-name": "Equilibrium Gray Dark",
   "author": "Carlo Abelli",
   "slug": "equilibrium-gray-dark",
   "slug-underscored": "equilibrium_gray_dark",
diff --git a/colors/base16-equilibrium-gray-light.json b/colors/base16-equilibrium-gray-light.json
index 7f500c0..8d98043 100644
--- a/colors/base16-equilibrium-gray-light.json
+++ b/colors/base16-equilibrium-gray-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Equilibrium Gray Light",
+  "name": "base16",
+  "scheme-name": "Equilibrium Gray Light",
   "author": "Carlo Abelli",
   "slug": "equilibrium-gray-light",
   "slug-underscored": "equilibrium_gray_light",
diff --git a/colors/base16-equilibrium-light.json b/colors/base16-equilibrium-light.json
index ac3c981..2012d3f 100644
--- a/colors/base16-equilibrium-light.json
+++ b/colors/base16-equilibrium-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Equilibrium Light",
+  "name": "base16",
+  "scheme-name": "Equilibrium Light",
   "author": "Carlo Abelli",
   "slug": "equilibrium-light",
   "slug-underscored": "equilibrium_light",
diff --git a/colors/base16-eris.json b/colors/base16-eris.json
index b45c127..bc9cd81 100644
--- a/colors/base16-eris.json
+++ b/colors/base16-eris.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "eris",
+  "name": "base16",
+  "scheme-name": "eris",
   "author": "ed (https://codeberg.org/ed)",
   "slug": "eris",
   "slug-underscored": "eris",
diff --git a/colors/base16-espresso.json b/colors/base16-espresso.json
index e70035c..5b0b237 100644
--- a/colors/base16-espresso.json
+++ b/colors/base16-espresso.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Espresso",
+  "name": "base16",
+  "scheme-name": "Espresso",
   "author": "Unknown. Maintained by Alex Mirrington (https://github.com/alexmirrington)",
   "slug": "espresso",
   "slug-underscored": "espresso",
diff --git a/colors/base16-eva-dim.json b/colors/base16-eva-dim.json
index 9544def..a86f9f5 100644
--- a/colors/base16-eva-dim.json
+++ b/colors/base16-eva-dim.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Eva Dim",
+  "name": "base16",
+  "scheme-name": "Eva Dim",
   "author": "kjakapat (https://github.com/kjakapat)",
   "slug": "eva-dim",
   "slug-underscored": "eva_dim",
diff --git a/colors/base16-eva.json b/colors/base16-eva.json
index 89632bf..0794d3a 100644
--- a/colors/base16-eva.json
+++ b/colors/base16-eva.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Eva",
+  "name": "base16",
+  "scheme-name": "Eva",
   "author": "kjakapat (https://github.com/kjakapat)",
   "slug": "eva",
   "slug-underscored": "eva",
diff --git a/colors/base16-evenok-dark.json b/colors/base16-evenok-dark.json
index 9e6f75d..571a42a 100644
--- a/colors/base16-evenok-dark.json
+++ b/colors/base16-evenok-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Evenok Dark",
+  "name": "base16",
+  "scheme-name": "Evenok Dark",
   "author": "Mekeor Melire",
   "slug": "evenok-dark",
   "slug-underscored": "evenok_dark",
diff --git a/colors/base16-everforest-dark-hard.json b/colors/base16-everforest-dark-hard.json
index 3b1986b..78c6f3d 100644
--- a/colors/base16-everforest-dark-hard.json
+++ b/colors/base16-everforest-dark-hard.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Everforest Dark Hard",
+  "name": "base16",
+  "scheme-name": "Everforest Dark Hard",
   "author": "Sainnhe Park (https://github.com/sainnhe)",
   "slug": "everforest-dark-hard",
   "slug-underscored": "everforest_dark_hard",
diff --git a/colors/base16-everforest-dark-soft.json b/colors/base16-everforest-dark-soft.json
index fa7b979..8b1ec91 100644
--- a/colors/base16-everforest-dark-soft.json
+++ b/colors/base16-everforest-dark-soft.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Everforest Dark Soft",
+  "name": "base16",
+  "scheme-name": "Everforest Dark Soft",
   "author": "Sainnhe Park (https://github.com/sainnhe)",
   "slug": "everforest-dark-soft",
   "slug-underscored": "everforest_dark_soft",
diff --git a/colors/base16-everforest.json b/colors/base16-everforest.json
index cfb1507..443bd0a 100644
--- a/colors/base16-everforest.json
+++ b/colors/base16-everforest.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Everforest",
+  "name": "base16",
+  "scheme-name": "Everforest",
   "author": "Sainnhe Park (https://github.com/sainnhe)",
   "slug": "everforest",
   "slug-underscored": "everforest",
diff --git a/colors/base16-flat.json b/colors/base16-flat.json
index 9d61a81..36b8b61 100644
--- a/colors/base16-flat.json
+++ b/colors/base16-flat.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Flat",
+  "name": "base16",
+  "scheme-name": "Flat",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "flat",
   "slug-underscored": "flat",
diff --git a/colors/base16-framer.json b/colors/base16-framer.json
index 125d5ff..46ce45a 100644
--- a/colors/base16-framer.json
+++ b/colors/base16-framer.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Framer",
+  "name": "base16",
+  "scheme-name": "Framer",
   "author": "Framer (Maintained by Jesse Hoyos)",
   "slug": "framer",
   "slug-underscored": "framer",
diff --git a/colors/base16-fruit-soda.json b/colors/base16-fruit-soda.json
index 0b45557..b7f0370 100644
--- a/colors/base16-fruit-soda.json
+++ b/colors/base16-fruit-soda.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Fruit Soda",
+  "name": "base16",
+  "scheme-name": "Fruit Soda",
   "author": "jozip",
   "slug": "fruit-soda",
   "slug-underscored": "fruit_soda",
diff --git a/colors/base16-gigavolt.json b/colors/base16-gigavolt.json
index b6c3052..f94853f 100644
--- a/colors/base16-gigavolt.json
+++ b/colors/base16-gigavolt.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gigavolt",
+  "name": "base16",
+  "scheme-name": "Gigavolt",
   "author": "Aidan Swope (http://github.com/Whillikers)",
   "slug": "gigavolt",
   "slug-underscored": "gigavolt",
diff --git a/colors/base16-github-dark.json b/colors/base16-github-dark.json
index 6e1de76..dbd6966 100644
--- a/colors/base16-github-dark.json
+++ b/colors/base16-github-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Github Dark",
+  "name": "base16",
+  "scheme-name": "Github Dark",
   "author": "Tinted Theming (https://github.com/tinted-theming)",
   "slug": "github-dark",
   "slug-underscored": "github_dark",
diff --git a/colors/base16-github.json b/colors/base16-github.json
index 03aa89d..0eab6f2 100644
--- a/colors/base16-github.json
+++ b/colors/base16-github.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Github",
+  "name": "base16",
+  "scheme-name": "Github",
   "author": "Tinted Theming (https://github.com/tinted-theming)",
   "slug": "github",
   "slug-underscored": "github",
diff --git a/colors/base16-google-dark.json b/colors/base16-google-dark.json
index cc9bcfb..481a90c 100644
--- a/colors/base16-google-dark.json
+++ b/colors/base16-google-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Google Dark",
+  "name": "base16",
+  "scheme-name": "Google Dark",
   "author": "Seth Wright (http://sethawright.com)",
   "slug": "google-dark",
   "slug-underscored": "google_dark",
diff --git a/colors/base16-google-light.json b/colors/base16-google-light.json
index 3e5ba93..1196123 100644
--- a/colors/base16-google-light.json
+++ b/colors/base16-google-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Google Light",
+  "name": "base16",
+  "scheme-name": "Google Light",
   "author": "Seth Wright (http://sethawright.com)",
   "slug": "google-light",
   "slug-underscored": "google_light",
diff --git a/colors/base16-gotham.json b/colors/base16-gotham.json
index 6eda320..a9edba2 100644
--- a/colors/base16-gotham.json
+++ b/colors/base16-gotham.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gotham",
+  "name": "base16",
+  "scheme-name": "Gotham",
   "author": "Andrea Leopardi (arranged by Brett Jones)",
   "slug": "gotham",
   "slug-underscored": "gotham",
diff --git a/colors/base16-grayscale-dark.json b/colors/base16-grayscale-dark.json
index 8c7c362..1b8b154 100644
--- a/colors/base16-grayscale-dark.json
+++ b/colors/base16-grayscale-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Grayscale Dark",
+  "name": "base16",
+  "scheme-name": "Grayscale Dark",
   "author": "Alexandre Gavioli (https://github.com/Alexx2/)",
   "slug": "grayscale-dark",
   "slug-underscored": "grayscale_dark",
diff --git a/colors/base16-grayscale-light.json b/colors/base16-grayscale-light.json
index 22b7f75..a0f5b17 100644
--- a/colors/base16-grayscale-light.json
+++ b/colors/base16-grayscale-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Grayscale Light",
+  "name": "base16",
+  "scheme-name": "Grayscale Light",
   "author": "Alexandre Gavioli (https://github.com/Alexx2/)",
   "slug": "grayscale-light",
   "slug-underscored": "grayscale_light",
diff --git a/colors/base16-greenscreen.json b/colors/base16-greenscreen.json
index c4a8046..897a15c 100644
--- a/colors/base16-greenscreen.json
+++ b/colors/base16-greenscreen.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Green Screen",
+  "name": "base16",
+  "scheme-name": "Green Screen",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "greenscreen",
   "slug-underscored": "greenscreen",
diff --git a/colors/base16-gruber.json b/colors/base16-gruber.json
index 6518884..1261701 100644
--- a/colors/base16-gruber.json
+++ b/colors/base16-gruber.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruber",
+  "name": "base16",
+  "scheme-name": "Gruber",
   "author": "Patel, Nimai <nimai.m.patel@gmail.com>, colors from www.github.com/rexim/gruber-darker-theme",
   "slug": "gruber",
   "slug-underscored": "gruber",
diff --git a/colors/base16-gruvbox-dark-hard.json b/colors/base16-gruvbox-dark-hard.json
index 2deb508..d1b7b0f 100644
--- a/colors/base16-gruvbox-dark-hard.json
+++ b/colors/base16-gruvbox-dark-hard.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox dark, hard",
+  "name": "base16",
+  "scheme-name": "Gruvbox dark, hard",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-dark-hard",
   "slug-underscored": "gruvbox_dark_hard",
diff --git a/colors/base16-gruvbox-dark-medium.json b/colors/base16-gruvbox-dark-medium.json
index 38d7f6d..f9d26fb 100644
--- a/colors/base16-gruvbox-dark-medium.json
+++ b/colors/base16-gruvbox-dark-medium.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox dark, medium",
+  "name": "base16",
+  "scheme-name": "Gruvbox dark, medium",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-dark-medium",
   "slug-underscored": "gruvbox_dark_medium",
diff --git a/colors/base16-gruvbox-dark-pale.json b/colors/base16-gruvbox-dark-pale.json
index 255bd84..5f5b546 100644
--- a/colors/base16-gruvbox-dark-pale.json
+++ b/colors/base16-gruvbox-dark-pale.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox dark, pale",
+  "name": "base16",
+  "scheme-name": "Gruvbox dark, pale",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-dark-pale",
   "slug-underscored": "gruvbox_dark_pale",
diff --git a/colors/base16-gruvbox-dark-soft.json b/colors/base16-gruvbox-dark-soft.json
index c0fcf9d..505e5b5 100644
--- a/colors/base16-gruvbox-dark-soft.json
+++ b/colors/base16-gruvbox-dark-soft.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox dark, soft",
+  "name": "base16",
+  "scheme-name": "Gruvbox dark, soft",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-dark-soft",
   "slug-underscored": "gruvbox_dark_soft",
diff --git a/colors/base16-gruvbox-dark.json b/colors/base16-gruvbox-dark.json
index 67d2891..9241d6c 100644
--- a/colors/base16-gruvbox-dark.json
+++ b/colors/base16-gruvbox-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox dark",
+  "name": "base16",
+  "scheme-name": "Gruvbox dark",
   "author": "Tinted Theming (https://github.com/tinted-theming), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-dark",
   "slug-underscored": "gruvbox_dark",
diff --git a/colors/base16-gruvbox-light-hard.json b/colors/base16-gruvbox-light-hard.json
index 8051aa4..c77a5f9 100644
--- a/colors/base16-gruvbox-light-hard.json
+++ b/colors/base16-gruvbox-light-hard.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox light, hard",
+  "name": "base16",
+  "scheme-name": "Gruvbox light, hard",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-light-hard",
   "slug-underscored": "gruvbox_light_hard",
diff --git a/colors/base16-gruvbox-light-medium.json b/colors/base16-gruvbox-light-medium.json
index 8b05f6c..76ef208 100644
--- a/colors/base16-gruvbox-light-medium.json
+++ b/colors/base16-gruvbox-light-medium.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox light, medium",
+  "name": "base16",
+  "scheme-name": "Gruvbox light, medium",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-light-medium",
   "slug-underscored": "gruvbox_light_medium",
diff --git a/colors/base16-gruvbox-light-soft.json b/colors/base16-gruvbox-light-soft.json
index 735272f..8a9011d 100644
--- a/colors/base16-gruvbox-light-soft.json
+++ b/colors/base16-gruvbox-light-soft.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox light, soft",
+  "name": "base16",
+  "scheme-name": "Gruvbox light, soft",
   "author": "Dawid Kurek (dawikur@gmail.com), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-light-soft",
   "slug-underscored": "gruvbox_light_soft",
diff --git a/colors/base16-gruvbox-light.json b/colors/base16-gruvbox-light.json
index a732f6f..ee354c8 100644
--- a/colors/base16-gruvbox-light.json
+++ b/colors/base16-gruvbox-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Light",
+  "name": "base16",
+  "scheme-name": "Gruvbox Light",
   "author": "Tinted Theming (https://github.com/tinted-theming), morhetz (https://github.com/morhetz/gruvbox)",
   "slug": "gruvbox-light",
   "slug-underscored": "gruvbox_light",
diff --git a/colors/base16-gruvbox-material-dark-hard.json b/colors/base16-gruvbox-material-dark-hard.json
index 7334f9e..35df779 100644
--- a/colors/base16-gruvbox-material-dark-hard.json
+++ b/colors/base16-gruvbox-material-dark-hard.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Material Dark, Hard",
+  "name": "base16",
+  "scheme-name": "Gruvbox Material Dark, Hard",
   "author": "Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)",
   "slug": "gruvbox-material-dark-hard",
   "slug-underscored": "gruvbox_material_dark_hard",
diff --git a/colors/base16-gruvbox-material-dark-medium.json b/colors/base16-gruvbox-material-dark-medium.json
index b8038a5..3faebd0 100644
--- a/colors/base16-gruvbox-material-dark-medium.json
+++ b/colors/base16-gruvbox-material-dark-medium.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Material Dark, Medium",
+  "name": "base16",
+  "scheme-name": "Gruvbox Material Dark, Medium",
   "author": "Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)",
   "slug": "gruvbox-material-dark-medium",
   "slug-underscored": "gruvbox_material_dark_medium",
diff --git a/colors/base16-gruvbox-material-dark-soft.json b/colors/base16-gruvbox-material-dark-soft.json
index c9a5cec..8443a17 100644
--- a/colors/base16-gruvbox-material-dark-soft.json
+++ b/colors/base16-gruvbox-material-dark-soft.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Material Dark, Soft",
+  "name": "base16",
+  "scheme-name": "Gruvbox Material Dark, Soft",
   "author": "Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)",
   "slug": "gruvbox-material-dark-soft",
   "slug-underscored": "gruvbox_material_dark_soft",
diff --git a/colors/base16-gruvbox-material-light-hard.json b/colors/base16-gruvbox-material-light-hard.json
index 2370791..aad2bd8 100644
--- a/colors/base16-gruvbox-material-light-hard.json
+++ b/colors/base16-gruvbox-material-light-hard.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Material Light, Hard",
+  "name": "base16",
+  "scheme-name": "Gruvbox Material Light, Hard",
   "author": "Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)",
   "slug": "gruvbox-material-light-hard",
   "slug-underscored": "gruvbox_material_light_hard",
diff --git a/colors/base16-gruvbox-material-light-medium.json b/colors/base16-gruvbox-material-light-medium.json
index 3c896c1..f0cf31b 100644
--- a/colors/base16-gruvbox-material-light-medium.json
+++ b/colors/base16-gruvbox-material-light-medium.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Material Light, Medium",
+  "name": "base16",
+  "scheme-name": "Gruvbox Material Light, Medium",
   "author": "Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)",
   "slug": "gruvbox-material-light-medium",
   "slug-underscored": "gruvbox_material_light_medium",
diff --git a/colors/base16-gruvbox-material-light-soft.json b/colors/base16-gruvbox-material-light-soft.json
index 0ced195..ed26db0 100644
--- a/colors/base16-gruvbox-material-light-soft.json
+++ b/colors/base16-gruvbox-material-light-soft.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Gruvbox Material Light, Soft",
+  "name": "base16",
+  "scheme-name": "Gruvbox Material Light, Soft",
   "author": "Mayush Kumar (https://github.com/MayushKumar), sainnhe (https://github.com/sainnhe/gruvbox-material-vscode)",
   "slug": "gruvbox-material-light-soft",
   "slug-underscored": "gruvbox_material_light_soft",
diff --git a/colors/base16-hardcore.json b/colors/base16-hardcore.json
index 53b7a8f..f7f5b12 100644
--- a/colors/base16-hardcore.json
+++ b/colors/base16-hardcore.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Hardcore",
+  "name": "base16",
+  "scheme-name": "Hardcore",
   "author": "Chris Caller",
   "slug": "hardcore",
   "slug-underscored": "hardcore",
diff --git a/colors/base16-harmonic16-dark.json b/colors/base16-harmonic16-dark.json
index 43886fc..129dfaa 100644
--- a/colors/base16-harmonic16-dark.json
+++ b/colors/base16-harmonic16-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Harmonic16 Dark",
+  "name": "base16",
+  "scheme-name": "Harmonic16 Dark",
   "author": "Jannik Siebert (https://github.com/janniks)",
   "slug": "harmonic16-dark",
   "slug-underscored": "harmonic16_dark",
diff --git a/colors/base16-harmonic16-light.json b/colors/base16-harmonic16-light.json
index 4dccd2a..58119f7 100644
--- a/colors/base16-harmonic16-light.json
+++ b/colors/base16-harmonic16-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Harmonic16 Light",
+  "name": "base16",
+  "scheme-name": "Harmonic16 Light",
   "author": "Jannik Siebert (https://github.com/janniks)",
   "slug": "harmonic16-light",
   "slug-underscored": "harmonic16_light",
diff --git a/colors/base16-heetch-light.json b/colors/base16-heetch-light.json
index dfe2730..f2ecd88 100644
--- a/colors/base16-heetch-light.json
+++ b/colors/base16-heetch-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Heetch Light",
+  "name": "base16",
+  "scheme-name": "Heetch Light",
   "author": "Geoffrey Teale (tealeg@gmail.com)",
   "slug": "heetch-light",
   "slug-underscored": "heetch_light",
diff --git a/colors/base16-heetch.json b/colors/base16-heetch.json
index 24fe76c..0a89cb8 100644
--- a/colors/base16-heetch.json
+++ b/colors/base16-heetch.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Heetch Dark",
+  "name": "base16",
+  "scheme-name": "Heetch Dark",
   "author": "Geoffrey Teale (tealeg@gmail.com)",
   "slug": "heetch",
   "slug-underscored": "heetch",
diff --git a/colors/base16-helios.json b/colors/base16-helios.json
index 1c34c01..e844e46 100644
--- a/colors/base16-helios.json
+++ b/colors/base16-helios.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Helios",
+  "name": "base16",
+  "scheme-name": "Helios",
   "author": "Alex Meyer (https://github.com/reyemxela)",
   "slug": "helios",
   "slug-underscored": "helios",
diff --git a/colors/base16-hopscotch.json b/colors/base16-hopscotch.json
index bc830ee..6a225b3 100644
--- a/colors/base16-hopscotch.json
+++ b/colors/base16-hopscotch.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Hopscotch",
+  "name": "base16",
+  "scheme-name": "Hopscotch",
   "author": "Jan T. Sott",
   "slug": "hopscotch",
   "slug-underscored": "hopscotch",
diff --git a/colors/base16-horizon-dark.json b/colors/base16-horizon-dark.json
index e21107a..0aa4c01 100644
--- a/colors/base16-horizon-dark.json
+++ b/colors/base16-horizon-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Horizon Dark",
+  "name": "base16",
+  "scheme-name": "Horizon Dark",
   "author": "Michaël Ball (http://github.com/michael-ball/)",
   "slug": "horizon-dark",
   "slug-underscored": "horizon_dark",
diff --git a/colors/base16-horizon-light.json b/colors/base16-horizon-light.json
index 64b9426..800bd66 100644
--- a/colors/base16-horizon-light.json
+++ b/colors/base16-horizon-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Horizon Light",
+  "name": "base16",
+  "scheme-name": "Horizon Light",
   "author": "Michaël Ball (http://github.com/michael-ball/)",
   "slug": "horizon-light",
   "slug-underscored": "horizon_light",
diff --git a/colors/base16-horizon-terminal-dark.json b/colors/base16-horizon-terminal-dark.json
index 47c24fb..04680a1 100644
--- a/colors/base16-horizon-terminal-dark.json
+++ b/colors/base16-horizon-terminal-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Horizon Terminal Dark",
+  "name": "base16",
+  "scheme-name": "Horizon Terminal Dark",
   "author": "Michaël Ball (http://github.com/michael-ball/)",
   "slug": "horizon-terminal-dark",
   "slug-underscored": "horizon_terminal_dark",
diff --git a/colors/base16-horizon-terminal-light.json b/colors/base16-horizon-terminal-light.json
index 5d7eb5a..5dafea4 100644
--- a/colors/base16-horizon-terminal-light.json
+++ b/colors/base16-horizon-terminal-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Horizon Terminal Light",
+  "name": "base16",
+  "scheme-name": "Horizon Terminal Light",
   "author": "Michaël Ball (http://github.com/michael-ball/)",
   "slug": "horizon-terminal-light",
   "slug-underscored": "horizon_terminal_light",
diff --git a/colors/base16-humanoid-dark.json b/colors/base16-humanoid-dark.json
index b487ff5..113309d 100644
--- a/colors/base16-humanoid-dark.json
+++ b/colors/base16-humanoid-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Humanoid dark",
+  "name": "base16",
+  "scheme-name": "Humanoid dark",
   "author": "Thomas (tasmo) Friese",
   "slug": "humanoid-dark",
   "slug-underscored": "humanoid_dark",
diff --git a/colors/base16-humanoid-light.json b/colors/base16-humanoid-light.json
index 423b0f3..1695aa7 100644
--- a/colors/base16-humanoid-light.json
+++ b/colors/base16-humanoid-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Humanoid light",
+  "name": "base16",
+  "scheme-name": "Humanoid light",
   "author": "Thomas (tasmo) Friese",
   "slug": "humanoid-light",
   "slug-underscored": "humanoid_light",
diff --git a/colors/base16-ia-dark.json b/colors/base16-ia-dark.json
index ec9f6e2..ba61ae7 100644
--- a/colors/base16-ia-dark.json
+++ b/colors/base16-ia-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "iA Dark",
+  "name": "base16",
+  "scheme-name": "iA Dark",
   "author": "iA Inc. (modified by aramisgithub)",
   "slug": "ia-dark",
   "slug-underscored": "ia_dark",
diff --git a/colors/base16-ia-light.json b/colors/base16-ia-light.json
index 63c2490..76bc40a 100644
--- a/colors/base16-ia-light.json
+++ b/colors/base16-ia-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "iA Light",
+  "name": "base16",
+  "scheme-name": "iA Light",
   "author": "iA Inc. (modified by aramisgithub)",
   "slug": "ia-light",
   "slug-underscored": "ia_light",
diff --git a/colors/base16-icy.json b/colors/base16-icy.json
index 12aded2..2603fd1 100644
--- a/colors/base16-icy.json
+++ b/colors/base16-icy.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Icy Dark",
+  "name": "base16",
+  "scheme-name": "Icy Dark",
   "author": "icyphox (https://icyphox.ga)",
   "slug": "icy",
   "slug-underscored": "icy",
diff --git a/colors/base16-irblack.json b/colors/base16-irblack.json
index 1309448..11216e2 100644
--- a/colors/base16-irblack.json
+++ b/colors/base16-irblack.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "IR Black",
+  "name": "base16",
+  "scheme-name": "IR Black",
   "author": "Timothée Poisot (http://timotheepoisot.fr)",
   "slug": "irblack",
   "slug-underscored": "irblack",
diff --git a/colors/base16-isotope.json b/colors/base16-isotope.json
index 64a0109..3c03e75 100644
--- a/colors/base16-isotope.json
+++ b/colors/base16-isotope.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Isotope",
+  "name": "base16",
+  "scheme-name": "Isotope",
   "author": "Jan T. Sott",
   "slug": "isotope",
   "slug-underscored": "isotope",
diff --git a/colors/base16-jabuti.json b/colors/base16-jabuti.json
index ed3c765..e4a553e 100644
--- a/colors/base16-jabuti.json
+++ b/colors/base16-jabuti.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Jabuti",
+  "name": "base16",
+  "scheme-name": "Jabuti",
   "author": "https://github.com/notusknot",
   "slug": "jabuti",
   "slug-underscored": "jabuti",
diff --git a/colors/base16-kanagawa-dragon.json b/colors/base16-kanagawa-dragon.json
index c8cc74f..1247bf4 100644
--- a/colors/base16-kanagawa-dragon.json
+++ b/colors/base16-kanagawa-dragon.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Kanagawa Dragon",
+  "name": "base16",
+  "scheme-name": "Kanagawa Dragon",
   "author": "Tommaso Laurenzi (https://github.com/rebelot)",
   "slug": "kanagawa-dragon",
   "slug-underscored": "kanagawa_dragon",
diff --git a/colors/base16-kanagawa.json b/colors/base16-kanagawa.json
index c1b043c..84178c1 100644
--- a/colors/base16-kanagawa.json
+++ b/colors/base16-kanagawa.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Kanagawa",
+  "name": "base16",
+  "scheme-name": "Kanagawa",
   "author": "Tommaso Laurenzi (https://github.com/rebelot)",
   "slug": "kanagawa",
   "slug-underscored": "kanagawa",
diff --git a/colors/base16-katy.json b/colors/base16-katy.json
index 72ee237..f1a7ae4 100644
--- a/colors/base16-katy.json
+++ b/colors/base16-katy.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Katy",
+  "name": "base16",
+  "scheme-name": "Katy",
   "author": "George Essig (https://github.com/gessig)",
   "slug": "katy",
   "slug-underscored": "katy",
diff --git a/colors/base16-kimber.json b/colors/base16-kimber.json
index 28c2579..85c020d 100644
--- a/colors/base16-kimber.json
+++ b/colors/base16-kimber.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Kimber",
+  "name": "base16",
+  "scheme-name": "Kimber",
   "author": "Mishka Nguyen (https://github.com/akhsiM)",
   "slug": "kimber",
   "slug-underscored": "kimber",
diff --git a/colors/base16-lime.json b/colors/base16-lime.json
index e79b764..7b9012b 100644
--- a/colors/base16-lime.json
+++ b/colors/base16-lime.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "lime",
+  "name": "base16",
+  "scheme-name": "lime",
   "author": "limelier",
   "slug": "lime",
   "slug-underscored": "lime",
diff --git a/colors/base16-macintosh.json b/colors/base16-macintosh.json
index 707bdc5..76ba5f2 100644
--- a/colors/base16-macintosh.json
+++ b/colors/base16-macintosh.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Macintosh",
+  "name": "base16",
+  "scheme-name": "Macintosh",
   "author": "Rebecca Bettencourt (http://www.kreativekorp.com)",
   "slug": "macintosh",
   "slug-underscored": "macintosh",
diff --git a/colors/base16-marrakesh.json b/colors/base16-marrakesh.json
index f2f255e..f033687 100644
--- a/colors/base16-marrakesh.json
+++ b/colors/base16-marrakesh.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Marrakesh",
+  "name": "base16",
+  "scheme-name": "Marrakesh",
   "author": "Alexandre Gavioli (http://github.com/Alexx2/)",
   "slug": "marrakesh",
   "slug-underscored": "marrakesh",
diff --git a/colors/base16-materia.json b/colors/base16-materia.json
index 9616074..b1f4891 100644
--- a/colors/base16-materia.json
+++ b/colors/base16-materia.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Materia",
+  "name": "base16",
+  "scheme-name": "Materia",
   "author": "Defman21",
   "slug": "materia",
   "slug-underscored": "materia",
diff --git a/colors/base16-material-darker.json b/colors/base16-material-darker.json
index 89ac38a..59374a8 100644
--- a/colors/base16-material-darker.json
+++ b/colors/base16-material-darker.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Material Darker",
+  "name": "base16",
+  "scheme-name": "Material Darker",
   "author": "Nate Peterson",
   "slug": "material-darker",
   "slug-underscored": "material_darker",
diff --git a/colors/base16-material-lighter.json b/colors/base16-material-lighter.json
index d26728c..4edcd82 100644
--- a/colors/base16-material-lighter.json
+++ b/colors/base16-material-lighter.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Material Lighter",
+  "name": "base16",
+  "scheme-name": "Material Lighter",
   "author": "Nate Peterson",
   "slug": "material-lighter",
   "slug-underscored": "material_lighter",
diff --git a/colors/base16-material-palenight.json b/colors/base16-material-palenight.json
index a17ce0c..6da31fc 100644
--- a/colors/base16-material-palenight.json
+++ b/colors/base16-material-palenight.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Material Palenight",
+  "name": "base16",
+  "scheme-name": "Material Palenight",
   "author": "Nate Peterson",
   "slug": "material-palenight",
   "slug-underscored": "material_palenight",
diff --git a/colors/base16-material-vivid.json b/colors/base16-material-vivid.json
index 0af9b2a..92a037b 100644
--- a/colors/base16-material-vivid.json
+++ b/colors/base16-material-vivid.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Material Vivid",
+  "name": "base16",
+  "scheme-name": "Material Vivid",
   "author": "joshyrobot",
   "slug": "material-vivid",
   "slug-underscored": "material_vivid",
diff --git a/colors/base16-material.json b/colors/base16-material.json
index 545640e..c989bd2 100644
--- a/colors/base16-material.json
+++ b/colors/base16-material.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Material",
+  "name": "base16",
+  "scheme-name": "Material",
   "author": "Nate Peterson",
   "slug": "material",
   "slug-underscored": "material",
diff --git a/colors/base16-measured-dark.json b/colors/base16-measured-dark.json
index 58e33c6..54687d4 100644
--- a/colors/base16-measured-dark.json
+++ b/colors/base16-measured-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Measured Dark",
+  "name": "base16",
+  "scheme-name": "Measured Dark",
   "author": "Measured (https://measured.co)",
   "slug": "measured-dark",
   "slug-underscored": "measured_dark",
diff --git a/colors/base16-measured-light.json b/colors/base16-measured-light.json
index e0ae684..6830b12 100644
--- a/colors/base16-measured-light.json
+++ b/colors/base16-measured-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Measured Light",
+  "name": "base16",
+  "scheme-name": "Measured Light",
   "author": "Measured (https://measured.co)",
   "slug": "measured-light",
   "slug-underscored": "measured_light",
diff --git a/colors/base16-mellow-purple.json b/colors/base16-mellow-purple.json
index c3787fa..9d6c6d4 100644
--- a/colors/base16-mellow-purple.json
+++ b/colors/base16-mellow-purple.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Mellow Purple",
+  "name": "base16",
+  "scheme-name": "Mellow Purple",
   "author": "gidsi",
   "slug": "mellow-purple",
   "slug-underscored": "mellow_purple",
diff --git a/colors/base16-mexico-light.json b/colors/base16-mexico-light.json
index c760664..fc9fb89 100644
--- a/colors/base16-mexico-light.json
+++ b/colors/base16-mexico-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Mexico Light",
+  "name": "base16",
+  "scheme-name": "Mexico Light",
   "author": "Sheldon Johnson",
   "slug": "mexico-light",
   "slug-underscored": "mexico_light",
diff --git a/colors/base16-mocha.json b/colors/base16-mocha.json
index ab29bcf..9ebca4b 100644
--- a/colors/base16-mocha.json
+++ b/colors/base16-mocha.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Mocha",
+  "name": "base16",
+  "scheme-name": "Mocha",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "mocha",
   "slug-underscored": "mocha",
diff --git a/colors/base16-monokai.json b/colors/base16-monokai.json
index cf1924b..3455bd5 100644
--- a/colors/base16-monokai.json
+++ b/colors/base16-monokai.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Monokai",
+  "name": "base16",
+  "scheme-name": "Monokai",
   "author": "Wimer Hazenberg (http://www.monokai.nl)",
   "slug": "monokai",
   "slug-underscored": "monokai",
diff --git a/colors/base16-moonlight.json b/colors/base16-moonlight.json
index b022cd8..57ab64c 100644
--- a/colors/base16-moonlight.json
+++ b/colors/base16-moonlight.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Moonlight",
+  "name": "base16",
+  "scheme-name": "Moonlight",
   "author": "Jeremy Swinarton (https://github.com/jswinarton)",
   "slug": "moonlight",
   "slug-underscored": "moonlight",
diff --git a/colors/base16-mountain.json b/colors/base16-mountain.json
index 8e9a6ef..c946340 100644
--- a/colors/base16-mountain.json
+++ b/colors/base16-mountain.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Mountain",
+  "name": "base16",
+  "scheme-name": "Mountain",
   "author": "gnsfujiwara (https://github.com/gnsfujiwara)",
   "slug": "mountain",
   "slug-underscored": "mountain",
diff --git a/colors/base16-nebula.json b/colors/base16-nebula.json
index 14ae5c5..9c7a0e9 100644
--- a/colors/base16-nebula.json
+++ b/colors/base16-nebula.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Nebula",
+  "name": "base16",
+  "scheme-name": "Nebula",
   "author": "Gabriel Fontes (https://github.com/Misterio77)",
   "slug": "nebula",
   "slug-underscored": "nebula",
diff --git a/colors/base16-nord-light.json b/colors/base16-nord-light.json
index 08f3e10..3f23c0c 100644
--- a/colors/base16-nord-light.json
+++ b/colors/base16-nord-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Nord Light",
+  "name": "base16",
+  "scheme-name": "Nord Light",
   "author": "threddast, based on fuxialexander's doom-nord-light-theme (Doom Emacs)",
   "slug": "nord-light",
   "slug-underscored": "nord_light",
diff --git a/colors/base16-nord.json b/colors/base16-nord.json
index 74365cc..14676e1 100644
--- a/colors/base16-nord.json
+++ b/colors/base16-nord.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Nord",
+  "name": "base16",
+  "scheme-name": "Nord",
   "author": "arcticicestudio",
   "slug": "nord",
   "slug-underscored": "nord",
diff --git a/colors/base16-nova.json b/colors/base16-nova.json
index 55c06fb..dd9393b 100644
--- a/colors/base16-nova.json
+++ b/colors/base16-nova.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Nova",
+  "name": "base16",
+  "scheme-name": "Nova",
   "author": "George Essig (https://github.com/gessig), Trevor D. Miller (https://trevordmiller.com)",
   "slug": "nova",
   "slug-underscored": "nova",
diff --git a/colors/base16-ocean.json b/colors/base16-ocean.json
index f479fbe..e25c7b5 100644
--- a/colors/base16-ocean.json
+++ b/colors/base16-ocean.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Ocean",
+  "name": "base16",
+  "scheme-name": "Ocean",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "ocean",
   "slug-underscored": "ocean",
diff --git a/colors/base16-oceanicnext.json b/colors/base16-oceanicnext.json
index 79bc4e9..259d847 100644
--- a/colors/base16-oceanicnext.json
+++ b/colors/base16-oceanicnext.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "OceanicNext",
+  "name": "base16",
+  "scheme-name": "OceanicNext",
   "author": "https://github.com/voronianski/oceanic-next-color-scheme",
   "slug": "oceanicnext",
   "slug-underscored": "oceanicnext",
diff --git a/colors/base16-one-light.json b/colors/base16-one-light.json
index 07dd9e3..2cbe015 100644
--- a/colors/base16-one-light.json
+++ b/colors/base16-one-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "One Light",
+  "name": "base16",
+  "scheme-name": "One Light",
   "author": "Daniel Pfeifer (http://github.com/purpleKarrot)",
   "slug": "one-light",
   "slug-underscored": "one_light",
diff --git a/colors/base16-onedark-dark.json b/colors/base16-onedark-dark.json
index 1412598..8ca7ff0 100644
--- a/colors/base16-onedark-dark.json
+++ b/colors/base16-onedark-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "OneDark Dark",
+  "name": "base16",
+  "scheme-name": "OneDark Dark",
   "author": "olimorris (https://github.com/olimorris)",
   "slug": "onedark-dark",
   "slug-underscored": "onedark_dark",
diff --git a/colors/base16-onedark.json b/colors/base16-onedark.json
index f2b70f9..e4ec448 100644
--- a/colors/base16-onedark.json
+++ b/colors/base16-onedark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "OneDark",
+  "name": "base16",
+  "scheme-name": "OneDark",
   "author": "Lalit Magant (http://github.com/tilal6991)",
   "slug": "onedark",
   "slug-underscored": "onedark",
diff --git a/colors/base16-outrun-dark.json b/colors/base16-outrun-dark.json
index f399e8a..7aecdff 100644
--- a/colors/base16-outrun-dark.json
+++ b/colors/base16-outrun-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Outrun Dark",
+  "name": "base16",
+  "scheme-name": "Outrun Dark",
   "author": "Hugo Delahousse (http://github.com/hugodelahousse/)",
   "slug": "outrun-dark",
   "slug-underscored": "outrun_dark",
diff --git a/colors/base16-oxocarbon-dark.json b/colors/base16-oxocarbon-dark.json
index 32e8bcc..168e145 100644
--- a/colors/base16-oxocarbon-dark.json
+++ b/colors/base16-oxocarbon-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Oxocarbon Dark",
+  "name": "base16",
+  "scheme-name": "Oxocarbon Dark",
   "author": "shaunsingh/IBM",
   "slug": "oxocarbon-dark",
   "slug-underscored": "oxocarbon_dark",
diff --git a/colors/base16-oxocarbon-light.json b/colors/base16-oxocarbon-light.json
index 1ec1359..f59eb81 100644
--- a/colors/base16-oxocarbon-light.json
+++ b/colors/base16-oxocarbon-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Oxocarbon Light",
+  "name": "base16",
+  "scheme-name": "Oxocarbon Light",
   "author": "shaunsingh/IBM",
   "slug": "oxocarbon-light",
   "slug-underscored": "oxocarbon_light",
diff --git a/colors/base16-pandora.json b/colors/base16-pandora.json
index 4e70890..7dfccd8 100644
--- a/colors/base16-pandora.json
+++ b/colors/base16-pandora.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "pandora",
+  "name": "base16",
+  "scheme-name": "pandora",
   "author": "Cassandra Fox",
   "slug": "pandora",
   "slug-underscored": "pandora",
diff --git a/colors/base16-papercolor-dark.json b/colors/base16-papercolor-dark.json
index 0a05692..c99d4ac 100644
--- a/colors/base16-papercolor-dark.json
+++ b/colors/base16-papercolor-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "PaperColor Dark",
+  "name": "base16",
+  "scheme-name": "PaperColor Dark",
   "author": "Jon Leopard (http://github.com/jonleopard), based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme)",
   "slug": "papercolor-dark",
   "slug-underscored": "papercolor_dark",
diff --git a/colors/base16-papercolor-light.json b/colors/base16-papercolor-light.json
index cdd6350..4ca33af 100644
--- a/colors/base16-papercolor-light.json
+++ b/colors/base16-papercolor-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "PaperColor Light",
+  "name": "base16",
+  "scheme-name": "PaperColor Light",
   "author": "Jon Leopard (http://github.com/jonleopard), based on PaperColor Theme (https://github.com/NLKNguyen/papercolor-theme)",
   "slug": "papercolor-light",
   "slug-underscored": "papercolor_light",
diff --git a/colors/base16-paraiso.json b/colors/base16-paraiso.json
index 980a021..1e9a7c9 100644
--- a/colors/base16-paraiso.json
+++ b/colors/base16-paraiso.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Paraiso",
+  "name": "base16",
+  "scheme-name": "Paraiso",
   "author": "Jan T. Sott",
   "slug": "paraiso",
   "slug-underscored": "paraiso",
diff --git a/colors/base16-pasque.json b/colors/base16-pasque.json
index 88f4c39..2e260df 100644
--- a/colors/base16-pasque.json
+++ b/colors/base16-pasque.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Pasque",
+  "name": "base16",
+  "scheme-name": "Pasque",
   "author": "Gabriel Fontes (https://github.com/Misterio77)",
   "slug": "pasque",
   "slug-underscored": "pasque",
diff --git a/colors/base16-penumbra-dark-contrast-plus-plus.json b/colors/base16-penumbra-dark-contrast-plus-plus.json
index 97b4ada..7170f01 100644
--- a/colors/base16-penumbra-dark-contrast-plus-plus.json
+++ b/colors/base16-penumbra-dark-contrast-plus-plus.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Penumbra Dark Contrast Plus Plus",
+  "name": "base16",
+  "scheme-name": "Penumbra Dark Contrast Plus Plus",
   "author": "Zachary Weiss (https://github.com/zacharyweiss)",
   "slug": "penumbra-dark-contrast-plus-plus",
   "slug-underscored": "penumbra_dark_contrast_plus_plus",
diff --git a/colors/base16-penumbra-dark-contrast-plus.json b/colors/base16-penumbra-dark-contrast-plus.json
index 6ed3148..f050dd4 100644
--- a/colors/base16-penumbra-dark-contrast-plus.json
+++ b/colors/base16-penumbra-dark-contrast-plus.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Penumbra Dark Contrast Plus",
+  "name": "base16",
+  "scheme-name": "Penumbra Dark Contrast Plus",
   "author": "Zachary Weiss (https://github.com/zacharyweiss)",
   "slug": "penumbra-dark-contrast-plus",
   "slug-underscored": "penumbra_dark_contrast_plus",
diff --git a/colors/base16-penumbra-dark.json b/colors/base16-penumbra-dark.json
index 46cba11..5e56856 100644
--- a/colors/base16-penumbra-dark.json
+++ b/colors/base16-penumbra-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Penumbra Dark",
+  "name": "base16",
+  "scheme-name": "Penumbra Dark",
   "author": "Zachary Weiss (https://github.com/zacharyweiss)",
   "slug": "penumbra-dark",
   "slug-underscored": "penumbra_dark",
diff --git a/colors/base16-penumbra-light-contrast-plus-plus.json b/colors/base16-penumbra-light-contrast-plus-plus.json
index 5faf050..0d9d92d 100644
--- a/colors/base16-penumbra-light-contrast-plus-plus.json
+++ b/colors/base16-penumbra-light-contrast-plus-plus.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Penumbra Light Contrast Plus Plus",
+  "name": "base16",
+  "scheme-name": "Penumbra Light Contrast Plus Plus",
   "author": "Zachary Weiss (https://github.com/zacharyweiss)",
   "slug": "penumbra-light-contrast-plus-plus",
   "slug-underscored": "penumbra_light_contrast_plus_plus",
diff --git a/colors/base16-penumbra-light-contrast-plus.json b/colors/base16-penumbra-light-contrast-plus.json
index 8982952..5ba1b02 100644
--- a/colors/base16-penumbra-light-contrast-plus.json
+++ b/colors/base16-penumbra-light-contrast-plus.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Penumbra Light Contrast Plus",
+  "name": "base16",
+  "scheme-name": "Penumbra Light Contrast Plus",
   "author": "Zachary Weiss (https://github.com/zacharyweiss)",
   "slug": "penumbra-light-contrast-plus",
   "slug-underscored": "penumbra_light_contrast_plus",
diff --git a/colors/base16-penumbra-light.json b/colors/base16-penumbra-light.json
index 96f0726..fc06cb3 100644
--- a/colors/base16-penumbra-light.json
+++ b/colors/base16-penumbra-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Penumbra Light",
+  "name": "base16",
+  "scheme-name": "Penumbra Light",
   "author": "Zachary Weiss (https://github.com/zacharyweiss)",
   "slug": "penumbra-light",
   "slug-underscored": "penumbra_light",
diff --git a/colors/base16-phd.json b/colors/base16-phd.json
index e2493bd..4acbe33 100644
--- a/colors/base16-phd.json
+++ b/colors/base16-phd.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "PhD",
+  "name": "base16",
+  "scheme-name": "PhD",
   "author": "Hennig Hasemann (http://leetless.de/vim.html)",
   "slug": "phd",
   "slug-underscored": "phd",
diff --git a/colors/base16-pico.json b/colors/base16-pico.json
index 5321d94..4691b03 100644
--- a/colors/base16-pico.json
+++ b/colors/base16-pico.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Pico",
+  "name": "base16",
+  "scheme-name": "Pico",
   "author": "PICO-8 (http://www.lexaloffle.com/pico-8.php)",
   "slug": "pico",
   "slug-underscored": "pico",
diff --git a/colors/base16-pinky.json b/colors/base16-pinky.json
index ad4d711..be44dab 100644
--- a/colors/base16-pinky.json
+++ b/colors/base16-pinky.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "pinky",
+  "name": "base16",
+  "scheme-name": "pinky",
   "author": "Benjamin (https://github.com/b3nj5m1n)",
   "slug": "pinky",
   "slug-underscored": "pinky",
diff --git a/colors/base16-pop.json b/colors/base16-pop.json
index f5aa1a0..e4a037c 100644
--- a/colors/base16-pop.json
+++ b/colors/base16-pop.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Pop",
+  "name": "base16",
+  "scheme-name": "Pop",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "pop",
   "slug-underscored": "pop",
diff --git a/colors/base16-porple.json b/colors/base16-porple.json
index 8abd05b..623ec27 100644
--- a/colors/base16-porple.json
+++ b/colors/base16-porple.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Porple",
+  "name": "base16",
+  "scheme-name": "Porple",
   "author": "Niek den Breeje (https://github.com/AuditeMarlow)",
   "slug": "porple",
   "slug-underscored": "porple",
diff --git a/colors/base16-precious-dark-eleven.json b/colors/base16-precious-dark-eleven.json
index 0057985..2b1ee85 100644
--- a/colors/base16-precious-dark-eleven.json
+++ b/colors/base16-precious-dark-eleven.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Precious Dark Eleven",
+  "name": "base16",
+  "scheme-name": "Precious Dark Eleven",
   "author": "4lex4 <4lex49@zoho.com>",
   "slug": "precious-dark-eleven",
   "slug-underscored": "precious_dark_eleven",
diff --git a/colors/base16-precious-dark-fifteen.json b/colors/base16-precious-dark-fifteen.json
index 63b3caa..fe3e576 100644
--- a/colors/base16-precious-dark-fifteen.json
+++ b/colors/base16-precious-dark-fifteen.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Precious Dark Fifteen",
+  "name": "base16",
+  "scheme-name": "Precious Dark Fifteen",
   "author": "4lex4 <4lex49@zoho.com>",
   "slug": "precious-dark-fifteen",
   "slug-underscored": "precious_dark_fifteen",
diff --git a/colors/base16-precious-light-warm.json b/colors/base16-precious-light-warm.json
index 7c37980..ff35232 100644
--- a/colors/base16-precious-light-warm.json
+++ b/colors/base16-precious-light-warm.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Precious Light Warm",
+  "name": "base16",
+  "scheme-name": "Precious Light Warm",
   "author": "4lex4 <4lex49@zoho.com>",
   "slug": "precious-light-warm",
   "slug-underscored": "precious_light_warm",
diff --git a/colors/base16-precious-light-white.json b/colors/base16-precious-light-white.json
index 057efbc..19f6d83 100644
--- a/colors/base16-precious-light-white.json
+++ b/colors/base16-precious-light-white.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Precious Light White",
+  "name": "base16",
+  "scheme-name": "Precious Light White",
   "author": "4lex4 <4lex49@zoho.com>",
   "slug": "precious-light-white",
   "slug-underscored": "precious_light_white",
diff --git a/colors/base16-primer-dark-dimmed.json b/colors/base16-primer-dark-dimmed.json
index 3591194..c5d95a7 100644
--- a/colors/base16-primer-dark-dimmed.json
+++ b/colors/base16-primer-dark-dimmed.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Primer Dark Dimmed",
+  "name": "base16",
+  "scheme-name": "Primer Dark Dimmed",
   "author": "Jimmy Lin",
   "slug": "primer-dark-dimmed",
   "slug-underscored": "primer_dark_dimmed",
diff --git a/colors/base16-primer-dark.json b/colors/base16-primer-dark.json
index fdf0a75..8621016 100644
--- a/colors/base16-primer-dark.json
+++ b/colors/base16-primer-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Primer Dark",
+  "name": "base16",
+  "scheme-name": "Primer Dark",
   "author": "Jimmy Lin",
   "slug": "primer-dark",
   "slug-underscored": "primer_dark",
diff --git a/colors/base16-primer-light.json b/colors/base16-primer-light.json
index 2745b74..dee850e 100644
--- a/colors/base16-primer-light.json
+++ b/colors/base16-primer-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Primer Light",
+  "name": "base16",
+  "scheme-name": "Primer Light",
   "author": "Jimmy Lin",
   "slug": "primer-light",
   "slug-underscored": "primer_light",
diff --git a/colors/base16-purpledream.json b/colors/base16-purpledream.json
index 1e6fdf6..7ca604e 100644
--- a/colors/base16-purpledream.json
+++ b/colors/base16-purpledream.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Purpledream",
+  "name": "base16",
+  "scheme-name": "Purpledream",
   "author": "malet",
   "slug": "purpledream",
   "slug-underscored": "purpledream",
diff --git a/colors/base16-qualia.json b/colors/base16-qualia.json
index be7cd0a..c0be211 100644
--- a/colors/base16-qualia.json
+++ b/colors/base16-qualia.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Qualia",
+  "name": "base16",
+  "scheme-name": "Qualia",
   "author": "isaacwhanson",
   "slug": "qualia",
   "slug-underscored": "qualia",
diff --git a/colors/base16-railscasts.json b/colors/base16-railscasts.json
index 80ebedb..2fb1d5d 100644
--- a/colors/base16-railscasts.json
+++ b/colors/base16-railscasts.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Railscasts",
+  "name": "base16",
+  "scheme-name": "Railscasts",
   "author": "Ryan Bates (http://railscasts.com)",
   "slug": "railscasts",
   "slug-underscored": "railscasts",
diff --git a/colors/base16-rebecca.json b/colors/base16-rebecca.json
index 635ee9b..1adac2b 100644
--- a/colors/base16-rebecca.json
+++ b/colors/base16-rebecca.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Rebecca",
+  "name": "base16",
+  "scheme-name": "Rebecca",
   "author": "Victor Borja (http://github.com/vic) based on Rebecca Theme (http://github.com/vic/rebecca-theme)",
   "slug": "rebecca",
   "slug-underscored": "rebecca",
diff --git a/colors/base16-rose-pine-dawn.json b/colors/base16-rose-pine-dawn.json
index a0b75ab..3b3bef2 100644
--- a/colors/base16-rose-pine-dawn.json
+++ b/colors/base16-rose-pine-dawn.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Rosé Pine Dawn",
+  "name": "base16",
+  "scheme-name": "Rosé Pine Dawn",
   "author": "Emilia Dunfelt <edun@dunfelt.se>",
   "slug": "rose-pine-dawn",
   "slug-underscored": "rose_pine_dawn",
diff --git a/colors/base16-rose-pine-moon.json b/colors/base16-rose-pine-moon.json
index 7697abc..61b667d 100644
--- a/colors/base16-rose-pine-moon.json
+++ b/colors/base16-rose-pine-moon.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Rosé Pine Moon",
+  "name": "base16",
+  "scheme-name": "Rosé Pine Moon",
   "author": "Emilia Dunfelt <edun@dunfelt.se>",
   "slug": "rose-pine-moon",
   "slug-underscored": "rose_pine_moon",
diff --git a/colors/base16-rose-pine.json b/colors/base16-rose-pine.json
index f152e64..82a3812 100644
--- a/colors/base16-rose-pine.json
+++ b/colors/base16-rose-pine.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Rosé Pine",
+  "name": "base16",
+  "scheme-name": "Rosé Pine",
   "author": "Emilia Dunfelt <edun@dunfelt.se>",
   "slug": "rose-pine",
   "slug-underscored": "rose_pine",
diff --git a/colors/base16-saga.json b/colors/base16-saga.json
index 285d05d..55c2a04 100644
--- a/colors/base16-saga.json
+++ b/colors/base16-saga.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "SAGA",
+  "name": "base16",
+  "scheme-name": "SAGA",
   "author": "https://github.com/SAGAtheme/SAGA",
   "slug": "saga",
   "slug-underscored": "saga",
diff --git a/colors/base16-sagelight.json b/colors/base16-sagelight.json
index 9378fe0..75ab283 100644
--- a/colors/base16-sagelight.json
+++ b/colors/base16-sagelight.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Sagelight",
+  "name": "base16",
+  "scheme-name": "Sagelight",
   "author": "Carter Veldhuizen",
   "slug": "sagelight",
   "slug-underscored": "sagelight",
diff --git a/colors/base16-sakura.json b/colors/base16-sakura.json
index be08f7e..8a182d9 100644
--- a/colors/base16-sakura.json
+++ b/colors/base16-sakura.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Sakura",
+  "name": "base16",
+  "scheme-name": "Sakura",
   "author": "Misterio77 (http://github.com/Misterio77)",
   "slug": "sakura",
   "slug-underscored": "sakura",
diff --git a/colors/base16-sandcastle.json b/colors/base16-sandcastle.json
index 5e677b8..0bd5102 100644
--- a/colors/base16-sandcastle.json
+++ b/colors/base16-sandcastle.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Sandcastle",
+  "name": "base16",
+  "scheme-name": "Sandcastle",
   "author": "George Essig (https://github.com/gessig)",
   "slug": "sandcastle",
   "slug-underscored": "sandcastle",
diff --git a/colors/base16-selenized-black.json b/colors/base16-selenized-black.json
index 7f81efd..28273bb 100644
--- a/colors/base16-selenized-black.json
+++ b/colors/base16-selenized-black.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "selenized-black",
+  "name": "base16",
+  "scheme-name": "selenized-black",
   "author": "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali",
   "slug": "selenized-black",
   "slug-underscored": "selenized_black",
diff --git a/colors/base16-selenized-dark.json b/colors/base16-selenized-dark.json
index 23e711f..bc4cd19 100644
--- a/colors/base16-selenized-dark.json
+++ b/colors/base16-selenized-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "selenized-dark",
+  "name": "base16",
+  "scheme-name": "selenized-dark",
   "author": "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali",
   "slug": "selenized-dark",
   "slug-underscored": "selenized_dark",
diff --git a/colors/base16-selenized-light.json b/colors/base16-selenized-light.json
index b580481..79f4bc1 100644
--- a/colors/base16-selenized-light.json
+++ b/colors/base16-selenized-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "selenized-light",
+  "name": "base16",
+  "scheme-name": "selenized-light",
   "author": "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali",
   "slug": "selenized-light",
   "slug-underscored": "selenized_light",
diff --git a/colors/base16-selenized-white.json b/colors/base16-selenized-white.json
index 7625f01..aaf5a28 100644
--- a/colors/base16-selenized-white.json
+++ b/colors/base16-selenized-white.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "selenized-white",
+  "name": "base16",
+  "scheme-name": "selenized-white",
   "author": "Jan Warchol (https://github.com/jan-warchol/selenized) / adapted to base16 by ali",
   "slug": "selenized-white",
   "slug-underscored": "selenized_white",
diff --git a/colors/base16-seti.json b/colors/base16-seti.json
index 3f29e3a..721b0bf 100644
--- a/colors/base16-seti.json
+++ b/colors/base16-seti.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Seti UI",
+  "name": "base16",
+  "scheme-name": "Seti UI",
   "author": "",
   "slug": "seti",
   "slug-underscored": "seti",
diff --git a/colors/base16-shades-of-purple.json b/colors/base16-shades-of-purple.json
index a0c899c..4507c0b 100644
--- a/colors/base16-shades-of-purple.json
+++ b/colors/base16-shades-of-purple.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Shades of Purple",
+  "name": "base16",
+  "scheme-name": "Shades of Purple",
   "author": "Iolar Demartini Junior (http://github.com/demartini), based on Shades of Purple Theme (https://github.com/ahmadawais/shades-of-purple-vscode)",
   "slug": "shades-of-purple",
   "slug-underscored": "shades_of_purple",
diff --git a/colors/base16-shadesmear-dark.json b/colors/base16-shadesmear-dark.json
index 9a02fc1..2b16612 100644
--- a/colors/base16-shadesmear-dark.json
+++ b/colors/base16-shadesmear-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "ShadeSmear Dark",
+  "name": "base16",
+  "scheme-name": "ShadeSmear Dark",
   "author": "Kyle Giammarco (http://kyle.giammar.co)",
   "slug": "shadesmear-dark",
   "slug-underscored": "shadesmear_dark",
diff --git a/colors/base16-shadesmear-light.json b/colors/base16-shadesmear-light.json
index 03e4f0d..4662096 100644
--- a/colors/base16-shadesmear-light.json
+++ b/colors/base16-shadesmear-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "ShadeSmear Light",
+  "name": "base16",
+  "scheme-name": "ShadeSmear Light",
   "author": "Kyle Giammarco (http://kyle.giammar.co)",
   "slug": "shadesmear-light",
   "slug-underscored": "shadesmear_light",
diff --git a/colors/base16-shapeshifter.json b/colors/base16-shapeshifter.json
index 294e43d..525bd29 100644
--- a/colors/base16-shapeshifter.json
+++ b/colors/base16-shapeshifter.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Shapeshifter",
+  "name": "base16",
+  "scheme-name": "Shapeshifter",
   "author": "Tyler Benziger (http://tybenz.com)",
   "slug": "shapeshifter",
   "slug-underscored": "shapeshifter",
diff --git a/colors/base16-silk-dark.json b/colors/base16-silk-dark.json
index da6f853..4341660 100644
--- a/colors/base16-silk-dark.json
+++ b/colors/base16-silk-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Silk Dark",
+  "name": "base16",
+  "scheme-name": "Silk Dark",
   "author": "Gabriel Fontes (https://github.com/Misterio77)",
   "slug": "silk-dark",
   "slug-underscored": "silk_dark",
diff --git a/colors/base16-silk-light.json b/colors/base16-silk-light.json
index c885fcd..19ede4d 100644
--- a/colors/base16-silk-light.json
+++ b/colors/base16-silk-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Silk Light",
+  "name": "base16",
+  "scheme-name": "Silk Light",
   "author": "Gabriel Fontes (https://github.com/Misterio77)",
   "slug": "silk-light",
   "slug-underscored": "silk_light",
diff --git a/colors/base16-snazzy.json b/colors/base16-snazzy.json
index dda1f12..90e693c 100644
--- a/colors/base16-snazzy.json
+++ b/colors/base16-snazzy.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Snazzy",
+  "name": "base16",
+  "scheme-name": "Snazzy",
   "author": "Chawye Hsu (https://github.com/chawyehsu), based on Hyper Snazzy Theme (https://github.com/sindresorhus/hyper-snazzy)",
   "slug": "snazzy",
   "slug-underscored": "snazzy",
diff --git a/colors/base16-solarflare-light.json b/colors/base16-solarflare-light.json
index 0efd00f..88cf29b 100644
--- a/colors/base16-solarflare-light.json
+++ b/colors/base16-solarflare-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Solar Flare Light",
+  "name": "base16",
+  "scheme-name": "Solar Flare Light",
   "author": "Chuck Harmston (https://chuck.harmston.ch)",
   "slug": "solarflare-light",
   "slug-underscored": "solarflare_light",
diff --git a/colors/base16-solarflare.json b/colors/base16-solarflare.json
index 7fe14ed..9987c27 100644
--- a/colors/base16-solarflare.json
+++ b/colors/base16-solarflare.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Solar Flare",
+  "name": "base16",
+  "scheme-name": "Solar Flare",
   "author": "Chuck Harmston (https://chuck.harmston.ch)",
   "slug": "solarflare",
   "slug-underscored": "solarflare",
diff --git a/colors/base16-solarized-dark.json b/colors/base16-solarized-dark.json
index 24d2605..7bbd2a0 100644
--- a/colors/base16-solarized-dark.json
+++ b/colors/base16-solarized-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Solarized Dark",
+  "name": "base16",
+  "scheme-name": "Solarized Dark",
   "author": "Ethan Schoonover (modified by aramisgithub)",
   "slug": "solarized-dark",
   "slug-underscored": "solarized_dark",
diff --git a/colors/base16-solarized-light.json b/colors/base16-solarized-light.json
index 8896a74..5ebf7ee 100644
--- a/colors/base16-solarized-light.json
+++ b/colors/base16-solarized-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Solarized Light",
+  "name": "base16",
+  "scheme-name": "Solarized Light",
   "author": "Ethan Schoonover (modified by aramisgithub)",
   "slug": "solarized-light",
   "slug-underscored": "solarized_light",
diff --git a/colors/base16-spaceduck.json b/colors/base16-spaceduck.json
index 6a30756..f8f06e8 100644
--- a/colors/base16-spaceduck.json
+++ b/colors/base16-spaceduck.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Spaceduck",
+  "name": "base16",
+  "scheme-name": "Spaceduck",
   "author": "Guillermo Rodriguez (https://github.com/pineapplegiant), packaged by Gabriel Fontes (https://github.com/Misterio77)",
   "slug": "spaceduck",
   "slug-underscored": "spaceduck",
diff --git a/colors/base16-spacemacs.json b/colors/base16-spacemacs.json
index 37a9cfa..899cf2e 100644
--- a/colors/base16-spacemacs.json
+++ b/colors/base16-spacemacs.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Spacemacs",
+  "name": "base16",
+  "scheme-name": "Spacemacs",
   "author": "Nasser Alshammari (https://github.com/nashamri/spacemacs-theme)",
   "slug": "spacemacs",
   "slug-underscored": "spacemacs",
diff --git a/colors/base16-sparky.json b/colors/base16-sparky.json
index 1c1b423..ce11342 100644
--- a/colors/base16-sparky.json
+++ b/colors/base16-sparky.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Sparky",
+  "name": "base16",
+  "scheme-name": "Sparky",
   "author": "Leila Sother (https://github.com/mixcoac)",
   "slug": "sparky",
   "slug-underscored": "sparky",
diff --git a/colors/base16-standardized-dark.json b/colors/base16-standardized-dark.json
index 7292275..7755a6f 100644
--- a/colors/base16-standardized-dark.json
+++ b/colors/base16-standardized-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "standardized-dark",
+  "name": "base16",
+  "scheme-name": "standardized-dark",
   "author": "ali (https://github.com/ali-githb/base16-standardized-scheme)",
   "slug": "standardized-dark",
   "slug-underscored": "standardized_dark",
diff --git a/colors/base16-standardized-light.json b/colors/base16-standardized-light.json
index b59ec2b..3f9825b 100644
--- a/colors/base16-standardized-light.json
+++ b/colors/base16-standardized-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "standardized-light",
+  "name": "base16",
+  "scheme-name": "standardized-light",
   "author": "ali (https://github.com/ali-githb/base16-standardized-scheme)",
   "slug": "standardized-light",
   "slug-underscored": "standardized_light",
diff --git a/colors/base16-stella.json b/colors/base16-stella.json
index ebcb1a5..71c0866 100644
--- a/colors/base16-stella.json
+++ b/colors/base16-stella.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Stella",
+  "name": "base16",
+  "scheme-name": "Stella",
   "author": "Shrimpram",
   "slug": "stella",
   "slug-underscored": "stella",
diff --git a/colors/base16-still-alive.json b/colors/base16-still-alive.json
index a5b98c3..11b0fd2 100644
--- a/colors/base16-still-alive.json
+++ b/colors/base16-still-alive.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Still Alive",
+  "name": "base16",
+  "scheme-name": "Still Alive",
   "author": "Derrick McKee (derrick.mckee@gmail.com)",
   "slug": "still-alive",
   "slug-underscored": "still_alive",
diff --git a/colors/base16-summercamp.json b/colors/base16-summercamp.json
index 154ac79..aaaccba 100644
--- a/colors/base16-summercamp.json
+++ b/colors/base16-summercamp.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "summercamp",
+  "name": "base16",
+  "scheme-name": "summercamp",
   "author": "zoe firi (zoefiri.github.io)",
   "slug": "summercamp",
   "slug-underscored": "summercamp",
diff --git a/colors/base16-summerfruit-dark.json b/colors/base16-summerfruit-dark.json
index 83d6f2b..e055f1c 100644
--- a/colors/base16-summerfruit-dark.json
+++ b/colors/base16-summerfruit-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Summerfruit Dark",
+  "name": "base16",
+  "scheme-name": "Summerfruit Dark",
   "author": "Christopher Corley (http://christop.club/)",
   "slug": "summerfruit-dark",
   "slug-underscored": "summerfruit_dark",
diff --git a/colors/base16-summerfruit-light.json b/colors/base16-summerfruit-light.json
index 65190a7..18e490c 100644
--- a/colors/base16-summerfruit-light.json
+++ b/colors/base16-summerfruit-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Summerfruit Light",
+  "name": "base16",
+  "scheme-name": "Summerfruit Light",
   "author": "Christopher Corley (http://christop.club/)",
   "slug": "summerfruit-light",
   "slug-underscored": "summerfruit_light",
diff --git a/colors/base16-synth-midnight-dark.json b/colors/base16-synth-midnight-dark.json
index 54f85d5..bcd2f8d 100644
--- a/colors/base16-synth-midnight-dark.json
+++ b/colors/base16-synth-midnight-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Synth Midnight Terminal Dark",
+  "name": "base16",
+  "scheme-name": "Synth Midnight Terminal Dark",
   "author": "Michaël Ball (http://github.com/michael-ball/)",
   "slug": "synth-midnight-dark",
   "slug-underscored": "synth_midnight_dark",
diff --git a/colors/base16-synth-midnight-light.json b/colors/base16-synth-midnight-light.json
index 1ca4453..7a46d1a 100644
--- a/colors/base16-synth-midnight-light.json
+++ b/colors/base16-synth-midnight-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Synth Midnight Terminal Light",
+  "name": "base16",
+  "scheme-name": "Synth Midnight Terminal Light",
   "author": "Michaël Ball (http://github.com/michael-ball/)",
   "slug": "synth-midnight-light",
   "slug-underscored": "synth_midnight_light",
diff --git a/colors/base16-tango.json b/colors/base16-tango.json
index 276a890..de392dd 100644
--- a/colors/base16-tango.json
+++ b/colors/base16-tango.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tango",
+  "name": "base16",
+  "scheme-name": "Tango",
   "author": "@Schnouki, based on the Tango Desktop Project",
   "slug": "tango",
   "slug-underscored": "tango",
diff --git a/colors/base16-tarot.json b/colors/base16-tarot.json
index e6db6d9..b598c66 100644
--- a/colors/base16-tarot.json
+++ b/colors/base16-tarot.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "tarot",
+  "name": "base16",
+  "scheme-name": "tarot",
   "author": "ed (https://codeberg.org/ed)",
   "slug": "tarot",
   "slug-underscored": "tarot",
diff --git a/colors/base16-tender.json b/colors/base16-tender.json
index 5650719..8f74a59 100644
--- a/colors/base16-tender.json
+++ b/colors/base16-tender.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "tender",
+  "name": "base16",
+  "scheme-name": "tender",
   "author": "Jacobo Tabernero (https://github/com/jacoborus/tender.vim)",
   "slug": "tender",
   "slug-underscored": "tender",
diff --git a/colors/base16-terracotta-dark.json b/colors/base16-terracotta-dark.json
index b0db279..c3e725c 100644
--- a/colors/base16-terracotta-dark.json
+++ b/colors/base16-terracotta-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Terracotta Dark",
+  "name": "base16",
+  "scheme-name": "Terracotta Dark",
   "author": "Alexander Rossell Hayes (https://github.com/rossellhayes)",
   "slug": "terracotta-dark",
   "slug-underscored": "terracotta_dark",
diff --git a/colors/base16-terracotta.json b/colors/base16-terracotta.json
index de56d7d..ffd4c70 100644
--- a/colors/base16-terracotta.json
+++ b/colors/base16-terracotta.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Terracotta",
+  "name": "base16",
+  "scheme-name": "Terracotta",
   "author": "Alexander Rossell Hayes (https://github.com/rossellhayes)",
   "slug": "terracotta",
   "slug-underscored": "terracotta",
diff --git a/colors/base16-tokyo-city-dark.json b/colors/base16-tokyo-city-dark.json
index 579850b..9ffe345 100644
--- a/colors/base16-tokyo-city-dark.json
+++ b/colors/base16-tokyo-city-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo City Dark",
+  "name": "base16",
+  "scheme-name": "Tokyo City Dark",
   "author": "Michaël Ball",
   "slug": "tokyo-city-dark",
   "slug-underscored": "tokyo_city_dark",
diff --git a/colors/base16-tokyo-city-light.json b/colors/base16-tokyo-city-light.json
index 04e9eea..331b64f 100644
--- a/colors/base16-tokyo-city-light.json
+++ b/colors/base16-tokyo-city-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo City Light",
+  "name": "base16",
+  "scheme-name": "Tokyo City Light",
   "author": "Michaël Ball",
   "slug": "tokyo-city-light",
   "slug-underscored": "tokyo_city_light",
diff --git a/colors/base16-tokyo-city-terminal-dark.json b/colors/base16-tokyo-city-terminal-dark.json
index 16a20b0..68ad26b 100644
--- a/colors/base16-tokyo-city-terminal-dark.json
+++ b/colors/base16-tokyo-city-terminal-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo City Terminal Dark",
+  "name": "base16",
+  "scheme-name": "Tokyo City Terminal Dark",
   "author": "Michaël Ball",
   "slug": "tokyo-city-terminal-dark",
   "slug-underscored": "tokyo_city_terminal_dark",
diff --git a/colors/base16-tokyo-city-terminal-light.json b/colors/base16-tokyo-city-terminal-light.json
index 7e74a6a..aab05f8 100644
--- a/colors/base16-tokyo-city-terminal-light.json
+++ b/colors/base16-tokyo-city-terminal-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo City Terminal Light",
+  "name": "base16",
+  "scheme-name": "Tokyo City Terminal Light",
   "author": "Michaël Ball",
   "slug": "tokyo-city-terminal-light",
   "slug-underscored": "tokyo_city_terminal_light",
diff --git a/colors/base16-tokyo-night-dark.json b/colors/base16-tokyo-night-dark.json
index b9a0940..08c66e8 100644
--- a/colors/base16-tokyo-night-dark.json
+++ b/colors/base16-tokyo-night-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Dark",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Dark",
   "author": "Michaël Ball",
   "slug": "tokyo-night-dark",
   "slug-underscored": "tokyo_night_dark",
diff --git a/colors/base16-tokyo-night-light.json b/colors/base16-tokyo-night-light.json
index 6697f7a..e9d2e0f 100644
--- a/colors/base16-tokyo-night-light.json
+++ b/colors/base16-tokyo-night-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Light",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Light",
   "author": "Michaël Ball",
   "slug": "tokyo-night-light",
   "slug-underscored": "tokyo_night_light",
diff --git a/colors/base16-tokyo-night-moon.json b/colors/base16-tokyo-night-moon.json
index 4e44799..3de1b5a 100644
--- a/colors/base16-tokyo-night-moon.json
+++ b/colors/base16-tokyo-night-moon.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Moon",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Moon",
   "author": "Ólafur Bjarki Bogason",
   "slug": "tokyo-night-moon",
   "slug-underscored": "tokyo_night_moon",
diff --git a/colors/base16-tokyo-night-storm.json b/colors/base16-tokyo-night-storm.json
index c6a7351..77db9b4 100644
--- a/colors/base16-tokyo-night-storm.json
+++ b/colors/base16-tokyo-night-storm.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Storm",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Storm",
   "author": "Michaël Ball",
   "slug": "tokyo-night-storm",
   "slug-underscored": "tokyo_night_storm",
diff --git a/colors/base16-tokyo-night-terminal-dark.json b/colors/base16-tokyo-night-terminal-dark.json
index 8f69764..cb4c83f 100644
--- a/colors/base16-tokyo-night-terminal-dark.json
+++ b/colors/base16-tokyo-night-terminal-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Terminal Dark",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Terminal Dark",
   "author": "Michaël Ball",
   "slug": "tokyo-night-terminal-dark",
   "slug-underscored": "tokyo_night_terminal_dark",
diff --git a/colors/base16-tokyo-night-terminal-light.json b/colors/base16-tokyo-night-terminal-light.json
index 0bcfd17..245a302 100644
--- a/colors/base16-tokyo-night-terminal-light.json
+++ b/colors/base16-tokyo-night-terminal-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Terminal Light",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Terminal Light",
   "author": "Michaël Ball",
   "slug": "tokyo-night-terminal-light",
   "slug-underscored": "tokyo_night_terminal_light",
diff --git a/colors/base16-tokyo-night-terminal-storm.json b/colors/base16-tokyo-night-terminal-storm.json
index 37a1706..d35b724 100644
--- a/colors/base16-tokyo-night-terminal-storm.json
+++ b/colors/base16-tokyo-night-terminal-storm.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyo Night Terminal Storm",
+  "name": "base16",
+  "scheme-name": "Tokyo Night Terminal Storm",
   "author": "Michaël Ball",
   "slug": "tokyo-night-terminal-storm",
   "slug-underscored": "tokyo_night_terminal_storm",
diff --git a/colors/base16-tokyodark-terminal.json b/colors/base16-tokyodark-terminal.json
index 4064e59..cd0e359 100644
--- a/colors/base16-tokyodark-terminal.json
+++ b/colors/base16-tokyodark-terminal.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyodark Terminal",
+  "name": "base16",
+  "scheme-name": "Tokyodark Terminal",
   "author": "Tiagovla (https://github.com/tiagovla/)",
   "slug": "tokyodark-terminal",
   "slug-underscored": "tokyodark_terminal",
diff --git a/colors/base16-tokyodark.json b/colors/base16-tokyodark.json
index 6635d3f..357f52b 100644
--- a/colors/base16-tokyodark.json
+++ b/colors/base16-tokyodark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tokyodark",
+  "name": "base16",
+  "scheme-name": "Tokyodark",
   "author": "Jamy Golden (https://github.com/JamyGolden), Based on Tokyodark.nvim (https://github.com/tiagovla/tokyodark.nvim)",
   "slug": "tokyodark",
   "slug-underscored": "tokyodark",
diff --git a/colors/base16-tomorrow-night-eighties.json b/colors/base16-tomorrow-night-eighties.json
index 999ae4d..4079b72 100644
--- a/colors/base16-tomorrow-night-eighties.json
+++ b/colors/base16-tomorrow-night-eighties.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tomorrow Night Eighties",
+  "name": "base16",
+  "scheme-name": "Tomorrow Night Eighties",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "tomorrow-night-eighties",
   "slug-underscored": "tomorrow_night_eighties",
diff --git a/colors/base16-tomorrow-night.json b/colors/base16-tomorrow-night.json
index e54676f..07d25c1 100644
--- a/colors/base16-tomorrow-night.json
+++ b/colors/base16-tomorrow-night.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tomorrow Night",
+  "name": "base16",
+  "scheme-name": "Tomorrow Night",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "tomorrow-night",
   "slug-underscored": "tomorrow_night",
diff --git a/colors/base16-tomorrow.json b/colors/base16-tomorrow.json
index 7201dd4..dbeaaf3 100644
--- a/colors/base16-tomorrow.json
+++ b/colors/base16-tomorrow.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Tomorrow",
+  "name": "base16",
+  "scheme-name": "Tomorrow",
   "author": "Chris Kempson (http://chriskempson.com)",
   "slug": "tomorrow",
   "slug-underscored": "tomorrow",
diff --git a/colors/base16-tube.json b/colors/base16-tube.json
index c851fa5..d7a4cae 100644
--- a/colors/base16-tube.json
+++ b/colors/base16-tube.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "London Tube",
+  "name": "base16",
+  "scheme-name": "London Tube",
   "author": "Jan T. Sott",
   "slug": "tube",
   "slug-underscored": "tube",
diff --git a/colors/base16-twilight.json b/colors/base16-twilight.json
index 6e4594a..6ab1426 100644
--- a/colors/base16-twilight.json
+++ b/colors/base16-twilight.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Twilight",
+  "name": "base16",
+  "scheme-name": "Twilight",
   "author": "David Hart (https://github.com/hartbit)",
   "slug": "twilight",
   "slug-underscored": "twilight",
diff --git a/colors/base16-unikitty-dark.json b/colors/base16-unikitty-dark.json
index df24dc0..3f20238 100644
--- a/colors/base16-unikitty-dark.json
+++ b/colors/base16-unikitty-dark.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Unikitty Dark",
+  "name": "base16",
+  "scheme-name": "Unikitty Dark",
   "author": "Josh W Lewis (@joshwlewis)",
   "slug": "unikitty-dark",
   "slug-underscored": "unikitty_dark",
diff --git a/colors/base16-unikitty-light.json b/colors/base16-unikitty-light.json
index 368817d..ae71dfa 100644
--- a/colors/base16-unikitty-light.json
+++ b/colors/base16-unikitty-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Unikitty Light",
+  "name": "base16",
+  "scheme-name": "Unikitty Light",
   "author": "Josh W Lewis (@joshwlewis)",
   "slug": "unikitty-light",
   "slug-underscored": "unikitty_light",
diff --git a/colors/base16-unikitty-reversible.json b/colors/base16-unikitty-reversible.json
index 195f7d1..8362511 100644
--- a/colors/base16-unikitty-reversible.json
+++ b/colors/base16-unikitty-reversible.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Unikitty Reversible",
+  "name": "base16",
+  "scheme-name": "Unikitty Reversible",
   "author": "Josh W Lewis (@joshwlewis)",
   "slug": "unikitty-reversible",
   "slug-underscored": "unikitty_reversible",
diff --git a/colors/base16-uwunicorn.json b/colors/base16-uwunicorn.json
index 018c37c..2a69abb 100644
--- a/colors/base16-uwunicorn.json
+++ b/colors/base16-uwunicorn.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "UwUnicorn",
+  "name": "base16",
+  "scheme-name": "UwUnicorn",
   "author": "Fernando Marques (https://github.com/RakkiUwU) and Gabriel Fontes (https://github.com/Misterio77)",
   "slug": "uwunicorn",
   "slug-underscored": "uwunicorn",
diff --git a/colors/base16-valua.json b/colors/base16-valua.json
index 799df9f..1c61e07 100644
--- a/colors/base16-valua.json
+++ b/colors/base16-valua.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Valua",
+  "name": "base16",
+  "scheme-name": "Valua",
   "author": "Nonetrix (https://github.com/nonetrix)",
   "slug": "valua",
   "slug-underscored": "valua",
diff --git a/colors/base16-vesper.json b/colors/base16-vesper.json
index d446214..ee0685b 100644
--- a/colors/base16-vesper.json
+++ b/colors/base16-vesper.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Vesper",
+  "name": "base16",
+  "scheme-name": "Vesper",
   "author": "FormalSnake (https://github.com/formalsnake)",
   "slug": "vesper",
   "slug-underscored": "vesper",
diff --git a/colors/base16-vice.json b/colors/base16-vice.json
index aece9c8..d091728 100644
--- a/colors/base16-vice.json
+++ b/colors/base16-vice.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "vice",
+  "name": "base16",
+  "scheme-name": "vice",
   "author": "Thomas Leon Highbaugh thighbaugh@zoho.com",
   "slug": "vice",
   "slug-underscored": "vice",
diff --git a/colors/base16-vulcan.json b/colors/base16-vulcan.json
index a4afcc8..bb45aa7 100644
--- a/colors/base16-vulcan.json
+++ b/colors/base16-vulcan.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "vulcan",
+  "name": "base16",
+  "scheme-name": "vulcan",
   "author": "Andrey Varfolomeev",
   "slug": "vulcan",
   "slug-underscored": "vulcan",
diff --git a/colors/base16-windows-10-light.json b/colors/base16-windows-10-light.json
index 4502cb3..9f584ff 100644
--- a/colors/base16-windows-10-light.json
+++ b/colors/base16-windows-10-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows 10 Light",
+  "name": "base16",
+  "scheme-name": "Windows 10 Light",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-10-light",
   "slug-underscored": "windows_10_light",
diff --git a/colors/base16-windows-10.json b/colors/base16-windows-10.json
index b0dc422..5babe1a 100644
--- a/colors/base16-windows-10.json
+++ b/colors/base16-windows-10.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows 10",
+  "name": "base16",
+  "scheme-name": "Windows 10",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-10",
   "slug-underscored": "windows_10",
diff --git a/colors/base16-windows-95-light.json b/colors/base16-windows-95-light.json
index dba5bdb..606a89a 100644
--- a/colors/base16-windows-95-light.json
+++ b/colors/base16-windows-95-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows 95 Light",
+  "name": "base16",
+  "scheme-name": "Windows 95 Light",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-95-light",
   "slug-underscored": "windows_95_light",
diff --git a/colors/base16-windows-95.json b/colors/base16-windows-95.json
index 25fb820..32247c6 100644
--- a/colors/base16-windows-95.json
+++ b/colors/base16-windows-95.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows 95",
+  "name": "base16",
+  "scheme-name": "Windows 95",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-95",
   "slug-underscored": "windows_95",
diff --git a/colors/base16-windows-highcontrast-light.json b/colors/base16-windows-highcontrast-light.json
index 2fbb1ab..47699c2 100644
--- a/colors/base16-windows-highcontrast-light.json
+++ b/colors/base16-windows-highcontrast-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows High Contrast Light",
+  "name": "base16",
+  "scheme-name": "Windows High Contrast Light",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-highcontrast-light",
   "slug-underscored": "windows_highcontrast_light",
diff --git a/colors/base16-windows-highcontrast.json b/colors/base16-windows-highcontrast.json
index 2951538..41cb71d 100644
--- a/colors/base16-windows-highcontrast.json
+++ b/colors/base16-windows-highcontrast.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows High Contrast",
+  "name": "base16",
+  "scheme-name": "Windows High Contrast",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-highcontrast",
   "slug-underscored": "windows_highcontrast",
diff --git a/colors/base16-windows-nt-light.json b/colors/base16-windows-nt-light.json
index 153e8f1..0c6c841 100644
--- a/colors/base16-windows-nt-light.json
+++ b/colors/base16-windows-nt-light.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows NT Light",
+  "name": "base16",
+  "scheme-name": "Windows NT Light",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-nt-light",
   "slug-underscored": "windows_nt_light",
diff --git a/colors/base16-windows-nt.json b/colors/base16-windows-nt.json
index abccb74..727efe6 100644
--- a/colors/base16-windows-nt.json
+++ b/colors/base16-windows-nt.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Windows NT",
+  "name": "base16",
+  "scheme-name": "Windows NT",
   "author": "Fergus Collins (https://github.com/ferguscollins)",
   "slug": "windows-nt",
   "slug-underscored": "windows_nt",
diff --git a/colors/base16-woodland.json b/colors/base16-woodland.json
index 9c1b388..10cdf55 100644
--- a/colors/base16-woodland.json
+++ b/colors/base16-woodland.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Woodland",
+  "name": "base16",
+  "scheme-name": "Woodland",
   "author": "Jay Cornwall (https://jcornwall.com)",
   "slug": "woodland",
   "slug-underscored": "woodland",
diff --git a/colors/base16-xcode-dusk.json b/colors/base16-xcode-dusk.json
index 6431d6e..6e6c1c0 100644
--- a/colors/base16-xcode-dusk.json
+++ b/colors/base16-xcode-dusk.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "XCode Dusk",
+  "name": "base16",
+  "scheme-name": "XCode Dusk",
   "author": "Elsa Gonsiorowski (https://github.com/gonsie)",
   "slug": "xcode-dusk",
   "slug-underscored": "xcode_dusk",
diff --git a/colors/base16-zenbones.json b/colors/base16-zenbones.json
index c9e0127..1b14f11 100644
--- a/colors/base16-zenbones.json
+++ b/colors/base16-zenbones.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Zenbones",
+  "name": "base16",
+  "scheme-name": "Zenbones",
   "author": "mcchrish",
   "slug": "zenbones",
   "slug-underscored": "zenbones",
diff --git a/colors/base16-zenburn.json b/colors/base16-zenburn.json
index 48b312f..a9caaf8 100644
--- a/colors/base16-zenburn.json
+++ b/colors/base16-zenburn.json
@@ -1,6 +1,6 @@
 {
-  "name": "colorscheme",
-  "schemeName": "Zenburn",
+  "name": "base16",
+  "scheme-name": "Zenburn",
   "author": "elnawe",
   "slug": "zenburn",
   "slug-underscored": "zenburn",