diff --git a/home/sway/default.nix b/home/sway/default.nix
index bee2a93..a30ebb8 100644
--- a/home/sway/default.nix
+++ b/home/sway/default.nix
@@ -182,17 +182,19 @@ lib.mkIf osConfig.programs.sway.enable {
           "*" = {
             xkb_layout = "fr,us";
             xkb_options = "grp:alt_shift_toggle,compose:caps";
+            xkb_numlock = "enabled";
           };
           "${inputs.kb.builtin}" = {
             xkb_layout = "fr";
           };
           "${inputs.kb.keychron}" = {
             xkb_layout = "us";
-            xkb_numlock = "enabled";
           };
           "${inputs.kb.keychron_bt}" = {
             xkb_layout = "us";
-            xkb_numlock = "enabled";
+          };
+          "7504:24926:ZMK_Project_TOTEM_Keyboard" = {
+            xkb_layout = "us";
           };
           "type:touchpad" = {
             tap = "enabled";
diff --git a/hosts/marr/default.nix b/hosts/marr/default.nix
index f4c22e6..231422f 100644
--- a/hosts/marr/default.nix
+++ b/hosts/marr/default.nix
@@ -74,7 +74,6 @@
 
   programs = {
     dconf.enable = true;
-    steam.enable = true;
     fish.enable = true;
     firefox.enable = true;
     thunderbird.enable = true;
@@ -176,7 +175,6 @@
     glib
     wireguard-tools
     dconf
-    pwvucontrol
     xdg-utils
     brightnessctl
     pop-icon-theme
diff --git a/hosts/marr/home.nix b/hosts/marr/home.nix
index 87df9a3..9b87394 100644
--- a/hosts/marr/home.nix
+++ b/hosts/marr/home.nix
@@ -50,7 +50,6 @@
         digikam
         fragments
         element-desktop
-        libreoffice
         loupe
         seahorse
         gimp
@@ -59,6 +58,8 @@
         protonmail-bridge-gui
         varia
         signal-desktop
+        onlyoffice-desktopeditors
+        picard
 
         # Proprietary
         postman