diff --git a/machines/Everest/configuration.nix b/machines/Everest/configuration.nix
index fd2f6de..1d88a68 100755
--- a/machines/Everest/configuration.nix
+++ b/machines/Everest/configuration.nix
@@ -59,10 +59,9 @@
 	};
 
 	# Open ports in the firewall.
-	# 8384 is syncthing's webui, and 22000 is syncthing related too
-	# No idea what 5201 and 21027 do tho
-	networking.firewall.allowedTCPPorts = [ 5201 8384 22000 ];
-	networking.firewall.allowedUDPPorts = [ 5201 22000 21027];
+	# No idea what ports 5201 and 21027 do tho
+	networking.firewall.allowedTCPPorts = [ 5201 ];
+	networking.firewall.allowedUDPPorts = [ 5201 21027];
 	# Or disable the firewall altogether.
 	# networking.firewall.enable = false;
 }
diff --git a/roles/common/services/syncthing.nix b/roles/common/services/syncthing.nix
index 551063a..da9174f 100755
--- a/roles/common/services/syncthing.nix
+++ b/roles/common/services/syncthing.nix
@@ -1,8 +1,16 @@
 { config, ... }:
 
 {
-	# Set up devices and folders common to every device
 	services.syncthing = {
+		overrideDevices = true;
+		overrideFolders = true;
+		openDefaultPorts = true;
+		extraOptions = {
+			options = {
+				urAccepted = 3;
+			};
+		};
+		# Set up devices and folders common to every device
 		devices = {
 			"phone" = {
 				name = "Xiaomi Redmi Note 10 Pro";
@@ -16,12 +24,16 @@
 				name = "Steam Deck";
 				id = "DLQPL74-KEQTPM5-X4PDZHB-4HLQYHV-UCMJLOB-P6W3KWU-QLJADBY-V4KEMA5";
 			};
+			"server" = {
+				name = "Everest";
+				id = "BVJBCAZ-WDIWBFR-CK3WB3N-TWH3UXX-EPZXVWE-BLQ3IDU-U7MHVVB-WO4BKAJ";
+			};
 		};
 		folders = {
 			"passwords" = {
 				label = "KeePassXC Passwords";
 				id = "rdyaq-ex659";
-				devices = [ "phone" "pc" "steamdeck"];
+				devices = [ "phone" "pc" "steamdeck" "server"];
 			};
 		};
 	};
diff --git a/roles/desktop/services/default.nix b/roles/desktop/services/default.nix
index 19921e3..6393486 100644
--- a/roles/desktop/services/default.nix
+++ b/roles/desktop/services/default.nix
@@ -4,5 +4,6 @@
 	imports = [
 		./ssh-agent.nix
 		./flatpak.nix
+		./syncthing.nix
 	];
 }
diff --git a/roles/desktop/services/syncthing.nix b/roles/desktop/services/syncthing.nix
new file mode 100644
index 0000000..728dd0e
--- /dev/null
+++ b/roles/desktop/services/syncthing.nix
@@ -0,0 +1,11 @@
+{ config, ... }:
+
+{
+	services.syncthing = {
+		enable = true;
+		user = "toast";
+		group = "users";
+		dataDir = config.users.users.toast.home;
+		folders."passwords".path = "~/Documents/Passwords";
+	};
+}