diff --git a/public/404.html b/404.html
similarity index 85%
rename from public/404.html
rename to 404.html
index 3fecd6ac..e87399de 100644
--- a/public/404.html
+++ b/404.html
@@ -1,9 +1,9 @@
 <!DOCTYPE html>
 <html lang="en">
 <head>
-  <title>SUI2</title>
+  <title>{{title}}</title>
   <meta charset="utf-8">
-  <meta name="description" content="a startpage for your server and / or new tab page">
+  <meta name="description" content="{{description}}">
   <meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
   <link rel="shortcut icon" href="/icon-512.png" type="image/png">
   <style>
diff --git a/data.example.json b/data.example.json
index 928fb24f..c6e0b5c0 100644
--- a/data.example.json
+++ b/data.example.json
@@ -1,4 +1,6 @@
 {
+  "title": "SUI2",
+  "description": "a startpage for your server and / or new tab page",
   "apps" : [
     {
       "name": "Cloud",
diff --git a/index.html b/index.html
index 69eced14..7bcb07af 100755
--- a/index.html
+++ b/index.html
@@ -1,10 +1,10 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 
 <head>
-  <title>SUI2</title>
+  <title>{{title}}</title>
   <meta charset="utf-8">
-  <meta name="description" content="a startpage for your server and / or new tab page">
+  <meta name="description" content="{{description}}">
   <meta content="width=device-width, initial-scale=1.0, minimum-scale=1.0, maximum-scale=1.0, user-scalable=no" name="viewport" />
   <link rel="shortcut icon" href="/icon-512.png" type="image/png">
   <link rel="stylesheet" href="/scss/styles.scss" />
@@ -39,7 +39,7 @@ <h2>Color themes</h2>
       </div>
 
       <footer>
-        Project: <a href="https://github.com/reorx/sui2">reorx/suis</a>
+        Project: <a href="https://github.com/reorx/sui2">reorx/sui2</a>
         Icons: <a href="https://icon-sets.iconify.design/mdi/">Iconify MDI</a>
       </footer>
     </div>
diff --git a/live-server/app.js b/live-server/app.js
index 37db6deb..eb90ea1c 100644
--- a/live-server/app.js
+++ b/live-server/app.js
@@ -54,7 +54,8 @@ if (!fs.existsSync(dataFilePath)) {
   fs.copyFileSync(path.resolve(buildDir, 'data.example.json'), dataFilePath)
 }
 
-if (!fs.existsSync(path.resolve(outDir, 'index.html'))) {
+if (!fs.existsSync(path.resolve(outDir, 'index.html')) &&
+    !fs.existsSync(path.resolve(outDir, '404.html'))) {
   console.log('run initial build')
   buildStartpage((err, stdout, stderr) => {
     if (err) {
diff --git a/live-server/editor/index.html b/live-server/editor/index.html
index f5bbd1b0..6321fcc6 100644
--- a/live-server/editor/index.html
+++ b/live-server/editor/index.html
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
   <meta charset="UTF-8">
   <meta http-equiv="X-UA-Compatible" content="IE=edge">
@@ -12,7 +12,7 @@
   <div class="main">
     <div class="left">
       <div class="header">
-        <h2>SUI Live Editor</h2>
+        <h2>SUI2 Live Editor</h2>
         <button class="fn-build">Build</button>
       </div>
       <div class="editor"></div>
diff --git a/live-server/vite.config.js b/live-server/vite.config.js
index 6fa1a2e6..fec6824c 100644
--- a/live-server/vite.config.js
+++ b/live-server/vite.config.js
@@ -9,6 +9,7 @@ export default defineConfig({
     rolupOptions: {
       input: {
         main: resolve(__dirname, 'index.html'),
+        page404: resolve(__dirname, '404.html'),
       },
     },
   },
diff --git a/vite.config.js b/vite.config.js
index 5a271e3e..062d7ffe 100644
--- a/vite.config.js
+++ b/vite.config.js
@@ -60,6 +60,7 @@ export default defineConfig({
     rollupOptions: {
       input: {
         main: resolve(__dirname, 'index.html'),
+        page404: resolve(__dirname, '404.html'),
       },
     },
   },
