diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..e43b0f9
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.DS_Store
diff --git a/match/.DS_Store b/match/.DS_Store
index 404efbf..423c7fd 100644
Binary files a/match/.DS_Store and b/match/.DS_Store differ
diff --git a/match/git.yml b/match/git.yml
index c20b30c..1515ec6 100644
--- a/match/git.yml
+++ b/match/git.yml
@@ -1,22 +1,21 @@
 # Git Snippets for Espanso
 matches:
   # === BASIC COMMANDS ===
-
   # Git init
-  - trigger: "}ginit"
+  - trigger: "}giti"
     replace: "git init"
 
   # Git clone
-  - trigger: "}gclone"
+  - trigger: "}gitcl"
     replace: "git clone $1$"
 
   # Git status
-  - trigger: "}gst"
+  - trigger: "}gits"
     replace: "git status"
 
   # Git add
-  - trigger: "}ga"
-    #replace: "git add $1$"
+  - trigger: "}gita"
+    # replace: "git add $1$"
     vars:
       - name: "dot"
         type: "choice"
@@ -33,19 +32,19 @@ matches:
     replace: "git add {{dot}}{{file}}"
 
   # Git commit
-  - trigger: "}gcs"
+  - trigger: "}gitc"
     replace: 'git commit -m "$|$"'
 
   # Git commit with amend
-  - trigger: "}gca"
+  - trigger: "}gitcam"
     replace: 'git commit --amend -m "$|$"'
 
   # Git commit all
-  - trigger: "}gcaa"
+  - trigger: "}gitcal"
     replace: 'git commit -am "$|$"'
 
   # Git push
-  - trigger: "}gp"
+  - trigger: "}gitp"
     #replace: "git push $1$ $2$"
     vars:
       - name: "option"
@@ -63,10 +62,11 @@ matches:
             - "origin main"
             - "origin master"
             - "origin HEAD"
+            - "origin development"
     replace: "git push {{option}} {{remote_branch}}"
 
   # Git pull
-  - trigger: "}gl"
+  - trigger: "}gitpl"
     #replace: "git pull $1$ $2$"
     vars:
       - name: "option"
@@ -82,11 +82,13 @@ matches:
             - ""
             - "origin main"
             - "origin master"
+            - "origin HEAD"
+            - "origin development"
     replace: "git pull {{option}} {{remote_branch}}"
 
   # Git fetch
-  - trigger: "}gf"
-    #replace: "git fetch $1$"
+  - trigger: "}gitf"
+    # replace: "git fetch $1$"
     vars:
       - name: "remote"
         type: "choice"
@@ -98,11 +100,11 @@ matches:
     replace: "git fetch {{remote}}"
 
   # Git log
-  - trigger: "}glg"
+  - trigger: "}gitlg"
     replace: "git log --oneline --graph --all"
 
   # Git diff
-  - trigger: "}gd"
+  - trigger: "}gitdf"
     #replace: "git diff $1$"
     vars:
       - name: "option"
@@ -115,7 +117,7 @@ matches:
     replace: "git diff {{option}}"
 
   # Git checkout
-  - trigger: "}gco"
+  - trigger: "}gitco"
     #replace: "git checkout $1$"
     vars:
       - name: "what"
@@ -132,11 +134,11 @@ matches:
             - "$|$"
             - "main"
             - "master"
-            - "develop"
+            - "development"
     replace: "git checkout {{what}}{{target}}"
 
   # Git branch
-  - trigger: "}gb"
+  - trigger: "}gitb"
     #replace: "git branch $1$"
     vars:
       - name: "option"
@@ -156,10 +158,12 @@ matches:
             - "feature/"
             - "bugfix/"
             - "hotfix/"
+            - "chore/"
+            - "test/"
     replace: "git branch {{option}}{{branch}}"
 
   # Git merge
-  - trigger: "}gm"
+  - trigger: "}gitm"
     #replace: "git merge $1$"
     vars:
       - name: "option"
@@ -177,11 +181,11 @@ matches:
             - "$|$"
             - "main"
             - "master"
-            - "develop"
+            - "development"
     replace: "git merge {{option}}{{branch}}"
 
   # Git rebase
-  - trigger: "}gr"
+  - trigger: "}gitr"
     #replace: "git rebase $1$"
     vars:
       - name: "option"
@@ -201,10 +205,12 @@ matches:
             - "main"
             - "master"
             - "HEAD~3"
+            - "development"
+            - "staging"
     replace: "git rebase {{option}}{{target}}"
 
   # Git stash
-  - trigger: "}gstash"
+  - trigger: "}gitsah"
     #replace: "git stash $1$"
     vars:
       - name: "option"
@@ -216,10 +222,12 @@ matches:
             - "pop"
             - "list"
             - "drop"
+            - "apply"
+            - "--include-untracked"
     replace: "git stash {{option}}"
 
   # Git remote
-  - trigger: "}gr"
+  - trigger: "}gitr"
     #replace: "git remote $1$"
     vars:
       - name: "option"
@@ -238,7 +246,7 @@ matches:
     replace: "git remote {{option}}{{url}}"
 
   # Git reset
-  - trigger: "}greset"
+  - trigger: "}gitrst"
     #replace: "git reset $1$ $2$"
     vars:
       - name: "mode"
@@ -259,7 +267,7 @@ matches:
     replace: "git reset {{mode}}{{target}}"
 
   # Git clean
-  - trigger: "}gclean"
+  - trigger: "}gitcln"
     #replace: "git clean -fd $1$"
     vars:
       - name: "dry"
@@ -271,7 +279,7 @@ matches:
     replace: "git clean -fd{{dry}}"
 
   # Git show
-  - trigger: "}gshow"
+  - trigger: "}gitshow"
     #replace: "git show $1$"
     vars:
       - name: "ref"
@@ -285,7 +293,7 @@ matches:
     replace: "git show {{ref}}"
 
   # Git cherry-pick
-  - trigger: "}gcp"
+  - trigger: "}gitcp"
     #replace: "git cherry-pick $1$"
     vars:
       - name: "option"
@@ -306,7 +314,7 @@ matches:
     replace: "git cherry-pick {{option}}{{commit}}"
 
   # Git revert
-  - trigger: "}grev"
+  - trigger: "}gitrev"
     #replace: "git revert $1$"
     vars:
       - name: "commit"
@@ -320,7 +328,7 @@ matches:
     replace: "git revert {{commit}}"
 
   # Git bisect
-  - trigger: "}gbisect"
+  - trigger: "}gitbst"
     #replace: "git bisect $1$"
     vars:
       - name: "action"
@@ -335,7 +343,7 @@ matches:
     replace: "git bisect {{action}}"
 
   # Git blame
-  - trigger: "}gblame"
+  - trigger: "}gitblame"
     #replace: "git blame $1$"
     vars:
       - name: "file"
@@ -347,12 +355,12 @@ matches:
     replace: "git blame {{file}}"
 
   # Git reflog
-  - trigger: "}grl"
+  - trigger: "}gitrl"
     #replace: "git reflog"
     replace: "git reflog"
 
   # Git config
-  - trigger: "}gconf"
+  - trigger: "}gitconf"
     #replace: "git config --global $1$ $2$"
     vars:
       - name: "key"
@@ -376,7 +384,7 @@ matches:
 
   # === COMMIT MESSAGE CONVENTIONS ===
   # Conventional Commits
-  - trigger: "}gcc"
+  - trigger: "}gitcc"
     vars:
       - name: "type"
         type: "choice"
@@ -404,44 +412,17 @@ matches:
     replace: "{{type}}{{scope}}: "
 
   # Fix typo in commit
-  - trigger: "}gfix"
+  - trigger: "}gitfix"
     replace: "fixup! $|$"
 
   # Squash commit
-  - trigger: "}gsquash"
+  - trigger: "}gitsquash"
     replace: "squash! $|$"
 
   # === BRANCH NAMING CONVENTIONS ===
 
-  # Feature branch
-  - trigger: "}gbf"
-    replace: "feature/$|$-{{mydate}}"
-    vars:
-      - name: "mydate"
-        type: "date"
-        params:
-          format: "%Y-%m-%d"
-
-  # Bugfix branch
-  - trigger: "}gbb"
-    replace: "bugfix/$|$-{{mydate}}"
-    vars:
-      - name: "mydate"
-        type: "date"
-        params:
-          format: "%Y-%m-%d"
-
-  # Hotfix branch
-  - trigger: "}gbh"
-    replace: "hotfix/$|$-{{mydate}}"
-    vars:
-      - name: "mydate"
-        type: "date"
-        params:
-          format: "%Y-%m-%d"
-
   # Release branch
-  - trigger: "}gbr"
+  - trigger: "}gitbr"
     replace: "release/v$1$.$2$.$3$"
     vars:
       - name: "major"
@@ -460,7 +441,7 @@ matches:
   # === TROUBLESHOOTING ===
 
   # Discard local changes (CAREFUL!)
-  - trigger: "}gdc"
+  - trigger: "}gitdc"
     replace: "git checkout -- $1$"
     vars:
       - name: "file"
@@ -472,44 +453,44 @@ matches:
             - "<filename>"
 
   # Undo last commit (keep changes)
-  - trigger: "}gundo"
+  - trigger: "}gitundo"
     replace: "git reset --soft HEAD~1"
 
   # Undo last commit (discard changes)
-  - trigger: "}gundohard"
+  - trigger: "}gitundohard"
     replace: "git reset --hard HEAD~1"
 
   # Remove untracked files (CAREFUL!)
-  - trigger: "}grmuntracked"
+  - trigger: "}gitrmuntracked"
     replace: "git clean -fd"
 
   # See what branch you're on
-  - trigger: "}gcurrbranch"
+  - trigger: "}gitcurrbranch"
     replace: "git branch --show-current"
 
   # List all branches with last commit
-  - trigger: "}gbrl"
+  - trigger: "}gitbrl"
     replace: "git branch -vva"
 
   # Find deleted branches
-  - trigger: "}gbrd"
+  - trigger: "}gitbrd"
     replace: "git branch --merged | egrep -v \"(^\\*|main|master|develop)\""
 
   # === GIT IGNORE ===
 
   # Add to .gitignore
-  - trigger: "gignore"
+  - trigger: "}gitignore"
     replace: 'echo "$1$" >> .gitignore'
 
   # Common .gitignore entries
-  - trigger: "ignode"
+  - trigger: "}gitignode"
     replace: "node_modules/\n.env\nnpm-debug.log"
 
-  - trigger: "igpython"
+  - trigger: "}gitpython"
     replace: "__pycache__/\n*.pyc\n.env\nvenv/\n.venv/\n*.egg-info/"
 
-  - trigger: "igidea"
+  - trigger: "}gitidea"
     replace: ".idea/\n*.iml\n.vscode/\n.DS_Store"
 
-  - trigger: "igbuild"
+  - trigger: "}gitbuild"
     replace: "dist/\nbuild/\n*.o\n*.obj\n*.exe\n*.dll\n*.so\n*.dylib"