diff --git a/game-assets/cncnet.pack/rulesmd.ini b/game-assets/cncnet.pack/rulesmd.ini
index 97509137..019d6ebd 100644
--- a/game-assets/cncnet.pack/rulesmd.ini
+++ b/game-assets/cncnet.pack/rulesmd.ini
@@ -7590,6 +7590,7 @@ ThreatAvoidanceCoefficient=1
 DamageParticleSystems=SparkSys,SmallGreySSys
 ImmuneToRadiation=yes
 Trainable=no
+LowSelectionPriority=true; Phobos addition - RAZER
 
 
 ; harvester
@@ -7657,6 +7658,7 @@ StupidHunt=yes ;this guy can't handle a hunt command, so he should just run towa
 Trainable=no
 ResourceGatherer=yes;gs for the AI to handle the slave miner, it has to know if it can make money or not
 Bunkerable=no; Units default to yes, others default to no
+LowSelectionPriority=true; Phobos addition - RAZER
 
 ; Robot Tank
 [ROBO]
@@ -8455,6 +8457,7 @@ ThreatPosed=0	; This value MUST be 0 for all building addons
 ThreatAvoidanceCoefficient=1
 DamageParticleSystems=SparkSys,SmallGreySSys
 ImmuneToRadiation=yes
+LowSelectionPriority=true; Phobos addition - RAZER
 
 ; harvester
 [HARV]
@@ -8518,6 +8521,7 @@ EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 ElitePrimary=20mmRapidE
 ResourceGatherer=yes;gs for the AI to handle the slave miner, it has to understand what makes money
 Bunkerable=no; Units default to yes, others default to no
+LowSelectionPriority=true; Phobos addition - RAZER
 
 [UTNK]
 UIName=Name:UTNK
@@ -9356,6 +9360,7 @@ OmniCrushResistant=yes; so Crusher can crush Crushable, OmniCrusher trumps Crush
 Parasiteable=no
 Unsellable=yes
 BuildTimeMultiplier=0.8
+LowSelectionPriority=true; Phobos addition - RAZER
 
 ; **************************************************************************
 ; ******************************* Civ Units ********************************
@@ -13552,6 +13557,7 @@ VoiceDeploy=SlaveMinerUnDeployVoice
 Unsellable=yes
 Trainable=yes
 BuildTimeMultiplier=1.15
+LowSelectionPriority=true; Phobos addition - RAZER
 
 ;Yuri Weapons Factory
 [YAWEAP]
diff --git a/game-assets/ra2mode.pack/rulesmd.ini b/game-assets/ra2mode.pack/rulesmd.ini
index 0edde507..33874f5d 100644
--- a/game-assets/ra2mode.pack/rulesmd.ini
+++ b/game-assets/ra2mode.pack/rulesmd.ini
@@ -6190,6 +6190,7 @@ ThreatPosed=0	; This value MUST be 0 for all building addons
 ThreatAvoidanceCoefficient=1
 DamageParticleSystems=SparkSys,SmallGreySSys
 ImmuneToRadiation=yes
+LowSelectionPriority=true; Phobos addition - RAZER
 
 ; harvester
 [HARV]
@@ -6248,6 +6249,7 @@ Size=3
 VeteranAbilities=STRONGER,FIREPOWER,SIGHT,FASTER
 EliteAbilities=SELF_HEAL,STRONGER,FIREPOWER,ROF
 ElitePrimary=20mmRapidE
+LowSelectionPriority=true; Phobos addition - RAZER
 
 ; harvester without back
 [CMON]
@@ -6293,6 +6295,7 @@ ThreatAvoidanceCoefficient=1
 DamageParticleSystems=SparkSys,SmallGreySSys
 ImmuneToRadiation=yes
 Trainable=no
+LowSelectionPriority=true; Phobos addition - RAZER
 
 
 ; harvester
@@ -6355,6 +6358,7 @@ ZFudgeBridge=7
 Size=3
 StupidHunt=yes ;this guy can't handle a hunt command, so he should just run towards the player
 Trainable=no
+LowSelectionPriority=true; Phobos addition - RAZER
 
 
 ; Mobile Construction Vehicle
diff --git a/package/Resources/OptionsWindow.ini b/package/Resources/OptionsWindow.ini
index 10ce6858..8179baae 100644
--- a/package/Resources/OptionsWindow.ini
+++ b/package/Resources/OptionsWindow.ini
@@ -18,15 +18,19 @@ SettingKey=AllowTaunts
 2=chkQuickExit:SettingCheckBox
 3=chkSkipScoreScreen:SettingCheckBox
 4=chkSpeedControl:SettingCheckBox
+5=chkPrioritySelection:SettingCheckBox
 
 [lblPlayerName]
-Location=12,180
+Location=12,188
 
 [tbPlayerName]
-Location=113,180
+Location=113,186
+
+[btnConfigureHotkeys]
+Location=12,266
 
 [lblNotice]
-Location=12,204
+Location=12,216
 
 [chkScrollCoasting]
 DefaultValue=true
@@ -75,6 +79,14 @@ DefaultValue=false
 SettingSection=Options
 SettingKey=SpeedControl
 
+[chkPrioritySelection]
+Location=242,150
+Text=Mass Selection Filtering
+ToolTip=If enabled, non-combat units are not selected if mass-selecting together with combat units.
+DefaultValue=false
+SettingSection=Phobos
+SettingKey=PrioritySelectionFiltering
+
 [UpdaterOptionsPanelExtraControls]
 0=lblUpdateChannel:XNALabel
 1=ddUpdateChannel:FileSettingDropDown