diff --git a/frontend/src/features/workspace/WorkspaceView.tsx b/frontend/src/features/workspace/WorkspaceView.tsx
index 6b3592b..61bab97 100644
--- a/frontend/src/features/workspace/WorkspaceView.tsx
+++ b/frontend/src/features/workspace/WorkspaceView.tsx
@@ -4039,7 +4039,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                   </>
                 ) : (
                   <>
-                    <div className="w-9 h-9 rounded-lg bg-accent/10 border border-accent/30 flex items-center justify-center text-accent flex-shrink-0">
+                    <div className="w-9 h-9 rounded-lg bg-accent-dim border border-accent-border flex items-center justify-center text-accent flex-shrink-0">
                       <Hash className="w-5 h-5" />
                     </div>
                     <div>
@@ -4077,7 +4077,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
 
             {/* Quick tag hopping pills */}
             {workspaceTags.length > 0 && (
-              <div className="flex items-center gap-1.5 flex-wrap pt-1 border-t border-border/50">
+              <div className="flex items-center gap-1.5 flex-wrap pt-1 border-t border-border">
                 <span className="text-[11px] text-muted font-medium mr-1">Filter:</span>
                 <button
                   type="button"
@@ -4085,7 +4085,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                   className={`px-2 py-0.5 rounded-pill text-[11px] transition-colors ${
                     selectedTag === null
                       ? 'bg-accent text-white font-semibold'
-                      : 'badge-neutral hover:border-accent/40 hover:text-main'
+                      : 'badge-neutral hover:border-accent hover:text-main'
                   }`}
                 >
                   Alle ({workspaceTags.length})
@@ -4097,8 +4097,8 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                     onClick={() => openTagPage(t.tag)}
                     className={`px-2 py-0.5 rounded-pill text-[11px] transition-colors ${
                       selectedTag === t.tag
-                        ? 'bg-accent/20 border border-accent text-accent font-semibold'
-                        : 'badge-neutral hover:border-accent/40 hover:text-main'
+                        ? 'badge-accent font-semibold'
+                        : 'badge-neutral hover:border-accent hover:text-main'
                     }`}
                   >
                     #{t.tag} ({t.count})
@@ -4132,7 +4132,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                       className="group panel-surface p-4 rounded-card border border-border hover:border-accent hover:shadow-md cursor-pointer transition-all flex flex-col justify-between"
                     >
                       <div className="flex items-start justify-between gap-2 mb-3">
-                        <div className="w-8 h-8 rounded-lg bg-accent/10 border border-accent/20 flex items-center justify-center text-accent group-hover:scale-105 transition-transform">
+                        <div className="w-8 h-8 rounded-lg badge-accent flex items-center justify-center text-accent group-hover:scale-105 transition-transform">
                           <Hash className="w-4 h-4" />
                         </div>
                         <span className="badge-neutral text-[10px] font-mono">
@@ -4207,7 +4207,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                   }}
                   rows={Math.max(4, tagNoteContent.split('\n').length + 1)}
                   placeholder={`Eigene Gedanken, Zusammenfassungen oder Markdown-Notizen direkt zum Thema #${selectedTag} festhalten (unabhängig von den anderen Workspace-Notizen)…`}
-                  className="w-full bg-canvas/50 border border-border/60 rounded-card p-3 text-xs text-main leading-relaxed focus:outline-none focus:border-accent resize-y placeholder:text-faint"
+                  className="w-full input-field rounded-card p-3 text-xs text-main leading-relaxed focus:outline-none focus:border-accent resize-y placeholder:text-faint"
                 />
               </div>
 
@@ -4225,7 +4225,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                   {tagDetails.documents.map((docGroup) => (
                     <div
                       key={docGroup.docId}
-                      className="panel-surface p-4 space-y-3 border border-border rounded-card hover:border-border/80 transition-colors"
+                      className="panel-surface p-4 space-y-3 border border-border rounded-card hover:border-strong transition-colors"
                     >
                       {/* Document Header */}
                       <div className="flex flex-wrap items-center justify-between gap-2 pb-2 border-b border-border">
@@ -4254,7 +4254,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                               setWorkspaceMode('editor');
                             }
                           }}
-                          className="px-2.5 py-1 text-xs font-medium text-accent hover:text-main bg-accent/10 hover:bg-accent/20 rounded-btn flex items-center gap-1 transition-colors"
+                          className="btn-action h-7 px-2.5 text-xs font-medium text-accent hover:text-main"
                         >
                           <span>Notiz öffnen</span>
                           <ExternalLink className="w-3 h-3" />
@@ -4266,7 +4266,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                         {docGroup.matchedBlocks.map((mb, idx) => (
                           <div
                             key={mb.rootBlock.id || idx}
-                            className="space-y-1.5 bg-canvas/40 p-3 rounded-card border border-border/50"
+                            className="space-y-1.5 bg-canvas p-3 rounded-card border border-border"
                           >
                             {/* Root Bullet Point */}
                             <div className="flex items-start gap-2 group">
@@ -4278,7 +4278,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                                   className="w-4 h-4 mt-0.5 checkbox-square cursor-pointer flex-shrink-0"
                                 />
                               ) : (
-                                <div className="w-3.5 h-3.5 mt-1 rounded-full bg-accent/20 border border-accent flex items-center justify-center flex-shrink-0">
+                                <div className="w-3.5 h-3.5 mt-1 rounded-full bg-accent-dim border border-accent flex items-center justify-center flex-shrink-0">
                                   <div className="w-1.5 h-1.5 rounded-full bg-accent" />
                                 </div>
                               )}
@@ -4303,7 +4303,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
 
                             {/* Children / Sub-bullets */}
                             {mb.children.length > 0 && (
-                              <div className="space-y-1 mt-1 pl-4 border-l-2 border-border/60 ml-2">
+                              <div className="space-y-1 mt-1 pl-4 border-l-2 border-border ml-2">
                                 {mb.children.map((child) => {
                                   const indentLevel = Math.max(
                                     0,
@@ -4325,7 +4325,7 @@ export const WorkspaceView: React.FC<WorkspaceViewProps> = ({
                                           className="w-3.5 h-3.5 mt-0.5 checkbox-square cursor-pointer flex-shrink-0"
                                         />
                                       ) : (
-                                        <span className="w-1.5 h-1.5 mt-1.5 rounded-full bg-muted/60 flex-shrink-0" />
+                                        <span className="w-1.5 h-1.5 mt-1.5 rounded-full bg-muted flex-shrink-0" />
                                       )}
                                       <div
                                         onClick={() => {