diff --git a/components/Editor/cairoLangConfig.ts b/components/Editor/cairoLangConfig.ts
index 9ca5ad9..85f3dc4 100644
--- a/components/Editor/cairoLangConfig.ts
+++ b/components/Editor/cairoLangConfig.ts
@@ -191,7 +191,7 @@ export function registerCairoLanguageSupport(_monaco: typeof MonacoEditor) {
       ],
     },
   })
-  _monaco.editor.defineTheme('myTheme', {
+  _monaco.editor.defineTheme('light-theme', {
     base: 'vs',
     inherit: true,
     rules: [
@@ -208,5 +208,18 @@ export function registerCairoLanguageSupport(_monaco: typeof MonacoEditor) {
       'editor.inactiveSelectionBackground': '#88000015',
     },
   })
-  _monaco.editor.setTheme('myTheme')
+  _monaco.editor.defineTheme('dark-theme', {
+    base: 'vs-dark',
+    inherit: true,
+    rules: [
+      {
+        foreground: '#981B64',
+        token: 'variableinit',
+      },
+    ],
+    colors: {
+      'editor.background': '#141515',
+      'editor.lineHighlightBackground': '#1e1e1e',
+    },
+  })
 }
diff --git a/components/Editor/index.tsx b/components/Editor/index.tsx
index 2bf5b96..22f149c 100644
--- a/components/Editor/index.tsx
+++ b/components/Editor/index.tsx
@@ -14,6 +14,7 @@ import copy from 'copy-to-clipboard'
 import { Priority, useRegisterActions } from 'kbar'
 import { editor } from 'monaco-editor'
 import { useRouter } from 'next/router'
+import { useTheme } from 'next-themes'
 
 import {
   CairoVMApiContext,
@@ -66,6 +67,8 @@ const Editor = ({ readOnly = false }: Props) => {
 
   const { addToConsoleLog, isThreeColumnLayout } = useContext(AppUiContext)
 
+  const { theme } = useTheme()
+
   const [cairoCode, setCairoCode] = useState('')
   const [compiledCairoCode, setCompiledCairoCode] = useState(cairoCode)
   const [exampleOption, setExampleOption] = useState<number>(0)
@@ -74,12 +77,28 @@ const Editor = ({ readOnly = false }: Props) => {
 
   const editorRef = useRef<editor.IStandaloneCodeEditor>()
   const monaco = useMonaco()
+
+  useEffect(() => {
+    // when theme is changed, we again set theme of editor
+    if (theme === 'dark') {
+      monaco?.editor.setTheme('dark-theme')
+    } else {
+      monaco?.editor.setTheme('light-theme')
+    }
+  }, [monaco?.editor, theme])
+
   const handleEditorDidMount = async (
     editor: editor.IStandaloneCodeEditor,
     monaco: Monaco,
   ) => {
     editorRef.current = editor
     registerCairoLanguageSupport(monaco as any)
+    // once the editor is mounted we set the user selected theme
+    if (theme === 'dark') {
+      monaco.editor.setTheme('dark-theme')
+    } else {
+      monaco.editor.setTheme('light-theme')
+    }
   }
 
   const [decorations, setDecorations] = useState([])