diff --git a/species/blobfox/species.toml b/species/blobfox/species.toml
index 29ff199..953fa11 100644
--- a/species/blobfox/species.toml
+++ b/species/blobfox/species.toml
@@ -5,7 +5,7 @@ name = "blobfox"
 base = ["body-basic", "eyes-basic", "mouth-w"]
 happy = ["body-basic", "eyes-happy", "mouth-w"]
 evil = ["body-basic", "eyes-evil", "mouth-w"]
-owo = ["body-basic", "ear-owo", "eyes-happy", "mouth-w"]
+owo = ["body-basic", "ear-owo", "eyes-owo", "mouth-w"]
 
 "3c" = ["body-basic", "eyes-basic", "mouth-w", "hand-3c", "left-hand"]
 "3c_evil" = ["body-basic", "eyes-evil", "mouth-w", "hand-3c", "left-hand"]
@@ -16,10 +16,11 @@ boop_owo = ["body-basic", "ear-owo", "boop", "eyes-owo", "mouth-w"]
 
 reach = ["body-basic", "eyes-basic", "mouth-w", "hands-reach", "left-hand", "right-hand"]
 reach_aww = ["body-basic", "eyes-aww", "mouth-w", "hands-reach", "left-hand", "right-hand"]
+reach_owo = ["body-basic", "ear-owo", "eyes-owo", "mouth-w", "hands-reach", "left-hand", "right-hand"]
 
 snug = ["body-snug", "eyes-happy", "tail"]
 snug_aww = ["body-snug", "eyes-aww", "tail"]
 snug_owo = ["body-snug", "ear-owo", "eyes-owo", "tail"]
 snug_boop_owo = ["body-snug", "ear-owo", "eyes-owo", "tail", "boop"]
 
-stabby = ["body-basic", "prop", "eyes-evil", "mouth-w", "hand-3c", "left-hand"]
+stabby = ["body-basic", "holding", "eyes-evil", "mouth-w", "hand-3c", "left-hand"]
diff --git a/species/blobfox/templates/base-owo.mustache b/species/blobfox/templates/base-owo.mustache
deleted file mode 100644
index a5e4dec..0000000
--- a/species/blobfox/templates/base-owo.mustache
+++ /dev/null
@@ -1,8 +0,0 @@
-<g id="base">
-    {{#boop_owo}}#left-ear{{/boop_owo}}
-    {{#boop_owo}}#left-ear-fluff{{/boop_owo}}
-    {{#base}}#body{{/base}}
-    {{#base}}#hair{{/base}}
-    {{#base}}#right-ear{{/base}}
-    {{#base}}#right-ear-fluff{{/base}}
-</g>
diff --git a/species/blobfox/templates/base.mustache b/species/blobfox/templates/base.mustache
deleted file mode 100644
index 515a103..0000000
--- a/species/blobfox/templates/base.mustache
+++ /dev/null
@@ -1,7 +0,0 @@
-<g id="base">
-    {{#base}}#left-ear{{/base}}
-    {{#base}}#body{{/base}}
-    {{#base}}#hair{{/base}}
-    {{#base}}#right-ear{{/base}}
-    {{#base}}#right-ear-fluff{{/base}}
-</g>
diff --git a/species/blobfox/templates/body-basic.mustache b/species/blobfox/templates/body-basic.mustache
new file mode 100644
index 0000000..d8f3b8e
--- /dev/null
+++ b/species/blobfox/templates/body-basic.mustache
@@ -0,0 +1,15 @@
+{{! Left ear }}
+{{#tags.ear-owo}}
+    {{#boop_owo}}#left-ear{{/boop_owo}}
+    {{#boop_owo}}#left-ear-fluff{{/boop_owo}}
+{{/tags.ear-owo}}
+{{^tags.ear-owo}}
+    {{#base}}#left-ear{{/base}}
+{{/tags.ear-owo}}
+
+{{#base}}#body{{/base}}
+{{#base}}#hair{{/base}}
+
+{{! Right ear }}
+{{#base}}#right-ear{{/base}}
+{{#base}}#right-ear-fluff{{/base}}
diff --git a/species/blobfox/templates/base-snug.mustache b/species/blobfox/templates/body-snug.mustache
similarity index 59%
rename from species/blobfox/templates/base-snug.mustache
rename to species/blobfox/templates/body-snug.mustache
index 39d9a57..2bf4891 100644
--- a/species/blobfox/templates/base-snug.mustache
+++ b/species/blobfox/templates/body-snug.mustache
@@ -1,17 +1,21 @@
-<g id="base-snug">
+<g id="body-snug">
+    {{! TODO: owo ear }}
     {{#snug}}#left-ear{{/snug}}
     {{#snug}}#body{{/snug}}
     {{#snug}}#hair{{/snug}}
     {{#snug}}#right-ear{{/snug}}
     {{#snug}}#right-ear-fluff{{/snug}}
-    {{! TODO: update to the latest standard }}
-    <!--<g id="old">
-        {{#snug}}#left-ear{{/snug}}
-        {{#snug}}#right-ear{{/snug}}
-        {{#snug}}#right-ear-fluff{{/snug}}
-        {{#snug}}#body{{/snug}}
-    </g>-->
-    <!--<g id="new" transform="scale(1 0.88) translate(0 2)">
+
+    {{#tags.tail}}
+        <g id="tail">
+            {{#snug}}#tail{{/snug}}
+            {{#snug}}#tail-outline{{/snug}}
+        </g>
+    {{/tags.tail}}
+</g>
+
+<!-- Following is a list of transforms to approximate the snug version using the base version
+    <g id="new" transform="scale(1 0.88) translate(0 2)">
         <g id="left-ear" transform="rotate(5 6.6 5.5) translate(0 0.2) scale(1 1.2)">
             {{#base}}#left-ear{{/base}}
         </g>
@@ -21,5 +25,5 @@
             {{#base}}#right-ear{{/base}}
             {{#base}}#right-ear-fluff{{/base}}
         </g>
-    </g>-->
-</g>
+    </g>
+-->
diff --git a/species/blobfox/templates/body.mustache b/species/blobfox/templates/body.mustache
new file mode 100644
index 0000000..1eff5db
--- /dev/null
+++ b/species/blobfox/templates/body.mustache
@@ -0,0 +1,8 @@
+<g id="body">
+    {{#tags.body-basic}}
+        {{>body-basic}}
+    {{/tags.body-basic}}
+    {{#tags.body-snug}}
+        {{>body-snug}}
+    {{/tags.body-snug}}
+</g>
diff --git a/species/blobfox/templates/extra-3c.mustache b/species/blobfox/templates/extra-3c.mustache
deleted file mode 100644
index 9c8e191..0000000
--- a/species/blobfox/templates/extra-3c.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{! cf. base-extra }}
-<g id="base-extra" />
diff --git a/species/blobfox/templates/extra-base.mustache b/species/blobfox/templates/extra-base.mustache
deleted file mode 100644
index 5e859b1..0000000
--- a/species/blobfox/templates/extra-base.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{! Should be included after >base if there is no arm, object, etc. on the emote }}
-<g id="base-feature" />
diff --git a/species/blobfox/templates/extra-reach.mustache b/species/blobfox/templates/extra-reach.mustache
deleted file mode 100644
index 1dc66f5..0000000
--- a/species/blobfox/templates/extra-reach.mustache
+++ /dev/null
@@ -1,2 +0,0 @@
-{{! cf. base-extra }}
-<g id="reach-extra" />
diff --git a/species/blobfox/templates/extra-snug.mustache b/species/blobfox/templates/extra-snug.mustache
deleted file mode 100644
index 11f6523..0000000
--- a/species/blobfox/templates/extra-snug.mustache
+++ /dev/null
@@ -1 +0,0 @@
-<g id="extra-snug" />
diff --git a/species/blobfox/templates/eyes-aww.mustache b/species/blobfox/templates/eyes-aww.mustache
deleted file mode 100644
index 7a818b2..0000000
--- a/species/blobfox/templates/eyes-aww.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="eyes-aww">
-    {{#reach_aww}}#left-eye{{/reach_aww}}
-    {{#reach_aww}}#right-eye{{/reach_aww}}
-</g>
diff --git a/species/blobfox/templates/eyes-evil.mustache b/species/blobfox/templates/eyes-evil.mustache
deleted file mode 100644
index 16089bf..0000000
--- a/species/blobfox/templates/eyes-evil.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="eyes-eveil">
-    {{#3c_evil}}#left-eye{{/3c_evil}}
-    {{#3c_evil}}#right-eye{{/3c_evil}}
-</g>
diff --git a/species/blobfox/templates/eyes-owo.mustache b/species/blobfox/templates/eyes-owo.mustache
deleted file mode 100644
index f3056ad..0000000
--- a/species/blobfox/templates/eyes-owo.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="eyes-owo">
-    {{#boop_owo}}#left-eye{{/boop_owo}}
-    {{#boop_owo}}#right-eye{{/boop_owo}}
-</g>
diff --git a/species/blobfox/templates/eyes-snug.mustache b/species/blobfox/templates/eyes-snug.mustache
deleted file mode 100644
index 231190e..0000000
--- a/species/blobfox/templates/eyes-snug.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="eyes-snug">
-    {{#snug}}#left-eye{{/snug}}
-    {{#snug}}#right-eye{{/snug}}
-</g>
diff --git a/species/blobfox/templates/eyes.mustache b/species/blobfox/templates/eyes.mustache
index 935bf81..5b8e5b2 100644
--- a/species/blobfox/templates/eyes.mustache
+++ b/species/blobfox/templates/eyes.mustache
@@ -1,4 +1,22 @@
 <g id="eyes">
-    {{#base}}#left-eye{{/base}}
-    {{#base}}#right-eye{{/base}}
+    {{#tags.eyes-basic}}
+        {{#base}}#left-eye{{/base}}
+        {{#base}}#right-eye{{/base}}
+    {{/tags.eyes-basic}}
+    {{#tags.eyes-owo}}
+        {{#boop_owo}}#left-eye{{/boop_owo}}
+        {{#boop_owo}}#right-eye{{/boop_owo}}
+    {{/tags.eyes-owo}}
+    {{#tags.eyes-happy}}
+        {{#snug}}#left-eye{{/snug}}
+        {{#snug}}#right-eye{{/snug}}
+    {{/tags.eyes-happy}}
+    {{#tags.eyes-aww}}
+        {{#reach_aww}}#left-eye{{/reach_aww}}
+        {{#reach_aww}}#right-eye{{/reach_aww}}
+    {{/tags.eyes-aww}}
+    {{#tags.eyes-evil}}
+        {{#3c_evil}}#left-eye{{/3c_evil}}
+        {{#3c_evil}}#right-eye{{/3c_evil}}
+    {{/tags.eyes-evil}}
 </g>
diff --git a/species/blobfox/templates/hand-3c.mustache b/species/blobfox/templates/hand-3c.mustache
deleted file mode 100644
index 9530464..0000000
--- a/species/blobfox/templates/hand-3c.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{#3c_evil}}#left-hand{{/3c_evil}}
diff --git a/species/blobfox/templates/hand-knife.mustache b/species/blobfox/templates/hand-knife.mustache
deleted file mode 100644
index 9f32af4..0000000
--- a/species/blobfox/templates/hand-knife.mustache
+++ /dev/null
@@ -1,9 +0,0 @@
-<g id="hand-knife">
-    <g id="knife">
-        {{#knife}}#blade-back{{/knife}}
-        {{#knife}}#blade-front{{/knife}}
-        {{#knife}}#handle{{/knife}}
-        {{#knife}}#handle-screw{{/knife}}
-    </g>
-    {{#knife}}#left-hand{{/knife}}
-</g>
diff --git a/species/blobfox/templates/hands-reach.mustache b/species/blobfox/templates/hands-reach.mustache
deleted file mode 100644
index 591bb43..0000000
--- a/species/blobfox/templates/hands-reach.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="hands-reach">
-    {{#reach_aww}}#left-hand{{/reach_aww}}
-    {{#reach_aww}}#right-hand{{/reach_aww}}
-</g>
diff --git a/species/blobfox/templates/hands.mustache b/species/blobfox/templates/hands.mustache
new file mode 100644
index 0000000..61903be
--- /dev/null
+++ b/species/blobfox/templates/hands.mustache
@@ -0,0 +1,15 @@
+<g id="hands">
+    {{#tags.hands-reach}}
+        {{#reach_aww}}#left-hand{{/reach_aww}}
+        {{#reach_aww}}#right-hand{{/reach_aww}}
+    {{/tags.hands-reach}}
+    {{#tags.hand-3c}}
+        {{#tags.holding}}
+            {{#knife}}#left-hand{{/knife}}
+        {{/tags.holding}}
+        {{^tags.holding}}
+            {{! :3c hand }}
+            {{#3c_evil}}#left-hand{{/3c_evil}}
+        {{/tags.holding}}
+    {{/tags.hand-3c}}
+</g>
diff --git a/species/blobfox/templates/header.mustache b/species/blobfox/templates/header.mustache
index 5c94ac5..b2b7858 100644
--- a/species/blobfox/templates/header.mustache
+++ b/species/blobfox/templates/header.mustache
@@ -5,30 +5,5 @@
     xmlns:xlink="http://www.w3.org/1999/xlink"
     xmlns="http://www.w3.org/2000/svg"
     xmlns:svg="http://www.w3.org/2000/svg">
-    <!-- For some reason this makes krita give a nicer anti-alias over darker backgrounds -->
-    <sodipodi:namedview
-        id="namedview7"
-        pagecolor="#505050"
-        bordercolor="#ffffff"
-        borderopacity="1"
-        inkscape:pageshadow="0"
-        inkscape:pageopacity="0"
-        inkscape:pagecheckerboard="1"
-        inkscape:document-units="mm"
-        showgrid="false"
-        inkscape:zoom="10.154753"
-        inkscape:cx="59.381059"
-        inkscape:cy="57.214585"
-        inkscape:window-width="1536"
-        inkscape:window-height="779"
-        inkscape:window-x="0"
-        inkscape:window-y="0"
-        inkscape:window-maximized="1"
-        inkscape:current-layer="layer3"
-        units="px"
-        inkscape:showpageshadow="2"
-        inkscape:deskcolor="#505050">
-            <inkscape:grid type="xygrid" id="grid10" />
-    </sodipodi:namedview>
     <title>{{variant_name}}</title>
     <g id="main">
diff --git a/species/blobfox/templates/knife.mustache b/species/blobfox/templates/knife.mustache
new file mode 100644
index 0000000..6f1dbe3
--- /dev/null
+++ b/species/blobfox/templates/knife.mustache
@@ -0,0 +1,6 @@
+<g id="knife">
+    {{#knife}}#blade-back{{/knife}}
+    {{#knife}}#blade-front{{/knife}}
+    {{#knife}}#handle{{/knife}}
+    {{#knife}}#handle-screw{{/knife}}
+</g>
diff --git a/species/blobfox/templates/mouth-w.mustache b/species/blobfox/templates/mouth-w.mustache
deleted file mode 100644
index 8e1d73a..0000000
--- a/species/blobfox/templates/mouth-w.mustache
+++ /dev/null
@@ -1 +0,0 @@
-{{#base}}#mouth{{/base}}
diff --git a/species/blobfox/templates/mouth.mustache b/species/blobfox/templates/mouth.mustache
new file mode 100644
index 0000000..ad77603
--- /dev/null
+++ b/species/blobfox/templates/mouth.mustache
@@ -0,0 +1,3 @@
+{{#tags.mouth-w}}
+    {{#base}}#mouth{{/base}}
+{{/tags.mouth-w}}
diff --git a/species/blobfox/templates/nose-aww.mustache b/species/blobfox/templates/nose-aww.mustache
deleted file mode 100644
index 11abd48..0000000
--- a/species/blobfox/templates/nose-aww.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="nose-aww">
-    {{#base}}#nose{{/base}}
-    {{#reach_aww}}#nose-outline{{/reach_aww}}
-</g>
diff --git a/species/blobfox/templates/nose-evil.mustache b/species/blobfox/templates/nose-evil.mustache
deleted file mode 100644
index cb341a9..0000000
--- a/species/blobfox/templates/nose-evil.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="nose-evil">
-    {{#3c_evil}}#nose-outline{{/3c_evil}}
-    {{#base}}#nose{{/base}}
-</g>
diff --git a/species/blobfox/templates/nose-owo.mustache b/species/blobfox/templates/nose-owo.mustache
deleted file mode 100644
index 6655460..0000000
--- a/species/blobfox/templates/nose-owo.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="nose-owo">
-    {{#base}}#nose{{/base}}
-    {{#boop_owo}}#nose-outline{{/boop_owo}}
-</g>
diff --git a/species/blobfox/templates/nose-snug.mustache b/species/blobfox/templates/nose-snug.mustache
deleted file mode 100644
index f307896..0000000
--- a/species/blobfox/templates/nose-snug.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="nose-snug">
-    {{#snug}}#nose{{/snug}}
-    {{#snug}}#nose-outline{{/snug}}
-</g>
diff --git a/species/blobfox/templates/nose.mustache b/species/blobfox/templates/nose.mustache
index ea89fd8..e61790f 100644
--- a/species/blobfox/templates/nose.mustache
+++ b/species/blobfox/templates/nose.mustache
@@ -1,4 +1,16 @@
 <g id="nose">
-    {{#base}}#nose-outline{{/base}}
+    {{#tags.eyes-basic}}
+        {{#base}}#nose-outline{{/base}}
+    {{/tags.eyes-basic}}
+    {{#tags.eyes-owo}}
+        {{#boop_owo}}#nose-outline{{/boop_owo}}
+    {{/tags.eyes-owo}}
+    {{#tags.eyes-aww}}
+        {{#reach_aww}}#nose-outline{{/reach_aww}}
+    {{/tags.eyes-aww}}
+    {{#tags.eyes-evil}}
+        {{#3c_evil}}#nose-outline{{/3c_evil}}
+    {{/tags.eyes-evil}}
+
     {{#base}}#nose{{/base}}
 </g>
diff --git a/species/blobfox/templates/tail-snug.mustache b/species/blobfox/templates/tail-snug.mustache
deleted file mode 100644
index fd1cbac..0000000
--- a/species/blobfox/templates/tail-snug.mustache
+++ /dev/null
@@ -1,4 +0,0 @@
-<g id="tail-snug">
-    {{#snug}}#tail{{/snug}}
-    {{#snug}}#tail-outline{{/snug}}
-</g>
diff --git a/species/blobfox/templates/tail.mustache b/species/blobfox/templates/tail.mustache
new file mode 100644
index 0000000..e69de29
diff --git a/species/blobfox/variants/3c.mustache b/species/blobfox/variants/3c.mustache
index c168d5e..4665694 100644
--- a/species/blobfox/variants/3c.mustache
+++ b/species/blobfox/variants/3c.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>hand-3c}}
-        {{>extra-3c}}
-    </g>
-    <g id="features">
-        {{>eyes}}
-        {{>nose}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hands}}
 {{>footer}}
diff --git a/species/blobfox/variants/3c_evil.mustache b/species/blobfox/variants/3c_evil.mustache
index 4965bb9..4665694 100644
--- a/species/blobfox/variants/3c_evil.mustache
+++ b/species/blobfox/variants/3c_evil.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>hand-3c}}
-        {{>extra-3c}}
-    </g>
-    <g id="features">
-        {{>eyes-evil}}
-        {{>nose-evil}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hands}}
 {{>footer}}
diff --git a/species/blobfox/variants/base.mustache b/species/blobfox/variants/base.mustache
index f7147e7..be8b98b 100644
--- a/species/blobfox/variants/base.mustache
+++ b/species/blobfox/variants/base.mustache
@@ -1,11 +1,7 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes}}
-        {{>nose}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
 {{>footer}}
diff --git a/species/blobfox/variants/boop.mustache b/species/blobfox/variants/boop.mustache
index 495d95d..153c9c3 100644
--- a/species/blobfox/variants/boop.mustache
+++ b/species/blobfox/variants/boop.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes}}
-        {{>nose}}
-        {{>mouth-w}}
-        {{>hand-boop}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hand-boop}}
 {{>footer}}
diff --git a/species/blobfox/variants/boop_aww.mustache b/species/blobfox/variants/boop_aww.mustache
index ed38dfd..153c9c3 100644
--- a/species/blobfox/variants/boop_aww.mustache
+++ b/species/blobfox/variants/boop_aww.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes-aww}}
-        {{>nose-aww}}
-        {{>mouth-w}}
-        {{>hand-boop}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hand-boop}}
 {{>footer}}
diff --git a/species/blobfox/variants/boop_owo.mustache b/species/blobfox/variants/boop_owo.mustache
index dd4f9dc..153c9c3 100644
--- a/species/blobfox/variants/boop_owo.mustache
+++ b/species/blobfox/variants/boop_owo.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base-owo}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes-owo}}
-        {{>nose-owo}}
-        {{>mouth-w}}
-        {{>hand-boop}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hand-boop}}
 {{>footer}}
diff --git a/species/blobfox/variants/evil.mustache b/species/blobfox/variants/evil.mustache
index ff79cfd..be8b98b 100644
--- a/species/blobfox/variants/evil.mustache
+++ b/species/blobfox/variants/evil.mustache
@@ -1,11 +1,7 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes-evil}}
-        {{>nose-evil}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
 {{>footer}}
diff --git a/species/blobfox/variants/happy.mustache b/species/blobfox/variants/happy.mustache
index aab0a7e..be8b98b 100644
--- a/species/blobfox/variants/happy.mustache
+++ b/species/blobfox/variants/happy.mustache
@@ -1,11 +1,7 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes-snug}}
-        {{>nose-snug}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
 {{>footer}}
diff --git a/species/blobfox/variants/owo.mustache b/species/blobfox/variants/owo.mustache
index fbd065e..be8b98b 100644
--- a/species/blobfox/variants/owo.mustache
+++ b/species/blobfox/variants/owo.mustache
@@ -1,11 +1,7 @@
 {{>header}}
-    <g id="body">
-        {{>base-owo}}
-        {{>extra-base}}
-    </g>
-    <g id="features">
-        {{>eyes-owo}}
-        {{>nose-owo}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
 {{>footer}}
diff --git a/species/blobfox/variants/reach.mustache b/species/blobfox/variants/reach.mustache
index 49f35b6..4665694 100644
--- a/species/blobfox/variants/reach.mustache
+++ b/species/blobfox/variants/reach.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>hands-reach}}
-        {{>extra-reach}}
-    </g>
-    <g id="features">
-        {{>eyes}}
-        {{>nose}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hands}}
 {{>footer}}
diff --git a/species/blobfox/variants/reach_aww.mustache b/species/blobfox/variants/reach_aww.mustache
index a3ac5bf..4665694 100644
--- a/species/blobfox/variants/reach_aww.mustache
+++ b/species/blobfox/variants/reach_aww.mustache
@@ -1,12 +1,9 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>hands-reach}}
-        {{>extra-reach}}
-    </g>
-    <g id="features">
-        {{>eyes-aww}}
-        {{>nose-aww}}
-        {{>mouth-w}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hands}}
 {{>footer}}
diff --git a/species/blobfox/variants/reach_owo.mustache b/species/blobfox/variants/reach_owo.mustache
new file mode 100644
index 0000000..4665694
--- /dev/null
+++ b/species/blobfox/variants/reach_owo.mustache
@@ -0,0 +1,9 @@
+{{>header}}
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>hands}}
+{{>footer}}
diff --git a/species/blobfox/variants/snug.mustache b/species/blobfox/variants/snug.mustache
index fbc0e33..b6d9c9e 100644
--- a/species/blobfox/variants/snug.mustache
+++ b/species/blobfox/variants/snug.mustache
@@ -1,11 +1,6 @@
 {{>header}}
-    <g id="body">
-        {{>base-snug}}
-        {{>tail-snug}}
-        {{>extra-snug}}
-    </g>
-    <g id="features">
-        {{>eyes-snug}}
-        {{>nose-snug}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
 {{>footer}}
diff --git a/species/blobfox/variants/snug_aww.mustache b/species/blobfox/variants/snug_aww.mustache
index d487a64..b6d9c9e 100644
--- a/species/blobfox/variants/snug_aww.mustache
+++ b/species/blobfox/variants/snug_aww.mustache
@@ -1,11 +1,6 @@
 {{>header}}
-    <g id="body">
-        {{>base-snug}}
-        {{>tail-snug}}
-        {{>extra-snug}}
-    </g>
-    <g id="features">
-        {{>eyes-aww}}
-        {{>nose-aww}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
 {{>footer}}
diff --git a/species/blobfox/variants/snug_boop_owo.mustache b/species/blobfox/variants/snug_boop_owo.mustache
index 5331527..7b06cd4 100644
--- a/species/blobfox/variants/snug_boop_owo.mustache
+++ b/species/blobfox/variants/snug_boop_owo.mustache
@@ -1,12 +1,8 @@
 {{>header}}
-    <g id="body">
-        {{>base-snug}}
-        {{>tail-snug}}
-        {{>extra-snug}}
-    </g>
-    <g id="features">
-        {{>eyes-owo}}
-        {{>nose-owo}}
-        {{>hand-boop}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+
+    {{>hand-boop}}
 {{>footer}}
diff --git a/species/blobfox/variants/snug_owo.mustache b/species/blobfox/variants/snug_owo.mustache
index ab30748..b6d9c9e 100644
--- a/species/blobfox/variants/snug_owo.mustache
+++ b/species/blobfox/variants/snug_owo.mustache
@@ -1,11 +1,6 @@
 {{>header}}
-    <g id="body">
-        {{>base-snug}}
-        {{>tail-snug}}
-        {{>extra-snug}}
-    </g>
-    <g id="features">
-        {{>eyes-owo}}
-        {{>nose-owo}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
 {{>footer}}
diff --git a/species/blobfox/variants/stabby.mustache b/species/blobfox/variants/stabby.mustache
index 86ac1e8..699f4ec 100644
--- a/species/blobfox/variants/stabby.mustache
+++ b/species/blobfox/variants/stabby.mustache
@@ -1,12 +1,10 @@
 {{>header}}
-    <g id="body">
-        {{>base}}
-        {{>extra-3c}}
-    </g>
-    <g id="features">
-        {{>eyes-evil}}
-        {{>nose-evil}}
-        {{>mouth-w}}
-        {{>hand-knife}}
-    </g>
+    {{>body}}
+
+    {{>eyes}}
+    {{>nose}}
+    {{>mouth}}
+
+    {{>knife}}
+    {{>hands}}
 {{>footer}}