diff --git a/ui-v2/app/styles/app.scss b/ui-v2/app/styles/app.scss
index 19fc521843..133fae6d46 100644
--- a/ui-v2/app/styles/app.scss
+++ b/ui-v2/app/styles/app.scss
@@ -1,21 +1,17 @@
 @charset 'utf-8';
-@import 'base/reset/index';
-@import 'base/index';
-@import 'variables/index';
+
+/* all variables and custom queries including generic base variables */
+@import 'variables';
 
 /*TODO: Move this to its own local component*/
 @import 'ember-power-select';
 /**/
 
-@import 'base/components/index';
-@import 'components/index';
-@import 'core/typography';
-@import 'core/layout';
-
-@import 'routes/dc/settings/index';
-@import 'routes/dc/services/index';
-@import 'routes/dc/nodes/index';
-@import 'routes/dc/intention/index';
-@import 'routes/dc/kv/index';
-@import 'routes/dc/acls/index';
-@import 'routes/dc/acls/tokens/index';
+/* all components including generic base components */
+@import 'components';
+/* cascading typography */
+@import 'typography';
+/* layouts */
+@import 'layout';
+/* pinpoint individual overwrites for those 'just on this page' problems */
+@import 'routes';
diff --git a/ui-v2/app/styles/components.scss b/ui-v2/app/styles/components.scss
new file mode 100644
index 0000000000..77337360c2
--- /dev/null
+++ b/ui-v2/app/styles/components.scss
@@ -0,0 +1,52 @@
+@import './base/components/index';
+
+/**/
+
+@import './components/card/index';
+@import './components/form-elements';
+@import './components/breadcrumbs';
+@import './components/anchors';
+@import './components/progress';
+@import './components/buttons';
+@import './components/composite-row';
+@import './components/secret-button';
+@import './components/tabs';
+@import './components/pill';
+@import './components/table';
+@import './components/tooltip';
+@import './components/tag-list';
+@import './components/healthcheck-output';
+@import './components/healthcheck-info';
+@import './components/healthchecked-resource';
+@import './components/freetext-filter';
+@import './components/filter-bar';
+@import './components/tomography-graph';
+@import './components/flash-message';
+@import './components/code-editor';
+@import './components/confirmation-dialog';
+@import './components/modal-dialog';
+@import './components/auth-form';
+@import './components/auth-modal';
+@import './components/notice';
+@import './components/oidc-select';
+@import './components/discovery-chain';
+@import './components/empty-state';
+@import './components/tabular-details';
+@import './components/tabular-collection';
+@import './components/list-collection';
+@import './components/grid-collection';
+@import './components/popover-select';
+@import './components/tooltip-panel';
+@import './components/menu-panel';
+@import './components/more-popover-menu';
+@import './components/confirmation-alert';
+@import './components/definition-table';
+
+/**/
+
+@import './components/brand-loader';
+@import './components/loader';
+@import './components/main-header-horizontal';
+@import './components/main-nav-horizontal';
+@import './components/app-view';
+@import './components/footer';
diff --git a/ui-v2/app/styles/components/index.scss b/ui-v2/app/styles/components/index.scss
deleted file mode 100644
index a46f0417e1..0000000000
--- a/ui-v2/app/styles/components/index.scss
+++ /dev/null
@@ -1,48 +0,0 @@
-@import './card/index';
-@import './form-elements';
-@import './breadcrumbs';
-@import './anchors';
-@import './progress';
-@import './buttons';
-@import './composite-row';
-@import './secret-button';
-@import './tabs';
-@import './pill';
-@import './table';
-@import './tooltip';
-@import './tag-list';
-@import './healthcheck-output';
-@import './healthcheck-info';
-@import './healthchecked-resource';
-@import './freetext-filter';
-@import './filter-bar';
-@import './tomography-graph';
-@import './flash-message';
-@import './code-editor';
-@import './confirmation-dialog';
-@import './modal-dialog';
-@import './auth-form';
-@import './auth-modal';
-@import './notice';
-@import './oidc-select';
-@import './discovery-chain';
-@import './empty-state';
-@import './tabular-details';
-@import './tabular-collection';
-@import './list-collection';
-@import './grid-collection';
-@import './popover-select';
-@import './tooltip-panel';
-@import './menu-panel';
-@import './more-popover-menu';
-@import './confirmation-alert';
-@import './definition-table';
-
-/**/
-
-@import './brand-loader';
-@import './loader';
-@import './main-header-horizontal';
-@import './main-nav-horizontal';
-@import './app-view';
-@import './footer';
diff --git a/ui-v2/app/styles/components/phrase-editor.scss b/ui-v2/app/styles/components/phrase-editor.scss
deleted file mode 100644
index b7852453a1..0000000000
--- a/ui-v2/app/styles/components/phrase-editor.scss
+++ /dev/null
@@ -1,4 +0,0 @@
-@import './phrase-editor/index';
-.phrase-editor {
-  @extend %phrase-editor;
-}
diff --git a/ui-v2/app/styles/core/layout.scss b/ui-v2/app/styles/layout.scss
similarity index 97%
rename from ui-v2/app/styles/core/layout.scss
rename to ui-v2/app/styles/layout.scss
index d6dc5acf26..2cd29bd199 100644
--- a/ui-v2/app/styles/core/layout.scss
+++ b/ui-v2/app/styles/layout.scss
@@ -1,4 +1,4 @@
-@import '../layouts/index';
+@import 'layouts/index';
 
 // TODO: This shouldn't be done here, decide the best way to do this
 // %main-decoration ? %main-skin ? %content-skin ?
diff --git a/ui-v2/app/styles/routes.scss b/ui-v2/app/styles/routes.scss
new file mode 100644
index 0000000000..31a81ff15b
--- /dev/null
+++ b/ui-v2/app/styles/routes.scss
@@ -0,0 +1,7 @@
+@import 'routes/dc/settings/index';
+@import 'routes/dc/services/index';
+@import 'routes/dc/nodes/index';
+@import 'routes/dc/intention/index';
+@import 'routes/dc/kv/index';
+@import 'routes/dc/acls/index';
+@import 'routes/dc/acls/tokens/index';
diff --git a/ui-v2/app/styles/core/typography.scss b/ui-v2/app/styles/typography.scss
similarity index 99%
rename from ui-v2/app/styles/core/typography.scss
rename to ui-v2/app/styles/typography.scss
index d6e7724bcf..6500029f8c 100644
--- a/ui-v2/app/styles/core/typography.scss
+++ b/ui-v2/app/styles/typography.scss
@@ -41,7 +41,6 @@ pre code,
 %notice p,
 %flash-message p,
 %filter-bar input,
-%phrase-editor input,
 %tab-section p {
   @extend %p1;
 }
diff --git a/ui-v2/app/styles/variables.scss b/ui-v2/app/styles/variables.scss
new file mode 100644
index 0000000000..59a02ce99d
--- /dev/null
+++ b/ui-v2/app/styles/variables.scss
@@ -0,0 +1,4 @@
+@import './base/reset/index';
+@import './base/index';
+@import './variables/custom-query';
+@import './variables/skin';
diff --git a/ui-v2/app/styles/variables/index.scss b/ui-v2/app/styles/variables/skin.scss
similarity index 100%
rename from ui-v2/app/styles/variables/index.scss
rename to ui-v2/app/styles/variables/skin.scss