diff --git a/nixos/hosts/queen/configuration.nix b/nixos/hosts/queen/configuration.nix
index 1f643b8..1aabb0e 100644
--- a/nixos/hosts/queen/configuration.nix
+++ b/nixos/hosts/queen/configuration.nix
@@ -55,7 +55,6 @@
 
   environment.systemPackages = with pkgs; [
     fzf
-    matrix-conduit
     docker
     docker-compose
     gitea
@@ -86,6 +85,7 @@
     youtube-dl
     sqlite
     rocksdb
+    janus-gateway
   ];
   services.vpn-ip = {
     enable = false;
diff --git a/nixos/server/package-configs/conduit/default.nix b/nixos/server/package-configs/conduit/default.nix
index f8bcf35..3a5a98f 100644
--- a/nixos/server/package-configs/conduit/default.nix
+++ b/nixos/server/package-configs/conduit/default.nix
@@ -28,6 +28,7 @@
       }
     }
   '';
+  # TODO: replace conduwuit with tuwunnel
 in {
   # Configure Conduit itself
   services.conduit = {
diff --git a/nixos/shared/default.nix b/nixos/shared/default.nix
index 132d5b4..5e5bea7 100644
--- a/nixos/shared/default.nix
+++ b/nixos/shared/default.nix
@@ -70,8 +70,8 @@
   catppuccin = {
     flavor = "macchiato";
     tty.enable = true;
-    # sddm.enable = true;
-    # sddm.flavor = "macchiato";
+    sddm.enable = true;
+    sddm.flavor = "macchiato";
     forgejo.enable = true;
     forgejo.flavor = "macchiato";
     # plymouth.enable = false;