diff --git a/web/themes/custom/opdavies/assets/css/base/blockquote.pcss b/web/themes/custom/opdavies/assets/css/base/blockquote.pcss
new file mode 100644
index 000000000..d91bf2d14
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/blockquote.pcss
@@ -0,0 +1,5 @@
+@layer base {
+  iframe {
+    @apply max-w-full
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/base/forms.pcss b/web/themes/custom/opdavies/assets/css/base/forms.pcss
new file mode 100644
index 000000000..d50d00be0
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/forms.pcss
@@ -0,0 +1,5 @@
+@layer base {
+  input {
+    @apply dark:text-gray-900
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/base/iframe.pcss b/web/themes/custom/opdavies/assets/css/base/iframe.pcss
new file mode 100644
index 000000000..7a7c627f6
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/iframe.pcss
@@ -0,0 +1,13 @@
+@layer base {
+  h1, h2, h3 {
+    @apply font-bold
+  }
+    
+  h1 {
+    @apply text-3xl leading-normal
+  }
+    
+  h2 {
+    @apply text-2xl leading-normal
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/base/images.pcss b/web/themes/custom/opdavies/assets/css/base/images.pcss
new file mode 100644
index 000000000..a18080d97
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/images.pcss
@@ -0,0 +1,5 @@
+@layer base {
+  img {
+    @apply max-w-full h-auto
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/base/links.pcss b/web/themes/custom/opdavies/assets/css/base/links.pcss
new file mode 100644
index 000000000..c4827b9b5
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/links.pcss
@@ -0,0 +1,5 @@
+@layer base {
+  a {
+    @apply text-blue-500 no-underline hover:underline
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/base/tables.pcss b/web/themes/custom/opdavies/assets/css/base/tables.pcss
new file mode 100644
index 000000000..710c7b094
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/tables.pcss
@@ -0,0 +1,5 @@
+@layer base {
+  th {
+    @apply dark:text-white
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/base/typography.pcss b/web/themes/custom/opdavies/assets/css/base/typography.pcss
new file mode 100644
index 000000000..7a7c627f6
--- /dev/null
+++ b/web/themes/custom/opdavies/assets/css/base/typography.pcss
@@ -0,0 +1,13 @@
+@layer base {
+  h1, h2, h3 {
+    @apply font-bold
+  }
+    
+  h1 {
+    @apply text-3xl leading-normal
+  }
+    
+  h2 {
+    @apply text-2xl leading-normal
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/custom-base.pcss b/web/themes/custom/opdavies/assets/css/custom-base.pcss
deleted file mode 100644
index 3fb28026d..000000000
--- a/web/themes/custom/opdavies/assets/css/custom-base.pcss
+++ /dev/null
@@ -1,35 +0,0 @@
-h1, h2, h3 {
-  @apply font-bold
-}
-
-h1 {
-  @apply text-3xl leading-normal
-}
-
-h2 {
-  @apply text-2xl leading-normal
-}
-
-img {
-  @apply max-w-full h-auto
-}
-
-a {
-  @apply text-blue-500 no-underline hover:underline
-}
-
-blockquote {
-  @apply pl-5 border-l-4 border-gray-200 italic dark:text-gray-200
-}
-
-iframe {
-  @apply max-w-full
-}
-
-input {
-  @apply dark:text-gray-900
-}
-
-th {
-  @apply dark:text-white
-}
diff --git a/web/themes/custom/opdavies/assets/css/tailwind.pcss b/web/themes/custom/opdavies/assets/css/tailwind.pcss
index 661595d2a..d32b50e8d 100644
--- a/web/themes/custom/opdavies/assets/css/tailwind.pcss
+++ b/web/themes/custom/opdavies/assets/css/tailwind.pcss
@@ -1,5 +1,5 @@
 @import 'tailwindcss/base';
-@import './custom-base.pcss';
+@import './base/*.pcss';
 
 @import 'tailwindcss/components';
 @import './components/*.pcss';