diff --git a/Data/Map151.rxdata b/Data/Map151.rxdata
index 2f5f57b77..bd8071f92 100644
Binary files a/Data/Map151.rxdata and b/Data/Map151.rxdata differ
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb
index 2cc27c3b0..b08c8d102 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesMartAdapter.rb
@@ -40,11 +40,11 @@ class ClothesMartAdapter < OutfitsMartAdapter
     previewWindow.updatePreview()
   end
 
-  def get_dye_color(item)
+  def get_dye_color(item_id)
     return 0 if isShop?
     $Trainer.dyed_clothes= {} if ! $Trainer.dyed_clothes
-    if $Trainer.dyed_clothes.include?(item.id)
-      return $Trainer.dyed_clothes[item.id]
+    if $Trainer.dyed_clothes.include?(item_id)
+      return $Trainer.dyed_clothes[item_id]
     end
     return 0
   end
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
index 81e0ea702..9c3455026 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter.rb
@@ -14,33 +14,56 @@ class ClothesShopPresenter < PokemonMartScreen
   end
 
 
+  def dyeClothes()
+    original_color = $Trainer.clothes_color
+    options = ["Shift up", "Shift down", "Reset", "Confirm", "Never Mind"]
+    previous_input = 0
+    ret = false
+    while (true)
+      choice = pbShowCommands(nil, options, options.length, previous_input,200)
+      previous_input = choice
+      case choice
+      when 0 #NEXT
+        pbSEPlay("GUI storage pick up", 80, 100)
+        shiftClothesColor(10)
+        ret = true
+      when 1 #PREVIOUS
+        pbSEPlay("GUI storage pick up", 80, 100)
+        shiftClothesColor(-10)
+        ret = true
+      when 2 #Reset
+        pbSEPlay("GUI storage pick up", 80, 100)
+        $Trainer.clothes_color = 0
+        ret = false
+      when 3 #Confirm
+        break
+      else
+        $Trainer.clothes_color = original_color
+        ret = false
+        break
+      end
+      @scene.updatePreviewWindow
+    end
+    return ret
+  end
+
 
   # returns if should stay in the menu
   def playerClothesActionsMenu(item)
+    cmd_wear = "Wear"
+    cmd_dye = "Dye Kit"
     options = []
-    options << "Wear"
-    options << "Remove dye" if $Trainer.clothes_color != 0
-    options << "Mark as favorite" if $Trainer.favorite_hat != item.id
-    options << "Unmark as favorite" if $Trainer.favorite_hat == item.id
+    options << cmd_wear
+    options << cmd_dye  if $PokemonBag.pbHasItem?(:CLOTHESDYEKIT)
     options << "Cancel"
     choice = pbMessage("What would you like to do?", options, -1)
 
-    if choice == 0
+    if options[choice] == cmd_wear
       putOnClothes(item)
       $Trainer.clothes_color = @adapter.get_dye_color(item.id)
       return false
-    elsif options[choice] == "Remove dye"
-      if pbConfirm(_INTL("Are you sure you want to remove the dye from the {1}?", item.name))
-        $Trainer.clothes_color = 0
-      end
-    elsif options[choice] == "Mark as favorite"
-      $Trainer.favorite_clothes = item.id
-      pbSEPlay("GUI storage show party panel")
-      pbMessage("The #{item.name} is now your favorite!")
-    elsif options[choice] == "Unmark favorite"
-      $Trainer.favorite_clothes = nil
-      pbSEPlay("GUI storage show party panel")
-      pbMessage("The #{item.name} is no longer marked as your favorite!")
+    elsif options[choice] == cmd_dye
+      dyeClothes()
     end
     return true
   end
diff --git a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
index b3fc6e47a..46bb95c20 100644
--- a/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
+++ b/Data/Scripts/050_Outfits/UI/clothesShop/ClothesShopPresenter_HatsMenu.rb
@@ -42,8 +42,7 @@ class ClothesShopPresenter < PokemonMartScreen
     options << cmd_remove
 
     options << cmd_swap
-    dye_option_available = true#$Trainer.dyed_hats.include?(item.id) && $Trainer.dyed_hats[item.id] != 0
-    options << cmd_dye if dye_option_available
+    options << cmd_dye if $PokemonBag.pbHasItem?(:HATSDYEKIT)
     options << cmd_cancel
   end
 
diff --git a/Data/Scripts/052_AddOns/New Items effects.rb b/Data/Scripts/052_AddOns/New Items effects.rb
index 323b66c0c..48fc6359e 100644
--- a/Data/Scripts/052_AddOns/New Items effects.rb	
+++ b/Data/Scripts/052_AddOns/New Items effects.rb	
@@ -374,7 +374,7 @@ ItemHandlers::UseFromBag.add(:ODDKEYSTONE, proc { |item|
 })
 
 def useFavoriteOutfit()
-  cmd_switch = "Switch to favorite outfit"
+  cmd_switch = isWearingFavoriteOutfit() ? "Take off favorite outfit" : "Switch to favorite outfit"
   cmd_mark_favorite = "Mark current outfit as favorite"
   cmd_cancel = "Cancel"
 
@@ -406,9 +406,9 @@ def switchToFavoriteOutfit()
         $Trainer.last_worn_outfit = getDefaultClothes()
       end
       playOutfitChangeAnimation()
-      putOnClothes($Trainer.last_worn_outfit, true) if $Trainer.favorite_clothes
-      putOnHat($Trainer.last_worn_hat, true,false) if $Trainer.favorite_hat
-      putOnHat($Trainer.last_worn_hat2, true,true) if $Trainer.favorite_hat2
+      putOnClothes($Trainer.last_worn_outfit, true) #if $Trainer.favorite_clothes
+      putOnHat($Trainer.last_worn_hat, true,false) #if $Trainer.favorite_hat
+      putOnHat($Trainer.last_worn_hat2, true,true) #if $Trainer.favorite_hat2
 
     else
       return 0
diff --git a/Data/System.rxdata b/Data/System.rxdata
index f4bbcd8ff..99366496f 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Data/items.dat b/Data/items.dat
index bd6d9218b..4daa4a077 100644
Binary files a/Data/items.dat and b/Data/items.dat differ
diff --git a/Data/messages.dat b/Data/messages.dat
index f02890773..67178c631 100644
Binary files a/Data/messages.dat and b/Data/messages.dat differ
diff --git a/Data/sprites/sprites_rate_limit.log b/Data/sprites/sprites_rate_limit.log
index 789bf3fb3..83eaea0af 100644
--- a/Data/sprites/sprites_rate_limit.log
+++ b/Data/sprites/sprites_rate_limit.log
@@ -1 +1,2 @@
-1741538447
\ No newline at end of file
+1741542225
+1741542225
\ No newline at end of file
diff --git a/Data/sprites/updated_spritesheets_cache b/Data/sprites/updated_spritesheets_cache
index 1c0094b8f..9096e69f6 100644
--- a/Data/sprites/updated_spritesheets_cache
+++ b/Data/sprites/updated_spritesheets_cache
@@ -697,3 +697,15 @@ Graphics/CustomBattlers/spritesheets/spritesheets_custom/24/24.png
 Graphics/CustomBattlers/spritesheets/spritesheets_base/494.png
 Graphics/CustomBattlers/spritesheets/spritesheets_custom/494/494.png
 Graphics/CustomBattlers/spritesheets/spritesheets_custom/225/225.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/270/270.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/271/271.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/61/61.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/338/338.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/244.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/467/467.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/453/453a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/437/437.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/468/468a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/296/296a.png
+Graphics/CustomBattlers/spritesheets/spritesheets_base/418.png
+Graphics/CustomBattlers/spritesheets/spritesheets_custom/418/418.png