diff --git a/styles/src/themes/andromeda.ts b/styles/src/themes/andromeda.ts
index dc4a5a00d4..520ceb67fe 100644
--- a/styles/src/themes/andromeda.ts
+++ b/styles/src/themes/andromeda.ts
@@ -2,11 +2,11 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Andromeda";
-const author = "";
-const url = "";
+const author = "EliverLara";
+const url = "https://github.com/EliverLara/Andromeda";
 const license = {
-  type: "",
-  url: "",
+  type: "MIT",
+  url: "https://github.com/EliverLara/Andromeda/blob/master/LICENSE.md",
 };
 
 const ramps = {
diff --git a/styles/src/themes/cave.ts b/styles/src/themes/atelier-cave.ts
similarity index 84%
rename from styles/src/themes/cave.ts
rename to styles/src/themes/atelier-cave.ts
index b26dfaf7bc..98cf834704 100644
--- a/styles/src/themes/cave.ts
+++ b/styles/src/themes/atelier-cave.ts
@@ -1,13 +1,13 @@
 import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
-const name = "Cave";
-const author = "";
-const url = "";
+const name = "Atelier Cave";
+const author = "atelierbram";
+const url = "https://atelierbram.github.io/syntax-highlighting/atelier-schemes/cave/";
 const license = {
-  type: "",
-  url: ""
-}
+  type: "MIT",
+  url: "https://github.com/atelierbram/syntax-highlighting/blob/master/LICENSE",
+};
 
 export const dark = createColorScheme(`${name} Dark`, false, {
   neutral: chroma
diff --git a/styles/src/themes/sulphurpool.ts b/styles/src/themes/atelier-sulphurpool.ts
similarity index 74%
rename from styles/src/themes/sulphurpool.ts
rename to styles/src/themes/atelier-sulphurpool.ts
index 409f581fde..d8293db3a7 100644
--- a/styles/src/themes/sulphurpool.ts
+++ b/styles/src/themes/atelier-sulphurpool.ts
@@ -1,9 +1,13 @@
 import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
-const name = "Sulphurpool";
-const author = "";
-const url = "";
+const name = "Atelier Sulphurpool";
+const author = "atelierbram";
+const url = "https://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune/";
+const license = {
+  type: "MIT",
+  url: "https://github.com/atelierbram/syntax-highlighting/blob/master/LICENSE",
+};
 
 const ramps = {
   neutral: chroma
diff --git a/styles/src/themes/internal/atelier-dune.ts b/styles/src/themes/internal/atelier-dune.ts
new file mode 100644
index 0000000000..9879fe4b58
--- /dev/null
+++ b/styles/src/themes/internal/atelier-dune.ts
@@ -0,0 +1,34 @@
+import chroma from "chroma-js";
+import { colorRamp, createColorScheme } from "../common/ramps";
+
+const name = "Atelier Dune";
+const author = "atelierbram";
+const url = "https://atelierbram.github.io/syntax-highlighting/atelier-schemes/dune/";
+const license = {
+  type: "MIT",
+  url: "https://github.com/atelierbram/syntax-highlighting/blob/master/LICENSE",
+};
+
+const ramps = {
+  neutral: chroma.scale([
+    "#20201d",
+    "#292824",
+    "#6e6b5e",
+    "#7d7a68",
+    "#999580",
+    "#a6a28c",
+    "#e8e4cf",
+    "#fefbec",
+  ]),
+  red: colorRamp(chroma("#d73737")),
+  orange: colorRamp(chroma("#b65611")),
+  yellow: colorRamp(chroma("#ae9513")),
+  green: colorRamp(chroma("#60ac39")),
+  cyan: colorRamp(chroma("#1fad83")),
+  blue: colorRamp(chroma("#6684e1")),
+  violet: colorRamp(chroma("#b854d4")),
+  magenta: colorRamp(chroma("#d43552")),
+};
+
+export const dark = createColorScheme(`${name} Dark`, false, ramps);
+export const light = createColorScheme(`${name} Light`, true, ramps);
diff --git a/styles/src/themes/internal/heath.ts b/styles/src/themes/internal/atelier-heath.ts
similarity index 84%
rename from styles/src/themes/internal/heath.ts
rename to styles/src/themes/internal/atelier-heath.ts
index b1bbf7544e..e73e919dad 100644
--- a/styles/src/themes/internal/heath.ts
+++ b/styles/src/themes/internal/atelier-heath.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "../common/ramps";
 
 const name = "Atelier Heath";
-const author = "Bram de Haan (http://atelierbramdehaan.nl)";
-const url = "";
+const author = "atelierbram";
+const url = "https://atelierbram.github.io/syntax-highlighting/atelier-schemes/heath/";
+const license = {
+  type: "MIT",
+  url: "https://github.com/atelierbram/syntax-highlighting/blob/master/LICENSE",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name} Dark`, false, {
diff --git a/styles/src/themes/internal/seaside.ts b/styles/src/themes/internal/atelier-seaside.ts
similarity index 76%
rename from styles/src/themes/internal/seaside.ts
rename to styles/src/themes/internal/atelier-seaside.ts
index b114c8cd6f..74c8112f77 100644
--- a/styles/src/themes/internal/seaside.ts
+++ b/styles/src/themes/internal/atelier-seaside.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "../common/ramps";
 
 const name = "Atelier Seaside";
-const author = "Bram de Haan (http://atelierbramdehaan.nl)";
-const url = "";
+const author = "atelierbram";
+const url = "https://atelierbram.github.io/syntax-highlighting/atelier-schemes/seaside/";
+const license = {
+  type: "MIT",
+  url: "https://github.com/atelierbram/syntax-highlighting/blob/master/LICENSE",
+};
 
 const ramps = {
   neutral: chroma.scale([
diff --git a/styles/src/themes/internal/monokai.ts b/styles/src/themes/internal/monokai.ts
index 8e6df116d5..0a7ee275bb 100644
--- a/styles/src/themes/internal/monokai.ts
+++ b/styles/src/themes/internal/monokai.ts
@@ -3,7 +3,11 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 
 const name = "Monokai";
 const author = "Wimer Hazenberg (http://www.monokai.nl)";
-const url = "";
+const url = "https://base16.netlify.app/previews/base16-monokai.html";
+const license = {
+  type: "?",
+  url: "?",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name}`, false, {
diff --git a/styles/src/themes/internal/nord.ts b/styles/src/themes/internal/nord.ts
index 00902e60fa..5e303fcd47 100644
--- a/styles/src/themes/internal/nord.ts
+++ b/styles/src/themes/internal/nord.ts
@@ -3,7 +3,11 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 
 const name = "Nord";
 const author = "arcticicestudio";
-const url = "";
+const url = "https://www.nordtheme.com/";
+const license = {
+  type: "MIT",
+  url: "https://github.com/arcticicestudio/nord/blob/develop/LICENSE.md",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name}`, false, {
diff --git a/styles/src/themes/internal/seti-ui.ts b/styles/src/themes/internal/seti-ui.ts
index 29b25500cd..d1c809f6d9 100644
--- a/styles/src/themes/internal/seti-ui.ts
+++ b/styles/src/themes/internal/seti-ui.ts
@@ -3,7 +3,11 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 
 const name = "Seti UI";
 const author = "jesseweed";
-const url = "";
+const url = "https://github.com/jesseweed/seti-ui";
+const license = {
+  type: "MIT",
+  url: "https://github.com/jesseweed/seti-ui/blob/master/LICENSE.md",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name}`, false, {
diff --git a/styles/src/themes/internal/tokyo-night-storm.ts b/styles/src/themes/internal/tokyo-night-storm.ts
index 2aa08f8cec..009c0f2969 100644
--- a/styles/src/themes/internal/tokyo-night-storm.ts
+++ b/styles/src/themes/internal/tokyo-night-storm.ts
@@ -4,6 +4,10 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 const name = "Tokyo Night Storm";
 const author = "ghifarit53";
 const url = "https://github.com/ghifarit53/tokyonight-vim";
+const license = {
+  type: "MIT",
+  url: "https://github.com/ghifarit53/tokyonight-vim/blob/master/LICENSE",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name}`, false, {
diff --git a/styles/src/themes/internal/tokyo-night.ts b/styles/src/themes/internal/tokyo-night.ts
index 23805daf46..fb3f3e1b33 100644
--- a/styles/src/themes/internal/tokyo-night.ts
+++ b/styles/src/themes/internal/tokyo-night.ts
@@ -4,6 +4,10 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 const name = "Tokyo";
 const author = "Michaël Ball";
 const url = "https://github.com/folke/tokyonight.nvim";
+const license = {
+  type: "Apache License 2.0",
+  url: "https://github.com/folke/tokyonight.nvim/blob/main/LICENSE",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name} Night`, false, {
diff --git a/styles/src/themes/internal/twilight.ts b/styles/src/themes/internal/twilight.ts
deleted file mode 100644
index 98e83588ac..0000000000
--- a/styles/src/themes/internal/twilight.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import chroma from "chroma-js";
-import { colorRamp, createColorScheme } from "../common/ramps";
-
-const name = "Twilight";
-const author = "David Hart (https://github.com/hartbit)";
-const url = "";
-
-// `name-[light|dark]`, isLight, color ramps
-export const dark = createColorScheme(`${name}`, false, {
-  neutral: chroma.scale([
-    "#1e1e1e",
-    "#323537",
-    "#464b50",
-    "#5f5a60",
-    "#838184",
-    "#a7a7a7",
-    "#c3c3c3",
-    "#ffffff",
-  ]),
-  red: colorRamp(chroma("#cf6a4c")),
-  orange: colorRamp(chroma("#cda869")),
-  yellow: colorRamp(chroma("#f9ee98")),
-  green: colorRamp(chroma("#8f9d6a")),
-  cyan: colorRamp(chroma("#afc4db")),
-  blue: colorRamp(chroma("#7587a6")),
-  violet: colorRamp(chroma("#9b859d")),
-  magenta: colorRamp(chroma("#9b703f")),
-});
diff --git a/styles/src/themes/internal/zed-pro.ts b/styles/src/themes/internal/zed-pro.ts
index aa91f76c22..38f3268930 100644
--- a/styles/src/themes/internal/zed-pro.ts
+++ b/styles/src/themes/internal/zed-pro.ts
@@ -4,6 +4,10 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 const name = "Zed Pro";
 const author = "Nate Butler"
 const url = "https://github.com/iamnbutler"
+const license = {
+  type: "?",
+  url: "?",
+};
 
 const ramps = {
   neutral: chroma
diff --git a/styles/src/themes/internal/zenburn.ts b/styles/src/themes/internal/zenburn.ts
index 76692be270..7ad3e31ee1 100644
--- a/styles/src/themes/internal/zenburn.ts
+++ b/styles/src/themes/internal/zenburn.ts
@@ -3,7 +3,11 @@ import { colorRamp, createColorScheme } from "../common/ramps";
 
 const name = "Zenburn";
 const author = "elnawe";
-const url = "";
+const url = "https://github.com/elnawe/base16-zenburn-scheme";
+const license = {
+  type: "?",
+  url: "https://github.com/elnawe/base16-zenburn-scheme/blob/master/zenburn.yaml",
+};
 
 // `name-[light|dark]`, isLight, color ramps
 export const dark = createColorScheme(`${name}`, false, {
diff --git a/styles/src/themes/one-dark.ts b/styles/src/themes/one-dark.ts
new file mode 100644
index 0000000000..612a71ccc1
--- /dev/null
+++ b/styles/src/themes/one-dark.ts
@@ -0,0 +1,34 @@
+import chroma from "chroma-js";
+import { colorRamp, createColorScheme } from "./common/ramps";
+
+const name = "One Dark";
+const author = "simurai";
+const url = "https://github.com/atom/atom/tree/master/packages/one-dark-ui";
+const license = {
+  type: "MIT",
+  url: "https://github.com/atom/atom/blob/master/packages/one-dark-ui/LICENSE.md",
+};
+
+export const dark = createColorScheme(`${name}`, false, {
+  neutral: chroma
+    .scale([
+      "#282c34",
+      "#353b45",
+      "#3e4451",
+      "#545862",
+      "#565c64",
+      "#abb2bf",
+      "#b6bdca",
+      "#c8ccd4",
+    ])
+    .domain([0.05, 0.22, 0.25, 0.45, 0.62, 0.8, 0.9, 1]),
+
+  red: colorRamp(chroma("#e06c75")),
+  orange: colorRamp(chroma("#d19a66")),
+  yellow: colorRamp(chroma("#e5c07b")),
+  green: colorRamp(chroma("#98c379")),
+  cyan: colorRamp(chroma("#56b6c2")),
+  blue: colorRamp(chroma("#61afef")),
+  violet: colorRamp(chroma("#c678dd")),
+  magenta: colorRamp(chroma("#be5046")),
+});
diff --git a/styles/src/themes/one-light.ts b/styles/src/themes/one-light.ts
new file mode 100644
index 0000000000..d8c8e5272c
--- /dev/null
+++ b/styles/src/themes/one-light.ts
@@ -0,0 +1,33 @@
+import chroma from "chroma-js";
+import { colorRamp, createColorScheme } from "./common/ramps";
+
+const name = "One Light";
+const author = "simurai";
+const url = "https://github.com/atom/atom/tree/master/packages/one-light-ui";
+const license = {
+  type: "MIT",
+  url: "https://github.com/atom/atom/blob/master/packages/one-light-ui/LICENSE.md",
+};
+
+export const light = createColorScheme(`${name}`, true, {
+  neutral: chroma.scale([
+      "#090a0b",
+      "#202227",
+      "#383a42",
+      "#696c77",
+      "#a0a1a7",
+      "#e5e5e6",
+      "#f0f0f1",
+      "#fafafa",
+    ])
+    .domain([0.05, 0.22, 0.25, 0.45, 0.62, 0.8, 0.9, 1]),
+
+  red: colorRamp(chroma("#ca1243")),
+  orange: colorRamp(chroma("#d75f00")),
+  yellow: colorRamp(chroma("#c18401")),
+  green: colorRamp(chroma("#50a14f")),
+  cyan: colorRamp(chroma("#0184bc")),
+  blue: colorRamp(chroma("#4078f2")),
+  violet: colorRamp(chroma("#a626a4")),
+  magenta: colorRamp(chroma("#986801")),
+});
diff --git a/styles/src/themes/one.ts b/styles/src/themes/one.ts
deleted file mode 100644
index f0872d020e..0000000000
--- a/styles/src/themes/one.ts
+++ /dev/null
@@ -1,58 +0,0 @@
-import chroma from "chroma-js";
-import { colorRamp, createColorScheme } from "./common/ramps";
-
-const name = "One";
-const author = "";
-const url = "";
-const license = {
-  type: "",
-  url: "",
-};
-
-export const dark = createColorScheme(`${name} Dark`, false, {
-  neutral: chroma
-    .scale([
-      "#282c34",
-      "#353b45",
-      "#3e4451",
-      "#545862",
-      "#565c64",
-      "#abb2bf",
-      "#b6bdca",
-      "#c8ccd4",
-    ])
-    .domain([0.05, 0.22, 0.25, 0.45, 0.62, 0.8, 0.9, 1]),
-
-  red: colorRamp(chroma("#e06c75")),
-  orange: colorRamp(chroma("#d19a66")),
-  yellow: colorRamp(chroma("#e5c07b")),
-  green: colorRamp(chroma("#98c379")),
-  cyan: colorRamp(chroma("#56b6c2")),
-  blue: colorRamp(chroma("#61afef")),
-  violet: colorRamp(chroma("#c678dd")),
-  magenta: colorRamp(chroma("#be5046")),
-});
-
-export const light = createColorScheme(`${name} Light`, true, {
-  neutral: chroma
-    .scale([
-      "#090a0b",
-      "#202227",
-      "#383a42",
-      "#696c77",
-      "#a0a1a7",
-      "#e5e5e6",
-      "#f0f0f1",
-      "#fafafa",
-    ])
-    .domain([0.05, 0.22, 0.25, 0.45, 0.62, 0.8, 0.9, 1]),
-
-  red: colorRamp(chroma("#ca1243")),
-  orange: colorRamp(chroma("#d75f00")),
-  yellow: colorRamp(chroma("#c18401")),
-  green: colorRamp(chroma("#50a14f")),
-  cyan: colorRamp(chroma("#0184bc")),
-  blue: colorRamp(chroma("#4078f2")),
-  violet: colorRamp(chroma("#a626a4")),
-  magenta: colorRamp(chroma("#986801")),
-});
diff --git a/styles/src/themes/rose-pine-dawn.ts b/styles/src/themes/rose-pine-dawn.ts
index 1c5866b3ff..20d5dd1ebe 100644
--- a/styles/src/themes/rose-pine-dawn.ts
+++ b/styles/src/themes/rose-pine-dawn.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Rosé Pine Dawn";
-const author = "";
-const url = "";
+const author = "edunfelt";
+const url = "https://github.com/edunfelt/base16-rose-pine-scheme";
+const license = {
+  type: "MIT",
+  url: "https://github.com/edunfelt/base16-rose-pine-scheme/blob/main/rose-pine-dawn.yaml",
+};
 
 const ramps = {
   neutral: chroma
diff --git a/styles/src/themes/rose-pine-moon.ts b/styles/src/themes/rose-pine-moon.ts
index 27e2caf07b..5920357bd3 100644
--- a/styles/src/themes/rose-pine-moon.ts
+++ b/styles/src/themes/rose-pine-moon.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Rosé Pine Moon";
-const author = "";
-const url = "";
+const author = "edunfelt";
+const url = "https://github.com/edunfelt/base16-rose-pine-scheme";
+const license = {
+  type: "MIT",
+  url: "https://github.com/edunfelt/base16-rose-pine-scheme/blob/main/rose-pine-moon.yaml",
+};
 
 const ramps = {
   neutral: chroma
diff --git a/styles/src/themes/rose-pine.ts b/styles/src/themes/rose-pine.ts
index 5e6f6d028e..9144a136d2 100644
--- a/styles/src/themes/rose-pine.ts
+++ b/styles/src/themes/rose-pine.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Rosé Pine";
-const author = "";
-const url = "";
+const author = "edunfelt";
+const url = "https://github.com/edunfelt/base16-rose-pine-scheme";
+const license = {
+  type: "MIT",
+  url: "https://github.com/edunfelt/base16-rose-pine-scheme",
+};
 
 const ramps = {
   neutral: chroma.scale([
diff --git a/styles/src/themes/sandcastle.ts b/styles/src/themes/sandcastle.ts
index 51ca87913f..c625ab2986 100644
--- a/styles/src/themes/sandcastle.ts
+++ b/styles/src/themes/sandcastle.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Sandcastle";
-const author = "";
-const url = "";
+const author = "gessig";
+const url = "https://github.com/gessig/base16-sandcastle-scheme";
+const license = {
+  type: "MIT",
+  url: "https://github.com/gessig/base16-sandcastle-scheme/blob/master/LICENSE",
+};
 
 const ramps = {
   neutral: chroma.scale([
diff --git a/styles/src/themes/solarized.ts b/styles/src/themes/solarized.ts
index 18c10c35c3..3e0fff61e8 100644
--- a/styles/src/themes/solarized.ts
+++ b/styles/src/themes/solarized.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Solarized";
-const author = "";
-const url = "";
+const author = "Ethan Schoonover";
+const url = "https://github.com/altercation/solarized";
+const license = {
+  type: "MIT",
+  url: "https://github.com/altercation/solarized/blob/master/README.md",
+};
 
 const ramps = {
   neutral: chroma
diff --git a/styles/src/themes/summercamp.ts b/styles/src/themes/summercamp.ts
index 8c66e3690b..bc5b7e1d24 100644
--- a/styles/src/themes/summercamp.ts
+++ b/styles/src/themes/summercamp.ts
@@ -2,8 +2,12 @@ import chroma from "chroma-js";
 import { colorRamp, createColorScheme } from "./common/ramps";
 
 const name = "Summercamp";
-const author = "";
-const url = "";
+const author = "zoefiri";
+const url = "https://github.com/zoefiri/base16-sc";
+const license = {
+  type: "MIT",
+  url: "https://github.com/zoefiri/base16-sc/blob/master/summercamp.yaml",
+};
 
 const ramps = {
   neutral: chroma