diff --git a/game/scripts/characters/genie/wardrobe.rpy b/game/scripts/characters/genie/wardrobe.rpy
index ebe200e5..b1a9faf8 100644
--- a/game/scripts/characters/genie/wardrobe.rpy
+++ b/game/scripts/characters/genie/wardrobe.rpy
@@ -10,25 +10,11 @@ init python:
 layeredimage genie_stats:
     anchor (0.0, 1.0)
 
-    group hair:
-        attribute nude "characters/genie/hair.webp"
-
-    group fixes:
-        attribute robes "characters/genie/robes_fix.webp"
-
     always "characters/genie/base.webp"
+    always "characters/genie/outfits/robes.webp"
+    always "characters/genie/outfits/robes_beard.webp"
 
-    group face:
-        attribute base 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"
-
-    group outfit:
-
-        attribute nude Null()
-        attribute robes default "characters/genie/robes.webp"
+    # TODO: Add outfit support; Low priority
 
 layeredimage genie:
     anchor (0.0, 1.0)
diff --git a/game/scripts/doll/lipstick.rpy b/game/scripts/doll/lipstick.rpy
index cd7ce07c..f6043684 100644
--- a/game/scripts/doll/lipstick.rpy
+++ b/game/scripts/doll/lipstick.rpy
@@ -6,7 +6,10 @@ init python:
 
         def set_layers(self):
             for x in self.layers_special:
-                self.__dict__[x] =  None
+                if x == "zorder":
+                    self.__dict__["zlayers"] = [f for f in renpy.list_files() if f.startswith(self.imagepath.lstrip("/")) and "zorder" in f]
+                else:
+                    self.__dict__[x] =  None
 
             for x in self.layers_additional:
                 self.__dict__[x] = []
diff --git a/game/scripts/doll/main.rpy b/game/scripts/doll/main.rpy
index 148e8f56..e7d8f680 100644
--- a/game/scripts/doll/main.rpy
+++ b/game/scripts/doll/main.rpy
@@ -88,8 +88,6 @@ init python:
                     if clothing.mask:
                         masks.append((clothing.mask, zorder-1))
 
-            print sprites
-
             sprites.sort(key=itemgetter(1))
             masks.sort(key=itemgetter(1))
 
diff --git a/game/scripts/options.rpy b/game/scripts/options.rpy
index 34581ec1..e66cfee5 100644
--- a/game/scripts/options.rpy
+++ b/game/scripts/options.rpy
@@ -30,7 +30,7 @@ define config.developer = "auto"
 define config.console = True
 
 # Game version and naming
-define config.version = "1.44.3"
+define config.version = "1.44.4"
 define compatible_version = 1.43
 define config.name = "Witch Trainer Silver"