diff --git a/modules/system/services/server/mailserver/default.nix b/modules/system/services/server/mailserver/default.nix
index 7c3810a7..feb18226 100644
--- a/modules/system/services/server/mailserver/default.nix
+++ b/modules/system/services/server/mailserver/default.nix
@@ -1,4 +1,4 @@
-{ ... }: 
+{ lib, ... }: 
 {
   options.system.mailserver = {
     enable = lib.mkOption {
diff --git a/modules/system/services/server/minecraft/default.nix b/modules/system/services/server/minecraft/default.nix
index 8f8133e9..7c595851 100644
--- a/modules/system/services/server/minecraft/default.nix
+++ b/modules/system/services/server/minecraft/default.nix
@@ -6,8 +6,8 @@
     ./servers/dewdemolisher
     ./servers/johnside
     ./servers/roguecraft
-    #./servers/blockworld
-    #./servers/uberbeta
+    ./servers/blockworld
+    ./servers/uberbeta
   ];
 
   nixpkgs.overlays = [ minecraft.overlay ];
diff --git a/modules/system/services/server/minecraft/servers/blockworld/default.nix b/modules/system/services/server/minecraft/servers/blockworld/default.nix
index 0aa81827..bc20e72f 100644
--- a/modules/system/services/server/minecraft/servers/blockworld/default.nix
+++ b/modules/system/services/server/minecraft/servers/blockworld/default.nix
@@ -3,7 +3,6 @@ let
   common = import ../../common { inherit pkgs; };
 in {
   services.minecraft-servers.servers.blockworld = {
-    enable = true;
     autoStart = false;
     package = pkgs.paperServers.paper-1_21_1;
     jvmOpts = "-Xmx3072M";
diff --git a/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix b/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
index c1b59e0c..5b5f0c7a 100644
--- a/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
+++ b/modules/system/services/server/minecraft/servers/dewdemolisher/default.nix
@@ -3,7 +3,6 @@ let
   common = import ../../common { inherit pkgs; };
 in {
   services.minecraft-servers.servers.dewdemolisher = {
-    enable = true;
     package = pkgs.paperServers.paper-1_21_1;
     jvmOpts = "-Xmx2000M";
     serverProperties = common.serverProperties // {
diff --git a/modules/system/services/server/minecraft/servers/johnside/default.nix b/modules/system/services/server/minecraft/servers/johnside/default.nix
index 4a26847b..c866ad85 100644
--- a/modules/system/services/server/minecraft/servers/johnside/default.nix
+++ b/modules/system/services/server/minecraft/servers/johnside/default.nix
@@ -4,7 +4,6 @@ let
 in {
   services = {
     minecraft-servers.servers.johnside = {
-      enable = true;
       package = pkgs.paperServers.paper-1_20_6;
       jvmOpts = "-Xmx2500M";
       serverProperties = common.serverProperties // {
diff --git a/modules/system/services/server/minecraft/servers/roguecraft/default.nix b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
index a3b5537c..3e46fff8 100644
--- a/modules/system/services/server/minecraft/servers/roguecraft/default.nix
+++ b/modules/system/services/server/minecraft/servers/roguecraft/default.nix
@@ -4,7 +4,6 @@ let
 in {
   services = {
     minecraft-servers.servers.roguecraft = {
-      enable = true;
       package = pkgs.paperServers.paper-1_21_1;
       jvmOpts = "-Xmx3000M";
       serverProperties = common.serverProperties // {
diff --git a/modules/system/services/server/minecraft/servers/uberbeta/default.nix b/modules/system/services/server/minecraft/servers/uberbeta/default.nix
index 3bbcbaf6..15699fc7 100644
--- a/modules/system/services/server/minecraft/servers/uberbeta/default.nix
+++ b/modules/system/services/server/minecraft/servers/uberbeta/default.nix
@@ -11,7 +11,6 @@ let
   });
 in {
   services.minecraft-servers.servers.uberbeta = {
-    enable = true;
     package = uberBukkit;
     jvmOpts = "-Xmx512M";
     serverProperties = common.serverProperties // {
diff --git a/modules/system/services/server/minecraft/servers/velocity/default.nix b/modules/system/services/server/minecraft/servers/velocity/default.nix
index 48a3ca75..fa225f15 100644
--- a/modules/system/services/server/minecraft/servers/velocity/default.nix
+++ b/modules/system/services/server/minecraft/servers/velocity/default.nix
@@ -3,7 +3,6 @@ let
   common = import ../../common { inherit pkgs; };
 in {
   services.minecraft-servers.servers.velocity = {
-    enable = true;
     package = pkgs.velocityServers.velocity;
     jvmOpts = "-Xmx512M";
     symlinks = {
@@ -44,14 +43,12 @@ in {
     allowedTCPPorts = [
       25565
       19132
-      30013
       5657
     ];
     # Server, VC, and Bedrock
     allowedUDPPorts = [
       25565
       19132
-      30013
     ];
   };
 }
diff --git a/modules/system/services/server/nginx/virtualhosts/default.nix b/modules/system/services/server/nginx/virtualhosts/default.nix
index fa8df4b1..7737099c 100644
--- a/modules/system/services/server/nginx/virtualhosts/default.nix
+++ b/modules/system/services/server/nginx/virtualhosts/default.nix
@@ -1,6 +1,6 @@
 { ... }:
 {
   imports = [
-    ./jimDomain1
+    ./jim1
   ];
 }
diff --git a/modules/system/services/server/nginx/virtualhosts/jimDomain1/default.nix b/modules/system/services/server/nginx/virtualhosts/jim1/default.nix
similarity index 100%
rename from modules/system/services/server/nginx/virtualhosts/jimDomain1/default.nix
rename to modules/system/services/server/nginx/virtualhosts/jim1/default.nix
diff --git a/modules/system/services/server/social/lemmy/default.nix b/modules/system/services/server/social/lemmy/default.nix
index 9db605a3..00f46740 100644
--- a/modules/system/services/server/social/lemmy/default.nix
+++ b/modules/system/services/server/social/lemmy/default.nix
@@ -3,7 +3,7 @@
   imports = [ ./nginx ];
 
   services.lemmy = {
-    enable = true;
+    enable = config.system.server.enable;
     nginx.enable = true;
     database.createLocally = true;
     settings = {
diff --git a/modules/system/services/server/social/mastodon/default.nix b/modules/system/services/server/social/mastodon/default.nix
index eedc2905..765a9a91 100644
--- a/modules/system/services/server/social/mastodon/default.nix
+++ b/modules/system/services/server/social/mastodon/default.nix
@@ -1,7 +1,7 @@
 { pkgs, config, ... }:
 {
   services.mastodon = {
-    enable = true;
+    enable = config.system.server.enable;
     localDomain = "social.${config.domains.jim1}";
     streamingProcesses = 4;
     configureNginx = true;