diff --git a/modules/config/instances/config/mastodon.nix b/modules/config/instances/config/mastodon.nix
index 3ed23f4..8aa4d3b 100755
--- a/modules/config/instances/config/mastodon.nix
+++ b/modules/config/instances/config/mastodon.nix
@@ -31,6 +31,9 @@ in
     "mast"
     "md"
   ];
+  ports = {
+    port0 = 80;
+  };
   interface = {
     id = "vm-${name}";
     mac = "02:00:00:00:55:05";
diff --git a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix
index 0053eb5..5ab6ace 100755
--- a/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix
+++ b/modules/home/gui/apps/browsers/floorp/config/bookmarks/config/flake/selfHosted.nix
@@ -1,12 +1,7 @@
 { flake, ... }:
 let
-  inherit (flake.config.machines.devices)
-    ceres
-    mars
-    ;
-  inherit (flake.config.services)
-    instances
-    ;
+  inherit (flake.config.machines.devices) mars;
+  inherit (flake.config.services) instances;
 
   makeBookmarks =
     {
@@ -21,23 +16,24 @@ let
       keyword = instances.${name}.short;
     }) (builtins.map (service: instances.${service}.name) services);
 
+  instanceList = [
+    instances.forgejo.name
+    instances.jellyfin.name
+    instances.mastodon.name
+    instances.vaultwarden.name
+    instances.firefly-iii.name
+  ];
   bookmarkConfigs = [
     {
       suffix = "(Remote)";
       urlTemplate = name: "https://${instances.${name}.domains.url0}";
-      services = [
-        instances.audiobookshelf.name
-        instances.forgejo.name
-        instances.glance.name
-        instances.jellyfin.name
-        instances.mastodon.name
-        instances.ollama.name
-        instances.opencloud.name
-        instances.searx.name
-        instances.vaultwarden.name
-        instances.prompter.name
-        instances.firefly-iii.name
-      ];
+      services = instanceList;
+    }
+    {
+      suffix = "(Server)";
+      urlTemplate =
+        name: "http://${instances.${name}.interface.ip}:${builtins.toString instances.${name}.ports.port0}";
+      services = instanceList;
     }
     {
       suffix = "(Desktop)";
@@ -47,15 +43,6 @@ let
         instances.syncthing.name
       ];
     }
-    {
-      suffix = "(Server)";
-      urlTemplate =
-        name: "http://${ceres.ip.address0}:${builtins.toString instances.${name}.ports.port0}";
-      services = [
-        instances.jellyfin.name
-        instances.firefly-iii.name
-      ];
-    }
   ];
 
   generatedBookmarks = builtins.concatLists (builtins.map makeBookmarks bookmarkConfigs);
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 917add3..9da2991 100755
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -14,6 +14,7 @@ in
           plasma
           plymouth
           sddm
+          tuios
           wireguard
           microvm
           defenseio
diff --git a/modules/nixos/guests/defenseio/default.nix b/modules/nixos/guests/defenseio/default.nix
index 2863bff..0662ba7 100755
--- a/modules/nixos/guests/defenseio/default.nix
+++ b/modules/nixos/guests/defenseio/default.nix
@@ -41,8 +41,14 @@ in
         autostart = true;
         config =
           let
+            ceresCpu = 45;
+            erisCpu = 5;
+            marsCpu = 20;
+            deimosCpu = 5;
+            phobosCpu = 5;
+
             macAddress = "02:00:00:00:00:${macOctet}";
-            workers = deviceLogic 35 4 18 5 6;
+            workers = deviceLogic ceresCpu erisCpu marsCpu deimosCpu phobosCpu;
           in
           {
             environment.systemPackages = [
@@ -67,7 +73,16 @@ in
                   mac = macAddress;
                 }
               ];
-              mem = deviceLogic 45000 5120 22000 6144 7168;
+              mem =
+                let
+                  num = 1024;
+                  ceresRam = num * 50;
+                  erisRam = num * 7;
+                  marsRam = num * 24;
+                  deimosRam = num * 7;
+                  phobosRam = num * 7;
+                in
+                deviceLogic ceresRam erisRam marsRam deimosRam phobosRam;
               shares = [
                 {
                   mountPoint = "/nix/.ro-store";