diff --git a/home-manager/features/chat.nix b/home-manager/features/chat.nix
new file mode 100644
index 0000000..7b8bd4e
--- /dev/null
+++ b/home-manager/features/chat.nix
@@ -0,0 +1,11 @@
+{ pkgs, ... }:
+{
+  imports = [
+    ../apps/element.nix
+    ../apps/discord.nix
+  ];
+
+  home.packages = with pkgs; [
+    signal-desktop
+  ];
+}
diff --git a/home-manager/features/development/nix.nix b/home-manager/features/development/nix.nix
index 3bf97a2..6ca8ac6 100644
--- a/home-manager/features/development/nix.nix
+++ b/home-manager/features/development/nix.nix
@@ -6,6 +6,7 @@
 
     nixfmt-rfc-style # Formatter
     nil # Language Server
+    statix # Lints and suggestions for Nix
   ];
 
   home.shellAliases = {
@@ -14,4 +15,3 @@
     rebuild-boot = "sudo nixos-rebuild boot --flake ~/system-config --show-trace --print-build-logs --verbose";
   };
 }
- 
diff --git a/home-manager/features/image-editing.nix b/home-manager/features/image-editing.nix
new file mode 100644
index 0000000..f91b112
--- /dev/null
+++ b/home-manager/features/image-editing.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  home.packages = with pkgs; [
+    gimp3
+    inkscape
+  ];
+}
diff --git a/home-manager/features/linux-desktop.nix b/home-manager/features/linux-desktop.nix
index b943c70..d500a46 100644
--- a/home-manager/features/linux-desktop.nix
+++ b/home-manager/features/linux-desktop.nix
@@ -13,7 +13,6 @@
   home = {
     packages = with pkgs; [
       # Desktop Applications
-      signal-desktop
       gimp3
 
       # Common utilities
diff --git a/system/hosts/altair/drew.nix b/system/hosts/altair/drew.nix
index 0d02509..5f34e85 100644
--- a/system/hosts/altair/drew.nix
+++ b/system/hosts/altair/drew.nix
@@ -9,6 +9,7 @@ in
   imports =
     map (x: ../../../home-manager + x) [
       "/features/astronomy.nix"
+      "/features/chat.nix"
       "/features/development/development.nix"
       "/features/development/docker.nix"
       "/features/development/haskell.nix"
@@ -17,6 +18,7 @@ in
       "/features/development/vscode.nix"
       "/features/eww"
       "/features/gaming.nix"
+      "/features/image-editing.nix"
       "/features/linux-desktop.nix"
       "/features/notes.nix"
       "/features/3d-printing.nix"
diff --git a/system/hosts/vega/drew.nix b/system/hosts/vega/drew.nix
index aef5566..55778ac 100644
--- a/system/hosts/vega/drew.nix
+++ b/system/hosts/vega/drew.nix
@@ -2,6 +2,7 @@
 {
   imports =
     map (x: ../../../home-manager + x) [
+      "/features/chat.nix"
       "/features/development/development.nix"
       "/features/development/docker.nix"
       "/features/development/haskell.nix"
@@ -9,6 +10,7 @@
       "/features/development/typescript.nix"
       "/features/development/vscode.nix"
       "/features/eww"
+      "/features/image-editing.nix"
       "/features/linux-desktop.nix"
       "/features/notes.nix"
     ]