diff --git a/src/components/FieldDateInput/DateInput.module.css b/src/components/FieldDateInput/DateInput.module.css
index 4e72755c8..e4a9434e9 100644
--- a/src/components/FieldDateInput/DateInput.module.css
+++ b/src/components/FieldDateInput/DateInput.module.css
@@ -275,7 +275,7 @@
     border-bottom-width: 2px;
     border-bottom-color: var(--matterColorNegative);
     border-radius: 0;
-    
+
     /* Effects */
     transition: border-bottom-color var(--transitionStyle);
     transition: all 0.15s ease-out;
diff --git a/src/components/FieldReviewRating/FieldReviewRating.module.css b/src/components/FieldReviewRating/FieldReviewRating.module.css
index 740c2550e..90ad531a1 100644
--- a/src/components/FieldReviewRating/FieldReviewRating.module.css
+++ b/src/components/FieldReviewRating/FieldReviewRating.module.css
@@ -1,3 +1,5 @@
+@import '../../styles/customMediaQueries.css';
+
 .ratingFieldSet {
   border: none;
   padding: 0;
diff --git a/src/components/OwnListingLink/OwnListingLink.module.css b/src/components/OwnListingLink/OwnListingLink.module.css
index d4b9422c9..a71b3f43d 100644
--- a/src/components/OwnListingLink/OwnListingLink.module.css
+++ b/src/components/OwnListingLink/OwnListingLink.module.css
@@ -1,4 +1,4 @@
-@import '../../styles/propertySets.css';
+@import '../../styles/customMediaQueries.css';
 
 .defaultLinkStyle {
   composes: a from global;
diff --git a/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css b/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css
index 02c9f7950..6b2da1757 100644
--- a/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css
+++ b/src/components/SearchFiltersSecondary/SearchFiltersSecondary.module.css
@@ -1,3 +1,5 @@
+@import '../../styles/customMediaQueries.css';
+
 .root {
   flex-grow: 1;
   display: flex;
diff --git a/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css b/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css
index 6c3f37978..e54d0aa86 100644
--- a/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css
+++ b/src/components/TopbarMobileMenu/TopbarMobileMenu.module.css
@@ -1,3 +1,5 @@
+@import '../../styles/customMediaQueries.css';
+
 .root {
   flex-shrink: 0;
   display: flex;
diff --git a/src/forms/BookingTimeForm/FieldDateAndTimeInput.module.css b/src/forms/BookingTimeForm/FieldDateAndTimeInput.module.css
index b01b2c06a..5a7cc2eb6 100644
--- a/src/forms/BookingTimeForm/FieldDateAndTimeInput.module.css
+++ b/src/forms/BookingTimeForm/FieldDateAndTimeInput.module.css
@@ -1,3 +1,5 @@
+@import '../../styles/customMediaQueries.css';
+
 .root {
   display: flex;
   flex-direction: column;
diff --git a/src/forms/EditListingAvailabilityExceptionForm/EditListingAvailabilityExceptionForm.module.css b/src/forms/EditListingAvailabilityExceptionForm/EditListingAvailabilityExceptionForm.module.css
index 2815cb40f..2106c5383 100644
--- a/src/forms/EditListingAvailabilityExceptionForm/EditListingAvailabilityExceptionForm.module.css
+++ b/src/forms/EditListingAvailabilityExceptionForm/EditListingAvailabilityExceptionForm.module.css
@@ -1,3 +1,5 @@
+@import '../../styles/customMediaQueries.css';
+
 .root {
 }
 
diff --git a/src/forms/EditListingAvailabilityPlanForm/EditListingAvailabilityPlanForm.module.css b/src/forms/EditListingAvailabilityPlanForm/EditListingAvailabilityPlanForm.module.css
index 9c3475efe..ae9bc2b65 100644
--- a/src/forms/EditListingAvailabilityPlanForm/EditListingAvailabilityPlanForm.module.css
+++ b/src/forms/EditListingAvailabilityPlanForm/EditListingAvailabilityPlanForm.module.css
@@ -1,4 +1,4 @@
-@import '../../styles/propertySets.css';
+@import '../../styles/customMediaQueries.css';
 
 .root {
   /* Dimensions */
@@ -151,7 +151,7 @@
 }
 
 .buttonAddNew {
-  composes: h5 from global;  
+  composes: h5 from global;
   color: var(--matterColor);
 }
 .submitButton {