diff --git a/packages/core/src/components/DateField/DateField.scss b/packages/core/src/components/DateField/DateField.scss
index 59a7c823a3..1da42705a1 100644
--- a/packages/core/src/components/DateField/DateField.scss
+++ b/packages/core/src/components/DateField/DateField.scss
@@ -1,4 +1,3 @@
-@import 'DateField.docs';
 @import '@cmsgov/design-system-support/src/settings/index';
 
 .ds-c-field--month,
diff --git a/packages/core/src/components/Tabs/_Tabs.docs.scss b/packages/core/src/components/Tabs/_Tabs.docs.scss
index 60cf3840f5..5875d95629 100644
--- a/packages/core/src/components/Tabs/_Tabs.docs.scss
+++ b/packages/core/src/components/Tabs/_Tabs.docs.scss
@@ -26,6 +26,14 @@ Style guide: components.tabs.react-tabs
 Style guide: components.tabs.react-tabpanel
 */
 
+/*
+`<Tab>`
+
+@react-component Tab
+
+Style guide: components.tabs.react-tab
+*/
+
 /*
 ---
 
diff --git a/packages/core/src/components/_index.scss b/packages/core/src/components/_index.scss
index af934ef99f..3c5c25d58d 100644
--- a/packages/core/src/components/_index.scss
+++ b/packages/core/src/components/_index.scss
@@ -5,7 +5,6 @@
 @import 'Button/Button';
 @import 'ChoiceList/Choice';
 @import 'ChoiceList/Select';
-@import 'DateField/DateField';
 @import 'Dialog/Dialog';
 @import 'Dropdown/Dropdown';
 @import 'FormLabel/FormLabel';
@@ -17,8 +16,11 @@
 @import 'StepList/StepList';
 @import 'Table/Table';
 @import 'Tabs/Tabs';
+// Mask and Date field styles need imported
+// after TextField since they modify it
 @import 'TextField/TextField';
 @import 'TextField/Mask';
+@import 'DateField/DateField';
 @import 'VerticalNav/VerticalNav';
 
 // Documentation