diff --git a/docs/source/_layouts/documentation_v2.blade.php b/docs/source/_layouts/documentation_v2.blade.php
deleted file mode 100644
index 933d48e..0000000
--- a/docs/source/_layouts/documentation_v2.blade.php
+++ /dev/null
@@ -1,19 +0,0 @@
-@extends('_layouts.master_v2')
-
-@section('nav-toggle')
-    @include('_nav.menu-toggle')
-@endsection
-
-@section('body')
-<section class="container max-w-4xl mx-auto px-6 md:px-8 py-4">
-    <div class="flex flex-col lg:flex-row">
-        <nav id="js-nav-menu" class="nav-menu hidden lg:block">
-            @include('_nav.menu', ['items' => $page->navigation[$page->version()]])
-        </nav>
-
-        <div class="w-full lg:w-3/5 break-words pb-16 lg:pl-4" v-pre>
-            @yield('content')
-        </div>
-    </div>
-</section>
-@endsection
diff --git a/docs/source/_layouts/master.blade.php b/docs/source/_layouts/master.blade.php
index c592a66..a21ea15 100644
--- a/docs/source/_layouts/master.blade.php
+++ b/docs/source/_layouts/master.blade.php
@@ -8,7 +8,7 @@
 
         <meta property="og:site_name" content="{{ $page->siteName }}"/>
         <meta property="og:title" content="{{ $page->title ?  $page->title . ' | ' : '' }}{{ $page->siteName }}"/>
-        <meta property="og:description" content="{{ $page->description ?? $page->siteDescription }}"/>
+        <meta property="og:description" content="{{ $page->description ?? $page->siteDescription }} {{ $page->siteName }}"/>
         <meta property="og:url" content="{{ $page->getUrl() }}"/>
         <meta property="og:image" content="/assets/img/logo.png"/>
         <meta property="og:type" content="website"/>
diff --git a/docs/source/_layouts/master_v2.blade.php b/docs/source/_layouts/master_v2.blade.php
deleted file mode 100644
index a21ea15..0000000
--- a/docs/source/_layouts/master_v2.blade.php
+++ /dev/null
@@ -1,106 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-    <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-        <meta http-equiv="x-ua-compatible" content="ie=edge">
-        <meta name="description" content="{{ $page->description ?? $page->siteDescription }}">
-
-        <meta property="og:site_name" content="{{ $page->siteName }}"/>
-        <meta property="og:title" content="{{ $page->title ?  $page->title . ' | ' : '' }}{{ $page->siteName }}"/>
-        <meta property="og:description" content="{{ $page->description ?? $page->siteDescription }} {{ $page->siteName }}"/>
-        <meta property="og:url" content="{{ $page->getUrl() }}"/>
-        <meta property="og:image" content="/assets/img/logo.png"/>
-        <meta property="og:type" content="website"/>
-
-        <meta name="twitter:image:alt" content="{{ $page->siteName }}">
-        <meta name="twitter:card" content="summary_large_image">
-
-        @if ($page->docsearchApiKey && $page->docsearchIndexName)
-            <meta name="generator" content="tighten_jigsaw_doc">
-        @endif
-
-        <title>{{ $page->title ? $page->title . ' | ' : '' }}{{ $page->siteName }}</title>
-
-        <link rel="home" href="{{ $page->baseUrl }}">
-        <link rel="icon" href="/favicon.ico">
-
-        @stack('meta')
-
-        @if ($page->production)
-            <!-- Insert analytics code here -->
-        @endif
-
-        <link href="https://fonts.googleapis.com/css?family=Nunito+Sans:300,300i,400,400i,700,700i,800,800i" rel="stylesheet">
-        <link rel="stylesheet" href="{{ $page->baseUrl . mix('css/main.css', 'assets/build') }}">
-
-        @if ($page->docsearchApiKey && $page->docsearchIndexName)
-            <link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/docsearch.js@2/dist/cdn/docsearch.min.css" />
-        @endif
-    </head>
-
-    <body class="flex flex-col justify-between min-h-screen bg-grey-lightest text-grey-darkest leading-normal font-sans">
-        <header class="flex items-center shadow bg-white border-b h-24 mb-8 py-4" role="banner">
-            <div class="container flex items-center max-w-4xl mx-auto px-4 lg:px-8">
-                <div class="flex items-center">
-                    <a href="/" title="{{ $page->siteName }} home" class="inline-flex items-center">
-                        {{-- <img class="h-8 md:h-10 mr-3" src="/assets/img/logo.svg" alt="{{ $page->siteName }} logo" /> --}}
-
-                        <h1 class="text-lg md:text-2xl text-blue-darkest font-semibold hover:text-blue-dark my-0 pr-4">{{ $page->siteName }}</h1>
-                    </a>
-                </div>
-
-                <meta name="docsearch:language" content="en" />
-                <meta name="docsearch:version" content="{{ $page->version() }}" />
-                <div class="flex flex-1 justify-end items-center text-right md:pl-10">
-                    @if ($page->docsearchApiKey && $page->docsearchIndexName)
-                        @include('_nav.search-input')
-                    @endif
-                </div>
-
-                <div class="flex flex-1 justify-end items-center text-right md:pl-10">
-                    <select id="versionSelect" class="bg-grey-lightest border-solid border">
-                        @foreach($page->versions as $version => $name)
-                            <option 
-                                value="{{ $page->baseUrl . '/' . $version }}/"
-                                @if($page->version() === $version)
-                                    selected
-                                @endif
-                            >
-                                {{ $name }}
-                            </option>
-                        @endforeach
-                    </select>
-                </div>
-            </div>
-
-            @yield('nav-toggle')
-        </header>
-
-        <main role="main" class="w-full flex-auto">
-            @yield('body')
-        </main>
-
-        <script src="{{ $page->baseUrl . mix('js/main.js', 'assets/build') }}"></script>
-
-        @stack('scripts')
-
-        <footer class="bg-white text-center text-sm mt-12 py-4" role="contentinfo">
-            <ul class="flex flex-col md:flex-row justify-center list-reset">
-                <li class="md:mr-2">
-                    &copy; <a href="https://github.com/stancl" title="Samuel Štancl">Samuel Štancl</a> {{ date('Y') }}.
-                </li>
-
-                <li>
-                    Built with <a href="http://jigsaw.tighten.co" title="Jigsaw by Tighten">Jigsaw</a>
-                    and <a href="https://tailwindcss.com" title="Tailwind CSS, a utility-first CSS framework">Tailwind CSS</a>.
-                </li>
-            </ul>
-        </footer>
-    <script>
-        document.getElementById('versionSelect').addEventListener('change', function () {
-            window.location = document.getElementById('versionSelect').value;
-        });
-    </script>
-    </body>
-</html>
diff --git a/docs/source/v2/application-testing.blade.md b/docs/source/v2/application-testing.blade.md
index e70df0d..ad01003 100644
--- a/docs/source/v2/application-testing.blade.md
+++ b/docs/source/v2/application-testing.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Application Testing
 description: Application Testing..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/configuration.blade.md b/docs/source/v2/configuration.blade.md
index c81ce27..fddb85c 100644
--- a/docs/source/v2/configuration.blade.md
+++ b/docs/source/v2/configuration.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Configuration
 description: Configuring stancl/tenancy
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/console-commands.blade.md b/docs/source/v2/console-commands.blade.md
index b8ce69a..4af1707 100644
--- a/docs/source/v2/console-commands.blade.md
+++ b/docs/source/v2/console-commands.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Console Commands
 description: Console commands..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/creating-tenants.blade.md b/docs/source/v2/creating-tenants.blade.md
index 91b5ce8..e0e43d8 100644
--- a/docs/source/v2/creating-tenants.blade.md
+++ b/docs/source/v2/creating-tenants.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Creating Tenants
 description: Creating tenants
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/custom-database-names.blade.md b/docs/source/v2/custom-database-names.blade.md
index 6f7718e..6adc950 100644
--- a/docs/source/v2/custom-database-names.blade.md
+++ b/docs/source/v2/custom-database-names.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Custom Database Names
 description: Custom Database Names..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/difference-between-this-package-and-others.blade.md b/docs/source/v2/difference-between-this-package-and-others.blade.md
index c51764e..23c3363 100644
--- a/docs/source/v2/difference-between-this-package-and-others.blade.md
+++ b/docs/source/v2/difference-between-this-package-and-others.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Difference Between This Package And Others
 description: Difference Between This Package And Others
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/digging-deeper.blade.md b/docs/source/v2/digging-deeper.blade.md
index d6ac7da..de473d3 100644
--- a/docs/source/v2/digging-deeper.blade.md
+++ b/docs/source/v2/digging-deeper.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Digging Deeper
 description: Digging Deeper..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/event-system.blade.md b/docs/source/v2/event-system.blade.md
index fb3e953..8454d6b 100644
--- a/docs/source/v2/event-system.blade.md
+++ b/docs/source/v2/event-system.blade.md
@@ -1,7 +1,7 @@
 ---
 title: The Event System
 description: The Event System..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/filesystem-tenancy.blade.md b/docs/source/v2/filesystem-tenancy.blade.md
index dcf46f1..37775b3 100644
--- a/docs/source/v2/filesystem-tenancy.blade.md
+++ b/docs/source/v2/filesystem-tenancy.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Filesystem Tenancy
 description: Filesystem Tenancy..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/getting-started.blade.md b/docs/source/v2/getting-started.blade.md
index 2600f1c..bf107f1 100644
--- a/docs/source/v2/getting-started.blade.md
+++ b/docs/source/v2/getting-started.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Getting Started
 description: Getting started.
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/global-stuff.blade.md b/docs/source/v2/global-stuff.blade.md
index af724da..f45c878 100644
--- a/docs/source/v2/global-stuff.blade.md
+++ b/docs/source/v2/global-stuff.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Global Cache/Storage/Assets/...
 description: Global Cache/Storage/Assets/...
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/horizon.blade.md b/docs/source/v2/horizon.blade.md
index 0de4d49..db0903f 100644
--- a/docs/source/v2/horizon.blade.md
+++ b/docs/source/v2/horizon.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Horizon Integration
 description: Horizon Integration..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/https-certificates.blade.md b/docs/source/v2/https-certificates.blade.md
index 402b067..73945c3 100644
--- a/docs/source/v2/https-certificates.blade.md
+++ b/docs/source/v2/https-certificates.blade.md
@@ -1,7 +1,7 @@
 ---
 title: HTTPS Certificates
 description: HTTPS Certificates..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/installation.blade.md b/docs/source/v2/installation.blade.md
index 7765654..17f35b3 100644
--- a/docs/source/v2/installation.blade.md
+++ b/docs/source/v2/installation.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Installation
 description: Installing stancl/tenancy
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/integrations.blade.md b/docs/source/v2/integrations.blade.md
index 46d94d8..acb0d6f 100644
--- a/docs/source/v2/integrations.blade.md
+++ b/docs/source/v2/integrations.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Integrations
 description: Integrating stancl/tenancy
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/jobs-queues.blade.md b/docs/source/v2/jobs-queues.blade.md
index 0c79071..5b0121a 100644
--- a/docs/source/v2/jobs-queues.blade.md
+++ b/docs/source/v2/jobs-queues.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Jobs & Queues
 description: Jobs & Queues..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/middleware-configuration.blade.md b/docs/source/v2/middleware-configuration.blade.md
index ca49e41..09a695a 100644
--- a/docs/source/v2/middleware-configuration.blade.md
+++ b/docs/source/v2/middleware-configuration.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Middleware Configuration
 description: Middleware Configuration..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/misc-tips.blade.md b/docs/source/v2/misc-tips.blade.md
index 064c038..d938778 100644
--- a/docs/source/v2/misc-tips.blade.md
+++ b/docs/source/v2/misc-tips.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Miscellaneous Tips
 description: Miscellaneous Tips..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/stay-updated.blade.md b/docs/source/v2/stay-updated.blade.md
index 623c23b..8964e78 100644
--- a/docs/source/v2/stay-updated.blade.md
+++ b/docs/source/v2/stay-updated.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Stay Updated
 description: Stay Updated..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/storage-drivers.blade.md b/docs/source/v2/storage-drivers.blade.md
index 43f7ed0..41c80a5 100644
--- a/docs/source/v2/storage-drivers.blade.md
+++ b/docs/source/v2/storage-drivers.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Storage Drivers
 description: Storage Drivers
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/telescope.blade.md b/docs/source/v2/telescope.blade.md
index 764b5c4..18fa3bf 100644
--- a/docs/source/v2/telescope.blade.md
+++ b/docs/source/v2/telescope.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Telescope Integration
 description: Telescope Integration..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenancy-bootstrappers.blade.md b/docs/source/v2/tenancy-bootstrappers.blade.md
index 7988683..b60f752 100644
--- a/docs/source/v2/tenancy-bootstrappers.blade.md
+++ b/docs/source/v2/tenancy-bootstrappers.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenancy Bootstrappers
 description: Tenancy Bootstrappers
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenancy-initialization.blade.md b/docs/source/v2/tenancy-initialization.blade.md
index 2eff466..7e3bf98 100644
--- a/docs/source/v2/tenancy-initialization.blade.md
+++ b/docs/source/v2/tenancy-initialization.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenancy Initialization
 description: Tenancy Initialization..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenant-manager.blade.md b/docs/source/v2/tenant-manager.blade.md
index 7d17009..656f449 100644
--- a/docs/source/v2/tenant-manager.blade.md
+++ b/docs/source/v2/tenant-manager.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenant Manager
 description: Tenant Manager
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenant-migrations.blade.md b/docs/source/v2/tenant-migrations.blade.md
index 500ef99..5c85f00 100644
--- a/docs/source/v2/tenant-migrations.blade.md
+++ b/docs/source/v2/tenant-migrations.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenant Migrations
 description: Tenant Migrations
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenant-routes.blade.md b/docs/source/v2/tenant-routes.blade.md
index c706fa8..188b3d8 100644
--- a/docs/source/v2/tenant-routes.blade.md
+++ b/docs/source/v2/tenant-routes.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenant Routes
 description: Tenant routes..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenant-storage.blade.md b/docs/source/v2/tenant-storage.blade.md
index 1b84ba8..50512fc 100644
--- a/docs/source/v2/tenant-storage.blade.md
+++ b/docs/source/v2/tenant-storage.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenant Storage
 description: Tenant storage..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/tenants.blade.md b/docs/source/v2/tenants.blade.md
index 5ba02df..65334b7 100644
--- a/docs/source/v2/tenants.blade.md
+++ b/docs/source/v2/tenants.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Tenants
 description: Tenants
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/usage.blade.md b/docs/source/v2/usage.blade.md
index 54a277c..32f0d63 100644
--- a/docs/source/v2/usage.blade.md
+++ b/docs/source/v2/usage.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Usage
 description: Usage..
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
diff --git a/docs/source/v2/writing-storage-drivers.blade.md b/docs/source/v2/writing-storage-drivers.blade.md
index ba30436..83d2fa8 100644
--- a/docs/source/v2/writing-storage-drivers.blade.md
+++ b/docs/source/v2/writing-storage-drivers.blade.md
@@ -1,7 +1,7 @@
 ---
 title: Writing Storage Drivers
 description: Writing Storage Drivers
-extends: _layouts.documentation_v2
+extends: _layouts.documentation
 section: content
 ---
 
