diff --git a/Data/Map157.rxdata b/Data/Map157.rxdata
index 1612a740a..b00f4c74e 100644
Binary files a/Data/Map157.rxdata and b/Data/Map157.rxdata differ
diff --git a/Data/Map160.rxdata b/Data/Map160.rxdata
index 8c409af18..a6e39a5c0 100644
Binary files a/Data/Map160.rxdata and b/Data/Map160.rxdata differ
diff --git a/Data/Map295.rxdata b/Data/Map295.rxdata
index 866b50b25..52c92e382 100644
Binary files a/Data/Map295.rxdata and b/Data/Map295.rxdata differ
diff --git a/Data/Map670.rxdata b/Data/Map670.rxdata
index c000e4d7c..5dc5dac22 100644
Binary files a/Data/Map670.rxdata and b/Data/Map670.rxdata differ
diff --git a/Data/Map777.rxdata b/Data/Map777.rxdata
index e9aef590b..b8973f4f9 100644
Binary files a/Data/Map777.rxdata and b/Data/Map777.rxdata differ
diff --git a/Data/Map778.rxdata b/Data/Map778.rxdata
index 13a403c22..11aaced31 100644
Binary files a/Data/Map778.rxdata and b/Data/Map778.rxdata differ
diff --git a/Data/Map783.rxdata b/Data/Map783.rxdata
index a9b82d020..dd03bb64c 100644
Binary files a/Data/Map783.rxdata and b/Data/Map783.rxdata differ
diff --git a/Data/Map784.rxdata b/Data/Map784.rxdata
index f974dca6b..66be28ab9 100644
Binary files a/Data/Map784.rxdata and b/Data/Map784.rxdata differ
diff --git a/Data/MapInfos.rxdata b/Data/MapInfos.rxdata
index 379498abc..a3b66fb71 100644
Binary files a/Data/MapInfos.rxdata and b/Data/MapInfos.rxdata differ
diff --git a/Data/Scripts/001_Settings.rb b/Data/Scripts/001_Settings.rb
index 365ddd14b..4afb3ece7 100644
--- a/Data/Scripts/001_Settings.rb
+++ b/Data/Scripts/001_Settings.rb
@@ -22,6 +22,7 @@ module Settings
   #Infinite fusion settings
   NB_POKEMON = 420
   CUSTOM_BATTLERS_FOLDER = "Graphics/CustomBattlers/"
+  CUSTOM_BATTLERS_FOLDER_INDEXED = "Graphics/CustomBattlers/indexed"
   BATTLERS_FOLDER = "Graphics/Battlers/"
   FRONTSPRITE_POSITION_OFFSET = 20
   FRONTSPRITE_SCALE = 0.6666666
diff --git a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb b/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb
index e28e2a711..12b9b71e9 100644
--- a/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb	
+++ b/Data/Scripts/011_Battle/005_Battle scene/007_Scene_Initialize.rb	
@@ -97,20 +97,20 @@ class PokeBattle_Scene
     when 2 then time = "night"
     end
     # Put everything together into backdrop, bases and message bar filenames
-    backdropFilename = @battle.backdrop
-    baseFilename = @battle.backdrop
-    baseFilename = sprintf("%s_%s",baseFilename,@battle.backdropBase) if @battle.backdropBase
-    messageFilename = @battle.backdrop
+    backdropFilename = @battle.backdrop.downcase
+    baseFilename = @battle.backdrop.downcase
+    baseFilename = sprintf("%s_%s",baseFilename,@battle.backdropBase).downcase if @battle.backdropBase
+    messageFilename = @battle.backdrop.downcase
     if time
-      trialName = sprintf("%s_%s",backdropFilename,time)
+      trialName = sprintf("%s_%s",backdropFilename,time).downcase
       if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_bg"))
         backdropFilename = trialName
       end
-      trialName = sprintf("%s_%s",baseFilename,time)
+      trialName = sprintf("%s_%s",baseFilename,time).downcase
       if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_base0"))
         baseFilename = trialName
       end
-      trialName = sprintf("%s_%s",messageFilename,time)
+      trialName = sprintf("%s_%s",messageFilename,time).downcase
       if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_message"))
         messageFilename = trialName
       end
@@ -119,7 +119,7 @@ class PokeBattle_Scene
        @battle.backdropBase
       baseFilename = @battle.backdropBase
       if time
-        trialName = sprintf("%s_%s",baseFilename,time)
+        trialName = sprintf("%s_%s",baseFilename,time).downcase
         if pbResolveBitmap(sprintf("Graphics/Battlebacks/"+trialName+"_base0"))
           baseFilename = trialName
         end
diff --git a/Data/Scripts/050_AddOns/Autosave.rb b/Data/Scripts/050_AddOns/Autosave.rb
index f2ae511bd..79fd36b00 100644
--- a/Data/Scripts/050_AddOns/Autosave.rb
+++ b/Data/Scripts/050_AddOns/Autosave.rb
@@ -27,6 +27,7 @@ end
 
 
 def Kernel.tryAutosave()
+  return if  !$Trainer.save_slot
   Kernel.Autosave if $game_switches[AUTOSAVE_ENABLED_SWITCH]
 end
 
diff --git a/Data/Scripts/050_AddOns/FusionSprites.rb b/Data/Scripts/050_AddOns/FusionSprites.rb
index 7b9f921d7..e2fcb7f37 100644
--- a/Data/Scripts/050_AddOns/FusionSprites.rb
+++ b/Data/Scripts/050_AddOns/FusionSprites.rb
@@ -176,7 +176,7 @@ module GameData
           filename = sprintf("%s.%s.png", head_id, body_id)
         end
       end
-      customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER + "/" + head_id.to_s + "/" +filename)
+      customPath = pbResolveBitmap(Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + head_id.to_s + "/" +filename)
       species = getSpecies(dex_number)
       use_custom = customPath && !species.always_use_generated
       if use_custom
diff --git a/Data/Scripts/050_AddOns/Gen 2.rb b/Data/Scripts/050_AddOns/Gen 2.rb
index 70a6284a8..834f6b78d 100644
--- a/Data/Scripts/050_AddOns/Gen 2.rb	
+++ b/Data/Scripts/050_AddOns/Gen 2.rb	
@@ -106,7 +106,7 @@ BATTLERSPATH = "Battlers"
 def GetSpritePath(poke1, poke2, isFused)
   #Check if custom exists
   spritename = GetSpriteName(poke1, poke2, isFused)
-  pathCustom = sprintf("Graphics/%s/%s/%s.png", DOSSIERCUSTOMSPRITES,poke2, spritename)
+  pathCustom = sprintf("Graphics/%s/indexed/%s/%s.png", DOSSIERCUSTOMSPRITES,poke2, spritename)
   pathReg = sprintf("Graphics/%s/%s/%s.png", BATTLERSPATH, poke2, spritename)
   path = pbResolveBitmap(pathCustom) && $game_variables[196] == 0 ? pathCustom : pathReg
   return path
@@ -116,7 +116,7 @@ end
 def GetSpritePathForced(poke1, poke2, isFused)
   #Check if custom exists
   spritename = GetSpriteName(poke1, poke2, isFused)
-  pathCustom = sprintf("Graphics/%s/%s.png", DOSSIERCUSTOMSPRITES, spritename)
+  pathCustom = sprintf("Graphics/%s/indexed/%s/%s.png", DOSSIERCUSTOMSPRITES, poke2, spritename)
   pathReg = sprintf("Graphics/%s/%s/%s.png", BATTLERSPATH, poke2, spritename)
   path = pbResolveBitmap(pathCustom) ? pathCustom : pathReg
   return path
diff --git a/Data/Scripts/999_Main/999_Main.rb b/Data/Scripts/999_Main/999_Main.rb
index 8eb3c0ce1..d32eb87b9 100644
--- a/Data/Scripts/999_Main/999_Main.rb
+++ b/Data/Scripts/999_Main/999_Main.rb
@@ -23,22 +23,21 @@ def mainFunction
 end
 
 def sortCustomBattlers()
-  customBattlersFolder = 'Graphics/CustomBattlers'
   echo "Sorting CustomBattlers files..."
-  Dir.foreach(customBattlersFolder) do |filename|
+  Dir.foreach(Settings::CUSTOM_BATTLERS_FOLDER) do |filename|
     next if filename == '.' or filename == '..'
     next if !filename.end_with?(".png")
     headNum = filename.split('.')[0]
-    oldPath = customBattlersFolder + "/" + filename
-    newPath = customBattlersFolder + "/" + headNum.to_s + "/" +filename
-    echo "\n"
-    echo "Sorted " + filename + " into " + newPath
+    oldPath = Settings::CUSTOM_BATTLERS_FOLDER + "/" + filename
+    newPath = Settings::CUSTOM_BATTLERS_FOLDER_INDEXED + "/" + headNum.to_s + "/" +filename
     begin
       File.rename(oldPath, newPath)
+      echo "\nSorted " + filename + " into " + newPath
     rescue
-      echo "Could not sort "+ filename
+      echo "\nCould not sort "+ filename
     end
   end
+  echo "\nFinished sorting"
 end
 
 
diff --git a/Data/System.rxdata b/Data/System.rxdata
index 03c476fab..6a72f0216 100644
Binary files a/Data/System.rxdata and b/Data/System.rxdata differ
diff --git a/Graphics/Battlebacks/unused_message.png b/Graphics/Battlebacks/unused_message.png
new file mode 100644
index 000000000..46a01fd43
Binary files /dev/null and b/Graphics/Battlebacks/unused_message.png differ