diff --git a/components/layout.tsx b/components/layout.tsx
index 67a1dbe..b41b42d 100644
--- a/components/layout.tsx
+++ b/components/layout.tsx
@@ -11,12 +11,12 @@ const Layout = ({ children }: { children: React.ReactNode }) => {
         var _paq = window._paq = window._paq || [];
         /* tracker methods like "setCustomDimension" should be called before "trackPageView" */
         _paq.push(["setDocumentTitle", document.domain + "/" + document.title]);
-        _paq.push(["setCookieDomain", "www.neshura-server.net"]);
+        _paq.push(["setCookieDomain", "www.neshweb.net"]);
         _paq.push(["disableCookies"]);
         _paq.push(['trackPageView']);
         _paq.push(['enableLinkTracking']);
         (function() {
-          var u="//tracking.neshura-server.net/";
+          var u="//tracking.neshweb.net/";
           _paq.push(['setTrackerUrl', u+'matomo.php']);
           _paq.push(['setSiteId', '2']);
           var d=document, g=d.createElement('script'), s=d.getElementsByTagName('script')[0];
diff --git a/components/navbar.tsx b/components/navbar.tsx
index e3011ef..8cc425d 100644
--- a/components/navbar.tsx
+++ b/components/navbar.tsx
@@ -19,8 +19,8 @@ const Navbar = () => {
           <a className={router.pathname == item.href ? styles.navelem_active : styles.navelem}>{item.name}</a>
         </Link>
       ))}
-      <Link key="Mastodon_Verify" href="https://mastodon.neshura-server.net/@neshura">
-        <a className={styles.navelem} rel="me" href="https://mastodon.neshura-server.net/@neshura">Mastodon</a>
+      <Link key="Mastodon_Verify" href="https://mastodon.neshweb.net/@neshura">
+        <a className={styles.navelem} rel="me" href="https://mastodon.neshweb.net/@neshura">Mastodon</a>
       </Link>
       
     </nav>
diff --git a/public/pages.json b/public/pages.json
index e2e8d59..b97f0da 100644
--- a/public/pages.json
+++ b/public/pages.json
@@ -3,7 +3,7 @@
     {
       "name": "Nextcloud",
       "icon": "/icons/nextcloud-logo.svg",
-      "href": "https://nextcloud.neshura-server.net",
+      "href": "https://nextcloud.neshweb.net",
       "desc": "Self-hosted Cloud Storage Service",
       "warn": "Note: Registration requires approval",
       "type": "docker",
@@ -13,7 +13,7 @@
     {
       "name": "Komga",
       "icon": "/icons/komga-logo.png",
-      "href": "https://komga.neshura-server.net",
+      "href": "https://komga.neshweb.net",
       "desc": "Self-hosted Comic Library",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
@@ -23,7 +23,7 @@
     {
       "name": "Calibre Web",
       "icon": "/icons/calibre-logo.ico",
-      "href": "https://calibre.neshura-server.net/",
+      "href": "https://calibre.neshweb.net/",
       "desc": "Self-hosted Ebook Library Service",
       "warn": "Note: Registration only via Admin",
       "type": "app",
@@ -32,7 +32,7 @@
     {
       "name": "PeerTube",
       "icon": "/icons/peertube-logo.svg",
-      "href": "https://tube.neshura-server.net",
+      "href": "https://tube.neshweb.net",
       "desc": "Self-hosted PeerTube Instance",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
@@ -42,7 +42,7 @@
     {
       "name": "Mastodon",
       "icon": "/icons/mastodon-logo.svg",
-      "href": "https://mastodon.neshura-server.net",
+      "href": "https://mastodon.neshweb.net",
       "desc": "Self-hosted Mastodon Instance",
       "warn": "Note: Registration requires approval",
       "type": "docker",
@@ -51,36 +51,17 @@
     },
     {
       "name": "File Browser",
-      "href": "https://files.neshura-server.net/",
+      "href": "https://files.neshweb.net/",
       "desc": "Server File Browser",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
       "docker_container_name": "filebrowser",
       "location": "brr7-4800u"
     },
-    {
-      "name": "Matrix",
-      "href": "https://matrix.neshura-server.net/",
-      "desc": "Open-Source, Decentralized Chat Protocol",
-      "warn": "Note: Registration only via Admin",
-      "type": "docker",
-      "docker_container_name": "synapse",
-      "location": "brr7-4800u"
-    },
-    {
-      "name": "Element",
-      "icon": "/icons/element-logo.svg",
-      "href": "https://element.neshura-server.net/",
-      "desc": "Matrix Chat Client",
-      "warn": "Note: Registration requires token",
-      "type": "docker",
-      "docker_container_name": "element",
-      "location": "brr7-4800u"
-    },
     {
       "name": "Jellyfin",
       "icon": "/icons/jellyfin-logo.svg",
-      "href": "https://jellyfin.neshura-server.net/",
+      "href": "https://jellyfin.neshweb.net/",
       "desc": "Open-Source, Self-Hosted Media Platform",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
@@ -90,7 +71,7 @@
     {
       "name": "Navidrome",
       "icon": "/icons/navidrome-logo.png",
-      "href": "https://navidrome.neshura-server.net/",
+      "href": "https://navidrome.neshweb.net/",
       "desc": "Open-Source, Self-Hosted Music Streaming Platform",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
@@ -99,7 +80,7 @@
     },
     {
       "name": "Picard",
-      "href": "https://picard.neshura-server.net/",
+      "href": "https://picard.neshweb.net/",
       "desc": "MP3 Tagger",
       "warn": "Note: Access only via Admin",
       "type": "docker",
@@ -109,7 +90,7 @@
     {
       "name": "Gitlab",
       "icon": "/icons/gitlab-logo.svg",
-      "href": "https://gitlab.neshura-server.net/",
+      "href": "https://gitlab.neshweb.net/",
       "desc": "Self-hosted Git Service",
       "warn": "Note: Registration only via Admin",
       "type": "docker",
@@ -119,7 +100,7 @@
     {
       "name": "Portainer",
       "icon": "/icons/portainer-logo.png",
-      "href": "https://portainer.neshura-server.net/",
+      "href": "https://portainer.neshweb.net/",
       "desc": "Docker Container Manager",
       "warn": "Note: Admin Only",
       "type": "docker",
@@ -129,7 +110,7 @@
     {
       "name": "Nginx Proxy Manager",
       "icon": "/icons/npm-logo.png",
-      "href": "https://nginx.neshura-server.net/",
+      "href": "https://nginx.neshweb.net/",
       "desc": "Web-based Nginx Proxy Manager",
       "warn": "Note: Admin Only",
       "type": "docker",
@@ -139,25 +120,34 @@
     {
       "name": "Grafana",
       "icon": "/icons/grafana-logo.svg",
-      "href": "https://monitoring.neshura-server.net/",
+      "href": "https://monitoring.neshweb.net/",
       "desc": "Server Monitoring Utility",
       "warn": "Note: Admin Only",
       "type": "docker",
       "docker_container_name": "grafana",
       "location": "brr7-4800u"
+    },
+    {
+      "name": "Matomo",
+      "href": "https://tracking.neshweb.net/",
+      "desc": "Traffic Tracking Utility",
+      "warn": "Note: Admin Only",
+      "type": "docker",
+      "docker_container_name": "matomo-web",
+      "location": "brr7-4800u"
     }
   ],
   "games": {
     "minecraft": {
       "name": "Minecraft",
       "icon": "/icons/minecraft-logo.png",
-      "href": "https://minecraft.neshura-server.net/",
+      "href": "https://minecraft.neshweb.net/",
       "desc": "View all currently available Minecraft Servers and their mods"
     },
     "ready_or_not": {
       "name": "Ready or Not",
       "icon": "/icons/ron-logo.png",
-      "href": "https://readyornot.neshura-server.net/",
+      "href": "https://readyornot.neshweb.net/",
       "desc": "Collection of Floor Plans for the Game 'Ready or Not'"
     },
     "zomboid": {