diff --git a/app/templates/local_workspace.html b/app/templates/local_workspace.html
index f343130..8ac4945 100644
--- a/app/templates/local_workspace.html
+++ b/app/templates/local_workspace.html
@@ -190,12 +190,11 @@
 .file-preview-body{padding:10px 12px;margin:0;font-size:12px;line-height:1.5;color:var(--text,#ddd);max-height:200px;overflow:auto;font-family:'Fira Code','Cascadia Code',monospace;white-space:pre-wrap;word-wrap:break-word;background:#141414;}
 
 /* Tag chips */
-.tag-chip{display:inline-flex;align-items:center;gap:4px;padding:1px 7px 1px 4px;background:rgba(120,119,116,.15);border-radius:10px;font-size:11px;color:var(--text-secondary);white-space:nowrap;margin:1px 2px;transition:all 150ms;}
-.tag-chip:hover{background:rgba(120,119,116,.25);}
-.tag-chip .tag-dot{width:6px;height:6px;border-radius:50%;flex-shrink:0;}
-.tag-chip.rm-btn{background:none;border:none;color:var(--text-tertiary);cursor:pointer;font-size:13px;line-height:1;padding:0 2px;border-radius:50%;margin-left:2px;}
-.tag-chip.rm-btn:hover{color:var(--danger);background:rgba(255,80,80,.15);}
-.tag-chip.active{background:var(--accent);color:#fff;}
+.tag-chip{display:inline-flex;align-items:center;gap:2px;padding:1px 8px;border-radius:10px;font-size:11px;color:#fff;white-space:nowrap;margin:1px 2px;transition:all 150ms;}
+.tag-chip:hover{filter:brightness(1.15);}
+.tag-chip.rm-btn{background:none !important;border:none;color:var(--text-tertiary);cursor:pointer;font-size:13px;line-height:1;padding:0 2px;border-radius:50%;margin-left:2px;}
+.tag-chip.rm-btn:hover{color:var(--danger);background:rgba(255,80,80,.15) !important;}
+.tag-chip.active{box-shadow:0 0 0 2px var(--accent);}
 .tag-add-btn{display:inline-flex;align-items:center;gap:3px;padding:1px 7px;background:none;border:1px dashed var(--border);border-radius:10px;font-size:11px;color:var(--text-tertiary);cursor:pointer;white-space:nowrap;transition:all 150ms;}
 .tag-add-btn:hover{border-color:var(--accent);color:var(--accent);}
 .tag-input{background:var(--bg);border:1px solid var(--accent);border-radius:8px;color:var(--text);font-size:11px;padding:2px 6px;outline:none;min-width:80px;}
@@ -785,6 +784,16 @@ window._wsInitData = (function() {
       c.ctxTagExistingOpen = this.ctxTagExistingOpen;
       c.ctxAvailTags = this.ctxAvailTags;
       c.ctxNewTagColor = this.ctxNewTagColor;
+      // Also force Alpine update on the menu element
+      var menuEl = document.querySelector('.ctx-menu');
+      if (menuEl && menuEl._x_dataStack && menuEl._x_dataStack[0]) {
+        var d = menuEl._x_dataStack[0];
+        d.ctxMenu = this.ctxMenu;
+        d.ctxTagAdding = this.ctxTagAdding;
+        d.ctxTagExistingOpen = this.ctxTagExistingOpen;
+        d.ctxAvailTags = [...this.ctxAvailTags];
+        d.ctxNewTagColor = this.ctxNewTagColor;
+      }
     },
 
     // ── Long-press (mobile context menu) ──
@@ -865,6 +874,12 @@ window._wsInitData = (function() {
       // Sync to _ctxMenuData
       window._ctxMenuData.ctxAvailTags = this.ctxAvailTags;
       window._ctxMenuData.ctxMenu = this.ctxMenu;
+      // Also force Alpine update
+      var menuEl = document.querySelector('.ctx-menu');
+      if (menuEl && menuEl._x_dataStack && menuEl._x_dataStack[0]) {
+        menuEl._x_dataStack[0].ctxAvailTags = [...this.ctxAvailTags];
+        menuEl._x_dataStack[0].ctxMenu = this.ctxMenu;
+      }
     },
 
     async ctxAddNewTag(tagName, color) {
@@ -892,6 +907,14 @@ window._wsInitData = (function() {
           // Sync to _ctxMenuData
           window._ctxMenuData.ctxAvailTags = self.ctxAvailTags;
           window._ctxMenuData.ctxMenu = self.ctxMenu;
+          // Also force Alpine update
+          var menuEl = document.querySelector('.ctx-menu');
+          if (menuEl && menuEl._x_dataStack && menuEl._x_dataStack[0]) {
+            menuEl._x_dataStack[0].ctxAvailTags = [...self.ctxAvailTags];
+            menuEl._x_dataStack[0].ctxMenu = self.ctxMenu;
+          }
+          // Close menu after successful add
+          document.querySelector('.ctx-menu').style.display = 'none';
         }); }, 200);
       }
       this.ctxTagAdding = false;
@@ -952,7 +975,7 @@ window._wsInitData = (function() {
             var t = c.tags[ti];
             var tc = this.esc(t.color||'#787774');
             var tn = this.esc(t.name);
-            html += '<span class="tag-chip" style="padding-left:4px;"><span class="tag-dot" style="background:'+tc+'"></span>'+tn+'</span>';
+            html += '<span class="tag-chip" style="background:'+tc+'">'+tn+'</span>';
           }
           html += '</span>';
         }
@@ -1837,6 +1860,7 @@ window._wsInitData = (function() {
       this.tagFilter = (this.tagFilter === tagName) ? '' : tagName;
       this.filterType = '';
       this.searchQuery = '';
+      this.doFilter();
     },
 
     startTagInput(node) {
@@ -2180,8 +2204,8 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
     <span style="font-size:11px;color:var(--text-tertiary);margin-right:4px;">Tags:</span>
     <template x-for="t in workspaceTags" :key="'tf'+t.id">
       <button class="tag-chip" :class="{ active: tagFilter === t.name }"
+              :style="{background: t.color}"
               @click="toggleTagFilter(t.name)">
-        <span class="tag-dot" :style="{background: t.color}"></span>
         <span x-text="t.name"></span>
         <span style="font-size:10px;opacity:.7" x-text="'('+t.count+')'"></span>
       </button>
@@ -2218,8 +2242,7 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
           <td class="col-tags">
             <span style="display:flex;align-items:center;gap:2px;flex-wrap:wrap;">
               <template x-for="t in (node.tags||[])" :key="'ftag'+t.id">
-                <span class="tag-chip">
-                  <span class="tag-dot" :style="{background: t.color}"></span>
+                <span class="tag-chip" :style="{background: t.color}">
                   <span x-text="t.name"></span>
                   <button class="tag-chip rm-btn" @click.stop="removeTag(node.id, t.id)" title="Remove tag">×</button>
                 </span>
@@ -2292,7 +2315,7 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
           <td class="col-tags">
             <span style="display:flex;align-items:center;gap:2px;flex-wrap:wrap;">
               <template x-for="t in (node.tags||[])" :key="'dtag'+t.id">
-                <span class="tag-chip"><span class="tag-dot" :style="{background: t.color}"></span><span x-text="t.name"></span></span>
+                <span class="tag-chip" :style="{background: t.color}"><span x-text="t.name"></span></span>
               </template>
             </span>
           </td>
@@ -2329,8 +2352,8 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
         <div class="content-item-preview" x-text="node.is_folder ? (node.child_count||0)+' items' : (node.size_display||'—')"></div>
         <div class="content-item-tags" x-show="(node.tags||[]).length > 0">
           <template x-for="t in (node.tags||[])" :key="'ctag'+t.id">
-            <span class="tag-chip"><span class="tag-dot" :style="{background: t.color}"></span><span x-text="t.name"></span></span>
-                      </template>
+            <span class="tag-chip" :style="{background: t.color}"><span x-text="t.name"></span></span>
+          </template>
                     </div>
                   </template>
                 </div>
@@ -2486,7 +2509,7 @@ console.log('FLOWDECK v2.4.6 — IIFE done, _wsInitData keys:', Object.keys(wind
     </div>
     <div class="preview-panel-tags" x-show="(previewItem.tags||[]).length > 0">
       <template x-for="t in (previewItem.tags||[])" :key="'ptag'+t.id">
-        <span class="tag-chip"><span class="tag-dot" :style="{background: t.color}"></span><span x-text="t.name"></span></span>
+        <span class="tag-chip" :style="{background: t.color}"><span x-text="t.name"></span></span>
       </template>
     </div>
     <div class="preview-panel-body" x-html="previewPanelContent || '<div style=text-align:center;padding:40px;color:var(--text-tertiary)>Loading preview...</div>'"></div>
diff --git a/app/templates/settings.html b/app/templates/settings.html
index 8f86f6c..0279a0d 100644
--- a/app/templates/settings.html
+++ b/app/templates/settings.html
@@ -58,9 +58,9 @@
 .color-swatch.selected{border-color:var(--text);box-shadow:0 0 0 2px var(--accent);}
 
 /* Modal (for tag delete/rename) */
-.modal-overlay{position:fixed;inset:0;background:rgba(0,0,0,.6);display:flex;align-items:center;justify-content:center;z-index:999;backdrop-filter:blur(4px);}
-.modal-box{background:var(--bg);border:1px solid var(--border-strong);border-radius:12px;padding:24px;min-width:320px;box-shadow:0 12px 40px rgba(0,0,0,.5);}
-.modal-box h3{font-size:16px;font-weight:600;color:var(--text);}
+.modal-overlay{position:fixed;inset:0;background:rgba(0,0,0,.85);display:flex;align-items:center;justify-content:center;z-index:999;}
+.modal-box{background:#1E1E1E;border:1px solid #444;border-radius:12px;padding:24px;min-width:320px;box-shadow:0 12px 40px rgba(0,0,0,.8);}
+.modal-box h3{font-size:16px;font-weight:600;color:#fff;}
 .btn-danger{background:#E03E3E;color:#fff;border:none;padding:6px 16px;border-radius:6px;cursor:pointer;font-size:13px;}
 .btn-danger:hover{background:#C93535;}