diff --git a/.config/espanso/config/default.yml b/.config/espanso/config/default.yml
new file mode 100644
index 0000000..73c9cd3
--- /dev/null
+++ b/.config/espanso/config/default.yml
@@ -0,0 +1 @@
+search_shortcut: ALT+SHIFT+SPACE
diff --git a/.config/espanso/default.yml b/.config/espanso/match/base.yml
similarity index 68%
rename from .config/espanso/default.yml
rename to .config/espanso/match/base.yml
index 8bafff2..92bec58 100644
--- a/.config/espanso/default.yml
+++ b/.config/espanso/match/base.yml
@@ -1,14 +1,15 @@
-# espanso configuration file
-# https://espanso.org/docs/
+# Automatically generated by espanso migration tool
+# Original file: default.yml
 
 matches:
-  # Simple replacements
   - trigger: ":grue"
-    replace: "Grüße,\nJanek"
-
+    replace: |-
+      Grüße,
+      Janek
   - trigger: ":gree"
-    replace: "Best,\nJanek"
-
+    replace: |-
+      Best,
+      Janek
   - trigger: ":date"
     replace: "{{mydate}}"
     vars:
@@ -16,7 +17,6 @@ matches:
         type: date
         params:
           format: "%Y-%m-%d"
-
   # Shell commands
   - trigger: ":ip"
     replace: "{{output}}"
@@ -25,7 +25,6 @@ matches:
         type: shell
         params:
           cmd: "curl 'https://api.ipify.org'"
-
   # Sensitive data through pass
   - trigger: ":ep"
     replace: "{{output}}"
@@ -33,132 +32,116 @@ matches:
       - name: output
         type: shell
         params:
-          cmd: "pass information/email/personal"
-
+          cmd: pass info/email/personal
   - trigger: ":ec"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/email/church"
-
+          cmd: pass info/email/church
   - trigger: ":eu"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/email/uni"
-
+          cmd: pass info/email/uni
   - trigger: ":eaur"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/email/aur"
-
+          cmd: pass info/email/aur
   - trigger: ":a0"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address | head -1"
-
+          cmd: pass info/address | head -1
   - trigger: ":a1"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address | head -2 | tail -1"
-
+          cmd: pass info/address | head -2 | tail -1
   - trigger: ":as"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address | head -2 | tail -1 | cut -d' ' -f1"
-
+          cmd: "pass info/address | head -2 | tail -1 | cut -d' ' -f1"
   - trigger: ":a2"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address | tail -1"
-
+          cmd: pass info/address | tail -1
   - trigger: ":ap"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address | tail -1 | cut -d' ' -f1"
-
+          cmd: "pass info/address | tail -1 | cut -d' ' -f1"
   - trigger: ":ac"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address | tail -1 | cut -d' ' -f2"
-
+          cmd: "pass info/address | tail -1 | cut -d' ' -f2"
   - trigger: ":tel"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/phone"
-
+          cmd: pass info/phone
   - trigger: ":adt"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address-bt"
-
+          cmd: pass info/address-bt
   - trigger: ":add"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/address"
-
+          cmd: pass info/address
   - trigger: ":tax"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/tax-id | head -1"
-
+          cmd: pass info/tax-id | head -1
   - trigger: ":ss"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/social-security | head -1"
-
+          cmd: pass info/social-security | head -1
   - trigger: ":sign"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/signature"
-
+          cmd: pass info/signature
   - trigger: ":iban"
     replace: "{{output}}"
     vars:
       - name: output
         type: shell
         params:
-          cmd: "pass information/banking/dkb | head -1"
+          cmd: pass info/banking/dkb | head -1
diff --git a/.config/espanso/match/packages/basic-emojis/package.yml b/.config/espanso/match/packages/basic-emojis/package.yml
new file mode 100644
index 0000000..caf91a3
--- /dev/null
+++ b/.config/espanso/match/packages/basic-emojis/package.yml
@@ -0,0 +1,28 @@
+# Automatically generated by espanso migration tool
+# Original file: packages/basic-emojis/package.yml
+
+matches:
+  - trigger: ":lol"
+    replace: 😂
+  - trigger: ":llol"
+    replace: 😂😂😂😂
+  - trigger: ":sad"
+    replace: ☹
+  - trigger: ":ssad"
+    replace: ☹☹☹☹
+  - trigger: ":sml"
+    replace: 😊
+  - trigger: ":strong"
+    replace: 💪
+  - trigger: ":stlol"
+    replace: 💪😂
+  - trigger: ":ok"
+    replace: 👍
+  - trigger: ":ook"
+    replace: 👍👍👍👍
+  - trigger: ":happy"
+    replace: 😄
+  - trigger: ":cry"
+    replace: 😭
+  - trigger: ":wow"
+    replace: 😮