diff --git a/resources/views/themes/base/admin/analyse_album.blade.php b/resources/views/themes/base/admin/analyse_album.blade.php
index c4e6e4c..5517c77 100644
--- a/resources/views/themes/base/admin/analyse_album.blade.php
+++ b/resources/views/themes/base/admin/analyse_album.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', 'Analysing...')
 
 @section('content')
diff --git a/resources/views/themes/base/admin/create_album.blade.php b/resources/views/themes/base/admin/create_album.blade.php
index ee0028d..075f67b 100644
--- a/resources/views/themes/base/admin/create_album.blade.php
+++ b/resources/views/themes/base/admin/create_album.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', 'Gallery Admin')
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/create_group.blade.php b/resources/views/themes/base/admin/create_group.blade.php
index ec5be41..3f62290 100644
--- a/resources/views/themes/base/admin/create_group.blade.php
+++ b/resources/views/themes/base/admin/create_group.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.create_group'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/create_storage.blade.php b/resources/views/themes/base/admin/create_storage.blade.php
index ba8efb4..bce02bf 100644
--- a/resources/views/themes/base/admin/create_storage.blade.php
+++ b/resources/views/themes/base/admin/create_storage.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.create_storage'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/create_user.blade.php b/resources/views/themes/base/admin/create_user.blade.php
index 23c795f..98aff3d 100644
--- a/resources/views/themes/base/admin/create_user.blade.php
+++ b/resources/views/themes/base/admin/create_user.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.create_user'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/delete_album.blade.php b/resources/views/themes/base/admin/delete_album.blade.php
index 32ffb2e..5db360d 100644
--- a/resources/views/themes/base/admin/delete_album.blade.php
+++ b/resources/views/themes/base/admin/delete_album.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.delete_album', ['name' => $album->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/delete_group.blade.php b/resources/views/themes/base/admin/delete_group.blade.php
index 6b99759..790efc8 100644
--- a/resources/views/themes/base/admin/delete_group.blade.php
+++ b/resources/views/themes/base/admin/delete_group.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.delete_group', ['name' => $group->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/delete_label.blade.php b/resources/views/themes/base/admin/delete_label.blade.php
index bc2f768..5ac3500 100644
--- a/resources/views/themes/base/admin/delete_label.blade.php
+++ b/resources/views/themes/base/admin/delete_label.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.delete_label', ['name' => $label->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/delete_storage.blade.php b/resources/views/themes/base/admin/delete_storage.blade.php
index d176bda..c73d3bf 100644
--- a/resources/views/themes/base/admin/delete_storage.blade.php
+++ b/resources/views/themes/base/admin/delete_storage.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.delete_storage', ['name' => $storage->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/delete_user.blade.php b/resources/views/themes/base/admin/delete_user.blade.php
index 47bf626..b588932 100644
--- a/resources/views/themes/base/admin/delete_user.blade.php
+++ b/resources/views/themes/base/admin/delete_user.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.delete_user', ['name' => $user->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/edit_album.blade.php b/resources/views/themes/base/admin/edit_album.blade.php
index a69dc65..59552d1 100644
--- a/resources/views/themes/base/admin/edit_album.blade.php
+++ b/resources/views/themes/base/admin/edit_album.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', 'Gallery Admin')
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/edit_group.blade.php b/resources/views/themes/base/admin/edit_group.blade.php
index 4674147..c26f343 100644
--- a/resources/views/themes/base/admin/edit_group.blade.php
+++ b/resources/views/themes/base/admin/edit_group.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.edit_group_title', ['group_name' => $group->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/edit_storage.blade.php b/resources/views/themes/base/admin/edit_storage.blade.php
index 681e386..c4ca92d 100644
--- a/resources/views/themes/base/admin/edit_storage.blade.php
+++ b/resources/views/themes/base/admin/edit_storage.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.edit_storage', ['storage_name' => $storage->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/edit_user.blade.php b/resources/views/themes/base/admin/edit_user.blade.php
index 4855ae7..3f85990 100644
--- a/resources/views/themes/base/admin/edit_user.blade.php
+++ b/resources/views/themes/base/admin/edit_user.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.edit_user_title', ['name' => $user->name]))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/index.blade.php b/resources/views/themes/base/admin/index.blade.php
index f6ba3f8..e4e7dc4 100644
--- a/resources/views/themes/base/admin/index.blade.php
+++ b/resources/views/themes/base/admin/index.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', 'Gallery Admin')
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/list_albums.blade.php b/resources/views/themes/base/admin/list_albums.blade.php
index 2ab4fcb..9d2d944 100644
--- a/resources/views/themes/base/admin/list_albums.blade.php
+++ b/resources/views/themes/base/admin/list_albums.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', 'Gallery Admin')
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/list_groups.blade.php b/resources/views/themes/base/admin/list_groups.blade.php
index dc3d57f..2a2b7ab 100644
--- a/resources/views/themes/base/admin/list_groups.blade.php
+++ b/resources/views/themes/base/admin/list_groups.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.list_groups_title'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/list_labels.blade.php b/resources/views/themes/base/admin/list_labels.blade.php
index c081472..051af5b 100644
--- a/resources/views/themes/base/admin/list_labels.blade.php
+++ b/resources/views/themes/base/admin/list_labels.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.list_labels_title'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/list_storage.blade.php b/resources/views/themes/base/admin/list_storage.blade.php
index 20f7c69..a245110 100644
--- a/resources/views/themes/base/admin/list_storage.blade.php
+++ b/resources/views/themes/base/admin/list_storage.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.storage_title'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/list_users.blade.php b/resources/views/themes/base/admin/list_users.blade.php
index b38eeee..e95ab14 100644
--- a/resources/views/themes/base/admin/list_users.blade.php
+++ b/resources/views/themes/base/admin/list_users.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.users_title'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/settings.blade.php b/resources/views/themes/base/admin/settings.blade.php
index 810f90b..8ec5c18 100644
--- a/resources/views/themes/base/admin/settings.blade.php
+++ b/resources/views/themes/base/admin/settings.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('admin.settings_title'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/admin/show_album.blade.php b/resources/views/themes/base/admin/show_album.blade.php
index 03e3b7f..05f85a4 100644
--- a/resources/views/themes/base/admin/show_album.blade.php
+++ b/resources/views/themes/base/admin/show_album.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $album->name)
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/auth/passwords/change_password.blade.php b/resources/views/themes/base/auth/passwords/change_password.blade.php
index 5ac797e..e7df713 100644
--- a/resources/views/themes/base/auth/passwords/change_password.blade.php
+++ b/resources/views/themes/base/auth/passwords/change_password.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 
 @section('title', trans('auth.change_password_title'))
 @section('content')
diff --git a/resources/views/themes/base/auth/passwords/email.blade.php b/resources/views/themes/base/auth/passwords/email.blade.php
index 0ce9c27..672dc4b 100644
--- a/resources/views/themes/base/auth/passwords/email.blade.php
+++ b/resources/views/themes/base/auth/passwords/email.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 
 @section('title', trans('auth.forgot_password_title'))
 @section('content')
diff --git a/resources/views/themes/base/auth/passwords/reset.blade.php b/resources/views/themes/base/auth/passwords/reset.blade.php
index 89b0ac0..a84ff8d 100644
--- a/resources/views/themes/base/auth/passwords/reset.blade.php
+++ b/resources/views/themes/base/auth/passwords/reset.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 
 @section('title', trans('auth.reset_password_title'))
 @section('content')
diff --git a/resources/views/themes/base/auth/v2_unified.blade.php b/resources/views/themes/base/auth/v2_unified.blade.php
index a552173..f1d7f24 100644
--- a/resources/views/themes/base/auth/v2_unified.blade.php
+++ b/resources/views/themes/base/auth/v2_unified.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 
 @section('title', trans($active_tab == 'login' ? 'auth.login_page_title' : 'auth.register_page_title'))
 @section('content')
diff --git a/resources/views/themes/base/gallery/album_default.blade.php b/resources/views/themes/base/gallery/album_default.blade.php
index ade9ba3..0be7d88 100644
--- a/resources/views/themes/base/gallery/album_default.blade.php
+++ b/resources/views/themes/base/gallery/album_default.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $album->name)
 
 @php ($hasChildren = $album->children()->count() > 0)
diff --git a/resources/views/themes/base/gallery/album_empty.blade.php b/resources/views/themes/base/gallery/album_empty.blade.php
index 1b3f507..043c24a 100644
--- a/resources/views/themes/base/gallery/album_empty.blade.php
+++ b/resources/views/themes/base/gallery/album_empty.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $album->name)
 
 @php ($hasChildren = $album->children()->count() > 0)
diff --git a/resources/views/themes/base/gallery/album_slideshow.blade.php b/resources/views/themes/base/gallery/album_slideshow.blade.php
index e6f52c4..f0cd0f1 100644
--- a/resources/views/themes/base/gallery/album_slideshow.blade.php
+++ b/resources/views/themes/base/gallery/album_slideshow.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $album->name)
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/gallery/index.blade.php b/resources/views/themes/base/gallery/index.blade.php
index b7b590b..3e20290 100644
--- a/resources/views/themes/base/gallery/index.blade.php
+++ b/resources/views/themes/base/gallery/index.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', 'Welcome')
 
 @section('content')
diff --git a/resources/views/themes/base/gallery/label_default.blade.php b/resources/views/themes/base/gallery/label_default.blade.php
index 4e9af3c..8831877 100644
--- a/resources/views/themes/base/gallery/label_default.blade.php
+++ b/resources/views/themes/base/gallery/label_default.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $label->name)
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/gallery/label_empty.blade.php b/resources/views/themes/base/gallery/label_empty.blade.php
index 6c77618..2a1b6ba 100644
--- a/resources/views/themes/base/gallery/label_empty.blade.php
+++ b/resources/views/themes/base/gallery/label_empty.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $label->name)
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/gallery/label_slideshow.blade.php b/resources/views/themes/base/gallery/label_slideshow.blade.php
index df3fcda..bc1af72 100644
--- a/resources/views/themes/base/gallery/label_slideshow.blade.php
+++ b/resources/views/themes/base/gallery/label_slideshow.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $label->name)
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/gallery/labels.blade.php b/resources/views/themes/base/gallery/labels.blade.php
index 555864f..f0b9b64 100644
--- a/resources/views/themes/base/gallery/labels.blade.php
+++ b/resources/views/themes/base/gallery/labels.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('gallery.labels_title'))
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/gallery/photo.blade.php b/resources/views/themes/base/gallery/photo.blade.php
index c31c96c..eb6fcde 100644
--- a/resources/views/themes/base/gallery/photo.blade.php
+++ b/resources/views/themes/base/gallery/photo.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', $photo->name)
 
 @section('breadcrumb')
diff --git a/resources/views/themes/base/gallery/statistics.blade.php b/resources/views/themes/base/gallery/statistics.blade.php
index 37b04d9..71bf688 100644
--- a/resources/views/themes/base/gallery/statistics.blade.php
+++ b/resources/views/themes/base/gallery/statistics.blade.php
@@ -1,4 +1,4 @@
-@extends('themes.base.layout')
+@extends(Theme::viewName('layout'))
 @section('title', trans('gallery.statistics.title'))
 
 @section('breadcrumb')