diff --git a/.npmignore b/.npmignore
index d9917bee2..274070bc1 100644
--- a/.npmignore
+++ b/.npmignore
@@ -3,4 +3,13 @@ config.json
 docker-compose.yml
 Dockerfile
 .vscode
-.github
\ No newline at end of file
+.github
+.uibuild
+templates
+ui
+locales
+module
+hydro
+build
+tool
+.build/install.js
diff --git a/hydro/service/server.js b/hydro/service/server.js
index f3768a221..0870e7fa4 100644
--- a/hydro/service/server.js
+++ b/hydro/service/server.js
@@ -306,7 +306,8 @@ function Route(route, RouteHandler, permission = null) {
                 domainId: 'system', ...ctx.params, ...ctx.query, ...ctx.request.body,
             };
             if (h.request.host !== await system.get('server.host')) {
-                args.domainId = h.request.url.split('//')[1].split(`.${await system.get('server.host')}`)[0] || '';
+                args.domainId = (h.request.url.split('//')[1] || '')
+                    .split(`.${await system.get('server.host')}`)[0] || 'system';
             }
 
             if (h.___prepare) await h.___prepare(args);
diff --git a/hydro/service/setup.js b/hydro/service/setup.js
index d23dd848c..2ceece936 100644
--- a/hydro/service/setup.js
+++ b/hydro/service/setup.js
@@ -11,9 +11,70 @@ const mongodb = require('mongodb');
 
 class Loader {
     getSource(name) { // eslint-disable-line class-methods-use-this
-        if (!global.Hydro.template[name]) throw new Error(`Cannot get template ${name}`);
         return {
-            src: global.Hydro.template[name],
+            src: `
+            <!DOCTYPE html>
+            <html data-page="setup" data-layout="immersive" class="layout--immersive page--setup nojs">
+            <head>
+              <meta charset="UTF-8">
+              <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
+              <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
+              <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
+              <meta name="msapplication-TileColor" content="#579e9a">
+              <meta name="theme-color" content="#56758f">
+              <link rel="stylesheet" media="all" href="/vj4.css">
+              <title>{{ _('Setup') }}</title>
+            </head>
+            <body>
+            <div class="slideout-panel" id="panel">
+              <div class="main">
+                <div class="row"><div class="columns">
+                <div class="immersive--content immersive--center">
+                  <h1>{{ _('Setup') }}</h1>
+                  <form method="POST">
+                    <div class="row"><div class="columns">
+                      <label class="inverse material textbox">
+                        {{ _('Database Host') }}
+                        <input name="host" type="text" value="127.0.0.1" autofocus>
+                      </label>
+                    </div></div>
+                    <div class="row"><div class="columns">
+                      <label class="inverse material textbox">
+                        {{ _('Database Port') }}
+                        <input name="port" type="number" value="27017">
+                      </label>
+                    </div></div>
+                    <div class="row"><div class="columns">
+                      <label class="inverse material textbox">
+                        {{ _('Database Name') }}
+                        <input name="name" type="text" value="hydro">
+                      </label>
+                    </div></div>
+                    <div class="row"><div class="columns">
+                      <label class="inverse material textbox">
+                        {{ _('Database Username') }}
+                        <input name="username" type="text" placeholder="{{ _('Leave blank if none') }}">
+                      </label>
+                    </div></div>
+                    <div class="row"><div class="columns">
+                      <label class="inverse material textbox">
+                        {{ _('Database Password') }}
+                        <input name="password" type="password" placeholder="{{ _('Leave blank if none') }}">
+                      </label>
+                    </div></div>
+                    <div class="row"><div class="columns">
+                      <div class="text-center">
+                        <input type="submit" value="{{ _('Confirm') }}" class="inverse expanded rounded primary button">
+                      </div>
+                    </div></div>
+                  </form>
+                </div>
+                </div></div>
+              </div>
+            </div>
+            </body>
+            </html>
+            `,
             path: name,
         };
     }
@@ -95,6 +156,7 @@ async function setup() {
             else resolve();
         });
     });
+    console.log('Done! Please restart.');
 }
 
 module.exports = { setup };
diff --git a/package.json b/package.json
index 1b856af3e..303a1c1c1 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
-    "name": "hydro",
-    "version": "2.1.0",
-    "main": "hydro/development.js",
+    "name": "hydrooj",
+    "version": "2.1.1",
+    "main": "hydro/loader.js",
     "repository": "https://github.com/hydro-dev/Hydro.git",
     "author": "masnn",
     "license": "GPL-3.0-only",
diff --git a/templates/setup.html b/templates/setup.html
deleted file mode 100644
index 9b2e16ec6..000000000
--- a/templates/setup.html
+++ /dev/null
@@ -1,65 +0,0 @@
-<!DOCTYPE html>
-<html data-page="setup" data-layout="immersive" class="layout--immersive page--setup nojs">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-  <meta http-equiv="X-UA-Compatible" content="chrome=1"/>
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1" />
-  <meta name="msapplication-TileColor" content="#579e9a">
-  <meta name="theme-color" content="#56758f">
-  <link rel="stylesheet" media="all" href="/vj4.css">
-  <title>{{ _('Setup') }}</title>
-  <script>
-    var _htmlNode = document.documentElement;
-    _htmlNode.className = _htmlNode.className.replace(' nojs', ' hasjs');
-  </script>
-</head>
-<body>
-<div class="slideout-panel" id="panel">
-  <div class="main">
-    <div class="row"><div class="columns">
-    <div class="immersive--content immersive--center">
-      <h1>{{ _('Setup') }}</h1>
-      <form method="POST">
-        <div class="row"><div class="columns">
-          <label class="inverse material textbox">
-            {{ _('Database Host') }}
-            <input name="host" type="text" value="127.0.0.1" autofocus>
-          </label>
-        </div></div>
-        <div class="row"><div class="columns">
-          <label class="inverse material textbox">
-            {{ _('Database Port') }}
-            <input name="port" type="number" value="27017">
-          </label>
-        </div></div>
-        <div class="row"><div class="columns">
-          <label class="inverse material textbox">
-            {{ _('Database Name') }}
-            <input name="name" type="text" value="hydro">
-          </label>
-        </div></div>
-        <div class="row"><div class="columns">
-          <label class="inverse material textbox">
-            {{ _('Database Username') }}
-            <input name="username" type="text" placeholder="{{ _('Leave blank if none') }}">
-          </label>
-        </div></div>
-        <div class="row"><div class="columns">
-          <label class="inverse material textbox">
-            {{ _('Database Password') }}
-            <input name="password" type="password" placeholder="{{ _('Leave blank if none') }}">
-          </label>
-        </div></div>
-        <div class="row"><div class="columns">
-          <div class="text-center">
-            <input type="submit" value="{{ _('Confirm') }}" class="inverse expanded rounded primary button">
-          </div>
-        </div></div>
-      </form>
-    </div>
-    </div></div>
-  </div>
-</div>
-</body>
-</html>