diff --git a/packages/ui-default/build/config/webpack.ts b/packages/ui-default/build/config/webpack.ts
index bbc530e79..de634e3f7 100644
--- a/packages/ui-default/build/config/webpack.ts
+++ b/packages/ui-default/build/config/webpack.ts
@@ -34,7 +34,7 @@ export default function (env: { watch?: boolean, production?: boolean, measure?:
   function postcssLoader() {
     return {
       loader: 'postcss-loader',
-      options: { postcssOptions: { sourceMap: env.production, config: root('postcss.config.js') } },
+      options: { postcssOptions: { sourceMap: false, config: root('postcss.config.js') } },
     };
   }
 
@@ -74,6 +74,8 @@ export default function (env: { watch?: boolean, production?: boolean, measure?:
       hydro: './entry.js',
       polyfill: './polyfill.ts',
       'default.theme': './theme/default.js',
+      'service-worker': './service-worker.ts',
+      'messages-shared-worker': './components/message/worker.ts',
     },
     cache: {
       type: 'filesystem',
diff --git a/packages/ui-default/components/message/index.page.ts b/packages/ui-default/components/message/index.page.ts
index f59e77d50..0d5dd1cb1 100644
--- a/packages/ui-default/components/message/index.page.ts
+++ b/packages/ui-default/components/message/index.page.ts
@@ -45,7 +45,7 @@ const endpoint = url.toString().replace('http', 'ws');
 const initWorkerMode = () => {
   console.log('Messages: using SharedWorker');
   // @ts-ignore
-  const worker = new SharedWorker(new URL('./worker?inline', import.meta.url), { name: 'HydroMessagesWorker' });
+  const worker = new SharedWorker('/message-shared-worker.js', { name: 'HydroMessagesWorker' });
   worker.port.start();
   window.addEventListener('beforeunload', () => {
     worker.port.postMessage({ type: 'unload' });
diff --git a/packages/ui-default/components/messagepad/reducers/activeId.js b/packages/ui-default/components/messagepad/reducers/activeId.ts
similarity index 100%
rename from packages/ui-default/components/messagepad/reducers/activeId.js
rename to packages/ui-default/components/messagepad/reducers/activeId.ts
diff --git a/packages/ui-default/components/messagepad/reducers/index.js b/packages/ui-default/components/messagepad/reducers/index.ts
similarity index 100%
rename from packages/ui-default/components/messagepad/reducers/index.js
rename to packages/ui-default/components/messagepad/reducers/index.ts
diff --git a/packages/ui-default/components/messagepad/reducers/isPosting.js b/packages/ui-default/components/messagepad/reducers/isPosting.ts
similarity index 100%
rename from packages/ui-default/components/messagepad/reducers/isPosting.js
rename to packages/ui-default/components/messagepad/reducers/isPosting.ts
diff --git a/packages/ui-default/entry.js b/packages/ui-default/entry.js
index a065836e7..08b540dd5 100644
--- a/packages/ui-default/entry.js
+++ b/packages/ui-default/entry.js
@@ -29,7 +29,7 @@ console.log(
 
 if ('serviceWorker' in navigator) {
   window.addEventListener('load', () => {
-    navigator.serviceWorker.register(new URL('./service-worker', import.meta.url)).then((registration) => {
+    navigator.serviceWorker.register('/service-worker.js').then((registration) => {
       console.log('SW registered: ', registration);
     }).catch((registrationError) => {
       console.log('SW registration failed: ', registrationError);