diff --git a/.config/espanso/default.yml b/.config/espanso/default.yml
index 4e71ac3..facd25b 100644
--- a/.config/espanso/default.yml
+++ b/.config/espanso/default.yml
@@ -3,11 +3,11 @@
 
 matches:
   # Simple replacements
-  - trigger: ":gr"
+  - trigger: ":grue"
     replace: "Grüße,\nJanek"
 
-  - trigger: ":reg"
-    replace: "Kind Regards,\nJanek"
+  - trigger: ":gree"
+    replace: "Best,\nJanek"
 
   - trigger: ":date"
     replace: "{{mydate}}"
@@ -51,6 +51,14 @@ matches:
         params:
           cmd: "pass information/email/uni"
 
+  - trigger: ":eaur"
+    replace: "{{output}}"
+    vars:
+      - name: output
+        type: shell
+        params:
+          cmd: "pass information/email/aur"
+
   - trigger: ":a0"
     replace: "{{output}}"
     vars:
@@ -83,6 +91,14 @@ matches:
         params:
           cmd: "pass information/address | tail -1"
 
+  - trigger: ":tel"
+    replace: "{{output}}"
+    vars:
+      - name: output
+        type: shell
+        params:
+          cmd: "pass information/phone"
+
   - trigger: ":add"
     replace: "{{output}}"
     vars:
diff --git a/.config/nvim/init/general.vim b/.config/nvim/init/general.vim
index c253cfc..782c220 100644
--- a/.config/nvim/init/general.vim
+++ b/.config/nvim/init/general.vim
@@ -46,7 +46,7 @@ autocmd Filetype * setlocal formatoptions-=o | setlocal formatoptions+=qjln12r "
 autocmd Filetype json syntax match Comment +\/\/.\+$+ " Comment highlighting in JSON
 autocmd Filetype markdown let &comments = "b:*,b:-,b:+," . &comments
 " custom hardcoded types
-autocmd BufRead,BufNewFile $CONFIG_SHELLS/*,$CONFIG_ZSH/* setlocal filetype=zsh
+autocmd BufRead,BufNewFile $CONFIG_SHELLS/*,$CONFIG_ZSH/* setlocal filetype=bash
 autocmd BufRead $XDG_CONFIG_HOME/yadm/bootstrap setlocal filetype=sh
 
 " shebang shortcut - https://www.reddit.com/r/vim/comments/4z7z7s/add_shebang_lines_to_your_vim_files_automatically/d6v7op8 and https://stackoverflow.com/a/52135425
diff --git a/.config/nvim/init/plug.vim b/.config/nvim/init/plug.vim
index 40a4e0d..4b6beef 100644
--- a/.config/nvim/init/plug.vim
+++ b/.config/nvim/init/plug.vim
@@ -49,6 +49,7 @@ Plug 'nathanaelkane/vim-indent-guides'
 let g:indent_guides_enable_on_vim_startup = 1
 
 " Integrations
+Plug 'weinshec/vim-dictcc'
 Plug 'glacambre/firenvim', { 'do': { _ -> firenvim#install(0) } }
 Plug 'mipmip/vim-scimark'             " Edit markdown tables with sc-im
 
diff --git a/.config/nvim/init/pluginConfig.vim b/.config/nvim/init/pluginConfig.vim
index 13326e2..047d2e9 100644
--- a/.config/nvim/init/pluginConfig.vim
+++ b/.config/nvim/init/pluginConfig.vim
@@ -30,7 +30,7 @@ let g:firenvim_config = {
         \ '.*': {
             \ 'cmdline': 'firenvim',
             \ 'priority': 0,
-            \ 'selector': 'textarea:not([readonly]):not([class="handsontableInput"]):not([wrap="off"]):not([rows="1"]),
+            \ 'selector': 'textarea:not([readonly]):not([class="handsontableInput"]):not([wrap="off"]):not([rows="1"]):not([title="Replace"]):not([title="Search"]),
                 \ div[role="textbox"]:not([aria-label="Search"])',
             \ 'takeover': 'always',
         \ },
@@ -38,6 +38,7 @@ let g:firenvim_config = {
         \ '.*twitter\.com.*':           { 'priority': 9, 'takeover': 'never', },
         \ '.*openstreetmap\.org.*':     { 'priority': 9, 'takeover': 'never', },
         \ '.*wikipedia\.org.*':         { 'priority': 9, 'takeover': 'never', },
+        \ '.*wikidata\.org.*':          { 'priority': 9, 'takeover': 'never', },
         \
         \ '.*docs\.google\.com.*':      { 'priority': 9, 'takeover': 'never', },
         \ '.*contacts\.google\.com.*':  { 'priority': 9, 'takeover': 'never', },
diff --git a/.config/yay/config.json b/.config/yay/config.json
index e0fe377..be5fa56 100644
--- a/.config/yay/config.json
+++ b/.config/yay/config.json
@@ -27,7 +27,7 @@
 	"requestsplitn": 150,
 	"sortmode": 0,
 	"completionrefreshtime": 7,
-	"sudoloop": false,
+	"sudoloop": true,
 	"timeupdate": false,
 	"devel": false,
 	"cleanAfter": false,