diff --git a/config/quick_tag_table.json b/config/quick_tag_table.json
index 02776f88..396fedb4 100644
--- a/config/quick_tag_table.json
+++ b/config/quick_tag_table.json
@@ -53,21 +53,10 @@
       "grimdark",
       "grotesque"
     ],
-    "Episode Spoilers": [
-      "spoiler:s09e20",
-      "spoiler:s09e21",
-      "spoiler:s09e22",
-      "spoiler:s09e23",
-      "spoiler:s09e24",
-      "spoiler:s09e25",
-      "spoiler:s09e26"
-    ],
     "General Spoilers": [
-      "spoiler:eqg specials",
       "spoiler:comic",
-      "spoiler:eqg series (season 2)",
-      "spoiler:s09",
-      "spoiler:rainbow roadtrip",
+      "spoiler:g5",
+      "spoiler:pony life",
       "spoilers for another series"
     ],
     "Species": [
@@ -187,6 +176,15 @@
       ["bp", "berry punch"],
       ["pbb", "prince blueblood"]
     ]],
+    ["Student Six", [
+      ["s6", "student six"],
+      ["ga", "gallus"],
+      ["ols", "ocellus"],
+      ["snb", "sandbar"],
+      ["svs", "silverstream"],
+      ["sm", "smolder"],
+      ["yn", "yona"]
+    ]],
     ["Uncategorized", [
       ["maud", "maud pie"],
       ["coco", "coco pommel"],
@@ -426,7 +424,7 @@
     ["21", "testing testing 1-2-3"],
     ["22", "trade ya"],
     ["23", "inspiration manifestation"],
-    ["24", "equestria games"],
+    ["24", "equestria games (episode)"],
     ["25-26", "twilight's kingdom"]
   ],
   "3": [