diff --git a/src/components/container/_container.scss b/src/components/container/_container.scss
index b28d4de..ae6b45e 100644
--- a/src/components/container/_container.scss
+++ b/src/components/container/_container.scss
@@ -30,6 +30,7 @@
 [dir="rtl"] .cmp-adaptiveform-container__hamburger-menu-button--prev {
   transform: rotate(180deg);
 }
+
 [dir="rtl"] .cmp-adaptiveform-container__hamburger-menu-button--next {
   transform: rotate(180deg);
 }
diff --git a/src/components/datepicker/_datepicker.scss b/src/components/datepicker/_datepicker.scss
index 62e83ff..a7a5239 100644
--- a/src/components/datepicker/_datepicker.scss
+++ b/src/components/datepicker/_datepicker.scss
@@ -23,10 +23,11 @@
 /* [dir="rtl"] ancestor-attribute selectors are not supported by the AEM Style System
    (theme editor) — this is an RTL implementation detail shipped here directly. */
 [dir="rtl"] .datepicker-calendar-icon {
-  left: 30px;
-  right: unset;
+  inset-inline-start: 30px;
+  inset-inline-end: unset;
 }
+
 [dir="rtl"] .cmp-adaptiveform-datepicker__calendar-icon {
-  left: 30px;
-  right: unset;
+  inset-inline-start: 30px;
+  inset-inline-end: unset;
 }
diff --git a/src/components/scribble/_scribble.scss b/src/components/scribble/_scribble.scss
index 0489ab3..7f16b63 100644
--- a/src/components/scribble/_scribble.scss
+++ b/src/components/scribble/_scribble.scss
@@ -25,4 +25,4 @@
 #keyboard_Sign_Box::placeholder {
   font: 1rem sans-serif, Georgia;
   vertical-align: middle;
-}
\ No newline at end of file
+}
diff --git a/src/site/_base.scss b/src/site/_base.scss
index 33d2494..3659adb 100644
--- a/src/site/_base.scss
+++ b/src/site/_base.scss
@@ -49,4 +49,3 @@ html, body {
     }
   }
 }
-
diff --git a/src/site/_fonts.scss b/src/site/_fonts.scss
index 99f4aff..2090846 100644
--- a/src/site/_fonts.scss
+++ b/src/site/_fonts.scss
@@ -55,4 +55,3 @@
 @include fontface(titleFont, "SourceSerifPro/SourceSerifPro-Regular", normal);
 @include fontface(titleFont, "SourceSerifPro/SourceSerifPro-SemiBold", bold);
 @include fontface(titleFont, "SourceSerifPro/SourceSerifPro-SemiBoldItalic", bold, italic);
-
diff --git a/src/site/_grid.scss b/src/site/_grid.scss
index d97cd96..9bed61e 100644
--- a/src/site/_grid.scss
+++ b/src/site/_grid.scss
@@ -127,4 +127,3 @@
     display: none;
   }
 }
-
diff --git a/src/site/_mixin.scss b/src/site/_mixin.scss
index 0473002..2063abd 100644
--- a/src/site/_mixin.scss
+++ b/src/site/_mixin.scss
@@ -33,4 +33,3 @@
   border-radius: $border-radius;
   flex-shrink: 0;
 }
-
diff --git a/src/site/_variables.scss b/src/site/_variables.scss
index 1fd2ba9..57a3583 100644
--- a/src/site/_variables.scss
+++ b/src/site/_variables.scss
@@ -61,4 +61,3 @@ $radio-checkbox-gap: 20px;
 //== Grid
 
 $max_col: 12;
-
diff --git a/src/theme.scss b/src/theme.scss
index 476582c..fecc75d 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -21,22 +21,22 @@
  */
 
 //== Variables
-@import 'site/variables';
+@import "site/variables";
 
 //== fonts
-// @import 'site/fonts';
+// @import "site/fonts";
 
 //== Mixins
-@import 'site/mixin';
+@import "site/mixin";
 
 //== base
-@import 'site/_grid.scss';
-@import 'site/_base';
+@import "site/grid";
+@import "site/base";
 
 //== Core component selectors that cannot be expressed via the theme editor's
 //== AEM Style System (media queries, unprefixed/global selectors, ID selectors,
 //== ancestor/descendant attribute selectors, anonymous-element hover) — everything
 //== else is authored through the theme editor instead.
-@import './components/container/_container.scss';
-@import './components/datepicker/_datepicker.scss';
-@import './components/scribble/_scribble.scss';
+@import "./components/container/container";
+@import "./components/datepicker/datepicker";
+@import "./components/scribble/scribble";