diff --git a/flake.lock b/flake.lock
index 7a8ac69..c646fe8 100644
--- a/flake.lock
+++ b/flake.lock
@@ -296,11 +296,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1749832440,
-        "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
+        "lastModified": 1749195551,
+        "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "db030f62a449568345372bd62ed8c5be4824fa49",
+        "rev": "4602f7e1d3f197b3cb540d5accf5669121629628",
         "type": "github"
       },
       "original": {
@@ -312,11 +312,11 @@
     },
     "nixos-unstable": {
       "locked": {
-        "lastModified": 1749794982,
-        "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
+        "lastModified": 1749285348,
+        "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
+        "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
         "type": "github"
       },
       "original": {
@@ -328,11 +328,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1749727998,
-        "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
+        "lastModified": 1749237914,
+        "narHash": "sha256-N5waoqWt8aMr/MykZjSErOokYH6rOsMMXu3UOVH5kiw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
+        "rev": "70c74b02eac46f4e4aa071e45a6189ce0f6d9265",
         "type": "github"
       },
       "original": {
@@ -403,11 +403,11 @@
         "tinted-zed": "tinted-zed"
       },
       "locked": {
-        "lastModified": 1749908208,
-        "narHash": "sha256-0nf9P4kRAzsBvf5jbY7M3NlnGSwBzU50kJAYGZH5Ez4=",
+        "lastModified": 1749389855,
+        "narHash": "sha256-//wZBnlBJ7Ki5/ZdafiAZwVFZd/2HhKqEbOupo/HcRA=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "67c8eca32f1baf158ffb9a56f28a2fc8e9852fb0",
+        "rev": "bf5ab9df57a3d77847289c39c3a537bd6e6ac6f4",
         "type": "github"
       },
       "original": {
diff --git a/hosts/ext-julia/default.nix b/hosts/ext-julia/default.nix
index 0128b09..92c90f8 100644
--- a/hosts/ext-julia/default.nix
+++ b/hosts/ext-julia/default.nix
@@ -1,37 +1,37 @@
-{pkgs, rootPath, lib, ...}:{
+{pkgs, ...}:{
   imports = [
     ./boot.nix
     ./hardware-configuration.nix
-    (rootPath + /system_profiles/server.nix)
-    (rootPath + /modules/pkg_mgrmnt/unattended-updates.nix)
 
-    (rootPath + /modules/hosting/wordpress-simple/kiezpalme.nix)
-    (rootPath + /modules/hosting/wordpress-simple/pertineo.nix)
-    #(rootPath + /modules/hosting/wordpress.nix)
+    #../../modules/hosting/wordpress-simple/kiezpalme.nix
+    #../../modules/hosting/wordpress-simple/pertineo.nix
+    ../../modules/hosting/wordpress.nix
+    ../../modules/sec_auth/ssh-server.nix
+
+    ../../system_profiles/server.nix
   ];
 
-  services.mysql = {
+  #services.mysql = {
+  #  enable = true;
+  #  package = pkgs.mariadb;
+  #};
+
+  services.cWordpress."example-site" = {
     enable = true;
-    package = pkgs.mariadb;
-    settings.mysqld.bind-address = "127.0.0.1";
+    sitePort = 80;
   };
 
-  #services.cWordpress."example-site" = {
-  #  enable = true;
-  #  sitePort = 80;
-  #};
+  services.cWordpress."example-site2" = {
+    enable = true;
+    sitePort = 81;
+  };
 
-  #services.cWordpress."example-site2" = {
-  #  enable = true;
-  #  sitePort = 81;
-  #};
-
-  services.openssh.ports = lib.mkForce [11522];
+  services.openssh.ports = [11522];
   users = let
     username = "root";
   in {
     users."${username}".openssh.authorizedKeys.keyFiles = [
-      (rootPath + /certificates/id_ed25519_ext-julia.pub)
+      ../../certificates/id_ed25519_ext-julia.pub
     ];
   };
 }
diff --git a/hosts/ext-julia/hardware-configuration.nix b/hosts/ext-julia/hardware-configuration.nix
index e26ed92..1e4a7ab 100644
--- a/hosts/ext-julia/hardware-configuration.nix
+++ b/hosts/ext-julia/hardware-configuration.nix
@@ -6,6 +6,10 @@
   modulesPath,
   ...
 }: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
+
   boot = {
     initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
     initrd.kernelModules = [];
diff --git a/hosts/game-luanti/default.nix b/hosts/game-luanti/default.nix
index cbac390..c69c055 100644
--- a/hosts/game-luanti/default.nix
+++ b/hosts/game-luanti/default.nix
@@ -1,18 +1,20 @@
-{rootPath, ...}: {
+{
   imports = [
     ./boot.nix
     ./hardware-configuration.nix
-    (rootPath + /system_profiles/server.nix)
 
-    (rootPath + /modules/game/server/luanti)
-    (rootPath + /modules/pkg_mgrmnt/unattended-updates.nix)
+    ../../modules/game/server/luanti
+    ../../modules/sec_auth/ssh-server.nix
+    ../../modules/pkg_mgrmnt/unattended-updates.nix
+
+    ../../system_profiles/server.nix
   ];
 
   users = let
     username = "root";
   in {
     users."${username}".openssh.authorizedKeys.keyFiles = [
-      (rootPath + /certificates/id_ed25519_game-luanti.pub)
+      ../../certificates/id_ed25519_game-luanti.pub
     ];
   };
 
diff --git a/hosts/game-luanti/hardware-configuration.nix b/hosts/game-luanti/hardware-configuration.nix
index e26ed92..6bbf7a7 100644
--- a/hosts/game-luanti/hardware-configuration.nix
+++ b/hosts/game-luanti/hardware-configuration.nix
@@ -6,6 +6,9 @@
   modulesPath,
   ...
 }: {
+  imports = [
+    (modulesPath + "/profiles/qemu-guest.nix")
+  ];
   boot = {
     initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
     initrd.kernelModules = [];
diff --git a/hosts/jitsi/default.nix b/hosts/jitsi/default.nix
new file mode 100644
index 0000000..a13ea41
--- /dev/null
+++ b/hosts/jitsi/default.nix
@@ -0,0 +1,13 @@
+{...}: {
+  nixpkgs.config = {
+    # Disable if you don't want unfree packages
+    allowUnfree = true;
+  };
+
+  imports = [
+    ./hardware-configuration.nix
+
+    ../../system_profiles/defaults.nix
+    ../../system_profiles/mini-container.nix
+  ];
+}
diff --git a/hosts/jitsi/hardware-configuration.nix b/hosts/jitsi/hardware-configuration.nix
new file mode 100644
index 0000000..f8c86aa
--- /dev/null
+++ b/hosts/jitsi/hardware-configuration.nix
@@ -0,0 +1,3 @@
+{lib, ...}: {
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+}
diff --git a/hosts/srv-videoconf/default.nix b/hosts/srv-videoconf/default.nix
deleted file mode 100644
index a1a0222..0000000
--- a/hosts/srv-videoconf/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{rootPath, ...}: {
-  imports = [
-    ./hardware-configuration.nix
-
-    (rootPath + /system_profiles/server.nix)
-  ];
-}
diff --git a/hosts/srv-videoconf/hardware-configuration.nix b/hosts/srv-videoconf/hardware-configuration.nix
deleted file mode 100644
index e26ed92..0000000
--- a/hosts/srv-videoconf/hardware-configuration.nix
+++ /dev/null
@@ -1,33 +0,0 @@
-# Do not modify this file!  It was generated by ‘nixos-generate-config’
-# and may be overwritten by future invocations.  Please make changes
-# to /etc/nixos/configuration.nix instead.
-{
-  lib,
-  modulesPath,
-  ...
-}: {
-  boot = {
-    initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "sr_mod" "virtio_blk"];
-    initrd.kernelModules = [];
-    kernelModules = [];
-    extraModulePackages = [];
-  };
-
-  fileSystems."/" = {
-    device = "/dev/disk/by-uuid/d290e12c-d93c-45f6-b737-135b551c1951";
-    fsType = "ext4";
-  };
-
-  swapDevices = [
-    {device = "/dev/disk/by-uuid/8c56f52e-568a-4e03-b22c-6d1c7de7c118";}
-  ];
-
-  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
-  # (the default) this is the recommended approach. When using systemd-networkd it's
-  # still possible to use this option, but it's recommended to use it in conjunction
-  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
-  networking.useDHCP = lib.mkDefault true;
-  # networking.interfaces.ens18.useDHCP = lib.mkDefault true;
-
-  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-}
diff --git a/modules/default.nix b/modules/default.nix
index a2abd41..e1045b5 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -11,6 +11,7 @@
     ./locale.nix
     ./networking.nix
     #./plymouth.nix # increases boot time too much
+    #./serial-console.nix # probably only for servers
     ./theming.nix
   ];
 }
diff --git a/system_profiles/components/serial-console.nix b/modules/serial-console.nix
similarity index 100%
rename from system_profiles/components/serial-console.nix
rename to modules/serial-console.nix
diff --git a/outputs.nix b/outputs.nix
index 5c64096..67d0073 100644
--- a/outputs.nix
+++ b/outputs.nix
@@ -15,11 +15,11 @@ in {
   nixosConfigurations = builtins.mapAttrs (hostName: hostOptions: (hostHelper hostName hostOptions)) {
     crocoite = {stateVersion = "24.05";};
 
-    #srv-videoconf = {stateVersion = "24.11";};
+    #jitsi = {stateVersion = "24.11";};
 
     game-luanti = {stateVersion = "25.05";};
 
-    ext-julia = {stateVersion = "25.05";};
+    #ext-julia = {stateVersion = "24.11";};
   };
 
   # Your custom packages
diff --git a/system_profiles/components/nixpkgs-ng.nix b/system_profiles/components/nixpkgs-ng.nix
deleted file mode 100644
index 4321bdd..0000000
--- a/system_profiles/components/nixpkgs-ng.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  system = {
-    rebuild.enableNg = false;
-  };
-}
diff --git a/system_profiles/components/qemu.nix b/system_profiles/components/qemu.nix
deleted file mode 100644
index 39b817d..0000000
--- a/system_profiles/components/qemu.nix
+++ /dev/null
@@ -1,6 +0,0 @@
-{modulesPath, ...}; {
-  imports = [
-    (modulesPath + "/profiles/qemu-guest.nix")
-  ];
-  services.qemuGuest.enable = true;
-}
diff --git a/system_profiles/desktop.nix b/system_profiles/desktop.nix
index dc96afc..c2da4f2 100644
--- a/system_profiles/desktop.nix
+++ b/system_profiles/desktop.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./components/nix-defaults.nix
-    #./components/nixpkgs-ng.nix
 
     ./importers/desktop.nix
     ./importers/general.nix
diff --git a/system_profiles/importers/server.nix b/system_profiles/importers/server.nix
index 4e0c313..66f1e60 100644
--- a/system_profiles/importers/server.nix
+++ b/system_profiles/importers/server.nix
@@ -1,7 +1,6 @@
 {rootPath, ...}: {
   imports = [
     (rootPath + /modules/customisation.nix)
-    (rootPath + /modules/sec_auth/ssh-server.nix)
     (rootPath + /modules/software/neovim.nix)
     (rootPath + /modules/software/packages/core.nix)
   ];
diff --git a/system_profiles/server.nix b/system_profiles/server.nix
index 56b00fe..8810958 100644
--- a/system_profiles/server.nix
+++ b/system_profiles/server.nix
@@ -2,7 +2,6 @@
   imports = [
     ./components/minify.nix
     ./components/nix-defaults.nix
-    ./components/qemu.nix
 
     ./importers/general.nix
     ./importers/server.nix