diff --git a/themes/devious-diamonds.omp.json b/themes/devious-diamonds.omp.json
index ba4d04b9..c9d3d80f 100644
--- a/themes/devious-diamonds.omp.json
+++ b/themes/devious-diamonds.omp.json
@@ -77,7 +77,7 @@
         },
         {
           "background": "p:bright-cyan",
-          "foreground": "p:dracula-white",
+          "foreground": "p:dracula-black",
           "powerline_symbol": "\ue0bc",
           "style": "powerline",
           "template": " \ue738 {{ .Full }}",
@@ -85,7 +85,7 @@
         },
         {
           "background": "p:bright-cyan",
-          "foreground": "p:dracula-white",
+          "foreground": "p:dracula-black",
           "powerline_symbol": "\ue0bc",
           "style": "powerline",
           "template": " \ue73d {{ .Full }} ",
@@ -93,7 +93,7 @@
         },
         {
           "background": "p:bright-green",
-          "foreground": "p:dracula-white",
+          "foreground": "p:dracula-black",
           "powerline_symbol": "\ue0bc",
           "properties": {
             "fetch_version": true
@@ -104,7 +104,7 @@
         },
         {
           "background": "p:bright-orange",
-          "foreground": "p:dracula-white",
+          "foreground": "p:dracula-black",
           "powerline_symbol": "\ue0bc",
           "properties": {
             "display_mode": "files",
@@ -116,7 +116,7 @@
         },
         {
           "background": "p:bright-red",
-          "foreground": "p:dracula-white",
+          "foreground": "p:dracula-black",
           "powerline_symbol": "\ue0bc",
           "properties": {
             "display_mode": "files",
@@ -148,10 +148,10 @@
         },
         {
           "background_templates": [
-            "{{if contains \"default\" .Profile}}#FFA400{{end}}",
-            "{{if contains \"jan\" .Profile}}#f1184c{{end}}"
+            "{{if contains \"default\" .Profile}}p:orange{{end}}",
+            "{{if contains \"jan\" .Profile}}p:pink{{end}}"
           ],
-          "foreground": "p:dracula-white",
+          "foreground": "p:dracula-black",
           "powerline_symbol": "\ue0bc",
           "properties": {
             "display_default": false
diff --git a/themes/schema.json b/themes/schema.json
index 526dcf77..7969a503 100644
--- a/themes/schema.json
+++ b/themes/schema.json
@@ -151,63 +151,64 @@
           "title": "Segment Type",
           "description": "https://ohmyposh.dev/docs/configuration/segment#type",
           "enum": [
-            "session",
-            "path",
-            "git",
-            "exit",
-            "python",
-            "root",
-            "time",
-            "text",
-            "command",
+            "az",
+            "aws",
+            "azfunc",
+            "angular",
             "battery",
+            "command",
+            "crystal",
+            "cds",
+            "cf",
+            "cftarget",
+            "dotnet",
+            "dart",
+            "exit",
+            "executiontime",
+            "git",
+            "go",
+            "haskell",
+            "ipify",
+            "iterm",
+            "julia",
+            "java",
+            "kubectl",
+            "kotlin",
+            "node",
+            "npm",
+            "os",
+            "owm",
+            "path",
+            "python",
+            "poshgit",
+            "php",
+            "plastic",
+            "project",
+            "root",
+            "ruby",
+            "rust",
+            "r",
+            "session",
             "spotify",
             "shell",
-            "node",
-            "os",
-            "az",
-            "kubectl",
-            "dotnet",
-            "terraform",
-            "go",
-            "julia",
-            "ruby",
-            "ytm",
-            "executiontime",
-            "aws",
-            "java",
-            "poshgit",
-            "azfunc",
-            "crystal",
-            "dart",
-            "rust",
-            "owm",
             "sysinfo",
             "strava",
-            "angular",
-            "php",
+            "swift",
+            "time",
+            "text",
+            "terraform",
+            "ui5tooling",
             "wakatime",
             "wifi",
             "winreg",
-            "plastic",
-            "ipify",
-            "haskell",
-            "ui5tooling",
-            "kotlin",
-            "swift",
-            "npm",
-            "project",
-            "r",
-            "cds",
-            "cf",
-            "cftarget"
+            "ytm"
           ]
         },
         "style": {
           "type": "string",
           "title": "Segment Style",
           "description": "https://ohmyposh.dev/docs/configuration/segment#style",
-          "enum": ["powerline", "plain", "diamond", "accordion"]
+          "enum": ["plain", "powerline", "diamond", "accordion"]
         },
         "foreground": { "$ref": "#/definitions/color" },
         "foreground_templates": { "$ref": "#/definitions/color_templates" },
@@ -342,11 +343,7 @@
                     "title": "Source",
                     "description": "https://ohmyposh.dev/docs/az#properties",
                     "default": "first_match",
-                    "enum": [
-                      "first_match",
-                      "cli",
-                      "pwsh"
-                    ]
+                    "enum": ["first_match", "cli", "pwsh"]
                   }
                 }
               }