diff --git a/modules/desktop/niri.nix b/modules/desktop/niri.nix
index 482bd28..8a9a3ac 100644
--- a/modules/desktop/niri.nix
+++ b/modules/desktop/niri.nix
@@ -263,6 +263,9 @@
               }
               {
                 matches = [
+                  {
+                    app-id = "Element";
+                  }
                   {
                     app-id = "discord";
                   }
@@ -295,6 +298,9 @@
                   {
                     app-id = "discord";
                   }
+                  {
+                    app-id = "Element";
+                  }
                   {
                     app-id = "steam";
                     title = "Friends List.*";
diff --git a/modules/games/communication.nix b/modules/games/communication.nix
index 3ef9199..cb65ff2 100644
--- a/modules/games/communication.nix
+++ b/modules/games/communication.nix
@@ -5,6 +5,7 @@
       environment.systemPackages = with pkgs; [
         discord
         teamspeak6-client
+        element-desktop
       ];
 
       programs.obs-studio = {
diff --git a/modules/hosts/loptland/nginx.nix b/modules/hosts/loptland/nginx.nix
index 0ceda04..dcd2499 100644
--- a/modules/hosts/loptland/nginx.nix
+++ b/modules/hosts/loptland/nginx.nix
@@ -59,6 +59,22 @@
             };
           };
 
+          "cholli.de" = {
+            forceSSL = true;
+            useACMEHost = "cholli.de";
+            globalRedirect = domainName;
+          };
+
+          "~^(?<subdomain>.+)\\.cholli\\.de$" = {
+            forceSSL = true;
+            useACMEHost = "cholli.de";
+            locations."/" = {
+              extraConfig = ''
+                return 301 https://$subdomain.${domainName}$request_uri;
+              '';
+            };
+          };
+
           "_" = {
             forceSSL = true;
             useACMEHost = domainName;
diff --git a/modules/server/acme.nix b/modules/server/acme.nix
index 81d509f..0aba9d4 100644
--- a/modules/server/acme.nix
+++ b/modules/server/acme.nix
@@ -54,6 +54,11 @@ topLevel: {
           dnsResolver = "1.1.1.1:53";
           extraDomainNames = [ "*.${domainname}" ];
         };
+
+        certs."cholli.de" = {
+          dnsResolver = "1.1.1.1:53";
+          extraDomainNames = [ "*.cholli.de" ];
+        };
       };
 
     };