diff --git a/index.html b/index.html
index 313fd92..2c7c31e 100644
--- a/index.html
+++ b/index.html
@@ -34,27 +34,31 @@
     commandSearchDelimiter: ' ',
     defaultSearchTemplate: 'https://duckduckgo.com/?q={}',
     openLinksInNewTab: true,
-    suggestionLimit: 4,
+    suggestionLimit: 5,
   };
 
   // prettier-ignore
   const COMMANDS = new Map([
-    ['a', { name: 'Chat', url: 'https://gemini.google.com/app' }],
-    ['b', { name: 'Dribbble', url: 'https://dribbble.com/shots/recent' }],
-    ['c', { name: 'Calendar', url: 'https://calendar.google.com' }],
-    ['d', { name: 'Drive', url: 'https://drive.google.com/drive/u/0/my-drive' }],
+    ['b', { name: 'Dribbble', searchTemplate: '/search/{}', url: 'https://dribbble.com/shots/recent' }],
     ['f', { name: 'Figma', url: 'https://www.figma.com' }],
-    ['g', { name: 'GitHub', url: 'https://github.com' }],
-    ['k', { name: 'Keep', url: 'https://keep.google.com' }],
+    ['g', { name: 'GitHub', searchTemplate: '/search?q={}', url: 'https://github.com' }],
     ['n', { name: 'Notion', url: 'https://www.notion.so' }],
-    ['p', { name: 'Proton', suggestions: ['drive.proton.me/u/1/'], url: 'https://mail.proton.me/u/1/inbox' }],
-    ['r', { name: 'Reddit', suggestions: ['r/r/selfhosted', 'r/r/dataisbeautiful', 'r/r/fujix', 'r/r/leetcode'], url: 'https://reddit.com' }],
+    ['o', { name: 'Google', searchTemplate: '/search?q={}', suggestions: ['o/ai', 'o/keep', 'o/drive', 'o/cal', 'o/travel'], url: 'https://www.google.com' }],
+    ['o/ai', { url: 'https://gemini.google.com/app' }],
+    ['o/cal', { url: 'https://calendar.google.com' }],
+    ['o/drive', { url: 'https://drive.google.com/drive/u/0/my-drive' }],
+    ['o/keep', { url: 'https://keep.google.com' }],
+    ['p', { name: 'Proton', searchTemplate: '/u/0/all-mail#keyword={}', suggestions: ['p/drive'], url: 'https://mail.proton.me/u/0/inbox' }],
+    ['p/drive', { url: 'https://drive.proton.me/u/0/' }],
+    ['r', { name: 'Reddit', searchTemplate: '/search/?q={}', suggestions: ['r/r/selfhosted', 'r/r/dataisbeautiful', 'r/r/fujix', 'r/r/leetcode'], url: 'https://reddit.com' }],
     ['s', { name: 'Supabase', url: 'https://supabase.com/dashboard/projects' }],
-    ['u', { name: 'Unsplash', searchTemplate: '/s/photos/{}', url: 'https://unsplash.com' }],
     ['v', { name: 'Vercel', url: 'https://vercel.com/dashboard' }],
-    ['x', { name: 'xvvvyz', searchTemplate: 'https://{}.xvvvyz.xyz', suggestions: ['x pomodoro', 'x jelly', 'x torrent', 'x proxy'], url: 'https://xvvvyz.xyz' }],
+    ['x', { name: 'xvvvyz', suggestions: ['x/pomo', 'x/torrent', 'x/proxy'], url: 'https://xvvvyz.xyz' }],
+    ['x/pomo', { url: 'https://pomodoro.xvvvyz.xyz' }],
+    ['x/proxy', { url: 'https://proxy.xvvvyz.xyz' }],
+    ['x/torrent', { url: 'https://torrent.xvvvyz.xyz' }],
     ['y', { name: 'YouTube', searchTemplate: '/results?search_query={}', url: 'https://youtube.com/feed/subscriptions' }],
-    ['0', { name: 'localhost', suggestions: ['0:54323', '0:54324'], url: 'http://localhost:3000' }],
+    ['0', { name: 'local', suggestions: ['0:54323', '0:54324'], url: 'http://localhost:3000' }],
     ['0:54323', { url: 'http://localhost:54323' }],
     ['0:54324', { url: 'http://localhost:54324' }],
   ]);