diff --git a/assets/style.css b/assets/style.css
index 4c2e286..39605f8 100644
--- a/assets/style.css
+++ b/assets/style.css
@@ -8,6 +8,14 @@ html {
         "Source Serif Pro", serif;
 }
 
+/* For overscroll in Apple browsers */
+html {
+    background: var(--theme-main);
+}
+body {
+    background: white;
+}
+
 h1 {
     font-weight: normal;
     font-style: normal;
@@ -187,11 +195,11 @@ nav {
 
 /* Sticky footer */
 html, body {
-  height: 100%;
   margin: 0;
   padding: 0;
 }
 body {
+    min-height: 100vh;
   display: flex;
   flex-direction: column;
 }
diff --git a/templates/layout.html b/templates/layout.html
index 2123814..46c7109 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html class="theme-{{theme()}}">
 <head>
 <title>{{title}}</title>
 <meta name="viewport" content="width=device-width, initial-scale=1">
@@ -9,7 +9,7 @@
 <link href="_assets/{{style_css()}}" rel="stylesheet">
 <meta name="generator" content="{{project_name()}} {{version()}}" />
 </head>
-<body class="theme-{{theme()}}">
+<body>
 {{>search_input.html}}
 {{{body}}}
 </body>
