diff --git a/server/configuration.org b/server/configuration.org
index 46f2d11..dc3a476 100644
--- a/server/configuration.org
+++ b/server/configuration.org
@@ -824,22 +824,7 @@ in [ myPkg ];
     # };
   };
   user = {
-    services = let
-      streamService = channel: {
-        description = "monitors a stream channel for online streams.";
-        restartIfChanged = true;
-        wantedBy = [ "default.target" ];
-        path = [
-          pkgs.nix
-          jawzStream
-        ];
-        serviceConfig = {
-          Restart = "on-failure";
-          RestartSec = 30;
-          ExecStart = "${jawzStream}/bin/stream-dl ${channel}";
-        };
-      };
-    in {
+    services = {
       "stream@" = {
         description = "monitors a stream channel for online streams.";
         restartIfChanged = true;
@@ -854,9 +839,6 @@ in [ myPkg ];
           ExecStart = "${jawzStream}/bin/stream-dl %I";
         };
       };
-      "stream-johnneal911" = streamService "johnneal911" // { };
-      "stream-uk2011boy" = streamService "uk2011boy" // { };
-      "stream-tomayto\x20picarto" = streamService "tomayto\x20picarto" // { };
       # unpackerr = {
       #   enable = true;
       #   restartIfChanged = true;
@@ -926,9 +908,10 @@ in [ myPkg ];
         };
       };
     in {
-      "stream-johnneal911" = streamTimer // { };
-      "stream-uk2011boy" = streamTimer // { };
-      "stream-tomayto\x20picarto" = streamTimer // { };
+      "stream@johnneal911" = streamTimer // { };
+      "stream@uk2011boy" = streamTimer // { };
+      "stream@tomayto\\x20picarto" = streamTimer // { };
+      "stream@retrohurricaneLIVE\\x20picarto" = streamTimer // { };
       # tasks = {
       #   enable = true;
       #   description = "Run a tasks script which keeps a lot of things organized";