diff --git a/frontend/src/ts/constants/themes.ts b/frontend/src/ts/constants/themes.ts
index b7147af8068c..4d20e79f1446 100644
--- a/frontend/src/ts/constants/themes.ts
+++ b/frontend/src/ts/constants/themes.ts
@@ -1126,6 +1126,12 @@ export const themes: Record<ThemeName, Omit<Theme, "name">> = {
     subColor: "#ffaca3",
     textColor: "#feffdb",
   },
+  tokyonight_storm: {
+    bgColor: "#24283b",
+    mainColor: "#7aa2f7",
+    subColor: "#565f89",
+    textColor: "#a9b1d6",
+  },
 };
 
 export const ThemesList: Theme[] = Object.keys(themes)
diff --git a/frontend/static/themes/tokyonight_storm.css b/frontend/static/themes/tokyonight_storm.css
new file mode 100644
index 000000000000..36f8699a0551
--- /dev/null
+++ b/frontend/static/themes/tokyonight_storm.css
@@ -0,0 +1,12 @@
+:root {
+  --bg-color: #24283b;
+  --main-color: #7aa2f7;
+  --caret-color: #e0af68;
+  --sub-color: #565f89;
+  --sub-alt-color: #313858;
+  --text-color: #a9b1d6;
+  --error-color: #f7768e;
+  --error-extra-color: #ff9e64;
+  --colorful-error-color: #f7768e;
+  --colorful-error-extra-color: #ff9e64;
+}
diff --git a/packages/schemas/src/themes.ts b/packages/schemas/src/themes.ts
index ac5463a465e8..6c07af86c6c8 100644
--- a/packages/schemas/src/themes.ts
+++ b/packages/schemas/src/themes.ts
@@ -189,6 +189,7 @@ export const ThemeNameSchema = z.enum(
     "wavez",
     "witch_girl",
     "pale_nimbus",
+    "tokyonight_storm",
   ],
   {
     errorMap: customEnumErrorHandler("Must be a known theme"),