diff --git a/src/components/code-editor.tsx b/src/components/code-editor.tsx
index 58aa98e..4ff4daf 100644
--- a/src/components/code-editor.tsx
+++ b/src/components/code-editor.tsx
@@ -6,13 +6,13 @@ import {
   WebSocketMessageWriter,
 } from "vscode-ws-jsonrpc";
 import dynamic from "next/dynamic";
-import { useTheme } from "next-themes";
 import normalizeUrl from "normalize-url";
 import { highlighter } from "@/lib/shiki";
 import { useEffect, useRef } from "react";
 import { shikiToMonaco } from "@shikijs/monaco";
 import { Skeleton } from "@/components/ui/skeleton";
 import { CODE_EDITOR_OPTIONS } from "@/constants/option";
+import { useMonacoTheme } from "@/hooks/use-monaco-theme";
 import { DEFAULT_EDITOR_PATH } from "@/config/editor/path";
 import { DEFAULT_EDITOR_VALUE } from "@/config/editor/value";
 import type { MonacoLanguageClient } from "monaco-languageclient";
@@ -46,7 +46,7 @@ type ConnectionHandle = {
 };
 
 export default function CodeEditor() {
-  const { resolvedTheme } = useTheme();
+  const { monacoTheme } = useMonacoTheme();
   const connectionRef = useRef<ConnectionHandle>({
     client: null,
     socket: null,
@@ -210,7 +210,7 @@ export default function CodeEditor() {
       defaultLanguage={language}
       value={editorValue}
       path={DEFAULT_EDITOR_PATH[language]}
-      theme={resolvedTheme === "light" ? "github-light-default" : "github-dark-default"}
+      theme={monacoTheme}
       className="h-full"
       options={mergeOptions}
       beforeMount={(monaco) => {
diff --git a/src/config/monaco-theme.ts b/src/config/monaco-theme.ts
new file mode 100644
index 0000000..06600b4
--- /dev/null
+++ b/src/config/monaco-theme.ts
@@ -0,0 +1,9 @@
+import { MonacoTheme } from "@/types/monaco-theme";
+
+// Define theme configurations
+const MonacoThemeConfig = {
+    light: MonacoTheme.GitHubLightDefault,  // Light theme
+    dark: MonacoTheme.GitHubDarkDefault,    // Dark theme
+};
+
+export { MonacoThemeConfig };
diff --git a/src/hooks/use-monaco-theme.ts b/src/hooks/use-monaco-theme.ts
new file mode 100644
index 0000000..5797e88
--- /dev/null
+++ b/src/hooks/use-monaco-theme.ts
@@ -0,0 +1,12 @@
+import { useTheme } from "next-themes";
+import { MonacoThemeConfig } from "@/config/monaco-theme";
+
+export function useMonacoTheme() {
+  const { resolvedTheme } = useTheme();
+
+  const monacoTheme = resolvedTheme === "light" ? MonacoThemeConfig.light : MonacoThemeConfig.dark;
+
+  return {
+    monacoTheme,
+  };
+}
diff --git a/src/types/monaco-theme.ts b/src/types/monaco-theme.ts
new file mode 100644
index 0000000..8154fde
--- /dev/null
+++ b/src/types/monaco-theme.ts
@@ -0,0 +1,4 @@
+export enum MonacoTheme {
+  GitHubLightDefault = "github-light-default",
+  GitHubDarkDefault = "github-dark-default",
+}