diff --git a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
index 6468c5881..4a8634fe6 100644
--- a/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
+++ b/cockatrice/src/client/ui/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp
@@ -16,55 +16,70 @@ DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags, const Q
     setWindowTitle("Deck Tags Manager");
     resize(400, 500);
 
-    QStringList defaultTags = {"🏃️ Aggro",
-                               "🧙‍️ Control",
-                               "⚔️ Midrange",
-                               "🌀 Combo",
-                               "🪓 Mill",
-                               "🐉 Tribal",
-                               "🔒 Stax",
-                               "🗺️ Landfall",
-                               "🛡️ Pillowfort",
-                               "🌱 Ramp",
-                               "⚡ Storm",
-                               "💀 Aristocrats",
-                               "☠️ Reanimator",
-                               "👹 Sacrifice",
-                               "🔥 Burn",
-                               "🌟 Lifegain",
-                               "🔮 Spellslinger",
-                               "👥 Tokens",
-                               "🐺 Werewolves",
-                               "🦴 Skeletons",
-                               "🦅 Flying",
-                               "💎 Artifacts",
-                               "🌔 Enchantress",
-                               "🌊 Flash",
-                               "👾 Eldrazi",
-                               "🎭 Blink",
-                               "⏳ Time Manipulation",
-                               "🌍 Domain",
-                               "💫 Proliferate",
-                               "🧛 Vampires",
-                               "🦇 Bats",
-                               "🐺 Wolves",
-                               "🐠 Merfolk",
-                               "🐉 Dragons",
-                               "🍄 Fungus",
-                               "🦗 Insects",
-                               "🦅 Birds",
-                               "🐚 Sea Creatures",
-                               "🎩 Wizards",
-                               "🎻 Bards",
-                               "👑 Monarch",
-                               "📜 Saga",
-                               "🚀 Vehicles",
-                               "💉 Infect",
-                               "🩸 Madness",
-                               "🌀 Morph",
-                               "🎲 Chaos",
-                               "🪄 Auras",
-                               "🔫 Pingers"};
+    QStringList defaultTags = {
+        // Strategies
+        "🏃️ Aggro",
+        "🧙‍️ Control",
+        "⚔️ Midrange",
+        "🌀 Combo",
+        "🪓 Mill",
+        "🔒 Stax",
+        "🗺️ Landfall",
+        "🛡️ Pillowfort",
+        "🌱 Ramp",
+        "⚡ Storm",
+        "💀 Aristocrats",
+        "☠️ Reanimator",
+        "👹 Sacrifice",
+        "🔥 Burn",
+        "🌟 Lifegain",
+        "🔮 Spellslinger",
+        "👥 Tokens",
+        "🎭 Blink",
+        "⏳ Time Manipulation",
+        "🌍 Domain",
+        "💫 Proliferate",
+        "📜 Saga",
+        "🎲 Chaos",
+        "🪄 Auras",
+        "🔫 Pingers",
+
+        // Themes
+        "👑 Monarch",
+        "🚀 Vehicles",
+        "💉 Infect",
+        "🩸 Madness",
+        "🌀 Morph"
+
+        // Card Types
+        "⚔️ Creature",
+        "💎 Artifact",
+        "🌔 Enchantment",
+        "📖 Sorcery",
+        "⚡ Instant",
+        "🌌 Planeswalker",
+        "🌏 Land",
+        "🪄 Aura",
+
+        // Tribal Types
+        "🐉 Tribal",
+        "🐠 Merfolk",
+        "🐺 Werewolves",
+        "🦴 Skeletons",
+        "🦅 Flying",
+        "👾 Eldrazi",
+        "🧛 Vampires",
+        "🦇 Bats",
+        "🐺 Wolves",
+        "🐉 Dragons",
+        "🍄 Fungus",
+        "🦗 Insects",
+        "🦅 Birds",
+        "🐚 Sea Creatures",
+        "🎩 Wizards",
+        "🎻 Bards",
+
+    };
 
     // Merge knownTags with defaultTags, ensuring no duplicates
     QStringList combinedTags = knownTags + defaultTags + activeTags;