From 9318daed94acac24cfe9d796c16d7d47d5ea6602 Mon Sep 17 00:00:00 2001
From: Bernard Xie <bernard@terrastruct.com>
Date: Wed, 9 Nov 2022 17:11:40 -0800
Subject: [PATCH 1/3] Add two new themes

---
 d2themes/d2themescatalog/buttered_toast.go    | 25 +++++++++++++++++++
 d2themes/d2themescatalog/catalog.go           |  2 ++
 .../d2themescatalog/granny_smith_apple.go     | 25 +++++++++++++++++++
 3 files changed, 52 insertions(+)
 create mode 100644 d2themes/d2themescatalog/buttered_toast.go
 create mode 100644 d2themes/d2themescatalog/granny_smith_apple.go

diff --git a/d2themes/d2themescatalog/buttered_toast.go b/d2themes/d2themescatalog/buttered_toast.go
new file mode 100644
index 000000000..e1b071220
--- /dev/null
+++ b/d2themes/d2themescatalog/buttered_toast.go
@@ -0,0 +1,25 @@
+package d2themescatalog
+
+import "oss.terrastruct.com/d2/d2themes"
+
+var ButteredToast = d2themes.Theme{
+	ID:   105,
+	Name: "Buttered toast",
+	Colors: d2themes.ColorPalette{
+		Neutrals: d2themes.CoolNeutral,
+
+		B1: "#312102",
+		B2: "#DF9C18",
+		B3: "#FDC659",
+		B4: "#FFDA90",
+		B5: "#FFF0D1",
+		B6: "#FFF7E7",
+
+		AA2: "#55452F",
+		AA4: "#C9B9A1",
+		AA5: "#E9DBCA",
+
+		AB4: "#FABA8A",
+		AB5: "#FFE0C7",
+	},
+}
diff --git a/d2themes/d2themescatalog/catalog.go b/d2themes/d2themescatalog/catalog.go
index 285a3499e..58e836073 100644
--- a/d2themes/d2themescatalog/catalog.go
+++ b/d2themes/d2themescatalog/catalog.go
@@ -20,6 +20,8 @@ var Catalog = []d2themes.Theme{
 	OrangeCreamsicle,
 	ShirleyTemple,
 	EarthTones,
+	GrannySmithApple,
+	ButteredToast,
 }
 
 func Find(id int64) d2themes.Theme {
diff --git a/d2themes/d2themescatalog/granny_smith_apple.go b/d2themes/d2themescatalog/granny_smith_apple.go
new file mode 100644
index 000000000..57f7950d2
--- /dev/null
+++ b/d2themes/d2themescatalog/granny_smith_apple.go
@@ -0,0 +1,25 @@
+package d2themescatalog
+
+import "oss.terrastruct.com/d2/d2themes"
+
+var GrannySmithApple = d2themes.Theme{
+	ID:   104,
+	Name: "Granny smith apple",
+	Colors: d2themes.ColorPalette{
+		Neutrals: d2themes.CoolNeutral,
+
+		B1: "#023324",
+		B2: "#048E63",
+		B3: "#49BC99",
+		B4: "#A6E2D0",
+		B5: "#CAF2E6",
+		B6: "#EBFDF7",
+
+		AA2: "#D35F0A",
+		AA4: "#FABA8A",
+		AA5: "#FFE0C7",
+
+		AB4: "#C9B9A1",
+		AB5: "#E9DBCA",
+	},
+}

From 45b3ca7562c248424e7b3c8c2ff2bc6b26241711 Mon Sep 17 00:00:00 2001
From: Bernard Xie <bernard@terrastruct.com>
Date: Thu, 10 Nov 2022 11:00:29 -0800
Subject: [PATCH 2/3] rename to everglade green

---
 d2themes/d2themescatalog/catalog.go                           | 2 +-
 .../{granny_smith_apple.go => everglade_green.go}             | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)
 rename d2themes/d2themescatalog/{granny_smith_apple.go => everglade_green.go} (83%)

diff --git a/d2themes/d2themescatalog/catalog.go b/d2themes/d2themescatalog/catalog.go
index 58e836073..4e059029b 100644
--- a/d2themes/d2themescatalog/catalog.go
+++ b/d2themes/d2themescatalog/catalog.go
@@ -20,7 +20,7 @@ var Catalog = []d2themes.Theme{
 	OrangeCreamsicle,
 	ShirleyTemple,
 	EarthTones,
-	GrannySmithApple,
+	EvergladeGreen,
 	ButteredToast,
 }
 
diff --git a/d2themes/d2themescatalog/granny_smith_apple.go b/d2themes/d2themescatalog/everglade_green.go
similarity index 83%
rename from d2themes/d2themescatalog/granny_smith_apple.go
rename to d2themes/d2themescatalog/everglade_green.go
index 57f7950d2..29151172d 100644
--- a/d2themes/d2themescatalog/granny_smith_apple.go
+++ b/d2themes/d2themescatalog/everglade_green.go
@@ -2,9 +2,9 @@ package d2themescatalog
 
 import "oss.terrastruct.com/d2/d2themes"
 
-var GrannySmithApple = d2themes.Theme{
+var EvergladeGreen = d2themes.Theme{
 	ID:   104,
-	Name: "Granny smith apple",
+	Name: "Everyglade green",
 	Colors: d2themes.ColorPalette{
 		Neutrals: d2themes.CoolNeutral,
 

From a5d2c92ab42dabf61b7daba3c490fc7ae7bab274 Mon Sep 17 00:00:00 2001
From: Bernard Xie <bernard@terrastruct.com>
Date: Thu, 10 Nov 2022 11:01:08 -0800
Subject: [PATCH 3/3] change to warm neutral

---
 d2themes/d2themescatalog/buttered_toast.go  | 2 +-
 d2themes/d2themescatalog/everglade_green.go | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/d2themes/d2themescatalog/buttered_toast.go b/d2themes/d2themescatalog/buttered_toast.go
index e1b071220..2dce552b0 100644
--- a/d2themes/d2themescatalog/buttered_toast.go
+++ b/d2themes/d2themescatalog/buttered_toast.go
@@ -6,7 +6,7 @@ var ButteredToast = d2themes.Theme{
 	ID:   105,
 	Name: "Buttered toast",
 	Colors: d2themes.ColorPalette{
-		Neutrals: d2themes.CoolNeutral,
+		Neutrals: d2themes.WarmNeutral,
 
 		B1: "#312102",
 		B2: "#DF9C18",
diff --git a/d2themes/d2themescatalog/everglade_green.go b/d2themes/d2themescatalog/everglade_green.go
index 29151172d..7e2b8a74f 100644
--- a/d2themes/d2themescatalog/everglade_green.go
+++ b/d2themes/d2themescatalog/everglade_green.go
@@ -6,7 +6,7 @@ var EvergladeGreen = d2themes.Theme{
 	ID:   104,
 	Name: "Everyglade green",
 	Colors: d2themes.ColorPalette{
-		Neutrals: d2themes.CoolNeutral,
+		Neutrals: d2themes.WarmNeutral,
 
 		B1: "#023324",
 		B2: "#048E63",