diff --git a/system/.config/espanso/config/default.yml b/system/.config/espanso/config/default.yml
index 1687118..7ec7612 100644
--- a/system/.config/espanso/config/default.yml
+++ b/system/.config/espanso/config/default.yml
@@ -1,2 +1,7 @@
+backend: "Clipboard"
+
 keyboard_layout:
+  rules: "evdev"
+  model: "pc105"
   layout: "ch"
+  variant: "legacy"
diff --git a/system/.config/espanso/match/base.yml b/system/.config/espanso/match/base.yml
index c1c4317..d60c6ae 100644
--- a/system/.config/espanso/match/base.yml
+++ b/system/.config/espanso/match/base.yml
@@ -1,6 +1,6 @@
 matches:
   - trigger: ":mail"
-    replace: severin@kaderli.dev
+    replace: "severin@kaderli.dev"
   - trigger: ":date"
     replace: "{{date}}"
     vars: