diff --git a/frontend/src/lib/components/TextFieldSelect.svelte b/frontend/src/lib/components/TextFieldSelect.svelte
index 8f236fa..360ff22 100644
--- a/frontend/src/lib/components/TextFieldSelect.svelte
+++ b/frontend/src/lib/components/TextFieldSelect.svelte
@@ -328,7 +328,7 @@
 									id="{listboxId}-option-{index}"
 									role="option"
 									aria-selected={value === option}
-									class="w-full text-left bg-slate-100 dark:bg-gray-600 rounded-md text-gray-600 dark:text-gray-200 hover:bg-grayblue-dark dark:hover:bg-gray-500 hover:text-white py-2 px-2 cursor-pointer focus:bg-grayblue-dark dark:focus:bg-gray-500 focus:text-white focus:outline-none transition-colors duration-200"
+									class="w-full text-left bg-slate-100 dark:bg-gray-700 rounded-md text-gray-600 dark:text-gray-200 hover:bg-grayblue-dark dark:hover:bg-gray-500 hover:text-white py-2 px-2 cursor-pointer focus:bg-grayblue-dark dark:focus:bg-gray-500 focus:text-white focus:outline-none transition-colors duration-200"
 									on:click={(e) => {
 										e.preventDefault();
 										e.stopPropagation();
@@ -344,7 +344,7 @@
 					{:else}
 						<li
 							role="none"
-							class="w-full bg-slate-100 dark:bg-gray-600 rounded-md text-gray-600 dark:text-gray-300 py-2 px-2 transition-colors duration-200"
+							class="w-full bg-slate-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 py-2 px-2 transition-colors duration-200"
 						>
 							No options available
 						</li>
diff --git a/frontend/src/lib/components/editor/SimpleCodeEditor.svelte b/frontend/src/lib/components/editor/SimpleCodeEditor.svelte
index 3cf879b..7b11b42 100644
--- a/frontend/src/lib/components/editor/SimpleCodeEditor.svelte
+++ b/frontend/src/lib/components/editor/SimpleCodeEditor.svelte
@@ -64,7 +64,7 @@
 		editor = monaco.editor.create(editorContainer, {
 			value: value || '',
 			language: language,
-			theme: isDark ? 'vs-dark' : 'vs-light',
+			theme: 'vs-dark',
 			automaticLayout: true,
 			minimap: {
 				enabled: false
@@ -113,12 +113,14 @@
 </script>
 
 <div class="w-full">
-	<div
-		bind:this={editorContainer}
-		class="border border-gray-300 dark:border-gray-600 rounded-md {heightClasses[
-			height
-		]} w-full transition-colors duration-200"
-	></div>
+	<div class="bg-white dark:bg-gray-800 transition-colors duration-200 rounded-md">
+		<div
+			bind:this={editorContainer}
+			class="border-2 border-black dark:border-gray-600 bg-white dark:bg-gray-900 rounded-md {heightClasses[
+				height
+			]} w-full transition-colors duration-200"
+		></div>
+	</div>
 	{#if placeholder}
 		<div class="mt-2">
 			<button
diff --git a/frontend/src/lib/components/form/TextFieldSelectWithType.svelte b/frontend/src/lib/components/form/TextFieldSelectWithType.svelte
index b6fb393..791618a 100644
--- a/frontend/src/lib/components/form/TextFieldSelectWithType.svelte
+++ b/frontend/src/lib/components/form/TextFieldSelectWithType.svelte
@@ -373,7 +373,7 @@
 									id="{listboxId}-option-{index}"
 									role="option"
 									aria-selected={value === option}
-									class="w-full text-left bg-slate-100 dark:bg-gray-600 rounded-md text-gray-600 dark:text-gray-200 hover:bg-grayblue-dark dark:hover:bg-gray-500 hover:text-white py-2 px-2 cursor-pointer focus:bg-grayblue-dark dark:focus:bg-gray-500 focus:text-white focus:outline-none transition-colors duration-200"
+									class="w-full text-left bg-slate-100 dark:bg-gray-700 rounded-md text-gray-600 dark:text-gray-200 hover:bg-grayblue-dark dark:hover:bg-gray-500 hover:text-white py-2 px-2 cursor-pointer focus:bg-grayblue-dark dark:focus:bg-gray-500 focus:text-white focus:outline-none transition-colors duration-200"
 									on:click={(e) => {
 										e.preventDefault();
 										e.stopPropagation();
@@ -389,7 +389,7 @@
 					{:else}
 						<li
 							role="none"
-							class="w-full bg-slate-100 dark:bg-gray-600 rounded-md text-gray-600 dark:text-gray-300 py-2 px-2 transition-colors duration-200"
+							class="w-full bg-slate-100 dark:bg-gray-700 text-gray-600 dark:text-gray-300 py-2 px-2 transition-colors duration-200"
 						>
 							No {type === 'proxy' ? 'Proxies' : 'pages'} available
 						</li>