diff --git a/src/definitions/elements/segment.less b/src/definitions/elements/segment.less
index bf592d2f7..ddeda073b 100755
--- a/src/definitions/elements/segment.less
+++ b/src/definitions/elements/segment.less
@@ -24,7 +24,7 @@
 
 .ui.segment {
   position: relative;
-  background-color: @background;
+  background: @background;
   box-shadow: @boxShadow;
   margin: @margin;
   padding: @padding;
@@ -46,7 +46,7 @@
   padding-left: 0em;
   padding-right: 0em;
 
-  background-color: transparent;
+  background: none transparent;
   border-radius: 0px;
   box-shadow: none;
   border: none;
@@ -187,7 +187,7 @@
   left: 0%;
 
   border-top: 1px solid @borderColor;
-  background-color: @stackedPageBackground;
+  background: @stackedPageBackground;
 
   width: 100%;
   height: @stackedHeight;
@@ -630,19 +630,21 @@
   border: none;
   box-shadow: none;
 }
+.ui.inverted.segment,
+.ui.primary.inverted.segment {
+  background: @invertedBackground;
+  color: @invertedTextColor;
+}
+
+/* Nested */
 .ui.inverted.segment .segment {
   color: @textColor;
 }
 .ui.inverted.segment .inverted.segment {
-  color: @white;
-}
-.ui.inverted.segment,
-.ui.primary.inverted.segment {
-  background-color: @black;
-  color: @white;
+  color: @invertedTextColor;
 }
 
-.ui.inverted.block.segment,
+/* Attached */
 .ui.inverted.attached.segment {
   border-color: @solidWhiteBorderColor;
 }
diff --git a/src/themes/default/elements/segment.variables b/src/themes/default/elements/segment.variables
index fd3af7f58..1bd54948b 100644
--- a/src/themes/default/elements/segment.variables
+++ b/src/themes/default/elements/segment.variables
@@ -78,9 +78,7 @@
 @tallStackedPadding: @verticalPadding + (0.8em);
 
 /* Raised */
-@raisedBoxShadow:
-  @floatingShadow
-;
+@raisedBoxShadow: @floatingShadow;
 
 /* Padded */
 @paddedSegmentPadding: 1.5em;
@@ -98,6 +96,9 @@
   @subtleShadow
 ;
 
+/* Inverted */
+@invertedBackground: @black;
+
 /* Floated */
 @floatedDistance: 1em;
 
diff --git a/src/themes/github/elements/segment.variables b/src/themes/github/elements/segment.variables
index 55aa245e9..4c53f0598 100644
--- a/src/themes/github/elements/segment.variables
+++ b/src/themes/github/elements/segment.variables
@@ -13,7 +13,6 @@
 @verticalPadding: 20px;
 @horizontalPadding: 20px;
 
-@margin: 1em;
 @borderRadius: 4px;
 
 /*******************************