diff --git a/system/.config/espanso/config/default.yml b/system/.config/espanso/config/default.yml
new file mode 100644
index 0000000..1687118
--- /dev/null
+++ b/system/.config/espanso/config/default.yml
@@ -0,0 +1,2 @@
+keyboard_layout:
+  layout: "ch"
diff --git a/system/.config/espanso/default.yml b/system/.config/espanso/match/base.yml
similarity index 73%
rename from system/.config/espanso/default.yml
rename to system/.config/espanso/match/base.yml
index 7fc07ad..c1c4317 100644
--- a/system/.config/espanso/default.yml
+++ b/system/.config/espanso/match/base.yml
@@ -1,30 +1,23 @@
-keyboard-layout:
-  layout: "ch"
-evdev_modifier_delay: 20
 matches:
   - trigger: ":mail"
-    replace: "severin@kaderli.dev"
-
+    replace: severin@kaderli.dev
   - trigger: ":date"
     replace: "{{date}}"
     vars:
       - name: date
         type: date
-        params: 
+        params:
           format: "%F"
-
   - trigger: ":iso"
     replace: "{{date}}"
     vars:
       - name: date
         type: date
-        params: 
+        params:
           format: "%+"
-
   - trigger: ":sig"
     replace: |
       Freundliche Grüsse
 
       Severin Kaderli
       https://kaderli.dev
-...