diff --git a/web/themes/custom/opdavies/assets/css/custom-components.pcss b/web/themes/custom/opdavies/assets/css/custom-components.pcss
deleted file mode 100644
index 86ad2b5..0000000
--- a/web/themes/custom/opdavies/assets/css/custom-components.pcss
+++ /dev/null
@@ -1,11 +0,0 @@
-@import './components/block.pcss';
-@import './components/button.pcss';
-@import './components/container.pcss';
-@import './components/lead.pcss';
-@import './components/logo.pcss';
-@import './components/note.pcss';
-@import './components/recommendation.pcss';
-@import './components/table.pcss';
-@import './components/video.pcss';
-@import './components/widget.pcss';
-@import './components/wrap.pcss';
diff --git a/web/themes/custom/opdavies/assets/css/tailwind.pcss b/web/themes/custom/opdavies/assets/css/tailwind.pcss
index 007a864..661595d 100644
--- a/web/themes/custom/opdavies/assets/css/tailwind.pcss
+++ b/web/themes/custom/opdavies/assets/css/tailwind.pcss
@@ -2,7 +2,7 @@
 @import './custom-base.pcss';
 
 @import 'tailwindcss/components';
-@import './custom-components.pcss';
+@import './components/*.pcss';
 
 @import './libraries/hljs.pcss';
 
diff --git a/web/themes/custom/opdavies/package-lock.json b/web/themes/custom/opdavies/package-lock.json
index 8e61528..eb38196 100644
--- a/web/themes/custom/opdavies/package-lock.json
+++ b/web/themes/custom/opdavies/package-lock.json
@@ -6571,6 +6571,58 @@
         "postcss": "^7.0.0"
       }
     },
+    "postcss-easy-import": {
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-easy-import/-/postcss-easy-import-3.0.0.tgz",
+      "integrity": "sha512-cfNsear/v8xlkl9v5Wm8y4Do/puiDQTFF+WX2Fo++h7oKt1fKWVVW/5Ca8hslYDQWnjndrg813cA23Pt1jsYdg==",
+      "dev": true,
+      "requires": {
+        "globby": "^6.1.0",
+        "is-glob": "^4.0.0",
+        "lodash": "^4.17.4",
+        "object-assign": "^4.0.1",
+        "pify": "^3.0.0",
+        "postcss": "^6.0.11",
+        "postcss-import": "^10.0.0",
+        "resolve": "^1.1.7"
+      },
+      "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "pify": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-3.0.0.tgz",
+          "integrity": "sha1-5aSs0sEB/fPZpNB/DbxNtJ3SgXY=",
+          "dev": true
+        },
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
+        }
+      }
+    },
     "postcss-functions": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/postcss-functions/-/postcss-functions-3.0.0.tgz",
@@ -6620,22 +6672,51 @@
       }
     },
     "postcss-import": {
-      "version": "12.0.1",
-      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-12.0.1.tgz",
-      "integrity": "sha512-3Gti33dmCjyKBgimqGxL3vcV8w9+bsHwO5UrBawp796+jdardbcFl4RP5w/76BwNL7aGzpKstIfF9I+kdE8pTw==",
+      "version": "10.0.0",
+      "resolved": "https://registry.npmjs.org/postcss-import/-/postcss-import-10.0.0.tgz",
+      "integrity": "sha1-TIXJewmRNsxeoCQNwd/b/eTi674=",
       "dev": true,
       "requires": {
-        "postcss": "^7.0.1",
+        "object-assign": "^4.0.1",
+        "postcss": "^6.0.1",
         "postcss-value-parser": "^3.2.3",
         "read-cache": "^1.0.0",
         "resolve": "^1.1.7"
       },
       "dependencies": {
+        "chalk": {
+          "version": "2.4.2",
+          "resolved": "https://registry.npmjs.org/chalk/-/chalk-2.4.2.tgz",
+          "integrity": "sha512-Mti+f9lpJNcwF4tWV8/OrTTtF1gZi+f8FqlyAdouralcFWFQWF2+NgCHShjkCb+IFBLq9buZwE1xckQU4peSuQ==",
+          "dev": true,
+          "requires": {
+            "ansi-styles": "^3.2.1",
+            "escape-string-regexp": "^1.0.5",
+            "supports-color": "^5.3.0"
+          }
+        },
+        "postcss": {
+          "version": "6.0.23",
+          "resolved": "https://registry.npmjs.org/postcss/-/postcss-6.0.23.tgz",
+          "integrity": "sha512-soOk1h6J3VMTZtVeVpv15/Hpdl2cBLX3CAw4TAbkpTJiNPk9YP/zWcD1ND+xEtvyuuvKzbxliTOIyvkSeSJ6ag==",
+          "dev": true,
+          "requires": {
+            "chalk": "^2.4.1",
+            "source-map": "^0.6.1",
+            "supports-color": "^5.4.0"
+          }
+        },
         "postcss-value-parser": {
           "version": "3.3.1",
           "resolved": "https://registry.npmjs.org/postcss-value-parser/-/postcss-value-parser-3.3.1.tgz",
           "integrity": "sha512-pISE66AbVkp4fDQ7VHBwRNXzAAKJjw4Vw7nWI/+Q3vuly7SNfgYXvm6i5IgFylHGK5sP/xHAbB7N49OS4gWNyQ==",
           "dev": true
+        },
+        "source-map": {
+          "version": "0.6.1",
+          "resolved": "https://registry.npmjs.org/source-map/-/source-map-0.6.1.tgz",
+          "integrity": "sha512-UjgapumWlbMhkBgzT7Ykc5YXUT46F0iKu8SGXq0bcwP5dz/h0Plj6enJqjz1Zbq2l5WaqYnrVbwWOWMyF3F47g==",
+          "dev": true
         }
       }
     },
diff --git a/web/themes/custom/opdavies/package.json b/web/themes/custom/opdavies/package.json
index 141baa5..9892277 100644
--- a/web/themes/custom/opdavies/package.json
+++ b/web/themes/custom/opdavies/package.json
@@ -14,7 +14,7 @@
     "autoprefixer": "^9.8.0",
     "elliptic": ">=6.5.3",
     "lodash": ">=4.17.19",
-    "postcss-import": "^12.0.1",
+    "postcss-easy-import": "^3.0.0",
     "postcss-loader": "^3.0.0",
     "postcss-nested": "^4.2.1",
     "tailwindcss": "^1.8.10",
diff --git a/web/themes/custom/opdavies/postcss.config.js b/web/themes/custom/opdavies/postcss.config.js
index 62550eb..570c449 100644
--- a/web/themes/custom/opdavies/postcss.config.js
+++ b/web/themes/custom/opdavies/postcss.config.js
@@ -1,6 +1,8 @@
 module.exports = {
   plugins: [
-    require('postcss-import'),
+    require('postcss-easy-import')({
+      extensions: ['.css', '.pcss']
+    }),
     require('tailwindcss'),
     require('postcss-nested'),
     require('autoprefixer')