diff --git a/game/characters/genie/outfits/robes_beard.webp b/game/characters/genie/outfits/robes_beard.webp
deleted file mode 100644
index f32a1c67..00000000
--- a/game/characters/genie/outfits/robes_beard.webp
+++ /dev/null
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:a53dffc1c42a1fe081df634cbcdcd0991979dcade9f3d992fefba90ad0ee3057
-size 6166
diff --git a/game/characters/genie/base.webp b/game/images/characters/genie/genie_bbase.webp
similarity index 100%
rename from game/characters/genie/base.webp
rename to game/images/characters/genie/genie_bbase.webp
diff --git a/game/characters/genie/angry.webp b/game/images/characters/genie/genie_face_angry.webp
similarity index 100%
rename from game/characters/genie/angry.webp
rename to game/images/characters/genie/genie_face_angry.webp
diff --git a/game/characters/genie/grin.webp b/game/images/characters/genie/genie_face_grin.webp
similarity index 100%
rename from game/characters/genie/grin.webp
rename to game/images/characters/genie/genie_face_grin.webp
diff --git a/game/characters/genie/open.webp b/game/images/characters/genie/genie_face_open.webp
similarity index 100%
rename from game/characters/genie/open.webp
rename to game/images/characters/genie/genie_face_open.webp
diff --git a/game/characters/genie/smile.webp b/game/images/characters/genie/genie_face_smile.webp
similarity index 100%
rename from game/characters/genie/smile.webp
rename to game/images/characters/genie/genie_face_smile.webp
diff --git a/game/characters/genie/beard.webp b/game/images/characters/genie/genie_goatee.webp
similarity index 100%
rename from game/characters/genie/beard.webp
rename to game/images/characters/genie/genie_goatee.webp
diff --git a/game/characters/genie/hair.webp b/game/images/characters/genie/genie_outfit_nude.webp
similarity index 100%
rename from game/characters/genie/hair.webp
rename to game/images/characters/genie/genie_outfit_nude.webp
diff --git a/game/characters/genie/outfits/robes.webp b/game/images/characters/genie/genie_outfit_robes.webp
similarity index 100%
rename from game/characters/genie/outfits/robes.webp
rename to game/images/characters/genie/genie_outfit_robes.webp
diff --git a/game/characters/genie/outfits/santa.webp b/game/images/characters/genie/genie_outfit_santa.webp
similarity index 100%
rename from game/characters/genie/outfits/santa.webp
rename to game/images/characters/genie/genie_outfit_santa.webp
diff --git a/game/characters/genie/outfits/santa_beard_angry.webp b/game/images/characters/genie/genie_santa_beard_angry.webp
similarity index 100%
rename from game/characters/genie/outfits/santa_beard_angry.webp
rename to game/images/characters/genie/genie_santa_beard_angry.webp
diff --git a/game/characters/genie/outfits/santa_beard_base.webp b/game/images/characters/genie/genie_santa_beard_base.webp
similarity index 100%
rename from game/characters/genie/outfits/santa_beard_base.webp
rename to game/images/characters/genie/genie_santa_beard_base.webp
diff --git a/game/characters/genie/outfits/santa_beard_grin.webp b/game/images/characters/genie/genie_santa_beard_grin.webp
similarity index 100%
rename from game/characters/genie/outfits/santa_beard_grin.webp
rename to game/images/characters/genie/genie_santa_beard_grin.webp
diff --git a/game/characters/genie/outfits/santa_beard_open.webp b/game/images/characters/genie/genie_santa_beard_open.webp
similarity index 100%
rename from game/characters/genie/outfits/santa_beard_open.webp
rename to game/images/characters/genie/genie_santa_beard_open.webp
diff --git a/game/characters/genie/outfits/santa_beard_smile.webp b/game/images/characters/genie/genie_santa_beard_smile.webp
similarity index 100%
rename from game/characters/genie/outfits/santa_beard_smile.webp
rename to game/images/characters/genie/genie_santa_beard_smile.webp
diff --git a/game/scripts/characters/genie/wardrobe.rpy b/game/scripts/characters/genie/wardrobe.rpy
index 2dcf7d69..c756b743 100644
--- a/game/scripts/characters/genie/wardrobe.rpy
+++ b/game/scripts/characters/genie/wardrobe.rpy
@@ -10,9 +10,9 @@ init python:
 layeredimage genie_stats:
     anchor (0.0, 1.0)
 
-    always "characters/genie/base.webp"
-    always "characters/genie/outfits/robes.webp"
-    always "characters/genie/outfits/robes_beard.webp"
+    always "genie_bbase"
+    always "genie_outfit_robes"
+    always "genie_robes"
 
     # TODO: Add outfit support; Low priority
 
@@ -20,31 +20,28 @@ layeredimage genie:
     anchor (0.0, 1.0)
 
     group outfit:
-        attribute robes default null
-        attribute nude "characters/genie/hair.webp"
+        attribute nude
 
-    always "characters/genie/base.webp"
+    attribute bbase default
 
     group face:
         attribute base default null
-        attribute grin "characters/genie/grin.webp"
-        attribute angry "characters/genie/angry.webp"
-        attribute smile "characters/genie/smile.webp"
-        attribute open "characters/genie/open.webp"
+        attribute grin
+        attribute angry
+        attribute smile
+        attribute open
 
     group outfit:
-        attribute robes default "characters/genie/outfits/robes.webp"
-        attribute nude null
-        attribute santa "characters/genie/outfits/santa.webp"
+        attribute robes default
+        attribute santa
 
-    group face multiple:
-        attribute robes default "characters/genie/outfits/robes_beard.webp" if_all ["robes"]
-        attribute nude "characters/genie/beard.webp" if_all ["nude"]
-        attribute base "characters/genie/outfits/santa_beard_base.webp" if_all ["santa", "base"]
-        attribute grin "characters/genie/outfits/santa_beard_grin.webp" if_all ["santa", "grin"]
-        attribute angry "characters/genie/outfits/santa_beard_angry.webp" if_all ["santa", "angry"]
-        attribute smile "characters/genie/outfits/santa_beard_smile.webp" if_all ["santa", "smile"]
-        attribute open "characters/genie/outfits/santa_beard_open.webp" if_all ["santa", "open"]
+    attribute goatee default if_any ("robes", "nude")
+    group _ multiple variant "santa_beard" if_any "santa":
+        attribute base
+        attribute grin
+        attribute angry
+        attribute smile
+        attribute open
 
     at Transform(function=genie_transform)