diff --git a/package.json b/package.json
index 3b1e0c9..14e9bf0 100644
--- a/package.json
+++ b/package.json
@@ -10,7 +10,7 @@
     "watch:eleventy": "eleventy --serve",
     "watch:sass": "npm run compile-sass -- --watch",
     "start": "npm-run-all copy-resources compile-sass --parallel watch:*",
-    "build": "npm run copy-resources && compile-sass && eleventy"
+    "build": "npm run copy-resources && npm run compile-sass && eleventy"
   },
   "author": "samuel-p",
   "repository": {
diff --git a/sites/de/404.md b/sites/de/404.md
new file mode 100644
index 0000000..6c7444c
--- /dev/null
+++ b/sites/de/404.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: 404
+title: Nicht gefunden
+---
+# Nicht gefunden
+
+Diese Seite existiert (noch) nicht. Schau später nochmal vorbei, oder fang von vorne an: [Home](/{{locale}}/)
diff --git a/sites/de/services.html b/sites/de/services.html
index 697f177..77db980 100644
--- a/sites/de/services.html
+++ b/sites/de/services.html
@@ -21,7 +21,7 @@ eleventyNavigation:
                 <a class="link" href="/{{locale}}/services/{{service.id}}"></a>
                 <div class="inner">
                     <i class="{{service.icon}} fa-4x"></i>
-                    <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}"><i
+                    <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
                             class="fas fa-external-link-alt"></i></a>{% endif %}</h2>
                     <div>{{service.summary[locale]}}</div>
                 </div>
diff --git a/sites/de/services/connectivitycheck.md b/sites/de/services/connectivitycheck.md
new file mode 100644
index 0000000..b3d4e43
--- /dev/null
+++ b/sites/de/services/connectivitycheck.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: connectivitycheck
+title: Captive Portal Check
+---
+# Captive Portal Check
+
+Die Beschreibung zum Captive Portal Check folgt in Kürze.
diff --git a/sites/de/services/firefox-sync.md b/sites/de/services/firefox-sync.md
new file mode 100644
index 0000000..d7647f6
--- /dev/null
+++ b/sites/de/services/firefox-sync.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: firefox-sync
+title: Firefox Sync
+---
+# Firefox Sync
+
+Die Beschreibung zu Firefox Sync folgt in Kürze.
diff --git a/sites/de/services/gitea.md b/sites/de/services/gitea.md
new file mode 100644
index 0000000..a404ca4
--- /dev/null
+++ b/sites/de/services/gitea.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: gitea
+title: Gitea
+---
+# Gitea
+
+Die Beschreibung zu Gitea folgt in Kürze.
diff --git a/sites/de/services/matrix.md b/sites/de/services/matrix.md
new file mode 100644
index 0000000..847c423
--- /dev/null
+++ b/sites/de/services/matrix.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: searx
+title: Searx
+---
+# Searx
+
+Die Beschreibung zu Searx folgt in Kürze.
diff --git a/sites/en/404.md b/sites/en/404.md
new file mode 100644
index 0000000..dafed38
--- /dev/null
+++ b/sites/en/404.md
@@ -0,0 +1,8 @@
+---
+layout: base.njk
+key: 404
+title: Not Found
+---
+# Not Found
+
+This page does not exist (yet). Come back later or take a look at the beginning: [Home](/{{locale}}/)
diff --git a/sites/en/services.html b/sites/en/services.html
index a0d7181..090a379 100644
--- a/sites/en/services.html
+++ b/sites/en/services.html
@@ -20,7 +20,7 @@ eleventyNavigation:
                 <a class="link" href="/{{locale}}/services/{{service.id}}"></a>
                 <div class="inner">
                     <i class="{{service.icon}} fa-4x"></i>
-                    <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}"><i
+                    <h2 class="mt-2">{{service.name}}{% if service.url %} <a href="{{service.url}}" target="_blank"><i
                             class="fas fa-external-link-alt"></i></a>{% endif %}</h2>
                     <div>{{service.summary[locale]}}</div>
                 </div>