diff --git a/public/assets/default_theme/css/base.css b/public/assets/default_theme/css/base.css
index d6a117a918..9e5304ed83 100644
--- a/public/assets/default_theme/css/base.css
+++ b/public/assets/default_theme/css/base.css
@@ -2,7 +2,6 @@
 @import url("../fonts/opensans/opensans.css");
 @import url("widgets/buttons.css");
 @import url("widgets/sections.css");
-@import url("colors.css");
 
 /* Sizes vars */
 :root {
@@ -14,6 +13,29 @@
 }
 
 /* RESET START */
+* {
+    -webkit-box-sizing: border-box !important;
+    -moz-box-sizing: border-box !important;
+    box-sizing: border-box !important;
+}
+
+body,
+html {
+    -webkit-font-smoothing: antialiased;
+    -moz-osx-font-smoothing: grayscale;
+    background-attachment: fixed;
+    font-family: 'Open Sans', sans-serif;
+    font-size: var(--default);
+}
+
+body,
+input,
+textarea,
+select {
+    color: var(--foreground);
+    fill: var(--foreground);
+}
+
 :link,
 :visited {
     text-decoration: none;
@@ -27,6 +49,7 @@ hr {
     all: unset;
     display: block;
     height: 1px;
+    background-color: var(--border) !important;
 }
 
 ol,
@@ -88,21 +111,6 @@ details > summary::-webkit-details-marker {
     display: none;
 }
 
-* {
-    -webkit-box-sizing: border-box !important;
-    -moz-box-sizing: border-box !important;
-    box-sizing: border-box !important;
-}
-
-body,
-html {
-    -webkit-font-smoothing: antialiased;
-    -moz-osx-font-smoothing: grayscale;
-    background-attachment: fixed;
-    font-family: 'Open Sans', sans-serif;
-    font-size: var(--default);
-}
-
 h1,
 h2,
 h3,
@@ -187,10 +195,6 @@ li {
 -moz-box-shadow: var(--shadow-inset-accent);
 box-shadow: var(--shadow-inset-accent);
 }
-
-hr {
-    background-color: var(--border) !important;
-}
 /* RESET END */
 
 /* DARK AND LIGHT COLOUR SCHEMES START */
@@ -249,22 +253,22 @@ hr {
 /* DARK AND LIGHT COLOUR SCHEMES END */
 
 /* MISCELLANEOUS START */
-    /* Align all icon .svg to center */
-    .icon {
-        align-self: center;
-    }
+/* Align all icon .svg to center */
+.icon {
+    align-self: center;
+}
 
-    /* All active links should pop up, the user should be aware where it is */
-    .active {
-        font-weight: bold;
-    }
+/* All active links should pop up, the user should be aware where it is */
+.active {
+    font-weight: bold;
+}
 
-    /* Hide all anchors used for accesskey shortcuts */
-    .anchor-hidden {
-        width: 1px;
-        height: 1px;
-        overflow: hidden;
-    }
+/* Hide all anchors used for accesskey shortcuts */
+.anchor-hidden {
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
 /* MISCELLANEOUS END */
 
 /* Background image and noise (Firefox-based browsers present banding without it) */
@@ -368,6 +372,7 @@ html {
 .markdown-blocks {
     border-radius: 0 0 var(--smaller) var(--smaller);
     padding: var(--smaller);
+    background-color: var(--background-card) !important;
 }
 
 .markdown-blocks ul {
@@ -383,6 +388,7 @@ html {
     border-radius: var(--smaller) var(--smaller) 0 0;
     border-bottom: none;
     padding: var(--smaller);
+    background-color: var(--background-card) !important;
 }
 
 .doc-navigation ul {
@@ -398,6 +404,7 @@ html {
     display: flex;
     flex-direction: column;
     font-size: var(--default);
+    background-color: var(--background-card) !important;
 }
 
 #replyform textarea {
diff --git a/public/assets/default_theme/css/colors.css b/public/assets/default_theme/css/colors.css
deleted file mode 100644
index cdc61f1edb..0000000000
--- a/public/assets/default_theme/css/colors.css
+++ /dev/null
@@ -1,90 +0,0 @@
-
-
-#replyform,
-.doc-navigation,
-.h-entry,
-.markdown-blocks {
-    background-color: var(--background-card) !important;
-}
-
-.set-background-color-gradient,
-button:not(.button-container),
-input[type=file] {
-    background: var(--gradient) !important;
-}
-
-.note-info {
-    background: var(--tneidarg) !important;
-}
-
-.section-settings hr {
-    background: var(--border) !important;
-}
-
-.button-container:focus,
-.button-container:hover,
-.set-background-color-accent,
-input[type=checkbox],
-input[type=checkbox]:focus,
-input[type=checkbox]:hover,
-input[type=radio]:focus,
-input[type=radio]:hover {
-    background-color: var(--accent) !important;
-}
-
-.note-actions-set,
-.set-background-color-foreground {
-    background-color: var(--foreground) !important;
-}
-
-::-webkit-file-upload-button {
-    color: var(--foreground);
-    fill: var(--foreground);
-}
-
-::file-selector-button {
-    color: var(--foreground);
-    fill: var(--foreground);
-}
-
-::file-selector-button {
-    color: var(--foreground);
-    fill: var(--foreground);
-}
-
-body,
-input,
-textarea,
-select {
-    color: var(--foreground);
-    fill: var(--foreground);
-}
-
-.doc-navigation,
-.h-entry:not(.embed),
-.markdown-blocks,
-.section-settings,
-.section-settings ul,
-.section-widget,
-.set-border-soft,
-button,
-input,
-select,
-textarea {
-    border: 2px solid var(--border) !important;
-}
-
-#header,
-.h-entry:not(.embed),
-.header-extra-forms-open,
-.profile,
-.set-shadow-dark,
-button,
-input,
-select,
-textarea {
-    -webkit-box-shadow: var(--shadow);
-    -moz-box-shadow: var(--shadow);
-    box-shadow: var(--shadow);
-}
-
diff --git a/public/assets/default_theme/css/pages/feeds.css b/public/assets/default_theme/css/pages/feeds.css
index fecd7f9740..2bf5f2daae 100644
--- a/public/assets/default_theme/css/pages/feeds.css
+++ b/public/assets/default_theme/css/pages/feeds.css
@@ -45,6 +45,13 @@
     margin-top: var(--smaller)
 }
 
+.h-entry:not(embed) {
+    border: 2px solid var(--border) !important;
+    -webkit-box-shadow: var(--shadow);
+    -moz-box-shadow: var(--shadow);
+    box-shadow: var(--shadow);
+}
+
 .h-entry img {
     background: repeating-conic-gradient(#ffffff66 0deg 90deg, #ffffff33 0deg 180deg) 0 0/40px 40px round;
 }
@@ -112,6 +119,7 @@
     -webkit-border-radius: var(--smaller);
     -moz-border-radius: var(--smaller);
     border-radius: var(--smaller);
+    background-color: var(--background-card) !important;
 }
 
 .h-entry figure {
@@ -197,10 +205,6 @@ embed header {
     opacity: 1 !important;
 }
 
-.note-actions .form-group {
-    all: unset
-}
-
 .button-container {
     border: none !important;
     -webkit-border-radius: unset !important;
@@ -219,8 +223,9 @@ embed header {
 
 .button-container:hover,
 .button-container:focus {
-    border: none;
+    border: none !important;
     opacity: 1;
+    background-color: var(--accent);
 }
 
 .favourite-button-container {
diff --git a/public/assets/default_theme/css/pages/settings.css b/public/assets/default_theme/css/pages/settings.css
index ab57df7208..f633a1e0b9 100644
--- a/public/assets/default_theme/css/pages/settings.css
+++ b/public/assets/default_theme/css/pages/settings.css
@@ -12,6 +12,7 @@
 
 .section-settings,
 .section-settings ul {
+    border: 2px solid var(--border) !important;
     background-color: var(--background-card) !important;
 }
 
diff --git a/public/assets/default_theme/css/widgets/buttons.css b/public/assets/default_theme/css/widgets/buttons.css
index 42b5342ca5..c110c6086f 100644
--- a/public/assets/default_theme/css/widgets/buttons.css
+++ b/public/assets/default_theme/css/widgets/buttons.css
@@ -84,7 +84,12 @@ textarea {
     -moz-border-radius: 0.6rem;
     border-radius: 0.6rem;
     background: var(--gradient) !important;
+    border: 2px solid var(--border) !important;
+    -webkit-box-shadow: var(--shadow);
+    -moz-box-shadow: var(--shadow);
+    box-shadow: var(--shadow);
 }
+
 select {
     -webkit-appearance: none !important;
     -moz-appearance: none !important;
@@ -131,18 +136,25 @@ input[type=file] {
     -webkit-border-radius: 0.6rem;
     -moz-border-radius: 0.6rem;
     border-radius: 0.6rem;
+    background: var(--gradient) !important;
 }
 ::-webkit-file-upload-button {
     font-family: 'Open Sans', sans-serif !important;
     font-weight: bold !important;
+    color: var(--foreground);
+    fill: var(--foreground);
 }
 ::file-selector-button {
     font-family: 'Open Sans', sans-serif !important;
     font-weight: bold !important;
+    color: var(--foreground);
+    fill: var(--foreground);
 }
 ::file-selector-button {
     font-family: 'Open Sans', sans-serif !important;
     font-weight: bold !important;
+    color: var(--foreground);
+    fill: var(--foreground);
 }
 
 input[type=checkbox],
diff --git a/public/assets/default_theme/css/widgets/sections.css b/public/assets/default_theme/css/widgets/sections.css
index 760975b190..05d91b31af 100644
--- a/public/assets/default_theme/css/widgets/sections.css
+++ b/public/assets/default_theme/css/widgets/sections.css
@@ -8,6 +8,9 @@
     border-radius: 0.6rem;
     padding: 0.6rem;
     background: var(--gradient) !important;
+    -webkit-box-shadow: var(--shadow);
+    -moz-box-shadow: var(--shadow);
+    box-shadow: var(--shadow);
 }
 .profile *[class*="profile-info-"] {
     flex: 1;
@@ -45,6 +48,7 @@
     margin-bottom: 1.3rem;
     background-color: var(--background-card) !important;
     box-shadow: var(--shadow);
+    border: 2px solid var(--border) !important;
 }
 .section-widget hr {
     margin-bottom: 0.6rem