diff --git a/11ty/definitions/-tard.md b/11ty/definitions/-tard.md
index d9cd72ce..0483d7e7 100644
--- a/11ty/definitions/-tard.md
+++ b/11ty/definitions/-tard.md
@@ -1,5 +1,8 @@
 ---
-title: -tard ableist slur
+title: -tard
 slug: -tard
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/bipolar-medical-appropriation.md b/11ty/definitions/bipolar-medical-appropriation.md
deleted file mode 100644
index 60e9d0a0..00000000
--- a/11ty/definitions/bipolar-medical-appropriation.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Bipolar medical appropriation
-slug: bipolar-medical-appropriation
-defined: false
----
\ No newline at end of file
diff --git a/11ty/definitions/crippled.md b/11ty/definitions/crippled.md
index 5ee18427..16a9b76b 100644
--- a/11ty/definitions/crippled.md
+++ b/11ty/definitions/crippled.md
@@ -1,5 +1,8 @@
 ---
-title: Crippled ableist slur
+title: Crippled
 slug: crippled
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/gender.md b/11ty/definitions/gender.md
index 99d0ae3d..5f9b6fc5 100644
--- a/11ty/definitions/gender.md
+++ b/11ty/definitions/gender.md
@@ -2,4 +2,15 @@
 title: Gender
 slug: gender
 defined: false
----
\ No newline at end of file
+sub_terms:
+  - text: Cis-
+    full_title: Cisgender
+  - text: -Fluid
+    full_title: Gender-Fluid
+  - text: Non-Conforming
+    full_title: Gender Non-Conforming
+  - text: Trans
+    full_title: transgender
+  - text: -Queer
+    full_title: Gender-Queer
+---
diff --git a/11ty/definitions/hermaphrodite.md b/11ty/definitions/hermaphrodite.md
index e8a5da2b..e6a281f3 100644
--- a/11ty/definitions/hermaphrodite.md
+++ b/11ty/definitions/hermaphrodite.md
@@ -2,4 +2,7 @@
 title: Hermaphrodite
 slug: hermaphrodite
 defined: false
----
\ No newline at end of file
+sub_terms:
+  - text: pseudo, male and female
+    full_title: Hermaprhodite pseudo, male and female
+---
diff --git a/11ty/definitions/idiot.md b/11ty/definitions/idiot.md
index 7ccb9fa9..3698ec3a 100644
--- a/11ty/definitions/idiot.md
+++ b/11ty/definitions/idiot.md
@@ -1,5 +1,8 @@
 ---
-title: Idiot ableist slur
+title: Idiot
 slug: idiot
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: 'Ableist Slur'
+---
diff --git a/11ty/definitions/illness.md b/11ty/definitions/illness.md
index 158a3b37..2347a59b 100644
--- a/11ty/definitions/illness.md
+++ b/11ty/definitions/illness.md
@@ -2,4 +2,7 @@
 title: Illness
 slug: illness
 defined: false
----
\ No newline at end of file
+sub_terms:
+  - text: Chronic
+    full_title: Chronic Illness
+---
diff --git a/11ty/definitions/lame.md b/11ty/definitions/lame.md
index 39179e65..08b82db4 100644
--- a/11ty/definitions/lame.md
+++ b/11ty/definitions/lame.md
@@ -1,5 +1,8 @@
 ---
-title: Lame ableist slur
+title: Lame
 slug: lame
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: 'ableist slur'
+---
diff --git a/11ty/definitions/lunatic.md b/11ty/definitions/lunatic.md
index 3a041ef6..3a2e6841 100644
--- a/11ty/definitions/lunatic.md
+++ b/11ty/definitions/lunatic.md
@@ -1,5 +1,8 @@
 ---
-title: Lunatic ableist slur
+title: Lunatic
 slug: lunatic
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/maniac.md b/11ty/definitions/maniac.md
index 928bc701..aa8f3bf6 100644
--- a/11ty/definitions/maniac.md
+++ b/11ty/definitions/maniac.md
@@ -1,5 +1,8 @@
 ---
-title: Maniac ableist slur
+title: Maniac
 slug: maniac
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/midget.md b/11ty/definitions/midget.md
index d3886a97..ef18cafa 100644
--- a/11ty/definitions/midget.md
+++ b/11ty/definitions/midget.md
@@ -1,5 +1,8 @@
 ---
-title: Midget ableist slur
+title: Midget
 slug: midget
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/moron.md b/11ty/definitions/moron.md
index fa8f2595..0ac69b23 100644
--- a/11ty/definitions/moron.md
+++ b/11ty/definitions/moron.md
@@ -1,5 +1,8 @@
 ---
-title: Moron ableist slur
+title: Moron
 slug: moron
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/n-word.md b/11ty/definitions/n-word.md
index 35d1030a..23b39d94 100644
--- a/11ty/definitions/n-word.md
+++ b/11ty/definitions/n-word.md
@@ -1,5 +1,8 @@
 ---
-title: N-word racist slur
+title: N-word
 slug: n-word
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: racist slur
+---
diff --git a/11ty/definitions/nuts.md b/11ty/definitions/nuts.md
index 2fa6c995..7306152d 100644
--- a/11ty/definitions/nuts.md
+++ b/11ty/definitions/nuts.md
@@ -1,5 +1,8 @@
 ---
-title: nuts ableist slur
+title: nuts
 slug: nuts
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/obese.md b/11ty/definitions/obese.md
index 536cf8ba..4e4eca32 100644
--- a/11ty/definitions/obese.md
+++ b/11ty/definitions/obese.md
@@ -1,5 +1,8 @@
 ---
-title: Obese anti-fat slur
+title: Obese
 slug: obese
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: anti-fat slur
+---
diff --git a/11ty/definitions/r-tard.md b/11ty/definitions/r-tard.md
index 54e840c6..7afebc4c 100644
--- a/11ty/definitions/r-tard.md
+++ b/11ty/definitions/r-tard.md
@@ -1,5 +1,8 @@
 ---
-title: R-tard ableist slur
+title: R-tard
 slug: r-tard
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/savage.md b/11ty/definitions/savage.md
index 893721d3..28620e11 100644
--- a/11ty/definitions/savage.md
+++ b/11ty/definitions/savage.md
@@ -1,5 +1,8 @@
 ---
-title: Savage racist slur
+title: Savage
 slug: savage
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: racist slur
+---
diff --git a/11ty/definitions/spirit-animalcultural-appropriation.md b/11ty/definitions/spirit-animalcultural-appropriation.md
deleted file mode 100644
index b59a6522..00000000
--- a/11ty/definitions/spirit-animalcultural-appropriation.md
+++ /dev/null
@@ -1,5 +0,0 @@
----
-title: Spirit animalcultural appropriation
-slug: spirit-animalcultural-appropriation
-defined: false
----
\ No newline at end of file
diff --git a/11ty/definitions/stupid.md b/11ty/definitions/stupid.md
index 954a8a2c..01080da5 100644
--- a/11ty/definitions/stupid.md
+++ b/11ty/definitions/stupid.md
@@ -1,5 +1,8 @@
 ---
-title: Stupid ableist slur
+title: Stupid
 slug: stupid
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: ableist slur
+---
diff --git a/11ty/definitions/tranny.md b/11ty/definitions/tranny.md
index 8e754e49..1b103517 100644
--- a/11ty/definitions/tranny.md
+++ b/11ty/definitions/tranny.md
@@ -1,5 +1,8 @@
 ---
-title: Tranny anti-trans slur
+title: Tranny
 slug: tranny
 defined: false
----
\ No newline at end of file
+flag:
+  level: avoid
+  text: anti-trans slur
+---