diff --git a/game/base-system/images.twee b/game/base-system/images.twee
index e0e4c51166fb2b7131f2a73087a9e06900e2276c..4374bc612dbfbc06f01f392e28efdd8f8922488b 100644
--- a/game/base-system/images.twee
+++ b/game/base-system/images.twee
@@ -313,101 +313,109 @@
 <</widget>>
 
 <<widget "img_tf_bird_doggy_idle">>
-	<<if !_disabled.includes($transformationParts.bird.tail)>>
+	<<set $_bird to $transformationParts.bird>>
+	<<if !_disabled.includes($_bird.tail)>>
 		<img class="layer-sexwings colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/tail/'+$transformationParts.bird.tail+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.eyes)>>
+	<<if !_disabled.includes($_bird.eyes)>>
 		<img class="layer-sexlashes anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/eyes/'+$transformationParts.bird.eyes+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.malar)>>
+	<<if !_disabled.includes($_bird.malar)>>
 		<img class="layer-sexlashes colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/malar/'+$transformationParts.bird.malar+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.plumage)>>
+	<<if !_disabled.includes($_bird.plumage)>>
 		<img class="layer-sexlashes colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/plumage/'+$transformationParts.bird.plumage+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.wings)>>
-		<<if isPartEnabled(_modeloptions.demon_wing_type) && isPartEnabled(_modeloptions.bird_wings_type)>>
+	<<if !_disabled.includes($_bird.wings)>>
+		<<set $_demon to $transformationParts.demon>>
+		<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
 			<img class="layer-sexaboveclothes colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/wings/default-demon.png'">
 		<<else>>
 			<img class="layer-sexaboveclothes colour-hair anim-idle-2f" @src="'img/sex/doggy/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
 		<</if>>
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.pubes)>>
+	<<if !_disabled.includes($_bird.pubes)>>
 		<img class="layer-doggyhirsute colour-hair" anim-idle-2f @src="'img/sex/doggy/active/transformations/bird/pubes/'+$transformationParts.bird.pubes+'.png'">
 	<</if>>
 <</widget>>
 
 <<widget "img_tf_bird_doggy_active">>
-	<<if !_disabled.includes($transformationParts.bird.tail)>>
+	<<set $_bird to $transformationParts.bird>>
+	<<if !_disabled.includes($_bird.tail)>>
 		<img @class="'layer-sexwings colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/tail/'+$transformationParts.bird.tail+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.eyes)>>
+	<<if !_disabled.includes($_bird.eyes)>>
 		<img @class="'layer-sexlashes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/eyes/'+$transformationParts.bird.eyes+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.malar)>>
+	<<if !_disabled.includes($_bird.malar)>>
 		<img @class="'layer-sexlashes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/malar/'+$transformationParts.bird.malar+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.plumage)>>
+	<<if !_disabled.includes($_bird.plumage)>>
 		<img @class="'layer-sexlashes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/plumage/'+$transformationParts.bird.plumage+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.wings)>>
-		<<if isPartEnabled(_modeloptions.demon_wing_type) && isPartEnabled(_modeloptions.bird_wings_type)>>
+	<<if !_disabled.includes($_bird.wings)>>
+		<<set $_demon to $transformationParts.demon>>
+		<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
 			<img @class="'layer-sexaboveclothes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/wings/default-demon.png'">
 		<<else>>
 			<img @class="'layer-sexaboveclothes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
 		<</if>>
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.pubes)>>
+	<<if !_disabled.includes($_bird.pubes)>>
 		<img @class="'layer-doggyhirsute colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/doggy/active/transformations/bird/pubes/'+$transformationParts.bird.pubes+'.png'">
 	<</if>>
 <</widget>>
 
 <<widget "img_tf_bird_miss_idle">>
-	<<if !_disabled.includes($transformationParts.bird.tail)>>
+	<<set $_bird to $transformationParts.bird>>
+	<<if !_disabled.includes($_bird.tail)>>
 		<img class="layer-sexwings colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/tail/'+$transformationParts.bird.tail+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.eyes)>>
+	<<if !_disabled.includes($_bird.eyes)>>
 		<img class="layer-sexlashes colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/eyes/'+$transformationParts.bird.eyes+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.malar)>>
+	<<if !_disabled.includes($_bird.malar)>>
 		<img class="layer-sexlashes colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/malar/'+$transformationParts.bird.malar+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.plumage)>>
+	<<if !_disabled.includes($_bird.plumage)>>
 		<img class="layer-sexlashes colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/plumage/'+$transformationParts.bird.plumage+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.wings)>>
-		<<if isPartEnabled(_modeloptions.demon_wing_type) && isPartEnabled(_modeloptions.bird_wings_type)>>
+	<<if !_disabled.includes($_bird.wings)>>
+		<<set $_demon to $transformationParts.demon>>
+		<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
 			<img class="layer-sexwings colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/wings/default-demon.png'">
 		<<else>>
 			<img class="layer-sexwings colour-hair anim-idle-2f" @src="'img/sex/missionary/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
 		<</if>>
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.pubes)>>
+	<<if !_disabled.includes($_bird.pubes)>>
 		<img class="layer-doggyhirsute colour-hair" @src="'img/sex/missionary/active/transformations/bird/pubes/'+$transformationParts.bird.pubes+'.png'">
 	<</if>>
 <</widget>>
 
 <<widget "img_tf_bird_miss_active">>
-	<<if !_disabled.includes($transformationParts.bird.tail)>>
+	<<set $_bird to $transformationParts.bird>>
+	<<if !_disabled.includes($_bird.tail)>>
 		<img @class="'layer-sexwings colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/tail/'+$transformationParts.bird.tail+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.eyes)>>
+	<<if !_disabled.includes($_bird.eyes)>>
 		<img @class="'layer-sexlashes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/eyes/'+$transformationParts.bird.eyes+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.malar)>>
+	<<if !_disabled.includes($_bird.malar)>>
 		<img @class="'layer-sexlashes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/malar/'+$transformationParts.bird.malar+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.plumage)>>
+	<<if !_disabled.includes($_bird.plumage)>>
 		<img @class="'layer-sexlashes colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/plumage/'+$transformationParts.bird.plumage+'.png'">
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.wings)>>
-		<<if isPartEnabled(_modeloptions.demon_wing_type) && isPartEnabled(_modeloptions.bird_wings_type)>>
+	<<if !_disabled.includes($_bird.wings)>>
+		<<set $_demon to $transformationParts.demon>>
+		<<if isPartEnabled($_demon.wings) && isPartEnabled($_bird.wings)>>
 			<img @class="'layer-sexwings colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/wings/default-demon.png'">
 		<<else>>
 			<img @class="'layer-sexwings colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/wings/'+$transformationParts.bird.wings+'.png'">
 		<</if>>
 	<</if>>
-	<<if !_disabled.includes($transformationParts.bird.pubes)>>
+	<<if !_disabled.includes($_bird.pubes)>>
 		<img @class="'layer-doggyhirsute colour-hair anim-doggy-4f-'+_animspeed" @src="'img/sex/missionary/active/transformations/bird/pubes/'+$transformationParts.bird.pubes+'.png'">
 	<</if>>
 <</widget>>