diff --git a/Classic/prefs/evo_mapRotation.cs b/Classic/prefs/evo_mapRotation.cs
index c934d1c..40ec29f 100644
--- a/Classic/prefs/evo_mapRotation.cs
+++ b/Classic/prefs/evo_mapRotation.cs
@@ -53,7 +53,7 @@ addRotationMap("Minotaur", CTF, 1, 0);
 addRotationMap("S8_Opus", CTF, 1, 1);
 addRotationMap("BeggarsRun", CTF, 1, 0);
 addRotationMap("TitForTat", CTF, 1, 0);
-addRotationMap("Surreal", CTF, 1, 1);
+addRotationMap("Surreal", CTF, 1, 0);
 addRotationMap("Signal", CTF, 1, 1);
 addRotationMap("Headstone", CTF, 1, 1);
 addRotationMap("Fenix", CTF, 1, 0);
@@ -89,11 +89,11 @@ addRotationMap("S8_Geothermal", CTF, 1, 0);
 //addRotationMap("Lakefront", CTF, 1, 1);
 //addRotationMap("TWL_Magamatic", CTF, 1, 1);
 addRotationMap("TWL2_FrozenGlory", CTF, 1, 1);
-addRotationMap("ShockRidge", CTF, 1, 0);
+addRotationMap("ShockRidge", CTF, 1, 1);
 addRotationMap("TWL2_Bleed", CTF, 1, 0);
 addRotationMap("TWL2_BlueMoon", CTF, 1, 0);
-addRotationMap("Blastside_nef", CTF, 1, 0);
-addRotationMap("ShortFall", CTF, 1, 0);
+addRotationMap("Blastside_nef", CTF, 1, 1);
+addRotationMap("ShortFall", CTF, 1, 1);
 addRotationMap("ArenaDome", CTF, 1, 1);
 addRotationMap("TWL2_MidnightMayhemDeluxe", CTF, 1, 0);
 //addRotationMap("IceRidge_nef", CTF, 1, 0);
@@ -107,7 +107,7 @@ addRotationMap("TitanV", CTF, 1, 0);
 //addRotationMap("AstersDescent", CTF, 1, 0);
 //addRotationMap("Azoth", CTF, 0, 0);
 //addRotationMap("BattleGrove", CTF, 0, 0);
-//addRotationMap("BerylBasin", CTF, 1, 0);
+addRotationMap("BerylBasin", CTF, 1, 1);
 //addRotationMap("Durango", CTF, 0, 0);
 //addRotationMap("DustLust", CTF, 0, 0);
 //addRotationMap("Island", CTF, 1, 0);
@@ -119,7 +119,7 @@ addRotationMap("JadeValley", CTF, 1, 0);
 //addRotationMap("Peak", CTF, 0, 0);
 //addRotationMap("Pendulum", CTF, 0, 0);
 //addRotationMap("Snowcone", CTF, 0, 0);
-//addRotationMap("S5_Drache", CTF, 1, 0);
+addRotationMap("S5_Drache", CTF, 1, 0);
 addRotationMap("S5_HawkingHeat", CTF, 1, 0);
 //addRotationMap("S5_Misadventure", CTF, 1, 0);
 addRotationMap("S5_Reynard", CTF, 1, 0);
@@ -135,33 +135,33 @@ addRotationMap("TWL2_Crevice", CTF, 1, 0);
 //addRotationMap("TWL2_Drorck", CTF, 0, 0);
 addRotationMap("TWL2_FrozenHope", CTF, 1, 0);
 addRotationMap("TWL2_IceDagger", CTF, 1, 0);
-//addRotationMap("TWL2_MuddySwamp", CTF, 1, 0);
+addRotationMap("TWL2_MuddySwamp", CTF, 1, 0);
 //addRotationMap("TWL2_Norty", CTF, 1, 0);
 //addRotationMap("TWL2_Ruined", CTF, 1, 0);
 //addRotationMap("TWL_Abaddon", CTF, 0, 0);
 //addRotationMap("TWL_BaNsHee", CTF, 0, 0);
 //addRotationMap("TWL_Boss", CTF, 0, 0);
-//addRotationMap("TWL_Chokepoint", CTF, 1, 0);
+addRotationMap("TWL_Chokepoint", CTF, 1, 0);
 addRotationMap("TWL_Cinereous", CTF, 1, 0);
-addRotationMap("TWL_Crossfire", CTF, 1, 0);
+addRotationMap("TWL_Crossfire", CTF, 1, 1);
 addRotationMap("TWL_NoShelter", CTF, 1, 0);
 addRotationMap("TWL_OsIris", CTF, 1, 0);
 //addRotationMap("TWL_Clusterfuct", CTF, 0, 0);
 //addRotationMap("TWL_Curtilage", CTF, 0, 0);
 addRotationMap("TWL_Damnation", CTF, 1, 0);
 addRotationMap("TWL_DangerousCrossing", CTF, 1, 0);
-//addRotationMap("TWL_DeadlyBirdsSong", CTF, 1, 0);
+addRotationMap("TWL_DeadlyBirdsSong", CTF, 1, 0);
 addRotationMap("TWL_Deserted", CTF, 1, 0);
 //addRotationMap("TWL_Frostclaw", CTF, 1, 0);
-//addRotationMap("TWL_Frozen", CTF, 1, 0);
-//addRotationMap("TWL_Harvester", CTF, 0, 0);
+addRotationMap("TWL_Frozen", CTF, 1, 0);
+addRotationMap("TWL_Harvester", CTF, 1, 0);
 //addRotationMap("TWL_Horde", CTF, 0, 0);
 addRotationMap("TWL_Katabatic", CTF, 1, 0);
 //addRotationMap("TWL_Neve", CTF, 0, 0);
 //addRotationMap("TWL_Pandemonium", CTF, 0, 0);
 //addRotationMap("TWL_Ramparts", CTF, 0, 0);
 //addRotationMap("TWL_Sandstorm", CTF, 0, 0);
-//addRotationMap("TWL_Starfallen", CTF, 1, 0);
+addRotationMap("TWL_Starfallen", CTF, 1, 0);
 addRotationMap("TWL_SubZero", CTF, 1, 0);
 addRotationMap("TWL_Titan", CTF, 1, 0);
 //addRotationMap("TWL_WoodyMyrk", CTF, 1, 0);
@@ -174,7 +174,7 @@ addRotationMap("WindyGap", CTF, 1, 0);
 //addRotationMap("Coppersky", CTF, 1, 0);
 addRotationMap("SuperHappyBouncyFunTime", CTF, 1, 0);
 //addRotationMap("CloudCity", CTF, 0, 0);
-//addRotationMap("ConstructionYard", CTF, 0, 0);
+//addRotationMap("ConstructionYard", CTF, 1, 0);
 //addRotationMap("Archipelago", CTF, 0, 0);
 //addRotationMap("Damnation", CTF, 0, 0);
 //addRotationMap("DeathBirdsFly", CTF, 0, 0);
@@ -200,7 +200,7 @@ addRotationMap("SandOcean", CTF, 1, 0);
 //addRotationMap("Agorazscium", CTF, 0, 0);
 //addRotationMap("BasinFury", CTF, 0, 0);
 //addRotationMap("Cadaver", CTF, 0, 0);
-//addRotationMap("Fallout", CTF, 1, 0);
+addRotationMap("Fallout", CTF, 1, 0);
 //addRotationMap("EivoItoxico", CTF, 0, 0);
 //addRotationMap("Einfach", CTF, 0, 0);
 addRotationMap("Nightdance", CTF, 1, 0);
@@ -219,7 +219,7 @@ addRotationMap("Choke", CTF, 1, 0);
 //addRotationMap("DesertofDeath_nef", CTF, 0, 0);
 //addRotationMap("Gorgon", CTF, 1, 0);
 addRotationMap("Magmatic", CTF, 1, 0);
-addRotationMap("Sub-zero", CTF, 1, 0);
+//addRotationMap("Sub-zero", CTF, 1, 0);
 addRotationMap("Blink", CTF, 1, 1);
 
 
@@ -231,19 +231,19 @@ addRotationMap("Blink", CTF, 1, 1);
 addRotationMap("VaubanLak", LakRabbit, 1, 1);
 addRotationMap("MiniSunDried", LakRabbit, 1, 1);
 addRotationMap("Sundance", LakRabbit, 1, 1);
-addRotationMap("TWL_BeachBlitzLak", LakRabbit, 1, 0);
+addRotationMap("TWL_BeachBlitzLak", LakRabbit, 1, 1);
 addRotationMap("DesertofDeathLak", LakRabbit, 1, 1);
-addRotationMap("TreasureIslandLak", LakRabbit, 1, 0);
+addRotationMap("TreasureIslandLak", LakRabbit, 1, 1);
 addRotationMap("Raindance_nefLak", LakRabbit, 1, 1);
 addRotationMap("SunDriedLak", LakRabbit, 1, 1);
 addRotationMap("SkinnyDipLak", LakRabbit, 1, 1);
-addRotationMap("SolsDescentLak", LakRabbit, 1, 0);
-addRotationMap("Crater71Lak", LakRabbit, 1, 0);
+addRotationMap("SolsDescentLak", LakRabbit, 1, 1);
+addRotationMap("Crater71Lak", LakRabbit, 1, 1);
 addRotationMap("SaddiesHill", LakRabbit, 1, 1);
 addRotationMap("GodsRiftLak", LakRabbit, 1, 0);
-addRotationMap("HavenLak", LakRabbit, 1, 1);
+addRotationMap("HavenLak", LakRabbit, 1, 0);
 addRotationMap("LushLak", LakRabbit, 1, 1);
-addRotationMap("PhasmaDustLak", LakRabbit, 1, 0);
+addRotationMap("PhasmaDustLak", LakRabbit, 1, 1);
 addRotationMap("BoxLak", LakRabbit, 1, 1);
 //addRotationMap("DamnnationLak", LakRabbit, 1, 0);
 addRotationMap("TitaniaLak", LakRabbit, 1, 1);
@@ -255,9 +255,9 @@ addRotationMap("TitaniaLak", LakRabbit, 1, 1);
 //addRotationMap("HillsOfSorrow", LakRabbit, 1, 1);
 addRotationMap("InfernusLak", LakRabbit, 1, 1);
 //addRotationMap("EscaladeLak", LakRabbit, 1, 0);
-addRotationMap("Arrakis", LakRabbit, 1, 1);
+addRotationMap("Arrakis", LakRabbit, 1, 0);
 //addRotationMap("EquinoxLak", LakRabbit, 1, 0);
-//addRotationMap("FrozenFuryLak", LakRabbit, 1, 0);
+addRotationMap("FrozenFuryLak", LakRabbit, 1, 0);
 //addRotationMap("S8_GeothermalLak", LakRabbit, 1, 1);
 addRotationMap("Sulfide", LakRabbit, 1, 0);
 
@@ -430,7 +430,7 @@ addRotationMap("Blink", sctf, 1, 1);
 addRotationMap("RaspDM", DM, 1, 1);
 addRotationMap("EntombedDM", DM, 1, 1);
 addRotationMap("IceDomeDM", DM, 1, 1);
-//addRotationMap("Mac_FlagArena", DM, 1, 1);
+addRotationMap("HoofToeDM", DM, 1, 1);
 addRotationMap("ArenaDomeDM", DM, 1, 1);
 addRotationMap("VulcansWrathDM", DM, 1, 1);
 //addRotationMap("SmallCrossingLT", DM, 1, 1);