diff --git a/Modifications/XenobladeX_GPL_Challenge/rules.txt b/Modifications/XenobladeX_GPL_Challenge/rules.txt
deleted file mode 100644
index 55d93d7e..00000000
--- a/Modifications/XenobladeX_GPL_Challenge/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Button Challenges disabled"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_CollectiblesRange/rules.txt b/Modifications/XenobladeX_GPL_CollectiblesRange/rules.txt
deleted file mode 100644
index 346e7a65..00000000
--- a/Modifications/XenobladeX_GPL_CollectiblesRange/rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Collectibles: increase range"
-version=2	
-	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_CustomDropRatio/rules.txt b/Modifications/XenobladeX_GPL_CustomDropRatio/rules.txt
deleted file mode 100644
index d46816fa..00000000
--- a/Modifications/XenobladeX_GPL_CustomDropRatio/rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Materials Drop Ratio" 
-version=2	
-	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_DLCQuests/rules.txt b/Modifications/XenobladeX_GPL_DLCQuests/rules.txt
deleted file mode 100644
index 9c55caaa..00000000
--- a/Modifications/XenobladeX_GPL_DLCQuests/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - DLC Quests unlocked"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_Damages/rules.txt b/Modifications/XenobladeX_GPL_Damages/rules.txt
deleted file mode 100644
index 08e67e0e..00000000
--- a/Modifications/XenobladeX_GPL_Damages/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Damage multiplicator (ground)"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_DropOnlyEquipment/rules.txt b/Modifications/XenobladeX_GPL_DropOnlyEquipment/rules.txt
deleted file mode 100644
index d06d3355..00000000
--- a/Modifications/XenobladeX_GPL_DropOnlyEquipment/rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Drop only Equipment" 
-version=2	
-	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_DropOnlyMaterials/rules.txt b/Modifications/XenobladeX_GPL_DropOnlyMaterials/rules.txt
deleted file mode 100644
index 9665735f..00000000
--- a/Modifications/XenobladeX_GPL_DropOnlyMaterials/rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Drop only Materials" 
-version=2	
-	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_EquipmentUpgradeUnlimited/rules.txt b/Modifications/XenobladeX_GPL_EquipmentUpgradeUnlimited/rules.txt
deleted file mode 100644
index ecb6deeb..00000000
--- a/Modifications/XenobladeX_GPL_EquipmentUpgradeUnlimited/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Augments Upgrade unlimited"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_MaxSlots/rules.txt b/Modifications/XenobladeX_GPL_MaxSlots/rules.txt
deleted file mode 100644
index dce3c832..00000000
--- a/Modifications/XenobladeX_GPL_MaxSlots/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Equipments have 3 Slots"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_MoreProbeIncome/rules.txt b/Modifications/XenobladeX_GPL_MoreProbeIncome/rules.txt
deleted file mode 100644
index 6be9469a..00000000
--- a/Modifications/XenobladeX_GPL_MoreProbeIncome/rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Probe Income Frequency"
-version=2	
-	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_NoItemSell/rules.txt b/Modifications/XenobladeX_GPL_NoItemSell/rules.txt
deleted file mode 100644
index a39293bf..00000000
--- a/Modifications/XenobladeX_GPL_NoItemSell/rules.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Collectibles: ignore 100th"
-version=2	
-	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_OfflineSquadQuests/rules.txt b/Modifications/XenobladeX_GPL_OfflineSquadQuests/rules.txt
deleted file mode 100644
index 1bc0b679..00000000
--- a/Modifications/XenobladeX_GPL_OfflineSquadQuests/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Offline Squad Quests"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_Overdrive/rules.txt b/Modifications/XenobladeX_GPL_Overdrive/rules.txt
deleted file mode 100644
index 0576e8b0..00000000
--- a/Modifications/XenobladeX_GPL_Overdrive/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Overdrive unlocked"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_PostGameSkellsUnlock/rules.txt b/Modifications/XenobladeX_GPL_PostGameSkellsUnlock/rules.txt
deleted file mode 100644
index d6cecd58..00000000
--- a/Modifications/XenobladeX_GPL_PostGameSkellsUnlock/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Post-game skells unlocked"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_HUD_EManual/rules.txt b/Modifications/XenobladeX_HUD_EManual/rules.txt
deleted file mode 100644
index 30f79ebe..00000000
--- a/Modifications/XenobladeX_HUD_EManual/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - HUD - eManual menu changes time"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_PHY_MoveSpeed/rules.txt b/Modifications/XenobladeX_PHY_MoveSpeed/rules.txt
deleted file mode 100644
index 240b7c99..00000000
--- a/Modifications/XenobladeX_PHY_MoveSpeed/rules.txt
+++ /dev/null
@@ -1,4 +0,0 @@
-[Definition]
-titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - PHY - Run Forrest, run!"
-version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_Damages/patches.txt b/Modifications/XenobladeX_mod_BattleDamageModGround/patches.txt
similarity index 92%
rename from Modifications/XenobladeX_GPL_Damages/patches.txt
rename to Modifications/XenobladeX_mod_BattleDamageModGround/patches.txt
index 78acf708..e07f332e 100644
--- a/Modifications/XenobladeX_GPL_Damages/patches.txt
+++ b/Modifications/XenobladeX_mod_BattleDamageModGround/patches.txt
@@ -3,6 +3,6 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 
 ; ----------------------------------------------------------------------------
 ; WHO  : cfs::CfCompoPropertyEnemy::addDamage((int))
-; WHAT : Multiply the ground damage (skells not included) given to enemy (default by 100)
+; WHAT : Multiply the ground damage (skells not included) given to enemy
 
 0x025D896C = mulli r4, r31, 10
diff --git a/Modifications/XenobladeX_mod_BattleDamageModGround/rules.txt b/Modifications/XenobladeX_mod_BattleDamageModGround/rules.txt
new file mode 100644
index 00000000..714c5246
--- /dev/null
+++ b/Modifications/XenobladeX_mod_BattleDamageModGround/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Battle - Damage mod (ground)"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_EnemieStats/patches.txt b/Modifications/XenobladeX_mod_BattleEnemyStats/patches.txt
similarity index 94%
rename from Modifications/XenobladeX_GPL_EnemieStats/patches.txt
rename to Modifications/XenobladeX_mod_BattleEnemyStats/patches.txt
index 02999304..f3f302fc 100644
--- a/Modifications/XenobladeX_GPL_EnemieStats/patches.txt
+++ b/Modifications/XenobladeX_mod_BattleEnemyStats/patches.txt
@@ -10,4 +10,4 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 ;  50% = 0.0005
 ;   1% = 0.00001 ; GAME CRASH (enemis are too weak)
 
-0x1003206C = .float 0.0070
+0x1003206C = .float 0.00075
diff --git a/Modifications/XenobladeX_mod_BattleEnemyStats/rules.txt b/Modifications/XenobladeX_mod_BattleEnemyStats/rules.txt
new file mode 100644
index 00000000..7cb6cc2c
--- /dev/null
+++ b/Modifications/XenobladeX_mod_BattleEnemyStats/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Battle - Enemy stats mod"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_ReleaseDistanceReduced/patches.txt b/Modifications/XenobladeX_mod_BattleEscapeDistance/patches.txt
similarity index 67%
rename from Modifications/XenobladeX_GPL_ReleaseDistanceReduced/patches.txt
rename to Modifications/XenobladeX_mod_BattleEscapeDistance/patches.txt
index 0670b02f..78326d7e 100644
--- a/Modifications/XenobladeX_GPL_ReleaseDistanceReduced/patches.txt
+++ b/Modifications/XenobladeX_mod_BattleEscapeDistance/patches.txt
@@ -5,7 +5,7 @@ codeCaveSize = 0x20
 
 ; ----------------------------------------------------------------------------
 ; WHO  : cfs::CfCompoPropertyEnemy::getReleasePcDistanceXZ
-; WHAT : Reduce release distance
+; WHAT : Reduce (by default /2) escape distance from enemies (to lose aggro)
 
 0x00000000 = .float 2.0 ; default is 1.0
 _distanceConst = 0x00000000
@@ -18,6 +18,3 @@ _getRelease = 0x00000004
 0x00000014 = blr
 
 0x025D8B2C = b _getRelease ; cfs::CfCompoPropertyEnemy::getReleasePcDistanceXZ
-;0x025D8B34 = b _getRelease ; cfs::CfCompoPropertyEnemy::getReleasePcDistanceY
-;0x025D8B08 = b _getRelease ; cfs::CfCompoPropertyEnemy::getReleaseDistanceXZ
-;0x025D8B14 = b _getRelease ; cfs::CfCompoPropertyEnemy::getReleaseDistanceY
diff --git a/Modifications/XenobladeX_mod_BattleEscapeDistance/rules.txt b/Modifications/XenobladeX_mod_BattleEscapeDistance/rules.txt
new file mode 100644
index 00000000..50045af1
--- /dev/null
+++ b/Modifications/XenobladeX_mod_BattleEscapeDistance/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Battle - Escape distance mod"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_Challenge/patches.txt b/Modifications/XenobladeX_mod_BattleNoQTE/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_Challenge/patches.txt
rename to Modifications/XenobladeX_mod_BattleNoQTE/patches.txt
diff --git a/Modifications/XenobladeX_GPL_EnemieStats/rules.txt b/Modifications/XenobladeX_mod_BattleNoQTE/rules.txt
similarity index 55%
rename from Modifications/XenobladeX_GPL_EnemieStats/rules.txt
rename to Modifications/XenobladeX_mod_BattleNoQTE/rules.txt
index fe722393..3ea4296d 100644
--- a/Modifications/XenobladeX_GPL_EnemieStats/rules.txt
+++ b/Modifications/XenobladeX_mod_BattleNoQTE/rules.txt
@@ -1,4 +1,4 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Enemy Stats"
+name = "Xenoblade Chronicles X - Battle - No QTE"
 version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_Overdrive/patches.txt b/Modifications/XenobladeX_mod_BattleOverdriveUnlocked/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_Overdrive/patches.txt
rename to Modifications/XenobladeX_mod_BattleOverdriveUnlocked/patches.txt
diff --git a/Modifications/XenobladeX_mod_BattleOverdriveUnlocked/rules.txt b/Modifications/XenobladeX_mod_BattleOverdriveUnlocked/rules.txt
new file mode 100644
index 00000000..e5993d15
--- /dev/null
+++ b/Modifications/XenobladeX_mod_BattleOverdriveUnlocked/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Battle - Overdrive unlocked"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_CollectiblesRange/patches.txt b/Modifications/XenobladeX_mod_CollectiblesCatchRange/patches.txt
similarity index 99%
rename from Modifications/XenobladeX_GPL_CollectiblesRange/patches.txt
rename to Modifications/XenobladeX_mod_CollectiblesCatchRange/patches.txt
index 4d791fec..ca57f6f1 100644
--- a/Modifications/XenobladeX_GPL_CollectiblesRange/patches.txt
+++ b/Modifications/XenobladeX_mod_CollectiblesCatchRange/patches.txt
@@ -63,4 +63,3 @@ _itemHeightFlight = 0x00000050
 0x02389C74 = bla _itemHeightDoll
 0x02389CEC = bla _itemRangeFlight
 0x02389D30 = bla _itemHeightFlight
-
diff --git a/Modifications/XenobladeX_mod_CollectiblesCatchRange/rules.txt b/Modifications/XenobladeX_mod_CollectiblesCatchRange/rules.txt
new file mode 100644
index 00000000..fa22ec17
--- /dev/null
+++ b/Modifications/XenobladeX_mod_CollectiblesCatchRange/rules.txt
@@ -0,0 +1,5 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Collectibles - Catch range mod"
+version=2	
+	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_NoItemSell/patches.txt b/Modifications/XenobladeX_mod_CollectiblesIgnore100th/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_NoItemSell/patches.txt
rename to Modifications/XenobladeX_mod_CollectiblesIgnore100th/patches.txt
diff --git a/Modifications/XenobladeX_BGM_NoFlight/rules.txt b/Modifications/XenobladeX_mod_CollectiblesIgnore100th/rules.txt
similarity index 57%
rename from Modifications/XenobladeX_BGM_NoFlight/rules.txt
rename to Modifications/XenobladeX_mod_CollectiblesIgnore100th/rules.txt
index 2c772618..c2ed7f0f 100644
--- a/Modifications/XenobladeX_BGM_NoFlight/rules.txt
+++ b/Modifications/XenobladeX_mod_CollectiblesIgnore100th/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - BGM - No Skell Flight Music"
+name = "Xenoblade Chronicles X - Collectibles - Ignore 100th"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_DLCQuests/patches.txt b/Modifications/XenobladeX_mod_EndGameContentDLCQuestsUnlocked/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_DLCQuests/patches.txt
rename to Modifications/XenobladeX_mod_EndGameContentDLCQuestsUnlocked/patches.txt
diff --git a/Modifications/XenobladeX_mod_EndGameContentDLCQuestsUnlocked/rules.txt b/Modifications/XenobladeX_mod_EndGameContentDLCQuestsUnlocked/rules.txt
new file mode 100644
index 00000000..b2b9d6cb
--- /dev/null
+++ b/Modifications/XenobladeX_mod_EndGameContentDLCQuestsUnlocked/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - End Game Content - DLC Quests unlocked"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_PostGameSkellsUnlock/patches.txt b/Modifications/XenobladeX_mod_EndGameContentLv60SkellsUnlocked/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_PostGameSkellsUnlock/patches.txt
rename to Modifications/XenobladeX_mod_EndGameContentLv60SkellsUnlocked/patches.txt
diff --git a/Modifications/XenobladeX_mod_EndGameContentLv60SkellsUnlocked/rules.txt b/Modifications/XenobladeX_mod_EndGameContentLv60SkellsUnlocked/rules.txt
new file mode 100644
index 00000000..c6117a55
--- /dev/null
+++ b/Modifications/XenobladeX_mod_EndGameContentLv60SkellsUnlocked/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - End Game Content - Lv60 Skells unlocked"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_MaxSlots/patches.txt b/Modifications/XenobladeX_mod_EquipmentArmorsCanHave3AugmentSlots/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_MaxSlots/patches.txt
rename to Modifications/XenobladeX_mod_EquipmentArmorsCanHave3AugmentSlots/patches.txt
diff --git a/Modifications/XenobladeX_mod_EquipmentArmorsCanHave3AugmentSlots/rules.txt b/Modifications/XenobladeX_mod_EquipmentArmorsCanHave3AugmentSlots/rules.txt
new file mode 100644
index 00000000..40710a1c
--- /dev/null
+++ b/Modifications/XenobladeX_mod_EquipmentArmorsCanHave3AugmentSlots/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Equipment - Armors can have 3 augment slots"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_EquipmentUpgradeUnlimited/patches.txt b/Modifications/XenobladeX_mod_EquipmentUnlimitedAugmentUpgrades/patches.txt
similarity index 65%
rename from Modifications/XenobladeX_GPL_EquipmentUpgradeUnlimited/patches.txt
rename to Modifications/XenobladeX_mod_EquipmentUnlimitedAugmentUpgrades/patches.txt
index 7aaba153..dea8fd33 100644
--- a/Modifications/XenobladeX_GPL_EquipmentUpgradeUnlimited/patches.txt
+++ b/Modifications/XenobladeX_mod_EquipmentUnlimitedAugmentUpgrades/patches.txt
@@ -5,18 +5,19 @@ moduleMatches = 0xF882D5CF ; 1.0.1E
 ; WHO  : menu::MenuArmsCompanyAffixStrengthen::CheckAffixStrengthen
 ; WHAT : Unlimited upgrades (affix selection menu)
 
-0x02A72134 = li r10, 99 ; No upgrades remaining (getAffixTotalReinforced) (4)
+0x02A72134 = li r10, 99 ; Ignore upgrades counter
+;0x02A723B4 = li r3, 0 ; [CHEAT] Ignore materials requirements
 
 ; ----------------------------------------------------------------------------
 ; WHO  : menu::MenuArmsCompanyAffixSelectItem::CheckAffixStrengthen
 ; WHAT : Unlimited upgrades (equipment selection menu)
 
-0x02A6DCA8 = li r3, 0 ; No upgrades remaining (3)
+0x02A6DCA8 = li r3, 0 ; Ignore upgrades counter
+;0x02A6DFFC = li r3, 0 ; [CHEAT] Ignore materials requirements
 
 ;#####################################################################################
 [XCX_UPGRADENOLIMIT_US]
 moduleMatches = 0x30B6E091 ; 1.0.2U
 
-0x02A72124 = li r10, 99 ; No upgrades remaining (getAffixTotalReinforced) (4)
-
-0x02A6DC98 = li r3, 0 ; No upgrades remaining (3)
+0x02A72124 = li r10, 99 ; Ignore upgrades counter
+0x02A6DC98 = li r3, 0 ; Ignore upgrades counter
diff --git a/Modifications/XenobladeX_mod_EquipmentUnlimitedAugmentUpgrades/rules.txt b/Modifications/XenobladeX_mod_EquipmentUnlimitedAugmentUpgrades/rules.txt
new file mode 100644
index 00000000..a979cc09
--- /dev/null
+++ b/Modifications/XenobladeX_mod_EquipmentUnlimitedAugmentUpgrades/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Equipment - Unlimited augment upgrades"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_BattlePointsX/patches.txt b/Modifications/XenobladeX_mod_ExpBattlePointsX/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_BattlePointsX/patches.txt
rename to Modifications/XenobladeX_mod_ExpBattlePointsX/patches.txt
diff --git a/Modifications/XenobladeX_GPL_BattlePointsX/rules.txt b/Modifications/XenobladeX_mod_ExpBattlePointsX/rules.txt
similarity index 60%
rename from Modifications/XenobladeX_GPL_BattlePointsX/rules.txt
rename to Modifications/XenobladeX_mod_ExpBattlePointsX/rules.txt
index 8800da53..000785ee 100644
--- a/Modifications/XenobladeX_GPL_BattlePointsX/rules.txt
+++ b/Modifications/XenobladeX_mod_ExpBattlePointsX/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Battle Points X"
+name = "Xenoblade Chronicles X - Exp - Battle Points X"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_BladePointsX/patches.txt b/Modifications/XenobladeX_mod_ExpBladePointsX/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_BladePointsX/patches.txt
rename to Modifications/XenobladeX_mod_ExpBladePointsX/patches.txt
diff --git a/Modifications/XenobladeX_GPL_BladePointsX/rules.txt b/Modifications/XenobladeX_mod_ExpBladePointsX/rules.txt
similarity index 60%
rename from Modifications/XenobladeX_GPL_BladePointsX/rules.txt
rename to Modifications/XenobladeX_mod_ExpBladePointsX/rules.txt
index c6cb37f0..c2ea7914 100644
--- a/Modifications/XenobladeX_GPL_BladePointsX/rules.txt
+++ b/Modifications/XenobladeX_mod_ExpBladePointsX/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Blade Points X"
+name = "Xenoblade Chronicles X - Exp - Blade Points X"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_ClassExpPointsX/patches.txt b/Modifications/XenobladeX_mod_ExpClassExpPointsX/patches.txt
similarity index 76%
rename from Modifications/XenobladeX_GPL_ClassExpPointsX/patches.txt
rename to Modifications/XenobladeX_mod_ExpClassExpPointsX/patches.txt
index d3262388..1307c397 100644
--- a/Modifications/XenobladeX_GPL_ClassExpPointsX/patches.txt
+++ b/Modifications/XenobladeX_mod_ExpClassExpPointsX/patches.txt
@@ -3,7 +3,7 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 
 ; ----------------------------------------------------------------------------
 ; WHO  : addClassExpChara__Q2_6Battle14CBattleManagerFUiT1
-; WHAT : Multiply the class experience given during combat (default by 100)
+; WHAT : Multiply the class experience given during combat
 
 0x020C4A28 = mulli r31, r3, 2
 
diff --git a/Modifications/XenobladeX_GPL_ClassExpPointsX/rules.txt b/Modifications/XenobladeX_mod_ExpClassExpPointsX/rules.txt
similarity index 58%
rename from Modifications/XenobladeX_GPL_ClassExpPointsX/rules.txt
rename to Modifications/XenobladeX_mod_ExpClassExpPointsX/rules.txt
index 5239c241..6ee06b3c 100644
--- a/Modifications/XenobladeX_GPL_ClassExpPointsX/rules.txt
+++ b/Modifications/XenobladeX_mod_ExpClassExpPointsX/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Class Exp Points X"
+name = "Xenoblade Chronicles X - Exp - Class Exp Points X"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_FriendPointsX/patches.txt b/Modifications/XenobladeX_mod_ExpFriendsPointsX/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_FriendPointsX/patches.txt
rename to Modifications/XenobladeX_mod_ExpFriendsPointsX/patches.txt
diff --git a/Modifications/XenobladeX_GPL_FriendPointsX/rules.txt b/Modifications/XenobladeX_mod_ExpFriendsPointsX/rules.txt
similarity index 59%
rename from Modifications/XenobladeX_GPL_FriendPointsX/rules.txt
rename to Modifications/XenobladeX_mod_ExpFriendsPointsX/rules.txt
index 6cc402ba..97be4488 100644
--- a/Modifications/XenobladeX_GPL_FriendPointsX/rules.txt
+++ b/Modifications/XenobladeX_mod_ExpFriendsPointsX/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Friend Points X"
+name = "Xenoblade Chronicles X - Exp - Friends Points X"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_InnerExpPointsX/patches.txt b/Modifications/XenobladeX_mod_ExpInnerExpPointsX/patches.txt
similarity index 90%
rename from Modifications/XenobladeX_GPL_InnerExpPointsX/patches.txt
rename to Modifications/XenobladeX_mod_ExpInnerExpPointsX/patches.txt
index 94734e7a..e02293aa 100644
--- a/Modifications/XenobladeX_GPL_InnerExpPointsX/patches.txt
+++ b/Modifications/XenobladeX_mod_ExpInnerExpPointsX/patches.txt
@@ -5,6 +5,6 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 ; WHO  : cfs::CfCompoCtrlEnemy::execRequestCommon
 ; WHAT : Multiply the experience points given in battles
 
-0x025624E4 = divi r30, r3, 2 ; mulli or divi
+0x025624E4 = mulli r30, r3, 2 ; mulli or divi
 ;0x020C1BC0 = nop; always +3000xp (+9999px) from battle (addInnerExpChara__Q2_6Battle14CBattleManagerFUiN21)
 ;0x022953A4 = li r4, 0x270F ; always +9999xp from exploration (addInnerExp__Q2_3cfs10CfTBoxUtilSFUi)
diff --git a/Modifications/XenobladeX_BGM_NoOverdrive/rules.txt b/Modifications/XenobladeX_mod_ExpInnerExpPointsX/rules.txt
similarity index 58%
rename from Modifications/XenobladeX_BGM_NoOverdrive/rules.txt
rename to Modifications/XenobladeX_mod_ExpInnerExpPointsX/rules.txt
index c9cf987b..f6f2019d 100644
--- a/Modifications/XenobladeX_BGM_NoOverdrive/rules.txt
+++ b/Modifications/XenobladeX_mod_ExpInnerExpPointsX/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - BGM - No Overdrive Music"
+name = "Xenoblade Chronicles X - Exp - Inner Exp Points X"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_MoreProbeIncome/patches.txt b/Modifications/XenobladeX_mod_FrontierNavProbeIncomeFrequency/patches.txt
similarity index 96%
rename from Modifications/XenobladeX_GPL_MoreProbeIncome/patches.txt
rename to Modifications/XenobladeX_mod_FrontierNavProbeIncomeFrequency/patches.txt
index f65a558a..48f38c8b 100644
--- a/Modifications/XenobladeX_GPL_MoreProbeIncome/patches.txt
+++ b/Modifications/XenobladeX_mod_FrontierNavProbeIncomeFrequency/patches.txt
@@ -24,7 +24,6 @@ _miranium = 0x00000000
 ; WHY  : Affect the quantity of the NavFrontier income for the Miranium
 
 0x027D5278 = mulli	r4, r31, 100
-;0x027D1034 = mulli	r3, r31, 100 ; ignore limit
 
 ; ----------------------------------------------------------------------------
 ; WHAT : changeTime__Q2_4fnet9CFnetTaskFUiT1
diff --git a/Modifications/XenobladeX_DSP_DistMobInfo/rules.txt b/Modifications/XenobladeX_mod_FrontierNavProbeIncomeFrequency/rules.txt
similarity index 53%
rename from Modifications/XenobladeX_DSP_DistMobInfo/rules.txt
rename to Modifications/XenobladeX_mod_FrontierNavProbeIncomeFrequency/rules.txt
index f05b9677..f5b7ca9c 100644
--- a/Modifications/XenobladeX_DSP_DistMobInfo/rules.txt
+++ b/Modifications/XenobladeX_mod_FrontierNavProbeIncomeFrequency/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - DSP - NPC bubbles distance increased"
+name = "Xenoblade Chronicles X - FrontierNav - Probe income frequency mod"
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_DSP_Camera/patches.txt b/Modifications/XenobladeX_mod_GraphicsCameraDistanceAndFov/patches.txt
similarity index 88%
rename from Modifications/XenobladeX_DSP_Camera/patches.txt
rename to Modifications/XenobladeX_mod_GraphicsCameraDistanceAndFov/patches.txt
index aae952a4..076510b5 100644
--- a/Modifications/XenobladeX_DSP_Camera/patches.txt
+++ b/Modifications/XenobladeX_mod_GraphicsCameraDistanceAndFov/patches.txt
@@ -6,7 +6,7 @@ codeCaveSize = 0x8
 0x00000000 = .float 5.0 ; zoom (default is 0.0)
 _zoom = 0x00000000
 
-0x00000004 = .float 60.0 ; fov (default is 40.0)
+0x00000004 = .float 50.0 ; fov (default is 40.0)
 _fov = 0x00000004
 
 # CamData::CCamDataManager::getParamsZoomDefault((CamData::eTargetTypes, unsigned char))
diff --git a/Modifications/XenobladeX_PHY_MoonJump/rules.txt b/Modifications/XenobladeX_mod_GraphicsCameraDistanceAndFov/rules.txt
similarity index 52%
rename from Modifications/XenobladeX_PHY_MoonJump/rules.txt
rename to Modifications/XenobladeX_mod_GraphicsCameraDistanceAndFov/rules.txt
index 76568aa7..a12a8584 100644
--- a/Modifications/XenobladeX_PHY_MoonJump/rules.txt
+++ b/Modifications/XenobladeX_mod_GraphicsCameraDistanceAndFov/rules.txt
@@ -1,4 +1,4 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - PHY - Jump to the Moon!"
+name = "Xenoblade Chronicles X - Graphics - Camera mod"
 version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_DSP_DistMobInfo/patches.txt b/Modifications/XenobladeX_mod_GraphicsNpcInfoBubblesDistance/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_DSP_DistMobInfo/patches.txt
rename to Modifications/XenobladeX_mod_GraphicsNpcInfoBubblesDistance/patches.txt
diff --git a/Modifications/XenobladeX_mod_GraphicsNpcInfoBubblesDistance/rules.txt b/Modifications/XenobladeX_mod_GraphicsNpcInfoBubblesDistance/rules.txt
new file mode 100644
index 00000000..fdc59bf1
--- /dev/null
+++ b/Modifications/XenobladeX_mod_GraphicsNpcInfoBubblesDistance/rules.txt
@@ -0,0 +1,5 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Graphics - NPC info bubbles distance mod"
+version=2	
+	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_HUD_EManual/patches.txt b/Modifications/XenobladeX_mod_HudChangeTimeFromEmanual/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_HUD_EManual/patches.txt
rename to Modifications/XenobladeX_mod_HudChangeTimeFromEmanual/patches.txt
diff --git a/Modifications/XenobladeX_GPL_ReleaseDistanceReduced/rules.txt b/Modifications/XenobladeX_mod_HudChangeTimeFromEmanual/rules.txt
similarity index 51%
rename from Modifications/XenobladeX_GPL_ReleaseDistanceReduced/rules.txt
rename to Modifications/XenobladeX_mod_HudChangeTimeFromEmanual/rules.txt
index 762aca74..221c393c 100644
--- a/Modifications/XenobladeX_GPL_ReleaseDistanceReduced/rules.txt
+++ b/Modifications/XenobladeX_mod_HudChangeTimeFromEmanual/rules.txt
@@ -1,4 +1,4 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Release Distance Reduced"
+name = "Xenoblade Chronicles X - HUD - Change time from eManual"
 version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_CustomDropRatio/patches.txt b/Modifications/XenobladeX_mod_LootMaterialsChance/patches.txt
similarity index 67%
rename from Modifications/XenobladeX_GPL_CustomDropRatio/patches.txt
rename to Modifications/XenobladeX_mod_LootMaterialsChance/patches.txt
index 3ed8f9d5..0725673c 100644
--- a/Modifications/XenobladeX_GPL_CustomDropRatio/patches.txt
+++ b/Modifications/XenobladeX_mod_LootMaterialsChance/patches.txt
@@ -34,30 +34,3 @@ _minDropRate = 0x00000000
 0x021AF5DC = bla _minDropRate ; modify drop ratio for gold chests
 0x021AF5F8 = bla _minDropRate ; modify drop ratio for silver chests
 0x021AF614 = bla _minDropRate ; modify drop ratio for bronze chests
-
-; ----------------------------------------------------------------------------
-; WHO  : ItemDrop::CItemDropManager::calcItemNum((uchar))
-; WHAT : 100 % chances of looting 3 equipments
-;0x021AB238 = li r11, 100 ; DRP_ItemNumTable - Lot_3
-
-; ----------------------------------------------------------------------------
-; WHO  : ItemDrop::CItemDropManager::calcAfxSltNum((unsigned short))
-; WHAT : Control of the loot quality
-
-0x021AB380 = li r28, 100
-0x021AB394 = li r29, 100
-0x021AB3AC = li r30, 100
-
-; ----------------------------------------------------------------------------
-; WHO  : __CPR129__calcItem__Q2_8ItemDrop16CItemDropManagerFRQ3_J13JJ22J9SDropInfoUcRCQ3_J13JJ22J11SCreateInfo
-; WHAT : Remove broken equipment
-
-;0x021AEBE0 = li r3, 0 ; Nothing is broken
-
-
-; Always best equipment (xx60) ? TO BE CONFIRMED
-0x021AD710 = nop ; ground weapons ?
-0x021ADA6C = nop ; ground armors
-0x021ADDE8 = nop ; skell weapons
-0x021AE164 = nop ; skell armors
-
diff --git a/Modifications/XenobladeX_mod_LootMaterialsChance/rules.txt b/Modifications/XenobladeX_mod_LootMaterialsChance/rules.txt
new file mode 100644
index 00000000..0e626783
--- /dev/null
+++ b/Modifications/XenobladeX_mod_LootMaterialsChance/rules.txt
@@ -0,0 +1,5 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Loot - Materials chance mod" 
+version=2	
+	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_DropOnlyEquipment/patches.txt b/Modifications/XenobladeX_mod_LootOnlyEquipment/patches.txt
similarity index 92%
rename from Modifications/XenobladeX_GPL_DropOnlyEquipment/patches.txt
rename to Modifications/XenobladeX_mod_LootOnlyEquipment/patches.txt
index e7294f5d..b004d53f 100644
--- a/Modifications/XenobladeX_GPL_DropOnlyEquipment/patches.txt
+++ b/Modifications/XenobladeX_mod_LootOnlyEquipment/patches.txt
@@ -42,8 +42,9 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 0x021ADDE8 = nop ; skell weapons
 0x021AE164 = nop ; skell armors
 
+; ----------------------------------------------------------------------------
 ; WHO  : ItemDrop::CItemDropManager::calcAfxSltNum((unsigned short))
-; WHAT : Control of the loot quality
+; WHAT : Control of the loot quality (always orange/yellow)
 
 0x021AB380 = li r28, 100
 0x021AB394 = li r29, 100
diff --git a/Modifications/XenobladeX_GPL_InnerExpPointsX/rules.txt b/Modifications/XenobladeX_mod_LootOnlyEquipment/rules.txt
similarity index 59%
rename from Modifications/XenobladeX_GPL_InnerExpPointsX/rules.txt
rename to Modifications/XenobladeX_mod_LootOnlyEquipment/rules.txt
index ad54e607..23d55b75 100644
--- a/Modifications/XenobladeX_GPL_InnerExpPointsX/rules.txt
+++ b/Modifications/XenobladeX_mod_LootOnlyEquipment/rules.txt
@@ -1,5 +1,5 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - GPL - Exp Points X"
+name = "Xenoblade Chronicles X - Loot - Only equipment" 
 version=2	
 	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_DropOnlyMaterials/patches.txt b/Modifications/XenobladeX_mod_LootOnlyMaterials/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_GPL_DropOnlyMaterials/patches.txt
rename to Modifications/XenobladeX_mod_LootOnlyMaterials/patches.txt
diff --git a/Modifications/XenobladeX_mod_LootOnlyMaterials/rules.txt b/Modifications/XenobladeX_mod_LootOnlyMaterials/rules.txt
new file mode 100644
index 00000000..a5846948
--- /dev/null
+++ b/Modifications/XenobladeX_mod_LootOnlyMaterials/rules.txt
@@ -0,0 +1,5 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Loot - Only materials" 
+version=2	
+	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_BGM_NoOverdrive/patches.txt b/Modifications/XenobladeX_mod_MusicOverdriveDisabled/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_BGM_NoOverdrive/patches.txt
rename to Modifications/XenobladeX_mod_MusicOverdriveDisabled/patches.txt
diff --git a/Modifications/XenobladeX_mod_MusicOverdriveDisabled/rules.txt b/Modifications/XenobladeX_mod_MusicOverdriveDisabled/rules.txt
new file mode 100644
index 00000000..2ab51706
--- /dev/null
+++ b/Modifications/XenobladeX_mod_MusicOverdriveDisabled/rules.txt
@@ -0,0 +1,5 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Music - Overdrive disabled"
+version=2	
+	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_BGM_NoFlight/patches.txt b/Modifications/XenobladeX_mod_MusicSkellFlightDisabled/patches.txt
similarity index 100%
rename from Modifications/XenobladeX_BGM_NoFlight/patches.txt
rename to Modifications/XenobladeX_mod_MusicSkellFlightDisabled/patches.txt
diff --git a/Modifications/XenobladeX_mod_MusicSkellFlightDisabled/rules.txt b/Modifications/XenobladeX_mod_MusicSkellFlightDisabled/rules.txt
new file mode 100644
index 00000000..cbff0c64
--- /dev/null
+++ b/Modifications/XenobladeX_mod_MusicSkellFlightDisabled/rules.txt
@@ -0,0 +1,5 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Music - Skell Flight disabled"
+version=2	
+	
\ No newline at end of file
diff --git a/Modifications/XenobladeX_PHY_MoonJump/patches.txt b/Modifications/XenobladeX_mod_PhysicsJumpToTheMoon!/patches.txt
similarity index 79%
rename from Modifications/XenobladeX_PHY_MoonJump/patches.txt
rename to Modifications/XenobladeX_mod_PhysicsJumpToTheMoon!/patches.txt
index 56d51a15..2f003b27 100644
--- a/Modifications/XenobladeX_PHY_MoonJump/patches.txt
+++ b/Modifications/XenobladeX_mod_PhysicsJumpToTheMoon!/patches.txt
@@ -3,8 +3,8 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 
 codeCaveSize = 0x28
 
-0x00000020 = .float 1.05 ; vertical velocity (default is 1.00)
-0x00000024 = .float 2.0 ; horizontal velocity (default is 1.00)
+0x00000020 = .float 1.05 ; vertical velocity (default is 1.00, speedrun is 1.05)
+0x00000024 = .float 2.0 ; horizontal velocity (default is 1.00, speedrun is 2.0)
 
 _velocity = 0x00000020
 _hvelocity = 0x00000024
diff --git a/Modifications/XenobladeX_mod_PhysicsJumpToTheMoon!/rules.txt b/Modifications/XenobladeX_mod_PhysicsJumpToTheMoon!/rules.txt
new file mode 100644
index 00000000..edc68ff0
--- /dev/null
+++ b/Modifications/XenobladeX_mod_PhysicsJumpToTheMoon!/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Physics - Jump to the Moon!"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_PHY_MoveSpeed/patches.txt b/Modifications/XenobladeX_mod_PhysicsRunForrestRun!/patches.txt
similarity index 74%
rename from Modifications/XenobladeX_PHY_MoveSpeed/patches.txt
rename to Modifications/XenobladeX_mod_PhysicsRunForrestRun!/patches.txt
index 4ea9a715..0b700147 100644
--- a/Modifications/XenobladeX_PHY_MoveSpeed/patches.txt
+++ b/Modifications/XenobladeX_mod_PhysicsRunForrestRun!/patches.txt
@@ -3,7 +3,7 @@ moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
 
 codeCaveSize = 0x18
 
-0x00000014 = .float 0.7 ; dash speed (smallest means fastest, default is ?)
+0x00000014 = .float 0.7 ; dash speed (smallest means fastest, default is 1.0)
 _speed = 0x00000014
 
 _setSpeed = 0x00000000
@@ -12,6 +12,3 @@ _setSpeed = 0x00000000
 0x00000008 = fdivs     f1, f1, f13
 0x0000000C = lwz       r3, 0(r31)
 0x00000010 = blr
-
-# chr::CInnerLabelState::applyFieldMoveWeight((float))
-0x02643330 = bla _setSpeed ; SetVariableFloat(0xBD,float)
diff --git a/Modifications/XenobladeX_DSP_Camera/rules.txt b/Modifications/XenobladeX_mod_PhysicsRunForrestRun!/rules.txt
similarity index 51%
rename from Modifications/XenobladeX_DSP_Camera/rules.txt
rename to Modifications/XenobladeX_mod_PhysicsRunForrestRun!/rules.txt
index 2bcdaca4..ae0131bb 100644
--- a/Modifications/XenobladeX_DSP_Camera/rules.txt
+++ b/Modifications/XenobladeX_mod_PhysicsRunForrestRun!/rules.txt
@@ -1,4 +1,4 @@
 [Definition]
 titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
-name = "Xenoblade Chronicles X - DSP - Camera customization"
+name = "Xenoblade Chronicles X - Physics - Run Forrest, run!
 version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_mod_SquadGainTicketsFromDlcMissions/patches.txt b/Modifications/XenobladeX_mod_SquadGainTicketsFromDlcMissions/patches.txt
new file mode 100644
index 00000000..4a999b76
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadGainTicketsFromDlcMissions/patches.txt
@@ -0,0 +1,72 @@
+[XCX_TICKETS_DLC_EU]
+moduleMatches = 0xF882D5CF ; 1.0.1E
+
+codeCaveSize = 0x50
+
+; ----------------------------------------------------------------------------
+; WHO  : menu::MenuMultiQuestInfoWindow::displayInfo((menu::MenuObject *,bool))
+;        menu::MenuMultiQuestResult::setup((void))
+;        addReward__Q2_3cfs11CfSquadUtilSFUiT1
+; WHAT : Override the Tickets rewarded for a DLC mission.
+;        By default, the number of tickets is the money divided by 100.
+
+_shareAddr = 0x1039C180
+
+_ticketsDispBefore = 0x00000000
+0x00000000 = lhz       r26, 0x8C(r1)
+0x00000004 = lwz       r7, 0x47C(r30)
+0x00000008 = lwz       r4, 8(r7)
+0x0000000C = cmpwi     r4, 5 ; QuestType == 2 (TA), QuestType == 5 (DLC)
+0x00000010 = bne       .+0xC
+0x00000014 = li        r4, 10
+0x00000018 = divw      r26, r22, r4 ; r23 = exp, r22 = money
+0x0000001C = lis       r24, _shareAddr@ha
+0x00000020 = stw       r26, _shareAddr@l(r24) ; lwz       r26, _shareAddr@l(r24);
+0x00000024 = blr
+
+_ticketsDispAfter = 0x00000030
+0x00000030 = lis       r5, _shareAddr@ha
+0x00000034 = lwz       r5, _shareAddr@l(r5)
+0x00000038 = blr
+
+_ticketsValue = 0x00000040
+0x00000040 = lis       r27, _shareAddr@ha
+0x00000044 = lwz       r27, _shareAddr@l(r27)
+0x00000048 = blr
+
+0x02B94718 = bla _ticketsDispBefore
+0x02B9FE2C = bla _ticketsDispAfter
+0x023CC654 = bla _ticketsValue
+
+[XCX_TICKETS_DLC_US] ############################################################################################
+moduleMatches = 0x30B6E091 ; 1.0.2U
+
+codeCaveSize = 0x50
+
+_shareAddr = 0x1039C180
+
+_ticketsDispBefore = 0x00000000
+0x00000000 = lhz       r26, 0x8C(r1)
+0x00000004 = lwz       r7, 0x47C(r30)
+0x00000008 = lwz       r4, 8(r7)
+0x0000000C = cmpwi     r4, 5
+0x00000010 = bne       .+0xC
+0x00000014 = li        r4, 100
+0x00000018 = divw      r26, r22, r4
+0x0000001C = lis       r24, _shareAddr@ha
+0x00000020 = stw       r26, _shareAddr@l(r24)
+0x00000024 = blr
+
+_ticketsDispAfter = 0x00000030
+0x00000030 = lis       r5, _shareAddr@ha
+0x00000034 = lwz       r5, _shareAddr@l(r5)
+0x00000038 = blr
+
+_ticketsValue = 0x00000040
+0x00000040 = lis       r27, _shareAddr@ha
+0x00000044 = lwz       r27, _shareAddr@l(r27)
+0x00000048 = blr
+
+0x02B94708 = bla _ticketsDispBefore
+0x02B9FE1C = bla _ticketsDispAfter
+0x023CC654 = bla _ticketsValue
diff --git a/Modifications/XenobladeX_mod_SquadGainTicketsFromDlcMissions/rules.txt b/Modifications/XenobladeX_mod_SquadGainTicketsFromDlcMissions/rules.txt
new file mode 100644
index 00000000..98de7f01
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadGainTicketsFromDlcMissions/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Squad - Gain tickets from DLC missions"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_mod_SquadGainTicketsFromTaMissions/patches.txt b/Modifications/XenobladeX_mod_SquadGainTicketsFromTaMissions/patches.txt
new file mode 100644
index 00000000..5407f363
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadGainTicketsFromTaMissions/patches.txt
@@ -0,0 +1,72 @@
+[XCX_TICKETS_TA_EU]
+moduleMatches = 0xF882D5CF ; 1.0.1E
+
+codeCaveSize = 0x50
+
+; ----------------------------------------------------------------------------
+; WHO  : menu::MenuMultiQuestInfoWindow::displayInfo((menu::MenuObject *,bool))
+;        menu::MenuMultiQuestResult::setup((void))
+;        addReward__Q2_3cfs11CfSquadUtilSFUiT1
+; WHAT : Override the Tickets rewarded for a Time Attack mission.
+;        By default, the number of tickets is the experience divided by 10.
+
+_shareAddr = 0x1039C180
+
+_ticketsDispBefore = 0x00000000
+0x00000000 = lhz       r26, 0x8C(r1)
+0x00000004 = lwz       r7, 0x47C(r30)
+0x00000008 = lwz       r4, 8(r7)
+0x0000000C = cmpwi     r4, 2 ; QuestType == 2 (TA), QuestType == 5 (DLC)
+0x00000010 = bne       .+0xC
+0x00000014 = li        r4, 2
+0x00000018 = mullw     r26, r23, r4 ; r23 = exp, r22 = money
+0x0000001C = lis       r24, _shareAddr@ha
+0x00000020 = stw       r26, _shareAddr@l(r24);stw       r26, _shareAddr@l(r24) ; lwz       r26, _shareAddr@l(r24);
+0x00000024 = blr
+
+_ticketsDispAfter = 0x00000030
+0x00000030 = lis       r5, _shareAddr@ha
+0x00000034 = lwz       r5, _shareAddr@l(r5)
+0x00000038 = blr
+
+_ticketsValue = 0x00000040
+0x00000040 = lis       r27, _shareAddr@ha
+0x00000044 = lwz       r27, _shareAddr@l(r27)
+0x00000048 = blr
+
+0x02B94718 = bla _ticketsDispBefore
+0x02B9FE2C = bla _ticketsDispAfter
+0x023CC654 = bla _ticketsValue
+
+[XCX_TICKETS_TA_US] ############################################################################################
+moduleMatches = 0x30B6E091 ; 1.0.2U
+
+codeCaveSize = 0x50
+
+_shareAddr = 0x1039C180
+
+_ticketsDispBefore = 0x00000000
+0x00000000 = lhz       r26, 0x8C(r1)
+0x00000004 = lwz       r7, 0x47C(r30)
+0x00000008 = lwz       r4, 8(r7)
+0x0000000C = cmpwi     r4, 2
+0x00000010 = bne       .+0xC
+0x00000014 = li        r4, 10
+0x00000018 = divw      r26, r23, r4
+0x0000001C = lis       r24, _shareAddr@ha
+0x00000020 = stw       r26, _shareAddr@l(r24)
+0x00000024 = blr
+
+_ticketsDispAfter = 0x00000030
+0x00000030 = lis       r5, _shareAddr@ha
+0x00000034 = lwz       r5, _shareAddr@l(r5)
+0x00000038 = blr
+
+_ticketsValue = 0x00000040
+0x00000040 = lis       r27, _shareAddr@ha
+0x00000044 = lwz       r27, _shareAddr@l(r27)
+0x00000048 = blr
+
+0x02B94708 = bla _ticketsDispBefore
+0x02B9FE1C = bla _ticketsDispAfter
+0x023CC654 = bla _ticketsValue
diff --git a/Modifications/XenobladeX_mod_SquadGainTicketsFromTaMissions/rules.txt b/Modifications/XenobladeX_mod_SquadGainTicketsFromTaMissions/rules.txt
new file mode 100644
index 00000000..6d3a697e
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadGainTicketsFromTaMissions/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Squad - Gain tickets from TA missions"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_mod_SquadGlobalNemesisMissionsOffline/patches.txt b/Modifications/XenobladeX_mod_SquadGlobalNemesisMissionsOffline/patches.txt
new file mode 100644
index 00000000..53a4a983
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadGlobalNemesisMissionsOffline/patches.txt
@@ -0,0 +1,55 @@
+[XCX_OFFLINEWE]
+moduleMatches = 0xF882D5CF, 0x30B6E091 ; 1.0.1E, 1.0.2U
+
+codeCaveSize = 0x10
+
+; ----------------------------------------------------------------------------
+; WHAT : cfs::CfSocialManager::isNeedRefreshSquadQuest(const(void))
+; WHY  : Disable the online check
+
+0x022C8CC8 = li r3, 0
+
+; ----------------------------------------------------------------------------
+; WHAT : collectQuestInfoTA__Q2_3cfs15CfSocialManagerFRQ2_2ml45resvector__tm__28_PQ2_3cfs17CfSocialQuestInfo
+; WHY  : Override the requirements for displaying the Global Nemesis missions
+
+_keepQuestType = 0x00000000
+0x00000000 = mr r25, r31
+0x00000004 = cmpwi r31, 4
+0x00000008 = blr
+
+# collectQuestInfoTA__Q2_3cfs15CfSocialManagerFRQ2_2ml45resvector__tm__28_PQ2_3cfs17CfSocialQuestInfo - CONTRE LA MONTRE
+0x022C5F5C = bla _keepQuestType
+_22C6128 = 0x022C6128
+0x022C5F60 = bgt _22C6128
+
+0x023BF578 = li r3, 10 # cfs::CfSquadQuestObject::getWorldEnemyLP(const(void))
+0x023B9630 = li r3, 10 # getEnemyLP__Q2_3cfs11CfSquadUtilSFUi
+
+[XCX_OFFLINEWE_EU] ############################################################################################
+moduleMatches = 0xF882D5CF ; 1.0.1E
+
+codeCaveSize = 0x40
+
+# menu::MenuMultiQuestOrder::move((void))
+; skip BLADE medals requirement
+0x02B9B0B0 = li r3, 1 ; Disable call to menu::MenuMultiQuestOrder::canOrderWorldEnemy
+
+# menu::CTerminalMenu_PieceExchange::offline((void))
+_single = 0x00000000
+0x00000000 = li r3, 0
+0x00000004 = blr
+0x02AC613C = b _single ; menu::CBladeHomuMenu::single((void))
+
+[XCX_OFFLINEWE_US] ############################################################################################
+moduleMatches = 0x30B6E091 ; 1.0.2U
+
+codeCaveSize = 0x10
+
+0x02B9B0A0 = li r3, 1 # Disable call to menu::MenuMultiQuestOrder::canOrderWorldEnemy
+
+_single = 0x00000000
+0x00000000 = li r3, 0
+0x00000004 = blr
+
+0x02AC612C = b _single
diff --git a/Modifications/XenobladeX_mod_SquadGlobalNemesisMissionsOffline/rules.txt b/Modifications/XenobladeX_mod_SquadGlobalNemesisMissionsOffline/rules.txt
new file mode 100644
index 00000000..49bd36ba
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadGlobalNemesisMissionsOffline/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Squad - Global Nemesis missions offline"
+version=2
\ No newline at end of file
diff --git a/Modifications/XenobladeX_GPL_OfflineSquadQuests/patches.txt b/Modifications/XenobladeX_mod_SquadTasksAndMissionsOffline/patches.txt
similarity index 71%
rename from Modifications/XenobladeX_GPL_OfflineSquadQuests/patches.txt
rename to Modifications/XenobladeX_mod_SquadTasksAndMissionsOffline/patches.txt
index d5c52108..11881aa3 100644
--- a/Modifications/XenobladeX_GPL_OfflineSquadQuests/patches.txt
+++ b/Modifications/XenobladeX_mod_SquadTasksAndMissionsOffline/patches.txt
@@ -6,31 +6,39 @@ codeCaveSize = 0x20
 _getLocalTimeSec = 0x02892000
 
 # cfs::CfSocialManager::update((float))
-0x022879D0 = nop
+0x022879D0 = nop ; (network test?) allow call to cfs::CfSocialQuestManager::update((void))
 
 # cfs::CfSocialQuestManager::update((void))
+_loopUpdate9 = 0x023AC194
+_loopUpdate8 = 0x023AC060
+_loopUpdate7 = 0x023ABFAC
+_loopUpdate6 = 0x023ABF80
+_loopUpdate5 = 0x023ABF28
+_loopUpdate4 = 0x023ABF0C
+_loopUpdate3 = 0x023ABD90
+_loopUpdate2 = 0x023ABC88
+_loopUpdate1 = 0x023ABBF4
+_loopUpdate0 = 0x023AB86C
+
 0x023AB884 = nop ; 0x6B8(r12) == 0
 0x023AB8B4 = nop ; isHost
 0x023ABA68 = li r5, 60 ; force 0x24 - UNLOCK
 0x023ABC10 = nop ; isHost
+0x023A0484 = nop ; isHost
 0x023ABC94 = nop ; getServerTimeSecRegion - UNLOCK
 0x023ABCAC = nop ; compare with 0x28 - UNLOCK
 0x023ABCB8 = nop ; compare with 0x2C - UNLOCK
 _gotoJoin = 0x023ABD00 - UNLOCK
 0x023ABCBC = b _gotoJoin - UNLOCK
 
-
-# cfs::CfSocialQuestManager::setupQuest
-0x023A0484 = nop ; isHost
-
 ##################### BLADE Home Terminal (for Squad Quest Selection)
 
 # cfs::CfSocialManager::refreshOrderQuestInfo (called when select an entry in the BLADE menu)
-0x022C805C = nop
-0x022C8060 = nop
+0x022C805C = nop ; test réseau : lwz       r10, 0x1B0(r30) --> rlwinm.   r9, r10, 0,30,30
+0x022C8060 = nop ; test réseau
 
 # collectQuestInfoSQ__Q2_3cfs15CfSocialManagerFRQ2_2ml45resvector__tm__28_PQ2_3cfs17CfSocialQuestInfo
-0x022C58BC = nop
+0x022C58BC = nop ; rlwinm.   r10, r11, 0,29,29
 
 #################### Change Squad Mission using main menu
 
@@ -58,6 +66,34 @@ _gotoNext = 0x023ABE54
 ;0x022CAC5C = nop ; no limit
 ;0x022CA874 = mulli r28, r4, 10 ; tickets multiplier
 
+######################## Nemesis
+
+# collectQuestInfoWE__Q2_3cfs15CfSocialManagerFRQ2_2ml45resvector__tm__28_PQ2_3cfs17CfSocialQuestInfo
+0x022C6284 = li r30, 2
+_loopWE = 0x022C6348
+0x022C634C = b _loopWE
+0x022C62A4 = nop
+0x022C62B0 = nop
+0x022C62BC = nop
+0x022C6304 = nop
+0x022C6314 = nop
+
+# cfs::CfSocialManager::getQuestDetailWE((cfs::CfSocialQuestInfoWE &))
+_loopgetQuestDetailWE = 0x022895B4
+0x022895B8 = beq _loopgetQuestDetailWE
+
+
+# cfs::CfSocialManager::update((float))
+0x02288014 = nop
+
+# cfs::CfSocialManager::onUpdatedWorldEnemy((void))
+_loopUpdateWE = 0x0228705C
+0x02287060 = b _loopUpdateWE
+
+# __CPR86__getWorldEnemyInfo__Q2_2fw15SocialDataStoreCFUiRQ3_2fwJ25J14WorldEnemyInfo
+0x0282B0F0 = nop
+0x0282B0FC = li r0, 1
+
 #####################################################################################################
 [XCX_SQUADMISSIONS_EU]
 moduleMatches = 0xF882D5CF ; 1.0.1E
@@ -104,8 +140,6 @@ moduleMatches = 0x30B6E091 ; 1.0.2U
 
 ##################### BLADE Home Terminal (for Squad Quest Selection)
 
-;menu::CBladeHomuMenu
-;menu:CTerminalMenu
 0x02AC5C00 = li r3, 0 ; menu::CTerminalMenu_SquadQuest::offline
 
 #################### Change Squad Mission using main menu
diff --git a/Modifications/XenobladeX_mod_SquadTasksAndMissionsOffline/rules.txt b/Modifications/XenobladeX_mod_SquadTasksAndMissionsOffline/rules.txt
new file mode 100644
index 00000000..6ba038d6
--- /dev/null
+++ b/Modifications/XenobladeX_mod_SquadTasksAndMissionsOffline/rules.txt
@@ -0,0 +1,4 @@
+[Definition]
+titleIds = 0005000010116100,00050000101C4C00,00050000101C4D00
+name = "Xenoblade Chronicles X - Squad - Tasks and missions offline"
+version=2
\ No newline at end of file