diff --git a/.theme-schema.json b/.theme-schema.json
index c6a7e8e1..1d33be0e 100644
--- a/.theme-schema.json
+++ b/.theme-schema.json
@@ -118,14 +118,6 @@
           "description": "Default border color",
           "type": ["string", "null"]
         },
-        "card.background": {
-          "description": "Background color for Card.",
-          "type": ["string", "null"]
-        },
-        "card.foreground": {
-          "description": "Text color for Card.",
-          "type": ["string", "null"]
-        },
         "caret": {
           "description": "Input caret color (Blinking cursor).",
           "type": ["string", "null"]
@@ -186,6 +178,18 @@
           "description": "Default text color.",
           "type": ["string", "null"]
         },
+        "group_box.background": {
+          "description": "Background color for GroupBox.",
+          "type": ["string", "null"]
+        },
+        "group_box.foreground": {
+          "description": "Foreground color for GroupBox.",
+          "type": ["string", "null"]
+        },
+        "group_box.title.foreground": {
+          "description": "Title text color for GroupBox.",
+          "type": ["string", "null"]
+        },
         "info.background": {
           "description": "Info background color.",
           "type": ["string", "null"]
diff --git a/themes/default.json b/themes/default.json
index 38ed4d0e..b722fc30 100644
--- a/themes/default.json
+++ b/themes/default.json
@@ -404,7 +404,7 @@
             "font_weight": 600
           },
           "type": {
-            "color": "#ec642a"
+            "color": "#c75828"
           },
           "property": {
             "color": "#CACCCA"
diff --git a/themes/gruvbox.json b/themes/gruvbox.json
index 6fd8b50d..6126a3c3 100644
--- a/themes/gruvbox.json
+++ b/themes/gruvbox.json
@@ -161,8 +161,6 @@
         "accent.foreground": "#ebdbb2",
         "background": "#1d2021",
         "border": "#3e3936",
-        "card.background": "#282828",
-        "card.foreground": "#ebdbb2",
         "danger.active.background": "#fb4934",
         "foreground": "#ebdbb2",
         "input.border": "#504945",
diff --git a/themes/macos-classic.json b/themes/macos-classic.json
index 68f3f7d2..d01f2bb7 100644
--- a/themes/macos-classic.json
+++ b/themes/macos-classic.json
@@ -280,7 +280,7 @@
             "font_weight": 600
           },
           "type": {
-            "color": "#ec642a"
+            "color": "#c75828"
           },
           "property": {
             "color": "#CACCCA"
diff --git a/themes/mellifluous.json b/themes/mellifluous.json
index 2a8f342b..645452db 100644
--- a/themes/mellifluous.json
+++ b/themes/mellifluous.json
@@ -159,8 +159,6 @@
         "accent.foreground": "#abb2bf",
         "background": "#1A1A1A",
         "border": "#444444",
-        "card.background": "#282c34",
-        "card.foreground": "#abb2bf",
         "foreground": "#abb2bf",
         "input.border": "#444444",
         "link.active.foreground": "#5A6599",
diff --git a/themes/molokai.json b/themes/molokai.json
index 1e3946ce..ae7a8fa4 100644
--- a/themes/molokai.json
+++ b/themes/molokai.json
@@ -147,8 +147,6 @@
         "accent.foreground": "#f8f8f2",
         "background": "#1b1d1e",
         "border": "#3b3b3b",
-        "card.background": "#272822",
-        "card.foreground": "#f8f8f2",
         "foreground": "#f8f8f2",
         "input.border": "#3b3b3b",
         "list.active.background": "#f9267211",
diff --git a/themes/solarized.json b/themes/solarized.json
index 4dd0e007..13243fab 100644
--- a/themes/solarized.json
+++ b/themes/solarized.json
@@ -154,8 +154,6 @@
         "accent.foreground": "#fdf6e3",
         "background": "#002B36",
         "border": "#083e4c",
-        "card.background": "#002b36",
-        "card.foreground": "#fdf6e3",
         "foreground": "#fdf6e3",
         "input.border": "#083e4c",
         "list.active.background": "#0d667d22",
diff --git a/themes/tokyonight.json b/themes/tokyonight.json
index c6815fb4..a1059aa0 100644
--- a/themes/tokyonight.json
+++ b/themes/tokyonight.json
@@ -153,8 +153,6 @@
         "border": "#3d4462",
         "window_border": "#3d4462",
         "ring": "#7aa2f7",
-        "card.background": "#292e42",
-        "card.foreground": "#c0caf5",
         "foreground": "#c0caf5",
         "input.border": "#414868",
         "link.active.foreground": "#7aa2f7",
@@ -287,8 +285,6 @@
         "border": "#323752",
         "window_border": "#404668",
         "ring": "#82aaff",
-        "card.background": "#2d3149",
-        "card.foreground": "#c0caf5",
         "foreground": "#c0caf5",
         "input.border": "#444b6a",
         "link.active.foreground": "#82aaff",