diff --git a/src/components/action-sheet/action-sheet.scss b/src/components/action-sheet/action-sheet.scss
index d4dada4140..0b507d865f 100644
--- a/src/components/action-sheet/action-sheet.scss
+++ b/src/components/action-sheet/action-sheet.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Action Sheet
 // --------------------------------------------------
diff --git a/src/components/alert/alert.scss b/src/components/alert/alert.scss
index 013ed65dfc..6bbdf3ab2d 100644
--- a/src/components/alert/alert.scss
+++ b/src/components/alert/alert.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Alerts
 // --------------------------------------------------
@@ -22,10 +22,10 @@ ion-alert {
 
   align-items: center;
   justify-content: center;
+}
 
-  input {
-    width: 100%;
-  }
+ion-alert input {
+  width: 100%;
 }
 
 .alert-wrapper {
@@ -71,11 +71,11 @@ ion-alert {
   display: flex;
 
   flex-direction: row;
+}
 
-  &.vertical {
-    flex-direction: column;
-    flex-wrap: nowrap;
-  }
+.alert-button-group-vertical {
+  flex-direction: column;
+  flex-wrap: nowrap;
 }
 
 .alert-button {
diff --git a/src/components/backdrop/backdrop.scss b/src/components/backdrop/backdrop.scss
index 573aab9a06..76a7d2ae29 100644
--- a/src/components/backdrop/backdrop.scss
+++ b/src/components/backdrop/backdrop.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Backdrop
 // --------------------------------------------------
diff --git a/src/components/badge/badge.scss b/src/components/badge/badge.scss
index d327f72d7e..3c983f64b2 100644
--- a/src/components/badge/badge.scss
+++ b/src/components/badge/badge.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Badge
 // --------------------------------------------------
@@ -24,8 +24,8 @@ ion-badge {
   text-align: center;
   white-space: nowrap;
   vertical-align: baseline;
-
-  &:empty {
-    display: none;
-  }
+}
+
+ion-badge:empty {
+  display: none;
 }
diff --git a/src/components/button/button-fab.scss b/src/components/button/button-fab.scss
index e5bc96c1da..ccdf30e26c 100644
--- a/src/components/button/button-fab.scss
+++ b/src/components/button/button-fab.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Floating Action Buttons
 // --------------------------------------------------
@@ -11,15 +11,18 @@ $button-fab-size:           56px !default;
   position: absolute;
   overflow: hidden;
 
+  line-height: $button-fab-size;
+  vertical-align: middle;
+
+  background-clip: padding-box;
+}
+
+.button-fab.button {
   width: $button-fab-size;
   min-width: 0;
   height: $button-fab-size;
 
   font-size: 14px;
-  line-height: $button-fab-size;
-  vertical-align: middle;
-
-  background-clip: padding-box;
 }
 
 .button-fab ion-icon {
@@ -28,28 +31,28 @@ $button-fab-size:           56px !default;
   font-size: 2.8rem;
 }
 
-[fab-center] {
+.button-fab[fab-center] {
   left: 50%;
 
   margin-left: -$button-fab-size / 2;
 }
 
-[fab-top] {
+.button-fab[fab-top] {
   top: 16px;
 }
 
-[fab-right] {
+.button-fab[fab-right] {
   right: 16px;
 }
 
-[fab-bottom] {
+.button-fab[fab-bottom] {
   bottom: 16px;
 }
 
-[fab-left] {
+.button-fab[fab-left] {
   left: 16px;
 }
 
-[fab-fixed] {
+.button-fab[fab-fixed] {
   position: fixed;
 }
diff --git a/src/components/button/button-icon.scss b/src/components/button/button-icon.scss
index 4ff8eb4828..1412e939df 100644
--- a/src/components/button/button-icon.scss
+++ b/src/components/button/button-icon.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Button Icons
 // --------------------------------------------------
@@ -23,7 +23,7 @@
   padding-left: .4em;
 }
 
-[icon-only] {
+.button[icon-only] {
   padding: 0;
 
   min-width: .9em;
diff --git a/src/components/button/button.scss b/src/components/button/button.scss
index 49ee3dbad1..0545bde7f8 100644
--- a/src/components/button/button.scss
+++ b/src/components/button/button.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Buttons
 // --------------------------------------------------
@@ -11,7 +11,6 @@ $button-round-border-radius:      64px !default;
 
 
 .button {
-  @include user-select-none();
   @include appearance(none);
 
   position: relative;
@@ -31,6 +30,7 @@ $button-round-border-radius:      64px !default;
   transition: background-color, opacity 100ms linear;
 
   font-kerning: none;
+  user-select: none;
 }
 
 .button-inner {
@@ -68,10 +68,10 @@ button[disabled],
   clear: both;
 
   width: 100%;
+}
 
-  &::after {
-    clear: both;
-  }
+.button-block::after {
+  clear: both;
 }
 
 
diff --git a/src/components/card/card.scss b/src/components/card/card.scss
index 8cf43ea69a..53530627eb 100644
--- a/src/components/card/card.scss
+++ b/src/components/card/card.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Card
 // --------------------------------------------------
diff --git a/src/components/chip/chip.scss b/src/components/chip/chip.scss
index 1c8831b7c9..f153852b42 100644
--- a/src/components/chip/chip.scss
+++ b/src/components/chip/chip.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Chip
 // --------------------------------------------------
@@ -37,42 +37,43 @@ ion-chip {
   vertical-align: middle;
 
   box-sizing: border-box;
-
-  .button {
-    margin: $chip-button-margin;
-
-    width: $chip-button-size;
-    height: $chip-button-size;
-
-    border-radius: $chip-button-border-radius;
-  }
-
-  ion-icon {
-    width: $chip-icon-size;
-    height: $chip-icon-size;
-
-    border-radius: $chip-icon-border-radius;
-    font-size: $chip-icon-font-size;
-    line-height: $chip-icon-size;
-  }
-
-  ion-avatar {
-    width: $chip-avatar-size;
-    min-width: $chip-avatar-size;
-    height: $chip-avatar-size;
-    min-height: $chip-avatar-size;
-
-    border-radius: $chip-avatar-border-radius;
-
-    img {
-      display: block;
-
-      width: 100%;
-      max-width: 100%;
-      height: 100%;
-      max-height: 100%;
-
-      border-radius: $chip-avatar-border-radius;
-    }
-  }
+}
+
+ion-chip .button {
+  margin: $chip-button-margin;
+
+  width: $chip-button-size;
+  height: $chip-button-size;
+
+  border-radius: $chip-button-border-radius;
+}
+
+ion-chip ion-icon {
+  width: $chip-icon-size;
+  height: $chip-icon-size;
+
+  border-radius: $chip-icon-border-radius;
+
+  font-size: $chip-icon-font-size;
+  line-height: $chip-icon-size;
+}
+
+ion-chip ion-avatar {
+  width: $chip-avatar-size;
+  min-width: $chip-avatar-size;
+  height: $chip-avatar-size;
+  min-height: $chip-avatar-size;
+
+  border-radius: $chip-avatar-border-radius;
+}
+
+ion-chip ion-avatar img {
+  display: block;
+
+  width: 100%;
+  max-width: 100%;
+  height: 100%;
+  max-height: 100%;
+
+  border-radius: $chip-avatar-border-radius;
 }
diff --git a/src/components/content/content.scss b/src/components/content/content.scss
index 5f5b47dd18..3cdd0cd3f9 100644
--- a/src/components/content/content.scss
+++ b/src/components/content/content.scss
@@ -1,51 +1,104 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Content
 // --------------------------------------------------
 
+ion-content {
+  position: relative;
+  top: 0;
+  left: 0;
+  display: block;
+
+  width: 100%;
+  height: 100%;
+}
+
+.ion-page > ion-content {
+  position: absolute;
+}
+
+a {
+  color: $link-color;
+}
+
+
+// Scrollable Content
+// --------------------------------------------------
+
+.scroll-content {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+  z-index: $z-index-scroll-content;
+  display: block;
+
+  overflow-x: hidden;
+  overflow-y: scroll;
+  -webkit-overflow-scrolling: touch;
+  will-change: scroll-position;
+}
+
+ion-content.js-scroll > .scroll-content {
+  position: relative;
+
+  min-height: 100%;
+
+  overflow-x: initial;
+  overflow-y: initial;
+  -webkit-overflow-scrolling: auto;
+  will-change: initial;
+}
+
+.disable-scroll .ion-page .scroll-content {
+  overflow-y: hidden;
+  overflow-x: hidden;
+}
+
 
 // Content Padding
 // --------------------------------------------------
 
 [no-padding],
-[no-padding] scroll-content {
+[no-padding] .scroll-content {
   padding: 0;
 }
 
 @mixin content-padding($content-padding) {
   [padding],
-  [padding] scroll-content {
+  [padding] .scroll-content {
     padding: $content-padding;
   }
 
   [padding-top],
-  [padding-top] scroll-content {
+  [padding-top] .scroll-content {
     padding-top: $content-padding;
   }
 
   [padding-left],
-  [padding-left] scroll-content {
+  [padding-left] .scroll-content {
     padding-left: $content-padding;
   }
 
   [padding-right],
-  [padding-right] scroll-content {
+  [padding-right] .scroll-content {
     padding-right: $content-padding;
   }
 
   [padding-bottom],
-  [padding-bottom] scroll-content {
+  [padding-bottom] .scroll-content {
     padding-bottom: $content-padding;
   }
 
   [padding-vertical],
-  [padding-vertical] scroll-content {
+  [padding-vertical] .scroll-content {
     padding-top: $content-padding;
     padding-bottom: $content-padding;
   }
 
   [padding-horizontal],
-  [padding-horizontal] scroll-content {
+  [padding-horizontal] .scroll-content {
     padding-right: $content-padding;
     padding-left: $content-padding;
   }
@@ -56,44 +109,44 @@
 // --------------------------------------------------
 
 [no-margin],
-[no-margin] scroll-content {
+[no-margin] .scroll-content {
   margin: 0;
 }
 
 @mixin content-margin($content-margin) {
   [margin],
-  [margin] scroll-content {
+  [margin] .scroll-content {
     margin: $content-margin;
   }
 
   [margin-top],
-  [margin-top] scroll-content {
+  [margin-top] .scroll-content {
     margin-top: $content-margin;
   }
 
   [margin-left],
-  [margin-left] scroll-content {
+  [margin-left] .scroll-content {
     margin-left: $content-margin;
   }
 
   [margin-right],
-  [margin-right] scroll-content {
+  [margin-right] .scroll-content {
     margin-right: $content-margin;
   }
 
   [margin-bottom],
-  [margin-bottom] scroll-content {
+  [margin-bottom] .scroll-content {
     margin-bottom: $content-margin;
   }
 
   [margin-vertical],
-  [margin-vertical] scroll-content {
+  [margin-vertical] .scroll-content {
     margin-top: $content-margin;
     margin-bottom: $content-margin;
   }
 
   [margin-horizontal],
-  [margin-horizontal] scroll-content {
+  [margin-horizontal] .scroll-content {
     margin-right: $content-margin;
     margin-left: $content-margin;
   }
diff --git a/src/components/datetime/datetime.scss b/src/components/datetime/datetime.scss
index a5cb0adbff..f1a3a58b14 100644
--- a/src/components/datetime/datetime.scss
+++ b/src/components/datetime/datetime.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // DateTime
 // --------------------------------------------------
diff --git a/src/components/grid/grid.scss b/src/components/grid/grid.scss
index 165b50e84a..426ab0f1eb 100644
--- a/src/components/grid/grid.scss
+++ b/src/components/grid/grid.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Grid
 // --------------------------------------------------
diff --git a/src/components/icon/icon.scss b/src/components/icon/icon.scss
index c81db35fa2..5d25b90823 100644
--- a/src/components/icon/icon.scss
+++ b/src/components/icon/icon.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Icon
 // --------------------------------------------------
diff --git a/src/components/img/img.scss b/src/components/img/img.scss
index ce2f7ddda9..72d2b9e004 100644
--- a/src/components/img/img.scss
+++ b/src/components/img/img.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Img
 // --------------------------------------------------
diff --git a/src/components/infinite-scroll/infinite-scroll.scss b/src/components/infinite-scroll/infinite-scroll.scss
index 6435b20ef5..26d62e3ad7 100644
--- a/src/components/infinite-scroll/infinite-scroll.scss
+++ b/src/components/infinite-scroll/infinite-scroll.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Infinite Scroll
 // --------------------------------------------------
diff --git a/src/components/input/input.scss b/src/components/input/input.scss
index 8b0f148e30..710c6e1621 100644
--- a/src/components/input/input.scss
+++ b/src/components/input/input.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Input/Textarea Wrapper
 // --------------------------------------------------
diff --git a/src/components/item/item-media.scss b/src/components/item/item-media.scss
index 6c350ce17d..0d5c86cf46 100644
--- a/src/components/item/item-media.scss
+++ b/src/components/item/item-media.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Item Media
 // --------------------------------------------------
@@ -22,18 +22,20 @@
 
   font-size: 2.4rem;
   line-height: 1;
+}
 
-  &[large] {
-    min-height: 3.2rem;
+.item > ion-icon[large],
+.item-inner > ion-icon[large] {
+  min-height: 3.2rem;
 
-    font-size: 3.2rem;
-  }
+  font-size: 3.2rem;
+}
 
-  &[small] {
-    min-height: 1.8rem;
+.item > ion-icon[small],
+.item-inner > ion-icon[small] {
+  min-height: 1.8rem;
 
-    font-size: 1.8rem;
-  }
+  font-size: 1.8rem;
 }
 
 ion-avatar,
@@ -41,10 +43,11 @@ ion-thumbnail {
   display: block;
 
   line-height: 1;
+}
 
-  img {
-    display: block;
-  }
+ion-avatar img,
+ion-thumbnail img {
+  display: block;
 }
 
 .item-cover {
diff --git a/src/components/item/item-reorder.scss b/src/components/item/item-reorder.scss
index 9aa4d05815..6620ea9504 100644
--- a/src/components/item/item-reorder.scss
+++ b/src/components/item/item-reorder.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Item reorder
 // --------------------------------------------------
@@ -22,10 +22,10 @@ ion-reorder {
 
   pointer-events: all;
   touch-action: manipulation;
+}
 
-  ion-icon {
-    pointer-events: none;
-  }
+ion-reorder ion-icon {
+  pointer-events: none;
 }
 
 .reorder-enabled ion-reorder {
@@ -36,17 +36,15 @@ ion-reorder {
   transform: translate3d(0, 0, 0);
 }
 
-.reorder-list-active {
-  .item,
-  .item-wrapper {
-    transition: transform 300ms;
+.reorder-list-active .item,
+.reorder-list-active .item-wrapper {
+  transition: transform 300ms;
 
-    will-change: transform;
-  }
+  will-change: transform;
+}
 
-  .item-inner {
-    pointer-events: none;
-  }
+.reorder-list-active .item-inner {
+  pointer-events: none;
 }
 
 
diff --git a/src/components/item/item-sliding.scss b/src/components/item/item-sliding.scss
index 89e1469e1c..a68b694087 100644
--- a/src/components/item/item-sliding.scss
+++ b/src/components/item/item-sliding.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Item Sliding
 // --------------------------------------------------
@@ -10,10 +10,10 @@ ion-item-sliding {
   overflow: hidden;
 
   width: 100%;
+}
 
-  .item {
-    position: static;
-  }
+ion-item-sliding .item {
+  position: static;
 }
 
 ion-item-options {
diff --git a/src/components/item/item.scss b/src/components/item/item.scss
index 43bcf8d12c..6324416ec4 100644
--- a/src/components/item/item.scss
+++ b/src/components/item/item.scss
@@ -1,11 +1,21 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Item
 // --------------------------------------------------
 // Core structure only, dimensions belong in specific modes
+//
+// ".item" includes elements:
+//   ion-item
+//   [ion-item]
+//   ion-item-divider
+//   ion-list-header
+//
+// ".item-block" includes elements:
+//   ion-item
+//   [ion-item]
 
 
-.item {
+.item-block {
   display: flex;
   overflow: hidden;
 
@@ -57,7 +67,7 @@
 }
 
 .item[no-lines],
-.item[no-lines] .item-inner {
+.item.item[no-lines] .item-inner {
   border: 0;
 }
 
@@ -79,11 +89,11 @@ ion-item-divider {
   width: 100%;
 
   min-height: 30px;
+}
 
-  &[sticky] {
-    position: sticky;
-    top: 0;
-  }
+ion-item-divider[sticky] {
+  position: sticky;
+  top: 0;
 }
 
 [vertical-align-top],
@@ -91,6 +101,3 @@ ion-input.item {
   align-items: flex-start;
 }
 
-@import "item-media";
-@import "item-sliding";
-@import "item-reorder";
diff --git a/src/components/label/label.scss b/src/components/label/label.scss
index 91433c8338..f81fa30dcb 100644
--- a/src/components/label/label.scss
+++ b/src/components/label/label.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Label
 // --------------------------------------------------
diff --git a/src/components/list/list.scss b/src/components/list/list.scss
index d0e05b613d..8300ef3276 100644
--- a/src/components/list/list.scss
+++ b/src/components/list/list.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // List
 // --------------------------------------------------
diff --git a/src/components/loading/loading.scss b/src/components/loading/loading.scss
index 9a675a9005..6089118bf5 100644
--- a/src/components/loading/loading.scss
+++ b/src/components/loading/loading.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Loading Indicator
 // --------------------------------------------------
diff --git a/src/components/picker/picker.scss b/src/components/picker/picker.scss
index 2eaf0cbcc4..2e843ea513 100644
--- a/src/components/picker/picker.scss
+++ b/src/components/picker/picker.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Picker
 // --------------------------------------------------
@@ -71,7 +71,6 @@ ion-picker-cmp {
 
   flex: 1;
 
-  min-width: 50px;
   min-width: 45%;
 
   text-align: right;
@@ -83,7 +82,6 @@ ion-picker-cmp {
 
   flex: 1;
 
-  min-width: 50px;
   min-width: 45%;
 
   text-align: left;
diff --git a/src/components/popover/popover.scss b/src/components/popover/popover.scss
index f462d799d8..66152de532 100644
--- a/src/components/popover/popover.scss
+++ b/src/components/popover/popover.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Popover
 // --------------------------------------------------
@@ -33,8 +33,8 @@ ion-popover {
   overflow: auto;
 
   flex-direction: column;
-
-  scroll-content {
-    position: relative;
-  }
+}
+
+.popover-content .scroll-content {
+  position: relative;
 }
diff --git a/src/components/range/range.scss b/src/components/range/range.scss
index 2f40358ce3..7ef4919305 100644
--- a/src/components/range/range.scss
+++ b/src/components/range/range.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Range
 // --------------------------------------------------
@@ -15,10 +15,10 @@
 
 .item-range ion-range {
   width: 100%;
+}
 
-  ion-label {
-    align-self: center;
-  }
+.item-range ion-range ion-label {
+  align-self: center;
 }
 
 ion-range {
@@ -26,17 +26,17 @@ ion-range {
   display: flex;
 
   align-items: center;
+}
 
-  ion-label {
-    flex: initial;
-  }
+ion-range ion-label {
+  flex: initial;
+}
 
-  ion-icon {
-    min-height: 2.4rem;
+ion-range ion-icon {
+  min-height: 2.4rem;
 
-    font-size: 2.4rem;
-    line-height: 1;
-  }
+  font-size: 2.4rem;
+  line-height: 1;
 }
 
 .range-slider {
diff --git a/src/components/refresher/refresher.scss b/src/components/refresher/refresher.scss
index 14506d480d..aab9103030 100644
--- a/src/components/refresher/refresher.scss
+++ b/src/components/refresher/refresher.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Refresher
 // --------------------------------------------------
@@ -29,7 +29,7 @@ ion-refresher {
   }
 }
 
-.has-refresher > scroll-content {
+.has-refresher > .scroll-content {
   // when the refresher is let go or has completed
   // this transition is what is used to put the
   // scroll content back into it's original location
diff --git a/src/components/scroll/scroll.scss b/src/components/scroll/scroll.scss
index 392674304a..f68893f714 100644
--- a/src/components/scroll/scroll.scss
+++ b/src/components/scroll/scroll.scss
@@ -1,37 +1,34 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 ion-scroll {
   position: relative;
   display: block;
-
-  &.scroll-x scroll-content {
-    overflow-x: auto;
-  }
-
-  &.scroll-y scroll-content {
-    overflow-y: auto;
-  }
-
-  &[center] {
-    scroll-content {
-      display: flex;
-
-      align-items: center;
-      justify-content: center;
-    }
-  }
-
-  scroll-content {
-    position: absolute;
-    top: 0;
-    right: 0;
-    bottom: 0;
-    left: 0;
-
-    overflow-y: hidden;
-    overflow-x: hidden;
-    -webkit-overflow-scrolling: touch;
-    will-change: scroll-position;
-  }
-
+}
+
+ion-scroll.scroll-x .scroll-content {
+  overflow-x: auto;
+}
+
+ion-scroll.scroll-y .scroll-content {
+  overflow-y: auto;
+}
+
+ion-scroll[center] .scroll-content {
+  display: flex;
+
+  align-items: center;
+  justify-content: center;
+}
+
+ion-scroll .scroll-content {
+  position: absolute;
+  top: 0;
+  right: 0;
+  bottom: 0;
+  left: 0;
+
+  overflow-y: hidden;
+  overflow-x: hidden;
+  -webkit-overflow-scrolling: touch;
+  will-change: scroll-position;
 }
diff --git a/src/components/searchbar/searchbar.scss b/src/components/searchbar/searchbar.scss
index f111d2914d..9d68e30b5c 100644
--- a/src/components/searchbar/searchbar.scss
+++ b/src/components/searchbar/searchbar.scss
@@ -1,9 +1,8 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Search Bar
 // --------------------------------------------------
 
-
 ion-searchbar {
   position: relative;
   display: flex;
diff --git a/src/components/segment/segment.scss b/src/components/segment/segment.scss
index d6bc8b3e48..2655ebdbc2 100644
--- a/src/components/segment/segment.scss
+++ b/src/components/segment/segment.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Segment
 // --------------------------------------------------
diff --git a/src/components/select/select.scss b/src/components/select/select.scss
index 2d970b3c6f..9831751787 100644
--- a/src/components/select/select.scss
+++ b/src/components/select/select.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Select
 // --------------------------------------------------
diff --git a/src/components/show-hide-when/show-hide-when.scss b/src/components/show-hide-when/show-hide-when.scss
index 40eb064f69..de39f65458 100644
--- a/src/components/show-hide-when/show-hide-when.scss
+++ b/src/components/show-hide-when/show-hide-when.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Show / Hide When
 // --------------------------------------------------
diff --git a/src/components/slides/slides.scss b/src/components/slides/slides.scss
index ded9090c6e..bee9e3153a 100644
--- a/src/components/slides/slides.scss
+++ b/src/components/slides/slides.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 
 /**
diff --git a/src/components/spinner/spinner.scss b/src/components/spinner/spinner.scss
index bf5d40b070..c40a83c129 100644
--- a/src/components/spinner/spinner.scss
+++ b/src/components/spinner/spinner.scss
@@ -1,5 +1,4 @@
 
-
 // Spinners
 // --------------------------------------------------
 
diff --git a/src/components/toast/toast.scss b/src/components/toast/toast.scss
index e72a368518..68e7bc6e07 100644
--- a/src/components/toast/toast.scss
+++ b/src/components/toast/toast.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 
 // Toast
diff --git a/src/components/toolbar/toolbar-button.scss b/src/components/toolbar/toolbar-button.scss
index 5027a941a8..e7549abce8 100644
--- a/src/components/toolbar/toolbar-button.scss
+++ b/src/components/toolbar/toolbar-button.scss
@@ -1,10 +1,9 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Toolbar Buttons
 // --------------------------------------------------
 
 .bar-button {
-  @include user-select-none();
   @include appearance(none);
 
   position: relative;
@@ -23,6 +22,8 @@
 
   vertical-align: top; // the better option for most scenarios
   vertical-align: -webkit-baseline-middle; // the best for those that support it
+
+  user-select: none;
 }
 
 .bar-button::after {
diff --git a/src/components/typography/typography.scss b/src/components/typography/typography.scss
index 24327af092..e65982518c 100644
--- a/src/components/typography/typography.scss
+++ b/src/components/typography/typography.scss
@@ -1,4 +1,4 @@
-@import "../../globals.core";
+@import "../../themes/ionic.globals";
 
 // Typography
 // --------------------------------------------------
diff --git a/src/components/virtual-scroll/virtual-scroll.scss b/src/components/virtual-scroll/virtual-scroll.scss
index 9832cfb745..cb73aeb3f6 100644
--- a/src/components/virtual-scroll/virtual-scroll.scss
+++ b/src/components/virtual-scroll/virtual-scroll.scss
@@ -2,7 +2,6 @@
 // Virtual Scroll
 // --------------------------------------------------
 
-
 .virtual-scroll {
   position: relative;
 }