diff --git a/config.php b/config.php
index 20f7176..8b2564b 100644
--- a/config.php
+++ b/config.php
@@ -1,7 +1,7 @@
 <?php
 
 define('APP_NAME', 'hyprcrd');
-define('APP_VERSION', '2.0.1');
+define('APP_VERSION', '2.0.2');
 
 // APP_DEBUG: gates verbose error responses (curl traces, upstream bodies).
 // Off by default; enable via env for local troubleshooting only.
diff --git a/electron/package.json b/electron/package.json
index 564125e..9a2e123 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
 {
   "name": "hyprcrd",
-  "version": "2.0.1",
+  "version": "2.0.2",
   "description": "hyprcrd — self-hosted card manager",
   "main": "main.js",
   "scripts": {
diff --git a/public/index.php b/public/index.php
index 22be44f..613595c 100644
--- a/public/index.php
+++ b/public/index.php
@@ -273,7 +273,14 @@ if (str_starts_with($route, '/api/')) {
     function validInt($v, $default = 0) { return is_numeric($v) ? (int)$v : $default; }
     function extractTags($body) {
         preg_match_all('/(?<=\s|^)#([a-zA-Z0-9_\/-][a-zA-Z0-9_\/-]*[a-zA-Z0-9_-]|[a-zA-Z0-9_-]+)/m', $body ?? '', $matches);
-        return implode(',', array_unique(array_map('strtolower', $matches[1] ?? [])));
+        // English ↔ German tag aliases: the calendar + journal logic is
+        // hardcoded against 'geburtstag' / 'termin', so accept the English
+        // synonyms and normalise to the canonical German form at write
+        // time. Keeps every downstream check (card.tags includes 'geburtstag')
+        // working without touching dozens of JS call sites.
+        $aliases = ['birthday' => 'geburtstag', 'appointment' => 'termin'];
+        $tags = array_map(fn($t) => $aliases[$t] ?? $t, array_map('strtolower', $matches[1] ?? []));
+        return implode(',', array_unique($tags));
     }
 
     // Plugin route handlers (registered by plugin backend.php files).
diff --git a/public/js/modules/editor.js b/public/js/modules/editor.js
index bd7ebb4..9750cad 100644
--- a/public/js/modules/editor.js
+++ b/public/js/modules/editor.js
@@ -234,7 +234,7 @@ export function openModal(card = null) {
     // `card` can be `null` (add-button new) or a shell `{id: null, ...}`
     // from the calendar day-popup — both count as "new", so key on
     // card?.id not the card ref itself.
-    const isNewAppointment = !card?.id && /#(termin|geburtstag)\b/.test(body.value);
+    const isNewAppointment = !card?.id && /#(termin|appointment|geburtstag|birthday)\b/.test(body.value);
     inpBucket.value = card?.bucket_id ? card.bucket_id
         : (isNewAppointment ? ''
            : (!virtualBuckets.includes(state.activeBucket) ? state.activeBucket : ''));
@@ -512,7 +512,7 @@ async function doSave(close, { animate = true } = {}) {
     }
     await window._reloadAll();
     // Auto-sync if card has #termin or #geburtstag
-    if (data.body && /#(termin|geburtstag)\b/.test(data.body)) {
+    if (data.body && /#(termin|appointment|geburtstag|birthday)\b/.test(data.body)) {
         window._triggerSync?.();
     }
     if (close) {
diff --git a/public/plugins/tests/undo.test.js b/public/plugins/tests/undo.test.js
index a3aeab6..aecca9c 100644
--- a/public/plugins/tests/undo.test.js
+++ b/public/plugins/tests/undo.test.js
@@ -109,11 +109,17 @@ describe('Undo: Editor Save', () => {
         bodyEl.dispatchEvent(new Event('input', { bubbles: true }));
         click('#modal-save-close');
 
+        // Wait for both the server patch AND the modal close before firing
+        // Ctrl+Z — the global undo shortcut is guarded by
+        // `!guards.isOpen('modal')`, so if doSave's closeModal() hasn't run
+        // yet (it only fires after the post-save _reloadAll), the undo key
+        // is swallowed silently and the test races the client's save flow.
         let card;
         for (let i = 0; i < 40; i++) {
             await sleep(100);
             card = (await fetch(`api/cards?ids=${res.id}`).then(r => r.json())).find(c => c.id == res.id);
-            if ((card?.body || '').includes('after edit')) break;
+            const modalClosed = !document.getElementById('modal')?.classList.contains('open');
+            if ((card?.body || '').includes('after edit') && modalClosed) break;
         }
         expect(card.body).toContain('after edit');
 
diff --git a/website/index.html b/website/index.html
index c764499..f871e50 100644
--- a/website/index.html
+++ b/website/index.html
@@ -352,10 +352,10 @@ footer {
                 <span class="vtag" style="background:rgba(52,211,153,0.06);color:var(--gn);border-color:rgba(52,211,153,0.2);">#ops</span>
                 <span class="vtag" style="background:rgba(52,211,153,0.06);color:var(--gn);border-color:rgba(52,211,153,0.2);">#done</span>
                 <span class="vtag" style="background:rgba(251,191,36,0.06);color:var(--yl);border-color:rgba(251,191,36,0.2);">#meeting</span>
-                <span class="vtag" style="background:rgba(251,191,36,0.06);color:var(--yl);border-color:rgba(251,191,36,0.2);">#termin</span>
+                <span class="vtag" style="background:rgba(251,191,36,0.06);color:var(--yl);border-color:rgba(251,191,36,0.2);">#appointment</span>
                 <span class="vtag" style="background:rgba(56,189,248,0.06);color:var(--ac);border-color:rgba(56,189,248,0.2);">#research</span>
                 <span class="vtag" style="background:rgba(244,114,182,0.06);color:var(--pk);border-color:rgba(244,114,182,0.2);">#idea</span>
-                <span class="vtag" style="background:rgba(244,114,182,0.06);color:var(--pk);border-color:rgba(244,114,182,0.2);">#geburtstag</span>
+                <span class="vtag" style="background:rgba(244,114,182,0.06);color:var(--pk);border-color:rgba(244,114,182,0.2);">#birthday</span>
                 <span class="vtag" style="background:rgba(56,189,248,0.06);color:var(--ac);border-color:rgba(56,189,248,0.2);">#personal</span>
             </div>
         </div>
@@ -407,8 +407,8 @@ See also: <span class="link">[[Infra checklist]]</span>
             <p>A month-grid calendar built into hyprcrd. Journal entries, appointments, and birthdays — all just cards with the right title or tag. Bidirectional CalDAV sync with ownCloud and Nextcloud.</p>
             <ul>
                 <li>Journal entries: title = <code>YYYY-MM-DD</code>, one per day, no tag needed</li>
-                <li>Appointments: <code>#termin</code> tag + structured template (time, end, location, attendees)</li>
-                <li>Birthdays: <code>#geburtstag</code> tag, recurring annually</li>
+                <li>Appointments: <code>#appointment</code> tag + structured template (time, end, location, attendees)</li>
+                <li>Birthdays: <code>#birthday</code> tag, recurring annually</li>
                 <li>Click any day to create a journal entry, appointment, or birthday</li>
                 <li>CalDAV sync: bidirectional push/pull with ownCloud, Nextcloud, or any CalDAV server</li>
                 <li>Per-calendar color + icon configuration</li>
@@ -434,8 +434,8 @@ See also: <span class="link">[[Infra checklist]]</span>
                 </div>
                 <div style="margin-top:12px;font-size:10px;display:flex;gap:12px;justify-content:center;">
                     <span><span style="color:var(--ac);">&bull;</span> journal</span>
-                    <span><span style="color:var(--yl);">&bull;</span> termin</span>
-                    <span><span style="color:var(--pk);">&bull;</span> geburtstag</span>
+                    <span><span style="color:var(--yl);">&bull;</span> appointment</span>
+                    <span><span style="color:var(--pk);">&bull;</span> birthday</span>
                 </div>
             </div>
         </div>