diff --git a/src/globals.ts b/src/globals.ts
index 6b3b364d..17a14a40 100644
--- a/src/globals.ts
+++ b/src/globals.ts
@@ -1,11 +1,8 @@
-// AI generated as a solution to cannot find SolidLogic 
-// Must be imported BEFORE solid-ui / solid-panes.
-// Their prebuilt bundles treat `solid-logic` (and `rdflib`) as UMD externals
-// with `root: "SolidLogic"` / `root: "$rdf"`, so the globals must exist on
-// `window` at module-evaluation time, not after all imports have run.
 import * as $rdf from 'rdflib'
 import * as SolidLogic from 'solid-logic'
+import * as UI from 'solid-ui'
 
 const w: any = window
 w.$rdf = $rdf
 w.SolidLogic = SolidLogic
+w.UI = UI
diff --git a/src/index.ts b/src/index.ts
index 7c802d44..50944bff 100644
--- a/src/index.ts
+++ b/src/index.ts
@@ -7,13 +7,11 @@ import './globals'
 import * as $rdf from 'rdflib'
 import * as SolidLogic from 'solid-logic'
 import type { RenderEnvironment } from 'pane-registry'
-import'solid-ui/components/header'
+import 'solid-ui/components/header'
 import * as panes from 'solid-panes'
 import { layout } from './layout'
 import { theme } from './theme'
 import versionInfo from './versionInfo'
-import 'solid-ui/design-system.css'
-import 'solid-ui/primitives.css'
 import './styles/mash.css'
 
 const global: any = window
diff --git a/src/styles/mash.css b/src/styles/mash.css
index baca80a9..4b41d573 100644
--- a/src/styles/mash.css
+++ b/src/styles/mash.css
@@ -1,3 +1,5 @@
+@import "solid-ui";
+
 /*  
 ** ------SolidOS Styles------
 **
diff --git a/webpack.config.mjs b/webpack.config.mjs
index a0de7e6d..005f541b 100644
--- a/webpack.config.mjs
+++ b/webpack.config.mjs
@@ -12,9 +12,7 @@ const WORKSPACE_RESOLUTION_MODE = 'workspace'
 const packageAliases = {
   'rdflib': path.resolve('./node_modules/rdflib'),
   'solid-logic': path.resolve('./node_modules/solid-logic'),
-  'solid-ui$': path.resolve('./node_modules/solid-ui/dist/solid-ui.esm.js'),
-  'UI$': path.resolve('./node_modules/solid-ui/dist/solid-ui.esm.js'),
-  'solid-ui/components/header$': path.resolve('./node_modules/solid-ui/dist/components/header/index.esm.js'),
+  'UI$': path.resolve('./node_modules/solid-ui/dist/index.esm.js'),
   'solid-panes$': path.resolve('./node_modules/solid-panes/dist/index.js'),
   'pane-registry': path.resolve('./node_modules/pane-registry'),
   '$rdf': path.resolve('./node_modules/rdflib'),
@@ -23,9 +21,7 @@ const packageAliases = {
 
 const workspaceAliases = {
   'solid-panes$': path.resolve('../solid-panes/src/index.ts'),
-  'solid-ui$': path.resolve('../solid-ui/src/index.ts'),
-  'UI$': path.resolve('../solid-ui/src/index.ts'),
-  'solid-ui/components/header$': path.resolve('../solid-ui/src/v2/components/layout/header/index.ts'),
+  'UI$': path.resolve('../solid-ui/dist/index.cjs.js'),
 }
 
 function getResolutionMode (env = {}) {