diff --git a/README.org b/README.org
index a74cafd..887cdfa 100755
--- a/README.org
+++ b/README.org
@@ -102,5 +102,4 @@ nix develop .#shells.x86_64-linux.debugTexShell
 
 ** Things to work out
 
-*** Mail
 *** Notebook tempaltes
diff --git a/azos-core b/azos-core
index edc8d1f..71780bd 160000
--- a/azos-core
+++ b/azos-core
@@ -1 +1 @@
-Subproject commit edc8d1fa7ae227dea6543c97f6d7cceb2dd256ab
+Subproject commit 71780bd96b6114b0cd492fb526b422ae6d0dfb1d
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 55ac945..4549654 100755
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -8,5 +8,7 @@
     ./qutebrowser-config.nix
     ./audio.nix
     ./reaper.nix
+    ./discord.nix
+    ./spotify.nix
   ];
 }
diff --git a/modules/home-manager/discord.nix b/modules/home-manager/discord.nix
new file mode 100755
index 0000000..7b5714a
--- /dev/null
+++ b/modules/home-manager/discord.nix
@@ -0,0 +1,17 @@
+{ lib, config, pkgs, ... }:
+let
+  isEnabled =
+    config.azos.discord.enable;
+in {
+    options.azos.discord.enable = lib.mkOption {
+      default = true;
+      example = true;
+      type = lib.types.bool;
+    };
+
+    config = lib.mkIf isEnabled {
+      home.packages = with pkgs; [
+        discord
+      ];
+    };
+}
diff --git a/modules/home-manager/spotify.nix b/modules/home-manager/spotify.nix
new file mode 100755
index 0000000..4834657
--- /dev/null
+++ b/modules/home-manager/spotify.nix
@@ -0,0 +1,17 @@
+{ lib, config, pkgs, ... }:
+let
+  isEnabled =
+    config.azos.spotify.enable;
+in {
+    options.azos.spotify.enable = lib.mkOption {
+      default = true;
+      example = true;
+      type = lib.types.bool;
+    };
+
+    config = lib.mkIf isEnabled {
+      home.packages = with pkgs; [
+        spotify
+      ];
+    };
+}