diff --git a/website/solv-epics-dev/src/app/[locale]/layout.tsx b/website/solv-epics-dev/src/app/[locale]/layout.tsx
index ca8f146d..a5bde3c7 100644
--- a/website/solv-epics-dev/src/app/[locale]/layout.tsx
+++ b/website/solv-epics-dev/src/app/[locale]/layout.tsx
@@ -42,12 +42,7 @@ export default async function LocaleLayout({
         className={cn(`${inter.variable} ${notoSansJP.variable}`)}
         suppressHydrationWarning
       >
-        <ThemeProvider
-          attribute="class"
-          defaultTheme="dark"
-          enableSystem={false}
-          disableTransitionOnChange
-        >
+        <ThemeProvider attribute="class" defaultTheme="dark">
           <NextIntlClientProvider messages={messages}>
             {children}
             <Toaster />
diff --git a/website/solv-epics-dev/src/app/globals.css b/website/solv-epics-dev/src/app/globals.css
index 289870ba..107c440c 100644
--- a/website/solv-epics-dev/src/app/globals.css
+++ b/website/solv-epics-dev/src/app/globals.css
@@ -85,6 +85,12 @@
       'Segoe UI Symbol',
       'Noto Color Emoji';
   }
+  ::selection {
+    background-color: rgba(209, 213, 219, 0.5);
+  }
+  .dark ::selection {
+    background-color: rgba(82, 82, 91, 0.5);
+  }
 }
 
 @layer base {
diff --git a/website/solv-epics-dev/src/components/config/ModeToggle.tsx b/website/solv-epics-dev/src/components/config/ModeToggle.tsx
index 4e4e9894..507dfb67 100644
--- a/website/solv-epics-dev/src/components/config/ModeToggle.tsx
+++ b/website/solv-epics-dev/src/components/config/ModeToggle.tsx
@@ -39,9 +39,9 @@ export function ModeToggle() {
         <DropdownMenuItem onClick={() => setTheme('dark')}>
           {t('common.darkMode')}
         </DropdownMenuItem>
-        {/* <DropdownMenuItem onClick={() => setTheme('system')}>
+        <DropdownMenuItem onClick={() => setTheme('system')}>
           {t('common.systemMode')}
-        </DropdownMenuItem> */}
+        </DropdownMenuItem>
       </DropdownMenuContent>
     </DropdownMenu>
   )