diff --git a/web/resources/views/layouts/app.blade.php b/web/resources/views/layouts/app.blade.php
index d55e361..ad44bc2 100644
--- a/web/resources/views/layouts/app.blade.php
+++ b/web/resources/views/layouts/app.blade.php
@@ -4,7 +4,7 @@
 	$authenticated = \App\Helpers\AuthHelper::IsAuthenticated(request());
 @endphp
 <!DOCTYPE html>
-<html class="gtoria-light" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+<html class="gtoria-{{ View::hasSection('theme') ? View::getSection('theme') : 'light' }}" lang="{{ str_replace('_', '-', app()->getLocale()) }}">
     <head>
 		<title>Graphictoria{{ View::hasSection('title') ? ' | ' . View::getSection('title') : '' }}</title>
 		<meta charset="utf-8" />
diff --git a/web/resources/views/layouts/nav.blade.php b/web/resources/views/layouts/nav.blade.php
index eee470d..88fb5f0 100644
--- a/web/resources/views/layouts/nav.blade.php
+++ b/web/resources/views/layouts/nav.blade.php
@@ -27,10 +27,14 @@
 				<img src="{{ asset('/images/logo.png') }}" alt="Graphictoria" width="43" height="43" draggable="false"/>
 			</i>
 		@endlive
-		<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#graphictoria-nav" aria-controls="graphictoria-nav" aria-expanded="false" aria-label="Toggle navigation">
-			<span class="navbar-toggler-icon"></span>
-		</button>
-		<div class="collapse navbar-collapse" id="graphictoria-nav">
+		@live
+			<button class="navbar-toggler" type="button" data-bs-toggle="collapse" data-bs-target="#graphictoria-nav" aria-controls="graphictoria-nav" aria-expanded="false" aria-label="Toggle navigation">
+				<span class="navbar-toggler-icon"></span>
+			</button>
+		@endlive
+		@live
+			<div class="collapse navbar-collapse" id="graphictoria-nav">
+		@endlive
 			<ul class="navbar-nav me-auto">
 				@live
 					@foreach($routes as $route)
@@ -81,7 +85,10 @@
 					<a class="btn btn-success" href="/login">Login / Sign up</a>
 				@endif
 			@endlive
-		</div>
+		@live
+			{{-- graphictoria-nav --}}
+			</div>
+		@endlive
 	</div>
 </div>
 <div class="graphictoria-nav-margin"></div>
diff --git a/web/resources/views/maintenance.blade.php b/web/resources/views/maintenance.blade.php
index 9c5a927..bdc6e2f 100644
--- a/web/resources/views/maintenance.blade.php
+++ b/web/resources/views/maintenance.blade.php
@@ -8,6 +8,8 @@ $buttons = str_split('Graphictoria')
 
 @section('title', 'Maintenance')
 
+@section('theme', 'dark')
+
 @section('page-specific')
 <script src="{{ mix('js/pages/maintenance.js') }}"></script>
 @endsection
