diff --git a/CLI/cmux.swift b/CLI/cmux.swift
index 7d8a0924..29b5608b 100644
--- a/CLI/cmux.swift
+++ b/CLI/cmux.swift
@@ -5405,6 +5405,7 @@ struct CMUXCLI {
         environment["CMUX_THEME_PICKER_CONFIG"] = try cmuxThemeOverrideConfigURL().path
         environment["CMUX_THEME_PICKER_BUNDLE_ID"] = currentCmuxAppBundleIdentifier() ?? Self.cmuxThemeOverrideBundleIdentifier
         environment["CMUX_THEME_PICKER_TARGET"] = defaultThemePickerTargetMode(current: selection).rawValue
+        environment["CMUX_THEME_PICKER_COLOR_SCHEME"] = defaultAppearancePrefersDarkThemes() ? "dark" : "light"
         if let light = selection.light {
             environment["CMUX_THEME_PICKER_INITIAL_LIGHT"] = light
         }
diff --git a/ghostty b/ghostty
index a8f08b0b..2ba8dfac 160000
--- a/ghostty
+++ b/ghostty
@@ -1 +1 @@
-Subproject commit a8f08b0bf0a263c6b84b4df69673d9ba8c93dd06
+Subproject commit 2ba8dfac27051c6566ceded486a1ea2af4b07f03