diff --git a/docs/assets/css/main.scss b/docs/assets/css/main.scss
index 1ee61340d..9ec2a3a0d 100644
--- a/docs/assets/css/main.scss
+++ b/docs/assets/css/main.scss
@@ -22,8 +22,7 @@
 @use 'variation' as *;
 @use 'color-swatches' as *;
 @use 'search' as *;
-
-@include define-custom-props();
+@include define-custom-props;
 
 // Webfont
 // This is the path for self-hosted fonts.
diff --git a/packages/cfpb-design-system/src/index.scss b/packages/cfpb-design-system/src/index.scss
index c9f45b51d..be468f0ec 100644
--- a/packages/cfpb-design-system/src/index.scss
+++ b/packages/cfpb-design-system/src/index.scss
@@ -1,18 +1,18 @@
 @forward 'abstracts';
 @forward 'base';
-
+// Buttons.
 @forward 'components/cfpb-buttons/vars';
 @forward 'components/cfpb-buttons/button';
 @forward 'components/cfpb-buttons/button-group';
 @forward 'components/cfpb-buttons/button-link';
 @forward 'components/cfpb-buttons/button-with-icon';
-
+// Expandables.
 @forward 'components/cfpb-expandables/vars';
 @forward 'components/cfpb-expandables/expandable';
 @forward 'components/cfpb-expandables/expandable-group';
 @forward 'components/cfpb-expandables/summary';
 @forward 'components/cfpb-expandables/summary-minimal';
-
+// Forms.
 @forward 'components/cfpb-forms/form';
 @forward 'components/cfpb-forms/form-alert';
 @forward 'components/cfpb-forms/form-field';
@@ -22,9 +22,9 @@
 @forward 'components/cfpb-forms/search-input';
 @forward 'components/cfpb-forms/select';
 @forward 'components/cfpb-forms/text-input';
-
+// Icons.
 @forward 'components/cfpb-icons/icon';
-
+// Layout.
 @forward 'components/cfpb-layout/card-group';
 @forward 'components/cfpb-layout/card';
 @forward 'components/cfpb-layout/email-signup';
@@ -33,17 +33,17 @@
 @forward 'components/cfpb-layout/layout';
 @forward 'components/cfpb-layout/text-introduction';
 @forward 'components/cfpb-layout/well';
-
+// Notifications.
 @forward 'components/cfpb-notifications/vars';
 @forward 'components/cfpb-notifications/banner';
 @forward 'components/cfpb-notifications/notification';
-
+// Pagination.
 @forward 'components/cfpb-pagination/vars';
 @forward 'components/cfpb-pagination/pagination';
-
+// Tables.
 @forward 'components/cfpb-tables/vars';
 @forward 'components/cfpb-tables/table';
-
+// Typography.
 @forward 'components/cfpb-typography/vars';
 @forward 'components/cfpb-typography/date';
 @forward 'components/cfpb-typography/link';
@@ -52,5 +52,5 @@
 @forward 'components/cfpb-typography/pull-quote';
 @forward 'components/cfpb-typography/slug-header';
 @forward 'components/cfpb-typography/tagline';
-
+// Utilities.
 @forward 'utilities';