diff --git a/server/configuration.org b/server/configuration.org
index bce07a4..1e67ace 100644
--- a/server/configuration.org
+++ b/server/configuration.org
@@ -49,16 +49,13 @@ let
     "tasks" (builtins.readFile ../scripts/tasks.sh);
   jawzSubs = pkgs.writeScriptBin
     "sub-sync" (builtins.readFile ../scripts/sub-sync.sh);
-  jawzChat = pkgs.writeScriptBin
-    "chat-dl" (builtins.readFile ../scripts/chat-dl.sh);
-  jawzPicarto = pkgs.writeScriptBin
-    "picarto-dl" (builtins.readFile ../scripts/picarto-dl.sh);
+  jawzStream = pkgs.writeScriptBin
+    "stream-dl" (builtins.readFile ../scripts/stream-dl.sh);
   jawzScripts = [
     jawzManageLibrary
     jawzTasks
     jawzSubs
-    jawzChat
-    jawzPicarto
+    jawzStream
   ];
 in
 { # Remember to close this bracket at the end of the document
@@ -816,12 +813,7 @@ in [ myPkg ];
     #   wantedBy = [ "default.target" ];
     #   path = [
     #     pkgs.bash
-    #     pkgs.fd
-    #     pkgs.ripgrep
-    #     pkgs.file
-    #     pkgs.alass
-    #     pkgs.ffmpeg
-    #     pkgs.gum
+    #     pkgs.nix
     #     jawzSubs
     #   ];
     #   serviceConfig = {
@@ -845,8 +837,8 @@ in [ myPkg ];
   };
   user = {
     services = let
-      chatService = channel: {
-        description = "monitors a chaturbate channel for online streams.";
+      streamService = channel: {
+        description = "monitors a stream channel for online streams.";
         restartIfChanged = true;
         wantedBy = [ "default.target" ];
         path = [
@@ -856,12 +848,12 @@ in [ myPkg ];
         serviceConfig = {
           Restart = "on-failure";
           RestartSec = 30;
-          ExecStart = "${jawzChat}/bin/chat-dl ${channel}";
+          ExecStart = "${jawzChat}/bin/stream-dl ${channel}";
         };
       };
     in {
-      "chat@" = {
-        description = "monitors a chaturbate channel for online streams.";
+      "stream@" = {
+        description = "monitors a stream channel for online streams.";
         restartIfChanged = true;
         wantedBy = [ "default.target" ];
         path = [
@@ -871,23 +863,12 @@ in [ myPkg ];
         serviceConfig = {
           Restart = "on-failure";
           RestartSec = 30;
-          ExecStart = "${jawzChat}/bin/chat-dl %I";
+          ExecStart = "${jawzChat}/bin/stream-dl %I";
         };
       };
-      "chat-johnneal911" = chatService "johnneal911" // { };
-      "chat-uk2011boy" = chatService "uk2011boy" // { };
-      # HentaiAtHome = {
-      #   enable = true;
-      #   restartIfChanged = true;
-      #   description = "Run hentai@home server";
-      #   wantedBy = [ "default.target" ];
-      #   serviceConfig = {
-      #     Restart = "on-failure";
-      #     RestartSec = 30;
-      #     WorkingDirectory="/mnt/disks/hnbox";
-      #     ExecStart = "${pkgs.HentaiAtHome}/bin/HentaiAtHome";
-      #   };
-      # };
+      "stream-johnneal911" = streamService "johnneal911" // { };
+      "stream-uk2011boy" = streamService "uk2011boy" // { };
+      "stream-tomayto\x20picarto" = streamService "tomayto\x20picarto" // { };
       # unpackerr = {
       #   enable = true;
       #   restartIfChanged = true;
@@ -946,9 +927,9 @@ in [ myPkg ];
       # };
     };
     timers = let
-      chatTimer = {
+      streamTimer = {
         enable = true;
-        description = "monitors a chaturbate channel for online streams.";
+        description = "monitors a stream channel for online streams.";
         wantedBy = [ "timers.target" ];
         timerConfig = {
           OnBootSec = "5min";
@@ -957,8 +938,9 @@ in [ myPkg ];
         };
       };
     in {
-      "chat-johnneal911" = chatTimer // { };
-      "chat-uk2011boy" = chatTimer // { };
+      "stream-johnneal911" = streamTimer // { };
+      "stream-uk2011boy" = streamTimer // { };
+      "stream-tomayto\x20picarto" = streamTimmer // { };
       # tasks = {
       #   enable = true;
       #   description = "Run a tasks script which keeps a lot of things organized";