diff --git a/build/base16-0x96f b/build/base16-0x96f.json
similarity index 100%
rename from build/base16-0x96f
rename to build/base16-0x96f.json
diff --git a/build/base16-3024 b/build/base16-3024.json
similarity index 100%
rename from build/base16-3024
rename to build/base16-3024.json
diff --git a/build/base16-apathy b/build/base16-apathy.json
similarity index 100%
rename from build/base16-apathy
rename to build/base16-apathy.json
diff --git a/build/base16-apprentice b/build/base16-apprentice.json
similarity index 100%
rename from build/base16-apprentice
rename to build/base16-apprentice.json
diff --git a/build/base16-ascendancy b/build/base16-ascendancy.json
similarity index 100%
rename from build/base16-ascendancy
rename to build/base16-ascendancy.json
diff --git a/build/base16-ashes b/build/base16-ashes.json
similarity index 100%
rename from build/base16-ashes
rename to build/base16-ashes.json
diff --git a/build/base16-atelier-cave-light b/build/base16-atelier-cave-light.json
similarity index 100%
rename from build/base16-atelier-cave-light
rename to build/base16-atelier-cave-light.json
diff --git a/build/base16-atelier-cave b/build/base16-atelier-cave.json
similarity index 100%
rename from build/base16-atelier-cave
rename to build/base16-atelier-cave.json
diff --git a/build/base16-atelier-dune-light b/build/base16-atelier-dune-light.json
similarity index 100%
rename from build/base16-atelier-dune-light
rename to build/base16-atelier-dune-light.json
diff --git a/build/base16-atelier-dune b/build/base16-atelier-dune.json
similarity index 100%
rename from build/base16-atelier-dune
rename to build/base16-atelier-dune.json
diff --git a/build/base16-atelier-estuary-light b/build/base16-atelier-estuary-light.json
similarity index 100%
rename from build/base16-atelier-estuary-light
rename to build/base16-atelier-estuary-light.json
diff --git a/build/base16-atelier-estuary b/build/base16-atelier-estuary.json
similarity index 100%
rename from build/base16-atelier-estuary
rename to build/base16-atelier-estuary.json
diff --git a/build/base16-atelier-forest-light b/build/base16-atelier-forest-light.json
similarity index 100%
rename from build/base16-atelier-forest-light
rename to build/base16-atelier-forest-light.json
diff --git a/build/base16-atelier-forest b/build/base16-atelier-forest.json
similarity index 100%
rename from build/base16-atelier-forest
rename to build/base16-atelier-forest.json
diff --git a/build/base16-atelier-heath-light b/build/base16-atelier-heath-light.json
similarity index 100%
rename from build/base16-atelier-heath-light
rename to build/base16-atelier-heath-light.json
diff --git a/build/base16-atelier-heath b/build/base16-atelier-heath.json
similarity index 100%
rename from build/base16-atelier-heath
rename to build/base16-atelier-heath.json
diff --git a/build/base16-atelier-lakeside-light b/build/base16-atelier-lakeside-light.json
similarity index 100%
rename from build/base16-atelier-lakeside-light
rename to build/base16-atelier-lakeside-light.json
diff --git a/build/base16-atelier-lakeside b/build/base16-atelier-lakeside.json
similarity index 100%
rename from build/base16-atelier-lakeside
rename to build/base16-atelier-lakeside.json
diff --git a/build/base16-atelier-plateau-light b/build/base16-atelier-plateau-light.json
similarity index 100%
rename from build/base16-atelier-plateau-light
rename to build/base16-atelier-plateau-light.json
diff --git a/build/base16-atelier-plateau b/build/base16-atelier-plateau.json
similarity index 100%
rename from build/base16-atelier-plateau
rename to build/base16-atelier-plateau.json
diff --git a/build/base16-atelier-savanna-light b/build/base16-atelier-savanna-light.json
similarity index 100%
rename from build/base16-atelier-savanna-light
rename to build/base16-atelier-savanna-light.json
diff --git a/build/base16-atelier-savanna b/build/base16-atelier-savanna.json
similarity index 100%
rename from build/base16-atelier-savanna
rename to build/base16-atelier-savanna.json
diff --git a/build/base16-atelier-seaside-light b/build/base16-atelier-seaside-light.json
similarity index 100%
rename from build/base16-atelier-seaside-light
rename to build/base16-atelier-seaside-light.json
diff --git a/build/base16-atelier-seaside b/build/base16-atelier-seaside.json
similarity index 100%
rename from build/base16-atelier-seaside
rename to build/base16-atelier-seaside.json
diff --git a/build/base16-atelier-sulphurpool-light b/build/base16-atelier-sulphurpool-light.json
similarity index 100%
rename from build/base16-atelier-sulphurpool-light
rename to build/base16-atelier-sulphurpool-light.json
diff --git a/build/base16-atelier-sulphurpool b/build/base16-atelier-sulphurpool.json
similarity index 100%
rename from build/base16-atelier-sulphurpool
rename to build/base16-atelier-sulphurpool.json
diff --git a/build/base16-atlas b/build/base16-atlas.json
similarity index 100%
rename from build/base16-atlas
rename to build/base16-atlas.json
diff --git a/build/base16-ayu-dark b/build/base16-ayu-dark.json
similarity index 100%
rename from build/base16-ayu-dark
rename to build/base16-ayu-dark.json
diff --git a/build/base16-ayu-light b/build/base16-ayu-light.json
similarity index 100%
rename from build/base16-ayu-light
rename to build/base16-ayu-light.json
diff --git a/build/base16-ayu-mirage b/build/base16-ayu-mirage.json
similarity index 100%
rename from build/base16-ayu-mirage
rename to build/base16-ayu-mirage.json
diff --git a/build/base16-aztec b/build/base16-aztec.json
similarity index 100%
rename from build/base16-aztec
rename to build/base16-aztec.json
diff --git a/build/base16-bespin b/build/base16-bespin.json
similarity index 100%
rename from build/base16-bespin
rename to build/base16-bespin.json
diff --git a/build/base16-black-metal-bathory b/build/base16-black-metal-bathory.json
similarity index 100%
rename from build/base16-black-metal-bathory
rename to build/base16-black-metal-bathory.json
diff --git a/build/base16-black-metal-burzum b/build/base16-black-metal-burzum.json
similarity index 100%
rename from build/base16-black-metal-burzum
rename to build/base16-black-metal-burzum.json
diff --git a/build/base16-black-metal-dark-funeral b/build/base16-black-metal-dark-funeral.json
similarity index 100%
rename from build/base16-black-metal-dark-funeral
rename to build/base16-black-metal-dark-funeral.json
diff --git a/build/base16-black-metal-gorgoroth b/build/base16-black-metal-gorgoroth.json
similarity index 100%
rename from build/base16-black-metal-gorgoroth
rename to build/base16-black-metal-gorgoroth.json
diff --git a/build/base16-black-metal-immortal b/build/base16-black-metal-immortal.json
similarity index 100%
rename from build/base16-black-metal-immortal
rename to build/base16-black-metal-immortal.json
diff --git a/build/base16-black-metal-khold b/build/base16-black-metal-khold.json
similarity index 100%
rename from build/base16-black-metal-khold
rename to build/base16-black-metal-khold.json
diff --git a/build/base16-black-metal-marduk b/build/base16-black-metal-marduk.json
similarity index 100%
rename from build/base16-black-metal-marduk
rename to build/base16-black-metal-marduk.json
diff --git a/build/base16-black-metal-mayhem b/build/base16-black-metal-mayhem.json
similarity index 100%
rename from build/base16-black-metal-mayhem
rename to build/base16-black-metal-mayhem.json
diff --git a/build/base16-black-metal-nile b/build/base16-black-metal-nile.json
similarity index 100%
rename from build/base16-black-metal-nile
rename to build/base16-black-metal-nile.json
diff --git a/build/base16-black-metal-venom b/build/base16-black-metal-venom.json
similarity index 100%
rename from build/base16-black-metal-venom
rename to build/base16-black-metal-venom.json
diff --git a/build/base16-black-metal b/build/base16-black-metal.json
similarity index 100%
rename from build/base16-black-metal
rename to build/base16-black-metal.json
diff --git a/build/base16-blueforest b/build/base16-blueforest.json
similarity index 100%
rename from build/base16-blueforest
rename to build/base16-blueforest.json
diff --git a/build/base16-blueish b/build/base16-blueish.json
similarity index 100%
rename from build/base16-blueish
rename to build/base16-blueish.json
diff --git a/build/base16-boo-shnickle-light.json b/build/base16-boo-shnickle-light.json
new file mode 100644
index 0000000..b000eb4
--- /dev/null
+++ b/build/base16-boo-shnickle-light.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#ffffcc",
+    "color1": "#ffbfa5",
+    "color2": "#e7ff99",
+    "color3": "#fff299",
+    "color4": "#bfbfd9",
+    "color5": "#f2bfd9",
+    "color6": "#bfffc5",
+    "color7": "#5b5b49",
+    "color8": "#9c9c7d",
+    "color9": "#ffbfa5",
+    "color10": "#e7ff99",
+    "color11": "#fff299",
+    "color12": "#bfbfd9",
+    "color13": "#f2bfd9",
+    "color14": "#bfffc5",
+    "color15": "#191914"
+  }
+}
diff --git a/build/base16-booshnickle-dark b/build/base16-boo-shnickle.json
similarity index 89%
rename from build/base16-booshnickle-dark
rename to build/base16-boo-shnickle.json
index 858334d..4bd28c5 100644
--- a/build/base16-booshnickle-dark
+++ b/build/base16-boo-shnickle.json
@@ -6,7 +6,7 @@
     "color1": "#ffbfa5",
     "color2": "#e7ff99",
     "color3": "#fff299",
-    "color4": "#ccbfd9",
+    "color4": "#bfbfd9",
     "color5": "#f2bfd9",
     "color6": "#bfffc5",
     "color7": "#bdbd97",
@@ -14,7 +14,7 @@
     "color9": "#ffbfa5",
     "color10": "#e7ff99",
     "color11": "#fff299",
-    "color12": "#ccbfd9",
+    "color12": "#bfbfd9",
     "color13": "#f2bfd9",
     "color14": "#bfffc5",
     "color15": "#ffffcc"
diff --git a/build/base16-brewer b/build/base16-brewer.json
similarity index 100%
rename from build/base16-brewer
rename to build/base16-brewer.json
diff --git a/build/base16-bright b/build/base16-bright.json
similarity index 100%
rename from build/base16-bright
rename to build/base16-bright.json
diff --git a/build/base16-brogrammer b/build/base16-brogrammer.json
similarity index 100%
rename from build/base16-brogrammer
rename to build/base16-brogrammer.json
diff --git a/build/base16-brushtrees-dark b/build/base16-brushtrees-dark.json
similarity index 100%
rename from build/base16-brushtrees-dark
rename to build/base16-brushtrees-dark.json
diff --git a/build/base16-brushtrees b/build/base16-brushtrees.json
similarity index 100%
rename from build/base16-brushtrees
rename to build/base16-brushtrees.json
diff --git a/build/base16-caroline b/build/base16-caroline.json
similarity index 100%
rename from build/base16-caroline
rename to build/base16-caroline.json
diff --git a/build/base16-catppuccin-frappe b/build/base16-catppuccin-frappe.json
similarity index 100%
rename from build/base16-catppuccin-frappe
rename to build/base16-catppuccin-frappe.json
diff --git a/build/base16-catppuccin-latte b/build/base16-catppuccin-latte.json
similarity index 100%
rename from build/base16-catppuccin-latte
rename to build/base16-catppuccin-latte.json
diff --git a/build/base16-catppuccin-macchiato b/build/base16-catppuccin-macchiato.json
similarity index 100%
rename from build/base16-catppuccin-macchiato
rename to build/base16-catppuccin-macchiato.json
diff --git a/build/base16-catppuccin-mocha b/build/base16-catppuccin-mocha.json
similarity index 100%
rename from build/base16-catppuccin-mocha
rename to build/base16-catppuccin-mocha.json
diff --git a/build/base16-chalk b/build/base16-chalk.json
similarity index 100%
rename from build/base16-chalk
rename to build/base16-chalk.json
diff --git a/build/base16-charcoal-dark b/build/base16-charcoal-dark.json
similarity index 100%
rename from build/base16-charcoal-dark
rename to build/base16-charcoal-dark.json
diff --git a/build/base16-charcoal-light b/build/base16-charcoal-light.json
similarity index 100%
rename from build/base16-charcoal-light
rename to build/base16-charcoal-light.json
diff --git a/build/base16-chicago-day b/build/base16-chicago-day.json
similarity index 100%
rename from build/base16-chicago-day
rename to build/base16-chicago-day.json
diff --git a/build/base16-chicago-night b/build/base16-chicago-night.json
similarity index 100%
rename from build/base16-chicago-night
rename to build/base16-chicago-night.json
diff --git a/build/base16-chinoiserie-midnight b/build/base16-chinoiserie-midnight.json
similarity index 100%
rename from build/base16-chinoiserie-midnight
rename to build/base16-chinoiserie-midnight.json
diff --git a/build/base16-chinoiserie-morandi b/build/base16-chinoiserie-morandi.json
similarity index 100%
rename from build/base16-chinoiserie-morandi
rename to build/base16-chinoiserie-morandi.json
diff --git a/build/base16-chinoiserie-night b/build/base16-chinoiserie-night.json
similarity index 100%
rename from build/base16-chinoiserie-night
rename to build/base16-chinoiserie-night.json
diff --git a/build/base16-chinoiserie b/build/base16-chinoiserie.json
similarity index 100%
rename from build/base16-chinoiserie
rename to build/base16-chinoiserie.json
diff --git a/build/base16-circus b/build/base16-circus.json
similarity index 100%
rename from build/base16-circus
rename to build/base16-circus.json
diff --git a/build/base16-classic-dark b/build/base16-classic-dark.json
similarity index 100%
rename from build/base16-classic-dark
rename to build/base16-classic-dark.json
diff --git a/build/base16-classic-light b/build/base16-classic-light.json
similarity index 100%
rename from build/base16-classic-light
rename to build/base16-classic-light.json
diff --git a/build/base16-codeschool b/build/base16-codeschool.json
similarity index 100%
rename from build/base16-codeschool
rename to build/base16-codeschool.json
diff --git a/build/base16-colors b/build/base16-colors.json
similarity index 100%
rename from build/base16-colors
rename to build/base16-colors.json
diff --git a/build/base16-cupcake b/build/base16-cupcake.json
similarity index 100%
rename from build/base16-cupcake
rename to build/base16-cupcake.json
diff --git a/build/base16-cupertino b/build/base16-cupertino.json
similarity index 100%
rename from build/base16-cupertino
rename to build/base16-cupertino.json
diff --git a/build/base16-cyberpunk b/build/base16-cyberpunk.json
similarity index 100%
rename from build/base16-cyberpunk
rename to build/base16-cyberpunk.json
diff --git a/build/base16-da-one-black b/build/base16-da-one-black.json
similarity index 100%
rename from build/base16-da-one-black
rename to build/base16-da-one-black.json
diff --git a/build/base16-da-one-gray b/build/base16-da-one-gray.json
similarity index 100%
rename from build/base16-da-one-gray
rename to build/base16-da-one-gray.json
diff --git a/build/base16-da-one-ocean b/build/base16-da-one-ocean.json
similarity index 100%
rename from build/base16-da-one-ocean
rename to build/base16-da-one-ocean.json
diff --git a/build/base16-da-one-paper b/build/base16-da-one-paper.json
similarity index 100%
rename from build/base16-da-one-paper
rename to build/base16-da-one-paper.json
diff --git a/build/base16-da-one-sea b/build/base16-da-one-sea.json
similarity index 100%
rename from build/base16-da-one-sea
rename to build/base16-da-one-sea.json
diff --git a/build/base16-da-one-white b/build/base16-da-one-white.json
similarity index 100%
rename from build/base16-da-one-white
rename to build/base16-da-one-white.json
diff --git a/build/base16-danqing-light b/build/base16-danqing-light.json
similarity index 100%
rename from build/base16-danqing-light
rename to build/base16-danqing-light.json
diff --git a/build/base16-danqing b/build/base16-danqing.json
similarity index 100%
rename from build/base16-danqing
rename to build/base16-danqing.json
diff --git a/build/base16-darcula b/build/base16-darcula.json
similarity index 100%
rename from build/base16-darcula
rename to build/base16-darcula.json
diff --git a/build/base16-darkmoss b/build/base16-darkmoss.json
similarity index 100%
rename from build/base16-darkmoss
rename to build/base16-darkmoss.json
diff --git a/build/base16-darktooth b/build/base16-darktooth.json
similarity index 100%
rename from build/base16-darktooth
rename to build/base16-darktooth.json
diff --git a/build/base16-darkviolet b/build/base16-darkviolet.json
similarity index 100%
rename from build/base16-darkviolet
rename to build/base16-darkviolet.json
diff --git a/build/base16-decaf b/build/base16-decaf.json
similarity index 100%
rename from build/base16-decaf
rename to build/base16-decaf.json
diff --git a/build/base16-deep-oceanic-next b/build/base16-deep-oceanic-next.json
similarity index 100%
rename from build/base16-deep-oceanic-next
rename to build/base16-deep-oceanic-next.json
diff --git a/build/base16-default-dark b/build/base16-default-dark.json
similarity index 100%
rename from build/base16-default-dark
rename to build/base16-default-dark.json
diff --git a/build/base16-default-light b/build/base16-default-light.json
similarity index 100%
rename from build/base16-default-light
rename to build/base16-default-light.json
diff --git a/build/base16-digital-rain b/build/base16-digital-rain.json
similarity index 100%
rename from build/base16-digital-rain
rename to build/base16-digital-rain.json
diff --git a/build/base16-dirtysea b/build/base16-dirtysea.json
similarity index 100%
rename from build/base16-dirtysea
rename to build/base16-dirtysea.json
diff --git a/build/base16-dracula b/build/base16-dracula.json
similarity index 89%
rename from build/base16-dracula
rename to build/base16-dracula.json
index c0a17f0..8446519 100644
--- a/build/base16-dracula
+++ b/build/base16-dracula.json
@@ -6,7 +6,7 @@
     "color1": "#ff5555",
     "color2": "#50fa7b",
     "color3": "#f1fa8c",
-    "color4": "#80bfff",
+    "color4": "#bd93f9",
     "color5": "#ff79c6",
     "color6": "#8be9fd",
     "color7": "#f8f8f2",
@@ -14,7 +14,7 @@
     "color9": "#ff5555",
     "color10": "#50fa7b",
     "color11": "#f1fa8c",
-    "color12": "#80bfff",
+    "color12": "#bd93f9",
     "color13": "#ff79c6",
     "color14": "#8be9fd",
     "color15": "#ffffff"
diff --git a/build/base16-edge-dark b/build/base16-edge-dark.json
similarity index 100%
rename from build/base16-edge-dark
rename to build/base16-edge-dark.json
diff --git a/build/base16-edge-light b/build/base16-edge-light.json
similarity index 100%
rename from build/base16-edge-light
rename to build/base16-edge-light.json
diff --git a/build/base16-eighties b/build/base16-eighties.json
similarity index 100%
rename from build/base16-eighties
rename to build/base16-eighties.json
diff --git a/build/base16-eldritch b/build/base16-eldritch.json
similarity index 100%
rename from build/base16-eldritch
rename to build/base16-eldritch.json
diff --git a/build/base16-embers-light b/build/base16-embers-light
deleted file mode 100644
index 530b8fa..0000000
--- a/build/base16-embers-light
+++ /dev/null
@@ -1,22 +0,0 @@
-{
-  "wallpaper": "",
-  "alpha": "100",
-  "colors": {
-    "color0": "#d1d6db",
-    "color1": "#576d82",
-    "color2": "#6d8257",
-    "color3": "#57826d",
-    "color4": "#82576d",
-    "color5": "#6d5782",
-    "color6": "#826d57",
-    "color7": "#323b43",
-    "color8": "#75808a",
-    "color9": "#576d82",
-    "color10": "#6d8257",
-    "color11": "#57826d",
-    "color12": "#82576d",
-    "color13": "#6d5782",
-    "color14": "#826d57",
-    "color15": "#0f1316"
-  }
-}
diff --git a/build/base16-embers-light.json b/build/base16-embers-light.json
new file mode 100644
index 0000000..79b6bea
--- /dev/null
+++ b/build/base16-embers-light.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#dbd6d1",
+    "color1": "#826d57",
+    "color2": "#57826d",
+    "color3": "#6d8257",
+    "color4": "#6d5782",
+    "color5": "#82576d",
+    "color6": "#576d82",
+    "color7": "#433b32",
+    "color8": "#8a8075",
+    "color9": "#826d57",
+    "color10": "#57826d",
+    "color11": "#6d8257",
+    "color12": "#6d5782",
+    "color13": "#82576d",
+    "color14": "#576d82",
+    "color15": "#16130f"
+  }
+}
diff --git a/build/base16-embers b/build/base16-embers.json
similarity index 100%
rename from build/base16-embers
rename to build/base16-embers.json
diff --git a/build/base16-emil b/build/base16-emil.json
similarity index 100%
rename from build/base16-emil
rename to build/base16-emil.json
diff --git a/build/base16-equilibrium-dark b/build/base16-equilibrium-dark.json
similarity index 100%
rename from build/base16-equilibrium-dark
rename to build/base16-equilibrium-dark.json
diff --git a/build/base16-equilibrium-gray-dark b/build/base16-equilibrium-gray-dark.json
similarity index 100%
rename from build/base16-equilibrium-gray-dark
rename to build/base16-equilibrium-gray-dark.json
diff --git a/build/base16-equilibrium-gray-light b/build/base16-equilibrium-gray-light.json
similarity index 100%
rename from build/base16-equilibrium-gray-light
rename to build/base16-equilibrium-gray-light.json
diff --git a/build/base16-equilibrium-light b/build/base16-equilibrium-light.json
similarity index 100%
rename from build/base16-equilibrium-light
rename to build/base16-equilibrium-light.json
diff --git a/build/base16-eris b/build/base16-eris.json
similarity index 100%
rename from build/base16-eris
rename to build/base16-eris.json
diff --git a/build/base16-espresso b/build/base16-espresso.json
similarity index 100%
rename from build/base16-espresso
rename to build/base16-espresso.json
diff --git a/build/base16-eva-dim b/build/base16-eva-dim.json
similarity index 100%
rename from build/base16-eva-dim
rename to build/base16-eva-dim.json
diff --git a/build/base16-eva b/build/base16-eva.json
similarity index 100%
rename from build/base16-eva
rename to build/base16-eva.json
diff --git a/build/base16-evenok-dark b/build/base16-evenok-dark.json
similarity index 100%
rename from build/base16-evenok-dark
rename to build/base16-evenok-dark.json
diff --git a/build/base16-everforest-dark-hard b/build/base16-everforest-dark-hard.json
similarity index 100%
rename from build/base16-everforest-dark-hard
rename to build/base16-everforest-dark-hard.json
diff --git a/build/base16-everforest-dark-medium b/build/base16-everforest-dark-medium.json
similarity index 100%
rename from build/base16-everforest-dark-medium
rename to build/base16-everforest-dark-medium.json
diff --git a/build/base16-everforest-dark-soft b/build/base16-everforest-dark-soft.json
similarity index 100%
rename from build/base16-everforest-dark-soft
rename to build/base16-everforest-dark-soft.json
diff --git a/build/base16-everforest-light-hard.json b/build/base16-everforest-light-hard.json
new file mode 100644
index 0000000..1ba69f0
--- /dev/null
+++ b/build/base16-everforest-light-hard.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#fffbef",
+    "color1": "#f85552",
+    "color2": "#8da101",
+    "color3": "#dfa000",
+    "color4": "#3a94c5",
+    "color5": "#df69ba",
+    "color6": "#35a77c",
+    "color7": "#5c6a72",
+    "color8": "#939f91",
+    "color9": "#f85552",
+    "color10": "#8da101",
+    "color11": "#dfa000",
+    "color12": "#3a94c5",
+    "color13": "#df69ba",
+    "color14": "#35a77c",
+    "color15": "#272e33"
+  }
+}
diff --git a/build/base16-everforest-light-medium.json b/build/base16-everforest-light-medium.json
new file mode 100644
index 0000000..de937c4
--- /dev/null
+++ b/build/base16-everforest-light-medium.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#fdf6e3",
+    "color1": "#f85552",
+    "color2": "#8da101",
+    "color3": "#dfa000",
+    "color4": "#3a94c5",
+    "color5": "#df69ba",
+    "color6": "#35a77c",
+    "color7": "#5c6a72",
+    "color8": "#939f91",
+    "color9": "#f85552",
+    "color10": "#8da101",
+    "color11": "#dfa000",
+    "color12": "#3a94c5",
+    "color13": "#df69ba",
+    "color14": "#35a77c",
+    "color15": "#2d353b"
+  }
+}
diff --git a/build/base16-everforest-light-soft.json b/build/base16-everforest-light-soft.json
new file mode 100644
index 0000000..ebd118a
--- /dev/null
+++ b/build/base16-everforest-light-soft.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#f3ead3",
+    "color1": "#f85552",
+    "color2": "#8da101",
+    "color3": "#dfa000",
+    "color4": "#3a94c5",
+    "color5": "#df69ba",
+    "color6": "#35a77c",
+    "color7": "#5c6a72",
+    "color8": "#939f91",
+    "color9": "#f85552",
+    "color10": "#8da101",
+    "color11": "#dfa000",
+    "color12": "#3a94c5",
+    "color13": "#df69ba",
+    "color14": "#35a77c",
+    "color15": "#333c43"
+  }
+}
diff --git a/build/base16-everforest b/build/base16-everforest.json
similarity index 100%
rename from build/base16-everforest
rename to build/base16-everforest.json
diff --git a/build/base16-flat b/build/base16-flat.json
similarity index 100%
rename from build/base16-flat
rename to build/base16-flat.json
diff --git a/build/base16-flexoki-dark b/build/base16-flexoki-dark.json
similarity index 100%
rename from build/base16-flexoki-dark
rename to build/base16-flexoki-dark.json
diff --git a/build/base16-flexoki-light b/build/base16-flexoki-light.json
similarity index 100%
rename from build/base16-flexoki-light
rename to build/base16-flexoki-light.json
diff --git a/build/base16-framer b/build/base16-framer.json
similarity index 100%
rename from build/base16-framer
rename to build/base16-framer.json
diff --git a/build/base16-fruit-soda b/build/base16-fruit-soda.json
similarity index 100%
rename from build/base16-fruit-soda
rename to build/base16-fruit-soda.json
diff --git a/build/base16-gigavolt b/build/base16-gigavolt.json
similarity index 100%
rename from build/base16-gigavolt
rename to build/base16-gigavolt.json
diff --git a/build/base16-github-dark b/build/base16-github-dark.json
similarity index 100%
rename from build/base16-github-dark
rename to build/base16-github-dark.json
diff --git a/build/base16-github b/build/base16-github.json
similarity index 100%
rename from build/base16-github
rename to build/base16-github.json
diff --git a/build/base16-google-dark b/build/base16-google-dark.json
similarity index 100%
rename from build/base16-google-dark
rename to build/base16-google-dark.json
diff --git a/build/base16-google-light b/build/base16-google-light.json
similarity index 100%
rename from build/base16-google-light
rename to build/base16-google-light.json
diff --git a/build/base16-gotham b/build/base16-gotham.json
similarity index 100%
rename from build/base16-gotham
rename to build/base16-gotham.json
diff --git a/build/base16-grayscale-dark b/build/base16-grayscale-dark.json
similarity index 100%
rename from build/base16-grayscale-dark
rename to build/base16-grayscale-dark.json
diff --git a/build/base16-grayscale-light b/build/base16-grayscale-light.json
similarity index 100%
rename from build/base16-grayscale-light
rename to build/base16-grayscale-light.json
diff --git a/build/base16-greenscreen b/build/base16-greenscreen.json
similarity index 100%
rename from build/base16-greenscreen
rename to build/base16-greenscreen.json
diff --git a/build/base16-gruber b/build/base16-gruber.json
similarity index 100%
rename from build/base16-gruber
rename to build/base16-gruber.json
diff --git a/build/base16-gruvbox-dark-hard b/build/base16-gruvbox-dark-hard.json
similarity index 100%
rename from build/base16-gruvbox-dark-hard
rename to build/base16-gruvbox-dark-hard.json
diff --git a/build/base16-gruvbox-dark-medium b/build/base16-gruvbox-dark-medium.json
similarity index 100%
rename from build/base16-gruvbox-dark-medium
rename to build/base16-gruvbox-dark-medium.json
diff --git a/build/base16-gruvbox-dark-pale b/build/base16-gruvbox-dark-pale.json
similarity index 100%
rename from build/base16-gruvbox-dark-pale
rename to build/base16-gruvbox-dark-pale.json
diff --git a/build/base16-gruvbox-dark-soft b/build/base16-gruvbox-dark-soft.json
similarity index 100%
rename from build/base16-gruvbox-dark-soft
rename to build/base16-gruvbox-dark-soft.json
diff --git a/build/base16-gruvbox-dark b/build/base16-gruvbox-dark.json
similarity index 100%
rename from build/base16-gruvbox-dark
rename to build/base16-gruvbox-dark.json
diff --git a/build/base16-gruvbox-light-hard b/build/base16-gruvbox-light-hard.json
similarity index 100%
rename from build/base16-gruvbox-light-hard
rename to build/base16-gruvbox-light-hard.json
diff --git a/build/base16-gruvbox-light-medium b/build/base16-gruvbox-light-medium.json
similarity index 100%
rename from build/base16-gruvbox-light-medium
rename to build/base16-gruvbox-light-medium.json
diff --git a/build/base16-gruvbox-light-soft b/build/base16-gruvbox-light-soft.json
similarity index 100%
rename from build/base16-gruvbox-light-soft
rename to build/base16-gruvbox-light-soft.json
diff --git a/build/base16-gruvbox-light b/build/base16-gruvbox-light.json
similarity index 100%
rename from build/base16-gruvbox-light
rename to build/base16-gruvbox-light.json
diff --git a/build/base16-gruvbox-material-dark-hard b/build/base16-gruvbox-material-dark-hard.json
similarity index 100%
rename from build/base16-gruvbox-material-dark-hard
rename to build/base16-gruvbox-material-dark-hard.json
diff --git a/build/base16-gruvbox-material-dark-medium b/build/base16-gruvbox-material-dark-medium.json
similarity index 100%
rename from build/base16-gruvbox-material-dark-medium
rename to build/base16-gruvbox-material-dark-medium.json
diff --git a/build/base16-gruvbox-material-dark-soft b/build/base16-gruvbox-material-dark-soft.json
similarity index 100%
rename from build/base16-gruvbox-material-dark-soft
rename to build/base16-gruvbox-material-dark-soft.json
diff --git a/build/base16-gruvbox-material-light-hard b/build/base16-gruvbox-material-light-hard.json
similarity index 100%
rename from build/base16-gruvbox-material-light-hard
rename to build/base16-gruvbox-material-light-hard.json
diff --git a/build/base16-gruvbox-material-light-medium b/build/base16-gruvbox-material-light-medium.json
similarity index 100%
rename from build/base16-gruvbox-material-light-medium
rename to build/base16-gruvbox-material-light-medium.json
diff --git a/build/base16-gruvbox-material-light-soft b/build/base16-gruvbox-material-light-soft.json
similarity index 100%
rename from build/base16-gruvbox-material-light-soft
rename to build/base16-gruvbox-material-light-soft.json
diff --git a/build/base16-hardcore b/build/base16-hardcore.json
similarity index 100%
rename from build/base16-hardcore
rename to build/base16-hardcore.json
diff --git a/build/base16-hardhacker b/build/base16-hardhacker.json
similarity index 100%
rename from build/base16-hardhacker
rename to build/base16-hardhacker.json
diff --git a/build/base16-harmonic16-dark b/build/base16-harmonic16-dark.json
similarity index 100%
rename from build/base16-harmonic16-dark
rename to build/base16-harmonic16-dark.json
diff --git a/build/base16-harmonic16-light b/build/base16-harmonic16-light.json
similarity index 100%
rename from build/base16-harmonic16-light
rename to build/base16-harmonic16-light.json
diff --git a/build/base16-heetch-light b/build/base16-heetch-light.json
similarity index 100%
rename from build/base16-heetch-light
rename to build/base16-heetch-light.json
diff --git a/build/base16-heetch b/build/base16-heetch.json
similarity index 100%
rename from build/base16-heetch
rename to build/base16-heetch.json
diff --git a/build/base16-helios b/build/base16-helios.json
similarity index 100%
rename from build/base16-helios
rename to build/base16-helios.json
diff --git a/build/base16-hopscotch b/build/base16-hopscotch.json
similarity index 100%
rename from build/base16-hopscotch
rename to build/base16-hopscotch.json
diff --git a/build/base16-horizon-dark b/build/base16-horizon-dark.json
similarity index 100%
rename from build/base16-horizon-dark
rename to build/base16-horizon-dark.json
diff --git a/build/base16-horizon-light b/build/base16-horizon-light.json
similarity index 100%
rename from build/base16-horizon-light
rename to build/base16-horizon-light.json
diff --git a/build/base16-horizon-terminal-dark b/build/base16-horizon-terminal-dark.json
similarity index 100%
rename from build/base16-horizon-terminal-dark
rename to build/base16-horizon-terminal-dark.json
diff --git a/build/base16-horizon-terminal-light b/build/base16-horizon-terminal-light.json
similarity index 100%
rename from build/base16-horizon-terminal-light
rename to build/base16-horizon-terminal-light.json
diff --git a/build/base16-humanoid-dark b/build/base16-humanoid-dark.json
similarity index 100%
rename from build/base16-humanoid-dark
rename to build/base16-humanoid-dark.json
diff --git a/build/base16-humanoid-light b/build/base16-humanoid-light.json
similarity index 100%
rename from build/base16-humanoid-light
rename to build/base16-humanoid-light.json
diff --git a/build/base16-ia-dark b/build/base16-ia-dark.json
similarity index 100%
rename from build/base16-ia-dark
rename to build/base16-ia-dark.json
diff --git a/build/base16-ia-light b/build/base16-ia-light.json
similarity index 100%
rename from build/base16-ia-light
rename to build/base16-ia-light.json
diff --git a/build/base16-icy b/build/base16-icy.json
similarity index 100%
rename from build/base16-icy
rename to build/base16-icy.json
diff --git a/build/base16-irblack b/build/base16-irblack.json
similarity index 100%
rename from build/base16-irblack
rename to build/base16-irblack.json
diff --git a/build/base16-isotope b/build/base16-isotope.json
similarity index 100%
rename from build/base16-isotope
rename to build/base16-isotope.json
diff --git a/build/base16-jabuti b/build/base16-jabuti.json
similarity index 100%
rename from build/base16-jabuti
rename to build/base16-jabuti.json
diff --git a/build/base16-kanagawa-dragon b/build/base16-kanagawa-dragon.json
similarity index 100%
rename from build/base16-kanagawa-dragon
rename to build/base16-kanagawa-dragon.json
diff --git a/build/base16-kanagawa b/build/base16-kanagawa.json
similarity index 100%
rename from build/base16-kanagawa
rename to build/base16-kanagawa.json
diff --git a/build/base16-katy b/build/base16-katy.json
similarity index 100%
rename from build/base16-katy
rename to build/base16-katy.json
diff --git a/build/base16-kimber b/build/base16-kimber.json
similarity index 100%
rename from build/base16-kimber
rename to build/base16-kimber.json
diff --git a/build/base16-kissa-latte.json b/build/base16-kissa-latte.json
new file mode 100644
index 0000000..4a33653
--- /dev/null
+++ b/build/base16-kissa-latte.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#f5f4f0",
+    "color1": "#9e3e3e",
+    "color2": "#387050",
+    "color3": "#7d6820",
+    "color4": "#3468a8",
+    "color5": "#6438a0",
+    "color6": "#287070",
+    "color7": "#1f1c16",
+    "color8": "#91887d",
+    "color9": "#9e3e3e",
+    "color10": "#387050",
+    "color11": "#7d6820",
+    "color12": "#3468a8",
+    "color13": "#6438a0",
+    "color14": "#287070",
+    "color15": "#fefcfa"
+  }
+}
diff --git a/build/base16-kissa-macchiato.json b/build/base16-kissa-macchiato.json
new file mode 100644
index 0000000..058d6d4
--- /dev/null
+++ b/build/base16-kissa-macchiato.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#1f1c16",
+    "color1": "#e87777",
+    "color2": "#8cb870",
+    "color3": "#eac67a",
+    "color4": "#7fa8d4",
+    "color5": "#b094cc",
+    "color6": "#6ab8b0",
+    "color7": "#faf0e6",
+    "color8": "#b8a48c",
+    "color9": "#e87777",
+    "color10": "#8cb870",
+    "color11": "#eac67a",
+    "color12": "#7fa8d4",
+    "color13": "#b094cc",
+    "color14": "#6ab8b0",
+    "color15": "#fef4e4"
+  }
+}
diff --git a/build/base16-lime b/build/base16-lime.json
similarity index 100%
rename from build/base16-lime
rename to build/base16-lime.json
diff --git a/build/base16-linux-vt b/build/base16-linux-vt.json
similarity index 100%
rename from build/base16-linux-vt
rename to build/base16-linux-vt.json
diff --git a/build/base16-macintosh b/build/base16-macintosh.json
similarity index 100%
rename from build/base16-macintosh
rename to build/base16-macintosh.json
diff --git a/build/base16-marrakesh b/build/base16-marrakesh.json
similarity index 100%
rename from build/base16-marrakesh
rename to build/base16-marrakesh.json
diff --git a/build/base16-materia b/build/base16-materia.json
similarity index 100%
rename from build/base16-materia
rename to build/base16-materia.json
diff --git a/build/base16-material-darker b/build/base16-material-darker.json
similarity index 100%
rename from build/base16-material-darker
rename to build/base16-material-darker.json
diff --git a/build/base16-material-lighter b/build/base16-material-lighter.json
similarity index 100%
rename from build/base16-material-lighter
rename to build/base16-material-lighter.json
diff --git a/build/base16-material-palenight b/build/base16-material-palenight.json
similarity index 100%
rename from build/base16-material-palenight
rename to build/base16-material-palenight.json
diff --git a/build/base16-material-vivid b/build/base16-material-vivid.json
similarity index 100%
rename from build/base16-material-vivid
rename to build/base16-material-vivid.json
diff --git a/build/base16-material b/build/base16-material.json
similarity index 100%
rename from build/base16-material
rename to build/base16-material.json
diff --git a/build/base16-measured-dark b/build/base16-measured-dark.json
similarity index 100%
rename from build/base16-measured-dark
rename to build/base16-measured-dark.json
diff --git a/build/base16-measured-light b/build/base16-measured-light.json
similarity index 100%
rename from build/base16-measured-light
rename to build/base16-measured-light.json
diff --git a/build/base16-mellow-purple b/build/base16-mellow-purple.json
similarity index 100%
rename from build/base16-mellow-purple
rename to build/base16-mellow-purple.json
diff --git a/build/base16-mexico-light b/build/base16-mexico-light.json
similarity index 100%
rename from build/base16-mexico-light
rename to build/base16-mexico-light.json
diff --git a/build/base16-mocha b/build/base16-mocha.json
similarity index 100%
rename from build/base16-mocha
rename to build/base16-mocha.json
diff --git a/build/base16-monokai b/build/base16-monokai.json
similarity index 100%
rename from build/base16-monokai
rename to build/base16-monokai.json
diff --git a/build/base16-moonlight b/build/base16-moonlight.json
similarity index 100%
rename from build/base16-moonlight
rename to build/base16-moonlight.json
diff --git a/build/base16-mountain b/build/base16-mountain.json
similarity index 100%
rename from build/base16-mountain
rename to build/base16-mountain.json
diff --git a/build/base16-nebula b/build/base16-nebula.json
similarity index 100%
rename from build/base16-nebula
rename to build/base16-nebula.json
diff --git a/build/base16-nord-light b/build/base16-nord-light.json
similarity index 100%
rename from build/base16-nord-light
rename to build/base16-nord-light.json
diff --git a/build/base16-nord b/build/base16-nord.json
similarity index 100%
rename from build/base16-nord
rename to build/base16-nord.json
diff --git a/build/base16-nova b/build/base16-nova.json
similarity index 100%
rename from build/base16-nova
rename to build/base16-nova.json
diff --git a/build/base16-ocean b/build/base16-ocean.json
similarity index 100%
rename from build/base16-ocean
rename to build/base16-ocean.json
diff --git a/build/base16-oceanicnext b/build/base16-oceanicnext.json
similarity index 100%
rename from build/base16-oceanicnext
rename to build/base16-oceanicnext.json
diff --git a/build/base16-one-light b/build/base16-one-light.json
similarity index 100%
rename from build/base16-one-light
rename to build/base16-one-light.json
diff --git a/build/base16-onedark-dark b/build/base16-onedark-dark.json
similarity index 100%
rename from build/base16-onedark-dark
rename to build/base16-onedark-dark.json
diff --git a/build/base16-onedark b/build/base16-onedark.json
similarity index 100%
rename from build/base16-onedark
rename to build/base16-onedark.json
diff --git a/build/base16-outrun-dark b/build/base16-outrun-dark.json
similarity index 100%
rename from build/base16-outrun-dark
rename to build/base16-outrun-dark.json
diff --git a/build/base16-oxocarbon-dark b/build/base16-oxocarbon-dark.json
similarity index 100%
rename from build/base16-oxocarbon-dark
rename to build/base16-oxocarbon-dark.json
diff --git a/build/base16-oxocarbon-light b/build/base16-oxocarbon-light.json
similarity index 100%
rename from build/base16-oxocarbon-light
rename to build/base16-oxocarbon-light.json
diff --git a/build/base16-pandora b/build/base16-pandora.json
similarity index 100%
rename from build/base16-pandora
rename to build/base16-pandora.json
diff --git a/build/base16-papercolor-dark b/build/base16-papercolor-dark.json
similarity index 100%
rename from build/base16-papercolor-dark
rename to build/base16-papercolor-dark.json
diff --git a/build/base16-papercolor-light b/build/base16-papercolor-light.json
similarity index 100%
rename from build/base16-papercolor-light
rename to build/base16-papercolor-light.json
diff --git a/build/base16-paraiso b/build/base16-paraiso.json
similarity index 100%
rename from build/base16-paraiso
rename to build/base16-paraiso.json
diff --git a/build/base16-pasque b/build/base16-pasque.json
similarity index 100%
rename from build/base16-pasque
rename to build/base16-pasque.json
diff --git a/build/base16-penumbra-dark-contrast-plus-plus b/build/base16-penumbra-dark-contrast-plus-plus.json
similarity index 100%
rename from build/base16-penumbra-dark-contrast-plus-plus
rename to build/base16-penumbra-dark-contrast-plus-plus.json
diff --git a/build/base16-penumbra-dark-contrast-plus b/build/base16-penumbra-dark-contrast-plus.json
similarity index 100%
rename from build/base16-penumbra-dark-contrast-plus
rename to build/base16-penumbra-dark-contrast-plus.json
diff --git a/build/base16-penumbra-dark b/build/base16-penumbra-dark.json
similarity index 100%
rename from build/base16-penumbra-dark
rename to build/base16-penumbra-dark.json
diff --git a/build/base16-penumbra-light-contrast-plus-plus b/build/base16-penumbra-light-contrast-plus-plus.json
similarity index 100%
rename from build/base16-penumbra-light-contrast-plus-plus
rename to build/base16-penumbra-light-contrast-plus-plus.json
diff --git a/build/base16-penumbra-light-contrast-plus b/build/base16-penumbra-light-contrast-plus.json
similarity index 100%
rename from build/base16-penumbra-light-contrast-plus
rename to build/base16-penumbra-light-contrast-plus.json
diff --git a/build/base16-penumbra-light b/build/base16-penumbra-light.json
similarity index 100%
rename from build/base16-penumbra-light
rename to build/base16-penumbra-light.json
diff --git a/build/base16-phd b/build/base16-phd.json
similarity index 100%
rename from build/base16-phd
rename to build/base16-phd.json
diff --git a/build/base16-pico b/build/base16-pico.json
similarity index 100%
rename from build/base16-pico
rename to build/base16-pico.json
diff --git a/build/base16-pinky b/build/base16-pinky.json
similarity index 100%
rename from build/base16-pinky
rename to build/base16-pinky.json
diff --git a/build/base16-pop b/build/base16-pop.json
similarity index 100%
rename from build/base16-pop
rename to build/base16-pop.json
diff --git a/build/base16-porple b/build/base16-porple.json
similarity index 100%
rename from build/base16-porple
rename to build/base16-porple.json
diff --git a/build/base16-precious-dark-eleven b/build/base16-precious-dark-eleven.json
similarity index 100%
rename from build/base16-precious-dark-eleven
rename to build/base16-precious-dark-eleven.json
diff --git a/build/base16-precious-dark-fifteen b/build/base16-precious-dark-fifteen.json
similarity index 100%
rename from build/base16-precious-dark-fifteen
rename to build/base16-precious-dark-fifteen.json
diff --git a/build/base16-precious-light-warm b/build/base16-precious-light-warm.json
similarity index 100%
rename from build/base16-precious-light-warm
rename to build/base16-precious-light-warm.json
diff --git a/build/base16-precious-light-white b/build/base16-precious-light-white.json
similarity index 100%
rename from build/base16-precious-light-white
rename to build/base16-precious-light-white.json
diff --git a/build/base16-primer-dark-dimmed b/build/base16-primer-dark-dimmed.json
similarity index 100%
rename from build/base16-primer-dark-dimmed
rename to build/base16-primer-dark-dimmed.json
diff --git a/build/base16-primer-dark b/build/base16-primer-dark.json
similarity index 100%
rename from build/base16-primer-dark
rename to build/base16-primer-dark.json
diff --git a/build/base16-primer-light b/build/base16-primer-light.json
similarity index 100%
rename from build/base16-primer-light
rename to build/base16-primer-light.json
diff --git a/build/base16-purpledream b/build/base16-purpledream.json
similarity index 100%
rename from build/base16-purpledream
rename to build/base16-purpledream.json
diff --git a/build/base16-qualia b/build/base16-qualia.json
similarity index 100%
rename from build/base16-qualia
rename to build/base16-qualia.json
diff --git a/build/base16-railscasts b/build/base16-railscasts.json
similarity index 100%
rename from build/base16-railscasts
rename to build/base16-railscasts.json
diff --git a/build/base16-rebecca b/build/base16-rebecca.json
similarity index 100%
rename from build/base16-rebecca
rename to build/base16-rebecca.json
diff --git a/build/base16-rose-pine-dawn b/build/base16-rose-pine-dawn.json
similarity index 100%
rename from build/base16-rose-pine-dawn
rename to build/base16-rose-pine-dawn.json
diff --git a/build/base16-rose-pine-moon b/build/base16-rose-pine-moon.json
similarity index 100%
rename from build/base16-rose-pine-moon
rename to build/base16-rose-pine-moon.json
diff --git a/build/base16-rose-pine b/build/base16-rose-pine.json
similarity index 100%
rename from build/base16-rose-pine
rename to build/base16-rose-pine.json
diff --git a/build/base16-saga b/build/base16-saga.json
similarity index 100%
rename from build/base16-saga
rename to build/base16-saga.json
diff --git a/build/base16-sagelight b/build/base16-sagelight.json
similarity index 100%
rename from build/base16-sagelight
rename to build/base16-sagelight.json
diff --git a/build/base16-sakura b/build/base16-sakura.json
similarity index 100%
rename from build/base16-sakura
rename to build/base16-sakura.json
diff --git a/build/base16-sandcastle b/build/base16-sandcastle.json
similarity index 100%
rename from build/base16-sandcastle
rename to build/base16-sandcastle.json
diff --git a/build/base16-selenized-black b/build/base16-selenized-black.json
similarity index 100%
rename from build/base16-selenized-black
rename to build/base16-selenized-black.json
diff --git a/build/base16-selenized-dark b/build/base16-selenized-dark.json
similarity index 100%
rename from build/base16-selenized-dark
rename to build/base16-selenized-dark.json
diff --git a/build/base16-selenized-light b/build/base16-selenized-light.json
similarity index 100%
rename from build/base16-selenized-light
rename to build/base16-selenized-light.json
diff --git a/build/base16-selenized-white b/build/base16-selenized-white.json
similarity index 100%
rename from build/base16-selenized-white
rename to build/base16-selenized-white.json
diff --git a/build/base16-seti b/build/base16-seti.json
similarity index 100%
rename from build/base16-seti
rename to build/base16-seti.json
diff --git a/build/base16-shades-of-purple b/build/base16-shades-of-purple.json
similarity index 100%
rename from build/base16-shades-of-purple
rename to build/base16-shades-of-purple.json
diff --git a/build/base16-shadesmear-dark b/build/base16-shadesmear-dark.json
similarity index 100%
rename from build/base16-shadesmear-dark
rename to build/base16-shadesmear-dark.json
diff --git a/build/base16-shadesmear-light b/build/base16-shadesmear-light.json
similarity index 100%
rename from build/base16-shadesmear-light
rename to build/base16-shadesmear-light.json
diff --git a/build/base16-shapeshifter b/build/base16-shapeshifter.json
similarity index 100%
rename from build/base16-shapeshifter
rename to build/base16-shapeshifter.json
diff --git a/build/base16-silk-dark b/build/base16-silk-dark.json
similarity index 100%
rename from build/base16-silk-dark
rename to build/base16-silk-dark.json
diff --git a/build/base16-silk-light b/build/base16-silk-light.json
similarity index 100%
rename from build/base16-silk-light
rename to build/base16-silk-light.json
diff --git a/build/base16-snazzy b/build/base16-snazzy.json
similarity index 100%
rename from build/base16-snazzy
rename to build/base16-snazzy.json
diff --git a/build/base16-soft-server b/build/base16-soft-server.json
similarity index 100%
rename from build/base16-soft-server
rename to build/base16-soft-server.json
diff --git a/build/base16-solarflare-light b/build/base16-solarflare-light.json
similarity index 100%
rename from build/base16-solarflare-light
rename to build/base16-solarflare-light.json
diff --git a/build/base16-solarflare b/build/base16-solarflare.json
similarity index 100%
rename from build/base16-solarflare
rename to build/base16-solarflare.json
diff --git a/build/base16-solarized-dark b/build/base16-solarized-dark.json
similarity index 100%
rename from build/base16-solarized-dark
rename to build/base16-solarized-dark.json
diff --git a/build/base16-solarized-light b/build/base16-solarized-light.json
similarity index 100%
rename from build/base16-solarized-light
rename to build/base16-solarized-light.json
diff --git a/build/base16-spaceduck b/build/base16-spaceduck.json
similarity index 100%
rename from build/base16-spaceduck
rename to build/base16-spaceduck.json
diff --git a/build/base16-spacemacs b/build/base16-spacemacs.json
similarity index 100%
rename from build/base16-spacemacs
rename to build/base16-spacemacs.json
diff --git a/build/base16-sparky b/build/base16-sparky.json
similarity index 100%
rename from build/base16-sparky
rename to build/base16-sparky.json
diff --git a/build/base16-standardized-dark b/build/base16-standardized-dark.json
similarity index 100%
rename from build/base16-standardized-dark
rename to build/base16-standardized-dark.json
diff --git a/build/base16-standardized-light b/build/base16-standardized-light.json
similarity index 100%
rename from build/base16-standardized-light
rename to build/base16-standardized-light.json
diff --git a/build/base16-stella b/build/base16-stella.json
similarity index 100%
rename from build/base16-stella
rename to build/base16-stella.json
diff --git a/build/base16-still-alive b/build/base16-still-alive.json
similarity index 100%
rename from build/base16-still-alive
rename to build/base16-still-alive.json
diff --git a/build/base16-summercamp b/build/base16-summercamp.json
similarity index 100%
rename from build/base16-summercamp
rename to build/base16-summercamp.json
diff --git a/build/base16-summerfruit-dark b/build/base16-summerfruit-dark.json
similarity index 100%
rename from build/base16-summerfruit-dark
rename to build/base16-summerfruit-dark.json
diff --git a/build/base16-summerfruit-light b/build/base16-summerfruit-light.json
similarity index 100%
rename from build/base16-summerfruit-light
rename to build/base16-summerfruit-light.json
diff --git a/build/base16-swamp-dark.json b/build/base16-swamp-dark.json
new file mode 100644
index 0000000..ca4a13d
--- /dev/null
+++ b/build/base16-swamp-dark.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#242015",
+    "color1": "#db930d",
+    "color2": "#7a7653",
+    "color3": "#a82d56",
+    "color4": "#c1666b",
+    "color5": "#91506c",
+    "color6": "#db930d",
+    "color7": "#d2c3a4",
+    "color8": "#5f4e41",
+    "color9": "#db930d",
+    "color10": "#7a7653",
+    "color11": "#a82d56",
+    "color12": "#c1666b",
+    "color13": "#91506c",
+    "color14": "#db930d",
+    "color15": "#f1e9d0"
+  }
+}
diff --git a/build/base16-swamp-light.json b/build/base16-swamp-light.json
new file mode 100644
index 0000000..164b8c5
--- /dev/null
+++ b/build/base16-swamp-light.json
@@ -0,0 +1,22 @@
+{
+  "wallpaper": "",
+  "alpha": "100",
+  "colors": {
+    "color0": "#f1e3d1",
+    "color1": "#d09700",
+    "color2": "#908d6a",
+    "color3": "#993333",
+    "color4": "#bf7979",
+    "color5": "#9e5581",
+    "color6": "#d09700",
+    "color7": "#64513e",
+    "color8": "#b5a492",
+    "color9": "#d09700",
+    "color10": "#908d6a",
+    "color11": "#993333",
+    "color12": "#bf7979",
+    "color13": "#9e5581",
+    "color14": "#d09700",
+    "color15": "#8c7b68"
+  }
+}
diff --git a/build/base16-synth-midnight-dark b/build/base16-synth-midnight-dark.json
similarity index 100%
rename from build/base16-synth-midnight-dark
rename to build/base16-synth-midnight-dark.json
diff --git a/build/base16-synth-midnight-light b/build/base16-synth-midnight-light.json
similarity index 100%
rename from build/base16-synth-midnight-light
rename to build/base16-synth-midnight-light.json
diff --git a/build/base16-tango b/build/base16-tango.json
similarity index 100%
rename from build/base16-tango
rename to build/base16-tango.json
diff --git a/build/base16-tarot b/build/base16-tarot.json
similarity index 100%
rename from build/base16-tarot
rename to build/base16-tarot.json
diff --git a/build/base16-tender b/build/base16-tender.json
similarity index 100%
rename from build/base16-tender
rename to build/base16-tender.json
diff --git a/build/base16-terracotta-dark b/build/base16-terracotta-dark.json
similarity index 100%
rename from build/base16-terracotta-dark
rename to build/base16-terracotta-dark.json
diff --git a/build/base16-terracotta b/build/base16-terracotta.json
similarity index 100%
rename from build/base16-terracotta
rename to build/base16-terracotta.json
diff --git a/build/base16-tokyo-city-dark b/build/base16-tokyo-city-dark.json
similarity index 100%
rename from build/base16-tokyo-city-dark
rename to build/base16-tokyo-city-dark.json
diff --git a/build/base16-tokyo-city-light b/build/base16-tokyo-city-light.json
similarity index 100%
rename from build/base16-tokyo-city-light
rename to build/base16-tokyo-city-light.json
diff --git a/build/base16-tokyo-city-terminal-dark b/build/base16-tokyo-city-terminal-dark.json
similarity index 100%
rename from build/base16-tokyo-city-terminal-dark
rename to build/base16-tokyo-city-terminal-dark.json
diff --git a/build/base16-tokyo-city-terminal-light b/build/base16-tokyo-city-terminal-light.json
similarity index 100%
rename from build/base16-tokyo-city-terminal-light
rename to build/base16-tokyo-city-terminal-light.json
diff --git a/build/base16-tokyo-night-dark b/build/base16-tokyo-night-dark.json
similarity index 100%
rename from build/base16-tokyo-night-dark
rename to build/base16-tokyo-night-dark.json
diff --git a/build/base16-tokyo-night-light b/build/base16-tokyo-night-light.json
similarity index 100%
rename from build/base16-tokyo-night-light
rename to build/base16-tokyo-night-light.json
diff --git a/build/base16-tokyo-night-moon b/build/base16-tokyo-night-moon.json
similarity index 100%
rename from build/base16-tokyo-night-moon
rename to build/base16-tokyo-night-moon.json
diff --git a/build/base16-tokyo-night-storm b/build/base16-tokyo-night-storm.json
similarity index 100%
rename from build/base16-tokyo-night-storm
rename to build/base16-tokyo-night-storm.json
diff --git a/build/base16-tokyo-night-terminal-dark b/build/base16-tokyo-night-terminal-dark.json
similarity index 100%
rename from build/base16-tokyo-night-terminal-dark
rename to build/base16-tokyo-night-terminal-dark.json
diff --git a/build/base16-tokyo-night-terminal-light b/build/base16-tokyo-night-terminal-light.json
similarity index 100%
rename from build/base16-tokyo-night-terminal-light
rename to build/base16-tokyo-night-terminal-light.json
diff --git a/build/base16-tokyo-night-terminal-storm b/build/base16-tokyo-night-terminal-storm.json
similarity index 100%
rename from build/base16-tokyo-night-terminal-storm
rename to build/base16-tokyo-night-terminal-storm.json
diff --git a/build/base16-tokyodark-terminal b/build/base16-tokyodark-terminal.json
similarity index 100%
rename from build/base16-tokyodark-terminal
rename to build/base16-tokyodark-terminal.json
diff --git a/build/base16-tokyodark b/build/base16-tokyodark.json
similarity index 100%
rename from build/base16-tokyodark
rename to build/base16-tokyodark.json
diff --git a/build/base16-tomorrow-night-eighties b/build/base16-tomorrow-night-eighties.json
similarity index 100%
rename from build/base16-tomorrow-night-eighties
rename to build/base16-tomorrow-night-eighties.json
diff --git a/build/base16-tomorrow-night b/build/base16-tomorrow-night.json
similarity index 100%
rename from build/base16-tomorrow-night
rename to build/base16-tomorrow-night.json
diff --git a/build/base16-tomorrow b/build/base16-tomorrow.json
similarity index 100%
rename from build/base16-tomorrow
rename to build/base16-tomorrow.json
diff --git a/build/base16-tube b/build/base16-tube.json
similarity index 100%
rename from build/base16-tube
rename to build/base16-tube.json
diff --git a/build/base16-twilight b/build/base16-twilight.json
similarity index 100%
rename from build/base16-twilight
rename to build/base16-twilight.json
diff --git a/build/base16-unikitty-dark b/build/base16-unikitty-dark.json
similarity index 100%
rename from build/base16-unikitty-dark
rename to build/base16-unikitty-dark.json
diff --git a/build/base16-unikitty-light b/build/base16-unikitty-light.json
similarity index 100%
rename from build/base16-unikitty-light
rename to build/base16-unikitty-light.json
diff --git a/build/base16-unikitty-reversible b/build/base16-unikitty-reversible.json
similarity index 100%
rename from build/base16-unikitty-reversible
rename to build/base16-unikitty-reversible.json
diff --git a/build/base16-uwunicorn b/build/base16-uwunicorn.json
similarity index 100%
rename from build/base16-uwunicorn
rename to build/base16-uwunicorn.json
diff --git a/build/base16-valua b/build/base16-valua.json
similarity index 100%
rename from build/base16-valua
rename to build/base16-valua.json
diff --git a/build/base16-vesper b/build/base16-vesper.json
similarity index 100%
rename from build/base16-vesper
rename to build/base16-vesper.json
diff --git a/build/base16-vice b/build/base16-vice.json
similarity index 100%
rename from build/base16-vice
rename to build/base16-vice.json
diff --git a/build/base16-vulcan b/build/base16-vulcan.json
similarity index 100%
rename from build/base16-vulcan
rename to build/base16-vulcan.json
diff --git a/build/base16-windows-10-light b/build/base16-windows-10-light.json
similarity index 100%
rename from build/base16-windows-10-light
rename to build/base16-windows-10-light.json
diff --git a/build/base16-windows-10 b/build/base16-windows-10.json
similarity index 100%
rename from build/base16-windows-10
rename to build/base16-windows-10.json
diff --git a/build/base16-windows-95-light b/build/base16-windows-95-light.json
similarity index 100%
rename from build/base16-windows-95-light
rename to build/base16-windows-95-light.json
diff --git a/build/base16-windows-95 b/build/base16-windows-95.json
similarity index 100%
rename from build/base16-windows-95
rename to build/base16-windows-95.json
diff --git a/build/base16-windows-highcontrast-light b/build/base16-windows-highcontrast-light.json
similarity index 100%
rename from build/base16-windows-highcontrast-light
rename to build/base16-windows-highcontrast-light.json
diff --git a/build/base16-windows-highcontrast b/build/base16-windows-highcontrast.json
similarity index 100%
rename from build/base16-windows-highcontrast
rename to build/base16-windows-highcontrast.json
diff --git a/build/base16-windows-nt-light b/build/base16-windows-nt-light.json
similarity index 100%
rename from build/base16-windows-nt-light
rename to build/base16-windows-nt-light.json
diff --git a/build/base16-windows-nt b/build/base16-windows-nt.json
similarity index 100%
rename from build/base16-windows-nt
rename to build/base16-windows-nt.json
diff --git a/build/base16-woodland b/build/base16-woodland.json
similarity index 100%
rename from build/base16-woodland
rename to build/base16-woodland.json
diff --git a/build/base16-xcode-dusk b/build/base16-xcode-dusk.json
similarity index 100%
rename from build/base16-xcode-dusk
rename to build/base16-xcode-dusk.json
diff --git a/build/base16-yesterday-bright b/build/base16-yesterday-bright.json
similarity index 100%
rename from build/base16-yesterday-bright
rename to build/base16-yesterday-bright.json
diff --git a/build/base16-yesterday-night b/build/base16-yesterday-night.json
similarity index 100%
rename from build/base16-yesterday-night
rename to build/base16-yesterday-night.json
diff --git a/build/base16-yesterday b/build/base16-yesterday.json
similarity index 100%
rename from build/base16-yesterday
rename to build/base16-yesterday.json
diff --git a/build/base16-zenbones b/build/base16-zenbones.json
similarity index 100%
rename from build/base16-zenbones
rename to build/base16-zenbones.json
diff --git a/build/base16-zenburn b/build/base16-zenburn.json
similarity index 100%
rename from build/base16-zenburn
rename to build/base16-zenburn.json
diff --git a/templates/config.yaml b/templates/config.yaml
index dc5443c..2a67405 100644
--- a/templates/config.yaml
+++ b/templates/config.yaml
@@ -1,3 +1,2 @@
 default:
-  filetype: "json"
-  output: "build"
+  filename: build/{{scheme-system}}-{{scheme-slug}}.json