diff --git a/pages/_includes/layout/menu-aside.html b/pages/_includes/layout/menu-aside.html
deleted file mode 100644
index 40c565a43..000000000
--- a/pages/_includes/layout/menu-aside.html
+++ /dev/null
@@ -1,66 +0,0 @@
-{% comment %}
-{% assign current-page = page.menu | default: layout.menu | split: '.' %}
-
-<ul class="sidebar-nav">
-	<li class="sidebar-nav-title">Navigation</li>
-	{% for level-1 in site.data.menu %}
-	<li class="sidebar-nav-item">
-
-		<a {% unless level-1[1].children %}href="{{ site.base }}/{{ level-1[1].url }}"{% endunless %} class="sidebar-nav-link{% if level-1[0] == current-page[0] and current-page.size == 1 %} active{% endif %}" {% if level-1[1].children %}data-toggle="collapse" data-target="#sidebar-menu-{{ level-1[0] }}"{% if level-1[0] == current-page[0] %} aria-expanded="true"{% endif %}{% endif %}>
-			{% if level-1[1].icon %}
-				{% assign icon = level-1[1].icon %}
-				{% include ui/icon.html icon=icon class="nav-icon" %}
-			{% endif %}
-
-			<span class="nav-text">{{ level-1[1].title }}</span>
-
-			{% if level-1[1].badge %}
-			{% assign badge = level-1[1].badge %}
-			{% assign badge-color = level-1[1].badge-color | default: "green" %}
-			{% include ui/badge.html text=badge color=badge-color %}
-			{% endif %}
-
-			{% if level-1[1].children %}
-			<span class="sidebar-nav-arrow"></span>
-			{% endif %}
-		</a>
-
-		{% if level-1[1].children %}
-		<ul class="sidebar-subnav collapse{% if level-1[0] == current-page[0] %} show{% endif %}" id="sidebar-menu-{{ level-1[0] }}">
-			{% for level-2 in level-1[1].children %}
-			<li class="sidebar-nav-item">
-				<a {% unless level-2[1].children %} href="{{ site.base }}/{{ level-2[1].url }}"{% endunless %} class="sidebar-nav-link{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] and current-page.size == 2 %} active{% endif %}" {% if level-2[1].children %}data-toggle="collapse" data-target="#sidebar-menu-{{ level-2[0] }}"{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] %} aria-expanded="true"{% endif %}{% endif %}>
-					<span>{{ level-2[1].title }}</span>
-					{% if level-2[1].badge %}
-					{% assign badge = level-2[1].badge %}
-					{% include ui/badge.html text=badge color="green" %}
-					{% endif %}
-
-					{% if level-2[1].children %}
-					<span class="sidebar-nav-arrow"></span>
-					{% endif %}
-				</a>
-
-				{% if level-2[1].children %}
-				<ul class="sidebar-subnav collapse{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] %} show{% endif %}" id="sidebar-menu-{{ level-2[0] }}">
-					{% for level-3 in level-2[1].children %}
-					<li class="sidebar-nav-item">
-						<a href="{{ site.base }}/{{ level-3[1].url }}" class="sidebar-nav-link{% if level-1[0] == current-page[0] and level-2[0] == current-page[1] and level-3[0] == current-page[2] and current-page.size == 3 %} active{% endif %}">
-							<span>{{ level-3[1].title }}</span>
-							{% if level-3[1].badge %}
-							{% assign badge = level-3[1].badge %}
-							{% include ui/badge.html text=badge color="green" %}
-							{% endif %}
-						</a>
-					</li>
-					{% endfor %}
-				</ul>
-				{% endif %}
-			</li>
-			{% endfor %}
-		</ul>
-		{% endif %}
-	</li>
-	{% endfor %}
-</ul>
-{% endcomment %}
\ No newline at end of file
diff --git a/pages/_includes/layout/sidebar.html b/pages/_includes/layout/sidebar.html
deleted file mode 100644
index d2049650a..000000000
--- a/pages/_includes/layout/sidebar.html
+++ /dev/null
@@ -1,30 +0,0 @@
-{% comment %}
-
-<aside class="sidebar{% if page.sidebar-dark %} sidebar-dark{% endif %}{% if page.sidebar-narrow %} sidebar-narrow{% endif %}{% if page.sidebar-right %} sidebar-right{% endif %}">
-	<!-- Sidebar logo -->
-	{% include layout/navbar-logo.html prefix="sidebar" %}
-
-	<div class="sidebar-content">
-		<div>
-			<!-- Sidebar menu -->
-			{% include layout/menu-aside.html %}
-
-			<div class="hide-sidebar-narrow">
-				<hr>
-
-				<div class="text-muted">
-					<div class="mb-2">
-						<strong>160MB</strong> from <strong>2GB</strong> used.
-					</div>
-					{% include ui/progress.html percentage=30 size="sm" %}
-				</div>
-			</div>
-		</div>
-
-		<div class="mt-auto hide-sidebar-narrow pt-3">
-			{% include ui/button.html text="Logout" color="primary" icon="log-out" block=true %}
-		</div>
-	</div>
-</aside>
-
-{% endcomment %}
\ No newline at end of file
diff --git a/pages/_includes/layout/topnav.html b/pages/_includes/layout/topnav.html
deleted file mode 100644
index 4d4ab6a1e..000000000
--- a/pages/_includes/layout/topnav.html
+++ /dev/null
@@ -1,81 +0,0 @@
-{% comment %}
-
-{% assign person-id = include.person-id | default: 12 | minus: 1 %}
-{% assign person = site.data.people[person-id] %}
-
-{% assign dark = page.topnav-dark %}
-{% assign fixed = page.topnav-fixed %}
-{% assign breakpoint = 'lg' %}
-
-{% unless page.hide-topnav %}
-<header class="navbar-wrap navbar-expand-lg flex-column{% if fixed %} fixed-top{% endif %}">
-	<div class="navbar navbar-border {% if page.topnav-dark %}navbar-dark bg-dark text-white{% else %}navbar-light bg-white{% endif %}">
-		<div class="container{% if include.topnav-fluid %}-fluid{% endif %}">
-
-			<button class="navbar-toggler mr-auto {% if page.sidebar %}hide-sidebar-visible{% else %}d-{{ breakpoint }}-none{% endif %}" type="button" data-toggle="collapse" data-target="#nav-main-menu" aria-expanded="false" aria-label="Toggle menu">
-				<span class="navbar-toggler-icon"></span>
-			</button>
-
-			<a href="{{ site.base }}" class="navbar-brand hide-sidebar-visible m-0">
-				<img src="{{ site.base }}/static/logo{% if dark %}-white{% endif %}.svg" alt="{{ site.title }}" class="navbar-brand-logo">
-			</a>
-
-			{% comment %}
-			{% if page.sidebar %}
-			{% include layout/navbar-search.html class="mr-4" %}
-			{% endif %}
-			{% endcomment %}
-
-			<ul class="nav navbar-menu align-items-center ml-auto">
-				<li class="nav-item d-none d-lg-flex mr-3">
-					{% include ui/button.html href=site.github_url text="Source code" icon="brand/github" external=true %}
-				</li>
-
-				<li class="nav-item dropdown">
-					<a href="#" data-toggle="dropdown" class="nav-link d-flex align-items-center py-0 px-lg-0 px-2 text-reset ml-2" aria-label="Show personal menu">
-						{% include ui/avatar.html src=person.photo size="sm" %}
-						<span class="ml-2 d-none d-lg-block lh-1">
-							{{ person.full_name }}
-							<span class="text-muted d-block mt-1 text-h6">Administrator</span>
-						</span>
-					</a>
-					<div class="dropdown-menu dropdown-menu-right dropdown-menu-arrow">
-						<a class="dropdown-item" href="#">
-							{% include ui/icon.html icon="user" class="dropdown-icon" %} Profile
-						</a>
-						<a class="dropdown-item" href="#">
-							{% include ui/icon.html icon="settings" class="dropdown-icon" %} Settings
-						</a>
-						<a class="dropdown-item" href="#">
-							{% include ui/icon.html icon="mail" class="dropdown-icon" %} Inbox
-							<span class="badge bg-primary ml-auto">6</span>
-						</a>
-						<a class="dropdown-item" href="#">
-							{% include ui/icon.html icon="send" class="dropdown-icon" %} Message
-						</a>
-						<div class="dropdown-divider"></div>
-						<a class="dropdown-item" href="#">
-							{% include ui/icon.html icon="help-circle" class="dropdown-icon" %} Need help?
-						</a>
-						<a class="dropdown-item" href="#">
-							{% include ui/icon.html icon="log-out" class="dropdown-icon" %} Sign out
-						</a>
-					</div>
-				</li>
-			</ul>
-		</div>
-	</div>
-
-	{% unless page.sidebar %}
-	<div class="navbar navbar-border collapse navbar-collapse navbar-collapse-absolute {% if page.topmenu-dark %}navbar-dark bg-dark text-white{% else %}navbar-light bg-white{% endif %}" id="nav-main-menu">
-		<div class="container{% if include.topnav-fluid %}-fluid{% endif %}">
-				{% include layout/menu.html top=true %}
-				{% include layout/navbar-search.html %}
-		</div>
-	</div>
-	{% endunless %}
-
-</header>
-{% endunless %}
-
-{% endcomment %}
\ No newline at end of file
diff --git a/scss/mixins/_mixins.scss b/scss/mixins/_mixins.scss
index d7be58fa2..d7e8a970e 100644
--- a/scss/mixins/_mixins.scss
+++ b/scss/mixins/_mixins.scss
@@ -49,13 +49,13 @@
 @mixin dark-mode {
   @if $enable-dark-mode {
     @media not print {
-      .theme-dark & {
+      .theme-dark {
         @content
       }
     }
 
     @media not print and (prefers-color-scheme: dark) {
-      .theme-dark-auto & {
+      .theme-dark-auto {
         @content
       }
     }