diff --git a/home-manager/hyprland/default.nix b/home-manager/hyprland/default.nix
index 28bf06b..4dd1277 100644
--- a/home-manager/hyprland/default.nix
+++ b/home-manager/hyprland/default.nix
@@ -1,4 +1,4 @@
-# Home configurations for Hyprland. For system configs, see ./hyprland
+# Home configurations for Hyprland. For system configs, see ./modules/hyprland
 {
   imports = [
     ./binds.nix
@@ -12,11 +12,7 @@
 
   programs = {
     btop.enable = true;
-    kitty = {
-      settings = {
-        window_padding_width = 10;
-      };
-    };
+    kitty.settings.window_padding_width = 10;
   };
 
   wayland.windowManager.hyprland.enable = true;
diff --git a/home-manager/hyprland/hyprcursor/default.nix b/home-manager/hyprland/hyprcursor/default.nix
index 6978f3c..c316031 100644
--- a/home-manager/hyprland/hyprcursor/default.nix
+++ b/home-manager/hyprland/hyprcursor/default.nix
@@ -1,17 +1,21 @@
 { pkgs, ... }:
 
 {
-  # TODO Not working correctly, see https://github.com/hyprwm/hyprcursor/issues/19
-  home.packages = with pkgs; [
-    hyprcursor
-  ];
+  home = {
+    packages = with pkgs; [
+      hyprcursor
+    ];
 
-  # TODO remove in favour of hyprland flake?
-  home.file = {
-    ".local/share/icons/rose-pine-hyprcursor/manifest.hl".source = ./manifest.hl;
-    ".local/share/icons/rose-pine-hyprcursor/hyprcursors" = {
-      source = ./hyprcursors;
-      recursive = true;
+    file = {
+      ".local/share/icons/rose-pine-hyprcursor/manifest.hl".source = ./manifest.hl;
+      ".local/share/icons/rose-pine-hyprcursor/hyprcursors" = {
+        source = ./hyprcursors;
+        recursive = true;
+      };
     };
   };
+
+  wayland.windowManager.hyprland.settings.exec-once = [
+    "hyprctl setcursor $HYPRCURSOR_THEME $HYPRCURSOR_SIZE" # Set cursor
+  ];
 }
diff --git a/home-manager/hyprland/settings.nix b/home-manager/hyprland/settings.nix
index 3dd95a2..1143f6e 100644
--- a/home-manager/hyprland/settings.nix
+++ b/home-manager/hyprland/settings.nix
@@ -186,8 +186,8 @@
     };
 
     misc = {
-      force_default_wallpaper = -1; # Set to 0 or 1 to disable the anime mascot wallpapers
-      disable_hyprland_logo = false; # If true disables the random hyprland logo / anime girl background. :(
+      force_default_wallpaper = 0;
+      disable_hyprland_logo = true;
     };
 
     debug.disable_logs = false;
@@ -196,11 +196,8 @@
     input = {
       kb_layout = "gb,no";
       kb_options = "grp:alt_shift_toggle";
-
       follow_mouse = 1;
-
       sensitivity = 0; # -1.0 - 1.0, 0 means no modification.
-
       touchpad.natural_scroll = false;
     };