diff --git a/hosts/nb-new.cloonar.com/configuration.nix b/hosts/nb-new.cloonar.com/configuration.nix
index 79428f9..99e76ee 100644
--- a/hosts/nb-new.cloonar.com/configuration.nix
+++ b/hosts/nb-new.cloonar.com/configuration.nix
@@ -39,9 +39,16 @@ in {
   # nixos cross building qemu
   boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
   boot.supportedFilesystems = [ "ntfs" ];
-  boot.plymouth.enable = true;
-  boot.plymouth.theme = "breeze";
-  boot.kernelParams = ["quiet"];
+  boot.plymouth = {
+    enable = true;
+    theme = "spin";
+    themePackages = with pkgs; [
+      # By default we would install all themes
+      (adi1090x-plymouth-themes.override {
+        selected_themes = [ "spin" ];
+      })
+    ];
+  };
 
   environment.persistence."/nix/persist/system" = {
     hideMounts = true;
diff --git a/hosts/nb-new.cloonar.com/hardware-configuration.nix b/hosts/nb-new.cloonar.com/hardware-configuration.nix
index 155d318..1d4d4cf 100644
--- a/hosts/nb-new.cloonar.com/hardware-configuration.nix
+++ b/hosts/nb-new.cloonar.com/hardware-configuration.nix
@@ -26,7 +26,14 @@
       fsType = "f2fs";
     };
 
-  boot.initrd.luks.devices."enc".device = "/dev/disk/by-uuid/08897ecb-23ce-4352-a1fc-fa442b9e0f72";
+  boot.initrd = {
+    luks.devices."enc" = {
+      crypttabExtraOpts = [ "fido2-device=auto" ];
+      device = "/dev/disk/by-uuid/08897ecb-23ce-4352-a1fc-fa442b9e0f72";
+    };
+    systemd.enable = true;
+  };
+
 
   fileSystems."/boot" =
     { device = "/dev/disk/by-uuid/1521-B173";
diff --git a/hosts/nb-new.cloonar.com/modules/sway/sway.conf b/hosts/nb-new.cloonar.com/modules/sway/sway.conf
index 8f7e2f0..ea26c5b 100644
--- a/hosts/nb-new.cloonar.com/modules/sway/sway.conf
+++ b/hosts/nb-new.cloonar.com/modules/sway/sway.conf
@@ -17,16 +17,16 @@ set $up     k
 set $right  l
 
 # define names for workspaces
-set $ws1    "1: "
-set $ws2    "2: "
-set $ws3    "3: "
-set $ws4    "4: "
-set $ws5    "5: "
-set $ws6    "6: "
-set $ws7    "7: "
-set $ws8    "8: "
-set $ws9    "9: "
-set $ws10   "10: "
+set $ws1    "1:  "
+set $ws2    "2:  "
+set $ws3    "3:  "
+set $ws4    "4:  "
+set $ws5    "5:  "
+set $ws6    "6:  "
+set $ws7    "7:  "
+set $ws8    "8:  "
+set $ws9    "9:  "
+set $ws10   "10:  "
 
 # assign workspaces to primary monitor
 workspace $ws1 output primary
diff --git a/hosts/nb-new.cloonar.com/modules/sway/waybar.conf b/hosts/nb-new.cloonar.com/modules/sway/waybar.conf
index 504fae6..6804f27 100644
--- a/hosts/nb-new.cloonar.com/modules/sway/waybar.conf
+++ b/hosts/nb-new.cloonar.com/modules/sway/waybar.conf
@@ -69,20 +69,24 @@
 "tooltip": false
 },
 "clock#2": {
-"format": "{:%H:%M}",
-"tooltip": false
+  "format": "{:%H:%M}",
+  "tooltip": false
 },
 "clock#3": {
-"format": "{:%d.%m}",
-"tooltip": false
+  "format": "{:%d.%m}",
+  "tooltip": false
 },
 
   "pulseaudio": {
-      "format": "{icon}{volume}%",
-      "format-muted": "ﱝ",
+      "format": "{icon} {volume}%",
+      "format-bluetooth": "󰂰",
+      "format-muted": "󰝟",
+      "format-source-muted": " ",
       "format-icons": {
-          "phone": ["奄", "奔", "墳"],
-          "default": ["奄", "奔", "墳"]
+          "headphone": " ",
+          "hands-free": " ",
+          "headset": " ",
+          "default": ["", "", " "]
       },
       "scroll-step": 5,
       "on-click": "pavucontrol",
@@ -90,43 +94,62 @@
   },
   "network": {
       // "interface": "wlp2*", // (Optional) To force the use of this interface
-      "format-wifi": "{essid} ({signalStrength}%) ",
+      "format-wifi": "{essid} ({signalStrength}%)  ",
       "format-ethernet": "{ipaddr}/{cidr} ",
       "tooltip-format": "{ifname} via {gwaddr} ",
       "format-linked": "{ifname} (No IP) ",
       "format-disconnected": "Disconnected ",
       "format-alt": "{ifname}: {ipaddr}/{cidr}"
   },
-"memory": {
-"interval": 5,
-"format": "{}%"
-},
-"cpu": {
-"interval": 5,
-"format": "﬙{usage:2}%"
-},
-"battery": {
-"states": {
-"good": 95,
-"warning": 30,
-"critical": 15
-},
-"format": "{icon} {capacity}%",
-"format-icons": [
-"",
-"",
-"",
-"",
-""
-]
-},
-"disk": {
-"interval": 5,
-"format": "{percentage_used:2}%",
-"path": "/home/"
-},
-"tray": {
-"icon-size": 20
-}
+  "memory": {
+    "interval": 5,
+    "format": " {}%"
+  },
+  "cpu": {
+    "interval": 5,
+    "format": " {usage:2}%"
+  },
+  "battery": {
+    "states": {
+      "good": 95,
+      "warning": 30,
+      "critical": 15
+    },
+    "format": "{icon} {capacity}%",
+    "format-icons": {
+      "charging": [
+        "󰢜",
+        "󰂆",
+        "󰂇",
+        "󰂈",
+        "󰢝",
+        "󰂉",
+        "󰢞",
+        "󰂊",
+        "󰂋",
+        "󰂅"
+      ],
+      "default": [
+        "󰁺",
+        "󰁻",
+        "󰁼",
+        "󰁽",
+        "󰁾",
+        "󰁿",
+        "󰂀",
+        "󰂁",
+        "󰂂",
+        "󰁹"
+      ]
+    },
+  },
+  "disk": {
+    "interval": 5,
+    "format": " {percentage_used:2}%",
+    "path": "/home/"
+  },
+  "tray": {
+    "icon-size": 20
+  }
 }
 
diff --git a/hosts/nb-new.cloonar.com/users/configs/project_history b/hosts/nb-new.cloonar.com/users/configs/project_history
index 5ddc1b4..91dbcf1 100644
--- a/hosts/nb-new.cloonar.com/users/configs/project_history
+++ b/hosts/nb-new.cloonar.com/users/configs/project_history
@@ -1,3 +1,4 @@
+/home/dominik/projects/cloonar/support-invoiced
 /home/dominik/projects/cloonar/cloonar-nixos
 /home/dominik/projects/cloonar/cloonar-website
 /home/dominik/projects/cloonar/wohnservice-wien
diff --git a/hosts/nb-new.cloonar.com/users/dominik.nix b/hosts/nb-new.cloonar.com/users/dominik.nix
index 12b5d0c..e6a3ace 100644
--- a/hosts/nb-new.cloonar.com/users/dominik.nix
+++ b/hosts/nb-new.cloonar.com/users/dominik.nix
@@ -329,6 +329,7 @@ in
     home.activation.projects = lib.hm.dag.entryAfter ["writeBoundary"] ''
       PATH="${pkgs.git}/bin:${pkgs.openssh}/bin:$PATH"
       set +eu
+      git clone gitea@git.cloonar.com:Cloonar/support-invoiced.git /nix/persist/user/dominik/projects/cloonar/support-invoiced 2>/dev/null
       git clone gitea@git.cloonar.com:Cloonar/nixos.git /nix/persist/user/dominik/projects/cloonar/cloonar-nixos 2>/dev/null
       git clone gitea@git.cloonar.com:Cloonar/website.git /nix/persist/user/dominik/projects/cloonar/cloonar-website 2>/dev/null
       git clone gitea@git.cloonar.com:Cloonar/wohnservice-wien-typo3.git /nix/persist/user/dominik/projects/cloonar/wohnservice-wien 2>/dev/null