added traffic shaper game rules

5 files changed, 458 insertions, 118 deletions

diff --git a/etc/inc/wizardapp.inc b/etc/inc/wizardapp.inc
index 8cd53e1..1203475 100644
--- a/etc/inc/wizardapp.inc
+++ b/etc/inc/wizardapp.inc
@@ -31,6 +31,18 @@
 
 $gamesplist = array();
 
+$gamesplist['arma2'] = array();
+	/* ARMA 2 */
+	$gamesplist['arma2'][] = array('arma2', 'udp', '2302', '2310', 'both');
+	
+$gamesplist['battlenet'] = array();
+	/* Blizzard Publishing games */
+	$gamesplist['battlenet'][] = array('Battle.NET-game1-tcp', 'tcp', '6112', '6119', 'both'); //diablo, diablo2, starcraft, warcraft 2, warcraft 3
+	$gamesplist['battlenet'][] = array('Battle.NET-game1-udp', 'udp', '6112', '6119', 'both'); //diablo, diablo2, starcraft, warcraft 2
+	$gamesplist['battlenet'][] = array('Battle.NET-diablo2', 'tcp', '4000', '4000', 'both'); //diablo2
+	$gamesplist['battlenet'][] = array('Battle.NET-game2', 'tcp', '1119', '1119', 'both');  //diablo3, starcraft 2
+
+
 $gamesplist['battlefield2'] = array();
 	/* Battlefield 2 */
 	$gamesplist['battlefield2'][] = array('BF2-1500-4999', 'udp', '1500', '4999', 'both');
@@ -43,60 +55,50 @@ $gamesplist['battlefield2'] = array();
 	$gamesplist['battlefield2'][] = array('BF2-27900', 'udp', '27900', '27900', 'both');
 	$gamesplist['battlefield2'][] = array('BF2-55123-55125', 'udp', '55123', '55125', 'both');
 
+$gamesplist['callofduty'] = array();
+	/* Call Of Duty */
+	$gamesplist['callofduty'][] = array('CallOfDuty1', 'tcp', '28960', '28960', 'both');
+	$gamesplist['callofduty'][] = array('CallOfDuty2', 'udp', '28960', '28960', 'both');
+
 $gamesplist['counterstrike'] = array();
 	/* counter strike */
-	$gamesplist['counterstrike'][] = array('Titan', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Authentication', 'udp', '7002', '7002', 'both');
-	$gamesplist['counterstrike'][] = array('Client', 'udp', '6003', '6003', 'both');
-	$gamesplist['counterstrike'][] = array('Masterserver', 'udp', '27010', '27010', 'both');
-	$gamesplist['counterstrike'][] = array('Mod-Server', 'udp', '27011', '27011', 'both');
-	$gamesplist['counterstrike'][] = array('Chat', 'udp', '27012', '27012', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport1', 'udp', '27013', '27013', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport2', 'udp', '27014', '27014', 'both');
-	$gamesplist['counterstrike'][] = array('HL-Serverport', 'udp', '27015', '27015', 'both');
+	$gamesplist['counterstrike'][] = array('CS-Titan', 'udp', '6003', '6003', 'both');
+	$gamesplist['counterstrike'][] = array('CS-Authentication', 'udp', '7002', '7002', 'both');
+	$gamesplist['counterstrike'][] = array('CS-Client', 'udp', '6003', '6003', 'both');
+	$gamesplist['counterstrike'][] = array('CS-Masterserver', 'udp', '27010', '27010', 'both');
+	$gamesplist['counterstrike'][] = array('CS-Mod-Server', 'udp', '27011', '27011', 'both');
+	$gamesplist['counterstrike'][] = array('CS-Chat', 'udp', '27012', '27012', 'both');
+	$gamesplist['counterstrike'][] = array('CS-HL-Serverport1', 'udp', '27013', '27013', 'both');
+	$gamesplist['counterstrike'][] = array('CS-HL-Serverport2', 'udp', '27014', '27014', 'both');
+	$gamesplist['counterstrike'][] = array('CS-HL-Serverport', 'udp', '27015', '27015', 'both');
+
+$gamesplist['crysis2'] = array();
+	/* Crysis 2 */
+	$gamesplist['crysis2'][] = array('Crysis2', 'udp', '64100', '64100', 'both');
 
 $gamesplist['deltaforce'] = array();
 	/* delta force */
 	$gamesplist['deltaforce'][] = array('Delta1', 'udp', '17478', '17488', 'both');
 
-$gamesplist['quakeiii'] = array();
-	/* quake3 */
-	$gamesplist['quakeiii'][] = array('quakeiii', 'udp', '27910', '27919', 'both');
-
-$gamesplist['tigerwoods2004ps2'] = array();
-	/* tiger woods 2004 ps2 */
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player', 'udp', '3658', '3658', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player2', 'udp', '6000', '6000', 'both');
-	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2EA', 'tcp', '10300', '10301', 'both');
-
-$gamesplist['callofduty'] = array();
-	$gamesplist['callofduty'][] = array('CallOfDuty1', 'tcp', '28960', '28960', 'both');
-	$gamesplist['callofduty'][] = array('CallOfDuty2', 'udp', '28960', '28960', 'both');
-
-$gamesplist['planetside'] = array();
-	/* PlanetSide */
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7000', '7000', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7080', '7080', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '3016', '3021', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '45000', '45010', 'both');
-	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '30000', '30500', 'both');
-
-$gamesplist['halo2'] = array();
-	/* Halo2 + XBOX Live */
-	$gamesplist['halo2'][] = array('Halo2-1', 'udp', '88', '88', 'both');
-	$gamesplist['halo2'][] = array('Halo2-2', 'udp', '3074', '3074', 'both');
-	$gamesplist['halo2'][] = array('Halo2-3', 'tcp', '3074', '3074', 'both');
-
-$gamesplist['unrealtournament'] = array();
-	/* Unreal Tournament */
-	$gamesplist['unrealtournament'][] = array('ur1', 'udp', '7777', '7787', 'both');
-	$gamesplist['unrealtournament'][] = array('ur2', 'tcp', '7777', '7787', 'both');
+$gamesplist['dirt3'] = array();
+	/* ARMA 2 */
+	$gamesplist['dirt3'][] = array('Dirt3-1', 'tcp', '2300', '2400', 'both');
+	$gamesplist['dirt3'][] = array('Dirt3-2', 'udp', '2300', '2400', 'both');
+	$gamesplist['dirt3'][] = array('Dirt3-3', 'udp', '6073', '6073', 'both');	
+	$gamesplist['dirt3'][] = array('Dirt3-4', 'tcp', '47624', '47624', 'both');
 
 $gamesplist['doom3'] = array();
 	/* doom3 */
 	$gamesplist['doom3'][] = array('DOOM3-1', 'udp', '27650', '27650', 'both');
 	$gamesplist['doom3'][] = array('DOOM3-2', 'udp', '27666', '27666', 'both');
 
+$gamesplist['eveonline'] = array();
+	/* EVE Online */
+	$gamesplist['eveonline'][] = array('EVEOnline-tcp', 'tcp', '26000', '26000', 'both');
+	$gamesplist['eveonline'][] = array('EVEOnline-udp', 'udp', '26000', '26000', 'both');
+	$gamesplist['eveonline'][] = array('EVEOnline-alternate-tcp', 'tcp', '3724', '3724', 'both');
+	$gamesplist['eveonline'][] = array('EVEOnline-alternate-udp', 'udp', '3724', '3724', 'both');
+
 $gamesplist['empireearth'] = array();
 	/* empire earth */
 	$gamesplist['empireearth'][] = array('EmpireEarth-1', 'tcp', '33335', '33336', 'both');
@@ -122,11 +124,14 @@ $gamesplist['farcry'] = array();
 	$gamesplist['farcry'][] = array('FarCry-1', 'tcp', '49001', '49002', 'both');
 	$gamesplist['farcry'][] = array('FarCry-2', 'udp', '49001', '49002', 'both');
 
-$gamesplist['halflife2'] = array();
-	/* halflife 2 */
-	$gamesplist['halflife2'][] = array('HL2-1', 'tcp', '27020', '27050', 'both');
-	$gamesplist['halflife2'][] = array('HL2-2', 'udp', '1200', '1200', 'both');
-	$gamesplist['halflife2'][] = array('HL2-3', 'udp', '27000', '27015', 'both');
+$gamesplist['farcry2'] = array();
+	/* FarCry 2*/
+	$gamesplist['farcry2'][] = array('FarCry2-tcp', 'tcp', '9000', '9004', 'both');
+	$gamesplist['farcry2'][] = array('FarCry2-udp', 'udp', '9000', '9004', 'both');
+
+$gamesplist['gunzonline'] = array();
+	/* GunZ Online */
+	$gamesplist['gunzonline'][] = array('GunZOnline', 'udp', '7700', '7700', 'both');
 
 $gamesplist['halflife'] = array();
 	/* halflife */
@@ -134,9 +139,11 @@ $gamesplist['halflife'] = array();
 	$gamesplist['halflife'][] = array('HL-2', 'udp', '27650', '27650', 'both');
 	$gamesplist['halflife'][] = array('HL-3', 'udp', '27666', '27666', 'both');
 
-$gamesplist['wolfet'] = array();
-	/* wolfenstein enemy territory */
-	$gamesplist['wolfet'][] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
+$gamesplist['halo2'] = array();
+	/* Halo2 + XBOX Live */
+	$gamesplist['halo2'][] = array('Halo2-1', 'udp', '88', '88', 'both');
+	$gamesplist['halo2'][] = array('Halo2-2', 'udp', '3074', '3074', 'both');
+	$gamesplist['halo2'][] = array('Halo2-3', 'tcp', '3074', '3074', 'both');
 
 $gamesplist['lineage2'] = array();
 	/* Lineage II */
@@ -144,20 +151,89 @@ $gamesplist['lineage2'] = array();
 	$gamesplist['lineage2'][] = array('Lineage2-2106', 'tcp', '2106', '2106', 'both');
 	$gamesplist['lineage2'][] = array('Lineage2-7777', 'tcp', '7777', '7777', 'both');
 
-$gamesplist['battlenet'] = array();
-	/* Blizzard Publishing games */
-	$gamesplist['battlenet'][] = array('Battle.NET', 'tcp', '6112', '6119', 'both');
-	$gamesplist['battlenet'][] = array('Battle.NET-2', 'tcp', '1119', '1119', 'both');
+$gamesplist['wechwarrioronline'] = array();
+	/* MechWarrior: Online */
+	$gamesplist['wechwarrioronline'][] = array('wechwarrioronline-tcp1', 'tcp', '45461', '45461', 'both');
+	$gamesplist['wechwarrioronline'][] = array('wechwarrioronline-tcp2', 'tcp', '45464', '45464', 'both');
+	$gamesplist['wechwarrioronline'][] = array('wechwarrioronline-game', 'udp', '21000', '30000', 'both'); // 9000 ports
+
+$gamesplist['minecraft'] = array();
+	/* Minecraft */
+	$gamesplist['minecraft'][] = array('minecraft-tcp', 'tcp', '25565', '25565', 'both');
+	$gamesplist['minecraft'][] = array('minecraft-udp', 'udp', '25565', '25565', 'both');
+
+$gamesplist['operationflashpoint-dr'] = array();
+	/* Operation Flashpoint: Dragon Rising */
+	$gamesplist['operationflashpoint-dr'][] = array('operationflashpoint-dr-game', 'udp', '9105', '9105', 'both');
+
+$gamesplist['planetside'] = array();
+	/* PlanetSide */
+	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7000', '7000', 'both');
+	$gamesplist['planetside'][] = array('PlanetSide', 'tcp', '7080', '7080', 'both');
+	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '3016', '3021', 'both');
+	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '45000', '45010', 'both');
+	$gamesplist['planetside'][] = array('PlanetSide2', 'udp', '30000', '30500', 'both');
+	
+$gamesplist['planetside2'] = array();
+	/* PlanetSide 2 */
+	$gamesplist['planetside2'][] = array('PlanetSide2-game', 'udp', '20040', '20199', 'both');
+	$gamesplist['planetside2'][] = array('PlanetSide2-voice', 'udp', '5062', '5062', 'both');
+	
+$gamesplist['playstation3'] = array();
+	/* PlayStation 2 */
+	$gamesplist['playstation3'][] = array('PS3-pshome1', 'tcp', '3478', '3480', 'both');
+	$gamesplist['playstation3'][] = array('PS3-pshome2', 'tcp', '8080', '8080', 'both');
+	$gamesplist['playstation3'][] = array('PS3-tcp1', 'tcp', '5223', '5223', 'both');
+	$gamesplist['playstation3'][] = array('PS3-tcp2', 'tcp', '10070', '10080', 'both');
+	$gamesplist['playstation3'][] = array('PS3-udp1', 'udp', '3478', '3479', 'both');
+	$gamesplist['playstation3'][] = array('PS3-udp2', 'udp', '3658', '3658', 'both');
+	$gamesplist['playstation3'][] = array('PS3-udp3', 'udp', '10070', '10070', 'both');
+	$gamesplist['playstation3'][] = array('PS3-remoteplay', 'tcp', '9293', '9293', 'both');
+	
+$gamesplist['quakeiii'] = array();
+	/* quake3 */
+	$gamesplist['quakeiii'][] = array('quakeiii', 'udp', '27910', '27919', 'both');
+
+$gamesplist['steam'] = array();
+	/* Steam Games */
+	$gamesplist['steam'][] = array('steam-game-udp', 'udp', '27000', '27015', 'both');  //america's army 3, cs:s, cs:go, HL2
+	$gamesplist['steam'][] = array('steam-game-tcp', 'tcp', '27000', '27015', 'both');  //america's army 3, cs:s, cs:go, HL2
+	$gamesplist['steam'][] = array('steam-hltv', 'udp', '27015', '27030', 'both');
+	$gamesplist['steam'][] = array('steam-1', 'udp', '4380', '4380', 'both');
+	$gamesplist['steam'][] = array('steam-2', 'udp', '1200', '1200', 'both');
+	$gamesplist['steam'][] = array('steam-voice', 'udp', '3478', '3480', 'both');
+	//NOTE: steam downloads, probably don't want this in the game que
+	//$gamesplist['steam'][] = array('steam-downloads', 'tcp', '27014', '27050', 'both');
+
+$gamesplist['tigerwoods2004ps2'] = array();
+	/* tiger woods 2004 ps2 */
+	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player', 'udp', '3658', '3658', 'both');
+	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2Player2', 'udp', '6000', '6000', 'both');
+	$gamesplist['tigerwoods2004ps2'][] = array('Outbound2EA', 'tcp', '10300', '10301', 'both');
+
+$gamesplist['tribesascend'] = array();
+	/* Tribes Ascend */
+	$gamesplist['tribesascend'][] = array('tribesascend-tcp', 'tcp', '9000', '9001', 'both');
+	$gamesplist['tribesascend'][] = array('tribesascend-udp', 'udp', '9002', '9999', 'both');
+
+$gamesplist['unrealtournament'] = array();
+	/* Unreal Tournament */
+	$gamesplist['unrealtournament'][] = array('UT-game-udp', 'udp', '7777', '7787', 'both');
+	$gamesplist['unrealtournament'][] = array('UT-game-tcp', 'tcp', '7777', '7787', 'both');
+	$gamesplist['unrealtournament'][] = array('UT-voice', 'udp', '3783', '3783', 'both');
+
+$gamesplist['wolfet'] = array();
+	/* wolfenstein enemy territory */
+	$gamesplist['wolfet'][] = array('WolfET-1', 'tcp', '27960', '27960', 'both');
 
 $gamesplist['wow'] = array();
+	/* World of Warcraft */
 	$gamesplist['wow'][] = array('WoW', 'tcp', '3724', '3724', 'both');
-
-$gamesplist['gunzonline'] = array();
-	/* GunZ Online */
-	$gamesplist['gunzonline'][] = array('GunZOnline', 'udp', '7700', '7700', 'both');
+	$gamesplist['wow'][] = array('WoW-voice', 'udp', '1119', '1119', 'both');
+	$gamesplist['wow'][] = array('WoW-voice', 'udp', '3724', '3724', 'both');
 
 $gamesplist['xbox360'] = array();
-	/* XBox360 */
+	/* XBox360 and Games for Windows Live*/
 	$gamesplist['xbox360'][] = array('xbox360-1', 'udp', '88', '88', 'both');
 	$gamesplist['xbox360'][] = array('xbox360-2', 'udp', '3074', '3074', 'both');
 	$gamesplist['xbox360'][] = array('xbox360-3', 'tcp', '3074', '3074', 'both');
diff --git a/usr/local/www/wizards/traffic_shaper_wizard.xml b/usr/local/www/wizards/traffic_shaper_wizard.xml
index 4c2f2a3..7268216 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard.xml
@@ -433,7 +433,7 @@
 				<type>checkbox</type>
 				<typehint>Prioritize network gaming traffic</typehint>
 				<description>This will raise the priority of gaming traffic to higher than most traffic.</description>
-				<enablefields>BattleNET,Battlefield2,CallOfDuty,Counterstrike,DeltaForce,DOOM3,EmpireEarth,Everquest,Everquest2,FarCry,GunZOnline,HalfLife,HalfLife2,Halo2,Lineage2,PlanetSide,QuakeIII,TigerWoods2004PS2,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
+				<enablefields>ARMA2,BattleNET,Battlefield2,CallOfDuty,Counterstrike,Crysis2,DeltaForce,Dirt3,DOOM3,EmpireEarth,EveOnline,Everquest,Everquest2,FarCry,FarCry2,GunZOnline,HalfLife,Halo2,Lineage2,MechwarriorOnline,Minecraft,OperationFlashpointDR,PlanetSide,PlanetSide2,PlayStation3,QuakeIII,Steam,TigerWoods2004PS2,TribesAscend,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
 				<donotdisable>true</donotdisable>
 				<bindstofield>ezshaper-&gt;step6-&gt;enable</bindstofield>
 			</field>
@@ -446,6 +446,12 @@
 				<type>listtopic</type>
 			</field>
 			<field>
+				<name>ARMA2</name>
+				<type>checkbox</type>
+				<typehint>ARMA 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;arma2</bindstofield>
+			</field>
+			<field>
 				<name>BattleNET</name>
 				<type>checkbox</type>
 				<typehint>Battle.net - Virtually every game from Blizzard publishing should match this.  This includes the following game series: Starcraft, Diablo, Warcraft.  Guild Wars also uses this port.</typehint>
@@ -470,12 +476,24 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;counterstrike</bindstofield>
 			</field>
 			<field>
+				<name>Crysis2</name>
+				<type>checkbox</type>
+				<typehint>Crysis 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;crysis2</bindstofield>
+			</field>
+			<field>
 				<name>DeltaForce</name>
 				<type>checkbox</type>
 				<typehint>Delta Force</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;deltaforce</bindstofield>
 			</field>
 			<field>
+				<name>Dirt3</name>
+				<type>checkbox</type>
+				<typehint>Dirt 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;dirt3</bindstofield>
+			</field>
+			<field>
 				<name>DOOM3</name>
 				<type>checkbox</type>
 				<typehint>DOOM3</typehint>
@@ -488,6 +506,12 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;empireearth</bindstofield>
 			</field>
 			<field>
+				<name>EveOnline</name>
+				<type>checkbox</type>
+				<typehint>EVE Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;eveonline</bindstofield>
+			</field>
+			<field>
 				<name>Everquest</name>
 				<type>checkbox</type>
 				<typehint>Everquest - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
@@ -500,28 +524,28 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;everquest2</bindstofield>
 			</field>
 			<field>
-				<name>GunZOnline</name>
-				<type>checkbox</type>
-				<typehint>GunZ Online</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
-			</field>
-			<field>
 				<name>FarCry</name>
 				<type>checkbox</type>
 				<typehint>Far Cry</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;farcry</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife</name>
+				<name>FarCry2</name>
 				<type>checkbox</type>
-				<typehint>HalfLife</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
+				<typehint>Far Cry 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;farcry2</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife2</name>
+				<name>GunZOnline</name>
 				<type>checkbox</type>
-				<typehint>HalfLife 2</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife2</bindstofield>
+				<typehint>GunZ Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
+			</field>
+			<field>
+				<name>HalfLife</name>
+				<type>checkbox</type>
+				<typehint>HalfLife</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
 			</field>
 			<field>
 				<name>Halo2</name>
@@ -536,27 +560,69 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;lineage2</bindstofield>
 			</field>
 			<field>
+				<name>MechwarriorOnline</name>
+				<type>checkbox</type>
+				<typehint>MechWarrior: Online - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;wechwarrioronline</bindstofield>
+			</field>
+			<field>
+				<name>Minecraft</name>
+				<type>checkbox</type>
+				<typehint>Minecraft</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;minecraft</bindstofield>
+			</field>
+			<field>
+				<name>OperationFlashpointDR</name>
+				<type>checkbox</type>
+				<typehint>Operation Flashpoint: Dragon Rising</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;operationflashpoint-dr</bindstofield>
+			</field>
+			<field>
 				<name>PlanetSide</name>
 				<type>checkbox</type>
 				<typehint>PlanetSide</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;planetside</bindstofield>
 			</field>
 			<field>
+				<name>PlanetSide2</name>
+				<type>checkbox</type>
+				<typehint>PlanetSide 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;planetside2</bindstofield>
+			</field>
+			<field>
+				<name>PlayStation3</name>
+				<type>checkbox</type>
+				<typehint>PlayStation 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;playstation3</bindstofield>
+			</field>
+			<field>
 				<name>QuakeIII</name>
 				<type>checkbox</type>
 				<typehint>Quake III</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;quakeiii</bindstofield>
 			</field>
 			<field>
+				<name>Steam</name>
+				<type>checkbox</type>
+				<typehint>Steam (Includes: America's Army 3, Counter-Strike: Source, Counter-Strike: Global Offensive, Halflife 2)</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;steam</bindstofield>
+			</field>
+			<field>
 				<name>TigerWoods2004PS2</name>
 				<type>checkbox</type>
 				<typehint>Tiger Woods 2004 for PS2</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;tigerwoods2004ps2</bindstofield>
 			</field>
 			<field>
+				<name>TribesAscend</name>
+				<type>checkbox</type>
+				<typehint>Tribes Ascend</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;tribesascend</bindstofield>
+			</field>
+			<field>
 				<name>UnrealTournament</name>
 				<type>checkbox</type>
-				<typehint>Unreal Tournament</typehint>
+				<typehint>Unreal Tournament Series</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;unrealtournament</bindstofield>
 			</field>
 			<field>
@@ -574,7 +640,7 @@
 			<field>
 				<name>Xbox360</name>
 				<type>checkbox</type>
-				<typehint>XBox 360</typehint>
+				<typehint>XBox 360 and Games for Windows Live</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;xbox360</bindstofield>
 			</field>
 			<field>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
index ecdb508..ab0f105 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_dedicated.xml
@@ -438,7 +438,7 @@
 				<type>checkbox</type>
 				<typehint>Prioritize network gaming traffic</typehint>
 				<description>This will raise the priority of gaming traffic to higher than most traffic.</description>
-				<enablefields>BattleNET,Battlefield2,CallOfDuty,Counterstrike,DeltaForce,DOOM3,EmpireEarth,Everquest,Everquest2,FarCry,GunZOnline,HalfLife,HalfLife2,Halo2,Lineage2,PlanetSide,QuakeIII,TigerWoods2004PS2,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
+				<enablefields>ARMA2,BattleNET,Battlefield2,CallOfDuty,Counterstrike,Crysis2,DeltaForce,Dirt3,DOOM3,EmpireEarth,EveOnline,Everquest,Everquest2,FarCry,FarCry2,GunZOnline,HalfLife,Halo2,Lineage2,MechwarriorOnline,Minecraft,OperationFlashpointDR,PlanetSide,PlanetSide2,PlayStation3,QuakeIII,Steam,TigerWoods2004PS2,TribesAscend,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
 				<donotdisable>true</donotdisable>
 				<bindstofield>ezshaper-&gt;step6-&gt;enable</bindstofield>
 			</field>
@@ -451,6 +451,12 @@
 				<type>listtopic</type>
 			</field>
 			<field>
+				<name>ARMA2</name>
+				<type>checkbox</type>
+				<typehint>ARMA 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;arma2</bindstofield>
+			</field>
+			<field>
 				<name>BattleNET</name>
 				<type>checkbox</type>
 				<typehint>Battle.net - Virtually every game from Blizzard publishing should match this.  This includes the following game series: Starcraft, Diablo, Warcraft.  Guild Wars also uses this port.</typehint>
@@ -475,12 +481,24 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;counterstrike</bindstofield>
 			</field>
 			<field>
+				<name>Crysis2</name>
+				<type>checkbox</type>
+				<typehint>Crysis 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;crysis2</bindstofield>
+			</field>
+			<field>
 				<name>DeltaForce</name>
 				<type>checkbox</type>
 				<typehint>Delta Force</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;deltaforce</bindstofield>
 			</field>
 			<field>
+				<name>Dirt3</name>
+				<type>checkbox</type>
+				<typehint>Dirt 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;dirt3</bindstofield>
+			</field>
+			<field>
 				<name>DOOM3</name>
 				<type>checkbox</type>
 				<typehint>DOOM3</typehint>
@@ -493,6 +511,12 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;empireearth</bindstofield>
 			</field>
 			<field>
+				<name>EveOnline</name>
+				<type>checkbox</type>
+				<typehint>EVE Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;eveonline</bindstofield>
+			</field>
+			<field>
 				<name>Everquest</name>
 				<type>checkbox</type>
 				<typehint>Everquest - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
@@ -505,28 +529,28 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;everquest2</bindstofield>
 			</field>
 			<field>
-				<name>GunZOnline</name>
-				<type>checkbox</type>
-				<typehint>GunZ Online</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
-			</field>
-			<field>
 				<name>FarCry</name>
 				<type>checkbox</type>
 				<typehint>Far Cry</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;farcry</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife</name>
+				<name>FarCry2</name>
 				<type>checkbox</type>
-				<typehint>HalfLife</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
+				<typehint>Far Cry 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;farcry2</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife2</name>
+				<name>GunZOnline</name>
 				<type>checkbox</type>
-				<typehint>HalfLife 2</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife2</bindstofield>
+				<typehint>GunZ Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
+			</field>
+			<field>
+				<name>HalfLife</name>
+				<type>checkbox</type>
+				<typehint>HalfLife</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
 			</field>
 			<field>
 				<name>Halo2</name>
@@ -541,27 +565,69 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;lineage2</bindstofield>
 			</field>
 			<field>
+				<name>MechwarriorOnline</name>
+				<type>checkbox</type>
+				<typehint>MechWarrior: Online - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;wechwarrioronline</bindstofield>
+			</field>
+			<field>
+				<name>Minecraft</name>
+				<type>checkbox</type>
+				<typehint>Minecraft</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;minecraft</bindstofield>
+			</field>
+			<field>
 				<name>PlanetSide</name>
 				<type>checkbox</type>
 				<typehint>PlanetSide</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;planetside</bindstofield>
 			</field>
 			<field>
+				<name>PlanetSide2</name>
+				<type>checkbox</type>
+				<typehint>PlanetSide 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;planetside2</bindstofield>
+			</field>
+			<field>
+				<name>PlayStation3</name>
+				<type>checkbox</type>
+				<typehint>PlayStation 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;playstation3</bindstofield>
+			</field>
+			<field>
+				<name>OperationFlashpointDR</name>
+				<type>checkbox</type>
+				<typehint>Operation Flashpoint: Dragon Rising</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;operationflashpoint-dr</bindstofield>
+			</field>
+			<field>
 				<name>QuakeIII</name>
 				<type>checkbox</type>
 				<typehint>Quake III</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;quakeiii</bindstofield>
 			</field>
 			<field>
+				<name>Steam</name>
+				<type>checkbox</type>
+				<typehint>Steam (Includes: America's Army 3, Counter-Strike: Source, Counter-Strike: Global Offensive, Halflife 2)</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;steam</bindstofield>
+			</field>
+			<field>
 				<name>TigerWoods2004PS2</name>
 				<type>checkbox</type>
 				<typehint>Tiger Woods 2004 for PS2</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;tigerwoods2004ps2</bindstofield>
 			</field>
 			<field>
+				<name>TribesAscend</name>
+				<type>checkbox</type>
+				<typehint>Tribes Ascend</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;tribesascend</bindstofield>
+			</field>
+			<field>
 				<name>UnrealTournament</name>
 				<type>checkbox</type>
-				<typehint>Unreal Tournament</typehint>
+				<typehint>Unreal Tournament Series</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;unrealtournament</bindstofield>
 			</field>
 			<field>
@@ -579,7 +645,7 @@
 			<field>
 				<name>Xbox360</name>
 				<type>checkbox</type>
-				<typehint>XBox 360</typehint>
+				<typehint>XBox 360 and Games for Windows Live</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;xbox360</bindstofield>
 			</field>
       <field>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
index 050f493..f7aad15 100755
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_all.xml
@@ -446,7 +446,7 @@
 				<type>checkbox</type>
 				<typehint>Prioritize network gaming traffic</typehint>
 				<description>This will raise the priority of gaming traffic to higher than most traffic.</description>
-				<enablefields>BattleNET,Battlefield2,CallOfDuty,Counterstrike,DeltaForce,DOOM3,EmpireEarth,Everquest,Everquest2,FarCry,GunZOnline,HalfLife,HalfLife2,Halo2,Lineage2,PlanetSide,QuakeIII,TigerWoods2004PS2,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
+				<enablefields>ARMA2,BattleNET,Battlefield2,CallOfDuty,Counterstrike,Crysis2,DeltaForce,Dirt3,DOOM3,EmpireEarth,EveOnline,Everquest,Everquest2,FarCry,FarCry2,GunZOnline,HalfLife,Halo2,Lineage2,MechwarriorOnline,Minecraft,OperationFlashpointDR,PlanetSide,PlanetSide2,PlayStation3,QuakeIII,Steam,TigerWoods2004PS2,TribesAscend,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
 				<donotdisable>true</donotdisable>
 				<bindstofield>ezshaper-&gt;step6-&gt;enable</bindstofield>
 			</field>
@@ -459,6 +459,12 @@
 				<type>listtopic</type>
 			</field>
 			<field>
+				<name>ARMA2</name>
+				<type>checkbox</type>
+				<typehint>ARMA 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;arma2</bindstofield>
+			</field>
+			<field>
 				<name>BattleNET</name>
 				<type>checkbox</type>
 				<typehint>Battle.net - Virtually every game from Blizzard publishing should match this.  This includes the following game series: Starcraft, Diablo, Warcraft.  Guild Wars also uses this port.</typehint>
@@ -483,12 +489,24 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;counterstrike</bindstofield>
 			</field>
 			<field>
+				<name>Crysis2</name>
+				<type>checkbox</type>
+				<typehint>Crysis 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;crysis2</bindstofield>
+			</field>
+			<field>
 				<name>DeltaForce</name>
 				<type>checkbox</type>
 				<typehint>Delta Force</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;deltaforce</bindstofield>
 			</field>
 			<field>
+				<name>Dirt3</name>
+				<type>checkbox</type>
+				<typehint>Dirt 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;dirt3</bindstofield>
+			</field>
+			<field>
 				<name>DOOM3</name>
 				<type>checkbox</type>
 				<typehint>DOOM3</typehint>
@@ -501,6 +519,12 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;empireearth</bindstofield>
 			</field>
 			<field>
+				<name>EveOnline</name>
+				<type>checkbox</type>
+				<typehint>EVE Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;eveonline</bindstofield>
+			</field>
+			<field>
 				<name>Everquest</name>
 				<type>checkbox</type>
 				<typehint>Everquest - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
@@ -513,28 +537,28 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;everquest2</bindstofield>
 			</field>
 			<field>
-				<name>GunZOnline</name>
-				<type>checkbox</type>
-				<typehint>GunZ Online</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
-			</field>
-			<field>
 				<name>FarCry</name>
 				<type>checkbox</type>
 				<typehint>Far Cry</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;farcry</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife</name>
+				<name>FarCry2</name>
 				<type>checkbox</type>
-				<typehint>HalfLife</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
+				<typehint>Far Cry 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;farcry2</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife2</name>
+				<name>GunZOnline</name>
 				<type>checkbox</type>
-				<typehint>HalfLife 2</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife2</bindstofield>
+				<typehint>GunZ Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
+			</field>
+			<field>
+				<name>HalfLife</name>
+				<type>checkbox</type>
+				<typehint>HalfLife</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
 			</field>
 			<field>
 				<name>Halo2</name>
@@ -549,27 +573,69 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;lineage2</bindstofield>
 			</field>
 			<field>
+				<name>MechwarriorOnline</name>
+				<type>checkbox</type>
+				<typehint>MechWarrior: Online - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;wechwarrioronline</bindstofield>
+			</field>
+			<field>
+				<name>Minecraft</name>
+				<type>checkbox</type>
+				<typehint>Minecraft</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;minecraft</bindstofield>
+			</field>
+			<field>
 				<name>PlanetSide</name>
 				<type>checkbox</type>
 				<typehint>PlanetSide</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;planetside</bindstofield>
 			</field>
 			<field>
+				<name>PlanetSide2</name>
+				<type>checkbox</type>
+				<typehint>PlanetSide 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;planetside2</bindstofield>
+			</field>
+			<field>
+				<name>PlayStation3</name>
+				<type>checkbox</type>
+				<typehint>PlayStation 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;playstation3</bindstofield>
+			</field>
+			<field>
+				<name>OperationFlashpointDR</name>
+				<type>checkbox</type>
+				<typehint>Operation Flashpoint: Dragon Rising</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;operationflashpoint-dr</bindstofield>
+			</field>
+			<field>
 				<name>QuakeIII</name>
 				<type>checkbox</type>
 				<typehint>Quake III</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;quakeiii</bindstofield>
 			</field>
 			<field>
+				<name>Steam</name>
+				<type>checkbox</type>
+				<typehint>Steam (Includes: America's Army 3, Counter-Strike: Source, Counter-Strike: Global Offensive, Halflife 2)</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;steam</bindstofield>
+			</field>
+			<field>
 				<name>TigerWoods2004PS2</name>
 				<type>checkbox</type>
 				<typehint>Tiger Woods 2004 for PS2</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;tigerwoods2004ps2</bindstofield>
 			</field>
 			<field>
+				<name>TribesAscend</name>
+				<type>checkbox</type>
+				<typehint>Tribes Ascend</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;tribesascend</bindstofield>
+			</field>
+			<field>
 				<name>UnrealTournament</name>
 				<type>checkbox</type>
-				<typehint>Unreal Tournament</typehint>
+				<typehint>Unreal Tournament Series</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;unrealtournament</bindstofield>
 			</field>
 			<field>
@@ -587,7 +653,7 @@
 			<field>
 				<name>Xbox360</name>
 				<type>checkbox</type>
-				<typehint>XBox 360</typehint>
+				<typehint>XBox 360 and Games for Windows Live</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;xbox360</bindstofield>
 			</field>
 			<field>
diff --git a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml
index 30bc566..a968e3d 100644
--- a/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml
+++ b/usr/local/www/wizards/traffic_shaper_wizard_multi_lan.xml
@@ -497,7 +497,7 @@
 				<type>checkbox</type>
 				<typehint>Prioritize network gaming traffic</typehint>
 				<description>This will raise the priority of gaming traffic to higher than most traffic.</description>
-				<enablefields>BattleNET,Battlefield2,CallOfDuty,Counterstrike,DeltaForce,DOOM3,EmpireEarth,Everquest,Everquest2,FarCry,GunZOnline,HalfLife,HalfLife2,Halo2,Lineage2,PlanetSide,QuakeIII,TigerWoods2004PS2,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
+				<enablefields>ARMA2,BattleNET,Battlefield2,CallOfDuty,Counterstrike,Crysis2,DeltaForce,Dirt3,DOOM3,EmpireEarth,EveOnline,Everquest,Everquest2,FarCry,FarCry2,GunZOnline,HalfLife,Halo2,Lineage2,MechwarriorOnline,Minecraft,OperationFlashpointDR,PlanetSide,PlanetSide2,PlayStation3,QuakeIII,Steam,TigerWoods2004PS2,TribesAscend,UnrealTournament,WolfensteinEnemyTerritory,WorldOfWarcraft,XBox360</enablefields>
 				<donotdisable>true</donotdisable>
 				<bindstofield>ezshaper-&gt;step6-&gt;enable</bindstofield>
 			</field>
@@ -510,6 +510,12 @@
 				<type>listtopic</type>
 			</field>
 			<field>
+				<name>ARMA2</name>
+				<type>checkbox</type>
+				<typehint>ARMA 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;arma2</bindstofield>
+			</field>
+			<field>
 				<name>BattleNET</name>
 				<type>checkbox</type>
 				<typehint>Battle.net - Virtually every game from Blizzard publishing should match this.  This includes the following game series: Starcraft, Diablo, Warcraft.  Guild Wars also uses this port.</typehint>
@@ -534,12 +540,24 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;counterstrike</bindstofield>
 			</field>
 			<field>
+				<name>Crysis2</name>
+				<type>checkbox</type>
+				<typehint>Crysis 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;crysis2</bindstofield>
+			</field>
+			<field>
 				<name>DeltaForce</name>
 				<type>checkbox</type>
 				<typehint>Delta Force</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;deltaforce</bindstofield>
 			</field>
 			<field>
+				<name>Dirt3</name>
+				<type>checkbox</type>
+				<typehint>Dirt 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;dirt3</bindstofield>
+			</field>
+			<field>
 				<name>DOOM3</name>
 				<type>checkbox</type>
 				<typehint>DOOM3</typehint>
@@ -552,6 +570,12 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;empireearth</bindstofield>
 			</field>
 			<field>
+				<name>EveOnline</name>
+				<type>checkbox</type>
+				<typehint>EVE Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;eveonline</bindstofield>
+			</field>
+			<field>
 				<name>Everquest</name>
 				<type>checkbox</type>
 				<typehint>Everquest - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
@@ -564,28 +588,28 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;everquest2</bindstofield>
 			</field>
 			<field>
-				<name>GunZOnline</name>
-				<type>checkbox</type>
-				<typehint>GunZ Online</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
-			</field>
-			<field>
 				<name>FarCry</name>
 				<type>checkbox</type>
 				<typehint>Far Cry</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;farcry</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife</name>
+				<name>FarCry2</name>
 				<type>checkbox</type>
-				<typehint>HalfLife</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
+				<typehint>Far Cry 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;farcry2</bindstofield>
 			</field>
 			<field>
-				<name>HalfLife2</name>
+				<name>GunZOnline</name>
 				<type>checkbox</type>
-				<typehint>HalfLife 2</typehint>
-				<bindstofield>ezshaper-&gt;step6-&gt;halflife2</bindstofield>
+				<typehint>GunZ Online</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;gunzonline</bindstofield>
+			</field>
+			<field>
+				<name>HalfLife</name>
+				<type>checkbox</type>
+				<typehint>HalfLife</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;halflife</bindstofield>
 			</field>
 			<field>
 				<name>Halo2</name>
@@ -600,27 +624,69 @@
 				<bindstofield>ezshaper-&gt;step6-&gt;lineage2</bindstofield>
 			</field>
 			<field>
+				<name>MechwarriorOnline</name>
+				<type>checkbox</type>
+				<typehint>MechWarrior: Online - this game uses a LARGE port range, be aware that you may need to manually rearrange the resulting rules to correctly prioritize other traffic.</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;wechwarrioronline</bindstofield>
+			</field>
+			<field>
+				<name>Minecraft</name>
+				<type>checkbox</type>
+				<typehint>Minecraft</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;minecraft</bindstofield>
+			</field>
+			<field>
 				<name>PlanetSide</name>
 				<type>checkbox</type>
 				<typehint>PlanetSide</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;planetside</bindstofield>
 			</field>
 			<field>
+				<name>PlanetSide2</name>
+				<type>checkbox</type>
+				<typehint>PlanetSide 2</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;planetside2</bindstofield>
+			</field>
+			<field>
+				<name>PlayStation3</name>
+				<type>checkbox</type>
+				<typehint>PlayStation 3</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;playstation3</bindstofield>
+			</field>
+			<field>
+				<name>OperationFlashpointDR</name>
+				<type>checkbox</type>
+				<typehint>Operation Flashpoint: Dragon Rising</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;operationflashpoint-dr</bindstofield>
+			</field>
+			<field>
 				<name>QuakeIII</name>
 				<type>checkbox</type>
 				<typehint>Quake III</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;quakeiii</bindstofield>
 			</field>
 			<field>
+				<name>Steam</name>
+				<type>checkbox</type>
+				<typehint>Steam (Includes: America's Army 3, Counter-Strike: Source, Counter-Strike: Global Offensive, Halflife 2)</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;steam</bindstofield>
+			</field>
+			<field>
 				<name>TigerWoods2004PS2</name>
 				<type>checkbox</type>
 				<typehint>Tiger Woods 2004 for PS2</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;tigerwoods2004ps2</bindstofield>
 			</field>
 			<field>
+				<name>TribesAscend</name>
+				<type>checkbox</type>
+				<typehint>Tribes Ascend</typehint>
+				<bindstofield>ezshaper-&gt;step6-&gt;tribesascend</bindstofield>
+			</field>
+			<field>
 				<name>UnrealTournament</name>
 				<type>checkbox</type>
-				<typehint>Unreal Tournament</typehint>
+				<typehint>Unreal Tournament Series</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;unrealtournament</bindstofield>
 			</field>
 			<field>
@@ -638,7 +704,7 @@
 			<field>
 				<name>Xbox360</name>
 				<type>checkbox</type>
-				<typehint>XBox 360</typehint>
+				<typehint>XBox 360 and Games for Windows Live</typehint>
 				<bindstofield>ezshaper-&gt;step6-&gt;xbox360</bindstofield>
 			</field>
       <field>