diff --git a/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss
new file mode 100644
index 0000000000..5ddd11f822
--- /dev/null
+++ b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.scss
@@ -0,0 +1,18 @@
+@import "./infinite-scroll-content";
+@import "./infinite-scroll-content.ios.vars";
+
+.infinite-scroll-content-ios .infinite-loading-text {
+  color: $infinite-scroll-ios-loading-text-color;
+}
+
+.infinite-scroll-content-ios .infinite-loading-spinner .spinner-ios line,
+.infinite-scroll-content-ios .infinite-loading-spinner .spinner-ios-small line,
+.infinite-scroll-content-ios .infinite-loading-spinner .spinner-crescent circle {
+  stroke: $infinite-scroll-ios-loading-color;
+}
+
+.infinite-scroll-content-ios .infinite-loading-spinner .spinner-bubbles circle,
+.infinite-scroll-content-ios .infinite-loading-spinner .spinner-circles circle,
+.infinite-scroll-content-ios .infinite-loading-spinner .spinner-dots circle {
+  fill: $infinite-scroll-ios-loading-color;
+}
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.ios.vars.scss b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.vars.scss
similarity index 100%
rename from packages/core/src/components/infinite-scroll/infinite-scroll.ios.vars.scss
rename to packages/core/src/components/infinite-scroll-content/infinite-scroll-content.ios.vars.scss
diff --git a/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.md.scss b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.md.scss
new file mode 100644
index 0000000000..a1e88e4f12
--- /dev/null
+++ b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.md.scss
@@ -0,0 +1,16 @@
+@import "./infinite-scroll-content";
+@import "./infinite-scroll-content.md.vars";
+
+.infinite-scroll-content-md .infinite-loading-text {
+  color: $infinite-scroll-md-loading-text-color;
+}
+
+.infinite-scroll-content-md .infinite-loading-spinner .spinner-crescent circle {
+  stroke: $infinite-scroll-md-loading-color;
+}
+
+.infinite-scroll-content-md .infinite-loading-spinner .spinner-bubbles circle,
+.infinite-scroll-content-md .infinite-loading-spinner .spinner-circles circle,
+.infinite-scroll-content-md .infinite-loading-spinner .spinner-dots circle {
+  fill: $infinite-scroll-md-loading-color;
+}
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.md.vars.scss b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.md.vars.scss
similarity index 100%
rename from packages/core/src/components/infinite-scroll/infinite-scroll.md.vars.scss
rename to packages/core/src/components/infinite-scroll-content/infinite-scroll-content.md.vars.scss
diff --git a/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.scss b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.scss
new file mode 100644
index 0000000000..afd3a9d7fd
--- /dev/null
+++ b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.scss
@@ -0,0 +1,36 @@
+@import "./infinite-scroll-content.vars";
+
+// Infinite Scroll Content
+// --------------------------------------------------
+
+ion-infinite-scroll-content {
+  @include text-align(center);
+
+  display: flex;
+
+  flex-direction: column;
+  justify-content: center;
+
+  min-height: $infinite-scroll-content-min-height;
+}
+
+.infinite-loading {
+  @include margin($infinite-scroll-loading-margin-top, $infinite-scroll-loading-margin-end, $infinite-scroll-loading-margin-bottom, $infinite-scroll-loading-margin-start);
+
+  display: none;
+
+  width: 100%;
+}
+
+
+.infinite-loading-text {
+  @include margin($infinite-scroll-loading-text-margin-top, $infinite-scroll-loading-text-margin-end, $infinite-scroll-loading-text-margin-bottom, $infinite-scroll-loading-text-margin-start);
+}
+
+
+
+// Infinite Scroll Content States
+// --------------------------------------------------
+.infinite-scroll-loading ion-infinite-scroll-content > .infinite-loading {
+  display: block;
+}
diff --git a/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx
index 52ac66db2e..ec4d879ec3 100644
--- a/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx
+++ b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.tsx
@@ -3,7 +3,14 @@ import { Config } from '../../index';
 
 
 @Component({
-  tag: 'ion-infinite-scroll-content'
+  tag: 'ion-infinite-scroll-content',
+  styleUrls: {
+    ios: 'infinite-scroll-content.ios.scss',
+    md: 'infinite-scroll-content.md.scss'
+  },
+  host: {
+    theme: 'infinite-scroll-content'
+  }
 })
 export class InfiniteScrollContent {
 
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.vars.scss b/packages/core/src/components/infinite-scroll-content/infinite-scroll-content.vars.scss
similarity index 100%
rename from packages/core/src/components/infinite-scroll/infinite-scroll.vars.scss
rename to packages/core/src/components/infinite-scroll-content/infinite-scroll-content.vars.scss
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.ios.scss b/packages/core/src/components/infinite-scroll/infinite-scroll.ios.scss
deleted file mode 100644
index 601d7996d6..0000000000
--- a/packages/core/src/components/infinite-scroll/infinite-scroll.ios.scss
+++ /dev/null
@@ -1,17 +0,0 @@
-@import "./infinite-scroll.ios.vars";
-
-.infinite-scroll-ios .infinite-loading-text {
-  color: $infinite-scroll-ios-loading-text-color;
-}
-
-.infinite-scroll-ios .infinite-loading-spinner .spinner-ios line,
-.infinite-scroll-ios .infinite-loading-spinner .spinner-ios-small line,
-.infinite-scroll-ios .infinite-loading-spinner .spinner-crescent circle {
-  stroke: $infinite-scroll-ios-loading-color;
-}
-
-.infinite-scroll-ios .infinite-loading-spinner .spinner-bubbles circle,
-.infinite-scroll-ios .infinite-loading-spinner .spinner-circles circle,
-.infinite-scroll-ios .infinite-loading-spinner .spinner-dots circle {
-  fill: $infinite-scroll-ios-loading-color;
-}
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.md.scss b/packages/core/src/components/infinite-scroll/infinite-scroll.md.scss
deleted file mode 100644
index e15d69d256..0000000000
--- a/packages/core/src/components/infinite-scroll/infinite-scroll.md.scss
+++ /dev/null
@@ -1,15 +0,0 @@
-@import "./infinite-scroll.md.vars";
-
-.infinite-scroll-md .infinite-loading-text {
-  color: $infinite-scroll-md-loading-text-color;
-}
-
-.infinite-scroll-md .infinite-loading-spinner .spinner-crescent circle {
-  stroke: $infinite-scroll-md-loading-color;
-}
-
-.infinite-scroll-md .infinite-loading-spinner .spinner-bubbles circle,
-.infinite-scroll-md .infinite-loading-spinner .spinner-circles circle,
-.infinite-scroll-md .infinite-loading-spinner .spinner-dots circle {
-  fill: $infinite-scroll-md-loading-color;
-}
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.scss b/packages/core/src/components/infinite-scroll/infinite-scroll.scss
index ed5918472a..f941d37dfb 100644
--- a/packages/core/src/components/infinite-scroll/infinite-scroll.scss
+++ b/packages/core/src/components/infinite-scroll/infinite-scroll.scss
@@ -1,5 +1,3 @@
-@import "./infinite-scroll.vars";
-
 // Infinite Scroll
 // --------------------------------------------------
 
@@ -12,39 +10,3 @@ ion-infinite-scroll {
 .infinite-scroll-enabled {
   display: block;
 }
-
-
-// Infinite Scroll Content
-// --------------------------------------------------
-
-ion-infinite-scroll-content {
-  @include text-align(center);
-
-  display: flex;
-
-  flex-direction: column;
-  justify-content: center;
-
-  min-height: $infinite-scroll-content-min-height;
-}
-
-.infinite-loading {
-  @include margin($infinite-scroll-loading-margin-top, $infinite-scroll-loading-margin-end, $infinite-scroll-loading-margin-bottom, $infinite-scroll-loading-margin-start);
-
-  display: none;
-
-  width: 100%;
-}
-
-
-.infinite-loading-text {
-  @include margin($infinite-scroll-loading-text-margin-top, $infinite-scroll-loading-text-margin-end, $infinite-scroll-loading-text-margin-bottom, $infinite-scroll-loading-text-margin-start);
-}
-
-
-
-// Infinite Scroll Content States
-// --------------------------------------------------
-.infinite-scroll-loading ion-infinite-scroll-content > .infinite-loading {
-  display: block;
-}
diff --git a/packages/core/src/components/infinite-scroll/infinite-scroll.tsx b/packages/core/src/components/infinite-scroll/infinite-scroll.tsx
index 4641a8f340..af4dfa9f22 100644
--- a/packages/core/src/components/infinite-scroll/infinite-scroll.tsx
+++ b/packages/core/src/components/infinite-scroll/infinite-scroll.tsx
@@ -9,13 +9,7 @@ const enum Position {
 
 @Component({
   tag: 'ion-infinite-scroll',
-  styleUrls: {
-    ios: 'infinite-scroll.ios.scss',
-    md: 'infinite-scroll.md.scss'
-  },
-  host: {
-    theme: 'infinite-scroll'
-  }
+  styleUrl: 'infinite-scroll.scss'
 })
 export class InfiniteScroll {
 
diff --git a/packages/core/src/components/scroll/readme.md b/packages/core/src/components/scroll/readme.md
index 7c6e689919..763676ac0d 100644
--- a/packages/core/src/components/scroll/readme.md
+++ b/packages/core/src/components/scroll/readme.md
@@ -7,11 +7,6 @@
 
 ## Properties
 
-#### disabled
-
-boolean
-
-
 #### onionScroll
 
 
@@ -27,13 +22,13 @@ boolean
 
 
 
-## Attributes
-
-#### disabled
+#### scrollEvents
 
 boolean
 
 
+## Attributes
+
 #### onion-scroll
 
 
@@ -49,6 +44,11 @@ boolean
 
 
 
+#### scroll-events
+
+boolean
+
+
 ## Events
 
 #### ionScroll