diff --git a/packages/octuple/src/components/Button/button.module.scss b/packages/octuple/src/components/Button/button.module.scss
index f911a6465..a221704a5 100644
--- a/packages/octuple/src/components/Button/button.module.scss
+++ b/packages/octuple/src/components/Button/button.module.scss
@@ -112,6 +112,42 @@
     }
 }
 
+.button1 {
+    // Button 1 (Mobile L)
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-5;
+    line-height: $text-line-height-3;
+
+    &.open-sans {
+        font-family: 'Open Sans', sans-serif;
+    }
+}
+
+.button2 {
+    // Button 2 (Mobile M, Desktop L)
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-3;
+    line-height: $text-line-height-2;
+
+    &.open-sans {
+        font-family: 'Open Sans', sans-serif;
+    }
+}
+
+.button3 {
+    // Button 3 (Desktop M)
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-2;
+    line-height: $text-line-height-1;
+
+    &.open-sans {
+        font-family: 'Open Sans', sans-serif;
+    }
+}
+
 .button-padding-1 {
     padding: $button-padding-vertical-large $button-padding-horizontal-large;
 }
@@ -315,7 +351,7 @@
         width: 1px;
 
         &.split-divider-primary {
-            background-color: var(--button-default-foreground-color);
+            background-color: var(--text-color);
         }
 
         &.split-divider-secondary {
@@ -323,7 +359,7 @@
         }
 
         &.split-divider-primary-disruptive {
-            background-color: var(--white-color);
+            background-color: var(--text-inverse-color);
         }
 
         &.split-divider-secondary-disruptive {
diff --git a/packages/octuple/src/styles/base/_typography.scss b/packages/octuple/src/styles/base/_typography.scss
index 9bafc0d20..6422c91b2 100644
--- a/packages/octuple/src/styles/base/_typography.scss
+++ b/packages/octuple/src/styles/base/_typography.scss
@@ -1,225 +1,169 @@
 .display1 {
-  // Display 1
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-light;
-  font-size: $text-font-size-12;
-  line-height: $text-line-height-11;
-  letter-spacing: $text-letter-spacing-l;
+    // Display 1
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-light;
+    font-size: $text-font-size-12;
+    line-height: $text-line-height-11;
+    letter-spacing: $text-letter-spacing-l;
 }
 
 .display2 {
-  // Display 2
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-light;
-  font-size: $text-font-size-11;
-  line-height: $text-line-height-10;
-  letter-spacing: $text-letter-spacing-l;
+    // Display 2
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-light;
+    font-size: $text-font-size-11;
+    line-height: $text-line-height-10;
+    letter-spacing: $text-letter-spacing-l;
 }
 
 .display3 {
-  // Display 3
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-10;
-  line-height: $text-line-height-9;
-  letter-spacing: $text-letter-spacing-m;
+    // Display 3
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-10;
+    line-height: $text-line-height-9;
+    letter-spacing: $text-letter-spacing-m;
 }
 
 .display4 {
-  // Display 4
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-9;
-  line-height: $text-line-height-8;
-  letter-spacing: $text-letter-spacing-m;
+    // Display 4
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-9;
+    line-height: $text-line-height-8;
+    letter-spacing: $text-letter-spacing-m;
 }
 
 .header1 {
-  // Header 1
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-8;
-  line-height: $text-line-height-7;
-  letter-spacing: $text-letter-spacing-m;
+    // Header 1
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-8;
+    line-height: $text-line-height-7;
+    letter-spacing: $text-letter-spacing-m;
 }
 
 .header2 {
-  // Header 2
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-7;
-  line-height: $text-line-height-6;
-  letter-spacing: $text-letter-spacing-xs;
+    // Header 2
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-7;
+    line-height: $text-line-height-6;
+    letter-spacing: $text-letter-spacing-xs;
 }
 
 .header3 {
-  // Header 3
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-6;
-  line-height: $text-line-height-5;
+    // Header 3
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-6;
+    line-height: $text-line-height-5;
 }
 
 .header4 {
-  // Header 4
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-5;
-  line-height: $text-line-height-3;
+    // Header 4
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-5;
+    line-height: $text-line-height-3;
 }
 
 .header5 {
-  // Header 5
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-3;
-  line-height: $text-line-height-2;
+    // Header 5
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-3;
+    line-height: $text-line-height-2;
 }
 
 .header6 {
-  // Header 5
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-2;
-  line-height: $text-line-height-2;
+    // Header 5
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-2;
+    line-height: $text-line-height-2;
 }
 
 .subtitle1 {
-  // Subtitle 1
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-7;
-  line-height: $text-line-height-6;
-  letter-spacing: $text-letter-spacing-s;
+    // Subtitle 1
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-7;
+    line-height: $text-line-height-6;
+    letter-spacing: $text-letter-spacing-s;
 }
 
 .subtitle2 {
-  // Subtitle 2
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-6;
-  line-height: $text-line-height-5;
-  letter-spacing: $text-letter-spacing-xs;
+    // Subtitle 2
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-6;
+    line-height: $text-line-height-5;
+    letter-spacing: $text-letter-spacing-xs;
 }
 
 .pre-display {
-  // Pre-Dsiplay
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-5;
-  line-height: $text-line-height-4;
-  text-transform: uppercase;
-}
-
-.button1 {
-  // Button 1 (Mobile L)
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-5;
-  line-height: $text-line-height-3;
-
-  &.open-sans {
-    font-family: "Open Sans", sans-serif;
-  }
-}
-
-.button2 {
-  // Button 2 (Mobile M, Desktop L)
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-3;
-  line-height: $text-line-height-2;
-
-  &.open-sans {
-    font-family: "Open Sans", sans-serif;
-  }
-}
-
-.button3 {
-  // Button 3 (Desktop M)
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-semibold;
-  font-size: $text-font-size-2;
-  line-height: $text-line-height-1;
-
-  &.open-sans {
-    font-family: "Open Sans", sans-serif;
-  }
+    // Pre-Dsiplay
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-semibold;
+    font-size: $text-font-size-5;
+    line-height: $text-line-height-4;
+    text-transform: uppercase;
 }
 
 .body1 {
-  // Body 1 (Mobile L)
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-4;
-  line-height: $text-line-height-3;
+    // Body 1 (Mobile L)
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-4;
+    line-height: $text-line-height-3;
 
-  &.semibold {
-    font-weight: $text-font-weight-semibold;
-  }
+    &.semibold {
+        font-weight: $text-font-weight-semibold;
+    }
 
-  &.open-sans {
-    font-family: "Open Sans", sans-serif;
-  }
+    &.open-sans {
+        font-family: 'Open Sans', sans-serif;
+    }
 }
 
 .body2 {
-  // Body 2 (Mobile M, Desktop L)
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-3;
-  line-height: $text-line-height-3;
+    // Body 2 (Mobile M, Desktop L)
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-3;
+    line-height: $text-line-height-3;
 
-  &.semibold {
-    font-weight: $text-font-weight-semibold;
-  }
+    &.semibold {
+        font-weight: $text-font-weight-semibold;
+    }
 
-  &.open-sans {
-    font-family: "Open Sans", sans-serif;
-  }
+    &.open-sans {
+        font-family: 'Open Sans', sans-serif;
+    }
 }
 
 .body3 {
-  // Body 3 (Desktop M)
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-2;
-  line-height: $text-line-height-2;
-
-  &.semibold {
-    font-family: "Source Sans Pro", sans-serif;
-    font-weight: $text-font-weight-semibold;
-  }
-
-  &.open-sans {
-    font-family: "Open Sans", sans-serif;
-  }
-}
+    // Body 3 (Desktop M)
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-2;
+    line-height: $text-line-height-2;
 
-.caption {
-  // Caption
-  font-family: "Source Sans Pro", sans-serif;
-  font-weight: $text-font-weight-regular;
-  font-size: $text-font-size-1;
-  line-height: $text-line-height-1;
-}
-
-.icon-material-l {
-  font-family: Material Design Icons;
-  font-size: $icon-font-size-material-l;
-}
+    &.semibold {
+        font-family: 'Source Sans Pro', sans-serif;
+        font-weight: $text-font-weight-semibold;
+    }
 
-.icon-material-m {
-  font-family: Material Design Icons;
-  font-size: $icon-font-size-material-m;
+    &.open-sans {
+        font-family: 'Open Sans', sans-serif;
+    }
 }
 
-.icon-material-s {
-  font-family: Material Design Icons;
-  font-size: $icon-font-size-material-s;
-}
-
-.icon-material-xs {
-  font-family: Material Design Icons;
-  font-size: $icon-font-size-material-xs;
+.caption {
+    // Caption
+    font-family: 'Source Sans Pro', sans-serif;
+    font-weight: $text-font-weight-regular;
+    font-size: $text-font-size-1;
+    line-height: $text-line-height-1;
 }