diff --git a/profiles/contexts/desktop/wm/hyprland.nix b/profiles/contexts/desktop/wm/hyprland.nix
index f5666b2..fb11344 100644
--- a/profiles/contexts/desktop/wm/hyprland.nix
+++ b/profiles/contexts/desktop/wm/hyprland.nix
@@ -40,7 +40,7 @@ in {
         ];
 
         input = {
-          kb_layout = "de,us";
+          kb_layout = "us";
           kb_variant = "";
           kb_model = "";
           kb_rules = "";
@@ -97,17 +97,47 @@ in {
         };
 
         device = [
+          # Alle normalen Keyboards explizit auf de setzen:
           {
-            name = "zsa-technology-labs-moonlander-mark-i";
-            kb_layout = "us";
+            name = "video-bus";
+            kb_layout = "de,us";
+            kb_options = "ctrl:nocaps";
+          }
+          {
+            name = "razer-razer-pro-click-v2-vertical-edition-keyboard";
+            kb_layout = "de,us";
+            kb_options = "ctrl:nocaps";
+          }
+          {
+            name = "razer-razer-pro-click-v2-vertical-edition-1";
+            kb_layout = "de,us";
+            kb_options = "ctrl:nocaps";
           }
           {
             name = "vibe-typer-virtual-keyboard";
             kb_layout = "de";
+            kb_options = "ctrl:nocaps";
           }
           {
             name = "keychron-keychron-k7";
             kb_layout = "us";
+            kb_options = "ctrl:nocaps";
+          }
+          # Moonlander Sub-Devices bleiben us (erben global)
+          {
+            name = "zsa-technology-labs-moonlander-mark-i-consumer-control";
+            kb_layout = "us";
+            kb_options = "ctrl:nocaps";
+          }
+          {
+            name = "zsa-technology-labs-moonlander-mark-i-keyboard";
+            kb_layout = "us";
+            kb_options = "ctrl:nocaps";
+          }
+          {
+            name = "zsa-technology-labs-moonlander-mark-i-system-control";
+            kb_layout = "us";
+            kb_options = "ctrl:nocaps";
           }
         ];
 
@@ -150,6 +180,10 @@ in {
           "match:initial_title .*streamlabs.com.*, no_shadow on"
           "match:initial_title .*streamlabs.com.*, no_blur on"
           "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_blur on"
+          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_shadow on"
+          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_anim on"
+          "match:class ^vibe-typer$, match:title ^Recording Indicator$, border_size 0"
+          "match:class ^vibe-typer$, match:title ^Recording Indicator$, no_focus on"
           "border_color rgb(ffffff), match:xwayland 1"
         ];
 
diff --git a/users/m3tam3re/identities/work.nix b/users/m3tam3re/identities/work.nix
index 8aaef44..0d4f292 100644
--- a/users/m3tam3re/identities/work.nix
+++ b/users/m3tam3re/identities/work.nix
@@ -44,29 +44,29 @@
   programs.ssh = {
     enable = true;
     enableDefaultConfig = false;
-    matchBlocks = {
+    settings = {
       "AZ-CLD-1" = {
-        hostname = "152.53.186.119";
-        user = "sascha.koenig";
-        port = 2022;
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "152.53.186.119";
+        User = "sascha.koenig";
+        Port = 2022;
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "AZ-PRM-1" = {
-        hostname = "192.168.152.76";
-        user = "sascha.koenig";
-        port = 2022;
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "192.168.152.76";
+        User = "sascha.koenig";
+        Port = 2022;
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "git.az-gruppe.com" = {
-        hostname = "git.az-gruppe.com";
-        port = 2022;
-        user = "sascha.koenig";
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "git.az-gruppe.com";
+        Port = 2022;
+        User = "sascha.koenig";
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
       "code.m3ta.dev" = {
-        hostname = "code.m3ta.dev";
-        user = "m3tam3re";
-        identityFile = "~/.ssh/sascha.koenig";
+        HostName = "code.m3ta.dev";
+        User = "m3tam3re";
+        IdentityFile = "~/.ssh/sascha.koenig";
       };
     };
   };