diff --git a/examples/theme_sandbox.py b/examples/theme_sandbox.py
index 57ca5f5cd9..6bbc4bdd91 100644
--- a/examples/theme_sandbox.py
+++ b/examples/theme_sandbox.py
@@ -142,7 +142,6 @@ class ChangingThemeApp(App[None]):
         }
     }
     #widget-list {
-        margin: 1 2;
     }
     #widget-list > * {
         margin: 1 2;
diff --git a/src/textual/command.py b/src/textual/command.py
index f21d687aae..8d77a8f8e7 100644
--- a/src/textual/command.py
+++ b/src/textual/command.py
@@ -446,14 +446,13 @@ class CommandList(OptionList, can_focus=False):
     CommandList {
         visibility: hidden;
         border-top: blank;
-        border-bottom: hkey $primary;
+        border-bottom: hkey $border;
         border-left: none;
         border-right: none;
         height: auto;
         max-height: 70vh;
         background: transparent;
         padding: 0;
-        text-style: bold;
     }
 
     CommandList:focus {
@@ -593,7 +592,7 @@ class CommandPalette(SystemModalScreen[None]):
     CommandPalette #--input {
         height: auto;
         visibility: visible;
-        border: hkey $primary;
+        border: hkey $border;
     }
 
     CommandPalette #--input.--list-visible {
@@ -618,7 +617,7 @@ class CommandPalette(SystemModalScreen[None]):
     CommandPalette LoadingIndicator {
         height: auto;
         visibility: hidden;
-        border-bottom: hkey $primary;
+        border-bottom: hkey $border;
     }
 
     CommandPalette LoadingIndicator.--visible {
diff --git a/src/textual/theme.py b/src/textual/theme.py
index 1106c6a9ef..ce04333387 100644
--- a/src/textual/theme.py
+++ b/src/textual/theme.py
@@ -198,18 +198,29 @@ def to_color_system(self) -> ColorSystem:
         panel="#414868",  # Panel
         dark=True,
     ),
-    "catppuccin": Theme(
-        name="catppuccin",
-        primary="#89DCEB",  # Sky
-        secondary="#F5C2E7",
+    "catppuccin-mocha": Theme(
+        name="catppuccin-mocha",
+        primary="#F5C2E7",
+        secondary="#b4befe",
         warning="#FAE3B0",
         error="#F28FAD",
         success="#ABE9B3",
         accent="#DDB6F2",
-        background="#1E1E2E",
-        surface="#302D41",
-        panel="#575268",
+        foreground="#cdd6f4",
+        background="#181825",
+        surface="#313244",
+        panel="#45475a",
         dark=True,
+        variables={
+            "input-cursor-foreground": "#11111b",
+            "input-cursor-background": "#f5e0dc",
+            "input-selection-background": "#9399b2 30%",
+            "border": "#45475a",
+            "border-blurred": "#585b70",
+            "footer-background": "#45475a",
+            "footer-key-foreground": "#89b4fa",
+            "block-cursor-foreground": "#1e1e2e",
+        },
     ),
     "monokai": Theme(
         name="monokai",