diff --git a/Moonlight/Shared/Components/Partials/Navbar.razor b/Moonlight/Shared/Components/Partials/Navbar.razor
index 004c580f..9135f2df 100644
--- a/Moonlight/Shared/Components/Partials/Navbar.razor
+++ b/Moonlight/Shared/Components/Partials/Navbar.razor
@@ -41,13 +41,6 @@
 }
 
 <div class="app-navbar flex-shrink-0">
-    <div class="app-navbar-item ms-1 ms-lg-3">
-        <ThemeSwitcher
-            ToggleBtnClass="btn btn-icon btn-custom btn-icon-muted btn-active-light btn-active-color-primary w-35px h-35px w-md-40px h-md-40px"
-            ToggleBtnIconClass="svg-icon svg-icon-2">
-        </ThemeSwitcher>
-    </div>
-
     @if (User != null)
     {
         <div class="app-navbar-item ms-1 ms-lg-3">
@@ -56,49 +49,7 @@
             </a>
         </div>
 
-        <!--
-        <div class="app-navbar-item ms-1 ms-lg-3" id="kt_header_user_menu_toggle">
-            <div class="cursor-pointer symbol symbol-35px symbol-md-40px" data-kt-menu-trigger="click" data-kt-menu-attach="parent" data-kt-menu-placement="bottom-end">
-                <img alt="Avatar" src="/api/moonlight/avatar/@(User.Id)"/>
-            </div>
-
-            <div class="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-gray-800 menu-state-bg menu-state-primary fw-semibold py-4 fs-6 w-275px" data-kt-menu="true">
-                <div class="menu-item px-3">
-                    <div class="menu-content d-flex align-items-center px-3">
-                        <div class="symbol symbol-50px me-5">
-                            <img alt="Avatar" src="/api/moonlight/avatar/@(User.Id)"/>
-                        </div>
-                        <div class="d-flex flex-column">
-                            <div class="fw-bold d-flex align-items-center fs-5">
-                                <div class="@(User.StreamerMode ? "blur" : "")">
-                                    @(User.FirstName) @(User.LastName)
-                                </div>
-
-                                @if (User.Admin)
-                                {
-                                    <span class="badge badge-light-success fw-bold fs-8 px-2 py-1 ms-2">Admin</span>
-                                }
-                            </div>
-                            <a class="fw-semibold text-muted text-hover-primary fs-7 @(User.StreamerMode ? "blur" : "")">@(User.Email)</a>
-                        </div>
-                    </div>
-                </div>
-                <div class="separator my-2"></div>
-                <div class="menu-item px-5 my-1">
-                    <a href="/profile" class="menu-link px-5">
-                        <TL>Profile</TL>
-                    </a>
-                </div>
-                <div class="menu-item px-5">
-                    <a @onclick="Logout" class="menu-link px-5">
-                        <TL>Logout</TL>
-                    </a>
-                </div>
-            </div>
-        </div>
-        -->
-        
-        <div class="app-navbar-item ms-1 ms-lg-3 dropdown" id="kt_header_user_menu_toggle">
+        <div class="app-navbar-item ms-1 ms-lg-3 dropdown">
             <!-- Trigger -->
             <a class="cursor-pointer d-block symbol symbol-35px symbol-md-40px" href="#" role="button" id="dropdownMenuLink" data-bs-toggle="dropdown" aria-expanded="false">
                 <img alt="Avatar" src="/api/moonlight/avatar/@(User.Id)" width="35" height="35">
diff --git a/Moonlight/Shared/Components/Partials/PageHeader.razor b/Moonlight/Shared/Components/Partials/PageHeader.razor
deleted file mode 100644
index e4d9b822..00000000
--- a/Moonlight/Shared/Components/Partials/PageHeader.razor
+++ /dev/null
@@ -1,26 +0,0 @@
-@using Moonlight.App.Services.Files
-@using Moonlight.App.Services.Sessions
-
-@inject ResourceService ResourceService
-
-<div id="kt_app_header" class="app-header">
-    <div class="app-container container-fluid d-flex align-items-stretch justify-content-between">
-        <div class="d-flex align-items-center d-lg-none ms-n2 me-2" title="Show sidebar menu">
-            <div class="btn btn-icon btn-active-color-primary w-35px h-35px" id="kt_app_sidebar_mobile_toggle">
-                <i class="bx bx-menu bx-md"></i>
-            </div>
-        </div>
-        <div class="d-flex align-items-center flex-grow-1 flex-lg-grow-0">
-            <a href="/" class="d-lg-none">
-                <img alt="Logo" src="@(ResourceService.Image("logo.svg"))" class="h-30px"/>
-            </a>
-        </div>
-        <div class="d-flex align-items-stretch justify-content-between flex-lg-grow-1" id="kt_app_header_wrapper">
-            <div class="app-header-menu app-header-mobile-drawer align-items-stretch" data-kt-drawer="true" data-kt-drawer-name="app-header-menu" data-kt-drawer-activate="{default: true, lg: false}" data-kt-drawer-overlay="true" data-kt-drawer-width="225px" data-kt-drawer-direction="end" data-kt-drawer-toggle="#kt_app_header_menu_toggle" data-kt-swapper="true" data-kt-swapper-mode="{default: 'append', lg: 'prepend'}" data-kt-swapper-parent="{default: '#kt_app_body', lg: '#kt_app_header_wrapper'}">
-                <div class="menu menu-rounded menu-column menu-lg-row my-5 my-lg-0 align-items-stretch fw-semibold px-2 px-lg-0" id="kt_app_header_menu" data-kt-menu="true">
-                </div>
-            </div>
-            <Navbar></Navbar>
-        </div>
-    </div>
-</div>
\ No newline at end of file
diff --git a/Moonlight/Shared/Components/Partials/Sidebar.razor b/Moonlight/Shared/Components/Partials/Sidebar.razor
deleted file mode 100644
index cc7557d2..00000000
--- a/Moonlight/Shared/Components/Partials/Sidebar.razor
+++ /dev/null
@@ -1,274 +0,0 @@
-@using Moonlight.App.Services.Sessions
-@using Moonlight.App.Database.Entities
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Files
-
-@inject IdentityService IdentityService
-@inject ResourceService ResourceService
-@inject IJSRuntime JsRuntime
-
-<div id="kt_app_sidebar" class="app-sidebar flex-column @(ShowMobileSidebar ? "" : "")" data-kt-drawer="true" data-kt-drawer-name="app-sidebar" data-kt-drawer-activate="{default: true, lg: false}" data-kt-drawer-overlay="true" data-kt-drawer-width="225px" data-kt-drawer-direction="start" data-kt-drawer-toggle="#kt_app_sidebar_mobile_toggle">
-    <div class="app-sidebar-logo px-6" id="kt_app_sidebar_logo">
-        <a href="@(User != null ? "/" : "/login")">
-            @if (sidebar == "dark-sidebar")
-            {
-                <img alt="Logo" src="@(ResourceService.Image("logolong.png"))" class="h-45px app-sidebar-logo-default"/>
-            }
-            else
-            {
-                if (sidebar == "light-sidebar")
-                {
-                    <img alt="Logo" src="@(ResourceService.Image("logo.svg"))" class="theme-light-show h-20px app-sidebar-logo-default"/>
-                    <img alt="Logo" src="@(ResourceService.Image("logo.svg"))" class="theme-dark-show h-20px app-sidebar-logo-default"/>
-                }
-            }
-            <img alt="Logo" src="@(ResourceService.Image("logo.svg"))" class="h-20px app-sidebar-logo-minimize"/>
-        </a>
-    
-        <div id="kt_app_sidebar_toggle" class="app-sidebar-toggle btn btn-icon btn-shadow btn-sm btn-color-muted btn-active-color-primary body-bg h-30px w-30px position-absolute top-50 start-100 translate-middle rotate" data-kt-toggle="true" data-kt-toggle-state="active" data-kt-toggle-target="body" data-kt-toggle-name="app-sidebar-minimize">
-            <i class="bx bx-chevrons-left bx-md"></i>
-        </div>
-    </div>
-    
-    <div class="app-sidebar-menu overflow-hidden flex-column-fluid">
-    <div id="kt_app_sidebar_menu_wrapper" class="app-sidebar-wrapper hover-scroll-overlay-y my-5" data-kt-scroll="true" data-kt-scroll-activate="true" data-kt-scroll-height="auto" data-kt-scroll-dependencies="#kt_app_sidebar_logo, #kt_app_sidebar_footer" data-kt-scroll-wrappers="#kt_app_sidebar_menu" data-kt-scroll-offset="5px" data-kt-scroll-save-state="true">
-    <div class="menu menu-column menu-rounded menu-sub-indention px-3" id="#kt_app_sidebar_menu" data-kt-menu="true" data-kt-menu-expand="false">
-    @if (User == null)
-    {
-        <div class="menu-item">
-            <a class="menu-link" href="/login">
-                <span class="menu-icon">
-                    <i class="bx bxs-log-in"></i>
-                </span>
-                <span class="menu-title">
-                    <TL>Login</TL>
-                </span>
-            </a>
-        </div>
-        <div class="menu-item">
-            <a class="menu-link" href="/register">
-                <span class="menu-icon">
-                    <i class="bx bx-user-plus"></i>
-                </span>
-                <span class="menu-title">
-                    <TL>Register</TL>
-                </span>
-            </a>
-        </div>
-    }
-    else
-    {
-        <div class="menu-item">
-            <a class="menu-link" href="/">
-                <span class="menu-icon">
-                    <i class="bx bx-layer"></i>
-                </span>
-                <span class="menu-title">
-                    <TL>Dashboard</TL>
-                </span>
-            </a>
-        </div>
-        <div class="menu-item">
-            <a class="menu-link" href="/servers">
-                <span class="menu-icon">
-                    <i class="bx bx-server"></i>
-                </span>
-                <span class="menu-title">
-                    <TL>Servers</TL>
-                </span>
-            </a>
-        </div>
-        <div class="menu-item">
-            <a class="menu-link" href="/webspaces">
-                <span class="menu-icon">
-                    <i class="bx bx-globe"></i>
-                </span>
-                <span class="menu-title">
-                    <TL>Webspaces</TL>
-                </span>
-            </a>
-        </div>
-        <div class="menu-item">
-            <a class="menu-link" href="/domains">
-                <span class="menu-icon">
-                    <i class="bx bx-purchase-tag"></i>
-                </span>
-                <span class="menu-title">
-                    <TL>Domains</TL>
-                </span>
-            </a>
-        </div>
-    
-        if (IdentityService.Permissions.HasAnyPermissions())
-        {
-            <div class="menu-item pt-5">
-                <div class="menu-content">
-                    <span class="menu-heading fw-bold text-uppercase fs-7">
-                        <TL>Admin</TL>
-                    </span>
-                </div>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin">
-                    <span class="menu-icon">
-                        <i class="bx bx-layer"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Dashboard</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/system">
-                    <span class="menu-icon">
-                        <i class="bx bx-chip"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>System</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/security">
-                    <span class="menu-icon">
-                        <i class="bx bx-shield"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Security</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/servers">
-                    <span class="menu-icon">
-                        <i class="bx bx-server"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Servers</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/webspaces">
-                    <span class="menu-icon">
-                        <i class="bx bx-globe"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Webspaces</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/users">
-                    <span class="menu-icon">
-                        <i class="bx bx-user"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Users</TL>
-                    </span>
-                </a>
-            </div>
-            <div data-kt-menu-trigger="click" class="menu-item menu-accordion">
-                <span class="menu-link">
-                    <span class="menu-icon">
-                        <i class="bx bx-purchase-tag"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Domains</TL>
-                    </span>
-                    <span class="menu-arrow"></span>
-                </span>
-                <div class="menu-sub menu-sub-accordion">
-                    <div class="menu-item">
-                        <a class="menu-link" href="/admin/domains/">
-                            <span class="menu-bullet">
-                                <span class="bullet bullet-dot"></span>
-                            </span>
-                            <span class="menu-title">
-                                <TL>Domains</TL>
-                            </span>
-                        </a>
-                    </div>
-                    <div class="menu-item">
-                        <a class="menu-link" href="/admin/domains/shared">
-                            <span class="menu-bullet">
-                                <span class="bullet bullet-dot"></span>
-                            </span>
-                            <span class="menu-title">
-                                <TL>Shared domains</TL>
-                            </span>
-                        </a>
-                    </div>
-                </div>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/support">
-                    <span class="menu-icon">
-                        <i class="bx bx-support"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Support</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/subscriptions">
-                    <span class="menu-icon">
-                        <i class="bx bx-credit-card"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Subscriptions</TL>
-                    </span>
-                </a>
-            </div>
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/statistics">
-                    <span class="menu-icon">
-                        <i class="bx bx-objects-vertical-bottom"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Statistics</TL>
-                    </span>
-                </a>
-            </div>
-    
-            <div class="menu-item">
-                <a class="menu-link" href="/admin/changelog">
-                    <span class="menu-icon">
-                        <i class="bx bx-notepad"></i>
-                    </span>
-                    <span class="menu-title">
-                        <TL>Changelog</TL>
-                    </span>
-                </a>
-            </div>
-        }
-    }
-    </div>
-    </div>
-    </div>
-    
-    <div class="app-sidebar-footer flex-column-auto pt-2 pb-6 px-6" id="kt_app_sidebar_footer">
-    	<a href="/support" class="btn btn-flex flex-center btn-custom btn-primary overflow-hidden text-nowrap px-0 h-40px w-100 btn-label">
-            <i class="bx bx-sm bx-support"></i>
-    	</a>
-    </div>
-</div>
-
-@code
-{
-    private string sidebar;
-    private bool ShowMobileSidebar = false;
-
-    private User? User;
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            User = IdentityService.User;
-            sidebar = await JsRuntime.InvokeAsync<string>("document.body.getAttribute", "data-kt-app-layout");
-            StateHasChanged();
-        }
-    }
-}
diff --git a/Moonlight/Shared/Components/Partials/SidebarMenu.razor b/Moonlight/Shared/Components/Partials/SidebarMenu.razor
deleted file mode 100644
index de08c549..00000000
--- a/Moonlight/Shared/Components/Partials/SidebarMenu.razor
+++ /dev/null
@@ -1,22 +0,0 @@
-@using Moonlight.App.Services
-@using Moonlight.App.Services.Sessions
-@using Moonlight.App.Database.Entities
-
-@inject IdentityService IdentityService
-
-
-
-@code
-{
-    private User? User;
-
-    protected override async Task OnAfterRenderAsync(bool firstRender)
-    {
-        if (firstRender)
-        {
-            User = IdentityService.User;
-
-            await InvokeAsync(StateHasChanged);
-        }
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/Shared/Components/Partials/ThemeSwitcher.razor b/Moonlight/Shared/Components/Partials/ThemeSwitcher.razor
deleted file mode 100644
index 3895beb9..00000000
--- a/Moonlight/Shared/Components/Partials/ThemeSwitcher.razor
+++ /dev/null
@@ -1,52 +0,0 @@
-@inject IJSRuntime JsRuntime
-
-<a href="#" class="@ToggleBtnClass" data-kt-menu-trigger="@Trigger" data-kt-menu-attach="parent" data-kt-menu-placement="@MenuPlacement">
-    <i class="theme-light-show bx bx-sun"></i>
-    <i class="theme-dark-show bx bx-moon" ></i>
-</a>
-
-<div class="menu menu-sub menu-sub-dropdown menu-column menu-rounded menu-title-gray-700 menu-icon-muted menu-active-bg menu-state-primary fw-semibold py-4 fs-base w-175px" data-kt-menu="true" data-kt-element="theme-mode-menu">
-    <div class="menu-item px-3 my-0">
-        <a href="#" class="menu-link px-3 py-2" data-kt-element="mode" data-kt-value="light" @onclick="TriggerFlashbang">
-            <span class="menu-icon" data-kt-element="icon">
-                <i class="bx bx-sun"></i>
-            </span>
-            <span class="menu-title">Lightmode</span>
-        </a>
-    </div>
-    <div class="menu-item px-3 my-0">
-        <a href="#" class="menu-link px-3 py-2" data-kt-element="mode" data-kt-value="dark">
-            <span class="menu-icon" data-kt-element="icon">
-                <i class="bx bx-moon"></i>
-            </span>
-            <span class="menu-title">Darkmode</span>
-        </a>
-    </div>
-    <div class="menu-item px-3 my-0">
-        <a href="#" class="menu-link px-3 py-2" data-kt-element="mode" data-kt-value="system">
-            <span class="menu-icon" data-kt-element="icon">
-                <i class="bx bx-cog"></i>
-            </span>
-            <span class="menu-title">System</span>
-        </a>
-    </div>
-</div>
-
-@code {
-    [Parameter]
-    public string ToggleBtnClass { get; set; } = "";
-
-    [Parameter]
-    public string MenuPlacement { get; set; } = "bottom-end";
-    
-    [Parameter]
-    public string ToggleBtnIconClass { get; set; } = "svg-icon svg-icon-2";
-    
-    [Parameter]
-    public string Trigger { get; set; } = "{default:'click'}";
-    
-    private async void TriggerFlashbang()
-    {
-        await JsRuntime.InvokeVoidAsync("moonlight.flashbang.run");
-    }
-}
\ No newline at end of file
diff --git a/Moonlight/Shared/Layouts/DefaultLayout.razor b/Moonlight/Shared/Layouts/DefaultLayout.razor
index 0aa9ecd2..34903537 100644
--- a/Moonlight/Shared/Layouts/DefaultLayout.razor
+++ b/Moonlight/Shared/Layouts/DefaultLayout.razor
@@ -27,9 +27,9 @@
                 <img alt="Logo" src="@(ResourceService.Image("logo.svg"))" class="h-30px"/>
             </a>
         </div>
-        <div class="d-flex align-items-stretch justify-content-between flex-lg-grow-1" id="kt_app_header_wrapper">
-            <div class="app-header-menu app-header-mobile-drawer align-items-stretch" data-kt-drawer="true" data-kt-drawer-name="app-header-menu" data-kt-drawer-activate="{default: true, lg: false}" data-kt-drawer-overlay="true" data-kt-drawer-width="225px" data-kt-drawer-direction="end" data-kt-drawer-toggle="#kt_app_header_menu_toggle" data-kt-swapper="true" data-kt-swapper-mode="{default: 'append', lg: 'prepend'}" data-kt-swapper-parent="{default: '#kt_app_body', lg: '#kt_app_header_wrapper'}">
-                <div class="menu menu-rounded menu-column menu-lg-row my-5 my-lg-0 align-items-stretch fw-semibold px-2 px-lg-0" id="kt_app_header_menu" data-kt-menu="true">
+        <div class="d-flex align-items-stretch justify-content-between flex-lg-grow-1">
+            <div class="app-header-menu app-header-mobile-drawer align-items-stretch">
+                <div class="menu menu-rounded menu-column menu-lg-row my-5 my-lg-0 align-items-stretch fw-semibold px-2 px-lg-0">
                 </div>
             </div>
             <Navbar></Navbar>
@@ -38,7 +38,7 @@
 </div>
 
 <!-- Page Header End --->
-<div class="app-wrapper flex-column flex-row-fluid" id="kt_app_wrapper">
+<div class="app-wrapper flex-column flex-row-fluid">
 <!-- Sidebar -->
 
 <div class="app-sidebar flex-column @(ShowMobileSidebar ? "drawer drawer-start drawer-on" : "")">
@@ -267,7 +267,7 @@ else
 </div>
 </div>
 
-<div class="app-sidebar-footer flex-column-auto pt-2 pb-6 px-6" id="kt_app_sidebar_footer">
+<div class="app-sidebar-footer flex-column-auto pt-2 pb-6 px-6">
     <a href="/support" class="btn btn-flex flex-center btn-custom btn-primary overflow-hidden text-nowrap px-0 h-40px w-100 btn-label">
         <i class="bx bx-sm bx-support"></i>
     </a>
@@ -278,8 +278,8 @@ else
 
 <div class="app-main flex-column flex-row-fluid">
     <div class="d-flex flex-column flex-column-fluid">
-        <div id="kt_app_content" class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: linear-gradient(rgba(0, 0, 0, 0.55),rgba(0, 0, 0, 0.55)) ,url('@(DynamicBackgroundService.BackgroundImageUrl)');">
-            <div id="kt_app_content_container" class="app-container container-fluid">
+        <div class="app-content flex-column-fluid" style="background-position: center; background-size: cover; background-repeat: no-repeat; background-attachment: fixed; background-image: linear-gradient(rgba(0, 0, 0, 0.55),rgba(0, 0, 0, 0.55)) ,url('@(DynamicBackgroundService.BackgroundImageUrl)');">
+            <div class="app-container container-fluid">
                 <div class="mt-10">
                     @ChildContent
                 </div>