diff --git a/configuration.nix b/configuration.nix
index 573ad18..8932281 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -16,6 +16,7 @@
     ./audio.nix
     ./networking.nix
     ./development.nix
+    ./security.nix
   ];
 
   # Bootloader.
@@ -102,10 +103,7 @@
   # programs.mtr.enable = true;
 
   programs = {
-
-    dconf = {
-      enable = true;
-    };
+    dconf.enable = true;
 
     gnupg.agent.enable = true;
 
@@ -137,11 +135,7 @@
 
     flatpak.enable = true;
 
-    gnome = {
-      gnome-keyring.enable = true;
-    };
-
-    pcscd.enable = true;
+    gnome.gnome-keyring.enable = true;
 
     xserver = {
       enable = true;
diff --git a/hyprland/hyprcursor/default.nix b/hyprland/hyprcursor/default.nix
index 2f71e8f..2721587 100644
--- a/hyprland/hyprcursor/default.nix
+++ b/hyprland/hyprcursor/default.nix
@@ -1,13 +1,16 @@
 { pkgs, ... }:
 
 {
+  # TODO Not working correctly, see https://github.com/hyprwm/hyprcursor/issues/19
   home.packages = with pkgs; [
     hyprcursor
   ];
 
+  # TODO remove in favour of hyprland flake
   home.file = {
-    ".local/share/icons/rose-pine-hyprcursor" = {
-      source = ./icons;
+    ".local/share/icons/rose-pine-hyprcursor/manifest.hl".source = ./manifest.hl;
+    ".local/share/icons/rose-pine-hyprcursor/hyprcursors" = {
+      source = ./hyprcursors;
       recursive = true;
     };
   };
diff --git a/hyprland/hyprcursor/icons/X_cursor.hlc b/hyprland/hyprcursor/hyprcursors/X_cursor.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/X_cursor.hlc
rename to hyprland/hyprcursor/hyprcursors/X_cursor.hlc
diff --git a/hyprland/hyprcursor/icons/all-scroll.hlc b/hyprland/hyprcursor/hyprcursors/all-scroll.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/all-scroll.hlc
rename to hyprland/hyprcursor/hyprcursors/all-scroll.hlc
diff --git a/hyprland/hyprcursor/icons/bd_double_arrow.hlc b/hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/bd_double_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/bd_double_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/bottom_left_corner.hlc b/hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/bottom_left_corner.hlc
rename to hyprland/hyprcursor/hyprcursors/bottom_left_corner.hlc
diff --git a/hyprland/hyprcursor/icons/bottom_right_corner.hlc b/hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/bottom_right_corner.hlc
rename to hyprland/hyprcursor/hyprcursors/bottom_right_corner.hlc
diff --git a/hyprland/hyprcursor/icons/bottom_side.hlc b/hyprland/hyprcursor/hyprcursors/bottom_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/bottom_side.hlc
rename to hyprland/hyprcursor/hyprcursors/bottom_side.hlc
diff --git a/hyprland/hyprcursor/icons/center_ptr.hlc b/hyprland/hyprcursor/hyprcursors/center_ptr.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/center_ptr.hlc
rename to hyprland/hyprcursor/hyprcursors/center_ptr.hlc
diff --git a/hyprland/hyprcursor/icons/col-resize.hlc b/hyprland/hyprcursor/hyprcursors/col-resize.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/col-resize.hlc
rename to hyprland/hyprcursor/hyprcursors/col-resize.hlc
diff --git a/hyprland/hyprcursor/icons/color-picker.hlc b/hyprland/hyprcursor/hyprcursors/color-picker.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/color-picker.hlc
rename to hyprland/hyprcursor/hyprcursors/color-picker.hlc
diff --git a/hyprland/hyprcursor/icons/context-menu.hlc b/hyprland/hyprcursor/hyprcursors/context-menu.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/context-menu.hlc
rename to hyprland/hyprcursor/hyprcursors/context-menu.hlc
diff --git a/hyprland/hyprcursor/icons/copy.hlc b/hyprland/hyprcursor/hyprcursors/copy.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/copy.hlc
rename to hyprland/hyprcursor/hyprcursors/copy.hlc
diff --git a/hyprland/hyprcursor/icons/cross.hlc b/hyprland/hyprcursor/hyprcursors/cross.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/cross.hlc
rename to hyprland/hyprcursor/hyprcursors/cross.hlc
diff --git a/hyprland/hyprcursor/icons/crossed_circle.hlc b/hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/crossed_circle.hlc
rename to hyprland/hyprcursor/hyprcursors/crossed_circle.hlc
diff --git a/hyprland/hyprcursor/icons/dnd_no_drop.hlc b/hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/dnd_no_drop.hlc
rename to hyprland/hyprcursor/hyprcursors/dnd_no_drop.hlc
diff --git a/hyprland/hyprcursor/icons/dotbox.hlc b/hyprland/hyprcursor/hyprcursors/dotbox.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/dotbox.hlc
rename to hyprland/hyprcursor/hyprcursors/dotbox.hlc
diff --git a/hyprland/hyprcursor/icons/fd_double_arrow.hlc b/hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/fd_double_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/fd_double_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/hand1.hlc b/hyprland/hyprcursor/hyprcursors/hand1.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/hand1.hlc
rename to hyprland/hyprcursor/hyprcursors/hand1.hlc
diff --git a/hyprland/hyprcursor/icons/hand2.hlc b/hyprland/hyprcursor/hyprcursors/hand2.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/hand2.hlc
rename to hyprland/hyprcursor/hyprcursors/hand2.hlc
diff --git a/hyprland/hyprcursor/icons/left_ptr.hlc b/hyprland/hyprcursor/hyprcursors/left_ptr.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/left_ptr.hlc
rename to hyprland/hyprcursor/hyprcursors/left_ptr.hlc
diff --git a/hyprland/hyprcursor/icons/left_side.hlc b/hyprland/hyprcursor/hyprcursors/left_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/left_side.hlc
rename to hyprland/hyprcursor/hyprcursors/left_side.hlc
diff --git a/hyprland/hyprcursor/icons/link.hlc b/hyprland/hyprcursor/hyprcursors/link.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/link.hlc
rename to hyprland/hyprcursor/hyprcursors/link.hlc
diff --git a/hyprland/hyprcursor/icons/move.hlc b/hyprland/hyprcursor/hyprcursors/move.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/move.hlc
rename to hyprland/hyprcursor/hyprcursors/move.hlc
diff --git a/hyprland/hyprcursor/icons/pencil.hlc b/hyprland/hyprcursor/hyprcursors/pencil.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/pencil.hlc
rename to hyprland/hyprcursor/hyprcursors/pencil.hlc
diff --git a/hyprland/hyprcursor/icons/pirate.hlc b/hyprland/hyprcursor/hyprcursors/pirate.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/pirate.hlc
rename to hyprland/hyprcursor/hyprcursors/pirate.hlc
diff --git a/hyprland/hyprcursor/icons/plus.hlc b/hyprland/hyprcursor/hyprcursors/plus.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/plus.hlc
rename to hyprland/hyprcursor/hyprcursors/plus.hlc
diff --git a/hyprland/hyprcursor/icons/question_arrow.hlc b/hyprland/hyprcursor/hyprcursors/question_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/question_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/question_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/right_ptr.hlc b/hyprland/hyprcursor/hyprcursors/right_ptr.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/right_ptr.hlc
rename to hyprland/hyprcursor/hyprcursors/right_ptr.hlc
diff --git a/hyprland/hyprcursor/icons/right_side.hlc b/hyprland/hyprcursor/hyprcursors/right_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/right_side.hlc
rename to hyprland/hyprcursor/hyprcursors/right_side.hlc
diff --git a/hyprland/hyprcursor/icons/row-resize.hlc b/hyprland/hyprcursor/hyprcursors/row-resize.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/row-resize.hlc
rename to hyprland/hyprcursor/hyprcursors/row-resize.hlc
diff --git a/hyprland/hyprcursor/icons/sb_down_arrow.hlc b/hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/sb_down_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/sb_down_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/sb_h_double_arrow.hlc b/hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/sb_h_double_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/sb_h_double_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/sb_left_arrow.hlc b/hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/sb_left_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/sb_left_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/sb_right_arrow.hlc b/hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/sb_right_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/sb_right_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/sb_up_arrow.hlc b/hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/sb_up_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/sb_up_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/sb_v_double_arrow.hlc b/hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/sb_v_double_arrow.hlc
rename to hyprland/hyprcursor/hyprcursors/sb_v_double_arrow.hlc
diff --git a/hyprland/hyprcursor/icons/top_left_corner.hlc b/hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/top_left_corner.hlc
rename to hyprland/hyprcursor/hyprcursors/top_left_corner.hlc
diff --git a/hyprland/hyprcursor/icons/top_right_corner.hlc b/hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/top_right_corner.hlc
rename to hyprland/hyprcursor/hyprcursors/top_right_corner.hlc
diff --git a/hyprland/hyprcursor/icons/top_side.hlc b/hyprland/hyprcursor/hyprcursors/top_side.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/top_side.hlc
rename to hyprland/hyprcursor/hyprcursors/top_side.hlc
diff --git a/hyprland/hyprcursor/icons/vertical-text.hlc b/hyprland/hyprcursor/hyprcursors/vertical-text.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/vertical-text.hlc
rename to hyprland/hyprcursor/hyprcursors/vertical-text.hlc
diff --git a/hyprland/hyprcursor/icons/wayland-cursor.hlc b/hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/wayland-cursor.hlc
rename to hyprland/hyprcursor/hyprcursors/wayland-cursor.hlc
diff --git a/hyprland/hyprcursor/icons/xterm.hlc b/hyprland/hyprcursor/hyprcursors/xterm.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/xterm.hlc
rename to hyprland/hyprcursor/hyprcursors/xterm.hlc
diff --git a/hyprland/hyprcursor/icons/zoom-in.hlc b/hyprland/hyprcursor/hyprcursors/zoom-in.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/zoom-in.hlc
rename to hyprland/hyprcursor/hyprcursors/zoom-in.hlc
diff --git a/hyprland/hyprcursor/icons/zoom-out.hlc b/hyprland/hyprcursor/hyprcursors/zoom-out.hlc
similarity index 100%
rename from hyprland/hyprcursor/icons/zoom-out.hlc
rename to hyprland/hyprcursor/hyprcursors/zoom-out.hlc
diff --git a/hyprland/hyprcursor/manifest.hl b/hyprland/hyprcursor/manifest.hl
new file mode 100644
index 0000000..99cc530
--- /dev/null
+++ b/hyprland/hyprcursor/manifest.hl
@@ -0,0 +1,4 @@
+name = rose-pine-hyprcursor
+description = BreezeX remixed with Rose Pine remixed to Hyprcursor format
+version = 0.3.2
+cursors_directory = hyprcursors
diff --git a/security.nix b/security.nix
new file mode 100644
index 0000000..c2eaa45
--- /dev/null
+++ b/security.nix
@@ -0,0 +1,17 @@
+{ pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    yubioath-flutter
+  ];
+
+  security.pam.services = {
+    login.u2fAuth = true;
+    sudo.u2fAuth = true;
+  };
+
+  services = {
+    pcscd.enable = true;
+    udev.packages = with pkgs; [ yubikey-personalization ];
+  };
+}