diff --git a/src/client/page-data.ts b/src/client/page-data.ts
index 3c997b4..616814b 100644
--- a/src/client/page-data.ts
+++ b/src/client/page-data.ts
@@ -134,21 +134,25 @@ function createPageData() {
 			const pd = (mod?.$$SolidBase_page_data ??
 				defaultPageData) as CurrentPageData;
 
-			// @ts-ignore
-			pd.layout ??= {};
+			pd.layout = defaultPageData.layout;
 
 			pd.layout!.prev = pd.frontmatter.prev;
 			pd.layout!.next = pd.frontmatter.next;
 
 			switch (pd.frontmatter.layout) {
 				case "home":
-					pd.layout!.editLink ??= false;
-					pd.layout!.lastUpdated ??= false;
-					pd.layout!.next ??= false;
-					pd.layout!.prev ??= false;
-					pd.layout!.sidebar ??= false;
-					pd.layout!.toc ??= false;
-					pd.layout!.footer ??= true;
+					pd.layout!.editLink = false;
+					pd.layout!.lastUpdated = false;
+					pd.layout!.next = false;
+					pd.layout!.prev = false;
+					pd.layout!.sidebar = false;
+					pd.layout!.toc = false;
+					pd.layout!.footer = true;
+			}
+
+			for (const k in Object.keys(pd.layout ?? {})) {
+				// @ts-ignore
+				if (pd.frontmatter[k]) pd.layout[k] = pd.frontmatter[k];
 			}
 
 			return pd;
diff --git a/src/default-theme/components/Article.tsx b/src/default-theme/components/Article.tsx
index f4be899..308f9c7 100644
--- a/src/default-theme/components/Article.tsx
+++ b/src/default-theme/components/Article.tsx
@@ -153,7 +153,7 @@ export default function Article(props: ParentProps) {
 					</Show>
 				</div>
 
-				<Show when={!mobileLayout() && pageData().layout?.toc}>
+				<Show when={!mobileLayout() && (pageData().layout?.toc ?? true)}>
 					<aside class={styles.aside}>
 						<TableOfContents />
 					</aside>