diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3fb3b87b..88facf77 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -25,8 +25,10 @@ project adheres to [Semantic Versioning](http://semver.org).
 - Removed unused `base-z-index` variable
 - Removed unused `medium-gray` variable
 - Removed unused `gray-light` variable
+- Removed [Bourbon] dependency
 
 [unreleased]: https://github.com/thoughtbot/bitters/compare/v1.8.0...HEAD
+[Bourbon]: https://github.com/thoughtbot/bourbon
 
 ## [1.8.0] - 2018-02-05
 
diff --git a/contrib/styles.scss b/contrib/styles.scss
index 094f7dac..ec9576a7 100644
--- a/contrib/styles.scss
+++ b/contrib/styles.scss
@@ -6,13 +6,13 @@ body {
 }
 
 .container {
-  @include margin(null auto);
-  @include padding(null var(--spacing));
+  margin: 0 auto;
+  padding: 0 var(--spacing);
   max-width: 500px;
 }
 
 .welcome-message {
-  @include padding(var(--spacing) null);
+  padding: var(--spacing) 0;
   background-color: #f2f2f2;
   margin-bottom: var(--spacing);
   text-align: center;
diff --git a/core/_buttons.scss b/core/_buttons.scss
index 7aa589c4..87917566 100644
--- a/core/_buttons.scss
+++ b/core/_buttons.scss
@@ -1,4 +1,7 @@
-#{$all-buttons} {
+button,
+[type='button'],
+[type='reset'],
+[type='submit'] {
   appearance: none;
   background-color: $action-color;
   border: 0;
diff --git a/core/_forms.scss b/core/_forms.scss
index f2ff9bd9..c545e9a5 100644
--- a/core/_forms.scss
+++ b/core/_forms.scss
@@ -30,7 +30,22 @@ textarea {
   font-size: 1rem;
 }
 
-#{$all-text-inputs} {
+[type='color'],
+[type='date'],
+[type='datetime'],
+[type='datetime-local'],
+[type='email'],
+[type='month'],
+[type='number'],
+[type='password'],
+[type='search'],
+[type='tel'],
+[type='text'],
+[type='time'],
+[type='url'],
+[type='week'],
+input:not([type]),
+textarea {
   appearance: none;
   background-color: transparent;
   border: var(--border);
diff --git a/core/_variables.scss b/core/_variables.scss
index 2033a190..a15d5b16 100644
--- a/core/_variables.scss
+++ b/core/_variables.scss
@@ -13,7 +13,7 @@ $viewport-background-color: #fff;
 
 :root {
   // Typography
-  --font-family: #{$font-stack-system};
+  --font-family: system-ui, sans-serif;
   --font-family--heading: var(--font-family);
 
   --font-weight--thin: 100;