diff --git a/hosts/hermit/configuration.nix b/hosts/hermit/configuration.nix
index a33bdc4..82d1618 100644
--- a/hosts/hermit/configuration.nix
+++ b/hosts/hermit/configuration.nix
@@ -9,7 +9,7 @@
   i18n.defaultLocale = "en_US.UTF-8";
   console.keyMap = "uk";
   security.polkit.enable = true;
-  programs.kdeconnect.enable = false;
+  programs.kdeconnect.enable = true;
   programs.nix-ld.enable = false;
   boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
   services = {
@@ -30,7 +30,7 @@
       boot.systemd-boot.enable = true;
       impermanence.enable = false;
       services = {
-        owncloud.enable = true;
+        nextcloud.enable = true;
       };
       hardware = {
         nvidia.enable = true;
diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index 00de886..b44fb58 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -16,7 +16,6 @@
       cbonsai
       cinny-desktop
       cmus
-      comma
       difftastic
       element
       element-desktop
diff --git a/hosts/temperance/configuration.nix b/hosts/temperance/configuration.nix
index cfc2982..71af206 100644
--- a/hosts/temperance/configuration.nix
+++ b/hosts/temperance/configuration.nix
@@ -48,7 +48,7 @@ in {
         systemd-boot.enable = true;
       };
       services = {
-        owncloud.enable = true;
+        nextcloud.enable = true;
       };
       programs = {
         editors = {
diff --git a/modules/services/owncloud/module.nix b/modules/services/nextcloud/module.nix
similarity index 77%
rename from modules/services/owncloud/module.nix
rename to modules/services/nextcloud/module.nix
index 2d7974e..5a3a570 100644
--- a/modules/services/owncloud/module.nix
+++ b/modules/services/nextcloud/module.nix
@@ -7,13 +7,13 @@
   inherit (lib.meta) getExe';
   inherit (lib.modules) mkIf;
 
-  cfg = config.modules.system.services.owncloud;
+  cfg = config.modules.system.services.nextcloud;
 in {
-  options.modules.system.services.owncloud.enable = lib.mkEnableOption "owncloud";
+  options.modules.system.services.nextcloud.enable = lib.mkEnableOption "nextcloud";
 
   config = {
-    systemd.user.services.owncloud = mkIf cfg.enable {
-      description = "Owncloud client service";
+    systemd.user.services.nextcloud = mkIf cfg.enable {
+      description = "Nextcloud client service";
 
       # makes the graphical session start this service when it starts
       wantedBy = ["graphical-session.target"];
@@ -23,7 +23,7 @@ in {
       after = ["graphical-session.target"];
 
       serviceConfig = {
-        ExecStart = "${getExe' pkgs.owncloud-client "owncloud"}";
+        ExecStart = "${getExe' pkgs.nextcloud-client "nextcloud"} --background";
         Restart = "always";
         RestartSec = 30;