diff --git a/packages.bzl b/packages.bzl
index befb5e66790f..f4e7af806569 100644
--- a/packages.bzl
+++ b/packages.bzl
@@ -71,6 +71,12 @@ MATERIAL_PACKAGES = [
 
 MATERIAL_TARGETS = ["//src/lib:material"] + ["//src/lib/%s" % p for p in MATERIAL_PACKAGES]
 
+# List that references the sass libraries for each Material package. This can be used to create
+# the theming scss-bundle or to specify dependencies for the all-theme.scss file.
+MATERIAL_SCSS_LIBS = [
+  "//src/lib/%s:%s_scss_lib" % (p, p.replace('-', '_')) for p in MATERIAL_PACKAGES
+]
+
 # Each individual package uses a placeholder for the version of Angular to ensure they're
 # all in-sync. This map is passed to each ng_package rule to stamp out the appropriate
 # version for the placeholders.
diff --git a/src/cdk-experimental/dialog/BUILD.bazel b/src/cdk-experimental/dialog/BUILD.bazel
index 81143974d5a3..f2c4377f5367 100644
--- a/src/cdk-experimental/dialog/BUILD.bazel
+++ b/src/cdk-experimental/dialog/BUILD.bazel
@@ -22,12 +22,6 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "dialog_container_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
 sass_binary(
   name = "dialog_container_scss",
   src = "dialog-container.scss",
diff --git a/src/cdk/a11y/BUILD.bazel b/src/cdk/a11y/BUILD.bazel
index 2f48ace368c8..878c2e88d77e 100644
--- a/src/cdk/a11y/BUILD.bazel
+++ b/src/cdk/a11y/BUILD.bazel
@@ -1,6 +1,6 @@
 package(default_visibility=["//visibility:public"])
 
-load("@io_bazel_rules_sass//:defs.bzl", "sass_library")
+load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
 load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
 
 ng_module(
@@ -19,15 +19,15 @@ ng_module(
   ]
 )
 
-# TODO(jelbourn): remove this when sass_library acts like a filegroup
-filegroup(
-  name = "a11y_scss_partials",
+sass_library(
+  name = "a11y_scss_lib",
   srcs = glob(["**/_*.scss"]),
 )
 
-sass_library(
-  name = "a11y_scss_lib",
-  srcs = [":a11y_scss_partials"],
+sass_binary(
+  name = "a11y_prebuilt_scss",
+  src = "a11y-prebuilt.scss",
+  deps = [":a11y_scss_lib"]
 )
 
 ng_test_library(
diff --git a/src/cdk/overlay/BUILD.bazel b/src/cdk/overlay/BUILD.bazel
index fc697942436b..00b50743483d 100644
--- a/src/cdk/overlay/BUILD.bazel
+++ b/src/cdk/overlay/BUILD.bazel
@@ -21,15 +21,9 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "overlay_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
 sass_library(
   name = "overlay_scss_lib",
-  srcs = [":overlay_scss_partials"],
+  srcs = glob(["**/_*.scss"]),
 )
 
 sass_binary(
diff --git a/src/cdk/text-field/BUILD.bazel b/src/cdk/text-field/BUILD.bazel
index 7c3395b99a94..2d63911a2b52 100644
--- a/src/cdk/text-field/BUILD.bazel
+++ b/src/cdk/text-field/BUILD.bazel
@@ -16,15 +16,9 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "text_field_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
 sass_library(
   name = "text_field_scss_lib",
-  srcs = [":text_field_scss_partials"],
+  srcs = glob(["**/_*.scss"]),
 )
 
 sass_binary(
diff --git a/src/lib/BUILD.bazel b/src/lib/BUILD.bazel
index cde31c23d9d8..2b235a28d46c 100644
--- a/src/lib/BUILD.bazel
+++ b/src/lib/BUILD.bazel
@@ -2,9 +2,9 @@ package(default_visibility=["//visibility:public"])
 
 load("@angular//:index.bzl", "ng_package")
 load("//tools:sass_bundle.bzl", "sass_bundle")
-load("//:packages.bzl", "MATERIAL_PACKAGES", "MATERIAL_TARGETS", "ROLLUP_GLOBALS",
-    "VERSION_PLACEHOLDER_REPLACEMENTS")
 load("//tools:defaults.bzl", "ng_module")
+load("//:packages.bzl", "MATERIAL_PACKAGES", "MATERIAL_TARGETS", "MATERIAL_SCSS_LIBS",
+    "ROLLUP_GLOBALS", "VERSION_PLACEHOLDER_REPLACEMENTS")
 
 # Root "@angular/material" entry-point.
 ng_module(
@@ -16,15 +16,11 @@ ng_module(
 
 sass_bundle(
   name = "theming_bundle",
-  # Use the filegroup rules for these sass partials directly because sass_library doesn't
-  # act like a filegroup.
   srcs = [
-    "//src/cdk/a11y:a11y_scss_partials",
-    "//src/cdk/overlay:overlay_scss_partials",
-    "//src/cdk/text-field:text_field_scss_partials",
-  ] + [
-    "//src/lib/%s:%s_scss_partials" % (p, p.replace('-', '_')) for p in MATERIAL_PACKAGES
-  ],
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/cdk/overlay:overlay_scss_lib",
+    "//src/cdk/text-field:text_field_scss_lib",
+  ] + MATERIAL_SCSS_LIBS,
   entry_point = '//src/lib/core:theming/_all-theme.scss',
   output_name = "_theming.scss",
 )
diff --git a/src/lib/autocomplete/BUILD.bazel b/src/lib/autocomplete/BUILD.bazel
index c6133a34f03d..98bb65698546 100644
--- a/src/lib/autocomplete/BUILD.bazel
+++ b/src/lib/autocomplete/BUILD.bazel
@@ -26,21 +26,19 @@ ng_module(
   ]
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "autocomplete_scss_partials",
+sass_library(
+  name = "autocomplete_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "autocomplete_scss",
   src = "autocomplete.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/badge/BUILD.bazel b/src/lib/badge/BUILD.bazel
index 433ff13a92c8..f3a206e6cb45 100644
--- a/src/lib/badge/BUILD.bazel
+++ b/src/lib/badge/BUILD.bazel
@@ -16,15 +16,13 @@ ng_module(
   ] + glob(["**/*.html"]),
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "badge_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
 sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  name = "badge_scss_lib",
+  srcs = glob(["**/_*.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ]
 )
 
 ng_test_library(
diff --git a/src/lib/bottom-sheet/BUILD.bazel b/src/lib/bottom-sheet/BUILD.bazel
index 37b081f59ec3..38f9731f5045 100644
--- a/src/lib/bottom-sheet/BUILD.bazel
+++ b/src/lib/bottom-sheet/BUILD.bazel
@@ -26,21 +26,16 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "bottom_sheet_scss_partials",
+sass_library(
+  name = "bottom_sheet_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "bottom_sheet_container_scss",
   src = "bottom-sheet-container.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = ["//src/cdk/a11y:a11y_scss_lib"],
 )
 
 ng_test_library(
diff --git a/src/lib/button-toggle/BUILD.bazel b/src/lib/button-toggle/BUILD.bazel
index 76bce404ced2..5083a08fdc6e 100644
--- a/src/lib/button-toggle/BUILD.bazel
+++ b/src/lib/button-toggle/BUILD.bazel
@@ -18,21 +18,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "button_toggle_scss_partials",
+sass_library(
+  name = "button_toggle_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"]
 )
 
 sass_binary(
   name = "button_toggle_scss",
   src = "button-toggle.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/button/BUILD.bazel b/src/lib/button/BUILD.bazel
index ed77abc982da..3e95f1709282 100644
--- a/src/lib/button/BUILD.bazel
+++ b/src/lib/button/BUILD.bazel
@@ -18,28 +18,20 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): remove this when sass_library acts like a filegroup
-filegroup(
-  name = "button_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
-# Library of all button scss partials.
 sass_library(
   name = "button_scss_lib",
-  srcs = [":button_scss_partials"],
+  srcs = glob(["**/_*.scss"]),
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "button_scss",
   src = "button.scss",
-  deps = [":button_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+    ":button_scss_lib"
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/card/BUILD.bazel b/src/lib/card/BUILD.bazel
index c265e1dd7a32..17441ec7b160 100644
--- a/src/lib/card/BUILD.bazel
+++ b/src/lib/card/BUILD.bazel
@@ -14,19 +14,17 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "card_scss_partials",
+sass_library(
+  name = "card_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "card_scss",
   src = "card.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
diff --git a/src/lib/checkbox/BUILD.bazel b/src/lib/checkbox/BUILD.bazel
index c630c063d576..8bb70d3ea1a4 100644
--- a/src/lib/checkbox/BUILD.bazel
+++ b/src/lib/checkbox/BUILD.bazel
@@ -20,21 +20,22 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "checkbox_scss_partials",
+sass_library(
+  name = "checkbox_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ]
 )
 
 sass_binary(
   name = "checkbox_scss",
   src = "checkbox.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/chips/BUILD.bazel b/src/lib/chips/BUILD.bazel
index bdc165b9b5de..a1dfe728e996 100644
--- a/src/lib/chips/BUILD.bazel
+++ b/src/lib/chips/BUILD.bazel
@@ -24,21 +24,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "chips_scss_partials",
+sass_library(
+  name = "chips_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "chips_scss",
   src = "chips.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/core/BUILD.bazel b/src/lib/core/BUILD.bazel
index 48edf231087a..a1fa5a5ea828 100644
--- a/src/lib/core/BUILD.bazel
+++ b/src/lib/core/BUILD.bazel
@@ -1,7 +1,7 @@
 package(default_visibility=["//visibility:public"])
 
 load("@io_bazel_rules_sass//:defs.bzl", "sass_library", "sass_binary")
-load("//:packages.bzl", "MATERIAL_PACKAGES")
+load("//:packages.bzl", "MATERIAL_SCSS_LIBS")
 load("//tools:defaults.bzl", "ng_module", "ng_test_library", "ng_web_test_suite")
 
 exports_files(["theming/_theming.scss"])
@@ -30,18 +30,9 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): remove this when sass_library acts like a filegroup
-filegroup(
-  name = "core_scss_partials",
-  srcs = glob([
-    "**/_*.scss"
-  ], exclude = ["theming/_all-theme.scss"]),
-)
-
-# Library of all core scss partials.
 sass_library(
   name = "core_scss_lib",
-  srcs = [":core_scss_partials"],
+  srcs = glob(["**/_*.scss"], exclude = ["theming/_all-theme.scss"]),
   deps = [
     "//src/cdk/a11y:a11y_scss_lib",
     "//src/cdk/overlay:overlay_scss_lib",
@@ -73,7 +64,7 @@ sass_library(
     "theming/_all-theme.scss",
     "typography/_all-typography.scss",
   ],
-  deps = [":core_scss_lib"] + ["//src/lib/%s:theme" % p for p in MATERIAL_PACKAGES],
+  deps = MATERIAL_SCSS_LIBS,
 )
 
 sass_binary(
@@ -100,11 +91,6 @@ sass_binary(
   deps = [":all_themes"],
 )
 
-# This rule exists so that we can use MATERIAL_PACKAGES to enumerate all themes.
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
 
 #################
 #  Test targets
diff --git a/src/lib/datepicker/BUILD.bazel b/src/lib/datepicker/BUILD.bazel
index b134815a6a8d..bf32dbac16d2 100644
--- a/src/lib/datepicker/BUILD.bazel
+++ b/src/lib/datepicker/BUILD.bazel
@@ -34,22 +34,20 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "datepicker_scss_partials",
+sass_library(
+  name = "datepicker_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "datepicker_content_scss",
   src = "datepicker-content.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "datepicker_toggle_scss",
   src = "datepicker-toggle.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
@@ -61,12 +59,7 @@ sass_binary(
 sass_binary(
   name = "calendar_body_scss",
   src = "calendar-body.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = ["//src/cdk/a11y:a11y_scss_lib"],
 )
 
 ng_test_library(
diff --git a/src/lib/dialog/BUILD.bazel b/src/lib/dialog/BUILD.bazel
index 9d400ac62e3e..e659e2286d07 100644
--- a/src/lib/dialog/BUILD.bazel
+++ b/src/lib/dialog/BUILD.bazel
@@ -23,21 +23,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "dialog_scss_partials",
+sass_library(
+  name = "dialog_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "dialog_scss",
   src = "dialog.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/divider/BUILD.bazel b/src/lib/divider/BUILD.bazel
index 7583b617122a..67efdde3ec4b 100644
--- a/src/lib/divider/BUILD.bazel
+++ b/src/lib/divider/BUILD.bazel
@@ -16,31 +16,17 @@ ng_module(
   ],
 )
 
-
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "divider_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
 sass_library(
   name = "divider_scss_lib",
-  srcs = ["divider.scss"],
+  srcs = glob(["**/_*.scss"]),
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "divider_scss",
   src = "divider.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
-
-
 ng_test_library(
   name = "divider_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/divider/_divider-offset.scss b/src/lib/divider/_divider-offset.scss
new file mode 100644
index 000000000000..6e8846294b21
--- /dev/null
+++ b/src/lib/divider/_divider-offset.scss
@@ -0,0 +1,12 @@
+// This mixin provides the correct offset for an inset divider based on the
+// size of the parent class (e.g. avatar vs icon)
+@mixin mat-inset-divider-offset($offset, $padding) {
+  $mat-inset-divider-offset: #{(2 * $padding) + $offset};
+  margin-left: $mat-inset-divider-offset;
+  width: calc(100% - #{$mat-inset-divider-offset});
+
+  [dir='rtl'] & {
+    margin-left: auto;
+    margin-right: $mat-inset-divider-offset;
+  }
+}
diff --git a/src/lib/divider/divider.scss b/src/lib/divider/divider.scss
index e7445cfb39ac..da8e5c620b87 100644
--- a/src/lib/divider/divider.scss
+++ b/src/lib/divider/divider.scss
@@ -1,19 +1,6 @@
 $mat-divider-width: 1px;
 $mat-divider-inset-margin: 80px;
 
-// This mixin provides the correct offset for an inset divider based on the
-// size of the parent class (e.g. avatar vs icon)
-@mixin mat-inset-divider-offset($offset, $padding) {
-  $mat-inset-divider-offset: #{(2 * $padding) + $offset};
-  margin-left: $mat-inset-divider-offset;
-  width: calc(100% - #{$mat-inset-divider-offset});
-
-  [dir='rtl'] & {
-    margin-left: auto;
-    margin-right: $mat-inset-divider-offset;
-  }
-}
-
 .mat-divider {
   display: block;
   margin: 0;
diff --git a/src/lib/expansion/BUILD.bazel b/src/lib/expansion/BUILD.bazel
index 4ab53840c2d3..473e67105963 100644
--- a/src/lib/expansion/BUILD.bazel
+++ b/src/lib/expansion/BUILD.bazel
@@ -7,10 +7,10 @@ ng_module(
   name = "expansion",
   srcs = glob(["**/*.ts"], exclude=["**/*.spec.ts"]),
   module_name = "@angular/material/expansion",
-  assets = [
+  assets = glob(["**/*.html"]) + [
     ":expansion-panel.css",
     ":expansion-panel-header.css",
-  ] + glob(["**/*.html"]),
+  ],
   deps = [
     "@angular//packages/animations",
     "@angular//packages/common",
@@ -27,27 +27,24 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "expansion_scss_partials",
+sass_library(
+  name = "expansion_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "expansion_panel_scss",
   src = "expansion-panel.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 sass_binary(
   name = "expansion_panel_header_scss",
   src = "expansion-panel-header.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
 )
 
 ng_test_library(
diff --git a/src/lib/expansion/expansion-panel-header.scss b/src/lib/expansion/expansion-panel-header.scss
index b2f3642b584e..d43ecffb4396 100644
--- a/src/lib/expansion/expansion-panel-header.scss
+++ b/src/lib/expansion/expansion-panel-header.scss
@@ -1,4 +1,3 @@
-
 .mat-expansion-panel-header {
   display: flex;
   flex-direction: row;
@@ -12,7 +11,7 @@
   }
 
   &.mat-expanded:focus,
-  &.mat-expanded:hover, {
+  &.mat-expanded:hover {
     background: inherit;
   }
 
diff --git a/src/lib/form-field/BUILD.bazel b/src/lib/form-field/BUILD.bazel
index 7b2ebaa44cf3..aa0d0eaa5711 100644
--- a/src/lib/form-field/BUILD.bazel
+++ b/src/lib/form-field/BUILD.bazel
@@ -31,22 +31,28 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "form_field_scss_partials",
+sass_library(
+  name = "form_field_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "form_field_scss",
   src = "form-field.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 sass_binary(
   name = "form_field_fill_scss",
   src = "form-field-fill.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 sass_binary(
@@ -58,7 +64,10 @@ sass_binary(
 sass_binary(
   name = "form_field_legacy_scss",
   src = "form-field-legacy.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 sass_binary(
@@ -70,10 +79,8 @@ sass_binary(
 sass_binary(
   name = "form_field_standard_scss",
   src = "form-field-standard.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
diff --git a/src/lib/form-field/_form-field-theme.scss b/src/lib/form-field/_form-field-theme.scss
index 9f69faf09fc7..ee0e98d095fd 100644
--- a/src/lib/form-field/_form-field-theme.scss
+++ b/src/lib/form-field/_form-field-theme.scss
@@ -2,14 +2,13 @@
 @import '../core/theming/theming';
 @import '../core/style/form-common';
 @import '../core/typography/typography-utils';
-@import 'form-field-fill-theme.scss';
-@import 'form-field-legacy-theme.scss';
-@import 'form-field-outline-theme.scss';
-@import 'form-field-standard-theme.scss';
 
+@import './form-field-fill-theme.scss';
+@import './form-field-legacy-theme.scss';
+@import './form-field-outline-theme.scss';
+@import './form-field-standard-theme.scss';
 
 // Theme styles that apply to all appearances of the form-field.
-
 @mixin mat-form-field-theme($theme) {
   $primary: map-get($theme, primary);
   $accent: map-get($theme, accent);
diff --git a/src/lib/grid-list/BUILD.bazel b/src/lib/grid-list/BUILD.bazel
index 1a6e48e26fc9..14e66f5c4712 100644
--- a/src/lib/grid-list/BUILD.bazel
+++ b/src/lib/grid-list/BUILD.bazel
@@ -16,10 +16,10 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "grid_list_scss_partials",
+sass_library(
+  name = "grid_list_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
@@ -28,12 +28,6 @@ sass_binary(
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
-
-
 ng_test_library(
   name = "grid_list_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/icon/BUILD.bazel b/src/lib/icon/BUILD.bazel
index cc9410a00981..5b54e5485578 100644
--- a/src/lib/icon/BUILD.bazel
+++ b/src/lib/icon/BUILD.bazel
@@ -20,10 +20,10 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "icon_scss_partials",
+sass_library(
+  name = "icon_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
@@ -32,11 +32,6 @@ sass_binary(
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
-
 ng_test_library(
   name = "icon_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/input/BUILD.bazel b/src/lib/input/BUILD.bazel
index 59d676e84c46..03f1615daae1 100644
--- a/src/lib/input/BUILD.bazel
+++ b/src/lib/input/BUILD.bazel
@@ -21,15 +21,10 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "input_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
 sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  name = "input_scss_lib",
+  srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 ng_test_library(
diff --git a/src/lib/list/BUILD.bazel b/src/lib/list/BUILD.bazel
index 1f6cef062b36..f13f8ebaacff 100644
--- a/src/lib/list/BUILD.bazel
+++ b/src/lib/list/BUILD.bazel
@@ -22,21 +22,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "list_scss_partials",
+sass_library(
+  name = "list_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "list_scss",
   src = "list.scss",
-  deps = ["//src/lib/core:core_scss_lib", "//src/lib/divider:divider_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/lib/core:core_scss_lib",
+    "//src/lib/divider:divider_scss_lib"
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/list/list.scss b/src/lib/list/list.scss
index 2619f80e2827..d3bfe00b38d7 100644
--- a/src/lib/list/list.scss
+++ b/src/lib/list/list.scss
@@ -1,7 +1,7 @@
 @import '../core/style/variables';
 @import '../core/style/list-common';
 @import '../core/style/layout-common';
-@import '../divider/divider';
+@import '../divider/divider-offset';
 
 
 $mat-list-side-padding: 16px;
diff --git a/src/lib/menu/BUILD.bazel b/src/lib/menu/BUILD.bazel
index a6db45d4a9a8..5751a08e0a8f 100644
--- a/src/lib/menu/BUILD.bazel
+++ b/src/lib/menu/BUILD.bazel
@@ -25,22 +25,21 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "menu_scss_partials",
+sass_library(
+  name = "menu_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "menu_scss",
   src = "menu.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
 ng_test_library(
   name = "menu_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/paginator/BUILD.bazel b/src/lib/paginator/BUILD.bazel
index ddb4288d3217..4dec34d12b16 100644
--- a/src/lib/paginator/BUILD.bazel
+++ b/src/lib/paginator/BUILD.bazel
@@ -20,21 +20,15 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "paginator_scss_partials",
+sass_library(
+  name = "paginator_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "paginator_scss",
   src = "paginator.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
 )
 
 ng_test_library(
diff --git a/src/lib/progress-bar/BUILD.bazel b/src/lib/progress-bar/BUILD.bazel
index f7e198581138..c7bb945f4d28 100644
--- a/src/lib/progress-bar/BUILD.bazel
+++ b/src/lib/progress-bar/BUILD.bazel
@@ -18,21 +18,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "progress_bar_scss_partials",
+sass_library(
+  name = "progress_bar_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "progress_bar_scss",
   src = "progress-bar.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/progress-spinner/BUILD.bazel b/src/lib/progress-spinner/BUILD.bazel
index c3cfffaf0a10..bafdf4b2388b 100644
--- a/src/lib/progress-spinner/BUILD.bazel
+++ b/src/lib/progress-spinner/BUILD.bazel
@@ -18,10 +18,10 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "progress_spinner_scss_partials",
+sass_library(
+  name = "progress_spinner_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
@@ -30,10 +30,6 @@ sass_binary(
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
 ng_test_library(
   name = "progress_spinner_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/radio/BUILD.bazel b/src/lib/radio/BUILD.bazel
index 624e2698b6c0..b92e2f7f79d7 100644
--- a/src/lib/radio/BUILD.bazel
+++ b/src/lib/radio/BUILD.bazel
@@ -20,21 +20,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "radio_scss_partials",
+sass_library(
+  name = "radio_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "radio_scss",
   src = "radio.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/select/BUILD.bazel b/src/lib/select/BUILD.bazel
index 7846a3ca54dc..b700dec7ba37 100644
--- a/src/lib/select/BUILD.bazel
+++ b/src/lib/select/BUILD.bazel
@@ -27,21 +27,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "select_scss_partials",
+sass_library(
+  name = "select_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "select_scss",
   src = "select.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib"
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/sidenav/BUILD.bazel b/src/lib/sidenav/BUILD.bazel
index a11a1bb0be6e..13dedf66dd5d 100644
--- a/src/lib/sidenav/BUILD.bazel
+++ b/src/lib/sidenav/BUILD.bazel
@@ -25,21 +25,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "sidenav_scss_partials",
+sass_library(
+  name = "sidenav_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "drawer_scss",
   src = "drawer.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/slide-toggle/BUILD.bazel b/src/lib/slide-toggle/BUILD.bazel
index 7e9b854df86d..05f91c64a025 100644
--- a/src/lib/slide-toggle/BUILD.bazel
+++ b/src/lib/slide-toggle/BUILD.bazel
@@ -22,21 +22,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "slide_toggle_scss_partials",
+sass_library(
+  name = "slide_toggle_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "slide_toggle_scss",
   src = "slide-toggle.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/slider/BUILD.bazel b/src/lib/slider/BUILD.bazel
index 3a8f6f57f90b..dd3ec7551fbc 100644
--- a/src/lib/slider/BUILD.bazel
+++ b/src/lib/slider/BUILD.bazel
@@ -23,21 +23,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "slider_scss_partials",
+sass_library(
+  name = "slider_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "slider_scss",
   src = "slider.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/snack-bar/BUILD.bazel b/src/lib/snack-bar/BUILD.bazel
index 728b624e9737..d282766acd12 100644
--- a/src/lib/snack-bar/BUILD.bazel
+++ b/src/lib/snack-bar/BUILD.bazel
@@ -27,16 +27,16 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "snack_bar_scss_partials",
+sass_library(
+  name = "snack_bar_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "snack_bar_container_scss",
   src = "snack-bar-container.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = ["//src/cdk/a11y:a11y_scss_lib"],
 )
 
 sass_binary(
@@ -45,11 +45,6 @@ sass_binary(
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
-
 ng_test_library(
   name = "snack_bar_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/sort/BUILD.bazel b/src/lib/sort/BUILD.bazel
index b851b7fa1f0d..557054c7ae03 100644
--- a/src/lib/sort/BUILD.bazel
+++ b/src/lib/sort/BUILD.bazel
@@ -18,21 +18,15 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "sort_scss_partials",
+sass_library(
+  name = "sort_scss_lib",
   srcs = glob(["**/_*.scss"]),
 )
 
 sass_binary(
   name = "sort_header_scss",
   src = "sort-header.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = ["//src/cdk/a11y:a11y_scss_lib"],
 )
 
 ng_test_library(
diff --git a/src/lib/stepper/BUILD.bazel b/src/lib/stepper/BUILD.bazel
index 40ab73658009..67860e19030a 100644
--- a/src/lib/stepper/BUILD.bazel
+++ b/src/lib/stepper/BUILD.bazel
@@ -28,10 +28,10 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "stepper_scss_partials",
+sass_library(
+  name = "stepper_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
@@ -46,12 +46,6 @@ sass_binary(
   deps = ["//src/lib/core:core_scss_lib"],
 )
 
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
-
 ng_test_library(
   name = "stepper_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/table/BUILD.bazel b/src/lib/table/BUILD.bazel
index 0ccc5200e3da..6826d6fdda18 100644
--- a/src/lib/table/BUILD.bazel
+++ b/src/lib/table/BUILD.bazel
@@ -21,21 +21,15 @@ ng_module(
   ] + glob(["**/*.html"]),
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "table_scss_partials",
+sass_library(
+  name = "table_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "table_scss",
   src = "table.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
 )
 
 ng_test_library(
diff --git a/src/lib/tabs/BUILD.bazel b/src/lib/tabs/BUILD.bazel
index 5209be65da2a..a575d76132c4 100644
--- a/src/lib/tabs/BUILD.bazel
+++ b/src/lib/tabs/BUILD.bazel
@@ -31,27 +31,19 @@ ng_module(
   ],
 )
 
-
-# TODO(jelbourn): remove this when sass_library acts like a filegroup
-filegroup(
-  name = "tabs_scss_partials",
-  srcs = glob(["**/_*.scss"]),
-)
-
-# Library of all tabs scss partials.
 sass_library(
   name = "tabs_scss_lib",
-  srcs = [":tabs_scss_partials"],
-  deps = ["//src/lib/core:core_scss_lib"],
+  srcs = glob(["**/_*.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 sass_binary(
   name = "tab_body_scss",
   src = "tab-body.scss",
-  deps = [
-    "//src/lib/core:core_scss_lib",
-    "tabs_scss_lib",
-  ],
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
@@ -59,7 +51,7 @@ sass_binary(
   src = "tab-header.scss",
   deps = [
     "//src/lib/core:core_scss_lib",
-    "tabs_scss_lib",
+    ":tabs_scss_lib",
   ],
 )
 
@@ -68,7 +60,7 @@ sass_binary(
   src = "tab-group.scss",
   deps = [
     "//src/lib/core:core_scss_lib",
-    "tabs_scss_lib",
+    ":tabs_scss_lib",
   ],
 )
 
@@ -77,15 +69,10 @@ sass_binary(
   src = "tab-nav-bar/tab-nav-bar.scss",
   deps = [
     "//src/lib/core:core_scss_lib",
-    "tabs_scss_lib",
+    ":tabs_scss_lib",
   ],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
-
 ng_test_library(
   name = "tabs_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/tabs/tab-group.scss b/src/lib/tabs/tab-group.scss
index 320653648e91..df6dd6fd6213 100644
--- a/src/lib/tabs/tab-group.scss
+++ b/src/lib/tabs/tab-group.scss
@@ -1,6 +1,6 @@
 @import '../core/style/variables';
 @import '../core/style/layout-common';
-@import 'tabs-common';
+@import './tabs-common';
 
 .mat-tab-group {
   display: flex;
diff --git a/src/lib/tabs/tab-header.scss b/src/lib/tabs/tab-header.scss
index 3ecf4231fc6d..638af2856db7 100644
--- a/src/lib/tabs/tab-header.scss
+++ b/src/lib/tabs/tab-header.scss
@@ -1,6 +1,6 @@
 @import '../core/style/variables';
 @import '../core/style/layout-common';
-@import 'tabs-common';
+@import './tabs-common';
 
 .mat-tab-header {
   display: flex;
diff --git a/src/lib/toolbar/BUILD.bazel b/src/lib/toolbar/BUILD.bazel
index 4efb53c07d30..898ee4b02c23 100644
--- a/src/lib/toolbar/BUILD.bazel
+++ b/src/lib/toolbar/BUILD.bazel
@@ -16,22 +16,21 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "toolbar_scss_partials",
+sass_library(
+  name = "toolbar_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "toolbar_scss",
   src = "toolbar.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
-)
 ng_test_library(
   name = "toolbar_test_sources",
   srcs = glob(["**/*.spec.ts"]),
diff --git a/src/lib/tooltip/BUILD.bazel b/src/lib/tooltip/BUILD.bazel
index fb2f5caef445..3975905fde09 100644
--- a/src/lib/tooltip/BUILD.bazel
+++ b/src/lib/tooltip/BUILD.bazel
@@ -28,21 +28,19 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "tooltip_scss_partials",
+sass_library(
+  name = "tooltip_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "tooltip_scss",
   src = "tooltip.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
+  deps = [
+    "//src/cdk/a11y:a11y_scss_lib",
+    "//src/lib/core:core_scss_lib",
+  ],
 )
 
 ng_test_library(
diff --git a/src/lib/tree/BUILD.bazel b/src/lib/tree/BUILD.bazel
index e2e594d91543..a856e5b02ebd 100644
--- a/src/lib/tree/BUILD.bazel
+++ b/src/lib/tree/BUILD.bazel
@@ -19,21 +19,15 @@ ng_module(
   ],
 )
 
-# TODO(jelbourn): replace this w/ sass_library when it supports acting like a filegroup
-filegroup(
-  name = "tree_scss_partials",
+sass_library(
+  name = "tree_scss_lib",
   srcs = glob(["**/_*.scss"]),
+  deps = ["//src/lib/core:core_scss_lib"],
 )
 
 sass_binary(
   name = "tree_scss",
   src = "tree.scss",
-  deps = ["//src/lib/core:core_scss_lib"],
-)
-
-sass_library(
-  name = "theme",
-  srcs = glob(["**/*-theme.scss"]),
 )
 
 ng_test_library(