diff --git a/modules/connectivity/default.nix b/modules/connectivity/default.nix
index 0e25115..c38baf1 100644
--- a/modules/connectivity/default.nix
+++ b/modules/connectivity/default.nix
@@ -7,7 +7,7 @@
 
 {
   imports = [
-    ./browser
+    ./internet
     ./bluetooth
   ];
 }
diff --git a/modules/connectivity/browser/default.nix b/modules/connectivity/internet/default.nix
similarity index 87%
rename from modules/connectivity/browser/default.nix
rename to modules/connectivity/internet/default.nix
index bbd03b1..72d62a9 100644
--- a/modules/connectivity/browser/default.nix
+++ b/modules/connectivity/internet/default.nix
@@ -9,5 +9,6 @@
   imports = [
     ./librewolf.nix
     ./zen-browser.nix
+    ./tor.nix
   ];
 }
diff --git a/modules/connectivity/browser/librewolf.nix b/modules/connectivity/internet/librewolf.nix
similarity index 100%
rename from modules/connectivity/browser/librewolf.nix
rename to modules/connectivity/internet/librewolf.nix
diff --git a/modules/connectivity/internet/tor.nix b/modules/connectivity/internet/tor.nix
new file mode 100644
index 0000000..8573673
--- /dev/null
+++ b/modules/connectivity/internet/tor.nix
@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    internet = {
+      tor.enable = lib.mkEnableOption "enable tor";
+      browsers.tor-browser.enable = lib.mkEnableOption "enable tor-browser";
+    };
+  };
+  config = {
+    home.packages = with pkgs; [
+      (lib.mkIf (config.internet.browsers.tor-browser.enable) tor-browser)
+      (lib.mkIf (config.internet.tor.enable) oniux)
+    ];
+  };
+}
diff --git a/modules/connectivity/browser/zen-browser.nix b/modules/connectivity/internet/zen-browser.nix
similarity index 100%
rename from modules/connectivity/browser/zen-browser.nix
rename to modules/connectivity/internet/zen-browser.nix
diff --git a/modules/default.nix b/modules/default.nix
index 6347ec1..d995317 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -15,5 +15,6 @@
     ./gaming
     ./connectivity
     ./media
+    ./social-media
   ];
 }
diff --git a/modules/defaults/default.nix b/modules/defaults/default.nix
index 279dc0c..d5bdd81 100644
--- a/modules/defaults/default.nix
+++ b/modules/defaults/default.nix
@@ -28,9 +28,10 @@
     terminal = lib.mkDefault {
       ranger.enable = true;
     };
-    misc = lib.mkDefault{
+    misc = lib.mkDefault {
       bitwarden.enable = true;
     };
+    internet.tor.enable = true;
     syncthing = lib.mkDefault {
       devices = {
         marty-pc = {
@@ -56,4 +57,4 @@
       };
     };
   };
-}
\ No newline at end of file
+}
diff --git a/modules/defaults/desktop.nix b/modules/defaults/desktop.nix
index 2b5f8fc..4a46713 100644
--- a/modules/defaults/desktop.nix
+++ b/modules/defaults/desktop.nix
@@ -25,11 +25,15 @@
       grimblast.enable = true;
       audio.enable = true;
     };
+    messaging.enable = true;
     internet = lib.mkDefault {
       browsers = {
         zen-browser = {
           enable = true;
         };
+        tor-browser = {
+          enable = true;
+        };
       };
     };
     bluetooth.enable = true;
diff --git a/modules/defaults/laptop.nix b/modules/defaults/laptop.nix
index 64c659f..5056c20 100644
--- a/modules/defaults/laptop.nix
+++ b/modules/defaults/laptop.nix
@@ -27,6 +27,7 @@
       grimblast.enable = true;
       audio.enable = true;
     };
+    messaging.enable = true;
     internet = lib.mkDefault {
       browsers = {
         zen-browser = {
diff --git a/modules/social-media/default.nix b/modules/social-media/default.nix
new file mode 100644
index 0000000..471ff39
--- /dev/null
+++ b/modules/social-media/default.nix
@@ -0,0 +1,12 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  imports = [
+    ./messaging
+  ];
+}
diff --git a/modules/social-media/messaging/default.nix b/modules/social-media/messaging/default.nix
new file mode 100644
index 0000000..d31259d
--- /dev/null
+++ b/modules/social-media/messaging/default.nix
@@ -0,0 +1,31 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  options = {
+    messaging = {
+      enable = lib.mkEnableOption "enable all messaging";
+      element.enable = lib.mkEnableOption "enable element";
+      signal.enable = lib.mkEnableOption "enable signal";
+    };
+  };
+
+  config = {
+    messaging = lib.mkIf config.messaging.enable {
+      element.enable = lib.mkDefault true;
+      signal.enable = lib.mkDefault true;
+    };
+    home.packages = with pkgs; [
+      (lib.mkIf (config.messaging.signal.enable) signal-desktop)
+    ];
+    programs = {
+      element-desktop = lib.mkIf config.messaging.element.enable {
+        enable = true;
+      };
+    };
+  };
+}