diff --git a/static/css/data.css b/static/css/data.css
index f6833962..404d0f89 100644
--- a/static/css/data.css
+++ b/static/css/data.css
@@ -38,6 +38,12 @@
     left: 50%;
     transform: translate(-50%, -50%);
   }
+  
+  @media (prefers-color-scheme: dark) {
+    .data-container::after {
+      background: #2a2a2e;
+    }
+  }
 
   .data-topic {
     flex-basis: 50%;
diff --git a/static/css/janitor-new.css b/static/css/janitor-new.css
index c10005ce..5360cb28 100644
--- a/static/css/janitor-new.css
+++ b/static/css/janitor-new.css
@@ -101,11 +101,11 @@ a:not(:hover) {
 }
 
 a {
-  color: #0060df;
+  color: #0a84ff;
 }
 
 a:active {
-  color: #003eaa;
+  color: #0060df;
 }
 
 small {
@@ -207,9 +207,9 @@ section:not(:last-child) {
 .btn {
   border: none;
   border-radius: 2px;
-  background: #ededf0;
+  background: rgba(12, 12, 13, 0.1);
   padding: 6px 10px;
-  color: #0c0c0d;
+  color: inherit;
   text-decoration: none;
   font: inherit;
   display: inline-block;
@@ -222,11 +222,11 @@ section:not(:last-child) {
 }
 
 .btn:hover {
-  background: #d7d7db;
+  background: rgba(12, 12, 13, 0.2);
 }
 
 .btn:hover:active {
-  background: #b1b1b3;
+  background: rgba(12, 12, 13, 0.3);
 }
 
 .btn:focus {
@@ -240,11 +240,11 @@ section:not(:last-child) {
 }
 
 .btn-primary:hover {
-  background: #38383d;
+  background: #2a2a2e;
 }
 
 .btn-primary:hover:active {
-  background: #2a2a2e;
+  background: #38383d;
 }
 
 .btn-error {
@@ -298,14 +298,14 @@ textarea.form-control {
 .form-control.disabled,
 .form-control:disabled {
   pointer-events: none;
-  background: #f5f5f5;
+  opacity: 0.3;
 }
 
 /* Header and footer shared code */
 
 .brand-logo {
   text-decoration: none;
-  color: inherit;
+  color: inherit !important;
   display: block;
 }
 
@@ -343,7 +343,7 @@ textarea.form-control {
 }
 
 .link-list-wrapper ul li a:hover {
-  color: #0b0b0d;
+  color: inherit;
 }
 
 /* Navigation bar */
@@ -456,17 +456,17 @@ textarea.form-control {
   }
 
   .navbar ul li:hover {
-    background: #f8f8f8;
+    background: rgba(128,128,128,0.15);
   }
 
   .navbar ul li.active {
-    background: #f8f8f8;
+    background: rgba(128,128,128,0.2);
     font-weight: 600;
   }
 
   .navbar ul li a {
     color: #0b0b0d;
-    border-bottom: solid 1px #eee;
+    border-bottom: solid 1px rgba(128,128,128,0.2);
     display: block;
     line-height: 50px;
     font-size: 14px;
@@ -826,3 +826,49 @@ textarea.form-control {
 .ajax-form.error .form-control-feedback::before {
   background-image: url(../img/icons/error.svg);
 }
+
+/* Dark theme */
+
+@media (prefers-color-scheme: dark) {
+  body {
+    background: #2a2a2e;
+    color: #ededf0;
+  }
+
+  .navbar,
+  .card,
+  .panel,
+  .panel-body,
+  .footer {
+    background: #38383d;
+  }
+
+  .form-control {
+    background: #0c0c0d;
+    color: #ededf0;
+  }
+
+  .danger-zone {
+    color: #d70022;
+  }
+
+  section:not(:last-child),
+  .global-tab-nav,
+  .panel > .panel-heading,
+  .panel > .panel-section,
+  .footer {
+    border-color: rgba(255,255,255,0.1);
+  }
+
+  .grey-text,
+  p,
+  .link-list-wrapper ul li a:not(:hover) {
+    color: #b1b1b3;
+  }
+
+  .icon::before,
+  .form-control-feedback::before,
+  .brand-logo img {
+    filter: invert(1);
+  }
+}
diff --git a/static/css/landing.css b/static/css/landing.css
index 1f3123ec..b87e0ec2 100644
--- a/static/css/landing.css
+++ b/static/css/landing.css
@@ -36,6 +36,13 @@
   justify-content: space-around;
 }
 
+@media (prefers-color-scheme: dark) {
+  #quotes {
+    background: #38383d;
+    border-color: rgba(255,255,255,0.05);
+  }
+}
+
 @media screen and (max-width: 768px) {
   #quotes {
     display: block;
@@ -68,7 +75,6 @@
   text-align: justify;
   line-height: 1.5;
   margin: 0;
-  color: #666;
   padding: 0 5px 20px 0;
 }
 
@@ -95,6 +101,12 @@
   vertical-align: middle;
 }
 
+@media (prefers-color-scheme: dark) {
+  #feature-list li::before {
+    filter: invert(1);
+  }
+}
+
 .partners {
   display: flex;
   flex-wrap: wrap;
diff --git a/templates/landing.html b/templates/landing.html
index 54a29396..8639650b 100644
--- a/templates/landing.html
+++ b/templates/landing.html
@@ -10,15 +10,15 @@
         </div>
         <div id="quotes" class="landing-section">
           <div class="quote grow">
-            <blockquote>Just wanted to say thanks for making Janitor. It just saved me a ton of time debugging a crash.</blockquote>
+            <blockquote class="grey-text">Just wanted to say thanks for making Janitor. It just saved me a ton of time debugging a crash.</blockquote>
             <span>― Brian Grinstead</span>
           </div>
           <div class="quote grow">
-            <blockquote>This will change the lives of a lot of contributors.</blockquote>
+            <blockquote class="grey-text">This will change the lives of a lot of contributors.</blockquote>
             <span>― Michael Kohler</span>
           </div>
           <div class="quote grow">
-            <blockquote>Mind blown! This would have literally saved months of my life years ago when I hacked on Firefox.</blockquote>
+            <blockquote class="grey-text">Mind blown! This would have literally saved months of my life years ago when I hacked on Firefox.</blockquote>
             <span>― Brian King</span>
           </div>
         </div>