diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml
index 709a7cd..2f93975 100644
--- a/.gitea/workflows/release.yml
+++ b/.gitea/workflows/release.yml
@@ -37,10 +37,14 @@ jobs:
             RID=$(curl -sf -X POST -H "Authorization: token $GITEA_TOKEN" \
               -H "Content-Type: application/json" \
               "$API/repos/$REPO/releases" \
-              -d "$(jq -nc --arg t "$TAG" '{tag_name:$t,name:$t,draft:false,prerelease:false}')" \
+              -d "$(jq -nc --arg t "$TAG" '{tag_name:$t,name:$t,draft:false,prerelease:false,hide_archive_links:true}')" \
               | jq -r '.id')
           fi
           echo "release id: $RID"
+          # Gitea honors hide_archive_links only on edit, not create — PATCH it
+          # so the auto-generated Source Code (zip/tar.gz) links stay hidden.
+          curl -sf -X PATCH -H "Authorization: token $GITEA_TOKEN" -H "Content-Type: application/json" \
+            "$API/repos/$REPO/releases/$RID" -d '{"hide_archive_links":true}' >/dev/null || true
           # Upload every dist/*.zip. Per-asset failures don't fail the job —
           # we want partial releases to still publish rather than block the
           # whole pipeline on one big file.
diff --git a/WeakAuras/Init.lua b/WeakAuras/Init.lua
index e5948b5..791daaf 100644
--- a/WeakAuras/Init.lua
+++ b/WeakAuras/Init.lua
@@ -9,7 +9,7 @@ WeakAuras.halfWidth = WeakAuras.normalWidth / 2
 WeakAuras.doubleWidth = WeakAuras.normalWidth * 2
 
 local versionStringFromToc = GetAddOnMetadata("WeakAuras", "Version")
-local versionString = "5.21.2 Beta"
+local versionString = "5.22.0 Beta"
 -- Year, Month, Day, Hour, Minute, Seconds
 local buildTime = "2025".."11".."29".."04".."45".."00"
 local isTTSEnabled = C_VoiceChat and C_VoiceChat.SpeakText and true or false
diff --git a/WeakAuras/Types.lua b/WeakAuras/Types.lua
index 214b6e3..db21db5 100644
--- a/WeakAuras/Types.lua
+++ b/WeakAuras/Types.lua
@@ -3842,6 +3842,28 @@ do
       end
       table.sort(classOrder)
     end
+  else
+    -- CoA: CLASS_SORT_ORDER only contains the 11 vanilla classes. Append any
+    -- keys present in LOCALIZED_CLASS_NAMES_MALE that are not already in the
+    -- list (custom classes such as Witchdoctor, Templar, etc.). Build a fresh
+    -- local copy — do NOT mutate the global CLASS_SORT_ORDER.
+    if LOCALIZED_CLASS_NAMES_MALE then
+      local inOrder = {}
+      for _, class in ipairs(classOrder) do
+        inOrder[class] = true
+      end
+      classOrder = {unpack(classOrder)}
+      local extra = {}
+      for class in pairs(LOCALIZED_CLASS_NAMES_MALE) do
+        if not inOrder[class] then
+          extra[#extra + 1] = class
+        end
+      end
+      table.sort(extra)
+      for _, class in ipairs(extra) do
+        classOrder[#classOrder + 1] = class
+      end
+    end
   end
 
   if C_ClassInfo and C_ClassInfo.GetAllSpecs and C_ClassInfo.GetSpecInfo then