diff --git a/js/display_constants.js b/js/display_constants.js
index 5e924f9..ed493e8 100644
--- a/js/display_constants.js
+++ b/js/display_constants.js
@@ -40,46 +40,46 @@ let idPrefixes = {"displayName": "",
     "hpBonus":"Health Bonus: ",
     "hprRaw":"Raw Health Regen: ",
     "hprPct":"Health Regen %: ",
-    "sdRaw":"Raw Spell Damage: ",
-    "rSdRaw":"Raw Elem. Spell Damage: ",
-    "nSdRaw":"Raw Neut. Spell Damage: ",
-    "eSdRaw":"Raw Earth Spell Damage: ",
-    "tSdRaw":"Raw Thunder Spell Damage: ",
-    "wSdRaw":"Raw Water Spell Damage: ",
-    "fSdRaw":"Raw Fire Spell Damage: ",
-    "aSdRaw":"Raw Air Spell Damage: ",
+    "sdRaw":"Spell Damage Raw: ",
+    "rSdRaw":"Elem. Spell Damage Raw: ",
+    "nSdRaw":"Neut. Spell Damage Raw: ",
+    "eSdRaw":"Earth Spell Damage Raw: ",
+    "tSdRaw":"Thunder Spell Damage Raw: ",
+    "wSdRaw":"Water Spell Damage Raw: ",
+    "fSdRaw":"Fire Spell Damage Raw: ",
+    "aSdRaw":"Air Spell Damage Raw: ",
     "sdPct":"Spell Damage %: ",
     "rSdPct":"Elem. Spell Damage %: ",
     "nSdPct":"Neut. Spell Damage %: ",
-    "eSdPct":"% Earth Spell Damage: ",
-    "tSdPct":"% Thunder Spell Damage: ",
-    "wSdPct":"% Water Spell Damage: ",
-    "fSdPct":"% Fire Spell Damage: ",
-    "aSdPct":"% Air Spell Damage: ",
-    "mdRaw":"Raw Melee Damage: ",
-    "rMdRaw":"Raw Elem. Melee Damage: ",
-    "nMdRaw":"Raw Neut. Melee Damage: ",
-    "eMdRaw":"Raw Earth Melee Damage: ",
-    "tMdRaw":"Raw Thunder Melee Damage: ",
-    "wMdRaw":"Raw Water Melee Damage: ",
-    "fMdRaw":"Raw Fire Melee Damage: ",
-    "aMdRaw":"Raw Air Melee Damage: ",
+    "eSdPct":"Earth Spell Damage %: ",
+    "tSdPct":"Thunder Spell Damage %: ",
+    "wSdPct":"Water Spell Damage %: ",
+    "fSdPct":"Fire Spell Damage %: ",
+    "aSdPct":"Air Spell Damage %: ",
+    "mdRaw":"Melee Damage Raw: ",
+    "rMdRaw":"Elem. Melee Damage Raw: ",
+    "nMdRaw":"Neut. Melee Damage Raw: ",
+    "eMdRaw":"Earth Melee Damage Raw: ",
+    "tMdRaw":"Thunder Melee Damage Raw: ",
+    "wMdRaw":"Water Melee Damage Raw: ",
+    "fMdRaw":"Fire Melee Damage Raw: ",
+    "aMdRaw":"Air Melee Damage Raw: ",
     "mdPct":"Melee Damage %: ",
     "rMdPct":"Elem. Melee Damage %: ",
     "nMdPct":"Neut. Melee Damage %: ",
-    "eMdPct":"% Earth Melee Damage: ",
-    "tMdPct":"% Thunder Melee Damage: ",
-    "wMdPct":"% Water Melee Damage: ",
-    "fMdPct":"% Fire Melee Damage: ",
-    "aMdPct":"% Air Melee Damage: ",
-    "damRaw":"Raw Damage: ",
-    "rDamRaw":"Raw Elemental Damage: ",
-    "nDamRaw":"Raw Neutral Damage: ",
-    "eDamRaw":"Raw Earth Damage: ",
-    "tDamRaw":"Raw Thunder Damage: ",
-    "wDamRaw":"Raw Water Damage: ",
-    "fDamRaw":"Raw Fire Damage: ",
-    "aDamRaw":"Raw Air Damage: ",
+    "eMdPct":"Earth Melee Damage %: ",
+    "tMdPct":"Thunder Melee Damage %: ",
+    "wMdPct":"Water Melee Damage %: ",
+    "fMdPct":"Fire Melee Damage %: ",
+    "aMdPct":"Air Melee Damage %: ",
+    "damRaw":"Damage Raw: ",
+    "rDamRaw":"Elemental Damage Raw: ",
+    "nDamRaw":"Neutral Damage Raw: ",
+    "eDamRaw":"Earth Damage Raw: ",
+    "tDamRaw":"Thunder Damage Raw: ",
+    "wDamRaw":"Water Damage Raw: ",
+    "fDamRaw":"Fire Damage Raw: ",
+    "aDamRaw":"Air Damage Raw: ",
     "damPct":"Damage %: ",
     "rDamPct":"Elemental Damage %: ",
     "nDamPct":"Neutral Damage %: ",
@@ -395,12 +395,6 @@ let sq2_item_display_commands = [
     "str", "dex", "int", "def", "agi",
     "hpBonus",
     "hprRaw", "hprPct",
-    "sdRaw", "nSdRaw", "eSdRaw", "tSdRaw", "wSdRaw", "fSdRaw", "aSdRaw", "rSdRaw",
-    "sdPct", "nSdPct", "eSdPct", "tSdPct", "wSdPct", "fSdPct", "aSdPct", "rSdPct",
-    "mdRaw", "nMdRaw", "eMdRaw", "tMdRaw", "wMdRaw", "fMdRaw", "aMdRaw", "rMdRaw",
-    "mdPct", "nMdPct", "eMdPct", "tMdPct", "wMdPct", "fMdPct", "aMdPct", "rMdPct",
-    "damRaw", "nDamRaw", "eDamRaw", "tDamRaw", "wDamRaw", "fDamRaw", "aDamRaw", "rDamRaw",
-    "damPct", "nDamPct", "eDamPct", "tDamPct", "wDamPct", "fDamPct", "aDamPct", "rDamPct",
     "mr", "ms",
     "ref", "thorns",
     "ls",
@@ -408,7 +402,18 @@ let sq2_item_display_commands = [
     "expd",
     "spd",
     "atkTier",
+    "sdRaw", "nSdRaw", "rSdRaw",
+    "sdPct", "nSdPct", "rSdPct",
+    "mdRaw", "nMdRaw", "rMdRaw",
+    "mdPct", "nMdPct", "rMdPct",
+    "damRaw", "nDamRaw", "rDamRaw",
+    "damPct", "nDamPct", "rDamPct",
     "!elemental",
+    "fSdRaw", "wSdRaw", "aSdRaw", "tSdRaw", "eSdRaw",
+    "fSdPct", "wSdPct", "aSdPct", "tSdPct", "eSdPct",
+    "fMdRaw", "wMdRaw", "aMdRaw", "tMdRaw", "eMdRaw",
+    "fMdPct", "wMdPct", "aMdPct", "tMdPct", "eMdPct",
+    "fDamRaw", "wDamRaw", "aDamRaw", "tDamRaw", "eDamRaw",
     "fDamPct", "wDamPct", "aDamPct", "tDamPct", "eDamPct",
     "fDefPct", "wDefPct", "aDefPct", "tDefPct", "eDefPct",
     "!elemental",