diff --git a/GanjooRazor/Pages/Index.cshtml b/GanjooRazor/Pages/Index.cshtml
index 7650f564..ff3a7cc8 100644
--- a/GanjooRazor/Pages/Index.cshtml
+++ b/GanjooRazor/Pages/Index.cshtml
@@ -235,6 +235,8 @@
                 paste_remove_styles_if_webkit: true,
                 paste_strip_class_attributes: true,
                 a11y_advanced_options: true,
+                skin: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "oxide-dark" : ""),
+                content_css: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : ""),
                 setup: function (editor) {
                     editor.on('tap', function (e, f) {
                         var editor_id = e.view.frameElement.id.slice(0, -4);
diff --git a/GanjooRazor/Pages/Photos.cshtml b/GanjooRazor/Pages/Photos.cshtml
index dc2fce17..0db22db5 100644
--- a/GanjooRazor/Pages/Photos.cshtml
+++ b/GanjooRazor/Pages/Photos.cshtml
@@ -40,6 +40,8 @@
                 paste_remove_styles_if_webkit: true,
                 paste_strip_class_attributes: true,
                 a11y_advanced_options: true,
+                skin: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "oxide-dark" : ""),
+                content_css: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "")
             });
 
 
diff --git a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
index a7255c84..506820f3 100644
--- a/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_AdminLayout.cshtml
@@ -29,7 +29,9 @@
             paste_remove_styles_if_webkit: true,
             paste_strip_class_attributes: true,
             smart_paste: false,
-            a11y_advanced_options: true
+            a11y_advanced_options: true,
+            skin: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "oxide-dark" : ""),
+            content_css: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "")
         });
     </script>
 
diff --git a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
index d56b75a9..73c626da 100644
--- a/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
+++ b/GanjooRazor/Pages/Shared/_UserPanelLayout.cshtml
@@ -26,7 +26,9 @@
             paste_remove_styles: true,
             paste_remove_styles_if_webkit: true,
             paste_strip_class_attributes: true,
-            a11y_advanced_options: true
+            a11y_advanced_options: true,
+            skin: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "oxide-dark" : ""),
+            content_css: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : "")
         });
     </script>
     <script src="/lib/diff.js"></script>
diff --git a/GanjooRazor/Pages/_BNumPartial.cshtml b/GanjooRazor/Pages/_BNumPartial.cshtml
index ba9748e0..705f371b 100644
--- a/GanjooRazor/Pages/_BNumPartial.cshtml
+++ b/GanjooRazor/Pages/_BNumPartial.cshtml
@@ -118,6 +118,8 @@
             paste_remove_styles_if_webkit: true,
             paste_strip_class_attributes: true,
             a11y_advanced_options: true,
+            skin: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "oxide-dark" : ""),
+            content_css: (window.matchMedia("(prefers-color-scheme: dark)").matches ? "dark" : ""),
             setup: function(editor) {
             editor.on('tap', function(e) {
                 if(userNotifiedOnEditInsteadOfComment == false){
diff --git a/GanjooRazor/wwwroot/css/p8.css b/GanjooRazor/wwwroot/css/p8.css
index 4b978e58..3fd535eb 100644
--- a/GanjooRazor/wwwroot/css/p8.css
+++ b/GanjooRazor/wwwroot/css/p8.css
@@ -927,7 +927,7 @@ ol {
 }
 
 .footer-contents .material-icons{
-    font-size: 12px;
+    font-size: 10px;
 }
 
 .info-buttons {
@@ -1223,6 +1223,7 @@ ol {
     #footer li {
         text-align: right;
         padding-right: 20px;
+        margin-top: 5px;
     }
 
         #footer li a {
@@ -2054,4 +2055,8 @@ fieldset {
     .bg-white{
         background-color: darkgray !important;
     }
+
+    .tox .tox-notification--info p {
+        color: black !important;
+    }
 }