diff --git a/web/themes/custom/opdavies/assets/css/base/blockquote.pcss b/web/themes/custom/opdavies/assets/css/base/blockquote.pcss
deleted file mode 100644
index d91bf2d..0000000
--- a/web/themes/custom/opdavies/assets/css/base/blockquote.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@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
deleted file mode 100644
index e513ab0..0000000
--- a/web/themes/custom/opdavies/assets/css/base/forms.pcss
+++ /dev/null
@@ -1,37 +0,0 @@
-@layer base {
-  form {
-    @apply space-y-5
-  }
-
-  [type='text'],
-  [type='email'],
-  [type='url'],
-  [type='password'],
-  [type='number'],
-  [type='date'],
-  [type='datetime-local'],
-  [type='month'],
-  [type='search'],
-  [type='tel'],
-  [type='time'],
-  [type='week'],
-  [multiple],
-  select,
-  textarea {
-    @apply border-gray-400 rounded-lg w-full
-  }
-
-  .form-item,
-  .form-wrapper {
-    @apply max-w-md
-  }
-
-  .js-form-type-email,
-  .js-form-type-password,
-  .js-form-type-textarea,
-  .js-form-type-textfield {
-    label {
-      @apply block
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/base/iframe.pcss b/web/themes/custom/opdavies/assets/css/base/iframe.pcss
deleted file mode 100644
index 7a7c627..0000000
--- a/web/themes/custom/opdavies/assets/css/base/iframe.pcss
+++ /dev/null
@@ -1,13 +0,0 @@
-@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
deleted file mode 100644
index a18080d..0000000
--- a/web/themes/custom/opdavies/assets/css/base/images.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@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
deleted file mode 100644
index 1006011..0000000
--- a/web/themes/custom/opdavies/assets/css/base/links.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer base {
-  a {
-    @apply text-blue-700 no-underline hover:underline
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/base/typography.pcss b/web/themes/custom/opdavies/assets/css/base/typography.pcss
deleted file mode 100644
index 7a7c627..0000000
--- a/web/themes/custom/opdavies/assets/css/base/typography.pcss
+++ /dev/null
@@ -1,13 +0,0 @@
-@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/components/block.pcss b/web/themes/custom/opdavies/assets/css/components/block.pcss
deleted file mode 100644
index 251c54b..0000000
--- a/web/themes/custom/opdavies/assets/css/components/block.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer components {
-  .sidebar .block {
-    @apply p-6 rounded bg-gray-100
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/blog-image.pcss b/web/themes/custom/opdavies/assets/css/components/blog-image.pcss
deleted file mode 100644
index a35a81f..0000000
--- a/web/themes/custom/opdavies/assets/css/components/blog-image.pcss
+++ /dev/null
@@ -1,3 +0,0 @@
-.media--type-image .field--type-image img {
-  @apply border border-gray-200
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/button.pcss b/web/themes/custom/opdavies/assets/css/components/button.pcss
deleted file mode 100644
index 2dd6faf..0000000
--- a/web/themes/custom/opdavies/assets/css/components/button.pcss
+++ /dev/null
@@ -1,12 +0,0 @@
-@layer components {
-  .button {
-    @apply py-2 px-3 inline-block border border-blue-600;
-    @apply text-sm text-white no-underline bg-blue-600 rounded;
-
-    &:active,
-    &:focus,
-    &:hover {
-      @apply bg-white text-blue-600
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/container.pcss b/web/themes/custom/opdavies/assets/css/components/container.pcss
deleted file mode 100644
index 1be3827..0000000
--- a/web/themes/custom/opdavies/assets/css/components/container.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer components {
-  .container {
-    @apply w-full max-w-5xl px-4 mx-auto
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/lead.pcss b/web/themes/custom/opdavies/assets/css/components/lead.pcss
deleted file mode 100644
index f0d137d..0000000
--- a/web/themes/custom/opdavies/assets/css/components/lead.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer components {
-  p.lead {
-    @apply md:text-lg
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/logo.pcss b/web/themes/custom/opdavies/assets/css/components/logo.pcss
deleted file mode 100644
index 4fc89e6..0000000
--- a/web/themes/custom/opdavies/assets/css/components/logo.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer components {
-  #block-opdavies-branding img {
-    @apply h-8 md:h-12
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/note.pcss b/web/themes/custom/opdavies/assets/css/components/note.pcss
deleted file mode 100644
index 69a911c..0000000
--- a/web/themes/custom/opdavies/assets/css/components/note.pcss
+++ /dev/null
@@ -1,9 +0,0 @@
-@layer components {
-  .note {
-    @apply max-w-full prose bg-blue-200 border-blue-600 border-l-4 mb-4 p-4 rounded;
-
-    p a {
-      @apply underline hover:no-underline
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/recommendation.pcss b/web/themes/custom/opdavies/assets/css/components/recommendation.pcss
deleted file mode 100644
index aa63819..0000000
--- a/web/themes/custom/opdavies/assets/css/components/recommendation.pcss
+++ /dev/null
@@ -1,7 +0,0 @@
-@layer components {
-  .recommendation {
-    .photo img {
-      @apply rounded-full
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/table.pcss b/web/themes/custom/opdavies/assets/css/components/table.pcss
deleted file mode 100644
index 8af8b5c..0000000
--- a/web/themes/custom/opdavies/assets/css/components/table.pcss
+++ /dev/null
@@ -1,20 +0,0 @@
-@layer components {
-  .table {
-    @apply w-full;
-
-    th {
-      @apply bg-gray-200 text-left
-    }
-
-    th,
-    td {
-      @apply px-4 py-2 border border-solid border-gray-200
-    }
-  }
-
-  table.is-striped {
-    tbody > tr:not(:nth-child(odd)) td {
-      @apply bg-gray-100
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/widget.pcss b/web/themes/custom/opdavies/assets/css/components/widget.pcss
deleted file mode 100644
index 71ac18b..0000000
--- a/web/themes/custom/opdavies/assets/css/components/widget.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer components {
-  .widget {
-    @apply block mb-6
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/components/wrap.pcss b/web/themes/custom/opdavies/assets/css/components/wrap.pcss
deleted file mode 100644
index 296190a..0000000
--- a/web/themes/custom/opdavies/assets/css/components/wrap.pcss
+++ /dev/null
@@ -1,9 +0,0 @@
-@layer components {
-  .wrap {
-    @apply w-full max-w-3xl mx-auto;
-
-    &.is-wide {
-      @apply max-w-5xl
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/libraries/hljs.pcss b/web/themes/custom/opdavies/assets/css/libraries/hljs.pcss
deleted file mode 100644
index 4cf71ae..0000000
--- a/web/themes/custom/opdavies/assets/css/libraries/hljs.pcss
+++ /dev/null
@@ -1,3 +0,0 @@
-.hljs {
-  @apply p-0 bg-inherit
-}
diff --git a/web/themes/custom/opdavies/assets/css/tailwind.pcss b/web/themes/custom/opdavies/assets/css/tailwind.pcss
index 4b96deb..19a882e 100644
--- a/web/themes/custom/opdavies/assets/css/tailwind.pcss
+++ b/web/themes/custom/opdavies/assets/css/tailwind.pcss
@@ -2,7 +2,162 @@
 @import 'tailwindcss/components';
 @import 'tailwindcss/utilities';
 
-@import './base/*.pcss';
-@import './components/*.pcss';
-@import './libraries/*.pcss';
-@import './utilities/*.pcss';
+@layer base {
+  h1, h2, h3 {
+    @apply font-bold
+  }
+
+  h1 {
+    @apply text-3xl leading-normal
+  }
+
+  h2 {
+    @apply text-2xl leading-normal
+  }
+
+  a {
+    @apply text-blue-700 no-underline hover:underline
+  }
+
+  img {
+    @apply max-w-full h-auto
+  }
+
+  iframe {
+    @apply max-w-full
+  }
+
+  form {
+    @apply space-y-5
+  }
+
+  [type='text'],
+  [type='email'],
+  [type='url'],
+  [type='password'],
+  [type='number'],
+  [type='date'],
+  [type='datetime-local'],
+  [type='month'],
+  [type='search'],
+  [type='tel'],
+  [type='time'],
+  [type='week'],
+  [multiple],
+  select,
+  textarea {
+    @apply border-gray-400 rounded-lg w-full
+  }
+
+  .form-item,
+  .form-wrapper {
+    @apply max-w-md
+  }
+
+  .js-form-type-email,
+  .js-form-type-password,
+  .js-form-type-textarea,
+  .js-form-type-textfield {
+    label {
+      @apply block
+    }
+  }
+}
+
+@layer components {
+  .sidebar .block {
+    @apply p-6 rounded bg-gray-100
+  }
+
+  .media--type-image .field--type-image img {
+    @apply border border-gray-200
+  }
+
+  .button {
+    @apply py-2 px-3 inline-block border border-blue-600;
+    @apply text-sm text-white no-underline bg-blue-600 rounded;
+
+    &:active,
+    &:focus,
+    &:hover {
+      @apply bg-white text-blue-600
+    }
+  }
+
+  .container {
+    @apply w-full max-w-5xl px-4 mx-auto
+  }
+
+  p.lead {
+    @apply md:text-lg
+  }
+
+  #block-opdavies-branding img {
+    @apply h-8 md:h-12
+  }
+
+  .note {
+    @apply max-w-full prose bg-blue-200 border-blue-600 border-l-4 mb-4 p-4 rounded;
+
+    p a {
+      @apply underline hover:no-underline
+    }
+  }
+
+  .recommendation {
+    .photo img {
+      @apply rounded-full
+    }
+  }
+
+  .table {
+    @apply w-full;
+
+    th {
+      @apply bg-gray-200 text-left
+    }
+
+    th,
+    td {
+      @apply px-4 py-2 border border-solid border-gray-200
+    }
+  }
+
+  table.is-striped {
+    tbody > tr:not(:nth-child(odd)) td {
+      @apply bg-gray-100
+    }
+  }
+
+  .widget {
+    @apply block mb-6
+  }
+
+  .wrap {
+    @apply w-full max-w-3xl mx-auto;
+
+    &.is-wide {
+      @apply max-w-5xl
+    }
+  }
+
+  .hljs {
+    @apply p-0 bg-inherit
+  }
+}
+
+@layer utilities {
+  .no-js .js-hidden {
+    @apply hidden
+  }
+
+  [x-cloak] {
+    @apply hidden
+  }
+
+  @responsive {
+    .first-of-type\:mt-0:first-of-type {
+      @apply mt-0 !important
+    }
+  }
+}
diff --git a/web/themes/custom/opdavies/assets/css/utilities/first-of-type.pcss b/web/themes/custom/opdavies/assets/css/utilities/first-of-type.pcss
deleted file mode 100644
index 78beb00..0000000
--- a/web/themes/custom/opdavies/assets/css/utilities/first-of-type.pcss
+++ /dev/null
@@ -1,7 +0,0 @@
-@layer utilities {
-  @responsive {
-    .first-of-type\:mt-0:first-of-type {
-      @apply mt-0 !important
-    }
-  }
-}
diff --git a/web/themes/custom/opdavies/assets/css/utilities/js-hidden.pcss b/web/themes/custom/opdavies/assets/css/utilities/js-hidden.pcss
deleted file mode 100644
index bc05e97..0000000
--- a/web/themes/custom/opdavies/assets/css/utilities/js-hidden.pcss
+++ /dev/null
@@ -1,5 +0,0 @@
-@layer utilities {
-  .no-js .js-hidden {
-    display: none
-  } 
-}
diff --git a/web/themes/custom/opdavies/assets/css/utilities/x-cloak.pcss b/web/themes/custom/opdavies/assets/css/utilities/x-cloak.pcss
deleted file mode 100644
index 8cf0e3e..0000000
--- a/web/themes/custom/opdavies/assets/css/utilities/x-cloak.pcss
+++ /dev/null
@@ -1,3 +0,0 @@
-[x-cloak] {
-  @apply hidden
-}