diff --git a/toolkit/scss/toolkit.scss b/toolkit/scss/toolkit.scss
index 489797b..f65b777 100644
--- a/toolkit/scss/toolkit.scss
+++ b/toolkit/scss/toolkit.scss
@@ -617,17 +617,6 @@ img {
         background-color: $white;
         color: $primary;
 
-        &.toolkit-dark {
-            background-color: $dark-body;
-            border-color: $dark-primary;
-            color: $dark-primary;
-
-            &:hover {
-                border-color: $dark-primary-hover;
-                color: $dark-primary-hover;
-            }
-        }
-
         &:hover {
             border-color: $primary-border;
             color: $primary-border;
@@ -640,17 +629,6 @@ img {
         border: 1px solid $outline;
         color: $outline;
 
-        &.toolkit-dark {
-            background-color: $dark-body;
-            color: $border-light;
-            border-color: $border-light;
-
-            &:hover {
-                color: $secondary-border-hover;
-                border-color: $secondary-border-hover;
-            }
-        }
-
         &:hover {
             border-color: $dark;
             color: $dark;
@@ -663,17 +641,6 @@ img {
         background-color: $light-background;
         color: $dark;
 
-        &.toolkit-dark {
-            border-color: $dark-border;
-            background-color: $dark-heading;
-            color: $dark-text;
-
-            &:hover {
-                border-color: $dark-heading;
-                background-color: $dark-heading-hover;
-            }
-        }
-
         &:hover {
             border-color: $secondary-border-hover;
             background-color: $secondary-hover;
@@ -698,6 +665,44 @@ img {
         border: 1px solid;
     }
 }
+.toolkit-dark .toolkit-file,
+.toolkit-dark .toolkit-button {
+    &.toolkit-file__primary-outline,
+    &.toolkit-button__primary-outline {
+        background-color: $dark-body;
+        border-color: $dark-primary;
+        color: $dark-primary;
+
+        &:hover {
+            border-color: $dark-primary-hover;
+            color: $dark-primary-hover;
+        }
+    }
+
+    &.toolkit-file__outline,
+    &.toolkit-button__outline {
+        background-color: $dark-body;
+        color: $border-light;
+        border-color: $border-light;
+
+        &:hover {
+            color: $secondary-border-hover;
+            border-color: $secondary-border-hover;
+        }
+    }
+
+    &.toolkit-file__secondary,
+    &.toolkit-button__secondary {
+        border-color: $dark-border;
+        background-color: $dark-heading;
+        color: $dark-text;
+
+        &:hover {
+            border-color: $dark-heading;
+            background-color: $dark-heading-hover;
+        }
+    }
+}
 
 .toolkit-time__long {
     display: inline;
diff --git a/toolkit/src/button.rs b/toolkit/src/button.rs
index 1ecfe34..0e1313c 100644
--- a/toolkit/src/button.rs
+++ b/toolkit/src/button.rs
@@ -20,7 +20,6 @@ pub struct Button {
     pub(crate) href: Option<String>,
     pub(crate) link_kind: LinkKind,
     pub(crate) action: Option<String>,
-    dark: bool,
 }
 
 impl Button {
@@ -80,11 +79,6 @@ impl Button {
         self
     }
 
-    pub fn dark(mut self, dark: bool) -> Self {
-        self.dark = dark;
-        self
-    }
-
     pub(crate) fn class_string(&self) -> String {
         use ButtonKind::*;
 
@@ -99,10 +93,6 @@ impl Button {
 
         classes.push(static_classes.to_owned());
 
-        if self.dark {
-            classes.push("toolkit-dark".to_owned());
-        }
-
         classes.join(" ")
     }
 }