diff --git a/addon/components/api/x-toggles/template.hbs b/addon/components/api/x-toggles/template.hbs
index a7c36d430..12f67c86a 100644
--- a/addon/components/api/x-toggles/template.hbs
+++ b/addon/components/api/x-toggles/template.hbs
@@ -1,4 +1,4 @@
-<ul class="docs-mb-6">
+<ul class="docs-mb-6 docs-list-none">
   {{#each-in toggles as |key toggle|}}
     {{#if (not-eq toggle undefined)}}
       <li class="docs-inline docs-ml-4">
diff --git a/addon/components/docs-header/search-results/template.hbs b/addon/components/docs-header/search-results/template.hbs
index aaa7a4198..5d5c367d5 100644
--- a/addon/components/docs-header/search-results/template.hbs
+++ b/addon/components/docs-header/search-results/template.hbs
@@ -7,7 +7,7 @@
     targetAttachment="bottom left"
     constraints=(array (hash to="window" attachment="together" pin=true))}}
 
-    <ul class="docs-w-76 docs-bg-white docs-shadow-md" data-test-search-result-list>
+    <ul class="docs-list-none docs-w-76 docs-bg-white docs-shadow-md" data-test-search-result-list>
       {{#each (take 5 searchResults) as |result index|}}
         <li>
           {{docs-header/search-result
diff --git a/addon/components/docs-header/version-selector/template.hbs b/addon/components/docs-header/version-selector/template.hbs
index 245fc5c84..fc481a8ad 100644
--- a/addon/components/docs-header/version-selector/template.hbs
+++ b/addon/components/docs-header/version-selector/template.hbs
@@ -4,7 +4,7 @@
   clickOutsideToClose=true
   onClose=(action on-close)
   targetAttachment="bottom right"}}
-  <ul class="docs-mt-2 docs-bg-white docs-shadow-md docs-text-xs docs-rounded docs-z-10">
+  <ul class="docs-list-none docs-mt-2 docs-bg-white docs-shadow-md docs-text-xs docs-rounded docs-z-10">
     {{#each sortedVersions as |version|}}
       <li data-test-id="version">
         <a {{action "changeVersion" version}} href="#"
diff --git a/addon/components/docs-viewer/x-current-page-index/template.hbs b/addon/components/docs-viewer/x-current-page-index/template.hbs
index c6e7a0d85..64441f13d 100644
--- a/addon/components/docs-viewer/x-current-page-index/template.hbs
+++ b/addon/components/docs-viewer/x-current-page-index/template.hbs
@@ -1,6 +1,6 @@
 <nav class="AddonDocs-DocsViewer-CurrentPageIndex docs-hidden xl:docs-block docs-flex-no-shrink docs-mr-auto" data-test-current-page-index>
   <div class="docs-sticky docs-top-0 docs-pt-4 docs-pb-8 docs-pr-8 docs-max-h-screen docs-overflow-y-scroll">
-    <ul class="docs-border-l docs-border-grey-lighter docs-pl-6 docs-leading-normal">
+    <ul class="docs-list-none docs-border-l docs-border-grey-lighter docs-pl-6 docs-leading-normal">
       {{#if pageIndex.length}}
         <li class="docs-mt-12 docs-text-grey docs-font-bold docs-tracking-wide docs-uppercase docs-text-xxs">
           On This Page
diff --git a/addon/components/docs-viewer/x-nav-list/component.js b/addon/components/docs-viewer/x-nav-list/component.js
index fbcee4154..db1bd163c 100644
--- a/addon/components/docs-viewer/x-nav-list/component.js
+++ b/addon/components/docs-viewer/x-nav-list/component.js
@@ -4,6 +4,8 @@ import { hbs } from 'ember-cli-htmlbars';
 export default Component.extend({
   tagName: 'ul',
 
+  classNames: ['docs-list-none'],
+
   layout: hbs`
     {{yield (hash
       item=(component 'docs-viewer/x-nav-item')
diff --git a/addon/styles/tailwind.config.js b/addon/styles/tailwind.config.js
index cf8558b31..f0ddc970a 100644
--- a/addon/styles/tailwind.config.js
+++ b/addon/styles/tailwind.config.js
@@ -834,7 +834,9 @@ module.exports = {
   plugins: [],
 
   corePlugins: {
-    container: false
-  },
-
+    container: false,
+    // @ifdef NO_BASE_STYLES
+    preflight: false
+    // @endif
+  }
 };
diff --git a/ember-cli-build.js b/ember-cli-build.js
index d9841df0d..0ee3a8bbb 100644
--- a/ember-cli-build.js
+++ b/ember-cli-build.js
@@ -4,6 +4,7 @@ const EmberAddon = require('ember-cli/lib/broccoli/ember-addon');
 const Project = require('ember-cli/lib/models/project');
 const MergeTrees = require('broccoli-merge-trees');
 const Funnel = require('broccoli-funnel');
+const preprocess = require('broccoli-preprocess-tree');
 
 module.exports = function(defaults) {
   let project = Project.closestSync(process.cwd());
@@ -43,9 +44,24 @@ module.exports = function(defaults) {
       filter: {
         enabled: false,
         plugins: []
-      },
+      }
+    }
+  });
+
+  let appTree = new Funnel(app.toTree(), {
+    exclude: ['addon/styles']
+  });
+
+  let styles = preprocess('addon/styles', {
+    context: {
+      NO_BASE_STYLES: true
     },
+    destDir: 'addon/styles'
   });
 
-  return app.toTree();
+  styles = new Funnel(styles, { destDir: 'addon/styles' });
+
+  appTree = new MergeTrees([appTree, styles]);
+
+  return appTree;
 };
diff --git a/package.json b/package.json
index 6376862e1..2e82c75d8 100644
--- a/package.json
+++ b/package.json
@@ -95,6 +95,7 @@
     "@ember/optional-features": "^1.0.0",
     "babel-eslint": "^10.0.3",
     "broccoli-asset-rev": "^3.0.0",
+    "broccoli-preprocess-tree": "^0.4.0",
     "chai": "^4.2.0",
     "common-tags": "^1.8.0",
     "ember-classy-page-object": "^0.5.0",
diff --git a/yarn.lock b/yarn.lock
index 3cd396c36..4fe918473 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -3224,6 +3224,18 @@ broccoli-postcss@^5.0.0:
     object-assign "^4.1.1"
     postcss "^7.0.5"
 
+broccoli-preprocess-tree@^0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/broccoli-preprocess-tree/-/broccoli-preprocess-tree-0.4.0.tgz#54440e29d829f721443ccfb6169520f6b73cf507"
+  integrity sha1-VEQOKdgp9yFEPM+2FpUg9rc89Qc=
+  dependencies:
+    broccoli-writer "^0.1.1"
+    copy-dereference "^1.0.0"
+    fs-extra "^0.30.0"
+    glob "^5.0.10"
+    lodash-node "^3.9.3"
+    preprocess "^2.1.1"
+
 broccoli-replace@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/broccoli-replace/-/broccoli-replace-0.12.0.tgz#36460a984c45c61731638c53068b0ab12ea8fdb7"
@@ -8582,6 +8594,11 @@ lodash-es@^4.17.11:
   resolved "https://registry.yarnpkg.com/lodash-es/-/lodash-es-4.17.15.tgz#21bd96839354412f23d7a10340e5eac6ee455d78"
   integrity sha512-rlrc3yU3+JNOpZ9zj5pQtxnx2THmvRykwL4Xlxoa8I9lHBlVbbyPhgyPMioxVZ4NqyxaVVtaJnzsyOidQIhyyQ==
 
+lodash-node@^3.9.3:
+  version "3.10.2"
+  resolved "https://registry.yarnpkg.com/lodash-node/-/lodash-node-3.10.2.tgz#2598d5b1b54e6a68b4cb544e5c730953cbf632f7"
+  integrity sha1-JZjVsbVOami0y1ROXHMJU8v2Mvc=
+
 lodash._baseassign@^3.0.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/lodash._baseassign/-/lodash._baseassign-3.2.0.tgz#8c38a099500f215ad09e59f1722fd0c52bfe0a4e"
@@ -10354,6 +10371,11 @@ prepend-http@^2.0.0:
   resolved "https://registry.yarnpkg.com/prepend-http/-/prepend-http-2.0.0.tgz#e92434bfa5ea8c19f41cdfd401d741a3c819d897"
   integrity sha1-6SQ0v6XqjBn0HN/UAddBo8gZ2Jc=
 
+preprocess@^2.1.1:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/preprocess/-/preprocess-2.3.1.tgz#bda3022e623e9b599d4c0828186d85bd9f12c500"
+  integrity sha1-vaMCLmI+m1mdTAgoGG2FvZ8SxQA=
+
 pretender@3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/pretender/-/pretender-3.1.0.tgz#d8d7cc8502a9dbda82346ea399b9c63e7012f584"