diff --git a/app/View/Components/AppLayout.php b/app/View/Components/AppLayout.php
deleted file mode 100644
index de0d46f..0000000
--- a/app/View/Components/AppLayout.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\View\Components;
-
-use Illuminate\View\Component;
-use Illuminate\View\View;
-
-class AppLayout extends Component
-{
-    /**
-     * Get the view / contents that represents the component.
-     */
-    public function render(): View
-    {
-        return view('layouts.app');
-    }
-}
diff --git a/app/View/Components/GuestLayout.php b/app/View/Components/GuestLayout.php
deleted file mode 100644
index d1f6253..0000000
--- a/app/View/Components/GuestLayout.php
+++ /dev/null
@@ -1,17 +0,0 @@
-<?php
-
-namespace App\View\Components;
-
-use Illuminate\View\Component;
-use Illuminate\View\View;
-
-class GuestLayout extends Component
-{
-    /**
-     * Get the view / contents that represents the component.
-     */
-    public function render(): View
-    {
-        return view('layouts.guest');
-    }
-}
diff --git a/resources/views/admin.blade.php b/resources/views/admin.blade.php
index 8b4f74f..cf10537 100644
--- a/resources/views/admin.blade.php
+++ b/resources/views/admin.blade.php
@@ -1,7 +1,7 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>Admin</x-slot>
 
   <p>You're logged in!</p>
 
   <a href="{{ route('categories.index') }}">Categories</a>
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/auth/confirm-password.blade.php b/resources/views/auth/confirm-password.blade.php
index e6db1cb..a975bf7 100644
--- a/resources/views/auth/confirm-password.blade.php
+++ b/resources/views/auth/confirm-password.blade.php
@@ -1,4 +1,4 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>Confirm Password</x-slot>
 
   <x-window title="Confirm Password">
@@ -26,4 +26,4 @@
       <button type="submit">Confirm</button>
     </form>
   </x-window>
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php
index 418422a..e1e910d 100644
--- a/resources/views/auth/login.blade.php
+++ b/resources/views/auth/login.blade.php
@@ -1,4 +1,4 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>Login</x-slot>
 
   <x-window title="Login">
@@ -51,4 +51,4 @@
       </div>
     </form>
   </x-window>
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/categories/create.blade.php b/resources/views/categories/create.blade.php
index 2439dda..f48672c 100644
--- a/resources/views/categories/create.blade.php
+++ b/resources/views/categories/create.blade.php
@@ -1,4 +1,4 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>New Category</x-slot>
 
   <form action="{{ route('categories.store') }}" method="POST">
@@ -12,4 +12,4 @@
 
     <button type="submit">Submit</button>
   </form>
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/categories/index.blade.php b/resources/views/categories/index.blade.php
index c08a783..c342346 100644
--- a/resources/views/categories/index.blade.php
+++ b/resources/views/categories/index.blade.php
@@ -1,4 +1,4 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>Categories</x-slot>
 
   <div class="sunken-panel">
@@ -27,4 +27,4 @@
   </div>
 
   <a href="{{ route('categories.create') }}">New</a>
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/categories/show.blade.php b/resources/views/categories/show.blade.php
index a826222..51a17ce 100644
--- a/resources/views/categories/show.blade.php
+++ b/resources/views/categories/show.blade.php
@@ -1,8 +1,8 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>
     Category: {{ $category->name }}
   </x-slot>
 
   <h2>{{ $category->name }}</h2>
   <a href="{{ route('categories.index') }}">All</a>
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/components/layout/layout.blade.php b/resources/views/components/layout/layout.blade.php
new file mode 100644
index 0000000..f8725ec
--- /dev/null
+++ b/resources/views/components/layout/layout.blade.php
@@ -0,0 +1,27 @@
+<!DOCTYPE html>
+<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
+  <head>
+    <meta charset="utf-8" />
+    <meta name="viewport" content="width=device-width, initial-scale=1" />
+    <meta name="csrf-token" content="{{ csrf_token() }}" />
+
+    <title>
+      {{ config('app.name', 'Laravel') }} @isset($title)
+       - {{ $title }} @endisset
+    </title>
+
+    <!-- Scripts -->
+    @vite(['resources/css/app.css', 'resources/js/app.js'])
+
+    <!-- polyfills -->
+    <script src="//polyfill.io/v3/polyfill.min.js?flags=gated&features=default,es5,es6,es7,matchMedia,IntersectionObserver,ResizeObserver,NodeList.prototype.forEach,HTMLTemplateElement,Element.prototype.closest,requestAnimationFrame,CustomEvent,URLSearchParams,queueMicrotask"></script>
+  </head>
+
+  <body>
+    <main class="max-w-[600px]">
+      {{ $slot }}
+
+      <x-layout.navigation />
+    </main>
+  </body>
+</html>
diff --git a/resources/views/layouts/navigation.blade.php b/resources/views/components/layout/navigation.blade.php
similarity index 100%
rename from resources/views/layouts/navigation.blade.php
rename to resources/views/components/layout/navigation.blade.php
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php
deleted file mode 100644
index 66090e9..0000000
--- a/resources/views/layouts/app.blade.php
+++ /dev/null
@@ -1,12 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-  @include('layouts.head')
-
-  <body>
-    <main class="max-w-[600px]">
-      {{ $slot }}
-
-      @include('layouts.navigation')
-    </main>
-  </body>
-</html>
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php
deleted file mode 100644
index 35a6245..0000000
--- a/resources/views/layouts/guest.blade.php
+++ /dev/null
@@ -1,23 +0,0 @@
-<!DOCTYPE html>
-<html lang="{{ str_replace('_', '-', app()->getLocale()) }}">
-  @include('layouts.head')
-
-  <body class="h-screen">
-    <div class="m-auto w-1/4">
-      <a href="/">
-        <x-application-logo class="w-48" />
-      </a>
-
-      <div class="window">
-        <div class="title-bar">
-          <div class="title-bar-text">
-            @isset($title)
-              {{ $title }}
-            @endisset
-          </div>
-        </div>
-        <div class="window-body">{{ $slot }}</div>
-      </div>
-    </div>
-  </body>
-</html>
diff --git a/resources/views/layouts/head.blade.php b/resources/views/layouts/head.blade.php
deleted file mode 100644
index 42bf511..0000000
--- a/resources/views/layouts/head.blade.php
+++ /dev/null
@@ -1,16 +0,0 @@
-<head>
-  <meta charset="utf-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1" />
-  <meta name="csrf-token" content="{{ csrf_token() }}" />
-
-  <title>
-    {{ config('app.name', 'Laravel') }} @isset($title)
-     - {{ $title }} @endisset
-  </title>
-
-  <!-- Scripts -->
-  @vite(['resources/css/app.css', 'resources/js/app.js'])
-
-  <!-- polyfills -->
-  <script src="//polyfill.io/v3/polyfill.min.js?flags=gated&features=default,es5,es6,es7,matchMedia,IntersectionObserver,ResizeObserver,NodeList.prototype.forEach,HTMLTemplateElement,Element.prototype.closest,requestAnimationFrame,CustomEvent,URLSearchParams,queueMicrotask"></script>
-</head>
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
index 70243b5..3cf3ba0 100644
--- a/resources/views/profile/edit.blade.php
+++ b/resources/views/profile/edit.blade.php
@@ -1,6 +1,6 @@
-<x-app-layout>
+<x-layout>
   <x-slot:title>Profile</x-slot>
 
   @include('profile.partials.update-profile-information-form')
   @include('profile.partials.update-password-form')
-</x-app-layout>
+</x-layout>
diff --git a/resources/views/welcome.blade.php b/resources/views/welcome.blade.php
index 90254c9..568a8ac 100755
--- a/resources/views/welcome.blade.php
+++ b/resources/views/welcome.blade.php
@@ -1 +1 @@
-<x-app-layout></x-app-layout>
+<x-layout></x-layout>
