diff --git a/data/meta.json b/data/meta.json
index 6cb54585..5d3f95f2 100644
--- a/data/meta.json
+++ b/data/meta.json
@@ -194,7 +194,7 @@
   "misc-groups": {
     "body-style": {
       "name": {
-        "eng": "Body styles"
+        "eng": "Body styles (shape)"
       }
     },
     "ribbon": {
diff --git a/data/misc.json b/data/misc.json
index c688480d..788e6c3c 100644
--- a/data/misc.json
+++ b/data/misc.json
@@ -1635,5 +1635,147 @@
         "gen-3": "ribbon/world-ribbon.png"
       }
     }
+  ],
+  "body-style": [
+    {
+      "name": {
+        "eng": "Pokémon consisting of only a head",
+        "jpn": "頭だけのポケモン",
+        "jpn_ro": "Kao dake no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/head-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon consisting of a head and legs",
+        "jpn": "頭と脚だけのポケモン",
+        "jpn_ro": "Kao to ashi dake no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/head-legs-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with fins",
+        "jpn": "ひれが付いたポケモン",
+        "jpn_ro": "Hira ga tsuita Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/fins-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with an insectoid body",
+        "jpn": "羽を持たない虫型のポケモン",
+        "jpn_ro": "Hane wo motanai mushikata no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/insectoid-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with a quadruped body",
+        "jpn": "4本脚のポケモン",
+        "jpn_ro": "Yonhon ashi no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/quadruped-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with two or more pairs of wings",
+        "jpn": "羽を持つ虫型のポケモン",
+        "jpn_ro": "Hane wo motsu mushikata no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/wings-multiple-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon consisting of multiple bodies",
+        "jpn": "複数の体を持つポケモン",
+        "jpn_ro": "Fukusuu no karada wo motsu Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/multiple-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with tentacles or a multiped body",
+        "jpn": "複数の脚を持つポケモン",
+        "jpn_ro": "Fukusuu no ashi wo motsu Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/tentacles-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon consisting of a head and a base",
+        "jpn": "頭と胴体だけのポケモン",
+        "jpn_ro": "Atama to doutai dake no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/head-base-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with a bipedal, tailed form",
+        "jpn": "尾を持つ2本脚のポケモン",
+        "jpn_ro": "O wo motsu nitai ashi no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/bipedal-tailed-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with a bipedal, tailless form",
+        "jpn": "尾を持たない2本脚のポケモン",
+        "jpn_ro": "O wo motanai nitai ashi no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/bipedal-tailless-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with a single pair of wings",
+        "jpn": "一対の翼を持つポケモン",
+        "jpn_ro": "Ittai no tsubasa wo motsu Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/wings-single-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon with serpentine bodies",
+        "jpn": "蛇型のポケモン",
+        "jpn_ro": "Hebikata no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/serpentine-gen6.png"
+      }
+    },
+    {
+      "name": {
+        "eng": "Pokémon consisting of a head and arms",
+        "jpn": "頭と腕だけのポケモン",
+        "jpn_ro": "Atama to ude dake no Pokémon"
+      },
+      "files": {
+        "gen-6": "body-style/head-arms-gen6.png"
+      }
+    }
   ]
 }
diff --git a/misc/body-style/bipedal-tailed.png b/misc/body-style/bipedal-tailed-gen6.png
similarity index 100%
rename from misc/body-style/bipedal-tailed.png
rename to misc/body-style/bipedal-tailed-gen6.png
diff --git a/misc/body-style/bipedal-tailless.png b/misc/body-style/bipedal-tailless-gen6.png
similarity index 100%
rename from misc/body-style/bipedal-tailless.png
rename to misc/body-style/bipedal-tailless-gen6.png
diff --git a/misc/body-style/fins.png b/misc/body-style/fins-gen6.png
similarity index 100%
rename from misc/body-style/fins.png
rename to misc/body-style/fins-gen6.png
diff --git a/misc/body-style/head-arms.png b/misc/body-style/head-arms-gen6.png
similarity index 100%
rename from misc/body-style/head-arms.png
rename to misc/body-style/head-arms-gen6.png
diff --git a/misc/body-style/head-base.png b/misc/body-style/head-base-gen6.png
similarity index 100%
rename from misc/body-style/head-base.png
rename to misc/body-style/head-base-gen6.png
diff --git a/misc/body-style/head.png b/misc/body-style/head-gen6.png
similarity index 100%
rename from misc/body-style/head.png
rename to misc/body-style/head-gen6.png
diff --git a/misc/body-style/head-legs.png b/misc/body-style/head-legs-gen6.png
similarity index 100%
rename from misc/body-style/head-legs.png
rename to misc/body-style/head-legs-gen6.png
diff --git a/misc/body-style/insectoid.png b/misc/body-style/insectoid-gen6.png
similarity index 100%
rename from misc/body-style/insectoid.png
rename to misc/body-style/insectoid-gen6.png
diff --git a/misc/body-style/multiple.png b/misc/body-style/multiple-gen6.png
similarity index 100%
rename from misc/body-style/multiple.png
rename to misc/body-style/multiple-gen6.png
diff --git a/misc/body-style/quadruped.png b/misc/body-style/quadruped-gen6.png
similarity index 100%
rename from misc/body-style/quadruped.png
rename to misc/body-style/quadruped-gen6.png
diff --git a/misc/body-style/serpentine.png b/misc/body-style/serpentine-gen6.png
similarity index 100%
rename from misc/body-style/serpentine.png
rename to misc/body-style/serpentine-gen6.png
diff --git a/misc/body-style/tentacles.png b/misc/body-style/tentacles-gen6.png
similarity index 100%
rename from misc/body-style/tentacles.png
rename to misc/body-style/tentacles-gen6.png
diff --git a/misc/body-style/wings-multiple.png b/misc/body-style/wings-multiple-gen6.png
similarity index 100%
rename from misc/body-style/wings-multiple.png
rename to misc/body-style/wings-multiple-gen6.png
diff --git a/misc/body-style/wings-single.png b/misc/body-style/wings-single-gen6.png
similarity index 100%
rename from misc/body-style/wings-single.png
rename to misc/body-style/wings-single-gen6.png
diff --git a/scripts/gen_docs.py b/scripts/gen_docs.py
index 770fb549..11ce8813 100755
--- a/scripts/gen_docs.py
+++ b/scripts/gen_docs.py
@@ -399,7 +399,7 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
   buffer.append('<tbody>')
 
   # Ribbons
-  buffer.append('<tr><th></th><td colspan="8" class="group">%s</td></tr>' % groups['ribbon']['name']['eng'])
+  buffer.append('<tr><th></th><td colspan="6" class="group">%s</td></tr>' % groups['ribbon']['name']['eng'])
   #buffer.append('<tr class="header"><th>#</th><th>Name</th><th>名前</th><th>Sprite</th><th>Origin</th><th colspan="2">Description/gen</th><th colspan="2">Filename/gen</th></tr>')
   buffer.append('<tr class="header"><th>#</th><th>Name</th><th>名前</th><th>Sprite</th><th>Origin</th><th colspan="2">Filename/gen</th></tr>')
 
@@ -430,6 +430,27 @@ def generate_misc_table(misc, meta, curr_page, json_file, version = '[unknown]',
       buffer.append('</tr>')
       sprites_counter += 1
   
+  # Body styles
+  buffer.append('<tr><th></th><td colspan="6" class="group">%s</td></tr>' % groups['body-style']['name']['eng'])
+  buffer.append('<tr class="header"><th>#</th><th>Type</th><th>種類</th><th>Sprite</th><th colspan="4">Filename/gen</th></tr>')
+
+  for item in misc['body-style']:
+    count = get_counter()
+    name = item['name']
+    name_eng = name['eng']
+    name_jpn = name['jpn']
+    for k, v in item['files'].items():
+      gen_n = k.split('-')[1]
+      buffer.append('<tr class="variable-height">')
+      buffer.append(f'<td>{count}</td>')
+      buffer.append(f'<td>{name_eng}</td>')
+      buffer.append(f'<td>{name_jpn}</td>')
+      buffer.append('<td class="image item">' + get_img_node(get_misc_url(base_url, v), None, f"Sprite for '{name_eng}'", 'm') + '</td>')
+      buffer.append(f'<td class="filler" colspan="2"><code>{v}</code></td>')
+      buffer.append(f'<td>Gen {gen_n}</td>')
+      buffer.append('</tr>')
+      sprites_counter += 1
+  
   buffer.append('</tbody>')
   buffer.append('<tfoot>')
   buffer.append('<tr>')