diff --git a/app/Http/Controllers/StartpageController.php b/app/Http/Controllers/StartpageController.php
index 94554a07d0ea6a22cba9fc265f07c8874fde46e6..c5e4ff612abdbac0cd7e31dcf2ddcae4239d447e 100644
--- a/app/Http/Controllers/StartpageController.php
+++ b/app/Http/Controllers/StartpageController.php
@@ -43,10 +43,6 @@ class StartpageController extends Controller
             $lang = 'all';
         }
 
-        $css = mix('css/themes/startpage-only-light.css');
-        if(Cookie::get('dark_mode') === "2")
-            $css = mix('css/themes/startpage-only-dark.css');
-
         return view('index')
             ->with('title', trans('titles.index'))
             ->with('homeIcon')
@@ -57,8 +53,7 @@ class StartpageController extends Controller
             ->with('request', $request->input('request', 'GET'))
             ->with('option_values', $option_values)
             ->with('autocomplete', $autocomplete)
-            ->with('pluginmodal', $request->input('plugin-modal', 'off'))
-            ->with('css', [$css]);
+            ->with('pluginmodal', $request->input('plugin-modal', 'off'));
     }
 
     public function loadPage($subpage)
diff --git a/resources/views/layouts/resultPage.blade.php b/resources/views/layouts/resultPage.blade.php
index 8b63a3b37c7e38bbd50212d48a1714c17be99ed8..b36c7f86bf2a8d06022ad932fba86b8b4e95e10e 100644
--- a/resources/views/layouts/resultPage.blade.php
+++ b/resources/views/layouts/resultPage.blade.php
@@ -24,9 +24,12 @@
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
 
 		@if(Cookie::get('dark_mode') === "2")
-			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>	
+		@elseif(Cookie::get('dark_mode') === "1")
+			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
 		@else
-			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
+			<link type="text/css" rel="stylesheet" media="(prefers-color-scheme: dark)" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+			<link type="text/css" rel="stylesheet" media="not (prefers-color-scheme: dark)" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
 		@endif
 
 @endif
diff --git a/resources/views/layouts/resultpage/resources.blade.php b/resources/views/layouts/resultpage/resources.blade.php
index f0300a4cc7c63cacfa5d7459f97bdbb41caa3b41..6d38cc7b8f3332152820a977910e1ca5a11999be 100644
--- a/resources/views/layouts/resultpage/resources.blade.php
+++ b/resources/views/layouts/resultpage/resources.blade.php
@@ -19,6 +19,10 @@
 	<link type="text/css" rel="stylesheet" href="{{ mix('css/fontawesome-solid.css') }}" />
 	@if(Cookie::get('dark_mode') === "2")
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+	@elseif(Cookie::get('dark_mode') === "1")
+		<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
 	@else
-		<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
+		<link type="text/css" rel="stylesheet" media="(prefers-color-scheme: dark)" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+		<link type="text/css" rel="stylesheet" media="not (prefers-color-scheme: dark)" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
 	@endif
+	
diff --git a/resources/views/layouts/staticPages.blade.php b/resources/views/layouts/staticPages.blade.php
index bcad68ca9894733d1a54bd74250532b45ecf1855..91eeec73b1efdb895f42ba097383bcf6463b68bb 100644
--- a/resources/views/layouts/staticPages.blade.php
+++ b/resources/views/layouts/staticPages.blade.php
@@ -28,9 +28,24 @@
 		@endif
 
 		@if(Cookie::get('dark_mode') === "2")
-			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>	
+			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+			@if(isset($page) && $page === 'startpage')
+				<link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-dark.css') }}"/>
+			@endif
+		@elseif(Cookie::get('dark_mode') === "1")
+			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
+			@if(isset($page) && $page === 'startpage')
+				<link type="text/css" rel="stylesheet" media="not (prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-light.css') }}"/>
+			@endif
 		@else
-			<link type="text/css" rel="stylesheet" href="{{ mix('css/themes/metager.css') }}" title="MetaGer"/>
+			<link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/metager-dark.css') }}" title="MetaGer Dark"/>
+			@if(isset($page) && $page === 'startpage')
+				<link type="text/css" rel="stylesheet" media="(prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-dark.css') }}"/>
+			@endif
+			<link type="text/css" rel="stylesheet" media="not (prefers-color-scheme:dark)" href="{{ mix('css/themes/metager.css') }}" title="MetaGer Light"/>
+			@if(isset($page) && $page === 'startpage')
+				<link type="text/css" rel="stylesheet" media="not (prefers-color-scheme:dark)" href="{{ mix('css/themes/startpage-only-light.css') }}"/>
+			@endif
 		@endif
 		<link type="text/css" rel="stylesheet" href="{{ mix('css/utility.css') }}" />
 		<link href="/fonts/liberationsans/stylesheet.css" rel="stylesheet">