diff --git a/glossary.tex b/glossary.tex
index eb70f1d8c68828d3807f3aa76da5642cfbe12a5f..393ef5d6e8a815d24ba6080b997b181d7c06f1cd 100644
--- a/glossary.tex
+++ b/glossary.tex
@@ -918,7 +918,7 @@
 
 \newglossaryentry{plant}{
   type=symbols,
-  sort=Plant,
+  sort=TP,
   nonumberlist,
   name={\adfhangingflatleafleft},
   description={Plant, probably dangerous},
@@ -926,7 +926,7 @@
 
 \newglossaryentry{encumbrance}{
   type=symbols,
-  sort=Encumbrance,
+  sort=AE,
   nonumberlist,
   name={\Semisextile},
   description={Encumbrance},
@@ -934,7 +934,7 @@
 
 \newglossaryentry{N}{
   type=symbols,
-  sort=Nura,
+  sort=RZ,
   nonumberlist,
   name={\Hygiea},
   description={Goblinoid},
@@ -942,7 +942,7 @@
 
 \newglossaryentry{R}{
   type=symbols,
-  sort=Morph,
+  sort=TM,
   nonumberlist,
   name={\NorthNode},
   description={Morphed creature},
@@ -950,7 +950,7 @@
 
 \newglossaryentry{D}{
   type=symbols,
-  sort=Undead,
+  sort=TU,
   nonumberlist,
   name={\Lilith},
   description={Undead creature},
@@ -958,15 +958,23 @@
 
 \newglossaryentry{T}{
   type=symbols,
-  sort=Team,
+  sort=TT,
   nonumberlist,
   name={\Opposition},
   description={A team of multiple creatures},
 }
 
+\newglossaryentry{E}{
+  type=symbols,
+  sort=SN,
+  nonumberlist,
+  name={\Mercury},
+  description={Sentient (any gender or none)},
+}
+
 \newglossaryentry{F}{
   type=symbols,
-  sort=Female,
+  sort=SF,
   nonumberlist,
   name={\Venus},
   description={Female},
@@ -974,23 +982,15 @@
 
 \newglossaryentry{M}{
   type=symbols,
-  sort=Male,
+  sort=SM,
   nonumberlist,
   name={\Mars},
   description={Male},
 }
 
-\newglossaryentry{E}{
-  type=symbols,
-  sort=Sentient,
-  nonumberlist,
-  name={\Mercury},
-  description={Sentient (any gender or none)},
-}
-
 \newglossaryentry{A}{
   type=symbols,
-  sort=Animal,
+  sort=TA,
   nonumberlist,
   name={\Taurus},
   description={Animal},
@@ -998,7 +998,7 @@
 
 \newglossaryentry{Sw}{
   type=symbols,
-  sort=Swarm,
+  sort=TS,
   nonumberlist,
   name={\Juno},
   description={Swarm},
@@ -1008,7 +1008,7 @@
 
 \newglossaryentry{poison}{
   type=symbols,
-  sort=Abderian,
+  sort=GAbderian,
   nonumberlist,
   name={$\Large\Circle$\hspace{-1em}\adfflowerleft},
   description={Temple of Poison},
@@ -1016,7 +1016,7 @@
 
 \newglossaryentry{sickness}{
   type=symbols,
-  sort=Eldren,
+  sort=GEldren,
   nonumberlist,
   name={\Sun},
   description={Temple of Sickness},
@@ -1024,7 +1024,7 @@
 
 \newglossaryentry{misgen}{
   type=symbols,
-  sort=Misgenesis,
+  sort=GMisgenesis,
   nonumberlist,
   name={$\Large\Circle$},
   description={Temple of Misgenesis},
@@ -1032,7 +1032,7 @@
 
 \newglossaryentry{justice}{
   type=symbols,
-  sort=Paik,
+  sort=GPaik,
   nonumberlist,
   name={$\Large\newmoon$},
   description={Temple of Justice},
@@ -1040,7 +1040,7 @@
 
 \newglossaryentry{beasts}{
   type=symbols,
-  sort=Sylph,
+  sort=GSylph,
   nonumberlist,
   name={\Aries},
   description={Temple of Beasts},
@@ -1048,7 +1048,7 @@
 
 \newglossaryentry{frost}{
   type=symbols,
-  sort=Sable,
+  sort=GSable,
   nonumberlist,
   name={$\large\hexstar$},
   description={Temple of Frost},
@@ -1056,7 +1056,7 @@
 
 \newglossaryentry{hate}{
   type=symbols,
-  sort=Hate,
+  sort=GHate,
   nonumberlist,
   name={\Amor},
   description={Temple of Hate},
@@ -1064,7 +1064,7 @@
 
 \newglossaryentry{curiosity}{
   type=symbols,
-  sort=Curiosity,
+  sort=GCuriosity,
   nonumberlist,
   name={$\Large\bell$},
   description={Temple of Curiosity},
@@ -1074,7 +1074,7 @@
 
 \newglossaryentry{Dw}{
   type=symbols,
-  sort=Dwarf,
+  sort=RDwarf,
   nonumberlist,
   name={\Vulkanus},
   description={Dwarf},
@@ -1082,7 +1082,7 @@
 
 \newglossaryentry{El}{
   type=symbols,
-  sort=Elf,
+  sort=RElf,
   nonumberlist,
   name={\Moon},
   description={Elf},
@@ -1090,7 +1090,7 @@
 
 \newglossaryentry{Hu}{
   type=symbols,
-  sort=Human,
+  sort=RHuman,
   nonumberlist,
   name={\Saturn},
   description={Human},
@@ -1098,7 +1098,7 @@
 
 \newglossaryentry{Gn}{
   type=symbols,
-  sort=Gnome,
+  sort=RGnome,
   nonumberlist,
   name={\Kronos},
   description={Gnome},
@@ -1106,7 +1106,7 @@
 
 \newglossaryentry{Nl}{
   type=symbols,
-  sort=Gnoll,
+  sort=RGnoll,
   nonumberlist,
   name={\Admetos},
   description={Gnoll},
@@ -1114,7 +1114,7 @@
 
 \newglossaryentry{squash}{
   type=symbols,
-  sort=Squash,
+  sort=ASquash,
   nonumberlist,
   name={\Vesta},
   description={Play this \gls{sq} at the same time as the available one (i.e. not from the same \gls{sq})},
@@ -1122,7 +1122,7 @@
 
 \newglossaryentry{sqn}{
   type=symbols,
-  sort=sqn,
+  sort=Asqn,
   nonumberlist,
   name={\Square},
   description={Side Quest is not ready yet},
@@ -1130,7 +1130,7 @@
 
 \newglossaryentry{sqr}{
   type=symbols,
-  sort=sqr,
+  sort=Asqr,
   nonumberlist,
   name={\CheckedBox},
   description={Side Quest is ready},