diff --git a/homes/x86_64-linux/kylekrein/niri/niri.nix b/homes/x86_64-linux/kylekrein/niri/niri.nix
index 3b17cee..feb4c56 100644
--- a/homes/x86_64-linux/kylekrein/niri/niri.nix
+++ b/homes/x86_64-linux/kylekrein/niri/niri.nix
@@ -7,11 +7,15 @@
   pkgs,
   lib,
   ...
-}: let
+}:
+with lib.custom; let
   username = config.snowfallorg.user.name;
   home = config.snowfallorg.user.home.directory;
 in
   lib.mkIf osConfig.custom.windowManagers.niri.enable {
+    custom = {
+      programs.nautilus = enabled;
+    };
     programs.fuzzel = {
       enable = true;
       settings.main.terminal = "kitty";
@@ -20,6 +24,8 @@ in
       enable = true;
     };
     home.packages = with pkgs; [
+      playerctl
+      papers
       nwg-drawer
       wlogout
       brightnessctl
@@ -136,6 +142,11 @@ in
 
           "XF86MonBrightnessUp".action = sh "brightnessctl set 10%+";
           "XF86MonBrightnessDown".action = sh "brightnessctl set 10%-";
+
+          "XF86AudioNext".action = sh "playerctl next";
+          "XF86AudioPause".action = sh "playerctl play-pause";
+          "XF86AudioPlay".action = sh "playerctl play-pause";
+          "XF86AudioPrev".action = sh "playerctl previous";
           #"Mod+Tab".action = focus-window-down-or-column-right;
           #"Mod+Shift+Tab".action = focus-window-up-or-column-left;
           "Mod+Tab".action = toggle-overview;
@@ -162,7 +173,7 @@ in
           hide-after-inactive-ms = 10000;
         };
         gestures.hot-corners.enable = true;
-        prefer-no-csd = true;
+        prefer-no-csd = !config.custom.hardware.tablet.enable;
         environment = {
           XDG_SESSION_TYPE = "wayland";
           __GL_GSYNC_ALLOWED = "1";
diff --git a/modules/home/programs/nautilus/default.nix b/modules/home/programs/nautilus/default.nix
new file mode 100644
index 0000000..62f67b3
--- /dev/null
+++ b/modules/home/programs/nautilus/default.nix
@@ -0,0 +1,28 @@
+{
+  lib,
+  pkgs,
+  inputs,
+  namespace,
+  system,
+  target,
+  format,
+  virtual,
+  systems,
+  config,
+  ...
+}:
+with lib;
+with lib.${namespace}; let
+  cfg = config.${namespace}.programs.nautilus;
+in {
+  options.${namespace}.programs.nautilus = with types; {
+    enable = mkBoolOpt false "Enable nautilus on platforms, that are not GNOME";
+  };
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      nautilus
+      adwaita-icon-theme
+    ];
+  };
+}
diff --git a/modules/nixos/presets/workstation/default.nix b/modules/nixos/presets/workstation/default.nix
index e6e913c..a92b8c3 100644
--- a/modules/nixos/presets/workstation/default.nix
+++ b/modules/nixos/presets/workstation/default.nix
@@ -45,6 +45,7 @@ in {
 
     environment.systemPackages = with pkgs;
     with pkgs.${namespace}; [
+      rnote
       libreoffice
       root-files
       gparted
diff --git a/packages/wvkbd-kylekrein/default.nix b/packages/wvkbd-kylekrein/default.nix
index d63f1ef..e850e70 100644
--- a/packages/wvkbd-kylekrein/default.nix
+++ b/packages/wvkbd-kylekrein/default.nix
@@ -8,12 +8,12 @@ in
   wvkbd.overrideAttrs (final: prev: {
     pname = "wvkbd-kylekrein";
     name = "wvkbd-kylekrein";
-    version = "0.17";
+    version = "0.17-kylekrein";
     src = fetchFromGitHub {
-      owner = "Paulicat";
+      owner = "KyleKrein";
       repo = "wvkbd";
-      rev = "ac02545ab6f6ccfa5b6f132414021ba57ea73096";
-      hash = "sha256-py/IqNEEaTOx/9W935Vc47WoNFz99+bNaYD0sL//JmY=";
+      rev = "ed46e1b0e64fd105402dc85e607892343677f5bd";
+      hash = "sha256-xhn3QjKJL53K59oSnnLFVEv4AyRUGhYBoqSwJe4qfxE=";
     };
     installFlags = prev.installFlags ++ ["LAYOUT=vistath"];
     patches = prev.patches or [] ++ [smithay-patch];