diff --git a/assets/style/dark-mode.css b/assets/style/dark-mode.css
index 99b57f6..784eb42 100644
--- a/assets/style/dark-mode.css
+++ b/assets/style/dark-mode.css
@@ -1,4 +1,7 @@
 /* Default colors */
+:root {
+    color-scheme: dark;
+}
 * {
     color: #EEE;
 	scrollbar-color: #424242 #212121;	
diff --git a/assets/style/light-mode.css b/assets/style/light-mode.css
index 2e0dd83..696113b 100644
--- a/assets/style/light-mode.css
+++ b/assets/style/light-mode.css
@@ -1,4 +1,7 @@
 /* Default colors */
+:root {
+    color-scheme: light;
+}
 * {
     color: #212121;
 	scrollbar-color: #BDBDBD #EEE;
diff --git a/assets/style/main.css b/assets/style/main.css
index d1d6f19..1be8181 100644
--- a/assets/style/main.css
+++ b/assets/style/main.css
@@ -1,3 +1,6 @@
+html {
+    overflow-y: scroll;
+}
 body {
     margin: 0;
     overflow-x: hidden;
@@ -84,7 +87,6 @@ a:hover {
     width: 100px;
 }
 #sidebar .container {
-    padding: 10px;
     text-align: left;
     line-height: 1.5;
 }
@@ -103,7 +105,7 @@ a:hover {
     vertical-align: top;
     width: 820px;
     max-width: 100%;
-    padding: 0 10px 20px 10px;
+    padding: 0 10px;
     box-sizing:         border-box;
     -moz-box-sizing:    border-box;
     -webkit-box-sizing: border-box;
diff --git a/inc/sidebar.inc b/inc/sidebar.inc
index 85f19f7..4ba1b92 100644
--- a/inc/sidebar.inc
+++ b/inc/sidebar.inc
@@ -1,7 +1,7 @@
 <div id="sidebar-wrapper" class="inline-block">
 	<div id="sidebar" class="inline-block">
 		<aside>
-			<div class="container" style="font-size: 14px;">
+			<div class="section container" style="font-size: 14px;">
 				<h2>Theme</h2>
                 <?php
                     // List of themes and a condition to test if it's deselected (!)