diff --git a/.config/espanso/match/base.yml b/.config/espanso/match/base.yml
index a6d1d2e..d935cc1 100644
--- a/.config/espanso/match/base.yml
+++ b/.config/espanso/match/base.yml
@@ -24,3 +24,12 @@ matches:
         type: shell
         params:
           cmd: "curl 'https://api.ipify.org'"
+  # Data
+  - trigger: ":bic"
+    replace: "BYLADEM1001"
+  - trigger: ":dkb"
+    replace: "Deutsche Kreditbank"
+  # Phrases
+  - trigger: ":ek"
+    replace: "passt :) schauen sie auch gerne noch die anderen Sachen an, wir sortieren grad einiges aus ;)"
+
diff --git a/.config/espanso/match/pass.yml b/.config/espanso/match/pass.yml
index d046145..18ae832 100644
--- a/.config/espanso/match/pass.yml
+++ b/.config/espanso/match/pass.yml
@@ -1,5 +1,6 @@
 # Sensitive data through pass
 matches:
+  # {{{1 EMAILS
   - trigger: ":ep"
     replace: "{{output}}"
     vars:
@@ -28,6 +29,8 @@ matches:
         type: shell
         params:
           cmd: pass info/email/aur
+  # {{{1 ADDRESS
+  # Postal name
   - trigger: ":a0"
     replace: "{{output}}"
     vars:
@@ -35,6 +38,7 @@ matches:
         type: shell
         params:
           cmd: pass info/address | head -1
+  # Street Address
   - trigger: ":a1"
     replace: "{{output}}"
     vars:
@@ -42,6 +46,7 @@ matches:
         type: shell
         params:
           cmd: pass info/address | head -2 | tail -1
+  # Street
   - trigger: ":as"
     replace: "{{output}}"
     vars:
@@ -49,6 +54,7 @@ matches:
         type: shell
         params:
           cmd: "pass info/address | head -2 | tail -1 | cut -d' ' -f1"
+  # PLZ + City
   - trigger: ":a2"
     replace: "{{output}}"
     vars:
@@ -56,6 +62,7 @@ matches:
         type: shell
         params:
           cmd: pass info/address | tail -1
+  # PLZ
   - trigger: ":ap"
     replace: "{{output}}"
     vars:
@@ -63,6 +70,7 @@ matches:
         type: shell
         params:
           cmd: "pass info/address | tail -1 | cut -d' ' -f1"
+  # City
   - trigger: ":ac"
     replace: "{{output}}"
     vars:
@@ -91,6 +99,7 @@ matches:
         type: shell
         params:
           cmd: pass info/address
+  # {{{1 NUMBERS
   - trigger: ":tax"
     replace: "{{output}}"
     vars:
@@ -119,6 +128,7 @@ matches:
         type: shell
         params:
           cmd: pass info/banking/dkb | head -1
+  # {{{1 EXTRAS
   - trigger: ":sigo"
     replace: |-
       #+ATTR_ORG: :width 200
diff --git a/.config/ukuu.json##distro.Ubuntu b/.config/ukuu.json##distro.Ubuntu
deleted file mode 100644
index e551040..0000000
--- a/.config/ukuu.json##distro.Ubuntu
+++ /dev/null
@@ -1,12 +0,0 @@
-{
-  "notify_major" : "false",
-  "notify_minor" : "false",
-  "notify_bubble" : "false",
-  "notify_dialog" : "false",
-  "hide_unstable" : "true",
-  "hide_older" : "true",
-  "notify_interval_unit" : "2",
-  "notify_interval_value" : "10",
-  "grub_timeout" : "5",
-  "update_grub_timeout" : "false"
-}
\ No newline at end of file